gentoo resync : 14.07.2018

2 files changed, 122 insertions, 0 deletions

diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 8fa5dbb26c8b..58f395d54975 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.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.0.tar.gz 454912 BLAKE2B 1f37307ba21085d5f49dd908781ce34dff98a1e4d818158800a1fbdc1fc689e1b868ee9c762378a8cd28ab17cbaaf1e9255da94c44029bfa2f4a8b5d9fd4b273 SHA512 e59cb5685f1dee2673368c90fdf1f5b7689de9fa45f249ce472258f278288da7a81644c76d1ecb7cc857f8029d3d70c367fe62190caf55328143b51017cc5c6f
+DIST pciutils-3.6.1.tar.gz 455061 BLAKE2B a9dcce9a79aa66101a77d9299aa7c4f2ae3ab9d7ec597790de7396d65e9c700e4e866b5702412972abbf9ffc2996ebad52782a26d9206cc8d33d96566072fb90 SHA512 2a9c86d826932ac6242677bdd0c5288c264b964aa14314aa7eda5379e687822656081883a2a1c5f846037db9bdba616381f84104d0b3b62cd34acf653faf3990
 EBUILD pciutils-3.4.1.ebuild 2854 BLAKE2B bfc624cfc8a303673e2c480ffd77d888243bf0df8c84733ba37bf9dd7c13063df458160f9649c3c8c67d3320418595406cafd9596814f399d24646161ff8d9b0 SHA512 cd86bd701d2225009923bbdc4bbc75b32b1992fb0f2b212fc7b0288c1e607f7ac64a3503c85dfdfc1a448f75cac9f904e4b2767d01abc7d5f5f8b048d826896c
 EBUILD pciutils-3.5.6.ebuild 2900 BLAKE2B ce68aba5b8564d1b3d043a1e71398fbbb5608e48401013a600186d6f1fb76a700b0f91ec6d1e50f28ab1388064203504e8948bbcb93f4163b526f4a7e706b8b4 SHA512 b4e20c6644a5767c960dfa2e232f0e3e148a15f3476825507fd7d4895e883b96de2e346f2d0e474259ac2e8321f8ec6b02e4796e6d7e250ac7e5c05088073065
 EBUILD pciutils-3.6.0.ebuild 2900 BLAKE2B 268e47d2e63abc0cc57b1fcea7ddd86831824e80dffb39772b6dff8a93a0aedc52831f318a230658be28c07e8746cefc745d784083292a99946cd837529e9af5 SHA512 593a8d5ac2d30da48392f2753846412d41b8a7d879e188dbc671b76695e6640607133ea45cc4e9249c96a19e6ab29679821b4eb153292d9f36e3e4c97d6581ff
+EBUILD pciutils-3.6.1.ebuild 2900 BLAKE2B 268e47d2e63abc0cc57b1fcea7ddd86831824e80dffb39772b6dff8a93a0aedc52831f318a230658be28c07e8746cefc745d784083292a99946cd837529e9af5 SHA512 593a8d5ac2d30da48392f2753846412d41b8a7d879e188dbc671b76695e6640607133ea45cc4e9249c96a19e6ab29679821b4eb153292d9f36e3e4c97d6581ff
 MISC metadata.xml 524 BLAKE2B c000b3995b57cf87ea92270e4e2d9b8463e5db65dea3a3aeef50a72a153ff3320a1ab1825cf0a2dcac3569d32f6d17015debb79d567c22d7c6891ce48211d661 SHA512 881e7cb9a71e1ccbf84be8cbaab54cfd0258a782aa1e4def6f3398444f4c28790a23eb194c3facc6e7c77437c06e4c17db01e0360debb1f01349cbca69dd8020
diff --git a/sys-apps/pciutils/pciutils-3.6.1.ebuild b/sys-apps/pciutils/pciutils-3.6.1.ebuild
new file mode 100644
index 000000000000..4fa617e1c488
--- /dev/null
+++ b/sys-apps/pciutils/pciutils-3.6.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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="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 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} ]] && [[ ${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
+}