summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-08-18 22:14:00 +0000
committerMike Frysinger <vapier@gentoo.org>2012-08-18 22:14:00 +0000
commit3ff7fc76c72f15e395261392e13c3b6846251ca3 (patch)
tree603f616905f7bd308ac3c8adb983ecb4602bce07 /sys-apps/coreutils
parentStable for x86, wrt bug #431634 (diff)
downloadgentoo-2-3ff7fc76c72f15e395261392e13c3b6846251ca3.tar.gz
gentoo-2-3ff7fc76c72f15e395261392e13c3b6846251ca3.tar.bz2
gentoo-2-3ff7fc76c72f15e395261392e13c3b6846251ca3.zip
Depend on USE=static-libs for lib packages when USE=static #425732 by Christian Ruppert.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/coreutils')
-rw-r--r--sys-apps/coreutils/ChangeLog6
-rw-r--r--sys-apps/coreutils/coreutils-8.18.ebuild12
2 files changed, 12 insertions, 6 deletions
diff --git a/sys-apps/coreutils/ChangeLog b/sys-apps/coreutils/ChangeLog
index 599ecf9323df..d68928a54f5f 100644
--- a/sys-apps/coreutils/ChangeLog
+++ b/sys-apps/coreutils/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/coreutils
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.343 2012/08/18 22:01:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.344 2012/08/18 22:14:00 vapier Exp $
+
+ 18 Aug 2012; Mike Frysinger <vapier@gentoo.org> coreutils-8.18.ebuild:
+ Depend on USE=static-libs for lib packages when USE=static #425732 by
+ Christian Ruppert.
18 Aug 2012; Mike Frysinger <vapier@gentoo.org> coreutils-8.18.ebuild:
Fix static linking #425730 by Christian Ruppert.
diff --git a/sys-apps/coreutils/coreutils-8.18.ebuild b/sys-apps/coreutils/coreutils-8.18.ebuild
index b1ab058ac46c..9e0e8be511bb 100644
--- a/sys-apps/coreutils/coreutils-8.18.ebuild
+++ b/sys-apps/coreutils/coreutils-8.18.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-apps/coreutils/coreutils-8.18.ebuild,v 1.2 2012/08/18 22:01:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-8.18.ebuild,v 1.3 2012/08/18 22:14:00 vapier Exp $
EAPI="3"
@@ -20,11 +20,12 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
IUSE="acl caps gmp nls selinux static userland_BSD vanilla xattr"
-RDEPEND="caps? ( sys-libs/libcap )
- gmp? ( dev-libs/gmp )
+LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
+ caps? ( sys-libs/libcap )
+ gmp? ( dev-libs/gmp[static-libs] )
+ xattr? ( !userland_BSD? ( sys-apps/attr[static-libs] ) )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )
selinux? ( sys-libs/libselinux )
- acl? ( sys-apps/acl )
- xattr? ( !userland_BSD? ( sys-apps/attr ) )
nls? ( >=sys-devel/gettext-0.15 )
!app-misc/realpath
!<sys-apps/util-linux-2.13
@@ -35,6 +36,7 @@ RDEPEND="caps? ( sys-libs/libcap )
!<net-fs/netatalk-2.0.3-r4
!<sci-chemistry/ccp4-6.1.1"
DEPEND="${RDEPEND}
+ static? ( ${LIB_DEPEND} )
app-arch/xz-utils"
src_prepare() {