Add patch to link against proper dlopen libraly. #395347

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

4 files changed, 40 insertions, 15 deletions

diff --git a/media-gfx/pstoedit/ChangeLog b/media-gfx/pstoedit/ChangeLog
index 24afbf5907cb..96397b4a1c88 100644
--- a/media-gfx/pstoedit/ChangeLog
+++ b/media-gfx/pstoedit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/pstoedit
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/ChangeLog,v 1.69 2011/09/21 05:02:57 radhermit Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/ChangeLog,v 1.70 2012/03/19 09:08:49 naota Exp $
+
+  19 Mar 2012; Naohiro Aota <naota@gentoo.org> +files/pstoedit-3.60-libdl.patch,
+  pstoedit-3.60.ebuild:
+  Add patch to link against proper dlopen libraly. #395347
 
 *pstoedit-3.60 (21 Sep 2011)
 
diff --git a/media-gfx/pstoedit/Manifest b/media-gfx/pstoedit/Manifest
index 4737d15732d1..ccce3a4b7f73 100644
--- a/media-gfx/pstoedit/Manifest
+++ b/media-gfx/pstoedit/Manifest
@@ -1,25 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX pstoedit-3.50-parallel.patch 1913 RMD160 0589216baca35730b2bbb42f2fe08875cd4e7215 SHA1 aa7fce1110ddb3cff99cfd32e2064112eb1b3a95 SHA256 306e4dc9068834df6a99ad8b4d10fc63157bf895ad2be32211d507001ecea13c
 AUX pstoedit-3.50-plugin-close.patch 178 RMD160 b411a3be19c29a625be1a79902484d9294d003a9 SHA1 3343fc51cdc7daf7791554f2e9ba5cfcddadd9e7 SHA256 1e44d86f4184e9dd0d0a02c352af9a849f92fb5ee974e5dc3fc933d2debf515c
 AUX pstoedit-3.50-swf.patch 673 RMD160 23570d31892528794a6dbc61e106ec04c689ea3e SHA1 278738ba2da3930678d7191faca3738a913f2e54 SHA256 e8e12b859cc87f8df628f653381d1b999d4dfe0603fcd91ba3e789d089fe2268
+AUX pstoedit-3.60-libdl.patch 428 RMD160 8aad3115ae35c368ca3a0a3ab2632d94c9e48710 SHA1 726f204aeff392379ca08cbf728f455e1676f5df SHA256 587e8e9786002f245fc4f5a9bd89fb7bd15b2febacc96201f954923c07c40377
 AUX pstoedit-3.60-parallel.patch 2007 RMD160 73cb65bf2166488bcb2c3fdc1f70a39401b3ad38 SHA1 6caed6daa627f171ddc2126641a820db01458d43 SHA256 e83b0d23a1dc8f5ee1fb1b142b6b3e78337615f872058e0d292004ab842d1f87
 DIST pstoedit-3.50.tar.gz 894115 RMD160 ba9be28424ced48464d93dd8bca60107d181a1c3 SHA1 5685bef29fa00aae7cc314d3a1dd21612a98eb2b SHA256 22b16452d7538358f8ecdff1fec29a8b6d4da49dffec9ae436f60bd95d105711
 DIST pstoedit-3.60.tar.gz 988351 RMD160 5e1e40b5d8ea1cee045ce19b5c6322e35f108690 SHA1 649ade3d873429548eb6dd9f3e13cb79a8d6a1a2 SHA256 118e58aa2c65e4193f1cc5a56c569e160752f654bf35e39f790d27b223b62391
 EBUILD pstoedit-3.50-r1.ebuild 1400 RMD160 2ff01d48c12cd93b82a87e897da0d303bc5a850f SHA1 96d86b6651c4c4577fbe5f9dd5356db0cdb40888 SHA256 dbe09dea248274d1a268b5bf4fb91563ec6fa1a23aab196292c4c38f133e8d35
 EBUILD pstoedit-3.50.ebuild 1362 RMD160 73f32623d49976c1e44b157df5d7c766be9158d9 SHA1 aec6cc873e0692887ee03c8af84ccefec7ed00a6 SHA256 4e58480592879ab95d15cdc5de065b8be41993f629e993fa80fd3741977da1c7
-EBUILD pstoedit-3.60.ebuild 1274 RMD160 1a095ba95c4bf6fb4652f41ba97cd2c88ec8f45c SHA1 e54d2f4d9fc521819d8dee537c65732be12c853c SHA256 ada4540defbe65d40ba6e245549bb08d0beb97e3dd95ca7b44ede6f590f38330
-MISC ChangeLog 9866 RMD160 f8ac4577bdf005eceef4710f055b71e9c79899d1 SHA1 8cc33a81e01c93ee2994d05836cff82275f68fa8 SHA256 928c7d59c08b7de88fd9bcd10f1dfe135df116a9484604253e24e59952a13127
+EBUILD pstoedit-3.60.ebuild 1305 RMD160 b1685e5c9a55c5466da2eb2b94fba2a67c6bca33 SHA1 13f75a95b3b2033033874a4c8557904d445823a2 SHA256 9404482972d2b8a27544091d19d81576c3cbda5eedd0df91e09292d95d94e9c8
+MISC ChangeLog 10027 RMD160 2ff7dfb258d44733772fa1cfb55e1e08f107f6ab SHA1 ac3e31c24cd7d83e3a9ab0c7cbded198fe41f356 SHA256 97015446df044c837437237dd2f9a2948771fc97a499b81fdab83e8ea5116722
 MISC metadata.xml 347 RMD160 9e423c815bde1901d77b949a473ab84356442606 SHA1 e90865b7aa10f25cd154d24f965d34e0ac874772 SHA256 5b861bace315a6efb12cc13969af4a4c7bf18e35edc79c47e169011666393063
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOeXAHAAoJEEqz6FtPBkyjFjIH/0D3gBWUvnIVmcZMJTzObzkj
-5NmV6O2QqsIAWGPUDQGAJWd2ukiBkuIWD5bUFlXMPqxW4N4J1+U2iUoP+zgCmWyl
-VOzGEMbxJwEgUhDqSvA/jiasyP/LykVe++53dHzMnGkxHVP8BcOgoBVuhxF2twlo
-Jibp2qzfl1cwYWT5P/j+Vt0K7kSYWmq9n1Z5gW6KKjSrMdFzbhWTiIIv74UIzOaa
-xD2pwOr1iEAWOhKeI6EMmJ3kmH++zFGGQq2q0Cu3wOcPU+ZR9mkadao9cti4Zqb1
-xA2bWhvxAbg7Ek9td91eBNMST27NYhK30orHrKog0Ni8Z64WYGswi5pc7qIWFL0=
-=SAzr
+iQIcBAEBCAAGBQJPZveNAAoJEDYO1FT4VRUUCVUP/2U6dOx8U9WBu6+Rvw3Ppj+i
+13e5VWYL23vQTpb28EvyT8FdgiV7/gvvaBSNAcau0Ky/j0ALGKbqVyC+hcWWN09k
+fXNI0OMfJG/4m1c8N1xPAdIxZ66wP1RDCfvDBvN1cZzn6ChZkF9hp3hWVbY2gVsx
+KXEuOKKdoNAElJdw4pwU2tevP6FQsRsBIqOgoJKiuptVeoaeUZ5JUMP/J7tRMNBY
+2RYIiR7wYxLovgYROScdjZkS1OMamvSu8zBiII1suH5hDY/ijKLWTL45oWf9a3/w
+bJc26t1FQUoDWZMF61uRLhGcmyUSdozEXYdnpHx3ngCyifr9Mf5FDjjK9AJPW3X+
+gTy2zOPUcb6KlVf3rs0UdI1kGPa3qKctP4zoMj8OLIHqufSnO386+lUP95esY42/
+RYOZ0cpCfRlX0HtdzGN32LbTXCCLlFQ77rksoV8VDngZxLq62qMHeZ1YupLrfAvd
+YLeyeuCf9WV2vlDaaywqjpellceogiFPeZr5ggdeKuL2Gyqh+YcUuDTfi3A9DdHN
+dUSzvaN6DcN8Gs8D6k9pHpxCNaAuq+vJ8tsp89mfPcJ/Heo0O/wbXtStSqBJK2Xz
+NwZSWS9JI7hJ6OTkxRWGgH3vWko96gTrslopTQaRVdrnby+hpWqk22hpu/ec40Xe
+nlqB99I8JSp4tAminvNU
+=2W7D
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/pstoedit/files/pstoedit-3.60-libdl.patch b/media-gfx/pstoedit/files/pstoedit-3.60-libdl.patch
new file mode 100644
index 000000000000..279ed715f53a
--- /dev/null
+++ b/media-gfx/pstoedit/files/pstoedit-3.60-libdl.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 6b33220..30c9f2e 100755
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -139,7 +139,7 @@ libpstoedit_la_SOURCES =			\
+ 	genericints.h 				\
+ 	version.h
+ 
+-libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} -ldl -lm
++libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} ${LIBLD_LDFLAGS} -lm
+ libpstoedit_la_LDFLAGS = -no-undefined
+ 
+ pstoedit_SOURCES = cmdmain.cpp
diff --git a/media-gfx/pstoedit/pstoedit-3.60.ebuild b/media-gfx/pstoedit/pstoedit-3.60.ebuild
index daae38f06ca9..ea3191a31600 100644
--- a/media-gfx/pstoedit/pstoedit-3.60.ebuild
+++ b/media-gfx/pstoedit/pstoedit-3.60.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/pstoedit-3.60.ebuild,v 1.1 2011/09/21 05:02:57 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/pstoedit-3.60.ebuild,v 1.2 2012/03/19 09:08:49 naota Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -30,7 +30,8 @@ src_prepare() {
 		-e 's:-pedantic::' \
 		configure.ac || die
 
-	epatch "${FILESDIR}"/${P}-parallel.patch
+	epatch "${FILESDIR}"/${P}-parallel.patch \
+		"${FILESDIR}"/${P}-libdl.patch
 
 	eautoreconf
 }