From bd4aeefe33e63f613512604e47bfca7b2187697d Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 3 Nov 2019 16:06:58 +0000
Subject: gentoo resync : 03.11.2019

---
 sys-apps/hwids/Manifest              |  6 +--
 sys-apps/hwids/hwids-20171003.ebuild | 89 ----------------------------------
 sys-apps/hwids/hwids-20180917.ebuild | 92 ------------------------------------
 sys-apps/hwids/hwids-20191025.ebuild | 91 +++++++++++++++++++++++++++++++++++
 4 files changed, 93 insertions(+), 185 deletions(-)
 delete mode 100644 sys-apps/hwids/hwids-20171003.ebuild
 delete mode 100644 sys-apps/hwids/hwids-20180917.ebuild
 create mode 100644 sys-apps/hwids/hwids-20191025.ebuild

(limited to 'sys-apps/hwids')

diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index 39f078903907..1462ebe6305f 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -1,10 +1,8 @@
-DIST hwids-20171003.tar.gz 3035908 BLAKE2B 8ecce99f6a6233b3dd79e1663053b6718fd8b4975a02e5735c1b8483214193bcd45a606145a7709f0b9021dd69e0757361bd568f4ba2d66a52641f691aa7f50a SHA512 6a05963f1883cfeb774671931a32eb9322ead145d4d8aa2fa791e90fc3c823a0b3baeaaa4ce84de0e6a10dcd7f1b5943f6d2cab8790d21e8f34ca1d403598a8a
-DIST hwids-20180917.tar.gz 3211960 BLAKE2B d1dc00994a63a6cb6f7c41c73267dcc38b59a46b9e627fac9d6df285b8d1abf5d1335c02c047bff2b09c9ed9f8e4a1c79329c1bd7dd932949d3db2bbb5b9b2e6 SHA512 9fdcd5a7b3adca1bed886aa83e9cf3944391a819fc9f09b673bd815d95e6e70cecf40d8e87287207e34bfeb58c888188fc61b1c0ac13c1ecab0efbdb5100f8d9
 DIST hwids-20190316.tar.gz 3312959 BLAKE2B d9f4c7170979c404a69ca0b51903af34db01a6150ec70dc1416dcb507dfa4d8ad9ce325204791a24e5646dee67aea0c1566c15dcddb65a5d9dddbbbb9b896398 SHA512 6db50577b5d29d73f1dc0a44d0b74320cb0df186b9850160b15a6e8f2bcbdbf8193bae4146f81a5afc6b0e05706b5286b4b5858eb028d6c58ea4582df61d232e
 DIST hwids-20190818.tar.gz 3407208 BLAKE2B c2a0098cba4a34210461a2781f325a95f18696c1917ff3a1c26a2f56383e9edd087ab6b3a1a173a92df829fc250cf460d915a98298f9c38a71396bf232916245 SHA512 74086f96152482af3c9caabc729f34d193cc619aae88d44aa0472d674b7533ab806b13243c95bfa04417bdd40e3bb7069b766c2c0824f19d0c62385b043a01c2
-EBUILD hwids-20171003.ebuild 1670 BLAKE2B c137a5e62f6a406f44df04a00ff8de0f579d6fdf0003377a0326ee9d15de22b7d390b6b579109867d6199522415f967d805fa514600e03614b59f7930ae1ea74 SHA512 c752d6488344fec0fc328667ad4393907c5d7b937a3753c2f6fb2860a780f69cae9de609a1da9a3f3f9ccb9632b69b1d7dc412a95f77eea5069c01e94be31f9a
-EBUILD hwids-20180917.ebuild 1701 BLAKE2B a17a6884074b364400b1ad9268d82fe965efbaff5c921a4105b1d6b27da1090241e0d5214a03cacb9e133b5cdd0340eef3ea9f2dbe3946260879a211f6ddf5eb SHA512 384206f013fb1f5c5a8c2616ca4ffce3dd89f079a0315a99f2f9aca7ec53d14472e06fcffbe305abfe7a0d46220072f84b186e80163acefa5af965ea26e83deb
+DIST hwids-20191025.tar.gz 3443988 BLAKE2B 0352f1568d7ceeb2c599d789f96a3175703f3c86240188beb9a080eabb6e7659aeeadf193f15050519fb64c58ee8d8832919cf6922b5017861b32be543235a03 SHA512 6f637ca8c4d6b1261c5c2eccd8d1a64ab750f4c36f3d435b50b75949c15e571d83bc61dd6a14e777b53d383d7d02c34f616cc6a62d005db3d965b33b4121deca
 EBUILD hwids-20190316.ebuild 1712 BLAKE2B 9fbc8b26eb0e11df3397863d80798284a67f263fba66575a34b27368c914ad14037ab8580d436f76900d635e53a05dbe566447971ea250d9bc6d25fa4c80be0f SHA512 2a984901b8ee9bf2a1ac5d2d1fd37ed76e7362c07736fe882ec29e474c6a6736871a91b1908a0f4d6cd04a72d06f06fd811f69e889ca0eaaf1200d8fd4e0a159
 EBUILD hwids-20190818.ebuild 1700 BLAKE2B 2b55f48d6f9686de4ac33b9d9f2daf0a57b5ae8fd08bcee25b5c6dc907754e6b2f7a960bc112db74213b194d0f6c7a39172afd5a61ad58a7de7f48fe24f6ee55 SHA512 bee79d34872109cb1b7aa4745b359ca382758e164bcd4fdfd60e2121430c7439312dad09d8ade1d65ed28fe1016983e8ab4b820348cf387646342b47dc4a4e23
+EBUILD hwids-20191025.ebuild 1700 BLAKE2B 2b55f48d6f9686de4ac33b9d9f2daf0a57b5ae8fd08bcee25b5c6dc907754e6b2f7a960bc112db74213b194d0f6c7a39172afd5a61ad58a7de7f48fe24f6ee55 SHA512 bee79d34872109cb1b7aa4745b359ca382758e164bcd4fdfd60e2121430c7439312dad09d8ade1d65ed28fe1016983e8ab4b820348cf387646342b47dc4a4e23
 EBUILD hwids-99999999.ebuild 1700 BLAKE2B 2b55f48d6f9686de4ac33b9d9f2daf0a57b5ae8fd08bcee25b5c6dc907754e6b2f7a960bc112db74213b194d0f6c7a39172afd5a61ad58a7de7f48fe24f6ee55 SHA512 bee79d34872109cb1b7aa4745b359ca382758e164bcd4fdfd60e2121430c7439312dad09d8ade1d65ed28fe1016983e8ab4b820348cf387646342b47dc4a4e23
 MISC metadata.xml 647 BLAKE2B 88b205060dbd1c22edb25b740b5b84d0b36e8746a8bfd5793ab385afa2afd34e54626c2b09e59dc2cf91d838ae44dea878be26cd9cab83a98054a3d0b4bfbd52 SHA512 b05dbd41c2a839d2ac8baaf8ee2352ee999d48deb123c54e048da44cccb06f64729620983848a6b16ada8af50e6fb68adf15323ff362f230b7213f485b1ec27c
diff --git a/sys-apps/hwids/hwids-20171003.ebuild b/sys-apps/hwids/hwids-20171003.ebuild
deleted file mode 100644
index 03f056b8a8e5..000000000000
--- a/sys-apps/hwids/hwids-20171003.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 2012-2018 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 )
-	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-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() {
-	[[ ${PV} == 99999999 ]] && use udev && python_setup
-	_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
deleted file mode 100644
index eeb6f2e07afa..000000000000
--- a/sys-apps/hwids/hwids-20180917.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 2012-2019 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 )
-	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-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-20191025.ebuild b/sys-apps/hwids/hwids-20191025.ebuild
new file mode 100644
index 000000000000..81079882934b
--- /dev/null
+++ b/sys-apps/hwids/hwids-20191025.ebuild
@@ -0,0 +1,91 @@
+# Copyright 2012-2019 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="${HOMEPAGE}.git"
+else
+	SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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
+}
-- 
cgit v1.2.3