gentoo resync : 11.08.2021

25 files changed, 166 insertions, 38 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index df57e2c940aa..4910fd480590 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index 6c6acfe3267a..320198d571a0 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -1,4 +1,6 @@
 AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2ac429fdf8b8bcc4e387ed686d44b3aceebcd517578cbf6348d751ce2fb62f1b7580d6a645a4f912c7fa374eb165b2600 SHA512 5907aed1745b199b0cad44f6e7669c663761b308b2bb1b669be8ba118d990481c37d1da5477df2cfa9cba30ecffe99c3863215779d683f056fe0c41241a0049b
 DIST help2man-1.48.3.tar.xz 211504 BLAKE2B 407cc87b1238242c202d37c0c4cd394e0efba95759b86a88026aef7c05d6a097d1946614547ebfab45f7fe0c1ddd057724234629246d32e94862c3d633b78c31 SHA512 e000e7380604c0986b14cb64b852d55eff48595884bddd389e876056dde6ce72b37aa16d92230e6f8f6e128003b819954bae4aa90933a58b51d3665d3c0ba356
+DIST help2man-1.48.4.tar.xz 204592 BLAKE2B 0625af5a0a65daeb459a7445ef6e5a8c9ddbac4ebad5c31134bfbbd5abdc1d05cd5e682d2d1f0d4df36de4fdbbbe22ac7bbbb2c1c5fca4d53ee0c6bfefd63dfb SHA512 fa3f3eabc6010a4a34dc108bfa3b9456b9ea66b343ff2913c32cd6da52ddcf3aa8cb9c05a8b14585f314198aa4ef6f1eebbb185b90a2fb923ab3b2ee7b5e57a9
 EBUILD help2man-1.48.3.ebuild 1035 BLAKE2B 2bdcaea0a0b2256abf60dabc5f212b586ff59113f8d3ae541ce21d2f5c7c9a294b18280d741f116ea9dd75d9bdb24480ae6bfd5ac332456174d4ce942ffb997d SHA512 d1bfe5663fe13784f5d08e077f216f3155e44bcddba456413fc495dea90e799703a866f0210c690e4764f8826fb7f2732f8912df095b6e9c1f209432911aae0f
+EBUILD help2man-1.48.4.ebuild 1043 BLAKE2B a409c6688242306b58aa9b395c4800166b31a301bd356cd93505e522169ebb4e1b1b82b61b3f2ed737691956fae33516faf69dd9819b8b07abe4bbc981ab7f23 SHA512 68652e40fd2ab4e8ffd862c9783bc7aa891e76a30419b955891134a7a96f8e132ce08dcb4b1be32937398970dfff57c6a09b401fad7cb6207c16a99a12a2a491
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/help2man/help2man-1.48.4.ebuild b/sys-apps/help2man/help2man-1.48.4.ebuild
new file mode 100644
index 000000000000..2f5c10989e9b
--- /dev/null
+++ b/sys-apps/help2man/help2man-1.48.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="GNU utility to convert program --help output to a man page"
+HOMEPAGE="https://www.gnu.org/software/help2man/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls"
+
+RDEPEND="dev-lang/perl
+	nls? ( dev-perl/Locale-gettext )"
+DEPEND="${RDEPEND}"
+
+DOCS=( debian/changelog NEWS README THANKS ) #385753
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.46.1-linguas.patch
+)
+
+src_prepare() {
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i \
+			-e 's/-shared/-bundle/' \
+			Makefile.in || die
+	fi
+	default
+}
+
+src_configure() {
+	# Disable gettext requirement as the release includes the gmo files #555018
+	local myeconfargs=(
+		ac_cv_path_MSGFMT=$(type -P false)
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index 20e32e429b4e..91780aee549f 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -3,4 +3,4 @@ DIST hwids-20210613.tar.gz 3867741 BLAKE2B 64c4b0a83058a2052f7b132241008a3cc7545
 EBUILD hwids-20201207.ebuild 1671 BLAKE2B c7740e0c4a2b694af30d91f420052ee16c4fac29e6e632ca6d9cbfc9803b774c0c53e7ed8447d30f567e48215bf6cf5323d48cb74041465db14b0f67d603393b SHA512 c8fe09cb6e4523afca06a06fc271414062d89248fd56ae729dcdf513c34c3c9834cb64369a359d97df0b80f369b44b7fb711530b42666dfadbfeeb29147ee674
 EBUILD hwids-20210613-r1.ebuild 1820 BLAKE2B eb942518c31ac71fd8d7eb2ae8abde03122e9d9602ceb187ae6186aa3b85e31e576ea7be7a59b19b7d5cb16490a008f76408770ad0bcc554016d72d0de078a66 SHA512 2d558c49ac5124434c927496faf480dac9cef2f93fce4e338c9fd43a240c37f91cbe928781f676bb6ed2691dd9c26551854e79e0628f35ec2f033722b6916fcc
 EBUILD hwids-99999999.ebuild 1820 BLAKE2B eb942518c31ac71fd8d7eb2ae8abde03122e9d9602ceb187ae6186aa3b85e31e576ea7be7a59b19b7d5cb16490a008f76408770ad0bcc554016d72d0de078a66 SHA512 2d558c49ac5124434c927496faf480dac9cef2f93fce4e338c9fd43a240c37f91cbe928781f676bb6ed2691dd9c26551854e79e0628f35ec2f033722b6916fcc
-MISC metadata.xml 647 BLAKE2B 88b205060dbd1c22edb25b740b5b84d0b36e8746a8bfd5793ab385afa2afd34e54626c2b09e59dc2cf91d838ae44dea878be26cd9cab83a98054a3d0b4bfbd52 SHA512 b05dbd41c2a839d2ac8baaf8ee2352ee999d48deb123c54e048da44cccb06f64729620983848a6b16ada8af50e6fb68adf15323ff362f230b7213f485b1ec27c
+MISC metadata.xml 687 BLAKE2B 112bd041c34e2ba27e9b96a9f7a8bc66c048aa755e7d7536c3f53f2f6e9130268883df23c8c1118f0faa9b3007b49b266c2fc2cb15fbe5ac5a5429cc50693929 SHA512 06f7772796e5b76e6e1d08018ad7940af28232852b04afadf14676c6a0ef33df8614be01696d8f9e75377b805a4c26912da2a21e3175769e54e0dcb3ea555537
diff --git a/sys-apps/hwids/metadata.xml b/sys-apps/hwids/metadata.xml
index d3fd22109cdc..7aad08273d14 100644
--- a/sys-apps/hwids/metadata.xml
+++ b/sys-apps/hwids/metadata.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<maintainer type="person">
-	<email>floppym@gentoo.org</email>
-</maintainer>
-<use>
-	<flag name="net">Install the oui.txt and iab.txt databases</flag>
-	<flag name="pci">Install the pci.ids database</flag>
-	<flag name="usb">Install the usb.ids database</flag>
-	<flag name="udev">Install hwdb.d rules for udev</flag>
-</use>
-<upstream>
-	<remote-id type="github">gentoo/hwids</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+	</maintainer>
+	<stabilize-allarches/>
+	<use>
+		<flag name="net">Install the oui.txt and iab.txt databases</flag>
+		<flag name="pci">Install the pci.ids database</flag>
+		<flag name="usb">Install the usb.ids database</flag>
+		<flag name="udev">Install hwdb.d rules for udev</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">gentoo/hwids</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index a5899b3cb0cf..822c9f910787 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -9,6 +9,6 @@ DIST iproute2-5.12.0.tar.xz 835880 BLAKE2B 8e3e1b7188d7ab5014d06d7edaae2cb0c1dc6
 DIST iproute2-5.13.0.tar.xz 845236 BLAKE2B e1c148e2a720236163e7f4d46aa38d244a02ae36ad86571c5606d54c9ccfd8d0363e2fb793d48cf39aae322b3c36b9f8a43eaf570dbdb8243092926cef3d2786 SHA512 a3286639fb303a7c3c553cb5df0a7336c4c67e53eb05e872d2776b771dbfa36ffdf2df140f570275db6785c882992f469f8eb34a5b506aac876216df7dde245d
 EBUILD iproute2-5.10.0-r1.ebuild 4764 BLAKE2B 4b9412a19f175d320ac4f1470f333d7f3ccec76f21a74bf8057a48bc59b2dd44eaa1f7d0466d9a791abaaf65ffc1e606e3722b4a82576e5abdee153534defa6c SHA512 455c325154f857be301998bbd0a693f1b3ae865f36e3e90dff9a23cf6e7d41a7c318bd4c4e7fca840571068f84337ef7bb5801ce4036ef1f430cbbab74528425
 EBUILD iproute2-5.12.0.ebuild 4866 BLAKE2B 45928bd2afdda0cf7592f6ba7c8dd8c9b078c13fc566485e64bb33a486d4c0075b499437a723674fb5e5cab4c42be0ff87a6ebdaf46eaf9a8fda7412d117c38e SHA512 a50ca23d8475b611cf8cc9078db314fb4bfa45af1d98e1d04d99ddce5debe512f72ba467e4cbb9e074d5d33a62e0ea88f064dd6bf0a8b2d0ac5aafd3b4743b58
-EBUILD iproute2-5.13.0.ebuild 4866 BLAKE2B 45928bd2afdda0cf7592f6ba7c8dd8c9b078c13fc566485e64bb33a486d4c0075b499437a723674fb5e5cab4c42be0ff87a6ebdaf46eaf9a8fda7412d117c38e SHA512 a50ca23d8475b611cf8cc9078db314fb4bfa45af1d98e1d04d99ddce5debe512f72ba467e4cbb9e074d5d33a62e0ea88f064dd6bf0a8b2d0ac5aafd3b4743b58
+EBUILD iproute2-5.13.0.ebuild 4861 BLAKE2B 60508d78b8d343ccc648fce9109344030f15c4d6320784df51b924dccdafc9de081087e60b807a16f7091f1ed3382654cc1f0f68aaf9301acc5d6f652c90499d SHA512 b1855948910e80ce6104ffd676d2299ee1b23fc54d70c6c396ac8c768af0a393f7e49b79ae4e8824d163b3785e63e0b49794e06f2a0ff5a3a2db5b0e146ad0bc
 EBUILD iproute2-9999.ebuild 4866 BLAKE2B 45928bd2afdda0cf7592f6ba7c8dd8c9b078c13fc566485e64bb33a486d4c0075b499437a723674fb5e5cab4c42be0ff87a6ebdaf46eaf9a8fda7412d117c38e SHA512 a50ca23d8475b611cf8cc9078db314fb4bfa45af1d98e1d04d99ddce5debe512f72ba467e4cbb9e074d5d33a62e0ea88f064dd6bf0a8b2d0ac5aafd3b4743b58
 MISC metadata.xml 813 BLAKE2B a34634416583a3d6a75a0d02e5e2c89b8e3dd0766a33e13555ee66515dda7bd10c711226701e00adb1b92fc6443d7793adc25e6b446a8ecb901afe268c7e978f SHA512 8fd774dd6bdde1265ace7e9b3f96f19a8afa782bbdbb5633b0e4024663e2877fd4db8e0aae48870c81fa470467ccaedad52c95b0fa9cd2b64829aa1a07e6f061
diff --git a/sys-apps/iproute2/iproute2-5.13.0.ebuild b/sys-apps/iproute2/iproute2-5.13.0.ebuild
index ae69e78cd831..8738ddc2e83e 100644
--- a/sys-apps/iproute2/iproute2-5.13.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.13.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 193dbb7f3f3c..66fd0e684d96 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -9,6 +9,6 @@ AUX kexec.service 407 BLAKE2B 7854172c36f550fece58b6cb351a6bd8b4ab8b5a11da0fd629
 DIST kexec-tools-2.0.21.tar.xz 303300 BLAKE2B d5b7bddeafdcbfd2b07dab6e4f167fcb61ccf2ec487f1835ac552a4596d22a94a7297d0eb769913f84eddc564ba4d9ae0c9d4c76994d0e3670fe168f377ebc77 SHA512 f487d2e243c2c4f29fbc9da7d06806f65210f717904655fc84d8d162b9c4614c3dd62e1bb47104a79f0dc2af04e462baf764fb309b5d7e6d287264cb48fd2a3e
 DIST kexec-tools-2.0.22.tar.xz 303564 BLAKE2B 977c741eabf9b6b882550713ba59b18289b4f997fb382e96338efce6d04a9390fea952fc46ca72fd0a0b782261841ab2002da84b1819f955e63996eac900b0f7 SHA512 7580860f272eee5af52139809f12961e5a5d3a65f4e191183ca9c845410425d25818945ac14ed04a60e6ce474dc2656fc6a14041177b0bf703f450820c7d6aba
 EBUILD kexec-tools-2.0.21.ebuild 3263 BLAKE2B 81df746fbd75d29a45e23cc1b1509dbe7c99e2a34cae30a04625dd13b41c770451752eb7cbfc2c53bff33948aa666119fdac81ade871c086973b27e70f1f0331 SHA512 dbb7744f92104f1a174a90c30eda7a384c43d3659f36f1103987e4a6354c77d21b3c45f9c4053fae699f13b1e87550b7ae7f3b1abe6c4fe31ff9a7d97a4868d3
-EBUILD kexec-tools-2.0.22.ebuild 3265 BLAKE2B f1b79999adf8df2e0a85cdcc2cd25027e78e8305fd8ba10d530cd2db3d31f8f5a148b978131c77871f4b0a97c0b496fa342834e8b8c4fbea74417c82a36f430e SHA512 bfe4ebad0b2c3e5281309e8f7b76f9f2f5a4a6b19f46b8077b1f066d0a9e41b0dd529d19071c660021d7dad41e9d86b1e5f3af3ca4149a2ea660af89b2eafd5f
+EBUILD kexec-tools-2.0.22.ebuild 3263 BLAKE2B 81df746fbd75d29a45e23cc1b1509dbe7c99e2a34cae30a04625dd13b41c770451752eb7cbfc2c53bff33948aa666119fdac81ade871c086973b27e70f1f0331 SHA512 dbb7744f92104f1a174a90c30eda7a384c43d3659f36f1103987e4a6354c77d21b3c45f9c4053fae699f13b1e87550b7ae7f3b1abe6c4fe31ff9a7d97a4868d3
 EBUILD kexec-tools-9999.ebuild 3265 BLAKE2B 1f5c5356f79113a1956d1b57dcb570f4bd0327ab03aef0917e06cac9cd6e7c1ae02ca530dd9e95b1f8e8f1b9277dd5c96397efb8881cffedf2a8096107e6ccb0 SHA512 163fd666f3f892d80c12bb809f5ef8a5494ba6a3f13bb5e1679b89795d943c19735c631bddc0f3ab51abf417413c20d24af47143941bd35fec747dc1d500d246
 MISC metadata.xml 490 BLAKE2B 87c80e53801415341290c29dbc0728a4d084519c38f5c5d14bedde32596111f4cbb91c72ed36b6a8fe3f63ad715df57d59b2a61730ebe08ff7f2bc868c8ff916 SHA512 6f4b25178cc6b8ff3fea664f2717eb7268d9e71c4ca46c170887eb836f9d78dff7e64067968175d018dc22bbcc2bb8cd6fd5f44edba0966fa568f9fd827a1cff
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild
index 0879b84e6744..897b98a24b69 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 fi
 
 DESCRIPTION="Load another kernel from the currently executing Linux kernel"
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index d0be6e046158..d3deee9cb050 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -2,6 +2,6 @@ AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52
 DIST kmod-28.tar.xz 552448 BLAKE2B af41a0c5681fb94eb5264f46ed2ae666d171d4e2d0dc21419a3c2f4b12a783350a06b408fb02a7afb00fcea1cd994ee35864c1ec8b7a8cc58a8c9dcdeffaf1b3 SHA512 50646dc72675a5e17b01e327e3d41b972f18aaeac20c8b00983c4d099c6218f35c32c184a833a2d7f716755d6a86851c90913d2835874cef933bdc4a9722df9a
 DIST kmod-29.tar.xz 560160 BLAKE2B 1362b6e7c07f66594074f07239d0f7a64e6efeb928483ed027b22a4ac77b916c631d1c03780b0515714a87847a716c35341edb1ced04a1795b4c7f8942d3207a SHA512 557cdcaec75e5a1ceea2d10862c944e9a65ef54f6ee9da6dc98ce4582418fdc9958aab2e14a84807db61daf36ec4fcdc23a36376c39d5dc31d1823ca7cd47998
 EBUILD kmod-28.ebuild 5224 BLAKE2B a332a2e2544d737b006d0179974de3f86baabfef69ef8291d9c1dda3df94829e2b37fd44862e194eff6107395dcab0ec50ec8e6d99afa136e332212feb34a49b SHA512 9eb983c787a706e7ae56d6b73515d176257ce189a2547405062f5b71a3f6113cea949dd0f73bda634e109608c78869ff40d1bc0cf216b0fba42d780f2a937492
-EBUILD kmod-29.ebuild 5236 BLAKE2B b8c89c6c4dcddf2b9da47b0b7a6ad342e155f30fadbeb74a1867b3ddee1b6575578407314c116afb19d1597d9a8ea34d5d4fb9ec7ce3a20ad62f51dc257c28ce SHA512 03cb2435a15e335a7a85d3fefea00b25e1a8561a7129b4ff173838092949d0cd88ff90df4ddf4522be5c1df5dcd4b030a22d3b545bb90d87b729167daabd3b1c
+EBUILD kmod-29.ebuild 5231 BLAKE2B c040a74b53bc30ae0bbed9b28ca5c97d6cb3dd8e49ae6f754ae400636d8b2c0cc285192286ba110f325be1c34dd5a4eb773d53b80020dd7c49c80c0ac4e2a88b SHA512 6f472fe7c20c7e6f7e57f1aad983b7143084ddcb0691d33d9ade981621bf8683f4c74cf9885a1a775d96b00862c94cc06ce47ff61adea02c7d5a50745903218c
 EBUILD kmod-9999.ebuild 5236 BLAKE2B b8c89c6c4dcddf2b9da47b0b7a6ad342e155f30fadbeb74a1867b3ddee1b6575578407314c116afb19d1597d9a8ea34d5d4fb9ec7ce3a20ad62f51dc257c28ce SHA512 03cb2435a15e335a7a85d3fefea00b25e1a8561a7129b4ff173838092949d0cd88ff90df4ddf4522be5c1df5dcd4b030a22d3b545bb90d87b729167daabd3b1c
-MISC metadata.xml 689 BLAKE2B 51a8819951b28ef934c7de80176ef6aeeacb09ac073a7fcf056428ee2c1a0ad851119e680b4ef2cdd48a26541c2a3e16f6cb6606231a6ed542a00cfdb0e3b2d4 SHA512 4282ad5b89b14e8e50aad8779e68cca6eb2e1c876a3284b6782a221c0da2e79db871d1d23d686c8ac1532ea453faa1291ff596afff716431d0560460953c3aed
+MISC metadata.xml 610 BLAKE2B 5542dbcd20e0cdafdb03ed48b19c34c52fce92564c77cedbe2d254e139f6d7976f28ad3a385cb445d4e043d2aaae4349cbc44c8181aaa8f7a177425c0646dc3b SHA512 8aa83c2b3d40025544c23423359d59a9ae1a9595a7745afe4b719427099729ebcaf8feb7d707376e2af737aae6a6f08a2208856ec317de18c0e80d9ab2c49dc5
diff --git a/sys-apps/kmod/kmod-29.ebuild b/sys-apps/kmod/kmod-29.ebuild
index b2369d923557..597d1a664056 100644
--- a/sys-apps/kmod/kmod-29.ebuild
+++ b/sys-apps/kmod/kmod-29.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	#inherit libtool
 fi
 
diff --git a/sys-apps/kmod/metadata.xml b/sys-apps/kmod/metadata.xml
index ccb7f0ba6875..14a7eeb6bb44 100644
--- a/sys-apps/kmod/metadata.xml
+++ b/sys-apps/kmod/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
-	<email>udev-bugs@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index 543d36eb30f2..b53d9a3a0183 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -1,3 +1,3 @@
 DIST lshw-02.19.2b_p20210121-B.02.19.2_p20210121.tar.gz 2469481 BLAKE2B b9a886c21d6abde00f234cc93fc25ae2b4cf734ffd3fdea7847283fa44eef80bfddd6d83ab428c126ef6518eb8da35f3ba15d88cfc5dbb304813a4d28c173351 SHA512 699ee270eb9a8dd6652d7bcab5d99187585159428bdceab2e17add51e29d73a929a4d34168d92308e775383b9920b07e3b02e0781f9f1b1f099aff3550e9b0c0
-EBUILD lshw-02.19.2b_p20210121.ebuild 2255 BLAKE2B 332f1b5d59a98901e28f3c39ee1a883f91a5c63a52c81f46f98e95a4baf7665d14a59ea9db80cb87c322d7cf0e2731e64f9734ca34de09d730bfb51ee90258e7 SHA512 d9c6a1a153a8325c0d0d5e361a8bf148ba174504127b6345997b693feb3be26876a8b8980683f1b19009f36800fc2a2cd3bffd7603d246b4d74873a19fd2c707
+EBUILD lshw-02.19.2b_p20210121.ebuild 2262 BLAKE2B 76c1c74029c8115c2894a8bc13683cff4afe075442c2e09a81434dd799e329c5780e4c83420d70dad22f6644e9313a8f64b35d18e6c49859878090769e6e22c1 SHA512 ec6a140e7f30ab39965beef848362e8a20672f8da50fd670aac236f5d9caa97f4e555849468231fbd38631600f910f13b6c342b68a30c7f0ce93c45835ce3280
 MISC metadata.xml 461 BLAKE2B 85843f85ec415a571d44f8c7bd8b04baa11e58141cc6bc7c0a0561628e858f9c8881d5737314873f5d4ba6788b36d54a9bb434ccdba3d2f1c435957b3972acce SHA512 b824f0e4251e52f1bb5283faba663d74b93c35bc23963e84826be85eeaffb6481b66ffc2548736cc66227be24bfb230cbf77cfe9d72d7ac7053abb26f980c6b3
diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
index a250b59d2873..1d03cec797f2 100644
--- a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gtk sqlite static"
 
 REQUIRED_USE="static? ( !gtk !sqlite )"
diff --git a/sys-apps/memtester/Manifest b/sys-apps/memtester/Manifest
index 7b826ca7e8d6..cc8cb50d422c 100644
--- a/sys-apps/memtester/Manifest
+++ b/sys-apps/memtester/Manifest
@@ -1,5 +1,5 @@
 DIST memtester-4.5.0.tar.gz 23286 BLAKE2B 841b68026a9b4eae69490c469dbaf062500b642d9ab11e3b1052e7c850e49af3665d0fd01c49670cf297ea5e03a4916ea01bb0219910d487de87568060115e2b SHA512 17df913509df33851fbc58751df993a77bff765a9799ac2b7976518b0a659a2322c9a93a7438e9daa314035e0c08cfcee5cbc97c6be1631917c47e221f15d363
 DIST memtester-4.5.1.tar.gz 23655 BLAKE2B bb7214a41f7cfa39dff6ab4f1efcd1788f5e6bd4cc1defba8c77ae030321703c1da7b6c1c6f1a67ea59e2cb9fc960772b710050b7c6d14b0799db4d9d99e9c31 SHA512 cf5744f11a931338a94158aee3047ad2dab18b0cb27b8998184a98f33aaebc678beec74841a2bcbbd7154cc2e46a20f746d9cae01a9274714bcedb93f29f8c80
 EBUILD memtester-4.5.0.ebuild 721 BLAKE2B 899588b6707b5cb7d7f5ecec63089e577202e3934981c2fb72785bffe0a0073c99f74a6bedcfdc34a5b84581a5f9103a9329eea2bfebfa76735a188ffe1187b7 SHA512 05557e5a04890b7fc6424e603493504793d68921c2325da5e94809b16aa431c79b34269e7119a8ad40474eaff09986302b908e4780b6ff3605b5b27cbe3ef1ee
-EBUILD memtester-4.5.1.ebuild 733 BLAKE2B cd4e9114110d48f4b50791f990cebd35f6380689c86eb532ca67c697987891f782b6bec3993c989f0ee97b589e32c2ace9aa9dc3ce5c8997fe7f38650e255b98 SHA512 3b568cc76fc439515eb74e2e553d86f61364124d92607530ef31a8e866ce817956f7449f0dee64a16592c4a263f030c619339d270e494563156045ae838973d7
+EBUILD memtester-4.5.1.ebuild 728 BLAKE2B 9d1c8bbc95d6b1c6807916be75a244cf34228d1a35073b92eb4bce54b9c6da8ea9b50b8a65005db67b0ae8d3350aadb67fe8829b8604e2713fa3a7eef5286472 SHA512 2ca0d5f496f430cac3e55f3588fd599ca1eda0600ce3bf94cd291e1357ab0896078f38a730da3eed8ea494e0597005d7171076ea4f791f8dd3e42277264baa6b
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/memtester/memtester-4.5.1.ebuild b/sys-apps/memtester/memtester-4.5.1.ebuild
index f4e51b6711df..4f984ccad2b2 100644
--- a/sys-apps/memtester/memtester-4.5.1.ebuild
+++ b/sys-apps/memtester/memtester-4.5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 
 src_configure() {
 	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -DPOSIX -c" > conf-cc || die
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index ced88fae7567..91df7ff50ccb 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -1,3 +1,5 @@
 DIST osinfo-db-20210621.tar.xz 118292 BLAKE2B 6051916322b52cc3496819a29257940421dfaa3071a7d3adc2aa644fd04e1100b2c6d272e88a9fb0205d97c4b7e9035f6e4d5833bf901b985c472164ab98034d SHA512 c0ed0621d799b6515038716bd3b78f6b9f7fa6f80dc83899f691e69a9dc604a43d8d36f0ba5810c68731f0e3ded5fac0a66b7be9c66a14d501384c6850bdb797
+DIST osinfo-db-20210806.tar.xz 120664 BLAKE2B 1b52a2eee65e947dba9929e09758212a02cd3b33930abf0fb90ee99692e9f454bc1151d75357e4d3eecd5cb65e39f70a0effeb153ce71c3a24ffc0ba334c77df SHA512 cd71e85e88bdb4d904ab078ef77799c3e74d922e466889713124cb5e3d4138a28fa6c83af6f30e299e33376b9ff015f679611d2e5849c36923428cd78bafb120
 EBUILD osinfo-db-20210621.ebuild 646 BLAKE2B cb2303b33652d1a20a3a7daa6e09803d8f099e7d30bc6f6165c6627ec68547e15d381fb14e309584f9ea3cbba5995ac212969d49bee13b93e3702708217c8320 SHA512 91a69da519966c175e9ba3712ca281e5b1bd68f936c97c534207a7913bed8d105d9539f1af81fb2bfbbdce52917a32e4b3bdbb51ef404e2c59a872ddc092b91d
+EBUILD osinfo-db-20210806.ebuild 649 BLAKE2B 80c3a428f78561c85970aaa059ad466cd0d8e1a3c322b705fd42248a0ddbbc39f3b7949c671b67a93e746d1ec2b2fdd6b8a32b69bd143adee059a242d6c5ff1a SHA512 1b79aad1bba76087ea026480b9ff907aaec79701f0a2f2844a37590fedd7e55394759761ff948710acad4289db8e50c7a34c7cd3201e62d1b2abb2b84f4f6ffd
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db/osinfo-db-20210806.ebuild b/sys-apps/osinfo-db/osinfo-db-20210806.ebuild
new file mode 100644
index 000000000000..b76468286d57
--- /dev/null
+++ b/sys-apps/osinfo-db/osinfo-db-20210806.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="osinfo database files"
+HOMEPAGE="https://libosinfo.org/"
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
+S="${WORKDIR}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+BDEPEND="sys-apps/osinfo-db-tools"
+
+# we don't depend on intltool here, contrary to README, as the tarball already
+# contains the processed results with translations in XML files
+
+src_unpack() { :; }
+
+src_install() {
+	osinfo-db-import --root "${D}" --dir "/usr/share/osinfo" "${DISTDIR}/${A}"
+}
diff --git a/sys-apps/systemd-tmpfiles/Manifest b/sys-apps/systemd-tmpfiles/Manifest
index eff0069937ba..1fd9354e2987 100644
--- a/sys-apps/systemd-tmpfiles/Manifest
+++ b/sys-apps/systemd-tmpfiles/Manifest
@@ -10,4 +10,4 @@ DIST systemd-stable-249.2.tar.gz 10591728 BLAKE2B fb24c681cf2328aa26fa49a8ba20cc
 DIST systemd-tmpfiles-246-musl.tar.xz 25860 BLAKE2B 87fc4ca37abec9c1a0cee48bf78c575bd53e16a50d427eff338159dc6d5474ffd328af533ccf90a0e1e160a16baa7378070f418f2be0d7f77e00907a5d07d30e SHA512 4a93d9f0cb2df2dd0a2f91820615dd3a95d19583f45dc0589e37ceaedfc2040112310a6e3fc525e28e222e96a91498af2fe8541b5bf86a635c0f52dd1a84deb7
 EBUILD systemd-tmpfiles-246.ebuild 4802 BLAKE2B cea13522b54ef9644dc274e4ccf3c3f2532f93eec3b7edb467e0505479a42463576dd971377407067f59f34edcc0e6a5f994ed16a6b9a0a532ee23241d80ffde SHA512 1cbf46e13a8a48e9e6659e580dfa81c356337ed63baae7a8ebae055e60932ad83283de1be9922104f57d61fc44dab9750fb7cad37a5e5f4896544e3c932453cd
 EBUILD systemd-tmpfiles-249.2.ebuild 5910 BLAKE2B 040f11ac201f67fad61449f848bd8df4eb14b12fbb77596b88ad074a27372eab05a714e7cea1f3f2eff904555f2fd939b601cf2047f3c03c3efe92f71f1685be SHA512 edff3dd451bd6132b1757100e414bace0e99f241c03be525219e8596ee90c5af7cbcdcd5b6c0c55ce1b54b958fd0912ed1ac7efd13b93f07f54f0774256ac5cf
-MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
+MISC metadata.xml 360 BLAKE2B 88025ee1295db8e637c6cbffcaee94574e8573a884b109bdb1793c1ab8ccb7da0f6ef654c4f1ac045071c1f4af04e6b2a0f5dab096b6ea97ce1d93a230eb89e7 SHA512 e3a37b3af90a3ba1ab0ce4efaf41dec616c50f6905da76e9e5919243134057494da6674cf56a8b1811d71ada2a619113167154086f4aaeaeeab94185e4de8ab0
diff --git a/sys-apps/systemd-tmpfiles/metadata.xml b/sys-apps/systemd-tmpfiles/metadata.xml
index efcd58fe0b9b..b1f47a8f4984 100644
--- a/sys-apps/systemd-tmpfiles/metadata.xml
+++ b/sys-apps/systemd-tmpfiles/metadata.xml
@@ -5,4 +5,8 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index c31ce40dc2e4..2961c593c361 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -7,6 +7,6 @@ AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab2821
 DIST systemd-stable-248.6.tar.gz 10388927 BLAKE2B a102d0fd37a3422f673ced2bbd5bb88b6589195e1f436f43231fd91d79aaf9f548154a3ab2a62a9b409527b3f2e7a9ea735925364ece15c2e151d06c0e4f303f SHA512 35a9d4a9ae04423959c71ad0175d04a1792b9ab39897a497776b93cea166de58b8fb111207c104c0e747d3ffbd85480d8b0cab38e3dc0defbbf09b15211954ce
 DIST systemd-stable-249.2.tar.gz 10591728 BLAKE2B fb24c681cf2328aa26fa49a8ba20cccd1ee0fae82ec9f9931a69eaa377fc01b2ece12fdf407444514d494b8ac1418f155b0fceeff4925bebaba691f0b8a2acc8 SHA512 4f42a0b93156529a464545361436fa98193e12a7e0809315b9fdedbcf33b81dd2037acac27fb0dfefcb2679bc49ebb6da4d152ecb4b15db797c81f7ca4588a11
 EBUILD systemd-248.6.ebuild 15225 BLAKE2B e6f52236abedad5db4c80f01aeff4f5df3c9542f733945e33128e45da4ae758c2182d00583c690f359131e0bdb88968122b39360f97adf4f5b8d2ff8347c74c4 SHA512 3c03bbbb6d50b7cfb78b9f0932f988241efea10785b3f83accfe3edd9b98dd39da9572aeab5ac3779db8c72645bb1e436155b8a71800f30f12e4b1a4755428d3
-EBUILD systemd-249.2.ebuild 14935 BLAKE2B 7ad2fa83ae177e7d3f36631f253a0bf1e785ac210df0775fecc9aa86f4e42c20bf53dba1b8545f95e1f82452444ca891ad0b3c413003fa1f6911ca0ee6fc82c5 SHA512 21976a9d95425d7097fd884c3af5684dbede5dce3e7431d7a47a98484c1ceede03bf86bb7c6e7ea10d5969596906bc6d6e305f844974140355e6d194625d5eae
-EBUILD systemd-9999.ebuild 14847 BLAKE2B f1fe499bd623a98a35be52313e525dd014a35a945f4532aa28db6938a41cd60e0a656beacee915373444a97639b1fc4628e18e27be2c98b0d2804d2a6a0ce987 SHA512 0b45deec2279c3642a2a39e84225c6b776a5fd621e7fdf65967c40cf3dca326fc2c08be161e41856f5375399701529503fa9dba734355659d3e084d70f521dda
+EBUILD systemd-249.2.ebuild 14935 BLAKE2B 16b00d91217a3c399b44b9c533524676f5f86ec66da471f047797dfc0b18a226cf37b18436b23550a95aa8fe218f049d462461164ea7d9d3d847c9f6b8ddade5 SHA512 385d55b929939191a21e87b54ff188ba13e7cdad3350b5539996b703bb823c8959f96d312f3b392d7d8981b4debc34602c0f77542a1d045c68b7e26fbac0afe0
+EBUILD systemd-9999.ebuild 14847 BLAKE2B 35b58ea0c0d9702e7c4074a20f6f0d6af62d209b1b2faa86e0ebf08eb678c05397deb6e2cd36970133a0f9f6367624f4df126519371a2ca136af08faa3c30785 SHA512 04b4aff2da305a507b46d5dcf5d217639c2c2ab3077fcd4d58f621486191f6c5bc4d77bd0eb30f4976f98cb99380107cd4008dc551ebf17da425b007ed987b71
 MISC metadata.xml 2418 BLAKE2B bec7b05950f495cd678359bca70723286c33d4943407fee45e1214a53d9bfbbb25d3612a5b1bb51d885c38ea63719b3de2f0341d2b8aeb5d5919a29459cb89e4 SHA512 46979fbafe3561a722efefeb82e283e221cb930e56e9f43c25a47c299712dac21f6ef4c970afed86cb390e21dc8dd86b23eea310d5dd7e66a7a6fde250b929d7
diff --git a/sys-apps/systemd/systemd-249.2.ebuild b/sys-apps/systemd/systemd-249.2.ebuild
index 9e5fa453bcfd..da6cc62575f2 100644
--- a/sys-apps/systemd/systemd-249.2.ebuild
+++ b/sys-apps/systemd/systemd-249.2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
@@ -19,8 +20,6 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python3_{7..9} )
-
 inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
 
 DESCRIPTION="System and service manager for Linux"
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 71b8f9c1b29c..260f9ce67e0f 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
@@ -19,8 +20,6 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python3_{7..9} )
-
 inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
 
 DESCRIPTION="System and service manager for Linux"
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index 6094e140a069..1019c660974f 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -1,3 +1,5 @@
 DIST usbutils-013.tar.xz 98056 BLAKE2B d6e7925e180ba90f27ca12f13ed985f34e51b230ec08188c91bf39bb8e64baa319aa63d473318e1a4cb21b53808e8610f837ea0bb85657072f1c70107d037873 SHA512 eb1751e5b82f7a1bdffc667662cebee6fd42f466e59d4eb4c98f0d3723d740305377da1df1ba5831402fddbbd1697bbfa2abd22d9ed175e2dee55d6d007e9e54
+DIST usbutils-014.tar.xz 165884 BLAKE2B aea4f8edd3c7d7bc400fd63a8702b6d0bb50b8ed07196c4a0ed20a615eacf6373794afb9e7d5d81408dc3382848e965ecf8bc1bbec20837e4d1f96ba47cc40b5 SHA512 43c9f6ed14f8d01e014ef39a5d50b3b09031c6bda8261e0945b4cb4287c9107104175b386c2adc61dc7f9f476afb30f9a647a6ece6dee26b4133a4f10af72792
 EBUILD usbutils-013-r1.ebuild 1266 BLAKE2B e715e4c409dee03b1ea41f1fd1ba92d66034f3ce920831b7ed637d2c1a10ec09b887ce0b5173fcc762335c15a86df9584e76625a5a490e21aad03a3870ee0f66 SHA512 e41434a389bd60fc473427eb5f58f27a4856c5037016affffd8c3d09bd5661092e4af9b3504d6ad655981976c70040cdf0b68b08faccc504965642b33cea1f8e
+EBUILD usbutils-014.ebuild 1321 BLAKE2B a1836fdc1ceda8e011a9f2cf7470f810ac86273effb79246fcc4688d82bc2f0c1e5e522b176e5acf122bb4ec59d04f7992ba587574858330c2f36a145c92905b SHA512 a621391f81992d173cfd6c8da77538a03cf43c2c9b1e176c42ec5853ffe2fec4d785a9e0a58ee46e90b81ee0a51e36339bef7dfe5523106d1d9a6ec326cfbc1c
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/usbutils/usbutils-014.ebuild b/sys-apps/usbutils/usbutils-014.ebuild
new file mode 100644
index 000000000000..14581fea76a9
--- /dev/null
+++ b/sys-apps/usbutils/usbutils-014.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit autotools python-single-r1
+
+DESCRIPTION="USB enumeration utilities"
+HOMEPAGE="https://www.kernel.org/pub/linux/utils/usb/usbutils/
+	https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/"
+SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="virtual/libusb:1=
+	virtual/libudev:="
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+	python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}
+	sys-apps/hwids
+	python? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+	use python && python_fix_shebang lsusb.py.in
+}
+
+src_configure() {
+	local myeconfargs=(
+		--datarootdir="${EPREFIX}/usr/share"
+		--datadir="${EPREFIX}/usr/share/misc"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	newdoc usbhid-dump/NEWS NEWS.usbhid-dump
+	dobin usbreset # noinst_PROGRAMS, but installed by other distros
+
+	if ! use python ; then
+		rm -f "${ED}"/usr/bin/lsusb.py || die
+	fi
+}