Turn binutils dep into a blocker, and put it behind USE=test.

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

6 files changed, 26 insertions, 22 deletions

diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog
index 2cb939a9c56f..1f13d24d85e6 100644
--- a/sys-devel/libtool/ChangeLog
+++ b/sys-devel/libtool/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/libtool
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.193 2011/09/24 06:39:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.194 2011/10/04 20:42:26 vapier Exp $
+
+  04 Oct 2011; Mike Frysinger <vapier@gentoo.org> libtool-2.2.10.ebuild,
+  libtool-2.4-r1.ebuild, libtool-2.4-r3.ebuild, libtool-9999.ebuild:
+  Turn binutils dep into a blocker, and put it behind USE=test.
 
 *libtool-2.4-r3 (24 Sep 2011)
 
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index d2d81ca9714d..e712a93d3940 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -14,16 +14,16 @@ DIST libtool-2.4.tar.xz 852248 RMD160 4955976ce1c7045ef725fbf4e05060f9bd33434b S
 EBUILD libtool-1.3.5.ebuild 799 RMD160 bb09cafcba1207d86571df43f1a0af6d594f40e3 SHA1 bd417f8a14152bc358c4724426ed7e6103349b5a SHA256 e954a743ece6084861556a273038c9c2fb4bd33e611cfb5359877cda183a0523
 EBUILD libtool-1.5.26-r1.ebuild 759 RMD160 59eaf949c33f58e014cb2a167309ab8d2f03630b SHA1 2700986bc166fcee998cd1e58a5549471afdfcef SHA256 c7394bc596fc888c399e1abcc9576a9dab3f911a351cc4c5d3e4e67048799798
 EBUILD libtool-1.5.26.ebuild 2837 RMD160 01e8a0bd7256d2aeda34e2f7791baba3fb979b02 SHA1 f9ec3c2ffb6d85610db75ffbb95e611e45a7576e SHA256 faf95db0c3e14440410e543a28a1d824c176e72a7f6091bd93f72bf9e74e707a
-EBUILD libtool-2.2.10.ebuild 1822 RMD160 38024b97a085f966d620f3a44ccd642e58af90ac SHA1 bc74836cd7f257811b88510d8a4eb0c82dcd4077 SHA256 338ae2f58f5c86338c3af4bc452d583a1ec4fed22707392a82b974a573395171
-EBUILD libtool-2.4-r1.ebuild 1856 RMD160 2f06fbaecce32fe38bd7c7d4af27e0d627df7670 SHA1 8b124eca396b9d14d7417b759eaec123056c89f6 SHA256 82e228a1979e516e2e7e3f08b0ecaff3a63f3a13bc1837d803bfa8c75f810c88
-EBUILD libtool-2.4-r3.ebuild 2453 RMD160 4e20e531e49a629a6d676ca4625b89c5147b01c8 SHA1 aabc276aca78f84ca1f41d67826908d5608bfe82 SHA256 4034cb3a6291cf91e5a7e327429a4ea251159dc247c57ed5701fa1f11302885f
-EBUILD libtool-9999.ebuild 2365 RMD160 a4e92631105bee99385c5d2d104572bcf4d66084 SHA1 dc75f71ec65315b31f113cbd47379bfb4f0844f4 SHA256 b70c9da74dd41e930854b67844d0b8a2bc5aeaead18b3ec8d4aef8e1d005cd38
-MISC ChangeLog 28826 RMD160 7a51a6cc393c8dfb44a77009d49f62645e16e8c4 SHA1 2dd004f88d56e932fb63a60273fa78bf6cffdf1a SHA256 9aeb0294c1242932e6ca5a9790f77230681bebdc9d953890a785b3bdd7aa149d
+EBUILD libtool-2.2.10.ebuild 1810 RMD160 194d25736763a21833e4472d26852aac15245969 SHA1 c9ce961c6397ff8a57a6183409c9916cc9ebf45b SHA256 7e287f68cc01dbcd2161f8b8e5704b30cbc844ad8d7bbc677271476f47268e24
+EBUILD libtool-2.4-r1.ebuild 1872 RMD160 c5af813e26426b822353988c95c6ac9d8d012049 SHA1 0ae0a0cbb962ae3175ba1597423ba576482d0942 SHA256 f4389cf4491d4ba03cf93b1bef73be71ca15715c1bc55dcd03bece80dfd0388b
+EBUILD libtool-2.4-r3.ebuild 2468 RMD160 7255d2102ffbb4759001ad9cdc27562c0c3e8e21 SHA1 ba9042263a5e8c85ca4070eb2ad0e2564cb67657 SHA256 eb051e1339aca6e4f601a3ac5973d6dcd7ae821ee1605bb257bbb43d8740242b
+EBUILD libtool-9999.ebuild 2380 RMD160 4690eb3b4b163a8fa55736440794111c15a827fa SHA1 ebf1ba411ef4454c004716a0228d5a42284051dd SHA256 664aa578308dba47139db28fa1982490406763f778d86e46f70d744ba0f8458a
+MISC ChangeLog 29033 RMD160 a8504d149f68d2a0cdf232abd4b244d5e8ca63d8 SHA1 640681309b8597476da617c1ee34786ac06681ba SHA256 e3c87951d37acf70036ccf4f2168c35ad69bbdeee88bb72b1ccda1abe0fcce78
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk59exEACgkQaC/OocHi7JazGwD8CHijvce53Uup1YojY8ASHo0U
-L8bRYeNfQTsyhhhpm68A/04d64WeSxKcuY9oHtXewwg5CEIn+nQQ4YN2NSF5gqKk
-=V3+p
+iF4EAREIAAYFAk6Lb5sACgkQaC/OocHi7JYJWAEAlUBVDm/vBTkHb8Rhmukk99IZ
+9ZNics4DQLvkAK5qY4UBAKChL+B1pVO84/dlzKBxVaPgnvqa55mj3I8U2R3AeIVJ
+=EQXk
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/libtool/libtool-2.2.10.ebuild b/sys-devel/libtool/libtool-2.2.10.ebuild
index ef854d16a3f6..3136fca7e98f 100644
--- a/sys-devel/libtool/libtool-2.2.10.ebuild
+++ b/sys-devel/libtool/libtool-2.2.10.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/sys-devel/libtool/libtool-2.2.10.ebuild,v 1.12 2011/08/22 18:20:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.2.10.ebuild,v 1.13 2011/10/04 20:42:26 vapier Exp $
 
 EAPI="2" #356089
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.lzma"
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="vanilla"
+IUSE="test vanilla"
 
 RDEPEND="sys-devel/gnuconfig
 	>=sys-devel/autoconf-2.62
@@ -23,8 +23,8 @@ RDEPEND="sys-devel/gnuconfig
 	!=sys-devel/automake-1.10
 	!=sys-devel/libtool-2*:1.5"
 DEPEND="${RDEPEND}
-	>=sys-devel/binutils-2.20
-	|| ( app-arch/xz-utils app-arch/lzma-utils )"
+	test? ( !<sys-devel/binutils-2.20 )
+	app-arch/xz-utils"
 
 src_prepare() {
 	if ! use vanilla ; then
diff --git a/sys-devel/libtool/libtool-2.4-r1.ebuild b/sys-devel/libtool/libtool-2.4-r1.ebuild
index f3076903e29e..c5b73ee78f99 100644
--- a/sys-devel/libtool/libtool-2.4-r1.ebuild
+++ b/sys-devel/libtool/libtool-2.4-r1.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/sys-devel/libtool/libtool-2.4-r1.ebuild,v 1.9 2011/08/22 18:20:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.4-r1.ebuild,v 1.10 2011/10/04 20:42:26 vapier Exp $
 
 EAPI="2" #356089
 
@@ -15,14 +15,14 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="vanilla"
+IUSE="test vanilla"
 
 RDEPEND="sys-devel/gnuconfig
 	!<sys-devel/autoconf-2.62:2.5
 	!<sys-devel/automake-1.11.1:1.11
 	!=sys-devel/libtool-2*:1.5"
 DEPEND="${RDEPEND}
-	>=sys-devel/binutils-2.20
+	test? ( !<sys-devel/binutils-2.20 )
 	app-arch/xz-utils"
 
 src_unpack() {
diff --git a/sys-devel/libtool/libtool-2.4-r3.ebuild b/sys-devel/libtool/libtool-2.4-r3.ebuild
index 155795939c6a..e171fe37ba4f 100644
--- a/sys-devel/libtool/libtool-2.4-r3.ebuild
+++ b/sys-devel/libtool/libtool-2.4-r3.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/sys-devel/libtool/libtool-2.4-r3.ebuild,v 1.1 2011/09/24 06:39:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.4-r3.ebuild,v 1.2 2011/10/04 20:42:26 vapier Exp $
 
 EAPI="2" #356089
 
@@ -22,14 +22,14 @@ HOMEPAGE="http://www.gnu.org/software/libtool/"
 
 LICENSE="GPL-2"
 SLOT="2"
-IUSE="static-libs vanilla"
+IUSE="static-libs test vanilla"
 
 RDEPEND="sys-devel/gnuconfig
 	!<sys-devel/autoconf-2.62:2.5
 	!<sys-devel/automake-1.11.1:1.11
 	!=sys-devel/libtool-2*:1.5"
 DEPEND="${RDEPEND}
-	>=sys-devel/binutils-2.20
+	test? ( !<sys-devel/binutils-2.20 )
 	app-arch/xz-utils"
 [[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man"
 
diff --git a/sys-devel/libtool/libtool-9999.ebuild b/sys-devel/libtool/libtool-9999.ebuild
index 7f1555b04a7c..68a3cfe425c8 100644
--- a/sys-devel/libtool/libtool-9999.ebuild
+++ b/sys-devel/libtool/libtool-9999.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/sys-devel/libtool/libtool-9999.ebuild,v 1.8 2011/09/24 06:39:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-9999.ebuild,v 1.9 2011/10/04 20:42:26 vapier Exp $
 
 EAPI="2" #356089
 
@@ -22,13 +22,13 @@ HOMEPAGE="http://www.gnu.org/software/libtool/"
 
 LICENSE="GPL-2"
 SLOT="2"
-IUSE="static-libs vanilla"
+IUSE="static-libs test vanilla"
 
 RDEPEND="sys-devel/gnuconfig
 	>=sys-devel/autoconf-2.65
 	>=sys-devel/automake-1.11.1"
 DEPEND="${RDEPEND}
-	>=sys-devel/binutils-2.20
+	test? ( !<sys-devel/binutils-2.20 )
 	app-arch/xz-utils"
 [[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man"