Fix clashing MD5 symbols (reported at upstream sf.net project page)

Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64

4 files changed, 37 insertions, 8 deletions

diff --git a/media-libs/liblrdf/ChangeLog b/media-libs/liblrdf/ChangeLog
index d35caaec8dce..b5b9537f8c49 100644
--- a/media-libs/liblrdf/ChangeLog
+++ b/media-libs/liblrdf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/liblrdf
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/liblrdf/ChangeLog,v 1.40 2011/07/29 07:48:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/liblrdf/ChangeLog,v 1.41 2011/07/29 17:03:32 ssuominen Exp $
+
+  29 Jul 2011; Samuli Suominen <ssuominen@gentoo.org> liblrdf-0.4.0-r20.ebuild,
+  +files/liblrdf-0.4.0-rename_clashing_md5_symbols.patch:
+  Fix clashing MD5 symbols (reported at upstream sf.net project page)
 
   29 Jul 2011; Samuli Suominen <ssuominen@gentoo.org> liblrdf-0.4.0-r20.ebuild,
   +files/liblrdf-0.4.0-raptor2-pkgconfig.patch:
diff --git a/media-libs/liblrdf/Manifest b/media-libs/liblrdf/Manifest
index f79df7fcfb29..28d3574e74fb 100644
--- a/media-libs/liblrdf/Manifest
+++ b/media-libs/liblrdf/Manifest
@@ -4,15 +4,16 @@ Hash: SHA256
 AUX liblrdf-0.4.0-dontbuild-tests.patch 479 RMD160 f8468291bedb71e369c47570b9a005e0dad43505 SHA1 f67d222e4a96b5d9ae81e863a02bf1ef6e8e5918 SHA256 e3418adcd2f627152880bff26f5e59e2b79fd6096a6f265dcc6fad9d0e4cd4dd
 AUX liblrdf-0.4.0-raptor2-pkgconfig.patch 290 RMD160 e388b7350d872a1a146fcfdc4bb4088805560433 SHA1 745f8233e6edafa4646bcd1df7e33f00f3889179 SHA256 b88bcb62ff3f69713111d6f2ebb2ebd7e5b0a4b7ca2968fbab8711716df553ec
 AUX liblrdf-0.4.0-raptor2.patch 7041 RMD160 5afc8cc1f79320de734ea244905d8545ea5cdfa2 SHA1 a189371033e853852f1b76afd611f78af8007eba SHA256 499cce2b11e66e05957e125c4baff33eed266c9a1e1485cbc71df451a880de8f
+AUX liblrdf-0.4.0-rename_clashing_md5_symbols.patch 684 RMD160 45fcaf4b0c9d02433eeb8eb7b2e3c0b3d5ff0325 SHA1 14d1998339922e2493939b7117ffa2669c1b68ba SHA256 3aba0d4e7960984f29afeaf79c47bcb02409a1fb6aaf713ec54afaac2d1997ef
 DIST liblrdf-0.4.0.tar.gz 336959 RMD160 2cb371c99552ac3045b72e20786494575ded37d8 SHA1 17ce55f692bc52ed12605091b99106255f964b5f SHA256 95e98e86ba06ed73a5571cbcff3ee88e481b403b6eb727e9eb182870efd9b204
-EBUILD liblrdf-0.4.0-r20.ebuild 909 RMD160 3cb614e2b177a726cb650eba82b393ac3088591e SHA1 cf2d104a7722f616a1fbfdc480bdf2153e6839c2 SHA256 db07fff02df10624284325ccf38de7bd92a67d592fa28ea8c7bc1ddc88aa4a45
+EBUILD liblrdf-0.4.0-r20.ebuild 998 RMD160 b528bae641ba0df26656ff6a51e7ab1a4a3c9e2c SHA1 345d9bcc2cfad414ecec67aa4835f55adc8af1a6 SHA256 62f596a48b572e498d535b3aedf72e6e17cc187ecfc978f5bc7b548af19af251
 EBUILD liblrdf-0.4.0.ebuild 804 RMD160 6651300089f968e82a637273948394c5ec63d5a6 SHA1 3593fd6bd3688d13ee539f409331394b7b3a26fd SHA256 d9fc42bc1e66b5940628a4e8df76234f0b697df9bc26ee93b67017f17d5a2cef
-MISC ChangeLog 5082 RMD160 828eba5ce4c6f7e60d4c6750b75820f809355ad1 SHA1 3982ad67f8cc042a103ff0df5bd1b12f3ebdefb8 SHA256 c993b9f4d62fd04948e9246ffef6360b4df1eacce77695941175488c1d1284e5
+MISC ChangeLog 5291 RMD160 3fc2f653a893df0e72500ed9cc5a7cdf28c261a9 SHA1 5c98297900ca6c067ae16b8f7c1f8ed1b89c3198 SHA256 fa59aa6d88b779f751167b1b115f05866fbfbdd42c6931d53e010f8e18904891
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk4yZWgACgkQXkR9YqOcLPGfAAD+KB4rKkbuj4WgvH+e0P+A6SzS
-FUYmrw4ARDdS1sU4QWYBAIARoD7vd1gIIAqsQqajiBJmCYwD3njPmlqsPL0B0FOD
-=hYME
+iF4EAREIAAYFAk4y52MACgkQXkR9YqOcLPH+TwD6ArKHRDrT4t18CkBv/LkIDiO/
+4Ypx2gE4xTCPSdFguu8A/1clUxel34INgC4XewJIZrs5cRdF77+gmZxUumE3ZCVO
+=Wun6
 -----END PGP SIGNATURE-----
diff --git a/media-libs/liblrdf/files/liblrdf-0.4.0-rename_clashing_md5_symbols.patch b/media-libs/liblrdf/files/liblrdf-0.4.0-rename_clashing_md5_symbols.patch
new file mode 100644
index 000000000000..7d4c6def70f5
--- /dev/null
+++ b/media-libs/liblrdf/files/liblrdf-0.4.0-rename_clashing_md5_symbols.patch
@@ -0,0 +1,20 @@
+From Debian patchset of liblrdf0 package; also reported at sf.net lrdf project page
+
+--- src/lrdf_md5.h
++++ src/lrdf_md5.h
+@@ -32,6 +32,15 @@
+ #ifndef __MD5_H__
+ #define __MD5_H__
+ 
++/* Change function names to prevent symbol conflicts */
++#define md5_init _lrdf_md5_init
++#define md5_buffer _lrdf_md5_buffer
++#define md5_sig_from_string _lrdf_md5_sig_from_string
++#define md5_finish _lrdf_md5_finish
++#define md5_process _lrdf_md5_process
++#define md5_sig_to_string _lrdf_md5_sig_to_string
++#define md5_get_result _lrdf_md5_get_result
++
+ /*
+  * Size of a standard MD5 signature in bytes.  This definition is for
+  * external programs only.  The MD5 routines themselves reference the
diff --git a/media-libs/liblrdf/liblrdf-0.4.0-r20.ebuild b/media-libs/liblrdf/liblrdf-0.4.0-r20.ebuild
index 027d5db20a87..1807caf0624b 100644
--- a/media-libs/liblrdf/liblrdf-0.4.0-r20.ebuild
+++ b/media-libs/liblrdf/liblrdf-0.4.0-r20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/liblrdf/liblrdf-0.4.0-r20.ebuild,v 1.2 2011/07/29 07:48:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/liblrdf/liblrdf-0.4.0-r20.ebuild,v 1.3 2011/07/29 17:03:32 ssuominen Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -22,7 +22,11 @@ DEPEND="${RDEPEND}
 DOCS=( AUTHORS ChangeLog README )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-{dontbuild-tests,raptor2{,-pkgconfig}}.patch
+	epatch \
+		"${FILESDIR}"/${P}-dontbuild-tests.patch \
+		"${FILESDIR}"/${P}-raptor2{,-pkgconfig}.patch \
+		"${FILESDIR}"/${P}-rename_clashing_md5_symbols.patch
+
 	eautoreconf
 }