gentoo resync : 05.02.2020

3 files changed, 124 insertions, 2 deletions

diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index e7057d1b5195..9b01d839d07c 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -4,7 +4,9 @@ AUX pciutils-3.1.9-static-pc.patch 373 BLAKE2B 39e44412bdde832e9812cd719155f7638
 DIST pciutils-3.5.6.tar.gz 442190 BLAKE2B 9f1237828436f0566caa13e49a154b40fcc41ddd165268011012e55a33ea401e3b78ddffecc6f0ec36efb24b6d9338a691167ac094d0d26f855e42cd055701bb SHA512 dcdca7e0bce69d1bee1fa5ea480a9f38534d66da576fdc710aefd8eeb0c18bf6ec5b39e63019d29d6bae0ec2d3881f5d07a4a105ca04c320d84c17821f7297e4
 DIST pciutils-3.6.2.tar.gz 473699 BLAKE2B ae7563f2d17334f54e6b055d135138e21d105fa5f5b71061a6de638ecf26c35d9de79cb67a691f936f42fcedb9a1f300e046dd892429195a9f54f9536e313110 SHA512 ab2bab26dd11f941286593135b751b811fa6199d4b5fb8a18e74f72709ea598ab0c0efa31ad6ca70949966dcf80cdfb16d53e5d339b773c69e0a12f132bb8577
 DIST pciutils-3.6.3.tar.gz 488501 BLAKE2B 77a1ad1e034dac0bfa67ae3a40c34fc394510bb61af1f929e8feb3eb12e9d44b48cfeee0ba786580531222c75c33613b423aa79e535316d2543ac1ba4224312c SHA512 0f6b272cf83e0ff857e4d38c72935709826af054620cd8d70cf8765d5f547f32bdccf5c76a47c8b24d8081b48c16882132a3b503f6a329e73a66089877d5e47b
-EBUILD pciutils-3.5.6-r1.ebuild 2870 BLAKE2B dda0660cdc472262389796e4ced29491050bade11e6bdf86ecb92088ff731aefeeaa2e95cfc37ae864eca1de5627831290423b5c92fb0436242b2cf855db9a13 SHA512 34454feabb024f8497ed9bd817f3d8c4616005f04ccfc0bb2546e998ab237f598771607b892af0696f1b521e42b8b87f80a442441b3f54a7090d283759208994
+DIST pciutils-3.6.4.tar.gz 491066 BLAKE2B bb63ac307f5a66ffb6505bbd7d030fdafcfea13e0b8f3b718c98ce693febbcb90ac7c511bf27d20688f83fd56994b2b246f94323386fd1cc16c79b1b8cab9ca3 SHA512 de36aef89a5269888b065df926fc91f24641e488492ad713f886efa4fb544a4e7f7609028d233fecf1755e15e08d4a41f2837f356f26c73d297a67b0b026e29f
+EBUILD pciutils-3.5.6-r1.ebuild 2871 BLAKE2B 70e11faf9e5ef8777b6771aa0381282ddeff30cdf447d5071747065af265b5a72894b6eabe23a1eb2d5a93085b4fb463502ea28b53c5c5daba9fab35123d8b63 SHA512 0a25dd1d3e84f0fe8a63231192017fbc454bb6a42fd5501635d5819397e1dbcb2294aac4297162c8ae77546022a1af0388e043a1a44c68661fa3943d96bf76b6
 EBUILD pciutils-3.6.2-r1.ebuild 2883 BLAKE2B 86e53599bee45f4012603ebac07b80a56ce86901bb8289936533813a738e35b6d862e04648f5faebc081bbbdd462385be10cc48facccc6680e27601c5ec7e037 SHA512 0897687dc6811f90926b145c5f848157b7b6ebc36374837d97b6f6103125034903ccc318a8c9add2f0c1cb60bfb8de6a90faec071a81b820e21c87cb1c69b6a0
 EBUILD pciutils-3.6.3.ebuild 2896 BLAKE2B d611f19f984120779025c19a04b1c7bd136ef4c874657f13e5932feb3ead61d229633fd1b978ecd66c0e43ebe0618e4c5bd1e3ee7b52f59e05b7a88d22fa5066 SHA512 a50768b9b1f3ce1a044c9f7e13a1434c06f73262958ba4f1e4faba70caa6c7195f31ec889623c966b940c243fc1b44e42adea22c98e5120556368dd93e6966eb
+EBUILD pciutils-3.6.4.ebuild 2896 BLAKE2B d611f19f984120779025c19a04b1c7bd136ef4c874657f13e5932feb3ead61d229633fd1b978ecd66c0e43ebe0618e4c5bd1e3ee7b52f59e05b7a88d22fa5066 SHA512 a50768b9b1f3ce1a044c9f7e13a1434c06f73262958ba4f1e4faba70caa6c7195f31ec889623c966b940c243fc1b44e42adea22c98e5120556368dd93e6966eb
 MISC metadata.xml 524 BLAKE2B c000b3995b57cf87ea92270e4e2d9b8463e5db65dea3a3aeef50a72a153ff3320a1ab1825cf0a2dcac3569d32f6d17015debb79d567c22d7c6891ce48211d661 SHA512 881e7cb9a71e1ccbf84be8cbaab54cfd0258a782aa1e4def6f3398444f4c28790a23eb194c3facc6e7c77437c06e4c17db01e0360debb1f01349cbca69dd8020
diff --git a/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild b/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild
index 972c45769c03..419256b04b84 100644
--- a/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild
+++ b/sys-apps/pciutils/pciutils-3.5.6-r1.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-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~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.4.ebuild b/sys-apps/pciutils/pciutils-3.6.4.ebuild
new file mode 100644
index 000000000000..f3a83e518b7e
--- /dev/null
+++ b/sys-apps/pciutils/pciutils-3.6.4.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+SRC_URI="https://git.kernel.org/pub/scm/utils/pciutils/pciutils.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+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 )
+	static-libs? ( ${LIB_DEPEND} )
+	!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
+)
+
+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() {
+	default
+
+	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} ]] && ver_test ${REPLACING_VERSIONS} -lt 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
+}