[proaudio] [2532] libclam-9999: fix compiling with recent glibc

[subversion@xxxxxxxxxxxxx]

Revision: 2532
Author:   dominique
Date:     2013-03-11 16:41:22 +0100 (Mon, 11 Mar 2013)
Log Message:
-----------
libclam-9999: fix compiling with recent glibc

Modified Paths:
--------------
    trunk/overlays/proaudio/media-libs/libclam/ChangeLog
    trunk/overlays/proaudio/media-libs/libclam/Manifest
    trunk/overlays/proaudio/media-libs/libclam/libclam-9999-r1.ebuild

Added Paths:
-----------
    trunk/overlays/proaudio/media-libs/libclam/files/libclam-9999_timeutc.patch

Modified: trunk/overlays/proaudio/media-libs/libclam/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-libs/libclam/ChangeLog	2013-03-11 15:31:59 UTC (rev 2531)
+++ trunk/overlays/proaudio/media-libs/libclam/ChangeLog	2013-03-11 15:41:22 UTC (rev 2532)
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 Mar 2013; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>
+  libclam-9999-r1.ebuild: Added fix for compilation failure with recent glibx
+  +libclam-9999_timeutc.patch: Fix preprocessor macro with recent glibc
+
   09 Mar 2013; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>
   libclam-9999-r1.ebuild: Changed QT depends to dev-qt/3; dropped qt3 support
   libclam-1.4.0.ebuild: Changed QT depends to dev-qt/*

Modified: trunk/overlays/proaudio/media-libs/libclam/Manifest
===================================================================
--- trunk/overlays/proaudio/media-libs/libclam/Manifest	2013-03-11 15:31:59 UTC (rev 2531)
+++ trunk/overlays/proaudio/media-libs/libclam/Manifest	2013-03-11 15:41:22 UTC (rev 2532)
@@ -1,3 +1,4 @@
+AUX libclam-9999_timeutc.patch 325 SHA256 7e5f897f429c6a9bef1769204ac0fa34179b8671b8b1a149bc0efe55d1713936 SHA512 c78a11b2584ff77a0a245e0ffb3da907ee5c0b0917a847d426a7e8bb446e9171ed60945d9113891dc491cf6b2d9a559282ba396d9b7b05ea90da65eabc74402f WHIRLPOOL 5517ca2ba87434cbd2970a0d896ad042ddc31378eaa55612d37858c93101c2d99eddf2802aaa285b5f3f73a220b8b8adbd7bb583550e15bcdc0488c5e61fc3fe
 DIST CLAM-1.3.0.tar.gz 2404874 SHA256 c112adcbf0f08a364ba17be6f175a0582b002ffb3208621e1cfdb20d83f4d64e
 DIST CLAM-1.4.0.tar.gz 2527268 SHA256 36fb156b01bb88276962763fef18cd1533cc10d64f8d7824b4623bf5d761bd4d SHA512 af1f5ed26b22dcfb09817450e286a5ce76a35a033e0457a959f91ce527b9406f492d2d7835ca1b43ed2b84fea93dd0096a56e7d354e465d75f28bb5910a947a5 WHIRLPOOL 96e8e3b7dbae3eedcd714ec8b8ca37ed7b4a1df1d3dcb81e0c93cd1e307a81f4ec241f983c0efb5e7bfacd7a177fdaf707e0a5856db59dde2f31f78e33f42ec5
 EBUILD libclam-1.3.0.ebuild 3815 SHA256 6b06b20fa0e5318d0cc8d29b9550cd5b642cb8416ae6c3e368e8582dcbc953b7 SHA512 688c63108e4e5b061ee3dab867caa91f61132c2750162b11fc9ed5c9646289593f52bc6403a1b8861dc2fab0f4145c1e7d343ea0e136ee7266d5cf8727eb954c WHIRLPOOL 0166f5c1db88bb7b61c0106273b1de721a7f6cb15706fb5553538951104d5738ba05614623dc894ef933593663e0da801119ed091eb029b2e98bd6e515d962e2
@@ -2,4 +3,4 @@
 EBUILD libclam-1.4.0.ebuild 4135 SHA256 fc6048d4caa2d53f520a84c62a5e192b552fd2e5761f94a5a3ee1c7867a9d9f2 SHA512 2789d761c7dbeb4459d25dcdd2a18453205054fc849b61d69d1cb8a2c0dc18eb0bab3571dffe57bbabce83fe53b977617cc7b873c6901ff2c2995b91c9576d2b WHIRLPOOL 41b8a249a572e37c08e469d0875530db395c6ff05b03dc6f1f9f9c4da8ef31c38f238f905eb406bcf8dc6cb8391cc172a4c62173e04332156528c0316037fd4c
-EBUILD libclam-9999-r1.ebuild 4674 SHA256 e9d790439d226b0d4f50e69a0375b5f211cd44ba7f2c1c31cf0e8f05eaf05c67 SHA512 8c0d9fa15eb3750a0c6404e28ac23021b0c23b5a450796969a865a8c6c298c3c553e08d475f2c03797212ea2d4336e8d42ba64932c5f80166f18a95bfa63d347 WHIRLPOOL b1290069b0bfaa120fbea27f0e6573bd7799c56005f4431706c298de9f6f39662944f44a3f1ece0bb777fe68ed5f97243482c0702e204a02c7ab35d685195619
-MISC ChangeLog 2423 SHA256 844bb26157261d56b6e138a25bba4b303bffdca97bbd2d4d89e2cbd4bd352cc2 SHA512 d51701fffaca6680bc56ffeff4694fb0985ed127377a5f2bbd3d7fefb1afb9bc1dffa55267c6f254fb34aab6fcf2c17ada82da125e685cc2ac7fd4d5a51f038d WHIRLPOOL edfa44bb9c39c09f4528667bcb18c618f9ef1880ba348e0ce90e0f4f1a211d6f564be42d5d7824ba6bfa22ec3adef77082db1cd2f50d599c5227341bf6402245
+EBUILD libclam-9999-r1.ebuild 4755 SHA256 a05fd4febc5fe3be9ecf4218dd5cc6aa2886f7abeac224890dacd3c2df134781 SHA512 ea65c6cffa00794a8a8d5233e63698d5c534ad0731e6ce0bd88999e7f2403f3865747cc0f14bbf016ab5dfb2e055f0e6e81275842c515ec50f192b23cc7b1a4d WHIRLPOOL c3a85c8d287cb7c52295cb4b10314cbc390ea4d9aca3021058248b36e4ac1c289d2eea8adbafc8605aaa007142194b32e789fbab3194415aa8f7f3ec29590b92
+MISC ChangeLog 2640 SHA256 47700f91e8798fc44de9501eb217b018a73b97c77a70171d97c0b2676fbc9091 SHA512 d5965366c31e8417caea487f863f7b6d0da8f27dff1a01096505a573b34986b44a7a8148fdf192e28bb4cd37b99fd072884ff5f861b8b8241c6553fce49e4388 WHIRLPOOL 1ac8a428c10049586d8208f1067ad38552dfde41553db53a0f1a203373bb257fe4957994533cae57b55f58e8ded8f20a56f6d174b82bf993df43843875f17af0
 MISC metadata.xml 812 SHA256 f58d6e666e08227e898340cd87689a8307c012a7626a241f0f2754ba98d342d8 SHA512 e4dcaec217871c0e2016705923f42dc756e7f70074622c6cc73d89beb725d3e280c9bf122203bae0c9af3c284babb6e4ca7e545780376981b6ff291389c087b3 WHIRLPOOL 090415dd77bcf1b75d33e9bc62b22ad917c72cebe7d1ec4d7a3e6bc54f5e480f1b94719eb915b7413f3dcb0c60d2d030482bc59f2c077d2363f468beca5630ba

Added: trunk/overlays/proaudio/media-libs/libclam/files/libclam-9999_timeutc.patch
===================================================================
--- trunk/overlays/proaudio/media-libs/libclam/files/libclam-9999_timeutc.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-libs/libclam/files/libclam-9999_timeutc.patch	2013-03-11 15:41:22 UTC (rev 2532)
@@ -0,0 +1,12 @@
+diff -ru CLAM_orig/src/System/Threads/xtime.hxx CLAM/src/System/Threads/xtime.hxx
+--- CLAM_orig/src/System/Threads/xtime.hxx	2013-03-11 15:06:28.000000000 +0100
++++ CLAM/src/System/Threads/xtime.hxx	2013-03-11 15:31:19.000000000 +0100
+@@ -30,6 +30,8 @@
+ #endif
+ #include <pthread.h>
+ 
++#undef TIME_UTC
++
+ namespace CLAM
+ {
+ 

Modified: trunk/overlays/proaudio/media-libs/libclam/libclam-9999-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-libs/libclam/libclam-9999-r1.ebuild	2013-03-11 15:31:59 UTC (rev 2531)
+++ trunk/overlays/proaudio/media-libs/libclam/libclam-9999-r1.ebuild	2013-03-11 15:41:22 UTC (rev 2532)
@@ -61,6 +61,11 @@
 	subversion_src_unpack
 }
 
+src_prepare() {
+	cd "${MY_S}" || die
+	epatch "${FILESDIR}/${P}_timeutc.patch"
+}
+
 src_compile() {
 	# required for scons to "see" intermediate install location
 	mkdir -p "${D}"/usr