diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-04-27 03:11:35 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-04-27 03:11:35 +0000 |
| commit | 848d5e577fb5db166dcbac99ac7361f1f0f30a1f (patch) | |
| tree | 5bbd89f1a2d028d686bd3cd8b334755bfb701d60 /sys-apps/pciutils | |
| parent | Version bump to 10.0.4 (diff) | |
| download | gentoo-2-848d5e577fb5db166dcbac99ac7361f1f0f30a1f.tar.gz gentoo-2-848d5e577fb5db166dcbac99ac7361f1f0f30a1f.tar.bz2 gentoo-2-848d5e577fb5db166dcbac99ac7361f1f0f30a1f.zip | |
Make sure USE=static-libs requires zlib[static-libs] accordingly.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/pciutils')
| -rw-r--r-- | sys-apps/pciutils/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-apps/pciutils/pciutils-3.1.9-r2.ebuild | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog index 5dc45fe098f4..9669fc71dc81 100644 --- a/sys-apps/pciutils/ChangeLog +++ b/sys-apps/pciutils/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/pciutils # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.200 2012/04/24 14:43:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.201 2012/04/27 03:11:35 vapier Exp $ + + 27 Apr 2012; Mike Frysinger <vapier@gentoo.org> pciutils-3.1.9-r2.ebuild: + Make sure USE=static-libs requires zlib[static-libs] accordingly. 24 Apr 2012; Mike Frysinger <vapier@gentoo.org> +files/pciutils-3.1.9-static-pc.patch, pciutils-3.1.9-r1.ebuild, diff --git a/sys-apps/pciutils/pciutils-3.1.9-r2.ebuild b/sys-apps/pciutils/pciutils-3.1.9-r2.ebuild index 0153c0804bcb..1e39a3023878 100644 --- a/sys-apps/pciutils/pciutils-3.1.9-r2.ebuild +++ b/sys-apps/pciutils/pciutils-3.1.9-r2.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/pciutils/pciutils-3.1.9-r2.ebuild,v 1.6 2012/04/24 14:43:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.1.9-r2.ebuild,v 1.7 2012/04/27 03:11:35 vapier Exp $ EAPI="4" @@ -15,7 +15,11 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="static-libs zlib" -DEPEND="zlib? ( sys-libs/zlib )" +# Have the sub-libs in RDEPEND with [static-libs] since, logically, +# our libssl.a depends on libz.a/etc... at runtime. +LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )" +DEPEND="static-libs? ( ${LIB_DEPEND} ) + !static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )" RDEPEND="${DEPEND} sys-apps/hwids" |