Fix dependencies on util-linux with USE=static (bug #410251, thanks to Fernando V.).

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

5 files changed, 21 insertions, 12 deletions

diff --git a/sys-fs/xfsprogs/ChangeLog b/sys-fs/xfsprogs/ChangeLog
index 2d6cace61d61..2991f695ee97 100644
--- a/sys-fs/xfsprogs/ChangeLog
+++ b/sys-fs/xfsprogs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/xfsprogs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.140 2012/03/25 16:29:31 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.141 2012/03/30 17:06:50 flameeyes Exp $
+
+  30 Mar 2012; Diego E. Pettenò <flameeyes@gentoo.org> xfsprogs-3.1.4.ebuild,
+  xfsprogs-3.1.5.ebuild, xfsprogs-3.1.6.ebuild, xfsprogs-3.1.7.ebuild:
+  Fix dependencies on util-linux with USE=static (bug #410251, thanks to
+  Fernando V.).
 
   25 Mar 2012; Markus Meier <maekke@gentoo.org> xfsprogs-3.1.7.ebuild:
   arm stable, bug #408021
diff --git a/sys-fs/xfsprogs/xfsprogs-3.1.4.ebuild b/sys-fs/xfsprogs/xfsprogs-3.1.4.ebuild
index ba1d61c7a547..0f710bc17d1a 100644
--- a/sys-fs/xfsprogs/xfsprogs-3.1.4.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-3.1.4.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/sys-fs/xfsprogs/xfsprogs-3.1.4.ebuild,v 1.6 2011/03/30 16:11:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.1.4.ebuild,v 1.7 2012/03/30 17:06:50 flameeyes Exp $
 
 EAPI="3"
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
 IUSE="libedit nls readline static static-libs"
 
-RDEPEND=">=sys-apps/util-linux-2.17.2
+RDEPEND="!static? ( >=sys-apps/util-linux-2.17.2 )
 	!<sys-fs/xfsdump-3
 	readline? (
 		sys-libs/readline
@@ -24,6 +24,7 @@ RDEPEND=">=sys-apps/util-linux-2.17.2
 	)
 	!readline? ( libedit? ( dev-libs/libedit ) )"
 DEPEND="${RDEPEND}
+	static? ( || ( sys-apps/util-linux[static-libs] <sys-apps/util-linux-2.20 ) )
 	nls? ( sys-devel/gettext )"
 
 pkg_setup() {
diff --git a/sys-fs/xfsprogs/xfsprogs-3.1.5.ebuild b/sys-fs/xfsprogs/xfsprogs-3.1.5.ebuild
index b199f9286aaa..da2bee260bf3 100644
--- a/sys-fs/xfsprogs/xfsprogs-3.1.5.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-3.1.5.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/sys-fs/xfsprogs/xfsprogs-3.1.5.ebuild,v 1.1 2011/04/12 17:25:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.1.5.ebuild,v 1.2 2012/03/30 17:06:50 flameeyes Exp $
 
 EAPI="3"
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE="libedit nls readline static static-libs"
 
-RDEPEND=">=sys-apps/util-linux-2.17.2
+RDEPEND="!static? ( >=sys-apps/util-linux-2.17.2 )
 	!<sys-fs/xfsdump-3
 	readline? (
 		sys-libs/readline
@@ -24,6 +24,7 @@ RDEPEND=">=sys-apps/util-linux-2.17.2
 	)
 	!readline? ( libedit? ( dev-libs/libedit ) )"
 DEPEND="${RDEPEND}
+	static? ( || ( sys-apps/util-linux[static-libs] <sys-apps/util-linux-2.20 ) )
 	nls? ( sys-devel/gettext )"
 
 pkg_setup() {
diff --git a/sys-fs/xfsprogs/xfsprogs-3.1.6.ebuild b/sys-fs/xfsprogs/xfsprogs-3.1.6.ebuild
index 52ac7d0799b2..b8dcb773178a 100644
--- a/sys-fs/xfsprogs/xfsprogs-3.1.6.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-3.1.6.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/sys-fs/xfsprogs/xfsprogs-3.1.6.ebuild,v 1.1 2011/11/06 04:56:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.1.6.ebuild,v 1.2 2012/03/30 17:06:50 flameeyes Exp $
 
 EAPI="3"
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE="libedit nls readline static static-libs"
 
-RDEPEND=">=sys-apps/util-linux-2.17.2
+RDEPEND="!static? ( >=sys-apps/util-linux-2.17.2 )
 	!<sys-fs/xfsdump-3
 	readline? (
 		sys-libs/readline
@@ -24,6 +24,7 @@ RDEPEND=">=sys-apps/util-linux-2.17.2
 	)
 	!readline? ( libedit? ( dev-libs/libedit ) )"
 DEPEND="${RDEPEND}
+	static? ( || ( sys-apps/util-linux[static-libs] <sys-apps/util-linux-2.20 ) )
 	nls? ( sys-devel/gettext )"
 
 pkg_setup() {
diff --git a/sys-fs/xfsprogs/xfsprogs-3.1.7.ebuild b/sys-fs/xfsprogs/xfsprogs-3.1.7.ebuild
index 10c226c08e71..cf4b176b3cf7 100644
--- a/sys-fs/xfsprogs/xfsprogs-3.1.7.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-3.1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.1.7.ebuild,v 1.6 2012/03/25 16:29:31 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.1.7.ebuild,v 1.7 2012/03/30 17:06:50 flameeyes Exp $
 
 EAPI="3"
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86"
 IUSE="libedit nls readline static static-libs"
 
-RDEPEND=">=sys-apps/util-linux-2.17.2
+RDEPEND="!static? ( >=sys-apps/util-linux-2.17.2 )
 	!<sys-fs/xfsdump-3
 	readline? (
 		sys-libs/readline
@@ -24,6 +24,7 @@ RDEPEND=">=sys-apps/util-linux-2.17.2
 	)
 	!readline? ( libedit? ( dev-libs/libedit ) )"
 DEPEND="${RDEPEND}
+	static? ( || ( sys-apps/util-linux[static-libs] <sys-apps/util-linux-2.20 ) )
 	nls? ( sys-devel/gettext )"
 
 pkg_setup() {