gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-23 16:49:10 -07:00
Code Issues Projects Releases Wiki Activity

sys-apps/pciutils: update lib deps

Browse Source 
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.
This commit is contained in:
Mike Frysinger
2016-11-10 00:33:20 -05:00
parent b0df990f50
commit 2eedc084d9
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
profiles/targets/systemd/package.use.mask
View File

@@ -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

14
sys-apps/pciutils/pciutils-3.5.2.ebuild
View File

@@ -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 )"