diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2015-02-17 00:00:24 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2015-02-17 00:00:24 +0000 |
| commit | da2ae3982cd6bbe2cc6e44d1e1ebe1b5a12ce948 (patch) | |
| tree | 1531ef02f8d03752189d5490d6d2ba19e1350624 /sys-apps/pciutils | |
| parent | sys-apps/pciutils now has native multilib support (diff) | |
| download | historical-da2ae3982cd6bbe2cc6e44d1e1ebe1b5a12ce948.tar.gz historical-da2ae3982cd6bbe2cc6e44d1e1ebe1b5a12ce948.tar.bz2 historical-da2ae3982cd6bbe2cc6e44d1e1ebe1b5a12ce948.zip | |
Prevent file collision with emul-linux-x86-baselibs
Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D
Diffstat (limited to 'sys-apps/pciutils')
| -rw-r--r-- | sys-apps/pciutils/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/pciutils/Manifest | 28 | ||||
| -rw-r--r-- | sys-apps/pciutils/pciutils-3.3.0-r2.ebuild | 8 |
3 files changed, 29 insertions, 13 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/Manifest b/sys-apps/pciutils/Manifest index 898ee6c37f52..f35803fc300f 100644 --- a/sys-apps/pciutils/Manifest +++ b/sys-apps/pciutils/Manifest @@ -10,17 +10,25 @@ DIST pciutils-3.3.0.tar.gz 424967 SHA256 4b576a1c2570046fda83fa2c5488661de698874 EBUILD pciutils-3.2.0.ebuild 2353 SHA256 1ac7212f396e6c218569cda57684f3248d871742ddcdc0eda9c29c82f211721b SHA512 c1c6960087a88a218ce110b88f3a8345eb76ef9b5fbc438e45f070b2d91724588b0644ad28454accc4b306ebcffb5293ba81063424a42ee62580393f2c2eab05 WHIRLPOOL d69c484efa630c65b6e1aa0a3438ec908145d8d87bf499fd81b603506cac0640e65e1b033350b37935b273c9a5cd9eefb6699b08cbfd9828db3ba77497670c8c EBUILD pciutils-3.2.1.ebuild 2373 SHA256 a0e93da5617f00df6f2f3f90c80fc3c35ae585b118098b2d6ebe80922b0f8638 SHA512 a13853ae95a2ba0c7914eac16b2c28270bf9f23050d3c418224334f3910ae9f131b673dc033ac9718fbcec0955325ade03675d07d85097d5b7f64e1e6d51f0eb WHIRLPOOL 5d6d90fe665a69afb4f7c677357d9ea589b56931eae247314e220efe3d45877d7165053345c9b7e1f1850f11507cadd3afaf668987d99b8ffa426da6fe710425 EBUILD pciutils-3.3.0-r1.ebuild 2573 SHA256 5d77c3580909665f335e178d6612e47a7099d17553757a3a6687a5ca0335e3b7 SHA512 36bbcb6cdc7cc602a6121df2f234b05a5a509a763266729cf3e188de2038ba5d2b07798c7bb57c04cc08dba6a85a03974c89b290e98323abb8212019de9394fb WHIRLPOOL 0fe1322e3b375f66ccc0d4e4aea551406864cdc351cc8f98aa32893a2e72e2c29ff5549716bcb85999d7ac132a40cfb362b0cf34ff434f47ab281472c6eb160f -EBUILD pciutils-3.3.0-r2.ebuild 2890 SHA256 95fc7367fb9794af3b11ed48cc155202a00f8ef903c13b72527cadeaa66efe64 SHA512 48ba707b767c0db672a0ef5579e3ea8b20f12f3262950cbeff665f36cb2650ac921bd282b064820ba8a29751a7a677d177eec457723910b0ff8eb0c11d9392f3 WHIRLPOOL 0c1ac4ef62b5dd73876b8ae12a1bc0f9673867513480e24b22fad385386770fe36265922f4c227c55a3d175aa4f24e226b9a866213570cceba3668aab830f6c2 -MISC ChangeLog 30975 SHA256 06495dadcc24562aaeef7490c5e2e7a6653ac4af8d7548d3a4c118e2e1fb7fac SHA512 c5cc3cb7d9a38d679f089dcc13ab935f03d00ad3d80ff30c501badfb5f05d3d79ac88170f8978fa9b7ee6eb64a5b1985c83c71de2559062cc20025da60858d08 WHIRLPOOL 87897a5252505c9319393f61d98e94f3789c2d1cd4d6ba059cc1f2669f8402ec411463e32e7423ef60d0063c30c41265bfb1c385719dd6d349cecd8e2f189c5b +EBUILD pciutils-3.3.0-r2.ebuild 3024 SHA256 2eb91234d6e3abf1d05fc7c09ec9235c796f8da95744af21ac2e83374d4d60d0 SHA512 5a3aa5b7f604a924227d38c3bc2e766fa7cf9fe9f891bba1802594234471708716129a3ec5ae4a4e29758d7bb5f50a1ef36680d84d502d54b70a4cdffc60ca3d WHIRLPOOL 6b96eaab93b0ff700a0efcfc418b0cb0526c2be29dd281c272ea7f3a4c48797edb155fb4defa963d1e5331259f4ba2f9dcca355c6c435df577ebd3a474425718 +MISC ChangeLog 31120 SHA256 4cf8ead446c11f3b5251717450352dfa685e4471773c63a49e3ceaddd3156c86 SHA512 e3240ca8d249b5b4e08e5399fdf0e6fce23e1544af2615d45ed7995d409947256a119563a27fe7cedbc6f59af2a3c6ee8540dcf6341da7da4822f574eb30dffa WHIRLPOOL 6ab4f9fe740570a574112f2dda9d0162cc4e251746ddbc7ef211a1df9dd049caf91f0120f825fa040e5fe80c6addcf0ae2a864d71a4588f51e39623b14496997 MISC metadata.xml 441 SHA256 3b59e464a347f70ba8253b0dfe68d2782bedcce66d6463cb70ca8d726b51ff7a SHA512 11928700ad20848f7218d6206b65619005d4c9552b0ae65f66ae7d3c21539b2fca664ea46e6d2f47553e3de6e25a5d89e4c9d4eb41fea358016e1549472934e0 WHIRLPOOL 6b8388c472839846d0bf04b8329e71f1acf787c465ff60e1d7abb7717fe717f1cff14e495ec9b6b9de6169b71a7546b22519cd38bcc8472f7090c7a996d2d7ec -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iQEcBAEBCAAGBQJU4Vb0AAoJEOeBhlrCAAWGgIsH/Rba5t0P23n2hL5aiF5t4+9n -EFqeIZolYmXRnAnrlcweProoajwW9RWjh4eNrNsgjdWYhGQN9qkjF7XXg0jOgMiR -Tm8AuV3xbvNvg385lpW5wOgjr7mYWsrfzgZd9PFIFKBczLOEGyJRPN1nPKFe/eMX -pwJPtuwS/Vyt+dCy1N/pTCWYK7BexlVVexK2+GZEeaUw7BhGDZ8RfhdS2nuEFYSJ -bsh8ph6+h61hcZ7f6kva90o305qvqXoce7bXB3Gp5ziI1h0qRqNEW6DAqWCzkvJG -6PQ+SfO5pbs9BdvbcZePYiUbaGiIDjfzQsFhN1OBwPNIvfreo6LoIipyrbhSyb8= -=kH64 +iQJ8BAEBCABmBQJU4oSUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx +OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNmkMP/2d5yBmC67tMXXDbHFcr/+Aw +XFYGYDUcMSD++XuqoDljOSaNRek0/2d2pz6RiG1epsdkYykJGIjoo+ABV4E0CdTt +y6AiQmvUqHWp8+NZe/ckWvh8TqRBwmZ+dma0gtUOQMaYuqrREvtUUUiQ5xVyc3r1 +rcwd8KMQAKMTfsp28H4Bs01SNsbGDA/Zz7amIj8Q+jkP/kb4Cd7A3IQnQjyI8Njo +JuisSn6PQRryFZruFZxwHPE1mxm/mLvjhile81ni9ReWzwMJDmthvhraLqeziHhX +7okWfCojxrg67LmYoB8ZVLwl4fISo9/3o5IpqiPSkYefa1gpa66+9/lpwt9GgLNu +2l7oTEssZWOAjiDDFWD4XGwREzBW6UA7jgcLbxn5aZ0Gr3Y6EyzNBBzsCNJFuw4Q +63l4+U0JFcf6gsvyXCoM/3+9pGO5P/4w3imlvaOceuH+WHE5l8ynwhCJ72vNpt0F +4vheaPqXqKWav+lgeDj8IAE6cJGfK3lkdB0bEvxM+JD+ab62RbQCEF5h3UKAyB2r +13qaJpcP3AGwcbpPxs7UO2/qSZpwjens6uvRDNnyMuLx5cCcPZoVy0DRpEQQc07i +mQ80KoF4KytNLjfaA+AReVVYcONZnF1IszMkjtf8g7zG3So2nzEweMN/5KfzUgOp +pJyDCdUsDaELyVbz5jTA +=H+Ey -----END PGP SIGNATURE----- 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 )" |