gentoo resync : 06.08.2019

4 files changed, 101 insertions, 9 deletions

diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index 7d2c6aa47877..fc04c11fbe97 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -1,8 +1,10 @@
 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 1692 BLAKE2B f5f7f80998064870b8f7a515e19b40412b5085ec46b33d2ffec5f721138be36de0d4dd3687c844d6988619a0276e7a02f1c3195b4b449f3559a9ecfb9f565fd2 SHA512 a6bae7bddd1ffcfc18965da4e568afc1e5246b3746f3b0c1453126475ef33f6f939c76ad5b5291df589e92489c5a0ea038e808ab38350bd52b7642291f50ca01
 EBUILD hwids-20180917.ebuild 1723 BLAKE2B bd739975959bea7e22c5f145e7fb00be9955071b63e83fc24f9ddb18adc41d1d6efe0c2690c0028595ffd57430599794be87779d9f66d6e7a418bfb37e01c63b SHA512 62e67422b893839bba28d6c19d7212c081d216d3b16c03bf1706ed2e59bf500e888ccb7c71d2d30d18b6ca864ccc916186f52f797b183520e69cca9c2fb66af6
-EBUILD hwids-20190316.ebuild 1747 BLAKE2B a433aa6a8aa6b1413c425fffd64464b3979209618fc71704dd2f2b2af826e6e0fc9a36080a3addb07a84924a7451526dc989b99aae3b91796552804d7cfab04c SHA512 9fb6a80f44fc58075e7e29ad7028e7cba1f51d4b2f0d198ed8008ccbf1897e16893ee8d4c4f1b0b219e92644b7a48bcacedb77b139612a8afac823a83d89f9ed
-EBUILD hwids-99999999.ebuild 1747 BLAKE2B a433aa6a8aa6b1413c425fffd64464b3979209618fc71704dd2f2b2af826e6e0fc9a36080a3addb07a84924a7451526dc989b99aae3b91796552804d7cfab04c SHA512 9fb6a80f44fc58075e7e29ad7028e7cba1f51d4b2f0d198ed8008ccbf1897e16893ee8d4c4f1b0b219e92644b7a48bcacedb77b139612a8afac823a83d89f9ed
+EBUILD hwids-20190316.ebuild 1737 BLAKE2B 6420065931867a382974fc5ab0670327bde6f6e588cbeb65a7e0e143186b4e8ed7db787c464374c17c6f087fdd558eea3f645eedead90e25f6e2e30e8e55a3d8 SHA512 d1755667f4c0ef441b2fd23176c89c3725406c3c73684e52893c659c49ae82e42d1daae48cb5216210e20141767fead8d1619eaa7f3d4e622691a2e3447d8321
+EBUILD hwids-20190818.ebuild 1722 BLAKE2B dcdc1c33133c7b16e2f9ddda850559b02e24474c79a95e904d060eed73ae21b7fa257c64ff45de9b127ea27ce97005a82cff184e44c9d6931e36351d633d9c3d SHA512 e7236b612898123ddcb20a675dcad60ce917c9bf09b9a3316bb4dd0e1d26f30dddec906ea65f26ecbe9b84213dd7608185304e0f0ed40450f2270c2907077f39
+EBUILD hwids-99999999.ebuild 1722 BLAKE2B dcdc1c33133c7b16e2f9ddda850559b02e24474c79a95e904d060eed73ae21b7fa257c64ff45de9b127ea27ce97005a82cff184e44c9d6931e36351d633d9c3d SHA512 e7236b612898123ddcb20a675dcad60ce917c9bf09b9a3316bb4dd0e1d26f30dddec906ea65f26ecbe9b84213dd7608185304e0f0ed40450f2270c2907077f39
 MISC metadata.xml 647 BLAKE2B 88b205060dbd1c22edb25b740b5b84d0b36e8746a8bfd5793ab385afa2afd34e54626c2b09e59dc2cf91d838ae44dea878be26cd9cab83a98054a3d0b4bfbd52 SHA512 b05dbd41c2a839d2ac8baaf8ee2352ee999d48deb123c54e048da44cccb06f64729620983848a6b16ada8af50e6fb68adf15323ff362f230b7213f485b1ec27c
diff --git a/sys-apps/hwids/hwids-20190316.ebuild b/sys-apps/hwids/hwids-20190316.ebuild
index 17e5beb8c711..99a221a8e85f 100644
--- a/sys-apps/hwids/hwids-20190316.ebuild
+++ b/sys-apps/hwids/hwids-20190316.ebuild
@@ -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 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv 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-20190818.ebuild b/sys-apps/hwids/hwids-20190818.ebuild
new file mode 100644
index 000000000000..fc424a668c7f
--- /dev/null
+++ b/sys-apps/hwids/hwids-20190818.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-fbsd ~x86-fbsd ~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-99999999.ebuild b/sys-apps/hwids/hwids-99999999.ebuild
index 17e5beb8c711..fc424a668c7f 100644
--- a/sys-apps/hwids/hwids-99999999.ebuild
+++ b/sys-apps/hwids/hwids-99999999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 2012-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit udev
 
 DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases"
 HOMEPAGE="https://github.com/gentoo/hwids"
-if [[ ${PV} == "99999999" ]]; then
+if [[ ${PV} == 99999999 ]]; then
 	PYTHON_COMPAT=( python3_{6,7} )
 	inherit git-r3 python-any-r1
 	EGIT_REPO_URI="${HOMEPAGE}.git"
@@ -20,7 +20,6 @@ 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
@@ -28,13 +27,13 @@ RDEPEND="
 "
 
 if [[ ${PV} == 99999999 ]]; then
-	DEPEND+="
+	BDEPEND="
 		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}]"
+			has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
 		fi
 	}
 else
@@ -87,6 +86,6 @@ src_install() {
 
 pkg_postinst() {
 	if use udev; then
-		udevadm hwdb --update --root="${ROOT%/}"
+		udevadm hwdb --update --root="${ROOT}"
 	fi
 }