Disable search of libtool files (like ltdl.la) as well as -I/-L build paths #383929 by Francesco Riosa.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 31 insertions, 20 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 14f9abf53658..e42e953f3ad4 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/imagemagick
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.496 2012/10/04 15:22:18 ssuominen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.497 2013/01/21 03:42:51 vapier Exp $
+
+  21 Jan 2013; Mike Frysinger <vapier@gentoo.org> imagemagick-6.7.8.7.ebuild,
+  imagemagick-6.7.9.9.ebuild:
+  Disable search of libtool files (like ltdl.la) as well as -I/-L build paths
+  #383929 by Francesco Riosa.
 
 *imagemagick-6.7.9.9 (04 Oct 2012)
 
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index ca6bc06315fa..872ff13305a2 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -3,18 +3,24 @@ Hash: SHA256
 
 DIST ImageMagick-6.7.8-7.tar.xz 7830744 SHA256 593e09bec0e6def3f9d6d6b0f7970ddd37dd9420a1286ce27e3f4ba26b78f114 SHA512 76b30887a40e6c74006a0e17f848893901bf001d68b4bf4ab6f38bf3147bf8b1fffa7e0a3aca8acb46bd65c6489aee6f9c28606f43d46b00cf9be2b6a93290dc WHIRLPOOL 2b746348aa058e4c2ef1096c62254f7694d7cc32bb23ee36f8a6b9f8fbb4603a98c2d473d0656004d40923b124c9d882842fec700fbac4900eaba1a5a102164a
 DIST ImageMagick-6.7.9-9.tar.xz 8363720 SHA256 706164aa20219f2f72bed9f8f2d1a998897fed61cd95cd4939be4e8fa7e1904a SHA512 41070032e7deddba17a779a985d600526c0eb32a5518db5d11aa722a65998743344105825155606dc2aab8af45ffa585f2c34e55f492662998773c1d84f880f9 WHIRLPOOL 09428d51460276d558e0c7c2bcd50b765865b59a2b243bae6f82b363c469599c2fb190d41a55d990b0474e2d9417acfb24506e3802a528ec84ab43d9283b5705
-EBUILD imagemagick-6.7.8.7.ebuild 4244 SHA256 ce099fb745e4149517f2a3463d1ecfd3eb0e07deeb8669d18ac5d6fc7316fc48 SHA512 9ff3f5aa200ffda0fe3458f0cf906ad690497b4a89e47126c78af56f19a55241f8a17077a526c997c7ae9507287c26bf0dafeabb161c9e1e0f639ca19bc025cb WHIRLPOOL 22378b9f665593654f0cb7c7723c026a6c991ec270662e3c37342b1c4ad872dd49bfb8dce50d27ccbee92f807d6bae3b9d09d74bc12b5380880a258917a2ed08
-EBUILD imagemagick-6.7.9.9.ebuild 4396 SHA256 edd036eb45200788c8dda69ce912062feb6c26e37c616e046c57889d0849d8ee SHA512 579fae5f7f04196c0f7c4d53801517b0a4c88e9294a4ff7a922eb54eac722cd7c01e8cb34102675cd9e496b040f3ef3bfeca33222b8dcfa10804c2d00e30aca3 WHIRLPOOL 3cc074371278200666788aa45efaf4c3615e3bf007d42a7ab23a4e7180c96e28d390fd2908f96a10c32f2ef251de8be95a4aafa8b9fba143661ed4687b56f923
-MISC ChangeLog 73279 SHA256 1ef3236af2ada7df38bca47d27fabb59ddad806505672aaa4d319c918462e1b7 SHA512 ab1cb16e26f730d69ab4d77d9e0d643c84a4951735966359abc9125d83ce5fc42ed1f8cb50a3b8ee5a78f23ac4f379c745e7ee84244179404b6d5d2abbc3a7e4 WHIRLPOOL 87a3854a3d6ba345aea12433c45d6edfd763eb470523cea443b24f43df41d4af66e324703716b85cda88dc02d065b6afa93a3b792e25e375625b81a0121f79f6
+EBUILD imagemagick-6.7.8.7.ebuild 4191 SHA256 7c0775fce1fb3f4073b2617dd9788d5c5b90f520855ddfc6d877fd296514c5f2 SHA512 9b0cc29140ea16278467ad021f11896a255cad3df73dd9ce823354ca8bde74b736b56ee3e3ca3e2893e6dd059a9a0502f24c0fb1b7835850fadbc0a29b9ae3dd WHIRLPOOL ac82924a9d84397faab207f406d555b00f2a0d29b5f613031e7c3eb2c93455fbc1ae52a3d51c709ca0e40c59c17375b4f8198dc1ffc4f9a9f894b446a295793c
+EBUILD imagemagick-6.7.9.9.ebuild 4343 SHA256 6ec0d781dd8808cf6ac17d03650766ff0fbe315f4604bcb9bfb059a51b86724c SHA512 5f10558e7746347443933fcf234a9228e82d4721033220d0ea30786474ef21d5e4d2b452356b5ab0a69829664761bfa079b010e8f4a7a1a7dbfd5b001df267d6 WHIRLPOOL a630e760b2880f7dd702a6f24038401807f74678a32c3685a10993a47a9473820f5024b7427a502260703b39a34ab3432afd5a7bcc547a60d9abb796ad08b0b6
+MISC ChangeLog 73493 SHA256 6bfc551e12451b61a94802a1bcdf5bf6fd1423eef0215beb96bee0ff3b0b913b SHA512 ebfcb38e1d4f0a6a1ff613af36eddd615d94cef62f9680c7bc142975537827917170c211dd1ceeeea0739ae33111d508d319135014e4c2f6ae2a1d3fc606780e WHIRLPOOL a45b65810860e2c59dbbc9e76c07a23887e7ca43a0cddf4966b531ae128064b5e01056a24ab5cb878e5a898fd42e0df51b24404869023dfb9368ee4c1cbe4ded
 MISC metadata.xml 1050 SHA256 c7fad295a9ca9207454a88d9794902dd76f732f01a439d29f94372ce9ae4af7d SHA512 d502e1038cd08123b1a0d25dccee6a4134bd8fc768c228042b546c8ee226432430107f76b506e946eb5a9b358c13115e5c6e7a1c80f3fe5b4061885263b0dbd7 WHIRLPOOL 675922fbabfacc2660f9572b61a3cee8bb0967b0df0e6e211271399dcb6edc050246344e5251e6a4a4411f8671f3c625d07f3606531662ab5b278fdcff692010
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQbakWAAoJEEdUh39IaPFNrIwH/0FcMSJWHMVtE6FgCVfCg9Gm
-vryih3HpPoxvE/WEXUEl8DUBBqfMrR7FpyuSv+AQ8GjS6j5YqcdVBKaEFzh+havi
-wYxl5QZe3cgZz5Ev5i1cNJc9k2q3iVoA0du44NnOl2e+OS+RuTEgKAbplNskZ6NY
-OyRnuhQxqwUkikdY+39Npkkm40bsAIo26JO0OFbj0w9GLtxFYASvCiFkGOUVFdm8
-Bqk3UsIcxG060d8fasHn76ZsoGbgoqslGLMHPg/oH5UKJzFLW1UG/2u82Mg0CNcQ
-DQ9+cvsr7X7UjXvdoSZmWBQLia835rwSa6jxsIMeTL/gy6zR+ZGk8/++S740mBs=
-=yzh+
+iQIcBAEBCAAGBQJQ/LopAAoJELEHsLL7fEFW7GsP/1Q4f5ie4n91NzftS2DlKNRA
+IZSODtopzNuT9VSmfBwQYY5OV4wyRdZByt3mbijiJTDEjvpmlaTDHPzE9eSyrN3a
+4ln/N9MUiH+4ByPVjOxwlMyS71qPm0v3RYsuOC5Q5HE8urPcg07UcfpplyLv2wuy
+zmu1PLoy40HE8ABtyPoBAsGphv2olCGG6aHhpQZ3GJ0uCCmy8RV1gF2g23iE7Ltu
+7qMDuElSC9zhorTpJLQh8WLTwzyZsrWnAu3lFeUNWEr39LBZVZqWmY9J4DnhpRe9
+7kFE1ar91zvnzjC/yji4R2dyIqemiPWgJpn2ZrCmcxcR92/CE51V8OYG6LL957Jn
+EaqK6zAeuJjgnbTbYYzVvr/m1ZvgtQi7+ekUwxWaFJjx+j6gsx0Pl3Xs1djupbek
+HUggF563H7KtkIRZUuzH7pQtKOU8xwg28qVGRhtH6D9B+wPw2nVvj2K/Qkqkzip3
+FnlgJIRC4eO15kOxOa/E74mSlH5F9mAOAu2jK2Av3w1XyuWQsp91+fWBYprCLqZ6
+0vnObkLDhzK9ekG8cfGnX9TckTUv0eIb4blfeTukSINpb8gm3mC703W6F78QONCf
+viSYXblwJNo4bzZO7msJhl6+UUHVh9jzdLwU60v5Yq9ao3wtRvUTEceaiF9FlE80
+gcK0YJOWXj8Mktusq1gC
+=App1
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild b/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild
index fbf0088888fa..cf434ccdde26 100644
--- a/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild,v 1.8 2012/10/04 14:56:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild,v 1.9 2013/01/21 03:42:51 vapier Exp $
 
 EAPI=4
 inherit multilib toolchain-funcs versionator libtool
@@ -85,8 +85,8 @@ src_configure() {
 		$(use_enable opencl) \
 		--with-threads \
 		--without-included-ltdl \
-		--with-ltdl-include="${EPREFIX}"/usr/include \
-		--with-ltdl-lib="${EPREFIX}"/usr/$(get_libdir) \
+		--with-ltdl-include='' \
+		--with-ltdl-lib='' \
 		--with-modules \
 		--with-quantum-depth=${depth} \
 		$(use_with cxx magick-plus-plus) \
diff --git a/media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild b/media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild
index f5b9a3af945b..aa883bc7a078 100644
--- a/media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild,v 1.1 2012/10/04 15:22:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild,v 1.2 2013/01/21 03:42:51 vapier Exp $
 
 EAPI=4
 inherit multilib toolchain-funcs versionator libtool
@@ -85,8 +85,8 @@ src_configure() {
 		$(use_enable opencl) \
 		--with-threads \
 		--without-included-ltdl \
-		--with-ltdl-include="${EPREFIX}"/usr/include \
-		--with-ltdl-lib="${EPREFIX}"/usr/$(get_libdir) \
+		--with-ltdl-include='' \
+		--with-ltdl-lib='' \
 		--with-modules \
 		--with-quantum-depth=${depth} \
 		$(use_with cxx magick-plus-plus) \