tetromino 15/02/17 00:00:19 Modified: ChangeLog pciutils-3.3.0-r2.ebuild Log: Prevent file collision with emul-linux-x86-baselibs (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)
Revision Changes Path 1.236 sys-apps/pciutils/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/pciutils/ChangeLog?rev=1.236&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/pciutils/ChangeLog?rev=1.236&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/pciutils/ChangeLog?r1=1.235&r2=1.236 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v retrieving revision 1.235 retrieving revision 1.236 diff -u -r1.235 -r1.236 --- ChangeLog 16 Feb 2015 02:33:21 -0000 1.235 +++ ChangeLog 17 Feb 2015 00:00:19 -0000 1.236 @@ -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 <[email protected]> + pciutils-3.3.0-r2.ebuild: + Prevent file collision with emul-linux-x86-baselibs *pciutils-3.3.0-r2 (16 Feb 2015) 1.2 sys-apps/pciutils/pciutils-3.3.0-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/pciutils/pciutils-3.3.0-r2.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/pciutils/pciutils-3.3.0-r2.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/pciutils/pciutils-3.3.0-r2.ebuild?r1=1.1&r2=1.2 Index: pciutils-3.3.0-r2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.3.0-r2.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pciutils-3.3.0-r2.ebuild 16 Feb 2015 02:33:21 -0000 1.1 +++ pciutils-3.3.0-r2.ebuild 17 Feb 2015 00:00:19 -0000 1.2 @@ -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 @@ !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 )"
