Require libltdl:0 specifically, and allow older libtool for stable ebuilds #528294 by Pacho Ramos.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

6 files changed, 35 insertions, 27 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 98f1a4c46253..e6e8fb5b17f9 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.573 2014/11/05 16:22:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.574 2014/11/06 05:41:10 vapier Exp $
+
+  06 Nov 2014; Mike Frysinger <vapier@gentoo.org>
+  imagemagick-6.8.8.10-r1.ebuild, imagemagick-6.8.9.7.ebuild,
+  imagemagick-6.8.9.8.ebuild, imagemagick-6.8.9.9.ebuild:
+  Require libltdl:0 specifically, and allow older libtool for stable ebuilds
+  #528294 by Pacho Ramos.
 
   05 Nov 2014; Mike Frysinger <vapier@gentoo.org>
   imagemagick-6.8.8.10-r1.ebuild, imagemagick-6.8.9.7.ebuild,
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 35371cf2a82e..8f78b6f8aff9 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -7,26 +7,26 @@ DIST ImageMagick-6.8.8-10.tar.xz 7530504 SHA256 f31c7771ed0b8050837289f0c7b55303
 DIST ImageMagick-6.8.9-7.tar.xz 7552828 SHA256 45670f37ebd3354d64e45df5462b929b5b843dee2b038b0ad524491492bffbf9 SHA512 e9be966b430d4aca1fe64435b68a5586c458ba8e238ba47d5d7046e90c2e807e6f7b476ede00c22ffb2dbdf9bb21762e121bba6e48062ebee2800612caf81eed WHIRLPOOL 7170e6dbfb9e6c990fc828f8f157ebd4f7cd25854dcd45834d9959fca63ee8add1775e072b534237580a5df49619cbbd0546e055692cdaf01dbf1c5e5965c62a
 DIST ImageMagick-6.8.9-8.tar.xz 7889188 SHA256 27360449c6f3d4cca548d1780ecd5f8313a57a0a83d6d953a5088cc81714e9b0 SHA512 e200dee8a11b2d7077eae7645f0f21e5deb628aa11ade0b75ebd3865867ca544c89ca1a745b4b78d5496c86d359a63e290a53f25d090872286704c8ecb6176c6 WHIRLPOOL 10fed3f3faa1b9359f2dd19cf57b1f9019ccbb759136fb73a2234fd796043025519e27bfa7d05b23b6e3f7ca0685e21e93685ed868547ff14ddeaead1aa6bdf1
 DIST ImageMagick-6.8.9-9.tar.xz 7891624 SHA256 a4cccc70179ff2c67550e063cdcb2e62907338ef3e68b45bb1c41931e515b3eb SHA512 c30067ae55e2905fdd23c70de83198b52937a5b87396b5b89d3324f19a77ac8f654f6bbeeb07d4dcef1b4d609e9f53e1d1dd70848aa1452b58a548a240f7a3a3 WHIRLPOOL 84430ea4551960afd0f6a85c6febf34fecb2fd60f89ed4e88d76562e65a47202b918d7419d4cd1925ccabd70d74dc949ee02d6955a3f77f2ccadecbfe0e9bdb6
-EBUILD imagemagick-6.8.8.10-r1.ebuild 5066 SHA256 a4031daf6c2d36ca510e9aa12d81cc1c2b5af8ff09c899c6016152c85158854d SHA512 9d5bd7b6c38fee64ddfb64b3434c77815bee57c39e56fbd065618f2661a0fe3407d7ddbe6dad8837e3523af3a331bb4cbd78fb27947477f39982ea01e4f37232 WHIRLPOOL 38bad32c22797744cb2ba26aa5583fe65cef7d750d2f5d323628b022998f40b315bc3e19809e55bf1d88deb579e36bc06222dbda70e84d2afe2c2ca1bea9456e
-EBUILD imagemagick-6.8.9.7.ebuild 4984 SHA256 c4aa72bf3360ac216e12048173cb9f8d742e6145fa33e2e82687393e80a5cdbf SHA512 642284ee968e38294fc03a3dff32bdba2ea2f2e7352a923e784d2c95e2bebac59b43c770ca3ba393d97898c55c052ed79ac3ef609b2e04967a50d2f74b2ecdba WHIRLPOOL 901da294b146ee1665080e0d650fadcf24314e43618d170e921332ad4f6adda023ab0accfa3cedb973219721c5b6d938b7ada4607aa31a6458c88fdb3e8f9c8a
-EBUILD imagemagick-6.8.9.8.ebuild 4984 SHA256 9ceb82342a50cd4781daeb101595fde6f8f960768702f3de2094f15906181c54 SHA512 3fb5e21942206ce7c9b2c756057b5d873450748026aaee0e3392cf953f2a4cb7d67730fc939f03a5091ccf89e23084fdc589e96a0c8c476b238537f23f41738c WHIRLPOOL a57f27744d6fe9b91e30594ba6851a57039b5e561b32579d48f59dbccc3ae46a0bc4ae89bd78c1fa7714eb59a5be623b6465222ac3f0cf694a80350c1ed407a6
-EBUILD imagemagick-6.8.9.9.ebuild 4977 SHA256 7bd7bce0e90f1c6b74ecd2976e78bb61d249127633aba98f0e5ac043c129bdd2 SHA512 195cfa7316ea1d612dd77ed8c2bc6e0ac0f9bb1f0496acddf630cd3483dfacc2051ccf17646052278d2af08ec664feafea92fb469e7e3af6f6eb1b34495be33a WHIRLPOOL 8245e1ca0c94d08721e72306065ebfa7eabcd18ec09ce083d0c4d2a716ee117d20ddf4d5ddbc37a015b11f38c00125ff97e40228961c4a96b4c905c9545c2c6b
-MISC ChangeLog 84727 SHA256 9f0dd776e40bfa7adeb09c83aeb52f4e9bcf4a61afe45dd5d4228a54e93c1679 SHA512 56be253f3bb4d608f43154702b2f8538de8670cdce891ff65e90d16e5a65c93db598caaed846712b214060e531eac1dca7fe0721fa6b7ab776379b7554f2ddae WHIRLPOOL 71738d2f69145f767ac06326339888c1242be72af41b2c4f01794922717a6906c7c422cd4b571e7ca8579e50c4634766f3268edfdb080e51f4cef3f41d4a8ea1
+EBUILD imagemagick-6.8.8.10-r1.ebuild 5154 SHA256 9d06ffa746949cf3ecf02342d487219a85876614b4fa1bede4a2073a05087d22 SHA512 7ecad9d900e4a9ec49ed8bae95ceaacfba0867302f7ea55ab9c72847d9aba0670bffc71c3c1be6a74369e65ff52c3544e2997e1a722ebb454284cfd66a21e825 WHIRLPOOL ff915f0be184481a1d533de974ca708ff1c3ea5036690316f00755c0b2a3b8ec53fd63bf7b26769abceeb18484c5eedc0e2726f37618e8bb6b7958b5c4ccdc94
+EBUILD imagemagick-6.8.9.7.ebuild 4986 SHA256 709cb3c3678595db9e1dcde99fe61943381926910b03b6b154c9f4d45b14a8d2 SHA512 1b9340a5fa2b2702b48c33c853d8d01973f475a2016c6e6bf0eda61adba8cf6729b379600c642488efedcfc28b85560d4579f5a2c25a456f4dec798e4a9817ab WHIRLPOOL 7749b28c83f1ca922f3fc17b0351941a6d2966fe0af7e67e3cfab1689a079f2cec375b848de32aaf67a1ed7b8e1a32a7480e2162f951c024e489d6967b871e42
+EBUILD imagemagick-6.8.9.8.ebuild 4986 SHA256 a8aabc40905364cbd8f31f977c86ba985a6e3da302e25f26ffbcd807b460f2db SHA512 6dcf9621c84081cfa3190f140bbc406d059bc844003b164cc5df9073f755f98320b3a591e0fd36b64b943f3ed0229e346363e361b91af6f804c9b24221d9560c WHIRLPOOL a1bc05177af10f5c4e908ec3204951235e8d75dc9da25dfe23d62cd6696f266e282d9732fbf5ce312ac6cac4e0d79caf49874168bccafb5ac22dc7de7892431a
+EBUILD imagemagick-6.8.9.9.ebuild 5066 SHA256 3ae8c7b20faa9673d587065083949b6b7f9010495e4ab6b077d5c112aee95269 SHA512 04d0f182c50d44315ec2f0320f7d4e473882ff77b176325077a8bb4e8f2661fc2ddcccf685611855e09fb514a13adcefaa738404a25a1d13ae0059dc85c277b9 WHIRLPOOL 40dc620d69e496c015924c92780f8ffc49e73924c4c0196824f6910d28304cd5b8bb49dae79e6e6815d4f1f699a7b5ea42e1bc9b050b4f8367ba755a8ec5c156
+MISC ChangeLog 85001 SHA256 1eae298f83cb2e696e0ed6177403f9907417d643cb86ae911962f52b296caaf7 SHA512 27e5115e185dff3b2517bb730718766b9ab54f2821d4086d381ca7cd22f4c58790e38d7a6e1b09d9fbdc30d0730d1aba0aaa1c0802ce7f55e249d995d1122e82 WHIRLPOOL 1479431db299a4a4c72588b9c7f56f5aa68944d5907a33779668769e83eb1d42293e22fabb3f07427b63ac5d1caefa790197a6985d7f0d7ff463f12b7df4a9c7
 MISC metadata.xml 1050 SHA256 c7fad295a9ca9207454a88d9794902dd76f732f01a439d29f94372ce9ae4af7d SHA512 d502e1038cd08123b1a0d25dccee6a4134bd8fc768c228042b546c8ee226432430107f76b506e946eb5a9b358c13115e5c6e7a1c80f3fe5b4061885263b0dbd7 WHIRLPOOL 675922fbabfacc2660f9572b61a3cee8bb0967b0df0e6e211271399dcb6edc050246344e5251e6a4a4411f8671f3c625d07f3606531662ab5b278fdcff692010
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUWk6yAAoJEPGu1DbS6WIADqgP/ijt7ZHH54jbPZY1ROTf0fgA
-I5p/xMmAGpjRENz4W6mpKOzJBL4Jlx8ob71ZyFj3nC1be5sOU8n6vNWeOrcrcKR5
-tI7xSiwIqHhBKyQMMacfyvQ1GXturT/pUjjTigIGXtGTb8svyf4A5ghTgGwOAUmd
-gvDSwK4eTbUYcox0SVbCR/TTazEPtmKL83Ua2y6sFlv9B0clMM8UTkPnHp1dl8zk
-TrmFk0lYs1VHGiWcO1T237FHMCfPNNZTjAssxefDOi8dZ8zTjJ/vwpGBP7BXeG+2
-hvpKU98ouLRqCVtOM1IX4FH/WhTct6qrII8kXyuuHcqpUEFyzwEzZt34ujG9JKUj
-cN/WBv3OAg+UWToOJOmpgw2q2GRXGxHkBggSgv7oIs3ptwQCO/5pof0W1pL/khKh
-uUc4HZ0Cx2KFxI4uGbAQwDkftcqJn7Xub964Wqw1lz4pCm+rH392yVveWz9PomPF
-duj/KsjQa5Eg7GAJCMvSo54y1MjLL8tBMBc0yi5t7tCRYqwO+1sZRmmcki0QtYJq
-PEXFYSYoleUyVfvwLTxFNU2f5f7QaPq9GsuE/jwrK9uaKQa9zE3+UHnlyqk+eyyo
-AulaGQykzecpQZcROeK53XXj4r9elqI1QW04qQgcoZWquJbnj+PPUbKKuZED30EH
-tHHtnjX9lPS3fqgW6cPg
-=asua
+iQIcBAEBCAAGBQJUWwn4AAoJEPGu1DbS6WIAQj0P/2ZrwLfkYWndmE+kFoxqkpxQ
+dwaNArpn1C//CqoGbVouo7E4XclhtBNWMkP8K+SrLDG2NZqTC45gg8GVLwfPcgBh
+T+nSqK4zhhIQnMKVAHPA0HtqhbJ+pouhTJj//zFO58eIVdanyy2fRHoSEdgvVBeN
+8g5cC6barg6iJU01R0/uh8JeStw6eLNdIWA/yOXhpQI42xkXbYhOYPPpipnx3rlV
+NTllRJfv/k8S7cIvvSK9YKp6vKXsCLWWGCaQ5wddMjw/Zb66DIB+gZTEd9COTve+
+2ho4Qhn3w9I4R+jQlxbfacjgYHpo57NzssKmlNt6P+grooEJFkYM8/YAkMu5KQ3Z
+iE84F4GTtm1MR2S6ISh6zYYRNMx1beP20VIGIQ1srhZK+i5Fc95rwc5+4GTi4pQZ
+pbOlclYmfh7PkLKm4Jg+otiDyN8CJJbpVdRfCF8gljen3EYDzzamFN1rbUibSIjz
+BVOusvM0PY3gmITju+Olbeoinq975RwQghK7ClhJBpm6/z5zOkyUiHN7BXbnqYGW
+fj3itVd96XBmz4oDloKfX/HhwgC+JdUAlFcwQnZ52x0Gfo3iE762hIxX24/pl2MI
+x7u/V4TqNi3vuraxBn6HBGXtd4OsX9dkUAmQ6G9W1rMKjga0PVJ4IEDffXv2pIHF
+BCLNQno1lN8nNVl/YtrL
+=2gc4
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild
index 3c5d06bbb745..08cf95afed17 100644
--- a/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild,v 1.7 2014/11/05 16:22:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild,v 1.8 2014/11/06 05:41:10 vapier Exp $
 
 EAPI=5
 inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
@@ -18,7 +18,8 @@ IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig
 
 RESTRICT="perl? ( userpriv )"
 
-RDEPEND="dev-libs/libltdl
+# Drop the libtool dep once libltdl goes stable.
+RDEPEND="|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )
 	autotrace? ( >=media-gfx/autotrace-0.31.1 )
 	bzip2? ( app-arch/bzip2 )
 	corefonts? ( media-fonts/corefonts )
diff --git a/media-gfx/imagemagick/imagemagick-6.8.9.7.ebuild b/media-gfx/imagemagick/imagemagick-6.8.9.7.ebuild
index 0934a0f0383e..445f09a8d2cc 100644
--- a/media-gfx/imagemagick/imagemagick-6.8.9.7.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.8.9.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.9.7.ebuild,v 1.4 2014/11/05 16:22:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.9.7.ebuild,v 1.5 2014/11/06 05:41:10 vapier Exp $
 
 EAPI=5
 inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
@@ -18,7 +18,7 @@ IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig
 
 RESTRICT="perl? ( userpriv )"
 
-RDEPEND="dev-libs/libltdl
+RDEPEND="dev-libs/libltdl:0
 	autotrace? ( >=media-gfx/autotrace-0.31.1 )
 	bzip2? ( app-arch/bzip2 )
 	corefonts? ( media-fonts/corefonts )
diff --git a/media-gfx/imagemagick/imagemagick-6.8.9.8.ebuild b/media-gfx/imagemagick/imagemagick-6.8.9.8.ebuild
index b35121a34f1e..4c40fb2e8e35 100644
--- a/media-gfx/imagemagick/imagemagick-6.8.9.8.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.8.9.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.9.8.ebuild,v 1.2 2014/11/05 16:22:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.9.8.ebuild,v 1.3 2014/11/06 05:41:10 vapier Exp $
 
 EAPI=5
 inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
@@ -18,7 +18,7 @@ IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig
 
 RESTRICT="perl? ( userpriv )"
 
-RDEPEND="dev-libs/libltdl
+RDEPEND="dev-libs/libltdl:0
 	autotrace? ( >=media-gfx/autotrace-0.31.1 )
 	bzip2? ( app-arch/bzip2 )
 	corefonts? ( media-fonts/corefonts )
diff --git a/media-gfx/imagemagick/imagemagick-6.8.9.9.ebuild b/media-gfx/imagemagick/imagemagick-6.8.9.9.ebuild
index 7ea6d237965c..174f39564c4c 100644
--- a/media-gfx/imagemagick/imagemagick-6.8.9.9.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.8.9.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.9.9.ebuild,v 1.9 2014/11/05 16:22:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.9.9.ebuild,v 1.10 2014/11/06 05:41:10 vapier Exp $
 
 EAPI=5
 inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
@@ -18,7 +18,8 @@ IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig
 
 RESTRICT="perl? ( userpriv )"
 
-RDEPEND="dev-libs/libltdl
+# Drop the libtool dep once libltdl goes stable.
+RDEPEND="|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )
 	autotrace? ( >=media-gfx/autotrace-0.31.1 )
 	bzip2? ( app-arch/bzip2 )
 	corefonts? ( media-fonts/corefonts )