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

(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)

5 files changed, 18 insertions, 14 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/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"