commit: 2eedc084d93b84be36a44123f6e51618a919dbc3
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 10 05:33:20 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Nov 10 05:48:33 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2eedc084
sys-apps/pciutils: update lib deps
Newer pciutils links against libudev directly so make sure the static
logic propagates correctly out to it.
Also drop old multilib logic that no longer matters.
profiles/targets/systemd/package.use.mask | 4 ++++
sys-apps/pciutils/pciutils-3.5.2.ebuild | 14 +++++---------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/profiles/targets/systemd/package.use.mask
b/profiles/targets/systemd/package.use.mask
index 9795831..8ee9292 100644
--- a/profiles/targets/systemd/package.use.mask
+++ b/profiles/targets/systemd/package.use.mask
@@ -20,3 +20,7 @@ sys-fs/cryptsetup static static-libs
sys-fs/lvm2 static static-libs
sys-fs/dmraid static
dev-libs/libgudev static-libs
+# These are actually possible, but only if you USE=-udev when building
pciutils.
+# But package.use.mask doesn't have a way to express that, so this profile
loses.
+sys-apps/flashrom static
+sys-apps/pciutils static-libs
diff --git a/sys-apps/pciutils/pciutils-3.5.2.ebuild
b/sys-apps/pciutils/pciutils-3.5.2.ebuild
index 4027319..4d47aa8 100644
--- a/sys-apps/pciutils/pciutils-3.5.2.ebuild
+++ b/sys-apps/pciutils/pciutils-3.5.2.ebuild
@@ -16,18 +16,14 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips
~ppc ~ppc64 ~s390 ~s
IUSE="dns +kmod static-libs +udev 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-1.2.8-r1[static-libs(+),${MULTILIB_USEDEP}] )"
+# our libpci.a depends on libz.a/etc... at runtime.
+LIB_DEPEND="zlib? (
>=sys-libs/zlib-1.2.8-r1[static-libs(+),${MULTILIB_USEDEP}] )
+ udev? ( >=virtual/libudev-208[static-libs(+),${MULTILIB_USEDEP}] )"
DEPEND="kmod? ( sys-apps/kmod )
static-libs? ( ${LIB_DEPEND} )
- !static-libs? ( ${LIB_DEPEND//static-libs(+),} )
- udev? ( >=virtual/libudev-208[${MULTILIB_USEDEP}] )"
+ !static-libs? ( ${LIB_DEPEND//static-libs(+),} )"
RDEPEND="${DEPEND}
- sys-apps/hwids
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140508-r14
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
+ sys-apps/hwids"
DEPEND="${DEPEND}
kmod? ( virtual/pkgconfig )"
