diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2015-02-17 00:00:19 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2015-02-17 00:00:19 +0000 |
| commit | aec1e7e62747536754b1b15e314ea2eb23edc7c2 (patch) | |
| tree | 8cd180299af2a5e0d43b6baa1da143f99dcad449 /sys-apps | |
| parent | sys-apps/pciutils now has native multilib support (diff) | |
| download | gentoo-2-aec1e7e62747536754b1b15e314ea2eb23edc7c2.tar.gz gentoo-2-aec1e7e62747536754b1b15e314ea2eb23edc7c2.tar.bz2 gentoo-2-aec1e7e62747536754b1b15e314ea2eb23edc7c2.zip | |
Prevent file collision with emul-linux-x86-baselibs
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/pciutils/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/pciutils/pciutils-3.3.0-r2.ebuild | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog index d3478c553fb9..b6505621a6ed 100644 --- a/sys-apps/pciutils/ChangeLog +++ b/sys-apps/pciutils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/pciutils # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.235 2015/02/16 02:33:21 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.236 2015/02/17 00:00:19 tetromino Exp $ + + 16 Feb 2015; Alexandre Rostovtsev <tetromino@gentoo.org> + pciutils-3.3.0-r2.ebuild: + Prevent file collision with emul-linux-x86-baselibs *pciutils-3.3.0-r2 (16 Feb 2015) diff --git a/sys-apps/pciutils/pciutils-3.3.0-r2.ebuild b/sys-apps/pciutils/pciutils-3.3.0-r2.ebuild index 19eb41a733a5..ff1b75421a48 100644 --- a/sys-apps/pciutils/pciutils-3.3.0-r2.ebuild +++ b/sys-apps/pciutils/pciutils-3.3.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.3.0-r2.ebuild,v 1.1 2015/02/16 02:33:21 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.3.0-r2.ebuild,v 1.2 2015/02/17 00:00:19 tetromino Exp $ EAPI="5" @@ -23,7 +23,11 @@ DEPEND="kmod? ( sys-apps/kmod ) !static-libs? ( ${LIB_DEPEND//static-libs(+),} ) udev? ( >=virtual/libudev-208[${MULTILIB_USEDEP}] )" RDEPEND="${DEPEND} - sys-apps/hwids" + sys-apps/hwids + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20140508-r14 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + )" DEPEND="${DEPEND} kmod? ( virtual/pkgconfig )" |