gentoo resync : 25.08.2020

7 files changed, 6 insertions, 201 deletions

diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index 35cdb8b46cf8..2b406fa8fdc8 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -1,12 +1,8 @@
-DIST hwids-20190316.tar.gz 3312959 BLAKE2B d9f4c7170979c404a69ca0b51903af34db01a6150ec70dc1416dcb507dfa4d8ad9ce325204791a24e5646dee67aea0c1566c15dcddb65a5d9dddbbbb9b896398 SHA512 6db50577b5d29d73f1dc0a44d0b74320cb0df186b9850160b15a6e8f2bcbdbf8193bae4146f81a5afc6b0e05706b5286b4b5858eb028d6c58ea4582df61d232e
-DIST hwids-20190818.tar.gz 3407208 BLAKE2B c2a0098cba4a34210461a2781f325a95f18696c1917ff3a1c26a2f56383e9edd087ab6b3a1a173a92df829fc250cf460d915a98298f9c38a71396bf232916245 SHA512 74086f96152482af3c9caabc729f34d193cc619aae88d44aa0472d674b7533ab806b13243c95bfa04417bdd40e3bb7069b766c2c0824f19d0c62385b043a01c2
-DIST hwids-20191025.tar.gz 3443988 BLAKE2B 0352f1568d7ceeb2c599d789f96a3175703f3c86240188beb9a080eabb6e7659aeeadf193f15050519fb64c58ee8d8832919cf6922b5017861b32be543235a03 SHA512 6f637ca8c4d6b1261c5c2eccd8d1a64ab750f4c36f3d435b50b75949c15e571d83bc61dd6a14e777b53d383d7d02c34f616cc6a62d005db3d965b33b4121deca
 DIST hwids-20200204.tar.gz 3495191 BLAKE2B 23075b6728d9b0e020be45729d0df4cef95cac5e912e646b612266337d1add59c87a1031e6672c5b6eb23e13c26e6299b62a5886aa25017242a86fd474c1e9ae SHA512 1d2a9baaa7ab64575a3d9b98ae4df9060cb8593ae752365296dd53b18bc5996170bbfe1c5b4b1ffc24b28e3dbaa7c321c4fa333bbf91449a6ca7b187cbe23741
 DIST hwids-20200306.tar.gz 3512152 BLAKE2B 6a6ee48598e72f97a90bff8f45aacb699218570ede5b60ed119ebae78de6cd4b92e02f96cf57c83710da699be9a7dcdfdef8d404539e04b664298874b35e54ce SHA512 eff1d2783925ca459b387fbaa5cf68a98aa4209ab8509ad92a902b4d02cc7f4a47e5506c2beed4c792d24a8ab636ad77b376a92b59ae4f605d1b5258350ff250
-EBUILD hwids-20190316.ebuild 1752 BLAKE2B 3465f5b3c58a50e39a2ec4d87fbd3a2c212f3660f0c3aa6a028d375b2564ccc5c4e736a2f95f5647fb1e6b0587bbb41f7289e0ae4cb2d932a308386a76e2b1d9 SHA512 26896ec3ea64c472f739dc7de88a1fa912cbad79d59a3140605654dcecf7133ab8f6140fc96662f8d4ce38ad21fddb060bb4377838402e3e29b266da2bda9b3c
-EBUILD hwids-20190818.ebuild 1727 BLAKE2B 9be9c7376ef6b5471ed5d5f4526760d2af5780aa8d8a4a348bd0782562bce71b371670d2758a4af998fcdb226fe9d0aa8dd0879a2b1b7a9cd2258279b1d8d425 SHA512 7786878102e783d12a7ad034ca41c27d6090331eda92f02f7600dbd1e260d939528433764040bffba7eb2b1e73ea275cd4c4c49f78dcae4cbccfbbb536fbc8f9
-EBUILD hwids-20191025.ebuild 1736 BLAKE2B 9c6790f94021cde5b51edb9add5a4a798d9957cdfbd8bc71f6ead04e9a9556221101faa0fd22b5f01155475df118a680b8a0c2704dae7fa17baa680a6fe1d299 SHA512 15a575949a9bf95bb61a24d987d87604de643507fe6560f7ca6860985643615282781771b1d878103d1ca8c8c9a006fdfea374b24c955544382c963be72fff21
-EBUILD hwids-20200204.ebuild 1727 BLAKE2B 9be9c7376ef6b5471ed5d5f4526760d2af5780aa8d8a4a348bd0782562bce71b371670d2758a4af998fcdb226fe9d0aa8dd0879a2b1b7a9cd2258279b1d8d425 SHA512 7786878102e783d12a7ad034ca41c27d6090331eda92f02f7600dbd1e260d939528433764040bffba7eb2b1e73ea275cd4c4c49f78dcae4cbccfbbb536fbc8f9
-EBUILD hwids-20200306.ebuild 1736 BLAKE2B 9c6790f94021cde5b51edb9add5a4a798d9957cdfbd8bc71f6ead04e9a9556221101faa0fd22b5f01155475df118a680b8a0c2704dae7fa17baa680a6fe1d299 SHA512 15a575949a9bf95bb61a24d987d87604de643507fe6560f7ca6860985643615282781771b1d878103d1ca8c8c9a006fdfea374b24c955544382c963be72fff21
-EBUILD hwids-99999999.ebuild 1736 BLAKE2B 9c6790f94021cde5b51edb9add5a4a798d9957cdfbd8bc71f6ead04e9a9556221101faa0fd22b5f01155475df118a680b8a0c2704dae7fa17baa680a6fe1d299 SHA512 15a575949a9bf95bb61a24d987d87604de643507fe6560f7ca6860985643615282781771b1d878103d1ca8c8c9a006fdfea374b24c955544382c963be72fff21
+DIST hwids-20200813.1.tar.gz 3680906 BLAKE2B 652cf4b05ead42a750c6f41ad78650ea8b0125f90563dec37bfa8388d021ceab12e94fd2f949b3f7b3b7c09a356d279b91e62164af2cf066cfee07ab583f8b83 SHA512 5ba15067969fa19d3218f523c1a0186568841466de4d18c563b5f09202ab7185c4df02b962f70eb6d3e99915caad8a743fc6c6349f49b666db742f9ced8053fc
+EBUILD hwids-20200204.ebuild 1669 BLAKE2B 8e070debcc0dcd428d49726af36a640642e699e7811706694cbfcd6f03d07251e7dcef29759eb5b9da36ff8c72a33fb50fdf365c81304b179e155b2307e73707 SHA512 d32cc90225945dc8a6f4b9dace7e99fcec8369116f1e9e04a447c6dc83ba7ada6054c5bcad706ea554b2836f1eb4d91c237a0a31123f4bed52eefdc614188dfe
+EBUILD hwids-20200306.ebuild 1678 BLAKE2B 15d252b1a9090d3b744a463c42a4d5e46c27df4c57807ae03acc5b524d4fb5f00a3e7acc01900a00eb17618d4685b606ed89abbc678c80c371fb7ff36e0b15b3 SHA512 d953589f15789952126486fb5f5eac733e33bc8c8c88e888887f7c92717efbdf8b716dc100bb7467226f8a0d762566a05ccac0ed2cf5d35e477c5d3fdaa4990e
+EBUILD hwids-20200813.1.ebuild 1678 BLAKE2B 15d252b1a9090d3b744a463c42a4d5e46c27df4c57807ae03acc5b524d4fb5f00a3e7acc01900a00eb17618d4685b606ed89abbc678c80c371fb7ff36e0b15b3 SHA512 d953589f15789952126486fb5f5eac733e33bc8c8c88e888887f7c92717efbdf8b716dc100bb7467226f8a0d762566a05ccac0ed2cf5d35e477c5d3fdaa4990e
+EBUILD hwids-99999999.ebuild 1679 BLAKE2B 6f3c0dc51d9598239348f1abfaf3f2c691b5c060dd21ab31fb79ccf4d9c240791a7ea061ae31aae201b15456459981ce1e06d15838b5dc136526c940dfc5c4d2 SHA512 f3a949dbda15206076e48d996bcbf6d9b1568a4338511dfbc05e87d6102eb5b08dffedf23cc24f06d2f9f17bc7247802e6229f01e23c5098b49b3768c0eb9c58
 MISC metadata.xml 647 BLAKE2B 88b205060dbd1c22edb25b740b5b84d0b36e8746a8bfd5793ab385afa2afd34e54626c2b09e59dc2cf91d838ae44dea878be26cd9cab83a98054a3d0b4bfbd52 SHA512 b05dbd41c2a839d2ac8baaf8ee2352ee999d48deb123c54e048da44cccb06f64729620983848a6b16ada8af50e6fb68adf15323ff362f230b7213f485b1ec27c
diff --git a/sys-apps/hwids/hwids-20190316.ebuild b/sys-apps/hwids/hwids-20190316.ebuild
deleted file mode 100644
index e772a64910d9..000000000000
--- a/sys-apps/hwids/hwids-20190316.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 2012-2020 Gentoo Authors
-# 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,7} )
-	inherit git-r3 python-any-r1
-	EGIT_REPO_URI="https://github.com/gentoo/hwids.git"
-else
-	SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~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-20190818.ebuild b/sys-apps/hwids/hwids-20190818.ebuild
deleted file mode 100644
index a62015c85539..000000000000
--- a/sys-apps/hwids/hwids-20190818.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 2012-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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,7} )
-	inherit git-r3 python-any-r1
-	EGIT_REPO_URI="https://github.com/gentoo/hwids.git"
-else
-	SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="|| ( GPL-2 BSD ) public-domain"
-SLOT="0"
-IUSE="+net +pci +udev +usb"
-
-RDEPEND="
-	udev? ( virtual/udev )
-	!<sys-apps/pciutils-3.1.9-r2
-	!<sys-apps/usbutils-005-r1
-"
-
-if [[ ${PV} == 99999999 ]]; then
-	BDEPEND="
-		net-misc/curl
-		udev? ( $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]') )
-	"
-	python_check_deps() {
-		if use udev; then
-			has_version -b "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-20200204.ebuild b/sys-apps/hwids/hwids-20200204.ebuild
index a62015c85539..13c9146d0919 100644
--- a/sys-apps/hwids/hwids-20200204.ebuild
+++ b/sys-apps/hwids/hwids-20200204.ebuild
@@ -22,8 +22,6 @@ IUSE="+net +pci +udev +usb"
 
 RDEPEND="
 	udev? ( virtual/udev )
-	!<sys-apps/pciutils-3.1.9-r2
-	!<sys-apps/usbutils-005-r1
 "
 
 if [[ ${PV} == 99999999 ]]; then
diff --git a/sys-apps/hwids/hwids-20200306.ebuild b/sys-apps/hwids/hwids-20200306.ebuild
index bbe6c639f9b4..c964e6ebfa16 100644
--- a/sys-apps/hwids/hwids-20200306.ebuild
+++ b/sys-apps/hwids/hwids-20200306.ebuild
@@ -22,8 +22,6 @@ IUSE="+net +pci +udev +usb"
 
 RDEPEND="
 	udev? ( virtual/udev )
-	!<sys-apps/pciutils-3.1.9-r2
-	!<sys-apps/usbutils-005-r1
 "
 
 if [[ ${PV} == 99999999 ]]; then
diff --git a/sys-apps/hwids/hwids-20191025.ebuild b/sys-apps/hwids/hwids-20200813.1.ebuild
index bbe6c639f9b4..c964e6ebfa16 100644
--- a/sys-apps/hwids/hwids-20191025.ebuild
+++ b/sys-apps/hwids/hwids-20200813.1.ebuild
@@ -22,8 +22,6 @@ IUSE="+net +pci +udev +usb"
 
 RDEPEND="
 	udev? ( virtual/udev )
-	!<sys-apps/pciutils-3.1.9-r2
-	!<sys-apps/usbutils-005-r1
 "
 
 if [[ ${PV} == 99999999 ]]; then
diff --git a/sys-apps/hwids/hwids-99999999.ebuild b/sys-apps/hwids/hwids-99999999.ebuild
index bbe6c639f9b4..fdc4a456ddd5 100644
--- a/sys-apps/hwids/hwids-99999999.ebuild
+++ b/sys-apps/hwids/hwids-99999999.ebuild
@@ -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,7} )
+	PYTHON_COMPAT=( python3_{6..9} )
 	inherit git-r3 python-any-r1
 	EGIT_REPO_URI="https://github.com/gentoo/hwids.git"
 else
@@ -22,8 +22,6 @@ IUSE="+net +pci +udev +usb"
 
 RDEPEND="
 	udev? ( virtual/udev )
-	!<sys-apps/pciutils-3.1.9-r2
-	!<sys-apps/usbutils-005-r1
 "
 
 if [[ ${PV} == 99999999 ]]; then