gentoo resync : 19.03.2019

8 files changed, 12 insertions, 258 deletions

diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index 3cd7db1bdad6..67a01d666a1f 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -1,14 +1,8 @@
-DIST hwids-20170328.tar.gz 2049249 BLAKE2B b9dd6dc98c9eafd4f1eb1e129a53bf10ebc4b3b718c9bc134cb5b3f5c2dfaa9626607b4f6edc8f35b811e3a7404cc967d5e9732398880dd5b96a76ca6e97cd37 SHA512 ffccbcda78f856b93026102d1d7f62f4639910671c63e30471c990b1029db94b542c555b6ad69820f8a91a45ef9d52c320b9767d38ff08b6e72c041a28e6f0f3
-DIST hwids-20170715.tar.gz 2091853 BLAKE2B 66e930346176d3501ba0e5f802b7e44fe327a4bbfcd250ac3b96259b3c2eefbade8b0555fcffeafc35e46ce07551bdc6d26d25d9913d7a584945b52f7e744dfe SHA512 6f1d2e3d7b7fc260f02b3cc87b46385292503dda2a46dea4e69b02915e9d411e9682fb98ca921eb45289e416320a8ef46a3df0753f8f820d20c719663076bd88
 DIST hwids-20171003.tar.gz 3035908 BLAKE2B 8ecce99f6a6233b3dd79e1663053b6718fd8b4975a02e5735c1b8483214193bcd45a606145a7709f0b9021dd69e0757361bd568f4ba2d66a52641f691aa7f50a SHA512 6a05963f1883cfeb774671931a32eb9322ead145d4d8aa2fa791e90fc3c823a0b3baeaaa4ce84de0e6a10dcd7f1b5943f6d2cab8790d21e8f34ca1d403598a8a
-DIST hwids-20180315.tar.gz 3117949 BLAKE2B 34b6349d7adf38da8591a0f75e98ce09f0217bb284d1bdc70d7c1bd0a13f0c21b46b2a40ea363dfcdb7524e2a06e94d8ca3a63f5dce6f4afac2b20d05229e944 SHA512 2c52b88b74d231f7c563079b02fdbe29ff70c4df5aae64f1241ab0e1bd3ab9c3ca925e102474e32d3dc8dcb833e3451f0698024a8fff808a987ce468af281898
-DIST hwids-20180518.tar.gz 3150553 BLAKE2B e7d1be88349d04dac09e44bba728d1b371be66628d0143a5ab9d98f9ac5ce14bc21c272bdc93e88cb2af8f640f2f5d0497be8a33a136bcb8e69112a998be3827 SHA512 5a8e65b226026b59008c714df79309a888f728198ac5ab71c5908b69a1fd5365a0834afab0e38423affbda59ded04b662a09dc544b4d96695671f562aa0c5ec1
 DIST hwids-20180917.tar.gz 3211960 BLAKE2B d1dc00994a63a6cb6f7c41c73267dcc38b59a46b9e627fac9d6df285b8d1abf5d1335c02c047bff2b09c9ed9f8e4a1c79329c1bd7dd932949d3db2bbb5b9b2e6 SHA512 9fdcd5a7b3adca1bed886aa83e9cf3944391a819fc9f09b673bd815d95e6e70cecf40d8e87287207e34bfeb58c888188fc61b1c0ac13c1ecab0efbdb5100f8d9
-EBUILD hwids-20170328.ebuild 1431 BLAKE2B 873074354502395c480a8f7310effae4d913ff00bd6b4dafb38c8aa9129238452c6f30592da124c4bc0af86a1abfd76ef58c0dbd6c99d3a901a0297be3a803bd SHA512 357aff1def6de26ae5eb2d07446c581b6279017f1750650bde113036ea2b87fd8be693e3f7cddbbf072bc598a30cc0183d1946db5c363a8e7fb203cf5f4ff1ca
-EBUILD hwids-20170715.ebuild 1444 BLAKE2B 1dff1651fd4cb03de461c1a7db918213dff62d3832aafe5cc0452a7c728b114b96e39a241c3ce08873f78f4a40e813f5608b7b746d93b63d23a5881cb9517581 SHA512 9b412d8745b387af89821ca49157d6d12a30e2aef98da70be6324ed4496f39981c00c909611f59644ac318463b92eed9a6b7e6b1cc6677c618b515ca96e9e4ce
-EBUILD hwids-20171003.ebuild 1695 BLAKE2B 51e64ebb329c3fb66f2dcc91587b0c750b1567068dad99bcaac93758969e5a72c29a60a6c0d131791ea00690d3ffbdf16595fc934741444d39633ac87357de6c SHA512 94a79ebedc06e023e54028574eff4de27799f903e1de85d77fd15fc053fed9ed153b2256d86490c024ad17da5d8d227e3290a5a34daea8b7d8ba334f4884111a
-EBUILD hwids-20180315.ebuild 1739 BLAKE2B 774592745f7a53d2177c4eb07f0fe4a658245c1faea0c574c79cb8dd363818ef4c2b2c468c1c548f23797f25dbbb3dcfa8409296e2c38f4d5376187b98672629 SHA512 e8d07c70b55ad7cba1296e16597e89d48cdad928926e7497726457d25a880ddbe2f4220bf6b6a08989706a554bd2db8edfc6fded203f9dc69dc8334b03ab7441
-EBUILD hwids-20180518.ebuild 1739 BLAKE2B 774592745f7a53d2177c4eb07f0fe4a658245c1faea0c574c79cb8dd363818ef4c2b2c468c1c548f23797f25dbbb3dcfa8409296e2c38f4d5376187b98672629 SHA512 e8d07c70b55ad7cba1296e16597e89d48cdad928926e7497726457d25a880ddbe2f4220bf6b6a08989706a554bd2db8edfc6fded203f9dc69dc8334b03ab7441
-EBUILD hwids-20180917.ebuild 1739 BLAKE2B 774592745f7a53d2177c4eb07f0fe4a658245c1faea0c574c79cb8dd363818ef4c2b2c468c1c548f23797f25dbbb3dcfa8409296e2c38f4d5376187b98672629 SHA512 e8d07c70b55ad7cba1296e16597e89d48cdad928926e7497726457d25a880ddbe2f4220bf6b6a08989706a554bd2db8edfc6fded203f9dc69dc8334b03ab7441
-EBUILD hwids-99999999.ebuild 1739 BLAKE2B e985f2d9d336c2bdd107b7402638b36bb095f705b68ccf23afc83847b9f7c0c56262e9e81b627309fd3e7b334b033d22a65f9224e7c144fa369dce0d1aba2f89 SHA512 e953085bc62d2d5beeb80b42fdbe6c7ec721d904789488e1754c2bb1504eb18bef7995f710c6d70045261c2b0b3d5e872ba6de835d31dfef7b4d272ab14853d8
+DIST hwids-20190316.tar.gz 3312959 BLAKE2B d9f4c7170979c404a69ca0b51903af34db01a6150ec70dc1416dcb507dfa4d8ad9ce325204791a24e5646dee67aea0c1566c15dcddb65a5d9dddbbbb9b896398 SHA512 6db50577b5d29d73f1dc0a44d0b74320cb0df186b9850160b15a6e8f2bcbdbf8193bae4146f81a5afc6b0e05706b5286b4b5858eb028d6c58ea4582df61d232e
+EBUILD hwids-20171003.ebuild 1692 BLAKE2B f5f7f80998064870b8f7a515e19b40412b5085ec46b33d2ffec5f721138be36de0d4dd3687c844d6988619a0276e7a02f1c3195b4b449f3559a9ecfb9f565fd2 SHA512 a6bae7bddd1ffcfc18965da4e568afc1e5246b3746f3b0c1453126475ef33f6f939c76ad5b5291df589e92489c5a0ea038e808ab38350bd52b7642291f50ca01
+EBUILD hwids-20180917.ebuild 1728 BLAKE2B 27809105939f83b68a978d242fd1ee03fcbbf4b208d3062bcb49ad2f9adefaa848bb6d1d05ac7cc4e4d3bd00d9c56ce01fb7d01e2e4cae970ed83b3a0fc6a55d SHA512 661a1f8a9822de548f334b06c7e22ca17fc0f554bf7b965dff770cf45a56a7a87d87bc15f4078a9c2ed403f71d7a7e1a54c63bfe1d799fce1d569ee1c804471e
+EBUILD hwids-20190316.ebuild 1740 BLAKE2B 6c831c3994c80d603c3c3babfe9ba1e07875b486e8b8ad8fcb233cda01f5385f91c89a11191c0935d41ef79bd9a936b780a13b4cf500ba3279fa5d98b1394d0f SHA512 aefb4150e54ce9a408be6614cfd39422e5abf9a60311edf03c62da3fd42730aa1e2d624405b7f8f9ddd75e99f8ad32f3914eccb4b5e2373867938c10e93533ec
+EBUILD hwids-99999999.ebuild 1740 BLAKE2B 6c831c3994c80d603c3c3babfe9ba1e07875b486e8b8ad8fcb233cda01f5385f91c89a11191c0935d41ef79bd9a936b780a13b4cf500ba3279fa5d98b1394d0f SHA512 aefb4150e54ce9a408be6614cfd39422e5abf9a60311edf03c62da3fd42730aa1e2d624405b7f8f9ddd75e99f8ad32f3914eccb4b5e2373867938c10e93533ec
 MISC metadata.xml 647 BLAKE2B 88b205060dbd1c22edb25b740b5b84d0b36e8746a8bfd5793ab385afa2afd34e54626c2b09e59dc2cf91d838ae44dea878be26cd9cab83a98054a3d0b4bfbd52 SHA512 b05dbd41c2a839d2ac8baaf8ee2352ee999d48deb123c54e048da44cccb06f64729620983848a6b16ada8af50e6fb68adf15323ff362f230b7213f485b1ec27c
diff --git a/sys-apps/hwids/hwids-20170328.ebuild b/sys-apps/hwids/hwids-20170328.ebuild
deleted file mode 100644
index 7aa566e5cc38..000000000000
--- a/sys-apps/hwids/hwids-20170328.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit udev
-
-DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases"
-HOMEPAGE="https://github.com/gentoo/hwids"
-if [[ ${PV} == "99999999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="${HOMEPAGE}.git"
-else
-	SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="|| ( GPL-2 BSD ) public-domain"
-SLOT="0"
-IUSE="+net +pci +udev +usb"
-
-DEPEND="udev? (
-	dev-lang/perl
-	>=virtual/udev-206
-)"
-[[ ${PV} == "99999999" ]] && DEPEND+=" udev? ( net-misc/curl )"
-RDEPEND="!<sys-apps/pciutils-3.1.9-r2
-	!<sys-apps/usbutils-005-r1"
-
-if [[ ${PV} != 99999999 ]]; then
-	S=${WORKDIR}/hwids-${P}
-fi
-
-src_unpack() {
-	if [[ ${PV} == 99999999 ]]; then
-		git-r3_src_unpack
-		cd "${S}" || die
-		emake fetch
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e '/udevadm hwdb/d' Makefile || die
-}
-
-_emake() {
-	emake \
-		NET=$(usex net) \
-		PCI=$(usex pci) \
-		UDEV=$(usex udev) \
-		USB=$(usex usb) \
-		"$@"
-}
-
-src_compile() {
-	_emake
-}
-
-src_install() {
-	_emake install \
-		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
-		MISCDIR="${EPREFIX}/usr/share/misc" \
-		HWDBDIR="${EPREFIX}$(get_udevdir)/hwdb.d" \
-		DESTDIR="${D}"
-}
-
-pkg_postinst() {
-	if use udev; then
-		udevadm hwdb --update --root="${ROOT%/}"
-	fi
-}
diff --git a/sys-apps/hwids/hwids-20170715.ebuild b/sys-apps/hwids/hwids-20170715.ebuild
deleted file mode 100644
index b88d95755f92..000000000000
--- a/sys-apps/hwids/hwids-20170715.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit udev
-
-DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases"
-HOMEPAGE="https://github.com/gentoo/hwids"
-if [[ ${PV} == "99999999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="${HOMEPAGE}.git"
-else
-	SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="|| ( GPL-2 BSD ) public-domain"
-SLOT="0"
-IUSE="+net +pci +udev +usb"
-
-DEPEND="udev? (
-	dev-lang/perl
-	>=virtual/udev-206
-)"
-[[ ${PV} == "99999999" ]] && DEPEND+=" udev? ( net-misc/curl )"
-RDEPEND="!<sys-apps/pciutils-3.1.9-r2
-	!<sys-apps/usbutils-005-r1"
-
-if [[ ${PV} != 99999999 ]]; then
-	S=${WORKDIR}/hwids-${P}
-fi
-
-src_unpack() {
-	if [[ ${PV} == 99999999 ]]; then
-		git-r3_src_unpack
-		cd "${S}" || die
-		emake fetch
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e '/udevadm hwdb/d' Makefile || die
-}
-
-_emake() {
-	emake \
-		NET=$(usex net) \
-		PCI=$(usex pci) \
-		UDEV=$(usex udev) \
-		USB=$(usex usb) \
-		"$@"
-}
-
-src_compile() {
-	_emake
-}
-
-src_install() {
-	_emake install \
-		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
-		MISCDIR="${EPREFIX}/usr/share/misc" \
-		HWDBDIR="${EPREFIX}$(get_udevdir)/hwdb.d" \
-		DESTDIR="${D}"
-}
-
-pkg_postinst() {
-	if use udev; then
-		udevadm hwdb --update --root="${ROOT%/}"
-	fi
-}
diff --git a/sys-apps/hwids/hwids-20171003.ebuild b/sys-apps/hwids/hwids-20171003.ebuild
index 1699bbb86d94..cdbfd2d64e02 100644
--- a/sys-apps/hwids/hwids-20171003.ebuild
+++ b/sys-apps/hwids/hwids-20171003.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2012-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/sys-apps/hwids/hwids-20180518.ebuild b/sys-apps/hwids/hwids-20180518.ebuild
deleted file mode 100644
index b853ba3cb8b6..000000000000
--- a/sys-apps/hwids/hwids-20180518.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit udev
-
-DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases"
-HOMEPAGE="https://github.com/gentoo/hwids"
-if [[ ${PV} == "99999999" ]]; then
-	PYTHON_COMPAT=( python3_6 )
-	inherit git-r3 python-any-r1
-	EGIT_REPO_URI="${HOMEPAGE}.git"
-else
-	SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="|| ( GPL-2 BSD ) public-domain"
-SLOT="0"
-IUSE="+net +pci +udev +usb"
-
-DEPEND=""
-RDEPEND="
-	udev? ( virtual/udev )
-	!<sys-apps/pciutils-3.1.9-r2
-	!<sys-apps/usbutils-005-r1
-"
-
-if [[ ${PV} == 99999999 ]]; then
-	DEPEND+="
-		net-misc/curl
-		udev? ( $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]') )
-	"
-	python_check_deps() {
-		if use udev; then
-			has_version --host-root "dev-python/pyparsing[${PYTHON_USEDEP}]"
-		fi
-	}
-else
-	S=${WORKDIR}/hwids-${P}
-fi
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	if [[ ${PV} == 99999999 ]]; then
-		git-r3_src_unpack
-		cd "${S}" || die
-		emake fetch
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e '/udevadm hwdb/d' Makefile || die
-}
-
-_emake() {
-	emake \
-		NET=$(usex net) \
-		PCI=$(usex pci) \
-		UDEV=$(usex udev) \
-		USB=$(usex usb) \
-		"$@"
-}
-
-src_compile() {
-	if [[ ${PV} == 99999999 ]] && use udev; then
-		python_setup
-		_emake udev-hwdb
-	fi
-	_emake
-}
-
-src_install() {
-	_emake install \
-		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
-		MISCDIR="${EPREFIX}/usr/share/misc" \
-		HWDBDIR="${EPREFIX}$(get_udevdir)/hwdb.d" \
-		DESTDIR="${D}"
-}
-
-pkg_postinst() {
-	if use udev; then
-		udevadm hwdb --update --root="${ROOT%/}"
-	fi
-}
diff --git a/sys-apps/hwids/hwids-20180917.ebuild b/sys-apps/hwids/hwids-20180917.ebuild
index b853ba3cb8b6..c5a242584fcb 100644
--- a/sys-apps/hwids/hwids-20180917.ebuild
+++ b/sys-apps/hwids/hwids-20180917.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2012-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ if [[ ${PV} == "99999999" ]]; then
 	EGIT_REPO_URI="${HOMEPAGE}.git"
 else
 	SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-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"
 fi
 
 LICENSE="|| ( GPL-2 BSD ) public-domain"
diff --git a/sys-apps/hwids/hwids-20180315.ebuild b/sys-apps/hwids/hwids-20190316.ebuild
index b853ba3cb8b6..4e6f5eb13d9a 100644
--- a/sys-apps/hwids/hwids-20180315.ebuild
+++ b/sys-apps/hwids/hwids-20190316.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2012-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -8,7 +8,7 @@ inherit udev
 DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases"
 HOMEPAGE="https://github.com/gentoo/hwids"
 if [[ ${PV} == "99999999" ]]; then
-	PYTHON_COMPAT=( python3_6 )
+	PYTHON_COMPAT=( python3_{6,7} )
 	inherit git-r3 python-any-r1
 	EGIT_REPO_URI="${HOMEPAGE}.git"
 else
diff --git a/sys-apps/hwids/hwids-99999999.ebuild b/sys-apps/hwids/hwids-99999999.ebuild
index 79a041389fd9..4e6f5eb13d9a 100644
--- a/sys-apps/hwids/hwids-99999999.ebuild
+++ b/sys-apps/hwids/hwids-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 2012-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -8,7 +8,7 @@ inherit udev
 DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases"
 HOMEPAGE="https://github.com/gentoo/hwids"
 if [[ ${PV} == "99999999" ]]; then
-	PYTHON_COMPAT=( python3_6 )
+	PYTHON_COMPAT=( python3_{6,7} )
 	inherit git-r3 python-any-r1
 	EGIT_REPO_URI="${HOMEPAGE}.git"
 else