gentoo resync : 05.02.2020

4 files changed, 97 insertions, 4 deletions

diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index 2585adf2cdb8..0564745fe818 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -1,8 +1,10 @@
 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
-EBUILD hwids-20190316.ebuild 1752 BLAKE2B d94d883b379cabbdf03e93035fe07515d965dfb006fb0ea3a7d81655d2acb929de505bad235faf05aa28caa4428cc0dd1fe64086edcbfad8d310615c894fc142 SHA512 8351e894631c093f4b7d745c1ecce0d50b88e19445aa5b97c6e6f8ce5650b1c8dcdf85b274c4874658123ec0966c1269a161909cf78a671cebd2d860a6c273af
-EBUILD hwids-20190818.ebuild 1727 BLAKE2B 4b49f53f54d14a411c4efc949a1fea0a14cf505db9b2050e2edb06b797bcb39c2caa29edda47e1b1f84e8b557c2d835560c73e45abfd2181adb7c72c0c0e83b0 SHA512 b550b872f235848704e995d9d4dafaa2ed3ac6a4f1243222bc3847cca6678b74fa8b68192ffd18323d7aad538213520ded45dc3ec695e7934bb098603792fc26
+DIST hwids-20200204.tar.gz 3495191 BLAKE2B 23075b6728d9b0e020be45729d0df4cef95cac5e912e646b612266337d1add59c87a1031e6672c5b6eb23e13c26e6299b62a5886aa25017242a86fd474c1e9ae SHA512 1d2a9baaa7ab64575a3d9b98ae4df9060cb8593ae752365296dd53b18bc5996170bbfe1c5b4b1ffc24b28e3dbaa7c321c4fa333bbf91449a6ca7b187cbe23741
+EBUILD hwids-20190316.ebuild 1753 BLAKE2B c863e859f5fccbbcef0c1fb253476418aaf9440421898520bcc91f652e05b79be65bb4294b748c17782e25c84c0f6cbaa2ab18f3851dfc2100cb3ce9bb211736 SHA512 82db514433c422433afa2060d79e4ab61cd600fc31729fb245780a09b943e0dfd5df0c05cf6f536d845e663619b1b05c44420f037e24ab9c4b7459d31e6c50b9
+EBUILD hwids-20190818.ebuild 1728 BLAKE2B 2e81bf63beaf47798c2ce8476d682ed8eda1718644d67ebfa81e692f503556c3892a14e5fb6d37b4eb0be083dbe3715e88bf17c5db4b1d6dd28b58f76a5e594e SHA512 60bd4adfd2602085716bec0df51bba85a83613bab7f7bec7ea2d099316cf1bb1bda7639ec33ac56cc0d0a6b473dc35fb259a52a82030300792f9144ae65558e5
 EBUILD hwids-20191025.ebuild 1740 BLAKE2B 6924f391e6a0ca5d6492e062223076ab0557f3fc9a99ee41702e7923d871d05b1f0c81522ef5b23fe1250e5d84e498bb0df9fab14a78392b436da837e85874cc SHA512 69057af763879b85549208334b575e5df63f49d5ad7656751d0442f8d601df584afe54bdd83c5d6cd17888bc5ac8a80239521ecf1fbf3849827c35c60713da3c
+EBUILD hwids-20200204.ebuild 1740 BLAKE2B b31cb1ff565dfc6d111864102a93cdff1a38a50ec13933698a73a08c9492a57970abb5c9db3c19e742945ac6809b6eadd86ca46af4a33a8fd0032813309ca07a SHA512 5bbda909cf7b896804d1b5a80474dd0b52369da193dd68e4ba303325987330a257c8ca4aecb97bcade3ad1b8e71b8cb662e0536e984d16740692de963fc8bdea
 EBUILD hwids-99999999.ebuild 1740 BLAKE2B 6924f391e6a0ca5d6492e062223076ab0557f3fc9a99ee41702e7923d871d05b1f0c81522ef5b23fe1250e5d84e498bb0df9fab14a78392b436da837e85874cc SHA512 69057af763879b85549208334b575e5df63f49d5ad7656751d0442f8d601df584afe54bdd83c5d6cd17888bc5ac8a80239521ecf1fbf3849827c35c60713da3c
 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 61cefea68916..e7c075818072 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="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 sh sparc x86 ~amd64-linux ~x86-linux"
+	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"
diff --git a/sys-apps/hwids/hwids-20190818.ebuild b/sys-apps/hwids/hwids-20190818.ebuild
index 0cd5e37d5255..7841497cc9a2 100644
--- a/sys-apps/hwids/hwids-20190818.ebuild
+++ b/sys-apps/hwids/hwids-20190818.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 99999999 ]]; then
 	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 sh sparc x86 ~amd64-linux ~x86-linux"
+	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"
diff --git a/sys-apps/hwids/hwids-20200204.ebuild b/sys-apps/hwids/hwids-20200204.ebuild
new file mode 100644
index 000000000000..bca039bc1899
--- /dev/null
+++ b/sys-apps/hwids/hwids-20200204.ebuild
@@ -0,0 +1,91 @@
+# 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 ~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
+}