gentoo resync 08.09.2018

5 files changed, 6 insertions, 116 deletions

diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index c65690cb3516..f7ee5f3a36f8 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -1,12 +1,10 @@
 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 BLAKE2B 75c50e7b4469fe4fc3719ee3b58f94be98f113ce4cb36be3d3fb8e57aaefef039866d31a6acc90e6136b21883239c1c7db2b497776e0db8ce05f19c6336b55e1 SHA512 1394647d5e9d324d68bd8bdf4709a438ae06e6a83ded40b9e0026968c032f214073bc764fbf59e15da90b2e424d90dc430db5810d7ff5fbeab0f3e5c6250ee49
 DIST pciutils-3.5.6.tar.gz 442190 BLAKE2B 9f1237828436f0566caa13e49a154b40fcc41ddd165268011012e55a33ea401e3b78ddffecc6f0ec36efb24b6d9338a691167ac094d0d26f855e42cd055701bb SHA512 dcdca7e0bce69d1bee1fa5ea480a9f38534d66da576fdc710aefd8eeb0c18bf6ec5b39e63019d29d6bae0ec2d3881f5d07a4a105ca04c320d84c17821f7297e4
 DIST pciutils-3.6.1.tar.gz 455061 BLAKE2B a9dcce9a79aa66101a77d9299aa7c4f2ae3ab9d7ec597790de7396d65e9c700e4e866b5702412972abbf9ffc2996ebad52782a26d9206cc8d33d96566072fb90 SHA512 2a9c86d826932ac6242677bdd0c5288c264b964aa14314aa7eda5379e687822656081883a2a1c5f846037db9bdba616381f84104d0b3b62cd34acf653faf3990
 DIST pciutils-3.6.2.tar.gz 473699 BLAKE2B ae7563f2d17334f54e6b055d135138e21d105fa5f5b71061a6de638ecf26c35d9de79cb67a691f936f42fcedb9a1f300e046dd892429195a9f54f9536e313110 SHA512 ab2bab26dd11f941286593135b751b811fa6199d4b5fb8a18e74f72709ea598ab0c0efa31ad6ca70949966dcf80cdfb16d53e5d339b773c69e0a12f132bb8577
-EBUILD pciutils-3.4.1.ebuild 2854 BLAKE2B bfc624cfc8a303673e2c480ffd77d888243bf0df8c84733ba37bf9dd7c13063df458160f9649c3c8c67d3320418595406cafd9596814f399d24646161ff8d9b0 SHA512 cd86bd701d2225009923bbdc4bbc75b32b1992fb0f2b212fc7b0288c1e607f7ac64a3503c85dfdfc1a448f75cac9f904e4b2767d01abc7d5f5f8b048d826896c
-EBUILD pciutils-3.5.6.ebuild 2891 BLAKE2B 6f8e291077b15975bc14ceea0016f414e40443aa6d17cff42d42bb8572b7d9170f166675d00c32cf85d0c4d47591093661946ea2cb1b09ece4276fe6ef1ae849 SHA512 8820f77e2b2976fdf597454e7d82e85b29d7cfca775052781ad0c3a299fdd3c2f198c19d7d3aa56c6e69749ddd9829d13a283336d2fc72217297718d91600607
-EBUILD pciutils-3.6.1.ebuild 2900 BLAKE2B 268e47d2e63abc0cc57b1fcea7ddd86831824e80dffb39772b6dff8a93a0aedc52831f318a230658be28c07e8746cefc745d784083292a99946cd837529e9af5 SHA512 593a8d5ac2d30da48392f2753846412d41b8a7d879e188dbc671b76695e6640607133ea45cc4e9249c96a19e6ab29679821b4eb153292d9f36e3e4c97d6581ff
-EBUILD pciutils-3.6.2.ebuild 2900 BLAKE2B 268e47d2e63abc0cc57b1fcea7ddd86831824e80dffb39772b6dff8a93a0aedc52831f318a230658be28c07e8746cefc745d784083292a99946cd837529e9af5 SHA512 593a8d5ac2d30da48392f2753846412d41b8a7d879e188dbc671b76695e6640607133ea45cc4e9249c96a19e6ab29679821b4eb153292d9f36e3e4c97d6581ff
+EBUILD pciutils-3.5.6.ebuild 2876 BLAKE2B e8719bac7c67dd22f99b09fb087aa715b35ceec9e03b939c3c354574637d629dd03dc49b1477d3801110a29412e8a582a8dd0f96063fb5a9f9815070df629f53 SHA512 dfff94aa0813269e8d965e78284e7300af178581c55cd4c9b97fa939051342670d65fa097198cf7910fd47e61e71498a56290dbde1b7dce63555a4d7ed1bd29b
+EBUILD pciutils-3.6.1.ebuild 2889 BLAKE2B 770d5ba8df0e2abd4a0a81aba07e878af1da6b6b76c783f5bf737cfc5239811c91b610170b0ec44335488e674cbb97c763d9496dd887d3e253bf8768d949a726 SHA512 73799a92758b15c5ccf81362696220c1baef545d22923ff50eb9f3399d1b3ecb5a891650b47f5c694b30a6e8cf6dde87c5442b4a5f36435145a39f822b95bac4
+EBUILD pciutils-3.6.2.ebuild 2889 BLAKE2B 770d5ba8df0e2abd4a0a81aba07e878af1da6b6b76c783f5bf737cfc5239811c91b610170b0ec44335488e674cbb97c763d9496dd887d3e253bf8768d949a726 SHA512 73799a92758b15c5ccf81362696220c1baef545d22923ff50eb9f3399d1b3ecb5a891650b47f5c694b30a6e8cf6dde87c5442b4a5f36435145a39f822b95bac4
 MISC metadata.xml 524 BLAKE2B c000b3995b57cf87ea92270e4e2d9b8463e5db65dea3a3aeef50a72a153ff3320a1ab1825cf0a2dcac3569d32f6d17015debb79d567c22d7c6891ce48211d661 SHA512 881e7cb9a71e1ccbf84be8cbaab54cfd0258a782aa1e4def6f3398444f4c28790a23eb194c3facc6e7c77437c06e4c17db01e0360debb1f01349cbca69dd8020
diff --git a/sys-apps/pciutils/pciutils-3.4.1.ebuild b/sys-apps/pciutils/pciutils-3.4.1.ebuild
deleted file mode 100644
index 6769a5b8e41a..000000000000
--- a/sys-apps/pciutils/pciutils-3.4.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils 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"
-SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-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}] )"
-DEPEND="kmod? ( sys-apps/kmod )
-	static-libs? ( ${LIB_DEPEND} )
-	!static-libs? ( ${LIB_DEPEND//static-libs(+),} )
-	udev? ( >=virtual/libudev-208[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
-	sys-apps/hwids"
-DEPEND="${DEPEND}
-	kmod? ( virtual/pkgconfig )"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/pci/config.h )
-
-switch_config() {
-	[[ $# -ne 2 ]] && return 1
-	local opt=$1 val=$2
-
-	sed "s@^\(${opt}=\).*\$@\1${val}@" -i Makefile || die
-	return 0
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.1.9-static-pc.patch
-
-	if use static-libs ; then
-		cp -pPR "${S}" "${S}.static" || die
-		mv "${S}.static" "${S}/static" || die
-	fi
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	append-lfs-flags #471102
-}
-
-pemake() {
-	emake \
-		HOST="${CHOST}" \
-		CROSS_COMPILE="${CHOST}-" \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		RANLIB="$(tc-getRANLIB)" \
-		DNS=$(usex dns) \
-		IDSDIR='$(SHAREDIR)/misc' \
-		MANDIR='$(SHAREDIR)/man' \
-		PREFIX="${EPREFIX}/usr" \
-		SHARED="yes" \
-		STRIP="" \
-		ZLIB=$(usex zlib) \
-		PCI_COMPRESSED_IDS=0 \
-		PCI_IDS=pci.ids \
-		LIBDIR="\${PREFIX}/$(get_libdir)" \
-		LIBKMOD=$(multilib_native_usex kmod) \
-		HWDB=$(usex udev) \
-		"$@"
-}
-
-multilib_src_compile() {
-	pemake OPT="${CFLAGS}" all
-	if use static-libs ; then
-		pemake \
-			-C "${BUILD_DIR}/static" \
-			OPT="${CFLAGS}" \
-			SHARED="no" \
-			lib/libpci.a
-	fi
-}
-
-multilib_src_install() {
-	pemake DESTDIR="${D}" install install-lib
-	use static-libs && dolib.a "${BUILD_DIR}/static/lib/libpci.a"
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog README TODO
-
-	rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/misc/pci.ids \
-		"${ED}"/usr/share/man/man8/update-pciids.8*
-
-	newinitd "${FILESDIR}"/init.d-pciparm pciparm
-	newconfd "${FILESDIR}"/conf.d-pciparm pciparm
-}
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.2.0 ]]; then
-		elog "The 'network-cron' USE flag is gone; if you want a more up-to-date"
-		elog "pci.ids file, you should use sys-apps/hwids-99999999 (live ebuild)."
-	fi
-}
diff --git a/sys-apps/pciutils/pciutils-3.5.6.ebuild b/sys-apps/pciutils/pciutils-3.5.6.ebuild
index f8ddd190f8f5..e9b3c34b4292 100644
--- a/sys-apps/pciutils/pciutils-3.5.6.ebuild
+++ b/sys-apps/pciutils/pciutils-3.5.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="dns +kmod static-libs +udev zlib"
 
 # Have the sub-libs in RDEPEND with [static-libs] since, logically,
diff --git a/sys-apps/pciutils/pciutils-3.6.1.ebuild b/sys-apps/pciutils/pciutils-3.6.1.ebuild
index 4fa617e1c488..9797f04d23d9 100644
--- a/sys-apps/pciutils/pciutils-3.6.1.ebuild
+++ b/sys-apps/pciutils/pciutils-3.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="dns +kmod static-libs +udev zlib"
 
 # Have the sub-libs in RDEPEND with [static-libs] since, logically,
diff --git a/sys-apps/pciutils/pciutils-3.6.2.ebuild b/sys-apps/pciutils/pciutils-3.6.2.ebuild
index 4fa617e1c488..9797f04d23d9 100644
--- a/sys-apps/pciutils/pciutils-3.6.2.ebuild
+++ b/sys-apps/pciutils/pciutils-3.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="dns +kmod static-libs +udev zlib"
 
 # Have the sub-libs in RDEPEND with [static-libs] since, logically,