From 2771f79232c273bc2a57d23bf335dd81ccf6af28 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 5 Dec 2021 02:47:11 +0000
Subject: gentoo resync : 05.12.2021

---
 sys-apps/hwids/Manifest                 |  4 +-
 sys-apps/hwids/hwids-20210613-r1.ebuild | 93 ---------------------------------
 sys-apps/hwids/hwids-20210613-r2.ebuild | 93 +++++++++++++++++++++++++++++++++
 sys-apps/hwids/hwids-99999999.ebuild    |  2 +-
 4 files changed, 96 insertions(+), 96 deletions(-)
 delete mode 100644 sys-apps/hwids/hwids-20210613-r1.ebuild
 create mode 100644 sys-apps/hwids/hwids-20210613-r2.ebuild

(limited to 'sys-apps/hwids')

diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index ba0308bc0aef..58ecd56d62cb 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -1,4 +1,4 @@
 DIST hwids-20210613.tar.gz 3867741 BLAKE2B 64c4b0a83058a2052f7b132241008a3cc75452e93a9a57a9159c357c23fd09ee256abc2b94e700b5d8e8bd4e231ae12932d2c2f32fb03853207739cb3387047d SHA512 4568f6b8c0ca80ec772bd2785d4dc169d1d13a721472a15399158d9a7f31abbe414c5c8cfdf1a3b81cce4e33742a4b6e005e97e3e907643d0afdc8e953624fea
-EBUILD hwids-20210613-r1.ebuild 1812 BLAKE2B f81e6e1eeeefbf33fa23caa13b2be3aeb65ca27e937f42b9f549f67c6a735d3660a6b500c034970c53caa8fe69a6e0a48d042a591c5f6cef678727bf5b29bcd4 SHA512 fb676007968823fa172fb931218355cb56a77825f1468cd4c6fff4dd078d9b7d2fbdc8ce913a1e519dfdf866339c0feaeb1210514cde3e7355369c3aa8c89c9d
-EBUILD hwids-99999999.ebuild 1867 BLAKE2B baf5245fdaa4bc338b5548e9c99cca5ea3441cf237c4c1bb9ce26b8bdd0eaf24f45182a6e6e959385d334102994878e438c712c2eb037b613c8a75c16439b753 SHA512 0c24ad14a699b5e43d3f1856b051222a57313229524271cb137fcf334496ce95b29afda445e6df7142aedab9f8dfe30843394000904d0ca8007d77b2c163ca07
+EBUILD hwids-20210613-r2.ebuild 1815 BLAKE2B 2d6f63cc7f0d087f82e925413eafaba4719ce8fa7e62398a2713b9a064a2815915b6e49cbb2bd87fffb2916829c2247bc0341321c28fb87f6c3dade934d559e0 SHA512 c63987d13e542af70492fec4e7b8d7c8cba8d827a201ee62b403b5e62c8c1796799dd5eb0e1796c1b35caee80f7f662fa970a08566f702d50882250f2b6374ee
+EBUILD hwids-99999999.ebuild 1870 BLAKE2B cb582e874eec58c42234fa7293f3299c35c3c5cb4938c843d421b786435711a8c22a114fee47a445db71b725a5c587b5be60f5b9f2fece98096970197e483ec0 SHA512 5e75f240ecf5e3277632657e8dd6b73b9374b84ca27f7b3dfddef424038490b3731eb7731189da432f48b1412fd922a2b0d91d94dc0d4584473c59f8af005701
 MISC metadata.xml 688 BLAKE2B ed9af9131f4c007d87fc53131f1359c7f9f52d5a1786bb5b2f5c52742bc7ca14a851efd913749ca9dc922264571faa832c570e4cf593691d50e381eb61784fe8 SHA512 de901bae177f28c7887ef474c7fcc440fc4450c00af4edc66813a33983ac090163d8a466b86fd79bb61a9a124bd084bc03e005040b3efe70a4e2864112c6278c
diff --git a/sys-apps/hwids/hwids-20210613-r1.ebuild b/sys-apps/hwids/hwids-20210613-r1.ebuild
deleted file mode 100644
index b549c583317e..000000000000
--- a/sys-apps/hwids/hwids-20210613-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 2012-2021 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..9} )
-	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 systemd +udev +usb"
-REQUIRED_USE="systemd? ( udev )"
-
-RDEPEND="
-	systemd? ( sys-apps/systemd[hwdb] )
-	udev? ( virtual/udev )
-"
-
-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 systemd; then
-		systemd-hwdb --root="${ROOT}" update
-	elif use udev; then
-		udevadm hwdb --update --root="${ROOT}"
-	fi
-}
diff --git a/sys-apps/hwids/hwids-20210613-r2.ebuild b/sys-apps/hwids/hwids-20210613-r2.ebuild
new file mode 100644
index 000000000000..1918ad974880
--- /dev/null
+++ b/sys-apps/hwids/hwids-20210613-r2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 2012-2021 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..9} )
+	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 systemd +udev +usb"
+REQUIRED_USE="systemd? ( udev )"
+
+RDEPEND="
+	systemd? ( sys-apps/systemd[hwdb(+)] )
+	udev? ( virtual/udev )
+"
+
+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 systemd; then
+		systemd-hwdb --root="${ROOT}" update
+	elif 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 8c09f82f4f23..a4f483a3048a 100644
--- a/sys-apps/hwids/hwids-99999999.ebuild
+++ b/sys-apps/hwids/hwids-99999999.ebuild
@@ -22,7 +22,7 @@ IUSE="+net +pci systemd +udev +usb"
 REQUIRED_USE="systemd? ( udev )"
 
 RDEPEND="
-	systemd? ( sys-apps/systemd[hwdb] )
+	systemd? ( sys-apps/systemd[hwdb(+)] )
 	udev? ( virtual/udev )
 "
 
-- 
cgit v1.2.3