gentoo resync : 26.11.2017

2 files changed, 27 insertions, 21 deletions

diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index bb265d4c1436..662f1b447380 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -1,12 +1,10 @@
-AUX conf.d-pciparm 988 SHA256 ffdec7d6c510a502d212129d31a9b37c3b9c75393a48a8b1ee6010b7d4aa1887 SHA512 7c3513a9112318736907f4a1f3e94910d59752d8f51cf4f9f8ccd33b563250aca17a507e0937507bd9352d12a2b9a47e7419306908990b21a3460e6527dab6a4 WHIRLPOOL b5954d8897687a0c6d267c9f60feadb692ce637bf294f5b2f8b7eca479cf454ac541a4bfe904d43ff59e5a77a808c1cecd63aa1011817ba61152d7a4664c86ad
-AUX init.d-pciparm 1758 SHA256 783cbb24591fdab3b1f95f1fe8ea2d1b0e4fa1fbf0b55e57ec9d95fb849e3b5d SHA512 c5a527236039edf29f6876d3b07909045dd04e40d863d68014dd96cc021b7b61356470e67541b5b68487d996a299b60b3da46272259f9d0724ea1392e6243646 WHIRLPOOL 020f4e29cd7cca640f7d92241229f86b0ac63fdf3902c95bec3a54dff36b4431c3b4d7a954c22b82ad2956ee0896090bee448ab24599714a463ddd783b0305e5
-AUX pciutils-3.1.9-static-pc.patch 373 SHA256 81f8c664cf844adfe2238f6dc584100340de8781d361cb185035d5928aee82fe SHA512 e20286ae41569236b549d13c703266f920f335609c1ad2e5d67fd1561f9e9c68d4ac1fd530f93a4451ec79a5496ed226b83db0c74935499f44cd47e94eb74f49 WHIRLPOOL 9d5bf04b08a76bb786524e8fdc4de412154340f17dcccf48ebcb7504a6b5feb8a719337489a20dd8d94d77bdeb93e75009f66840a18ec63805d8fe36dc7e1981
+AUX conf.d-pciparm 988 BLAKE2B c51b826806c58411939d8987e103cba5775806abcbf12a9320cdba2d410dde4f2b3198b4e07d3341b2b7fcafcfd6cafea648909bdaa4976703c764d5d4a0e312 SHA512 7c3513a9112318736907f4a1f3e94910d59752d8f51cf4f9f8ccd33b563250aca17a507e0937507bd9352d12a2b9a47e7419306908990b21a3460e6527dab6a4
+AUX init.d-pciparm 1758 BLAKE2B a9dd930da942c73d7a150938b2b58543f517542c4c675334cca8f9eb02b83dad456e36ae1bf77ed8fcc0eac52e0dc638f19a41682fa3e1d3623011d09301945b SHA512 c5a527236039edf29f6876d3b07909045dd04e40d863d68014dd96cc021b7b61356470e67541b5b68487d996a299b60b3da46272259f9d0724ea1392e6243646
+AUX pciutils-3.1.9-static-pc.patch 373 BLAKE2B 39e44412bdde832e9812cd719155f7638d01cd49ebb5be638b2bd10627fe77279c4be79684e13c588b5d3b252eba66dc1a95275d60d40bcf12df46cf8bbdc807 SHA512 e20286ae41569236b549d13c703266f920f335609c1ad2e5d67fd1561f9e9c68d4ac1fd530f93a4451ec79a5496ed226b83db0c74935499f44cd47e94eb74f49
 DIST pciutils-3.4.1.tar.gz 404166 SHA256 0196624282c33a9bcd4bd097d4100271c82af47797ecd7488ef2711fa5f043b2 SHA512 1394647d5e9d324d68bd8bdf4709a438ae06e6a83ded40b9e0026968c032f214073bc764fbf59e15da90b2e424d90dc430db5810d7ff5fbeab0f3e5c6250ee49 WHIRLPOOL 4391c84695dc1f0844129ff5d6056ac1332d855824e1b96ec105073b97d453db21e82d2a071f1bf7d977e26cf51421183b5a37d5a962bccbed9c2667c813cc4c
-DIST pciutils-3.5.4.tar.gz 423997 SHA256 1a650f10170423371d481c580071c27420b16a40eda995f3e906b8a9ade530c5 SHA512 cd3ed843b8b2a31f92234be6a59bb02cd5268afad7e353872f588df281984af5129b4a9e363332bcf173dd71fda2091e501237fbd4fc39575cfe0472456d4a34 WHIRLPOOL 4a99d7c95cebc42a369bd51db1f7682dd0c49ecf8023558781fb62dc57431a4993f41e01f2d128c99bb312e5d1d2fa97f653ae5dd6ee10f112aa5bded676ddfe
 DIST pciutils-3.5.5.tar.gz 437331 SHA256 58ad27f25c510598bdc5337160c8b573d6e9b328b3c5235636e89a1cc04d6a48 SHA512 b2c89e1d742c5a23cad662ed6bb1d47d7587b0d823fcbf3abc6d613735961473f7d29c83a4ccb49b64ec4f674026f17e88693eb34b42cb6c128abd1407c778ba WHIRLPOOL cfa15b7622d11495b1e83f543b1677ff42c2b54fb8acda6d99a4eb3a76387874da36147d04cadd0a801917e1499de87bd5e25cd80377b4695c68c2086ee2a6a1
-EBUILD pciutils-3.4.1.ebuild 2985 SHA256 183576a92c8dc2165f8ef3ab00bd907ae9e4d9bb58c49b119187a812af6c795f SHA512 55a6c8d02aac32c5115dd563ff1962dfc79fc09681cb062872cbd9c0dab0873eb3183efd51ed8bbd075a21815f9fa779fdbd5ec8c6556acbbf1dff44bf26af48 WHIRLPOOL 412fa4c43f62841826530c8ffd04b87cdd0b84c4ee27bfcb23864ad2bf2a61ceb160929a827a59d40f74f1e842e059ed88922c6c4a8d91256ad38ab4f4de0f2c
-EBUILD pciutils-3.5.4.ebuild 2912 SHA256 9465521eea7bbf44f5eff2e24c155d06f944bc8b1622ff98aee9f71686cbb618 SHA512 e30bf4f61ec643a7c6a61b4c72cb23ca41e0f24464655c7dc8031e135e80e4cf06545cdfeb0f513a9b72247949603a5510ae9ecf2196884efcb8e91dc68cb69b WHIRLPOOL b1f7b7f0884be2f5868d0076f70cfabedf45f96c6fe2756ba334effc622cf49cd3181f9bf63f8ac8200f30cfddef87c4f99ca3fe7cfae2db9d00c5f7e8a57923
-EBUILD pciutils-3.5.5.ebuild 2922 SHA256 9416882730b7a4510c1c9d309f00705411b35d0cfc8304c9533fe0562bce2e25 SHA512 7421156ce321c3cd979712debccf4908ace3dbdd70d0b033c15fecba3f010122b4675d567a302fb4ec594edf2e46535691c24abd23e37bf296fdddc0c9c41d9b WHIRLPOOL c69b503b0b61236c3797448d95779358eebb1270bb574f12316140d0cd350954dae17b7e7842fc1069ed6e1635128f0bcd2c6880480b004ca116a2d383ac2a02
-MISC ChangeLog 9557 SHA256 9371159f68be11c13c975c677207dcff3f06d2d72dfad5ca31079291f789475e SHA512 4076c2f56ec1800da9119650f2b408319a59d1ef79f94196db43ae2d41581701104eb60d3c65fab869cb358ad00682764af6947b2185cbfa7f91e29a3116852e WHIRLPOOL ecdfc701c679c908aaf79be7aaced993ee6fbf5f63cd151a7ccc006823a6f134b935766d1703a1f7c2df17958a6fa6d6869a8cbf5123ad8540b1d7bfe64e42f4
-MISC ChangeLog-2015 31500 SHA256 64e8281eb7979554390ef6c4c323f8d65f4da9a76bdc071d072f78d2c4a67ad6 SHA512 5baa5b45155b0df008de51298fdb54fda6d71b179a148bc799aa4f15a18c7d9de48240354826223fb7bcb1a4b44289dd72252a29204618dd54ddc336fcf245ec WHIRLPOOL 040a27595fe695d2bc4edd48697121b52d05abc302c6a1877e880a777d9a0417fd02cd324ca47b38ec38551296923f1bf157a6cf35fc2a0988d416031c208a45
-MISC metadata.xml 524 SHA256 11eae8d518033f12d6fd34b5624e1271900450dce2755cba0879d3c116155dd0 SHA512 881e7cb9a71e1ccbf84be8cbaab54cfd0258a782aa1e4def6f3398444f4c28790a23eb194c3facc6e7c77437c06e4c17db01e0360debb1f01349cbca69dd8020 WHIRLPOOL 499344b03bb97ab85fab18cc15c64318c047f58930b0d0bb545a8b29230639dcf8d7e13746e6fbb62d32d7f89e4d03c958a5271b5521977ab29459d7e573efa8
+DIST pciutils-3.5.6.tar.gz 442190 BLAKE2B 9f1237828436f0566caa13e49a154b40fcc41ddd165268011012e55a33ea401e3b78ddffecc6f0ec36efb24b6d9338a691167ac094d0d26f855e42cd055701bb SHA512 dcdca7e0bce69d1bee1fa5ea480a9f38534d66da576fdc710aefd8eeb0c18bf6ec5b39e63019d29d6bae0ec2d3881f5d07a4a105ca04c320d84c17821f7297e4
+EBUILD pciutils-3.4.1.ebuild 2985 BLAKE2B f623d9f76fc9ff79bbb62c94c3c1e4cf1e12b93b222d7de1833930d3098274f231660fd22086f2aa4a0f0d8813f21fa46dea5910dde10596aac038c0c082ef25 SHA512 55a6c8d02aac32c5115dd563ff1962dfc79fc09681cb062872cbd9c0dab0873eb3183efd51ed8bbd075a21815f9fa779fdbd5ec8c6556acbbf1dff44bf26af48
+EBUILD pciutils-3.5.5.ebuild 2922 BLAKE2B e89cb60e40b4fd1b1ff51f1dda3825cc43ee25f7016d8bb1044b6a81e25e7c814e61c4df9d7d059eeac3a1b7fa3dc20d89445475caaa0cc09caf5ec25228f23c SHA512 7421156ce321c3cd979712debccf4908ace3dbdd70d0b033c15fecba3f010122b4675d567a302fb4ec594edf2e46535691c24abd23e37bf296fdddc0c9c41d9b
+EBUILD pciutils-3.5.6.ebuild 2900 BLAKE2B ce68aba5b8564d1b3d043a1e71398fbbb5608e48401013a600186d6f1fb76a700b0f91ec6d1e50f28ab1388064203504e8948bbcb93f4163b526f4a7e706b8b4 SHA512 b4e20c6644a5767c960dfa2e232f0e3e148a15f3476825507fd7d4895e883b96de2e346f2d0e474259ac2e8321f8ec6b02e4796e6d7e250ac7e5c05088073065
+MISC metadata.xml 524 BLAKE2B c000b3995b57cf87ea92270e4e2d9b8463e5db65dea3a3aeef50a72a153ff3320a1ab1825cf0a2dcac3569d32f6d17015debb79d567c22d7c6891ce48211d661 SHA512 881e7cb9a71e1ccbf84be8cbaab54cfd0258a782aa1e4def6f3398444f4c28790a23eb194c3facc6e7c77437c06e4c17db01e0360debb1f01349cbca69dd8020
diff --git a/sys-apps/pciutils/pciutils-3.5.4.ebuild b/sys-apps/pciutils/pciutils-3.5.6.ebuild
index 7de545e32784..9ab23fe71c6f 100644
--- a/sys-apps/pciutils/pciutils-3.5.4.ebuild
+++ b/sys-apps/pciutils/pciutils-3.5.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-inherit eutils multilib toolchain-funcs multilib-minimal flag-o-matic
+inherit multilib toolchain-funcs multilib-minimal flag-o-matic
 
 DESCRIPTION="Various utilities dealing with the PCI bus"
 HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
@@ -16,15 +16,23 @@ IUSE="dns +kmod static-libs +udev zlib"
 
 # Have the sub-libs in RDEPEND with [static-libs] since, logically,
 # 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 )
+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(+),} )"
-RDEPEND="${DEPEND}
-	sys-apps/hwids"
-DEPEND="${DEPEND}
-	kmod? ( virtual/pkgconfig )"
+	!static-libs? ( ${LIB_DEPEND//static-libs(+),} )
+"
+RDEPEND="
+	${DEPEND}
+	sys-apps/hwids
+"
+DEPEND="
+	${DEPEND}
+	kmod? ( virtual/pkgconfig )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.9-static-pc.patch
@@ -41,7 +49,7 @@ switch_config() {
 }
 
 src_prepare() {
-	epatch "${PATCHES[@]}"
+	default
 
 	if use static-libs ; then
 		cp -pPR "${S}" "${S}.static" || die