gentoo resync : 27.03.2021

51 files changed, 859 insertions, 656 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index e36eaff012c2..0c28c92184d5 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/bolt/Manifest b/sys-apps/bolt/Manifest
index c2b6e3440657..681d4d91227b 100644
--- a/sys-apps/bolt/Manifest
+++ b/sys-apps/bolt/Manifest
@@ -1,4 +1,6 @@
 AUX bolt.openrc 362 BLAKE2B 1cefc0db24bcd6dca7483a582f89a68800e13651330d8873c2b9f3042c70e0f8d8a2b7c363ceeae5ec63fa4b736b42e129f9e90ea4a576e5419af7e0e26d848e SHA512 59616543c6cd101373249b06bcbc0b7dd13fb2c8e45d6dc61a56088434cdf0a6b57630471bd2d788dd6253b66bcbfc3ec60b11ba8442043e837119130344216e
+AUX bolt.openrc-r1 374 BLAKE2B 91dcbfb842166837d4a89c12e7c8b39db9810ba1ffd18eb1ee61798f3634952440b1bb79118d1486819c34916b266a8c47b4398df42ba8f0c3411d482e2e4874 SHA512 3731459efce91c89e5a601b649acc7ed4faee4d08d2a52a5784dc53b914a15113003516e8fed64e532dc703e019ed53b37ec9a4414b770165c1e46813392f9d3
 DIST bolt-0.9.tar.gz 238596 BLAKE2B 8032ecb83d39d6c3550c000eed400ee0451e5ed94f7c898ffe9c8fcf512af387cfd759bd94241a47623b5aac63615bcda40ddb3e9ae3ec4060da20e46d7e9b7d SHA512 427e9ad95a8d018dd22326cc4b458fc9149b001d3aa6e4bb8e4047eaf6c3cf04a4dc3be9396049734dc0bd54f990b3bce31b6eef4031e3b671a6202a588cfe78
 EBUILD bolt-0.9-r2.ebuild 1344 BLAKE2B 7742674b1eff6b2ed07b90a9ae76b94b4050b585b172609bd74597ee64b1bac3a9822fd7d9ff5a80966e5e931780bdbb2ccc86a703882c3d0a281285926edbbe SHA512 c1b0353b4d69d022fc570a5e38a01c56e72f3f48adab3e876ca9fadcf9eee9e35bde22db118418f2a6141b070614346a0c74a10ec30862260219fb65b14c656f
+EBUILD bolt-0.9-r3.ebuild 1349 BLAKE2B 06096ee9038a236782116306126ec7838827788173da85f59debc72ff70cc1ff71ee3f48f0a5b293990609fca2d0770ec3a6e68eb6f3225b3fd06873f2c6d3e2 SHA512 1c207d5b6d983700e1d6bbf04c5e8339203a6ad1da70ec74644f67c6df0f8b0562b99af905ea744c14244917c74081c67bb0ada05a2c4d128ac68ef651ca037d
 MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31
diff --git a/sys-apps/bolt/bolt-0.9-r3.ebuild b/sys-apps/bolt/bolt-0.9-r3.ebuild
new file mode 100644
index 000000000000..34cd766665ec
--- /dev/null
+++ b/sys-apps/bolt/bolt-0.9-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info meson systemd
+
+DESCRIPTION="Userspace system daemon to enable security levels for Thunderbolt 3"
+HOMEPAGE="https://gitlab.freedesktop.org/bolt/bolt"
+SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc systemd"
+
+DEPEND="
+	>=dev-libs/glib-2.56.0:2
+	dev-util/glib-utils
+	virtual/libudev
+	virtual/udev
+	dev-util/umockdev
+	sys-auth/polkit[introspection]
+	systemd? ( sys-apps/systemd )
+	doc? ( app-text/asciidoc )"
+RDEPEND="${DEPEND}"
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 5 6; then
+		CONFIG_CHECK="~THUNDERBOLT"
+		ERROR_THUNDERBOLT="This package requires the thunderbolt kernel driver."
+	else
+		CONFIG_CHECK="~USB4"
+		ERROR_USB4="This package requires the USB4 kernel driver for Thunderbolt support."
+	fi
+	check_extra_config
+
+	CONFIG_CHECK="~HOTPLUG_PCI"
+	ERROR_HOTPLUG_PCI="Thunderbolt requires PCI hotplug support."
+	check_extra_config
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dman=$(usex doc true false)
+		--sysconfdir=/etc
+		--localstatedir=/var
+		--sharedstatedir=/var/lib
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	newinitd "${FILESDIR}"/${PN}.openrc-r1 boltd
+	keepdir /var/lib/boltd
+}
diff --git a/sys-apps/bolt/files/bolt.openrc-r1 b/sys-apps/bolt/files/bolt.openrc-r1
new file mode 100644
index 000000000000..f47b15ffaecb
--- /dev/null
+++ b/sys-apps/bolt/files/bolt.openrc-r1
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name="Thunderbolt Security Daemon"
+description="Userspace system daemon to enable security levels for Thunderbolt 3"
+command="/usr/libexec/boltd"
+command_background="true"
+pidfile="/var/run/boltd.pid"
+
+depend() {
+	need dbus
+	before display-manager
+}
diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest
index 6312ceeba0bb..a9b88e7377f3 100644
--- a/sys-apps/dbus-broker/Manifest
+++ b/sys-apps/dbus-broker/Manifest
@@ -1,14 +1,20 @@
 DIST c-dvar-70f0f21e86a34577e674e202d5d09ef167102f02.tar.gz 24719 BLAKE2B 817c03739f56a3b741120896f98089bd6a379395b2f8e99697a79a3a2bdc855358a73b079434428c416373821e0e134acf6e30ef9bb9a384d25438c633e02433 SHA512 6a237100e66eef2413bf498d97a8fe1ca1b568df1f99276603f0b1627437a7f5741c38068cbafc49664f2a0438785a0ef7fb1de0fdb6768741585f1606d094e2
+DIST c-dvar-eeb91604574f7c5b12b270f8355f7e6cf1720f4c.tar.gz 24723 BLAKE2B 5206b4e85cdeffabc91e0feca17762ce10bf69815bad8d739af5eacf499ee4fe03058db1d2f4b2fe06cd93fa48eb637e68b50726a40e8b431f0fc526f830f114 SHA512 21d793ae449290c21c98904a43482ce1cbdead9fd1cd857214feeedd2e04e829f6ec4a8372f6b237eeeb5fcb5f96901ef8374d497afe6f70316f6a944a385443
+DIST c-ini-204410a08d3a6c8221f6f0baf0355ce5af0232ed.tar.gz 13952 BLAKE2B 42c34e4ebe17d4c0904c395c72e56b0587c5f6b2cdf422cb800678844cf8516f9645718a04e9a10f6e747d1f56b2f1e563d1fa07db078e745761ae1e40ad395a SHA512 72eeaecbe0b9434b48d2ca9674dd1e722e612a730fd07ef27babb346a10ed7311b11c9d85f2aaf0cd84ddca7f926a78d76d066f453289bcbe849c4cacf72ec58
 DIST c-ini-867f06a12a702c6869924575503877caa0adde75.tar.gz 13950 BLAKE2B 2cec6d49f7e698ee7f9514f8726c7c01dc72d2c186832122efcabeea37e082d0922be742c83f69c1ef93a820575c05dc2bb10790b41c2491e8c3719afbe5a37a SHA512 a3e82a24dc8119d90d573d87f5d92f24029490cae1564f66030f6781c95fa50c2c720378a8fbd07511007f1f53debbf62ca9ea86fdd905c42f325f28f35bd876
 DIST c-list-96455db9f04a6c9101a00957161551aea700b6aa.tar.gz 9221 BLAKE2B 3caa352a7be8ece056e69afbf556530f0a134f4fda987f4b46ec26e8b97d220726853b532a0479019374e90c06c9e1ff82198b04805b48db0a240d7929b08590 SHA512 ed4deb39dde17a57f4c8c9c8320e0df0cefe9a761fe5d684ee9a982d2175c5fba50c9fa29059844e96f46b008a6dc1ac1d17c47b1b52fc057ccb55dc7bd85148
-DIST c-list-ac7c831398219acd8d63038e866035a6f86f9e21.tar.gz 9218 BLAKE2B 5821032f60a27c696b0e34e2d26250c48df19ad0d8883eb50b5a0ee6acafeb3f570b23db7b0c823ecdd47de6eb0d2d02d5aedf467283e8293e848189af8d59ae SHA512 95a3e03b0b3aefcdaaf350de0b41cdbba081716ff01bf6e2442aaf0340f0411f32f6a06d204614b59af26df921a161b4bee5f83b5145ec2cae485c9954a6709c
+DIST c-list-f1eadf27377ef2f74b3cfd16185f54a219df2aae.tar.gz 9350 BLAKE2B c2db7f5e67f9575362c059545f3fa0bef4672e1195aeb57edbf50d8265e72f120540178cfaee8f49e0a9494e3ed56a4a10d23de237035d15b529dcfc47184da9 SHA512 c2a0f21bbf90b7dcfe9858aeb4f141202a7f5d7b980189f7ec6dec2eed9b70d78b82be5009ec7ae1a99911e2489a1734b8017cfb709d7625addda5b1a738dff6
+DIST c-rbtree-8aa7bd1828eedb19960f9eef98d15543ec9f34eb.tar.gz 25957 BLAKE2B 76b67a5efeafbf68fe3f1db732d1ad878cee7c23596dda096649c30205582f3d7fca99c5b99ced69b027cd3100351da03aacad00c3aa24d3a0604b09093ecb99 SHA512 57305a5a438a2dd69662dec02117d2636e50f901cb92a251c3844a343108ebeeaa208bb09dbeb22dc1b8d1171719442f4ccc248d89909cdd7310b7db6cfcd6cb
 DIST c-rbtree-a3b1f80548d1c736208c55e9251c49ada649dd62.tar.gz 25948 BLAKE2B 82e3692fd747191fc160ae5add4e037696f9209f7ef3003bcb72def18c96a7368b5e6408d38de6c0609ef27fa6762d9323a85e0ab5d1a50d8b10cca99b2930d1 SHA512 9ab0c6062e5cfb771c4f31a9c8d82f744762d2f9acf24849bcc6f04de57e85fc0f8487ef8c8484e2e0f0baec83a3011b1425ddd183c2836f90906636f1db8d94
+DIST c-shquote-83ccc2893385fcca1424b188f0f6c45a62f2b38d.tar.gz 10622 BLAKE2B 1c705c47ca22dfb3cb0a277ea96156806d1c0e9913da48a2baeea4e2e455e7f417f48db24c94770b7e471655a1c109a23679ce11ed802447e0b41ac3c60f822e SHA512 499fb764a2f72e1151c0007975720b56912f88f0ef92bb88c6b1870fcc8e815af8b377e1e6fb9829426757781134d9ec20cf04cda273ca2a5c128705b36dd3ef
 DIST c-shquote-95e4713a0de475688a5727a5d776dccbc69d3d28.tar.gz 10635 BLAKE2B 90dd5c343dcc7de13a7cc5a495052c058499fb7fcdf44d5463a45714ea8e330fc3c9756c84302f454cd46ef32801b74962d9e49ab930ebc6729cbdb1de9e8056 SHA512 494c55cb676998afc56e40f00661f49698e596a51019e9f227b111b4f16d7f2e65056adc57858c688957a07c972dadd217af2bbb95e390760ef758259e54a769
 DIST c-stdaux-346623b40eb8137cae7568a69ee42253ff098ff7.tar.gz 13046 BLAKE2B 19b22cc7cb6f4a5a970295a36ceecadf8d1fbd93524a39a22107c73df63516c643be711483aa0ca3fdb97941a9a41084802def7c6663824e7660908564f3ad96 SHA512 424512e8818ff56a9882806aa9879f4f5167ed02a19d01cffb42de620816318746898c27d9ccb857b466435d1a588d735ff51da45baa08f9b892dcef18ec34ce
+DIST c-stdaux-c5f166d02ff68af5cdcbad1bdcea2cb134e34ce4.tar.gz 13054 BLAKE2B 9a550b2eece549f9e7dbc6c69aa58b940e933106cca931a503c12220b3632bf1d48bcd1a2d6fa3a9f3e29e34fbd5bc11eba1751d05a9db40d0c2af21d8e1e066 SHA512 a138d9a8672d63537e6c082946777bdd62d651e837121bf180d5ad0591d12fe2b13fc63499da39a68d2e3ca8da6a0826701ae4807ea78d5a7604e9f2d28760ca
+DIST c-utf8-8a8f07d623492d4b45532527f945b118a2b4299b.tar.gz 9331 BLAKE2B f5b380da37ba0fcef7f8324777180683748639dbbcaf8b16dcc3432cf69b58caed7b93c2de0ef590876ae7c2ee9fa02a26d8ae94c1fc58281812ccd9b705eb17 SHA512 04a3e4e744ae50e9e06080b05d4ad8bb08ced945dc42625a4c47e47feccd2dbae1205555a8857c98f344357c28846cc5d7273bd5fe2e13f454c4d11ee1303b28
 DIST c-utf8-af5bf7f330078d285e5f58584abd6de01c4cfd7d.tar.gz 9331 BLAKE2B 32b6da3f92e25d3971abea08f336856f44e9180e73d776058c473a8140ad519b7b614177445f4e143e56276795d04127ec8c8c01561935683227fb2c391a51cd SHA512 84ee285d90d1a899a75e1fc63931d10ff1b652bb06b19b0916afd0a3af5c359628e2ec2951ca987a8a6e6cdfbe73a286bd5a664c24e9998ada6c29f3c34752ce
-DIST dbus-broker-25.tar.gz 210739 BLAKE2B 6abf0a38fba3af41d95c4c1deea4c5d5b974bc1d0918d4b5ff317c08dd8e097212d966b76a76dad9674129f9babd00bd9c44d09b1d36fd25acb11298a10b0819 SHA512 bdeb0b002153234729a34f4163549f7589cb6ab03776cf6ab8956a5560fb7a6e089b4654913afd68d6c267036cd8b684e698075c06ee30aed7fb778394121a80
 DIST dbus-broker-27.tar.gz 215070 BLAKE2B d7f12c588b3f11434e33c9eec603f2d3f8caa5ae892aa7951f98b533cbd05bbfdab93dd639c64975e79ffd8c7ca19185bf3e8b8f9546237a3686aea0a9f734fe SHA512 e33e48d7d29cb16f5aa10c7b5b98d85b9055adedcb2c4bda63113daa52597f9b322eeb1e128b7e6077378953b41914316485373b614a9a3a7f21cbbfcf5bec2b
-EBUILD dbus-broker-25.ebuild 1830 BLAKE2B 93e9b6dede776f524de17f52f2639b21d09e6653865ac8efd6d479508b1b3cd28e7b6b2258f357e805e3dfbed2375e7827d087fcdfa168bbda3420798fc5c286 SHA512 d78fe7188392c06107e54b70e6234b02853ef275e44099a03ac06653abf03f80282af1b24eefca2fb101969ccc46ab860c66601635c9a0c35ed1219c711dc0c0
+DIST dbus-broker-28.tar.gz 216484 BLAKE2B 8d8dd9d15efa8c276d6db5c4f50320c7d18498c93205f9cda2bb849b781def17c387d5768ef62963024ee99f163ea1a72e457098612a9e6cac39238f3eac533e SHA512 d8b8e0c665e3c0e33f50da99330ff4cfba8107bff2c7e03a9653bd89f740e69ed1dce750c7f737c78454e07294821ff545007f3927f12d7f35f53339e4747791
 EBUILD dbus-broker-27.ebuild 1830 BLAKE2B 8b7e73a05cc9fd084ae5d75033f66c48d5fd8c7e5768e3bef49e76b327dfc9cae190e62b20c30e9810a3a53464d940462de5ebfed221a9138cad54d13e953f73 SHA512 c4402e82c3e4018141d0800f380858b6490529cfef94cf3dd8ebaa5cbc3197889896fbd513751a0d3e3b8608c36cec4f39e0cbe5bffaf41ef9afbd83c7aff80c
+EBUILD dbus-broker-28.ebuild 1830 BLAKE2B b12f4e076b1744abfb216f5e37f6fd5f589d43546ad3b652fa181671d3ccbc865cf300cf720d4aa89ee72794c61650adaeab104c2b9340f51ad23ef65c580ae2 SHA512 9bc28978b7c72b6b22790cec8335ee9450c09a7cb73e3b4083227cbf9124eeebb7870c575f64dd133163fb81d9776dd264759111a315f96bdf940ed49296b7bf
 EBUILD dbus-broker-9999.ebuild 1830 BLAKE2B 092eea3b81cc65d389c477ed3c1c16473628b417bf262f6609ef62edab4ce1da2efab34a278b66b9704944f3f5e9ada19e37dac40a13051c3eac03094f543c5f SHA512 c6e8f582a8d26de067f0cea6399750c6b93cbc856282a09e76630d1614ea559117f513b7cc59dc2a1dcdd98800f9012d17f16be69f712dfc4d7673ffda43534f
 MISC metadata.xml 327 BLAKE2B baaa6c7be634d16ffbe1196a29bcc2254c77d857dd1b807d50dac7adbd3d20370bf55ac0ea8f60b0fb160bf9ae69d42a5002b4150c4b22c101b37ecab96028a2 SHA512 b350af1c8be6e227fb301fca4dc1d6c90a8ceaf1e4cbf3d83ea54a302a15baa9df560d9b728a66be843b3eb679fa9536ca2f531776ee5d09753233148a0cabe1
diff --git a/sys-apps/dbus-broker/dbus-broker-25.ebuild b/sys-apps/dbus-broker/dbus-broker-28.ebuild
index 7cea8124d8da..0f00dd372abd 100644
--- a/sys-apps/dbus-broker/dbus-broker-25.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2020 Gentoo Authors
+# Copyright 2017-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,13 +12,13 @@ else
 	KEYWORDS="~amd64 ~ppc64"
 	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz"
 	declare -Ag SUBPROJECTS=(
-		[c-dvar]=70f0f21e86a34577e674e202d5d09ef167102f02
-		[c-ini]=867f06a12a702c6869924575503877caa0adde75
-		[c-list]=ac7c831398219acd8d63038e866035a6f86f9e21
-		[c-rbtree]=a3b1f80548d1c736208c55e9251c49ada649dd62
-		[c-shquote]=95e4713a0de475688a5727a5d776dccbc69d3d28
-		[c-stdaux]=346623b40eb8137cae7568a69ee42253ff098ff7
-		[c-utf8]=af5bf7f330078d285e5f58584abd6de01c4cfd7d
+		[c-dvar]=eeb91604574f7c5b12b270f8355f7e6cf1720f4c
+		[c-ini]=204410a08d3a6c8221f6f0baf0355ce5af0232ed
+		[c-list]=f1eadf27377ef2f74b3cfd16185f54a219df2aae
+		[c-rbtree]=8aa7bd1828eedb19960f9eef98d15543ec9f34eb
+		[c-shquote]=83ccc2893385fcca1424b188f0f6c45a62f2b38d
+		[c-stdaux]=c5f166d02ff68af5cdcbad1bdcea2cb134e34ce4
+		[c-utf8]=8a8f07d623492d4b45532527f945b118a2b4299b
 	)
 	for sp in "${!SUBPROJECTS[@]}"; do
 		commit=${SUBPROJECTS[${sp}]}
diff --git a/sys-apps/dmidecode/Manifest b/sys-apps/dmidecode/Manifest
index 534f744accb8..348b73ef4afe 100644
--- a/sys-apps/dmidecode/Manifest
+++ b/sys-apps/dmidecode/Manifest
@@ -1,5 +1,5 @@
 DIST dmidecode-3.2.tar.xz 54440 BLAKE2B ff5b891b28231bc50657e6fe1fa1345171109ce9baf7fa4558ced482a0616be4206ef69dcf3909611475d543b12691cc2bfe4849d8e3d35b34d1bfffe600af21 SHA512 b080c73fbda756109f0f29935c641e0b32ea9ffe90f0a8254164c9c1ff5617d042347298e6bac31e5463e94fa56efe2b2743238156d878254fc77120e6dc1a18
 DIST dmidecode-3.3.tar.xz 56372 BLAKE2B 7a4557a203702da5d5d6722c72870342e18458b3777d095656e9d5c3a5f80cc712d16b775fa16e4ae9326965a789d393092d45651a449444e268438c1d16773e SHA512 dc77f40a7898011cea1b747d4677be2fbe8f52ec6ac460a5656de2f3389eca83bc416d6494acbe759971b5afce37b78f21ab55c34d62b1105b800e31566d1d22
-EBUILD dmidecode-3.2.ebuild 1134 BLAKE2B 01b280085bbb4b5e88a98bafecc7ffd923000568c9875021deee1013e2a5592bc5bb2baa102f7b5345762ebbf738d6c62447b3dc111894dc7924fdb2f3394b19 SHA512 c4880113ae36b10f5e4ba24272de557f5cf06189d32eb57b1278a7ca3ae9a5fdba8147d26542f8bce26bbcb96f00c31452714657756c4092b8895b67ce23805c
-EBUILD dmidecode-3.3.ebuild 1141 BLAKE2B ac69c5afab870d62fee200c8c873f7a32d9a5a9ee2ba69041d7fb98f00698f39686c38c9d62cd349a2781364a6d3a6107ef3c576b7e54ff703f5aab47c62e62b SHA512 d9a4f534c1d617f0bc34a8f3b5c69ce23bb013dbb1575e379e216f3a35be8010f6272cd358611b274d7ca16779b83a02c2e3bf246e3e456335bb78dbda78a0ec
+EBUILD dmidecode-3.2.ebuild 1128 BLAKE2B e4a423dfdac019c76747abd2083f7c62f5ed47289c4bd3efb3c70d3422f3bc213f60cd5521d6a14457959707e2eefc8a03680070eaf9e2e5b04f729befc1d46e SHA512 41bd73f3dce831f23380883c23dbe120865281832cb3a332f8fc7b3c0730dfa5585f7575dc781d45f74974cfc6d4a6362221d1bd8ec6e80c4df43745ddbe7433
+EBUILD dmidecode-3.3.ebuild 1134 BLAKE2B 8ed0a584bf89bffd1501fddb754b8cee75c1e213597d53aae8914f7310d48ee42217b2d702c3daad6f34b1786c65da8d7b876aa53266e9c9ba5dc5126c4543fd SHA512 d676264c7a67b1ac00a7d0161dbbd8dcfb6bb1580898c7622f7b6283ea98df13f0147d56d8a105ac552f81746616a3d8998ec439f3f763456f567a148c08803f
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/dmidecode/dmidecode-3.2.ebuild b/sys-apps/dmidecode/dmidecode-3.2.ebuild
index fdbf2088aaa7..32e84e47d1c8 100644
--- a/sys-apps/dmidecode/dmidecode-3.2.ebuild
+++ b/sys-apps/dmidecode/dmidecode-3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~x86-solaris"
+KEYWORDS="-* ~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 x86 ~x86-solaris"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-dmidecode )"
diff --git a/sys-apps/dmidecode/dmidecode-3.3.ebuild b/sys-apps/dmidecode/dmidecode-3.3.ebuild
index 8e6e738c4474..62ffcc4c4186 100644
--- a/sys-apps/dmidecode/dmidecode-3.3.ebuild
+++ b/sys-apps/dmidecode/dmidecode-3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
+KEYWORDS="-* ~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-solaris"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-dmidecode )"
diff --git a/sys-apps/duc/Manifest b/sys-apps/duc/Manifest
index fadffafc7d29..4fdfda67b106 100644
--- a/sys-apps/duc/Manifest
+++ b/sys-apps/duc/Manifest
@@ -4,4 +4,4 @@ DIST duc-1.4.3.tar.gz 363507 BLAKE2B 8d4364d48c247d7a83c8c5dd900b1c36ec78c68fa7d
 EBUILD duc-1.4.1-r1.ebuild 1733 BLAKE2B 42b1822de5a598f676893f58bc8254e3d25a6fc94cdfe2ba072c3fb86eecacb9322212d0788764dd7b0cd7637919c7fd8b17d0f4fbca91b22b81033a8b8d0d51 SHA512 6ad269c0d0a3353f2c2dc77b7ee73dfe6f5ee2802030619af2fcb36db7250d5e2960e63964fbf50f8d9d2fe37ffd48b799c6763b24184a47cc271a9472e0ae17
 EBUILD duc-1.4.3-r1.ebuild 1786 BLAKE2B ab3ff4a605e17af8e8684c95ca6fab309f321452119e7bfc1f8409346c1cffd37161138c61f65cd1b9f90683e9009a65f68cc4d68bd417fd8a55bbb1e8ed0fdb SHA512 b16673589ac327e782b8a98abb361c8aa732ab22d4e7306a0c87789c22a543b6018900ea68fab242238c20a6f3671feb2664992ec2a9a04f3bfe576d9940c7b7
 EBUILD duc-9999.ebuild 1786 BLAKE2B ab3ff4a605e17af8e8684c95ca6fab309f321452119e7bfc1f8409346c1cffd37161138c61f65cd1b9f90683e9009a65f68cc4d68bd417fd8a55bbb1e8ed0fdb SHA512 b16673589ac327e782b8a98abb361c8aa732ab22d4e7306a0c87789c22a543b6018900ea68fab242238c20a6f3671feb2664992ec2a9a04f3bfe576d9940c7b7
-MISC metadata.xml 836 BLAKE2B 4439120d5761b4101a201d2d6652ee8b06354bf05abaff97d0777d76d39d884df28532a3d321e018ec61cad2eee0fe207516dba2ec47fd659aa5b47ce069042e SHA512 36e1f82c58b004b86968d31a02bb3ce1740b409669d8bf5ad8d57a7187e2fa376115469b77255f732141aeb16cfa3be55094d130cf1c1a8fe2a479d28fa951b8
+MISC metadata.xml 838 BLAKE2B 79762b1423cc5de375cc7e4f9ed16749779db5cfd33b5c7f5c9819c2a00cdb162e023def10c4272064e42a5054cb033f4fa5eda6fd2e6045ed933b022fd239d0 SHA512 4e2f7fb47b98219402540be2c812f60aa6c1309b60cbe746855932287ed8fe4256dc3d555129f21dbc285d7d5332fda3d9c7dfaeb3984c47b598f8c05b06b8fe
diff --git a/sys-apps/duc/metadata.xml b/sys-apps/duc/metadata.xml
index 729eae15639e..062472b18687 100644
--- a/sys-apps/duc/metadata.xml
+++ b/sys-apps/duc/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>NP-Hardass@gentoo.org</email>
-		<name>NP-Hardass</name>
+		<email>np-hardass@gentoo.org</email>
+		<name>Adam Feldman</name>
 	</maintainer>
 	<use>
 		<flag name="cairo">Build support for exporting to PNG and PDF with <pkg>x11-libs/cairo</pkg></flag>
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index fbef851dae0d..e520841378a7 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -12,6 +12,6 @@ DIST file-5.39.tar.gz 954266 BLAKE2B 4d6d9a6317961e0a2aa391f502b0be8bbb40ede57c3
 EBUILD file-5.37-r1.ebuild 3153 BLAKE2B 19df45e9db45ca58085f3758d9396a074b6cd3a2475228ff7774551e85adb321203091958ae36eaa2aa12bbbfc2bf7aa79ad1e8b95345a106accd20fd621f54a SHA512 786d0ad8abe705e1e5ed1c3604dc4d6e4ae00ab27150368dd00475baefaeb37ec72c45297fd68def3fcb276b2ee29a8b8982e0010223d87df55450d49c8a1d76
 EBUILD file-5.38-r1.ebuild 3366 BLAKE2B cde302d8a08639b8b2a5f8aec2f4f00a0dce1bcc7a9b34b7ce9e2786cbc421659fba7acd50d81b90604dcdca84ee3ef9d8fb7bb431d01a98a2e47c7a82832e37 SHA512 af1fae92b1c27efb812b4a6b6944f9ebbdd35e0cf852b6e69bde503bcc9c5c08e97d4e7eac7139e674c4651650eb5e853dd3e3d4ee094d234d54606dd66b13ff
 EBUILD file-5.39-r3.ebuild 3390 BLAKE2B b8443b97f7364c7958ead19c0485321f821fe2a3c5d489be5c25a2dd9257faa0937cd0ddf900f860bd1790a2c196cc8d8566c65139619777335d742605e3d9f0 SHA512 6f8ff5ff5658fc9abe9d7803058763cf76ff63f269482c74956756befc95b993d2587f94b428305e19e5b66fb6b95f04d4eb32be4264bdf60cff07cbedbe0088
-EBUILD file-5.39-r4.ebuild 3451 BLAKE2B 5671ec10d0d409f2843f39c7113c2f5c4022e55ea1bebd49f61084e0a8ffbd99bca9a8fdc6f37b34f3d6544ab724f9c94fdd992e0ca7d0fdf41dd92fb48c856b SHA512 56f4099f550aa4bacca098b29bc9adf8961ea771822446dbf63eaaf915e8be01aca662d00f09c44a36d8fe9882da661fc49c3267167e4771689efb4e323f0962
+EBUILD file-5.39-r4.ebuild 3450 BLAKE2B 236f6da314ad6971e594e40853efc87b2fa32e4389553fa2a11b7cc3dbf4c1291e74285e0e2ed6489a5b67d843319d16b23471f1a74e0e201a9935bb2d4db63f SHA512 3056f15679b56f34406a2e9669ed56c33ea7185435c8a7c0b75b3e58480ddf1e204955932ff1b31ef09a7cf71ee7f1e3533606bf87d3f4d65b9501df60448886
 EBUILD file-9999.ebuild 3296 BLAKE2B 6e56f6436decee04e4c97dfccbe87d5942e328b003a7898e4ae12bb8a9c8c5150c0cb4b304cc3488f6698f2b33456e2d296dddda709cc351f69d07ac95378647 SHA512 4842d01087da26426d0ebe4438e2d20da6653e258e3848f2e01b0433856a9c08258a0391b6a6455714682baab67423660570f01cdd927bd0ed3c5fb4fcd2438c
 MISC metadata.xml 381 BLAKE2B 242f4a2403d0a4c69c7ff400fdbd447bb7fb8572dc57dc05f3edd0c875da68433217bec46d43467fa03c5e9ec69616e3450635ff2662ae3ed830a138521e23ab SHA512 f69d67890ecb0b574d414c432df12f6e8d31ceb7755055683941017563da8713d07728e49cd4a7277699a97cd3ba732c946ecf5435cee94778a0d5652e7d6857
diff --git a/sys-apps/file/file-5.39-r4.ebuild b/sys-apps/file/file-5.39-r4.ebuild
index 331509b85e3a..14b4cbfa64a4 100644
--- a/sys-apps/file/file-5.39-r4.ebuild
+++ b/sys-apps/file/file-5.39-r4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest
index 85bb5e150256..5846a48c389a 100644
--- a/sys-apps/flashrom/Manifest
+++ b/sys-apps/flashrom/Manifest
@@ -1,6 +1,6 @@
 AUX flashrom-1.2_meson-fixes.patch 7977 BLAKE2B 5ac9e09c6fbcf08f36da1fc874511f7023338b0bffe775c61be9f7c253d6d8343833ec64ff86dc3b4733e90e67435e3cc0d52e6ae11c8d368fe2f21b6a85bc59 SHA512 a0e30c2a87775342302fabfd594c91015b6ea9fba71a7d1b294c399a8336167f85b07fdcc2ff80174cc43362ef5ca28965571ca52e1a76922ef59dcb15991664
 AUX flashrom-1.2_meson-install-manpage.patch 1208 BLAKE2B a4290c046d82a7c8b8dbfba0d58abed2384506d761272929ca7972c68a92a314de2ad17af5bd49cb86af5fea119d36fb126c45febdd5ac99210949158d33fc75 SHA512 1345bc880317e37d028bc3d40c98e5b5b4b17c7cde18d3b17762c9792cf0e4ac19613702ae1d367937f86dd3dbb02732851774d91ef1372e5bbb8f998346526d
 DIST flashrom-v1.2.tar.bz2 366995 BLAKE2B 091e01a91e12b486154ace334a5e74bccbb5f5311ad76e37f43a28167080757873d8c78b8f549d2e77eb984922c830895ba955b23eb6ee4fc24f1ffed259954b SHA512 8e01395a54d0d1344bc55e7e4975f43bb8e59ebe83fb5f2766d14f76756d718b487254ce9a19ef4093aed04fb9d40fff5fe8f709b18c512f6e6fad894f83d7b8
-EBUILD flashrom-1.2-r3.ebuild 4339 BLAKE2B c68cb290611caac7c67d3c30570c8e9d54c3e5d24c63a269c8e3ff87de932950722bc86bc8b4c8b884d5dd65006f1576eac0c88328a50fd958b6f9b748473251 SHA512 41afda3a5123d9d124fc032f51dfa8b553b9044443c1783b32aa076a0c5d2b0af42e60dfbc4735166ba23f606e7d01bc6b8e70c4e924ca1150a8a6cffbd710b6
-EBUILD flashrom-9999.ebuild 4501 BLAKE2B c9424d845e9e9e9617b7f7f34a5c4035af50567eecca422e1f06c388ba2400d97824c9e854d1088480637fa36c32e9812470e7532f111e503ff772ae2f9ccb14 SHA512 110cc4d1ae0465c8f29bb0c8a66729d6d23ceaf155aafa60774e6a1a074f8ba2e381f3ea686462b1eea378bbe1501bc7abf8ed5e6cf67012a71cd258dee748c5
+EBUILD flashrom-1.2-r3.ebuild 4333 BLAKE2B 7aff14f2c2dfa58af2ab24d59908e3194adc05887e9e3faf0a617914e067409f1426c8cf1825ba1399e104fe82bcda63746498727e6351dc44b01dc0eeef8dad SHA512 39af8a0ccf443284c26766c8034b2cdf51c0eda686fef506255e5c4859e7638f0a872762e932a42c7f5134ef4dde96d2b66c94f6a6d2c9b3d2fde9c9be7e8abc
+EBUILD flashrom-9999.ebuild 4494 BLAKE2B be2488baa66fe2ba326403f686fe29132757c6ae29afb7859c99697f61288bc47f9315d60f37ec8868180b947893753b62fd04c945fb12f2a5b35ed1c0247ad8 SHA512 4033afcec2a2450ce4426b71960a1a86583a09f0dcdcdb51f2efc7f58aabbc8f3b9baea71f51af531c97a452d61a954dbd13c090ce906ab2c01bb00d6258c5ed
 MISC metadata.xml 5037 BLAKE2B 3027f42fb0ab5965684cb79857991888772126fbf48e2f9c314a0e01c831cf38474a20ce846964631ea95dc459629396c3796fc89d858b35f239f2a3fb343c1b SHA512 8602f9ad7419bae5f10620400f9451d16c43d12223173873ab53191c93064bf0bdb72c78ee5cde8dc9fa091ce1c6c80575cf586141080c13c971370fa0ac85f8
diff --git a/sys-apps/flashrom/flashrom-1.2-r3.ebuild b/sys-apps/flashrom/flashrom-1.2-r3.ebuild
index 773755292456..574e00f7884b 100644
--- a/sys-apps/flashrom/flashrom-1.2-r3.ebuild
+++ b/sys-apps/flashrom/flashrom-1.2-r3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-v${PV}"
 	SRC_URI="https://download.flashrom.org/releases/${MY_P}.tar.bz2"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/flashrom/flashrom-9999.ebuild b/sys-apps/flashrom/flashrom-9999.ebuild
index a307041b2749..64c28bcfbecc 100644
--- a/sys-apps/flashrom/flashrom-9999.ebuild
+++ b/sys-apps/flashrom/flashrom-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-v${PV}"
 	SRC_URI="https://download.flashrom.org/releases/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 948e94f6b2dc..e0b98090754b 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -3,10 +3,15 @@ AUX fwupd-1.4.4-help2man_var.patch 2642 BLAKE2B c0a8f9f5a79c84a1521fc85feb9cd8af
 AUX fwupd-1.5.6-gusb_deps.patch 1553 BLAKE2B 799957e4902ae31d94a1a5f304c6a814862c7b4d4c5020e47fb24210f5ab80fca4977d9fec102c751d7944ce7f4dcc76ce8a6c712c78346f578c949783b3881d SHA512 295a00515968e4beea761f2552e4de32bb7b6028cf889412988fd4df7df61f352551c46639a4c4e5d9cf33f6d89af58711288f50d71c0215055e25eb442ef813
 AUX fwupd-1.5.7-logind_plugin.patch 265 BLAKE2B 7959a4cb059a2207b0048f474ff9e0a3e3ab625d6db5e7dacafb7b6190c9718bd8659760579c6ee16fe22fefcc9ec4837f7b2635b1ff5f555ffda36cefacab48 SHA512 a809831e307549f109fbc2c705b80535d885db92a96b72d07f9ef7a954e52ffa2204331e608bc719d41ad038888adfeb23f6ed708c6a769c436f81b4086fedbb
 AUX fwupd-r1 303 BLAKE2B c940e8272c042ce1f82817f15faa82a3fd1bcd495da187473c8409db21a5e2e10da7cbe4bfd3b89d5b51d4f4d24c7f3c10214fa93e81c78c2c021c74dfd228df SHA512 f69438b16d3fa237cec0e5b48afb37b65835cebb47c682997eb0fa8a05e1ee8872da120c4003a8c8ed0801f7b4fe6bfd252349f9aaa4efe4b9b65517e6826acb
+AUX fwupd-r2 315 BLAKE2B fda26d20febea2564cc670df466fdde76679e69731d1d1d621ea2c0c8a6318a93cd17885cdf154540d62eb915ce3888a6a143143e4ba2c4f30c3beb7393efc22 SHA512 68328ad9e11eaf899f186f3ce0bfba09e1a8145af4001b52298f2a6cd9e54ba8cd24c67742db52a74d1f559989a4664517c77c07c975865def767d54b247a2dd
 DIST fwupd-1.4.6.tar.gz 2368201 BLAKE2B 86f4e8a3264b69eb72a357f59db082e81534dc28822934df328b1bf94aacb7ed1a219f8e5a03a9a37a0d07c248410822a3d12c4fd6b5df3a14157795e092a095 SHA512 c456704f40e7c5a5225255dbe3e4b794819d3fa982683a31b15a81f5467f007eef00cd80dac1844eca00ebab9ae12061139ae31c1fd7e2a6e012779d2a4b59f9
+DIST fwupd-1.4.7.tar.gz 2370660 BLAKE2B 8f04ced69610278576e41c12c7c51e326bdfbea8e1470ae586795b0c20f6a5fd4385701583195f49e14d749016987a7e02fb0d071b5315cca635f69d99bb63d6 SHA512 9d293adf6e9eba9537c4be9b7a4ccc26cd5519843f1bf94557148fabef8076e4846f7018949d8ad83afd01ce4874833bf8984c2ee3981fc6b1309ebda8e313f9
 DIST fwupd-1.5.6.tar.gz 2480802 BLAKE2B ab9d9cffaf74b4ce6a9de47ef37aa05efae0c0b353f879eb3d0573fd4153c0893922c3a47b68188998752c2f9a75ca340ecb7af94e6c85890060f3826900f812 SHA512 6a04151b53c4446c15527f6b1396ba238b749c6f767dff4171849ccbdab8db2619fd1e3f0e146fd67681263621d55f20008709c7bac10a6d34f27f06c7118cfe
 DIST fwupd-1.5.7.tar.gz 2498618 BLAKE2B ff0bf4d07a7df84232e90f5c85321dde3e08edd12f5ebf7a48130f076a52344e8654232bd0227d992fa5efbb3ce03e353da8b1511a9f39e5eab07c888b499463 SHA512 340a114123bd31a7a31370faaaa10e6517316d8f9c2b06f22d8b70bef64b7e6d9427682b8ceeea05570c8960eb7854ed5fc91aa450ff53d114fb97be43065213
+DIST fwupd-1.5.8.tar.gz 3708769 BLAKE2B e18738d5f681fd9016a609ce9d48e452628c32e731b2a1f3635ff4897ff2a910b1ca0d7836bd12f14b27254c23eb2b6d74a2c35939ac5c8484e2050ab89a33a3 SHA512 d4fecd13a223e7f544026a5ac684bd570af2b63fb509a21e98ef72ccc4d7818f32abf730e2a40943bc762f04ecd5af03bf71201518d55090bb95fe6e9dc6969e
 EBUILD fwupd-1.4.6.ebuild 4056 BLAKE2B 061c425224845a2f3d3947abe7bcedcd11c3d859b111c68ee12b438a2788297e37b296d0ea8b7b2118fda490fa37a3bf9f801735ec4b2b9634b63ccd55000a9d SHA512 84b58cf5c6aef3d0bd5645cb19114b01e173049e1a263276ecb195d4925e22d2d36f248df1c3254e3fb6520e7cf72de35cffc4554bbe0353222d682b12ddc47a
+EBUILD fwupd-1.4.7.ebuild 4058 BLAKE2B c8ea9e8560f5a62b622e110facb01b9db44ca39d28ed05632ef5aaae7bafa1d42462d5b0b56dcf9523fcefccf7b626664da2a7437eaa7261136bef6e8a392283 SHA512 7f00faeaf03285a3d130dccb173bbad5eb4c0609645ad29d1f4e43c374e74d536dd82877719c9cecc5168c0688f69131de7dc3f7f1d90eccf31829a147b57d20
 EBUILD fwupd-1.5.6.ebuild 4440 BLAKE2B 4c12a21a99aa943aaa16020a6ad61858c7397599654fed0cbccf5d3e644aea74e4ff8985d61bc6cf135e9769d5f7e47b9e46f94f5e6aa92d6a84b56208761ba2 SHA512 94b058117ca1707880df50ab4c4a375f58451382b6f31475f85ab5f80c027ee9b8fedc1ac49acc9ca120248073178c94923bb75809a2c6b5cf34c9b9dc32a674
-EBUILD fwupd-1.5.7.ebuild 4449 BLAKE2B 769ef0d9a2a2a472f3a503e4e87252dd96db48ce4aa65cd99577e9e7d5aefab7313392111ad38c8fed28179ebff43aace720b00cd162a228b0c5828f95e98313 SHA512 d255c2d07d446a259bbbfded0c02f19ac4bca507c140327a8cac2312d7c90502519b5d5d4718ac27d96447423da4e5e3f1526ed1fcdaf4605f464d73d724fae6
+EBUILD fwupd-1.5.7-r1.ebuild 4449 BLAKE2B 8dec374ff84fc59a9a6fe3997e5edd32b6793d4b24bf0b5bc800692d35c6bc1f9ba57eedc8dc033e8863c473cd5ab9cd654557877b6e8ce1a708964bd435f541 SHA512 e1ab69e2c4df76b65c137820b34e80dab7ae6f0993a3e9f26e797111dd9ce5e4f9bfe33635f308daa22fa2ea66f5de08bcf2261d69151ec4ee8bc6ae964a9b5b
+EBUILD fwupd-1.5.8.ebuild 4449 BLAKE2B 8dec374ff84fc59a9a6fe3997e5edd32b6793d4b24bf0b5bc800692d35c6bc1f9ba57eedc8dc033e8863c473cd5ab9cd654557877b6e8ce1a708964bd435f541 SHA512 e1ab69e2c4df76b65c137820b34e80dab7ae6f0993a3e9f26e797111dd9ce5e4f9bfe33635f308daa22fa2ea66f5de08bcf2261d69151ec4ee8bc6ae964a9b5b
 MISC metadata.xml 1142 BLAKE2B a7b7aa9cad916ad7c23a3f7bb405a62a4e8f2c83049412901f7b5055477465b3a0bfa7ef5617a4de704b49fdefb094190b764e7b4b4c8004225ce3d45feaf2da SHA512 6266ecd35bd0426ea76b434b053c1955a894b8d1faa389ec6b55b824507bca3dcb6f9d757ef03d09eeb1073d8d1592ed63276e1874c487a804ce88810aa5533e
diff --git a/sys-apps/fwupd/files/fwupd-r2 b/sys-apps/fwupd/files/fwupd-r2
new file mode 100644
index 000000000000..c8994ddd8413
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-r2
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Firmware update daemon"
+pidfile="/var/run/fwupd.pid"
+command="/usr/libexec/fwupd/fwupd"
+command_background="true"
+
+depend() {
+	need %SEAT_MANAGER% dbus
+	before display-manager
+}
diff --git a/sys-apps/fwupd/fwupd-1.4.7.ebuild b/sys-apps/fwupd/fwupd-1.4.7.ebuild
new file mode 100644
index 000000000000..a7632e3964a0
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.4.7.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
+
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
+HOMEPAGE="https://fwupd.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="agent amt dell gtk-doc elogind minimal introspection +man nvme redfish synaptics systemd test thunderbolt tpm uefi"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	^^ ( elogind minimal systemd )
+	dell? ( uefi )
+	minimal? ( !introspection )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="$(vala_depend)
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+	introspection? ( dev-libs/gobject-introspection )
+	man? (
+		app-text/docbook-sgml-utils
+		sys-apps/help2man
+	)
+	test? (
+		thunderbolt? ( dev-util/umockdev )
+		net-libs/gnutls[tools]
+	)
+"
+CDEPEND="${PYTHON_DEPS}
+	>=app-arch/gcab-1.0
+	app-arch/libarchive:=
+	dev-db/sqlite
+	>=dev-libs/glib-2.45.8:2
+	dev-libs/json-glib
+	dev-libs/libgpg-error
+	dev-libs/libgudev:=
+	>=dev-libs/libgusb-0.2.9[introspection?]
+	>=dev-libs/libjcat-0.1.0[gpg,pkcs7]
+	>=dev-libs/libxmlb-0.1.13:=
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
+	')
+	>=net-libs/libsoup-2.51.92:2.4[introspection?]
+	virtual/libelf:0=
+	virtual/udev
+	dell? (
+		sys-libs/efivar
+		>=sys-libs/libsmbios-2.4.0
+	)
+	elogind? ( sys-auth/elogind )
+	!minimal? (
+		>=sys-auth/polkit-0.103
+	)
+	nvme? ( sys-libs/efivar )
+	redfish? ( sys-libs/efivar )
+	systemd? ( >=sys-apps/systemd-211 )
+	tpm? ( app-crypt/tpm2-tss )
+	uefi? (
+		app-crypt/tpm2-tss
+		media-libs/fontconfig
+		media-libs/freetype
+		sys-boot/gnu-efi
+		sys-boot/efibootmgr
+		>=sys-libs/efivar-33
+		x11-libs/cairo
+	)
+"
+# Block sci-chemistry/chemical-mime-data for bug #701900
+RDEPEND="
+	!<sci-chemistry/chemical-mime-data-0.1.94-r4
+	${CDEPEND}
+	sys-apps/dbus
+"
+
+DEPEND="
+	${CDEPEND}
+	x11-libs/pango[introspection]
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
+	"${FILESDIR}/${PN}-1.4.4-help2man_var.patch" #728484
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use nvme; then
+		kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
+	fi
+}
+
+src_prepare() {
+	default
+	# c.f. https://github.com/fwupd/fwupd/issues/1414
+	sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
+		-i plugins/thunderbolt/meson.build || die
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		--localstatedir "${EPREFIX}"/var
+		-Dbuild="$(usex minimal standalone all)"
+		$(meson_use agent)
+		$(meson_use amt plugin_amt)
+		$(meson_use dell plugin_dell)
+		$(meson_use elogind)
+		$(meson_use gtk-doc gtkdoc)
+		$(meson_use man)
+		$(meson_use nvme plugin_nvme)
+		$(meson_use introspection)
+		$(meson_use redfish plugin_redfish)
+		$(meson_use synaptics plugin_synaptics)
+		$(meson_use systemd)
+		$(meson_use test tests)
+		$(meson_use thunderbolt plugin_thunderbolt)
+		$(meson_use tpm plugin_tpm)
+		$(meson_use uefi plugin_uefi)
+		# Although our sys-apps/flashrom package now provides
+		# libflashrom.a, meson still can't find it
+		-Dplugin_flashrom="false"
+		# Dependencies are not available (yet?)
+		-Dplugin_modem_manager="false"
+		-Dconsolekit="false"
+	)
+	export CACHE_DIRECTORY="${T}"
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if ! use minimal ; then
+		sed "s@%SEAT_MANAGER%@elogind@" \
+			"${FILESDIR}"/${PN}-r1 \
+			> "${T}"/${PN} || die
+		doinitd "${T}"/${PN}
+
+		if ! use systemd ; then
+			# Don't timeout when fwupd is running (#673140)
+			sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
+				-i "${ED}"/etc/${PN}/daemon.conf || die
+		fi
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	elog "In case you are using openrc as init system"
+	elog "and you're upgrading from <fwupd-1.1.0, you"
+	elog "need to start the fwupd daemon via the openrc"
+	elog "init script that comes with this package."
+}
diff --git a/sys-apps/fwupd/fwupd-1.5.7.ebuild b/sys-apps/fwupd/fwupd-1.5.7-r1.ebuild
index 5590327a5353..5e5f2c55a63a 100644
--- a/sys-apps/fwupd/fwupd-1.5.7.ebuild
+++ b/sys-apps/fwupd/fwupd-1.5.7-r1.ebuild
@@ -149,7 +149,7 @@ src_install() {
 
 	if ! use minimal ; then
 		sed "s@%SEAT_MANAGER%@elogind@" \
-			"${FILESDIR}"/${PN}-r1 \
+			"${FILESDIR}"/${PN}-r2 \
 			> "${T}"/${PN} || die
 		doinitd "${T}"/${PN}
 
diff --git a/sys-apps/fwupd/fwupd-1.5.8.ebuild b/sys-apps/fwupd/fwupd-1.5.8.ebuild
new file mode 100644
index 000000000000..5e5f2c55a63a
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.5.8.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
+
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
+HOMEPAGE="https://fwupd.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="agent amt archive bluetooth dell gnutls gtk-doc gusb elogind flashrom minimal introspection +man nvme policykit synaptics systemd test thunderbolt tpm uefi"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	^^ ( elogind minimal systemd )
+	dell? ( uefi )
+	minimal? ( !introspection )
+	uefi? ( gnutls )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="$(vala_depend)
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+	introspection? ( dev-libs/gobject-introspection )
+	man? (
+		app-text/docbook-sgml-utils
+		sys-apps/help2man
+	)
+	test? (
+		thunderbolt? ( dev-util/umockdev )
+		net-libs/gnutls[tools]
+	)
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-arch/gcab-1.0
+	dev-db/sqlite
+	>=dev-libs/glib-2.45.8:2
+	dev-libs/json-glib
+	dev-libs/libgpg-error
+	dev-libs/libgudev:=
+	>=dev-libs/libjcat-0.1.0[gpg,pkcs7]
+	>=dev-libs/libxmlb-0.1.13:=
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
+	')
+	>=net-libs/libsoup-2.51.92:2.4[introspection?]
+	net-misc/curl
+	virtual/libelf:0=
+	virtual/udev
+	archive? ( app-arch/libarchive:= )
+	dell? ( >=sys-libs/libsmbios-2.4.0 )
+	elogind? ( >=sys-auth/elogind-211 )
+	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
+	gnutls? ( net-libs/gnutls )
+	gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
+	policykit? ( >=sys-auth/polkit-0.103 )
+	systemd? ( >=sys-apps/systemd-211 )
+	tpm? ( app-crypt/tpm2-tss )
+	uefi? (
+		media-libs/fontconfig
+		media-libs/freetype
+		sys-boot/gnu-efi
+		sys-boot/efibootmgr
+		sys-fs/udisks
+		sys-libs/efivar
+		x11-libs/cairo
+	)
+"
+# Block sci-chemistry/chemical-mime-data for bug #701900
+RDEPEND="
+	!<sci-chemistry/chemical-mime-data-0.1.94-r4
+	${COMMON_DEPEND}
+	sys-apps/dbus
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	x11-libs/pango[introspection]
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.5.7-logind_plugin.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use nvme ; then
+		kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
+	fi
+}
+
+src_prepare() {
+	default
+	# c.f. https://github.com/fwupd/fwupd/issues/1414
+	sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
+		-i plugins/thunderbolt/meson.build || die
+	sed '/platform-integrity/d' \
+		-i plugins/meson.build || die #753521
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		--localstatedir "${EPREFIX}"/var
+		-Dbuild="$(usex minimal standalone all)"
+		$(meson_use agent)
+		$(meson_use amt plugin_amt)
+		$(meson_use archive libarchive)
+		$(meson_use bluetooth bluez)
+		$(meson_use dell plugin_dell)
+		$(meson_use elogind)
+		$(meson_use flashrom plugin_flashrom)
+		$(meson_use gnutls)
+		$(meson_use gtk-doc gtkdoc)
+		$(meson_use gusb)
+		$(meson_use gusb plugin_altos)
+		$(meson_use man)
+		$(meson_use nvme plugin_nvme)
+		$(meson_use introspection)
+		$(meson_use policykit polkit)
+		$(meson_use synaptics plugin_synaptics_mst)
+		$(meson_use synaptics plugin_synaptics_rmi)
+		$(meson_use systemd)
+		$(meson_use test tests)
+		$(meson_use thunderbolt plugin_thunderbolt)
+		$(meson_use tpm plugin_tpm)
+		$(meson_use uefi plugin_uefi_capsule)
+		$(meson_use uefi plugin_uefi_pk)
+		-Dconsolekit="false"
+		-Dcurl="true"
+		# Dependencies are not available (yet?)
+		-Dplugin_modem_manager="false"
+	)
+	use ppc64 && emesonargs+=( -Dplugin_msr="false" )
+	use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
+	export CACHE_DIRECTORY="${T}"
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if ! use minimal ; then
+		sed "s@%SEAT_MANAGER%@elogind@" \
+			"${FILESDIR}"/${PN}-r2 \
+			> "${T}"/${PN} || die
+		doinitd "${T}"/${PN}
+
+		if ! use systemd ; then
+			# Don't timeout when fwupd is running (#673140)
+			sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
+				-i "${ED}"/etc/${PN}/daemon.conf || die
+		fi
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	elog "In case you are using openrc as init system"
+	elog "and you're upgrading from <fwupd-1.1.0, you"
+	elog "need to start the fwupd daemon via the openrc"
+	elog "init script that comes with this package."
+}
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 916213ecbeca..52918c41860c 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -2,6 +2,6 @@ DIST grep-3.4.tar.xz 1555820 BLAKE2B 4e1924d6d5eb66faca93b405cce9784d726a476f26a
 DIST grep-3.5.tar.xz 1586396 BLAKE2B 62c98acb29b9998e60b64cacbe82df4f03a8d8a427a060d00283506155e6acadc4d77e8b8c2fa110227715c314ac7cde38a38eff0b92eb0ec793c59ba2562ea5 SHA512 8367aa930ecf7fa5c07153666bf7991097648bd7bf4ca672e6b14e0bb806c89991ec55d2880812877761cbde1d33562f22803835d74bfcd293c2246e274306c4
 DIST grep-3.6.tar.xz 1589412 BLAKE2B 86be3af6718ea3bf29982e1618c0ea9afc135f07e452a7ac8b618b863c0754a979482d4d418e558e703e03a4afcef7818a84ebcbe119aa63cd2892ad09e1a772 SHA512 8934544a19ded61344d83ff2cab501e86f17f8ae338892e0c36c2d2d8e63c76817840a0071ef5e3fcbca9115eba8a1aae0e4c46b024e75cd9a2e3bd05f933d90
 EBUILD grep-3.4.ebuild 1496 BLAKE2B 7abaf611e588c187df417df78d2b3e91d38455ee29ded09af8d7f7b5855748d9acf2b97a74a0c870e7716ed2d6ff7dc1745ea4f893cff21c75e646071e3cec73 SHA512 5dcf6ce5e50442ec490cab1f5e8ac5f68541e3b1609468c48680cffd8ba51f4bb245944763d40424e7e416b8e06f0ee0514c1c2d4510b79a2904023e464746c1
-EBUILD grep-3.5.ebuild 1498 BLAKE2B 7f7c000f1dea830b2fa231561af26bdd5e9d7f0e4ae76733620c1640f89ab72d91f47c7651350f4a78a85f7082ac0a3b19aaeb5b8255fc7652202f77587bb02c SHA512 717583a2987ee45708fe302502e1cee271ac17ad1e337c5b8928304af4392d4f673ed950aaccef19588088e85f45e2ed28922608f1c956d77a048bd0d2691dfd
-EBUILD grep-3.6.ebuild 1476 BLAKE2B f44b88f10ebb7ab4e5722fbf8e1b35d3951c450076d635cbfe9c6f028673a3553fbe0537208f79a69f152dc4cef2db7f5a1af75898b85df7786baea9c20a14a6 SHA512 841b71ddf3c9b8bffd504047082b10086b9dd6a2fff80983f2034daf36f7cabd80234106aa96cfff6fb03eb54a622fc6fa960fdb06e9e550d11f6bb025721c43
-MISC metadata.xml 327 BLAKE2B 4b377e001da15ee2ba05c41866d06eb3e9833f46b6985c38adb405842fb434bdfb49d944557787f4ed68d8e7194036d298b662973c480043ac841ff628a57f53 SHA512 394c0bd736594ec5ef916f1bd0b4b1d8b5547132bb375fe04f67da49fd0cdaec184206e8255f054b8cb5656dc5426e92a51781758cc1b6373200f31bd3152d6f
+EBUILD grep-3.5.ebuild 1783 BLAKE2B 6e1d754fe158ba0a919db4e2f1a9f365450067dfdac4072621a8f5a2ded5dc2d63c06e1741ca6939ecb40042718c76c42a0a8bbc9b37ffbad38f6c0a66feea68 SHA512 b9b92a7572712a2127bae0763cc7df70db86a5b2bafa9a7665d575d4e4b96f05889bf0473b579cebf38e2372852338be14d71c3ba336cd9010c74c3debd54e14
+EBUILD grep-3.6.ebuild 1760 BLAKE2B b642c2ecb17b684a16d4c4a89c03880e93b044d2b1b13c49cb0ecba1995119d88d7e413531bebc725575b4efbbaad4a4ece9281656b7b41e147e3d68268e939e SHA512 7adc72cb0669c752c84dfb8583b458c9359c70e550c225ababec1999a8e39622f18c1ac3ad2492da9bce629e99af0ac789669ceb0649559cd9f80744d6b75088
+MISC metadata.xml 334 BLAKE2B 9b080b3e11ed75688b2a917ec2068dfbe3e1809637ee4806f24f0faecec971eac04892498961172b96493dc250c1fed7c12e6d46104b0d3e54e13bd91011b096 SHA512 a6f238cbf49e79edfa41fa6c296c86378f8477c08fe1d581d399d00d485b8472a31b69311d26f2e399ac8fefe056ddcdb9f59f08dee1a50c77ee1dca97e0bedd
diff --git a/sys-apps/grep/grep-3.5.ebuild b/sys-apps/grep/grep-3.5.ebuild
index c66425de5967..4360f8880ff0 100644
--- a/sys-apps/grep/grep-3.5.ebuild
+++ b/sys-apps/grep/grep-3.5.ebuild
@@ -15,7 +15,11 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls pcre static"
 
-LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
+# We lack dev-libs/libsigsegv[static-libs] for now
+REQUIRED_USE="static? ( !sparc )"
+
+LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )
+	sparc? ( dev-libs/libsigsegv )"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	nls? ( virtual/libintl )
 	virtual/libiconv"
@@ -39,8 +43,13 @@ src_prepare() {
 
 src_configure() {
 	use static && append-ldflags -static
-	# don't link against libsigsegv even when available, bug #673524
-	export ac_cv_libsigsegv=no
+
+	# We used to turn this off unconditionally (bug #673524) but we now
+	# allow it for cases where libsigsegv is better for userspace handling
+	# of stack overflows.
+	# In particular, it's necessary for sparc: bug #768135
+	export ac_cv_libsigsegv=$(usex sparc)
+
 	# Always use pkg-config to get lib info for pcre.
 	export ac_cv_search_pcre_compile=$(
 		usex pcre "$($(tc-getPKG_CONFIG) --libs $(usex static --static '') libpcre)" ''
diff --git a/sys-apps/grep/grep-3.6.ebuild b/sys-apps/grep/grep-3.6.ebuild
index 576125c1c746..199fe20c46eb 100644
--- a/sys-apps/grep/grep-3.6.ebuild
+++ b/sys-apps/grep/grep-3.6.ebuild
@@ -11,10 +11,14 @@ 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls pcre static"
 
-LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
+# We lack dev-libs/libsigsegv[static-libs] for now
+REQUIRED_USE="static? ( !sparc )"
+
+LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )
+	sparc? ( dev-libs/libsigsegv )"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	nls? ( virtual/libintl )
 	virtual/libiconv"
@@ -38,8 +42,13 @@ src_prepare() {
 
 src_configure() {
 	use static && append-ldflags -static
-	# don't link against libsigsegv even when available, bug #673524
-	export ac_cv_libsigsegv=no
+
+	# We used to turn this off unconditionally (bug #673524) but we now
+	# allow it for cases where libsigsegv is better for userspace handling
+	# of stack overflows.
+	# In particular, it's necessary for sparc: bug #768135
+	export ac_cv_libsigsegv=$(usex sparc)
+
 	# Always use pkg-config to get lib info for pcre.
 	export ac_cv_search_pcre_compile=$(
 		usex pcre "$($(tc-getPKG_CONFIG) --libs $(usex static --static '') libpcre)" ''
diff --git a/sys-apps/grep/metadata.xml b/sys-apps/grep/metadata.xml
index f4a75bc8b992..36583c17c48b 100644
--- a/sys-apps/grep/metadata.xml
+++ b/sys-apps/grep/metadata.xml
@@ -1,11 +1,11 @@
 <?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>
-<upstream>
-	<remote-id type="cpe">cpe:/a:gnu:grep</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:gnu:grep</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/hwinfo/Manifest b/sys-apps/hwinfo/Manifest
index 08d8f5fd7d67..0bfdc996a155 100644
--- a/sys-apps/hwinfo/Manifest
+++ b/sys-apps/hwinfo/Manifest
@@ -1,5 +1,7 @@
 DIST hwinfo-21.23-1.2.src.rpm 844672 BLAKE2B 33cfd68c06081d76b33243474b9a72cc5994c749ff57b7fc4f36c88627707068fb86d4825bae66e4e08f730dc8849264f5f31f8717f28400b3d54302ac12b1eb SHA512 d25c955fa5620268a34a857916e0bdbbdb92f8e092735ac453e7bacc6476e00047c9ccef3a5275e5d50cc354bf9e3cffef57af519dc885d0afd3d161ab426629
 DIST hwinfo-21.4-1.1.src.rpm 781525 BLAKE2B 83c6d0b3d15a7b4354223eef8b976643ec6520842007ce6fb06534360a8994d4aac0975eba059275910f59391e7069b0166b69301006ea78ca4b74c6aefbde7c SHA512 bccac7749751924e1e1a8005e6fd783da7114926b6d9b9a1247b3b26dd680848eb2b85b368c312d08b444c8d7b75036d249daf33afc5b7efbbcc09bfbad4b340
+DIST hwinfo-21.72-1.3.src.rpm 926285 BLAKE2B b8a38b2f04649e268a6d6fbebabd724a0c678e81ea9c09c3453ababa26e91ba5fe55c7feccf157ab81ab676e6610ba1700ef1691bdd06fbcbc1cdd86806282d2 SHA512 4e51ee4f8e03eee82317557aa39b5018cc2370b33bfdb280ecb8716687d951f8c34fa7598a1e0eff03025991eee654af488e3343d93167e4cf16380d047c2de3
 EBUILD hwinfo-21.23.ebuild 1284 BLAKE2B e5ea1d3ec4faf5f0aa8a837a2a9763744ab2a75c259533ec0566a950ef12506281cfd807a69b36aae81c198ca14c8a4a22dc23316677108d104a8d53510d1065 SHA512 e0b9312a65f8227a2e0d87ad5c96f875f6a20ee4f1972bf0a3b3876b7efd26d9c549732737323a6431bce58f268c56e72fd8fd42d5099747ac31ea60b137e51e
 EBUILD hwinfo-21.4.ebuild 1565 BLAKE2B 3f0b88f238a63e2e05f0163d8d7168ee0f3821ddd87e5daf367c55b1a4fa150d87943f6fad285915c175dcc3d011584a69f2c33a9fcaac6deffbdc7f809d2efb SHA512 0037b450bce00f7264967ffcb8ff07fcfc9a6508ab3a981c799207f67d959680b55324708714e970c20fba865ea49f8b60fe89c413f88ae417415bbae89c0958
-MISC metadata.xml 256 BLAKE2B 7380eb4443aa7d04fc02d228edb72f675580a9f36244c083c4bbdcbc492a4c5169fb3121158d4a613f25f7c0464042bba7951fb92cf9f11c5208a2d9699e195e SHA512 574345bb2730bbc2d0190a03b16703d10441ccd589623c5e8bdddf84d7ce86226da7e079d7b2135e4c724d0813973c551143cdd0f525a58efdd37716dd83edfd
+EBUILD hwinfo-21.72.ebuild 1380 BLAKE2B f7c6a80e123f97a2333ad25635dd96ca77d862e4e7e27b149233ad3bba11fcea0372e6e0cf850458aef46b991088a5317f5d2299c6db750dae7800ec5d9fd9ae SHA512 8f5f69ccc76c0b25ee3c50b74e3b30a4f3b2588700aa9189643d387894ed30e038bdf14dfb52e5b9bf13ca7338ec694eb4f0e5231dcdc0c8685b6caf6fc0f35a
+MISC metadata.xml 334 BLAKE2B 08e4d837af5734c290c474fe28c4082531eb9b07be2fddef29e16e4dda6aee904bc8674830842b1c1f9736a92a4ccf21992ffdb6f0f3b7e62be73f3d3e93c6d5 SHA512 94c2a056338c3e3e40737e45468d77e170341185017098fc8892cbac1a0993321a1ee8dd007c075430d999fce90508f1e3d4a4f71fda6bfeb6f7c15b199c2405
diff --git a/sys-apps/hwinfo/hwinfo-21.72.ebuild b/sys-apps/hwinfo/hwinfo-21.72.ebuild
new file mode 100644
index 000000000000..0ba8bd099676
--- /dev/null
+++ b/sys-apps/hwinfo/hwinfo-21.72.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib rpm toolchain-funcs
+
+DESCRIPTION="Hardware detection tool used in SuSE Linux"
+HOMEPAGE="https://www.opensuse.org/"
+SRC_URI="http://download.opensuse.org/tumbleweed/repo/src-oss/src/${P}-1.3.src.rpm"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	amd64? ( dev-libs/libx86emu )
+	x86? ( dev-libs/libx86emu )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6.17"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_prepare() {
+	# Respect AR variable.
+	sed -i \
+		-e 's:ar r:$(AR) r:' \
+		src/{,isdn,ids,smp,hd}/Makefile || die
+
+	# Respect LDFLAGS.
+	sed -i -e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' src/ids/Makefile || die
+
+	# Respect MAKE variable. Skip forced -pipe and -g. Respect LDFLAGS.
+	sed -i \
+		-e 's:make:$(MAKE):' \
+		-e 's:-pipe -g::' \
+		-e 's:LDFLAGS.*=:LDFLAGS +=:' \
+		Makefile{,.common} || die
+	# Workaround from Arch, for using raw tarballs from git
+	echo 'touch changelog' > git2log
+	default
+}
+
+src_compile() {
+	tc-export AR
+	emake CC="$(tc-getCC)" RPM_OPT_FLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install
+	keepdir /var/lib/hardware/udi
+
+	dodoc changelog README*
+	docinto examples
+	dodoc doc/example*.c
+	doman doc/*.{1,8}
+}
diff --git a/sys-apps/hwinfo/metadata.xml b/sys-apps/hwinfo/metadata.xml
index 483ee9fe5899..7864c9786d4b 100644
--- a/sys-apps/hwinfo/metadata.xml
+++ b/sys-apps/hwinfo/metadata.xml
@@ -2,7 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>robbat2@gentoo.org</email>
-    <name>Robin H. Johnson</name>
+    <email>bkohler@gentoo.org</email>
+    <name>Ben Kohler</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">openSUSE/hwinfo</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index 8b4fcb2ee39c..4a962f84c521 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -2,6 +2,10 @@ AUX lshw-02.18b-gentoo.patch 4819 BLAKE2B 54e08c0373308bccc39c9217da4152fcb853a1
 AUX lshw-02.18b-gettext-array.patch 924 BLAKE2B 0ebb872cff09b1578026bb9026ca895fe70cbf93ed6d648478f6ef6332af8f56a58b687425f70ac95a40b57b84de9045e916c6ac4a3e35de2199a26acd6ae762 SHA512 60f09dcfbb6813fdeb06e7ca3161c768e4b138a65a2a1c27a19d241ddabbc8e511e31922a998c15e944056bf79eafd907073e419e0887c09180b87de24f4d5ee
 AUX lshw-02.18b-sgx.patch 842 BLAKE2B b1c9b676f8875ef312bcc55e6cf07be21500d50185e25075e61811a8342d4c1e165a75916cb3cf1a2a58ca5a062079dbadf314437c543a0792867d7828d92453 SHA512 face0b384e84379297b18b0efd106f59604a76ff526f3995038d8e261409f5117f456332f357c7c559a24980750779ae40757920b25bdf6b38588620966bc5a9
 DIST lshw-B.02.18.tar.gz 2322176 BLAKE2B 66183895fcdd5b47bfaa044c10f7b561b3310829b53828444a20f078ce63e166a878595c8a8a79e22f1e4ab726e98165a1b31225997785d2bfc3ad5d7b0c5214 SHA512 4385db86101178b8bd33a80e991718e14f83277c66b3d63ae97cb4339196873b6e9b31a174024bf43d16fe66e1d7f8cf5cea56076697878087880c8821b11e47
-EBUILD lshw-02.18b-r1.ebuild 1771 BLAKE2B d9311ae55206c46040936247e2d694ce82a146a723b39f91681f673d4a89cc5d4616b2c45166e5f9527b0ffc2b881f0fcf8fc425918903b1415b6775e02a0ed3 SHA512 4436b699f636d06a00a739f857905ce893222fa41d1815505c9fa2c17e9e41f992e7fa2c9c0e95893f25001cff2ec002fedc86ac1e0a1e6b825a708c10dc9371
+DIST lshw-B.02.19.2.tar.gz 2467937 BLAKE2B 8317def382bcb189c164bddf2dd766c614c6a0a49449ceee81f516125ef14ba24f5933b1f08f13b5ae52a96304baa1cc7ac5171231911ecaa466522a7c0c4c6f SHA512 f3abc6241fe7912740f11b5b97a1f7778cb7cc69f5209b83063cbc1d3aa7b082dedb3aac4119ce100391547400ed6bb2d413ca47de50794e1066f31961be41a5
+DIST lshw-B.02.19.2_p20210121.tar.gz 2469481 BLAKE2B b9a886c21d6abde00f234cc93fc25ae2b4cf734ffd3fdea7847283fa44eef80bfddd6d83ab428c126ef6518eb8da35f3ba15d88cfc5dbb304813a4d28c173351 SHA512 699ee270eb9a8dd6652d7bcab5d99187585159428bdceab2e17add51e29d73a929a4d34168d92308e775383b9920b07e3b02e0781f9f1b1f099aff3550e9b0c0
+EBUILD lshw-02.18b-r1.ebuild 1779 BLAKE2B cdcdef6003f3c8daccd8ea442822908813914f2b155887f9f3c2f0a4b843ff3833380e5bb0657b50293af35de36b305cfd741dfdd61b30d38063b98cf705d4d5 SHA512 b5a21f8effa23ab0154249d1e37fc7c966a4b6ac1896943903bfeb66a1105c682a2e9a7fc1e603179cf1ce5ea8955d162276681c8946e3bd3f1c98d7665a926f
 EBUILD lshw-02.18b.ebuild 1721 BLAKE2B 51a1020346e3ac0856d1c7dbbe5827c430db0b017b35ae70876e6b8fcfcea7d134f942dc507b8158ad9010242cf9f94c92b8521b981b8d569137cd0fb0eb0273 SHA512 9065cd8709e623d6ee770f2fb499bb433bcf383795e8b280171da3b7a2d9a93e32956aaaeaa347dfbedd81d29c4bd964f8839d7ab98124c86d9fb65e7feb07cd
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
+EBUILD lshw-02.19.2b.ebuild 2143 BLAKE2B a2ffef5fd6e729e670b13a596f6aac6d15e33d8388c02efec0e410f6ffb5fbfff64ac8ae15c97adfea61cee639e9dad29fd7f8bb4a50e5a89502f96ff4ce3c0d SHA512 98d66f43361a8fd5a7e39cb939804392e9f5c763affd448217a18a45b6276588e1f8e11a775fbc9ef1953ffca5f77f1a7ae0b807182341fab42efd0c847958bb
+EBUILD lshw-02.19.2b_p20210121.ebuild 2147 BLAKE2B faad40e16dc2e37e0c92805e3f8f6287ee41f30b2f82935fdbf4cacca8b19d44955f12f6c980bb22b7a201e3a47f3a6f137c0880e9590be9812ae528775cf604 SHA512 e6aaa0917953fe2483f474c256b062725801c6e7a7dfb84a1baddb9622ed909aaf079ebb520aa4e621d2dc12a6fc1ade9256ec8b40d0bb88312c37639921d5c3
+MISC metadata.xml 461 BLAKE2B 85843f85ec415a571d44f8c7bd8b04baa11e58141cc6bc7c0a0561628e858f9c8881d5737314873f5d4ba6788b36d54a9bb434ccdba3d2f1c435957b3972acce SHA512 b824f0e4251e52f1bb5283faba663d74b93c35bc23963e84826be85eeaffb6481b66ffc2548736cc66227be24bfb230cbf77cfe9d72d7ac7053abb26f980c6b3
diff --git a/sys-apps/lshw/lshw-02.18b-r1.ebuild b/sys-apps/lshw/lshw-02.18b-r1.ebuild
index bd4bc8ff6db2..5df82efaafaf 100644
--- a/sys-apps/lshw/lshw-02.18b-r1.ebuild
+++ b/sys-apps/lshw/lshw-02.18b-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="gtk sqlite static"
 
-REQUIRED_USE="static? ( !gtk )"
+REQUIRED_USE="static? ( !gtk !sqlite )"
 
 RDEPEND="gtk? ( x11-libs/gtk+:2 )
 	sqlite? ( dev-db/sqlite:3 )"
diff --git a/sys-apps/lshw/lshw-02.19.2b.ebuild b/sys-apps/lshw/lshw-02.19.2b.ebuild
new file mode 100644
index 000000000000..471abbf1b243
--- /dev/null
+++ b/sys-apps/lshw/lshw-02.19.2b.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES='fr'
+
+inherit desktop flag-o-matic toolchain-funcs l10n
+
+MY_P=${PN}-$(ver_cut 3 PV/b/B).$(ver_cut 1-3)
+
+DESCRIPTION="Hardware Lister"
+HOMEPAGE="https://www.ezix.org/project/wiki/HardwareLiSter"
+SRC_URI="https://www.ezix.org/software/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="gtk sqlite static"
+
+REQUIRED_USE="static? ( !gtk !sqlite )"
+
+DEPEND="${RDEPEND}"
+RDEPEND="sys-apps/hwids
+	gtk? ( x11-libs/gtk+:2 )
+	sqlite? ( dev-db/sqlite:3 )"
+BDEPEND="gtk? ( virtual/pkgconfig )
+	sqlite? ( virtual/pkgconfig )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( COPYING README.md docs/{Changelog,TODO,IODC.txt,lshw.xsd,proc_usb_info.txt} )
+
+src_prepare() {
+	default
+
+	l10n_find_plocales_changes "src/po" "" ".po" || die
+	sed -i \
+		-e "/^LANGUAGES =/ s/=.*/= $(l10n_get_locales)/" \
+		src/po/Makefile || die
+	sed -i \
+		-e 's:\<pkg-config\>:${PKG_CONFIG}:' \
+		-e 's:+\?make -C:${MAKE} -C:' \
+		-e '/^CXXFLAGS/s:=-g: +=:' \
+		-e '/^CXXFLAGS/s:-g ::' \
+		-e '/^LDFLAGS/s: -g::' \
+		-e '/^all:/s: $(DATAFILES)::' \
+		-e '/^install:/s: all::' \
+		src/Makefile src/gui/Makefile || die
+	sed -i \
+		-e '/^CXXFLAGS/s:\?=-g: +=:' \
+		-e '/^LDFLAGS=/d' \
+		src/core/Makefile || die
+	sed -i \
+		-e '/^#define PCIID_PATH/s:DATADIR"\/pci.ids.*:"/usr/share/misc/pci.ids":' \
+		src/core/pci.cc || die
+	sed -i \
+		-e '/^#define USBID_PATH/s:DATADIR"\/usb.ids.*:"/usr/share/misc/usb.ids":' \
+		src/core/usb.cc || die
+}
+
+src_compile() {
+	tc-export CC CXX AR PKG_CONFIG
+	use static && append-ldflags -static
+
+	# Need two sep make statements to avoid parallel build issues. #588174
+	local sqlite=$(usex sqlite 1 0)
+	emake SQLITE=${sqlite} all
+	use gtk && emake SQLITE=${sqlite} gui
+}
+
+src_install() {
+	default
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '')
+	if use gtk ; then
+		newicon -s scalable src/gui/artwork/logo.svg gtk-lshw.svg
+		make_desktop_entry \
+			"${EPREFIX}"/usr/sbin/gtk-lshw \
+			"${DESCRIPTION}"
+	fi
+}
diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
new file mode 100644
index 000000000000..20087b02f948
--- /dev/null
+++ b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES='fr'
+
+inherit desktop flag-o-matic toolchain-funcs l10n
+
+MY_COMMIT="fdab06ac0b190ea0aa02cd468f904ed69ce0d9f1"
+MY_P=${PN}-$(ver_cut 3 PV/b/B).$(ver_cut 1-3)_$(ver_cut 5-6)
+
+DESCRIPTION="Hardware Lister"
+HOMEPAGE="https://www.ezix.org/project/wiki/HardwareLiSter"
+SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="gtk sqlite static"
+
+REQUIRED_USE="static? ( !gtk !sqlite )"
+
+DEPEND="${RDEPEND}"
+RDEPEND="sys-apps/hwids
+	gtk? ( x11-libs/gtk+:3 )
+	sqlite? ( dev-db/sqlite:3 )"
+BDEPEND="gtk? ( virtual/pkgconfig )
+	sqlite? ( virtual/pkgconfig )"
+
+S=${WORKDIR}/${PN}
+
+DOCS=( COPYING README.md docs/{Changelog,TODO,IODC.txt,lshw.xsd,proc_usb_info.txt} )
+
+src_prepare() {
+	default
+
+	l10n_find_plocales_changes "src/po" "" ".po" || die
+	sed -i \
+		-e "/^LANGUAGES =/ s/=.*/= $(l10n_get_locales)/" \
+		src/po/Makefile || die
+	sed -i \
+		-e 's:\<pkg-config\>:${PKG_CONFIG}:' \
+		-e 's:+\?make -C:${MAKE} -C:' \
+		-e '/^CXXFLAGS/s:=-g: +=:' \
+		-e '/^CXXFLAGS/s:-g ::' \
+		-e '/^LDFLAGS/s: -g::' \
+		-e '/^all:/s: $(DATAFILES)::' \
+		-e '/^install:/s: all::' \
+		src/Makefile src/gui/Makefile || die
+	sed -i \
+		-e '/^CXXFLAGS/s:\?=-g: +=:' \
+		-e '/^LDFLAGS=/d' \
+		src/core/Makefile || die
+	sed -i \
+		-e '/^#define PCIID_PATH/s:DATADIR"\/pci.ids.*:"/usr/share/misc/pci.ids":' \
+		src/core/pci.cc || die
+	sed -i \
+		-e '/^#define USBID_PATH/s:DATADIR"\/usb.ids.*:"/usr/share/misc/usb.ids":' \
+		src/core/usb.cc || die
+}
+
+src_compile() {
+	tc-export CC CXX AR PKG_CONFIG
+	use static && append-ldflags -static
+
+	# Need two sep make statements to avoid parallel build issues. #588174
+	local sqlite=$(usex sqlite 1 0)
+	emake SQLITE=${sqlite} all
+	use gtk && emake SQLITE=${sqlite} gui
+}
+
+src_install() {
+	default
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '')
+	if use gtk ; then
+		newicon -s scalable src/gui/artwork/logo.svg gtk-lshw.svg
+		make_desktop_entry \
+			"${EPREFIX}"/usr/sbin/gtk-lshw \
+			"${DESCRIPTION}"
+	fi
+}
diff --git a/sys-apps/lshw/metadata.xml b/sys-apps/lshw/metadata.xml
index 56c124413057..3602ce544cc7 100644
--- a/sys-apps/lshw/metadata.xml
+++ b/sys-apps/lshw/metadata.xml
@@ -1,8 +1,13 @@
 <?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 type="person">
+	<email>bkohler@gentoo.org</email>
+	<name>Ben Kohler</name>
 </maintainer>
+<upstream>
+	<doc>https://ezix.org/src/pkg/lshw/wiki</doc>
+	<bugs-to>https://ezix.org/project/newticket?component=lshw</bugs-to>
+	<changelog>https://www.ezix.org/project/wiki/HardwareLiSter#Changes</changelog>
+</upstream>
 </pkgmetadata>
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index 3d0404a50d09..9539aab6c797 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -4,7 +4,7 @@ AUX man-db-2.9.3-sandbox-env-tests.patch 315 BLAKE2B d6f4835e9e32f8afffe6ab1a70e
 AUX man-db.cron-r1 252 BLAKE2B 1d48851bd11ddf65ee24cae65a8bdb43b2c0df515a790661680775598fae21ef0776f04736425d511d48e97873d44b36a04d6ff41a53fceda0d8254482a4b53a SHA512 c2c7c05bcf241bb066c3ef98e33fb8c3b06abf92c20709f97c1e1e048d47aa4cf5ea412231a490008b3f1d87b284e381e611bb3275e8413ad031dac113112054
 DIST man-db-2.9.3.tar.xz 1885840 BLAKE2B 6163660af60a2900220d7b1de74caa9cb9e5764cc5da20469a8fb08e19ee1948937916664fdc493b89da8fd829aa512877892245fabc00fb586c7754c0da3d53 SHA512 ca1c1214753483f6e22efe69a9df9852e0de01a9ad3b9950dcbbc9f38e6060100b98a84333256f8c734002e66e2fd6256bc017a31bd9acfc42002dca2c0f879b
 DIST man-db-2.9.4.tar.xz 1909020 BLAKE2B 43427e851f0e661ca1cee55211dd7636f4ffde067c75de7715f525029b22c205728f8e86ac49abff60e47a4a4c9e1fbd78e2c87e70bd37778b88594a3897275f SHA512 169f091dd0a1d0dbd1583366f8257afb8f57e030d0f7d4213c14ce0b1fc5debf8b9cf2731de503830cb2826b3a22b3cff7da993d44ec18557935bd293529133c
-EBUILD man-db-2.9.3-r1.ebuild 4129 BLAKE2B 92a05bea3a84a6dfd3945d8aa8c5a9136c8e92a35aff356046de6e2af0ea8de784fd9112595e8a42046fe6eec8f82cf6af87db6231d8476344c73623430efb44 SHA512 4e273cb69e23f49054eb9133f7ddee58837b6cccfd6d08cc8fc70a71d6f74fe3e08d5a2aeb00792df201eef803eeb1f8125b33f50c392a64ddfdc145f7239a09
+EBUILD man-db-2.9.3-r1.ebuild 4128 BLAKE2B ed8d4f14ecb1a02e6aae0027e0c1f0ef7a878fcffb52ff127ea83f22e16a742cb89880e9f883362b10ec42e21d18276aed615f06d452e93627de4834d2cdb549 SHA512 c0c20b45456d8b8366b6cf67bba32d9371c7e134bde13ce931b91c0c4a8daeb9011973df62c6386e929a177b35e25d6894f1cb41610a0debd6c8aedb6d4b9af2
 EBUILD man-db-2.9.3-r2.ebuild 5199 BLAKE2B aafb16a1685d0cafca99ac54a55fc7a9371d6d1a1c040b09e2c16ec37598a0a679316dce9bde18aec17aefb5fe767079d64771a986a3d0bbe9acb7ef6c602d6f SHA512 eb24108aabf63f6f936dd4c635c1a8b83f6f28a72ba45ad08561ac6e6dc262170c16f05739d11eebd8b8ceb0a835e62301a587b2fbed672086e3acf320edc88c
 EBUILD man-db-2.9.4.ebuild 5070 BLAKE2B 282b6d530643d4f98e1f5618865676f0eed81da88a599238f0c179777030eaa526182e49017e750aff403da713a1f6c598f87167fd8687be565320783e9c975e SHA512 fccf9aacad6d3b6fa86b08b30972a178599aa95eb596c7d0ba9d10284c870cd2dd86cfec77f5d58e5bc6f54ffcde05adba7f0d176bf9a5ded05a6584fd4f6f21
 EBUILD man-db-9999.ebuild 5070 BLAKE2B 282b6d530643d4f98e1f5618865676f0eed81da88a599238f0c179777030eaa526182e49017e750aff403da713a1f6c598f87167fd8687be565320783e9c975e SHA512 fccf9aacad6d3b6fa86b08b30972a178599aa95eb596c7d0ba9d10284c870cd2dd86cfec77f5d58e5bc6f54ffcde05adba7f0d176bf9a5ded05a6584fd4f6f21
diff --git a/sys-apps/man-db/man-db-2.9.3-r1.ebuild b/sys-apps/man-db/man-db-2.9.3-r1.ebuild
index 2dc1438844d8..e43583cc2ddd 100644
--- a/sys-apps/man-db/man-db-2.9.3-r1.ebuild
+++ b/sys-apps/man-db/man-db-2.9.3-r1.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" = 9999* ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-3"
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 07bd512bb649..96cce487b714 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -1,6 +1,8 @@
 DIST man-pages-5.09.tar.xz 1740816 BLAKE2B 5434453dc75058a2aef5d1ca04854abe3d2e3a7ddd5167fbbc36cefc0e103bb75339279fd5638698b12e7fbe2314dafd0498b2104e01b4314e909f89db65d50e SHA512 fa5684c316326afd2056876c174e4f2c8baa18d76bfc2f63009903f09f93b4c204fb0773e0991b5247e50596b2da7e232c5087121a0c938a072af8c77848686f
 DIST man-pages-5.10.tar.xz 1747688 BLAKE2B 39da2ec75b0096db7b5af483e6096259b2439bf9ce3b651af82350b612c234375e3e34d70ff84f401c23189c0aa921f29cf77c0979e40efd3fda0f06378a7c2b SHA512 a23f90136b0bf471f5ae3917ae0e558fec0671cace8ccdd8e244f41f11fefa4ac0df84cf972cc20a1792d7b930db5e2c451881c0937edabf7d5e1ec46c4760ed
+DIST man-pages-5.11.tar.xz 1758092 BLAKE2B 45f1f8751f197f616913fd0084ead3ff7e3b3d11d0c3c70ecd43acbc621927cbb3582ffc7df5101887ec5c733e35a9c5321af9ddaf477e06da391c5af9eb6bc5 SHA512 2f57308fb331e0207ed4764d7753711caf74c0b74eef789612bc1869126be529450c7a2a7011fd6413eebea4ff0fee9a1ba0c94959652a3c747c780e83741450
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
 EBUILD man-pages-5.09.ebuild 1615 BLAKE2B aef12c4bd4190869ac6ea8ea15728370fcbd536efd75b1e6e746585909d401cbf62fb14644d34a0c456645d750e59600fbd5c5ecae734b1297466ea701e6ba98 SHA512 e18aa04a42cb95b926c076605d1d594faa999a46fa6f680f65364e91a31f061fd9ff058707adaef7f91c5098d27ea2e4006e87714cf35007b200ac04fb622634
 EBUILD man-pages-5.10.ebuild 1749 BLAKE2B 776fbd4cbdc20511530945337a364c1a9fd4e46e8a1ba03508a4b62945d40c125073785528aa6147dfc6c88fddcc24b0d853782e22ba2916211e42d3118b1518 SHA512 c254fa30e04ea868df16470c694905d105907856a08b377c6db794f2f4a538e25864307ce935069c1d19a94af98de3ec0301bcea43d7a34425bf11dc532bd333
+EBUILD man-pages-5.11.ebuild 1749 BLAKE2B 776fbd4cbdc20511530945337a364c1a9fd4e46e8a1ba03508a4b62945d40c125073785528aa6147dfc6c88fddcc24b0d853782e22ba2916211e42d3118b1518 SHA512 c254fa30e04ea868df16470c694905d105907856a08b377c6db794f2f4a538e25864307ce935069c1d19a94af98de3ec0301bcea43d7a34425bf11dc532bd333
 MISC metadata.xml 276 BLAKE2B db75e173038497d8042224c9688330289e32f45997677daba5a31b4bbc3b3107f952801840a593cee563aa9bfe69c106aa9ac02bb0a1a724852da00aa26b0033 SHA512 c21ecc4f65303ae346b382f4158fc932401e49297d2dd9c55047ffe7e74283783e21a7b58de649bd97bb77cf920306734daf0ff70ed313505c999efa566fe574
diff --git a/sys-apps/man-pages/man-pages-5.11.ebuild b/sys-apps/man-pages/man-pages-5.11.ebuild
new file mode 100644
index 000000000000..2a296f092cdc
--- /dev/null
+++ b/sys-apps/man-pages/man-pages-5.11.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_PATCH=2
+
+DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
+HOMEPAGE="https://www.kernel.org/doc/man-pages/"
+SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
+	https://www.kernel.org/pub/linux/docs/man-pages/${P}.tar.xz
+	mirror://gentoo/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2
+	https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2"
+
+LICENSE="man-pages GPL-2+ BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE_L10N=" de fr it ja nl pl pt-BR ro ru zh-CN"
+IUSE="${IUSE_L10N// / l10n_}"
+RESTRICT="binchecks"
+
+# Block packages that used to install colliding man pages #341953 #548900 #612640 #617462
+RDEPEND="
+	virtual/man
+	!<sys-apps/keyutils-1.5.9-r4
+	!<dev-libs/libbsd-0.8.3-r1
+"
+PDEPEND="
+	l10n_de? ( app-i18n/man-pages-l10n[l10n_de] )
+	l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr] )
+	l10n_it? ( app-i18n/man-pages-it )
+	l10n_ja? ( app-i18n/man-pages-ja )
+	l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl] )
+	l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl] )
+	l10n_pt-BR? ( >=app-i18n/man-pages-l10n-4.2.0[l10n_pt-BR] )
+	l10n_ro? ( >=app-i18n/man-pages-l10n-4.2.0[l10n_ro] )
+	l10n_ru? ( app-i18n/man-pages-ru )
+	l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
+	sys-apps/man-pages-posix
+"
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	emake install prefix="${EPREFIX}/usr" DESTDIR="${D}"
+	dodoc man-pages-*.Announce README Changes*
+
+	# Override with Gentoo specific or additional Gentoo pages
+	cd "${WORKDIR}"/man-pages-gentoo || die
+	doman */*
+	dodoc README.Gentoo
+}
diff --git a/sys-apps/miller/Manifest b/sys-apps/miller/Manifest
index db36ec51cc2f..1afe508a241c 100644
--- a/sys-apps/miller/Manifest
+++ b/sys-apps/miller/Manifest
@@ -1,3 +1,5 @@
 DIST miller-5.10.0.tar.gz 6793426 BLAKE2B 25ec96e29ee8d913feffd6e9a54cd2d494c9050e180556ed462a6d94a6adaaea88dbdbc09b4753f8888673bdc33a1f0aa43f9dac37bdc3c25191b2a565fe8847 SHA512 a7cbaee9ad4075d27e74ab3a60297164c535ea2bc1e38128174f4f226ad061850d37108e7d7547821b7e6667cb9a024639795d7678b1897fedf6ee15d6064538
+DIST miller-5.10.1.tar.gz 6158587 BLAKE2B f22db3ccd29e0ff99e3f287e7e4382d679bba2c4d8e0fef3f3c086fa11ffbb287c22fc69c23f3baf647c2e5ac020d73f55ee613b0bb71273d7f94a5fe9561ea5 SHA512 32ec8216ea9c73c20b5c22fa047535c37f52a0d3c3c1100b090c57011cd555cae57a56425dfb0eaf0d09d41d82dbea3ad78a182ec8b538e194599b754f562961
 EBUILD miller-5.10.0.ebuild 1044 BLAKE2B 74501a4d7622e89ae1bf1653466b7ad41950e3e15b5e25b0d344a28378edd4b9e2ee3950c48669bf8258bc794e9ddee6a2949bad5518b7ca695da0bfff6a714d SHA512 ce2b40ca3f6a0e360bb5a13e87c4e51a4b629458501f6dc9c07d5aa6e06c3077864316caab187e5cbee1dbe8914cdd16d8d7857a1c61a8aaccd83fc2bdbd14b1
+EBUILD miller-5.10.1.ebuild 1045 BLAKE2B f5e71780d7469b52f88b75e8cebbbe15c730b6dc62a62ff3dbb4b27c949e12555fcad34545ee508e86d04dd2b22a98c18d835bce2a90a0744ce578e6f9fbbafb SHA512 843cf472b73a9464ffff14fde046c8ba2c72846fab9abceb190e5271ec894718359cb998eb812f817fab555962b1380a570f4a0f01812bf4e3e8c0a66e80b8ad
 MISC metadata.xml 245 BLAKE2B 99e9ca57f1b154300ca2be7ca1206ed452a161018fbb46c1c8a46b3387e6267f3cb2832ba0d3dac88ef6b71ca3e931fe20f998ad6839d1fbe724bb42baabcb58 SHA512 2997363b86d62fd687ba842015c5fcfe4b3a0055f226291bd2a797d7dab1df44e4dbab56152e4adf288f27ebebf5978d3b5761452840da554fd025cc493d8210
diff --git a/sys-apps/miller/miller-5.10.1.ebuild b/sys-apps/miller/miller-5.10.1.ebuild
new file mode 100644
index 000000000000..4f24e895c456
--- /dev/null
+++ b/sys-apps/miller/miller-5.10.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A tool like sed, awk, cut, join, and sort for name-indexed data (CSV, JSON, ..)"
+HOMEPAGE="https://johnkerl.org/miller/doc/index.html"
+SRC_URI="https://github.com/johnkerl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+DEPEND="sys-devel/flex"
+
+src_prepare() {
+	default
+
+	# Respect flags
+	find -type f -name "Makefile.am" -exec sed -i -r -e '/.*FLAGS[^=]*=/ s:(-g|-pg|-O[0-9]) ::g' -- {} \; || die
+
+	# Disable docs rebuilding as they're shipped prebuilt
+	sed -e '/SUBDIRS[^=]*=/ s:doc::g' -i -- Makefile.am || die
+
+	# Disable building tests automagically
+	if ! use test; then
+		sed -e '/SUBDIRS[^=]*=/ s:[^ ]*_test::g' -i -- c/Makefile.am || die
+	fi
+
+	eautoreconf
+}
+
+src_test() {
+	emake -C c/reg_test
+	emake -C c/unit_test
+}
+
+src_install() {
+	local HTML_DOCS=( $(usev doc) )
+
+	default
+
+	doman docs/mlr.1
+}
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 9ae9d23b094f..9b799738f9d9 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -3,5 +3,5 @@ AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a
 AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb
 DIST openrc-0.42.1.tar.gz 242848 BLAKE2B 381f52552c13afbbcf45456fe71078bacf9182adfd67c97394093986977f5e8262d8a3c64219501745575a5210f525afe9fccee72f7625485a9f575108baa369 SHA512 579b9bfbb151b945a364a2c12b037d2e15991820ca99a07ac18e9bdc50074e67fbf0dcf9865aa4deabe2bf82092e4623be51c9e0b4014384951e0a92ac1e7646
 EBUILD openrc-0.42.1-r1.ebuild 5470 BLAKE2B c0ad9fffd6fa294a0dff8ab4a25a21e7b7a2a3fe0c9c839ef0d8a40515d644df2fc10dac8f0ef5e420f5c20a97e63c4c4864a6863cb27a82c4abcf9891046870 SHA512 4e099110647827915fad4619e3eaea04dfe61e71f47bf941518756bfc398a4828f874598682e1548b6fbdc8b16f4f74ee4911077552ab14843b5ae9b7c87a063
-EBUILD openrc-9999.ebuild 5091 BLAKE2B 6828177a5355dbdaa2032cff0c1f7e5701b2b35202397813844327856dba137dd23608fc1f2ab706a6e9a2a96cebfb10f899393baad0d61f3168c9c27f94c113 SHA512 ac6ff0d319e3406f1b45c4ee2fc30b4deca49c4e11968a64754d5797111be2e2a2dd6f5cdd2a0ad775475af56c534dd87ef4c6851dced6e86d33713ff62d5e36
+EBUILD openrc-9999.ebuild 5013 BLAKE2B eba47aae6e1d07c2ccd925f2e380268a6ab96aec37e245b3ccf0474d30fc19811a5f45c610a6fd68760a4695f48040733aa524f41c86a9149bcdbb97195ba4a0 SHA512 24970d1219d2fc2c93ecd6ddc22200af0a3e70decb506f06ffd2f3be15a7b3a37398e150f26d6c2477b59f3ece72babf61056ddd3c6e86233b7576f081460cd3
 MISC metadata.xml 706 BLAKE2B 1d6a4937d577fff7db7fd64617328ca49faccaa61749adabc411a215960ee06c1af32499be697921012eee34f5c680295e46f545099f06393965a17c0d0d034d SHA512 d5d669cdcf8707689c855cab678031c6e9b1e33e4b931c7d80bbe2ad442aedabef718018466f0cb15bd8a329292a0de844935f9332611f3fb334b57d14aa39c1
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 2edcd38b66c7..1b2b297f3023 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -18,15 +18,11 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux sysv-utils
-	unicode"
+IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux sysv-utils unicode"
 
 COMMON_DEPEND="
 	ncurses? ( sys-libs/ncurses:0= )
-	pam? (
-		sys-auth/pambase
-		sys-libs/pam
-	)
+	pam? ( sys-libs/pam )
 	audit? ( sys-process/audit )
 	sys-process/psmisc
 	!<sys-process/procps-3.3.9-r2
@@ -68,10 +64,9 @@ src_prepare() {
 }
 
 src_compile() {
-	unset LIBDIR #266688
-
 	MAKE_ARGS="${MAKE_ARGS}
 		LIBNAME=$(get_libdir)
+		LIBDIR=${EPREFIX}/$(get_libdir)
 		LIBEXECDIR=${EPREFIX}/lib/rc
 		MKBASHCOMP=yes
 		MKNET=$(usex newnet)
@@ -81,13 +76,11 @@ src_compile() {
 		MKPAM=$(usev pam)
 		MKSTATICLIBS=no
 		MKZSHCOMP=yes
+		OS=Linux
 		SH=$(usex bash /bin/bash /bin/sh)"
 
-	local brand="Unknown"
-	MAKE_ARGS="${MAKE_ARGS} OS=Linux"
-	brand="Linux"
-	export BRANDING="Gentoo ${brand}"
 	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+export BRANDING="Gentoo Linux"
 	export DEBUG=$(usev debug)
 	export MKTERMCAP=$(usev ncurses)
 
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index fce1ec264757..19eed12fd692 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -11,7 +11,7 @@ EBUILD pkgcore-0.10.13-r3.ebuild 1247 BLAKE2B d0a3f38b90222ecbff5e8df115e686c3c7
 EBUILD pkgcore-0.10.14-r3.ebuild 1205 BLAKE2B 8310cceda556f51b36c89a60e28e0c884b92fede00d27672ecc31e14d2fd348aa2813ec6f5caa5efb5591dbee85f8ab2513a3dedbf93c24aba2e7ddebb8938db SHA512 3d38afe69a523e11e2d930c31ca7cdfab38ca890c2ebe57284a9ce838312acfac9dfa48580057a478b7f43f391ecee4561d74e2878d8189d0e920bbb023e94ed
 EBUILD pkgcore-0.11.2-r2.ebuild 1111 BLAKE2B 676d166638807895799de77fcf881962d60734dcb86eba10b726b1c2fb43629f7f2e86948a6f2a9770d5a4737413a6d6396212aafdc9e902bda064f8c64b046d SHA512 38fca7cc42e4e87a164d3f6912786fa0feb5bea777ac9028848b6bbf264de3af5f4a43cf1ae6d6c4eb77c66b8fd66336d8ac7ad27e61a1ee505469b817f54fc4
 EBUILD pkgcore-0.11.3-r2.ebuild 1117 BLAKE2B fe299e2de72b1dd790325b75bd7d9f2c02dfeb6e87b4c63a22a46777db3b4ea9053318969f32a259b3514476d0a3c588e8310c84e2a80736036381e27a09ff4e SHA512 7209df6b7170cd2435e124c4c9ab4b3ef377d91fb11fbc3aff0f73bcd29f943fbf8019dff7b742f185e9c7888d2b5cb89c85b68a6cb532c1baec63700a08f508
-EBUILD pkgcore-0.11.4-r2.ebuild 1190 BLAKE2B 6da813bd67c9d823429a3f9bf22006ab2e701a65b1b65ac42122421dedf27932a37a3a44d55718191adcff850cfd6a1d74205d21cf0a3b3c67b4fd442348ab1a SHA512 866a579309511c7b9f299b51ec74652f8831af9b3810bce991bcfe976978b7a00c913697456e60e499590ccbd7c3bf2e9cde045d9de8916613e5cd782aebc043
+EBUILD pkgcore-0.11.4-r2.ebuild 1185 BLAKE2B b54077aab046e546f315df380f64d5ee99b0ec89091d3807b314c2b774937d113b93445791b5001a5a03ddf2bc23c29a08f7501d09b59d54036cae172664b51b SHA512 ce005729bff768aecf9c1fe4870b4a43c3054ca7498204e59c3596ce9aa19ed2a8aad37457acea9dff9754e25f819b6fed96bfaf04661e445275d54619475459
 EBUILD pkgcore-0.11.5-r2.ebuild 1191 BLAKE2B f2230f3a09376a3429ec63ada66384ef67fb9479d0207258abb527b178a82c24876a732f58ff6853edf02796ba532682fc7b26231549d0cdc3259976388d5fcb SHA512 778ad43775ab53863850d42b8d868d55a0ad4403cd9007c5cc02645c856e32a7815fb400c942e1c03f2f13d6534e540a96b9fe28e896ef2ab8122a4efe0ef47b
 EBUILD pkgcore-0.11.6.ebuild 1077 BLAKE2B fbb8f0e723f5eb441cae9b8f0dacf1d6775a086efdb318b3683c35009ce868d2f4ed659cc24f92a875370e189a849e01dd4a2b7a6c45f8bed512c852942ea6f9 SHA512 432b04443a50ea90234f8c163bdd918187dbdcaab3b92a74131b850ada15423aa8339230769fc1e5a40f512bcd69a1ba20bcc8820afd87125b64c46daa4d55cb
 EBUILD pkgcore-9999.ebuild 1077 BLAKE2B fbb8f0e723f5eb441cae9b8f0dacf1d6775a086efdb318b3683c35009ce868d2f4ed659cc24f92a875370e189a849e01dd4a2b7a6c45f8bed512c852942ea6f9 SHA512 432b04443a50ea90234f8c163bdd918187dbdcaab3b92a74131b850ada15423aa8339230769fc1e5a40f512bcd69a1ba20bcc8820afd87125b64c46daa4d55cb
diff --git a/sys-apps/pkgcore/pkgcore-0.11.4-r2.ebuild b/sys-apps/pkgcore/pkgcore-0.11.4-r2.ebuild
index ad98dca71057..2bd302ae4827 100644
--- a/sys-apps/pkgcore/pkgcore-0.11.4-r2.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.11.4-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 1b18142c1a6f..f963241f74c7 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -4,14 +4,12 @@ DIST portage-2.3.89-bug-718578.patch 1325 BLAKE2B 7a3bc520274617736eac2e3d078e90
 DIST portage-2.3.99.tar.bz2 1051210 BLAKE2B dd3f990dbc87e655a767ce01e1ee3f0b1d5226fa818949408e54b81a2f96e50a4215a79af42b00dc795792858c4f86453b238b14baef4f0793c937b5617534b8 SHA512 176842318a4134ce54c5aa6485fef296f5a14edd2a72421c2011973a0f1a6af39bc5398f1e9eb3b8666d5fc307589c5b91ab93c219bdedb2d307357d8ddefbf5
 DIST portage-3.0.12.tar.bz2 1049335 BLAKE2B 9f7b17ebfe068559ffbc2bc0799f72901abab8b8b5bb608c8f6afe1f8f7fdaae1026c2a04d9b2256b367711196e32b58c6927ea6fc57146148ed71b295acdcb8 SHA512 6f93f35c06ac765f926f5281e2fac99d52140e8c5d95ee4224796c1ea23ed5f45ed5382acbbfc7aebf9f68a9c585fc1b41b615ef765be2d16577909032de1350
 DIST portage-3.0.13.tar.bz2 1049930 BLAKE2B 092e4a25896d613dcfcdaaa1c75f29d19112688328c4078a8ab2b24edcf1e26fff3273da56a79f8b35aada5e11e3cf7f14ef40aca742da0874ea7e907c4778bc SHA512 a9106fce311053523fd026c6c65cb85562bae69ab6ea6b5ae784044ffedbfeb0e3b1c3758ebea9204b11f885da383f9d8ee31d34ad52ac14f059cf97894e3590
-DIST portage-3.0.16.tar.bz2 1055482 BLAKE2B 84d1ffd0be8855a7fee5b966d72032e59d72184dabab99c97bd829c669ac8eb526470c7b05958c9ea4cce4236bfb4998167db8feed74f8ef879d1e529c3d0eb5 SHA512 ae8ca1d15143bc0b62506d46b042626dc3d8587110c909448cb3735080a4c916d5d6d4bcaa4f189f98a32b0de29f2fc8b643f38642ec26fab58d1448ac50f1c3
 DIST portage-3.0.17-bug-775053-setup-globals-double-prefix-ff7d78.patch 908 BLAKE2B 51984f04bf9a9b448207f9f724a01e72f76a1df8f3da8a9cf263a870674458e885ed47aba7597b3a01d9ee3c86b687bcb9048356af9d7d2b015dac9c41c97baa SHA512 1aef52afcf4e5dca3afe7d746a868f5ea5a1afb28703e2087d620f5206cebdbf71e0d600d3354693e59f49cd92758f47e3aafb4625539af0cdec80b36109051b
 DIST portage-3.0.17-bug-775239-_test_lock_fn-tempfile-leak-d8a12c.patch 733 BLAKE2B 8281107d270908b49218603ef64b7580c5d6e0bf015eabef4c35f8ee9d76b2b7790f4b75404b9d85fd030c3a0f9183e88894d67bf547978f3fa0bed0630112cf SHA512 5ea4ccc7d517ea79a02fad77d20502d613cedf9df00edebf73972979bd5a469f47c14ae5b69b850f0ce9860b9fdf1b5bb283e138bd7be5b832928697e4bba42b
 DIST portage-3.0.17.tar.xz 970076 BLAKE2B 261d8d3b0da5bb77f37328219365a59d7ac56a22e887de59a6b702fcf895493f7a0aac1af744bc67b80c9e2aa730795e507764e9e1c807c247d1ccbe6f825d2f SHA512 6f4a50b005a67e6eea24600d10179fd48b4aa1de4cdf99bc310854dc303248408f8a31bca4135e4e530fcbd2b3d99c2f89644e4e4240e3a754fd97e949403ffc
 EBUILD portage-2.3.99-r2.ebuild 8492 BLAKE2B f7b8dc5945641519b9a13bf149b172889261f89df30f1878632a4b3b2e84db8bfc5e329a77240afdfd4b4c529928724074fe0d63d8ad282aa3804c9c18d5194c SHA512 b8dc26ab536c251b2be914c8a212c1b92d4832835a058b507d47a94b4f8e5f68410d1c0a2c164c44359219fa9859237ba2a83ac209bff0a6e9fe824f7b7f4e7c
 EBUILD portage-3.0.12.ebuild 8440 BLAKE2B fddb332ecbd05f0db76eafd58c79e3e9f4b0b1637a2f604d928113a7e53db7db714f23582ee498a052ab93b07b50972c20621e7f79d249cfcb1473ddd02c9c58 SHA512 f6a2710b49f5c6e29e105ca72629d8f707eba0f44aead8a8a47d4a0f2bfb095802492c48d51f4e5941974f2d6e51e9eecfebcc031c0d5ba6db7619d636d4a2f4
 EBUILD portage-3.0.13.ebuild 8440 BLAKE2B fddb332ecbd05f0db76eafd58c79e3e9f4b0b1637a2f604d928113a7e53db7db714f23582ee498a052ab93b07b50972c20621e7f79d249cfcb1473ddd02c9c58 SHA512 f6a2710b49f5c6e29e105ca72629d8f707eba0f44aead8a8a47d4a0f2bfb095802492c48d51f4e5941974f2d6e51e9eecfebcc031c0d5ba6db7619d636d4a2f4
-EBUILD portage-3.0.16.ebuild 8745 BLAKE2B 20ce435f757cc791953f8b0ab80162a14c85b508fe6ed03923c4c5712cb69173a311733026c81c975c14b16a5f64d90f27cfc6aff9cf296bcf2672ead626b696 SHA512 28917107a1f07420449a390b17bc51438962c4dcb8a4c65e4e9fc9f8ee06d8046b384604878c2a07d7c09d2c9d91871a52d818a31fa3492672fe5328eedddc5a
-EBUILD portage-3.0.17-r2.ebuild 9217 BLAKE2B a21d203010e110b5929b1e7945c8dbed07273b76746ee1ed5981acc77ebaab5f5c94afcff1af137082debed5a2f6123b89b557197411a551151b4127917fda08 SHA512 b2d86b3c56815d3b88d23b8400c130c5b006ccc806920d75f384f1bccd21a91a82e7df9d05a6ce5d506e75eddd92746d244ffe677b6f6de6f2f7c886eb9c42ee
+EBUILD portage-3.0.17-r2.ebuild 9214 BLAKE2B eec8b0337168a02f110c52db2b8499f30b9fcb16a595803600da037ad555f427b496ffaf37085ad82917e9d9be1c2f601f1315a656c19d83c2c2762d2b3931fb SHA512 bdc626415e541c9249b422fc2490104ae4663d76252e14f1b2fa8ba828f84bbfce8b39e266abf1dde5a1564cca7c590b8d3a20e4773e352cb17b65e0bc9ec9da
 EBUILD portage-9999.ebuild 7776 BLAKE2B bef58d44947c861ca20767e5204ce67b51f7b63a7209b13e2761a97dce73b60ea153cee09b44769501796dcf50bc45943f3b3631f6c80f22a6545aee75de303d SHA512 0049bfc2225ee65073f56e498237b2862a688d083fdb6976bfe983b5c02722254f656e6571eb71c159b3e7b9daf400e513dea87bdb4001dbb55d2976a14458b8
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
diff --git a/sys-apps/portage/portage-3.0.16.ebuild b/sys-apps/portage/portage-3.0.16.ebuild
deleted file mode 100644
index 4bcace7f5405..000000000000
--- a/sys-apps/portage/portage-3.0.16.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-TMPFILES_OPTIONAL=1
-
-inherit distutils-r1 linux-info tmpfiles prefix
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-vcs/git )"
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	apidoc? (
-		dev-python/sphinx
-		dev-python/sphinx-epytext
-	)"
-# Require sandbox-2.2 for bug #288863.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
-RDEPEND="
-	acct-user/portage
-	app-arch/zstd
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/findutils-4.4
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-		rsync-verify? (
-			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
-			>=app-crypt/openpgp-keys-gentoo-release-20180706
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	kernel_linux? ( sys-apps/util-linux )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-	) )
-	!<app-admin/logrotate-3.8.0
-	!<app-portage/gentoolkit-0.4.6
-	!<app-portage/repoman-2.3.10
-	!~app-portage/repoman-3.0.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
-
-	check_extra_config
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i lib/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions; then
-		printf "[build_ext]\nportage-ext-modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i lib/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use build || ! use rsync-verify; then
-		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
-			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
-			-w "/_BINARY/" lib/portage/const.py
-
-		einfo "Prefixing shebangs ..."
-		> "${T}/shebangs" || die
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				echo "${REPLY}" >> "${T}/shebangs" || die
-			fi
-		done < <(find . -type f -executable ! -name etc-update -print0)
-
-		if [[ -s ${T}/shebangs ]]; then
-			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
-		fi
-
-		einfo "Adjusting make.globals, repos.conf and etc-update ..."
-		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
-
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use apidoc && targets+=( apidoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use apidoc && targets+=(
-		install_apidoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	dotmpfiles "${FILESDIR}"/portage-ccache.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	python_setup
-	local sitedir=$(python_get_sitedir)
-	[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
-	env -u DISTDIR \
-		-u PORTAGE_OVERRIDE_EPREFIX \
-		-u PORTAGE_REPOSITORIES \
-		-u PORTDIR \
-		-u PORTDIR_OVERLAY \
-		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
-
-	env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
-		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
-
-	env -u FEATURES -u PORTAGE_REPOSITORIES \
-		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
-		elog "The emerge --autounmask option is now disabled by default, except for"
-		elog "portions of behavior which are controlled by the --autounmask-use and"
-		elog "--autounmask-license options. For backward compatibility, previous"
-		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
-		elog "Users can get the old behavior simply by adding --autounmask to the"
-		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
-		elog "change, see https://bugs.gentoo.org/658648."
-	fi
-}
diff --git a/sys-apps/portage/portage-3.0.17-r2.ebuild b/sys-apps/portage/portage-3.0.17-r2.ebuild
index 2057b3611383..f75ba73cc86b 100644
--- a/sys-apps/portage/portage-3.0.17-r2.ebuild
+++ b/sys-apps/portage/portage-3.0.17-r2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-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"
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
 RESTRICT="!test? ( test )"
diff --git a/sys-apps/qcontrol/Manifest b/sys-apps/qcontrol/Manifest
index bbcd67e976f8..16c733263059 100644
--- a/sys-apps/qcontrol/Manifest
+++ b/sys-apps/qcontrol/Manifest
@@ -3,6 +3,5 @@ AUX conf.d 133 BLAKE2B 4d77e38035348a26a1dc576cdc681ef41e10104730158e4c3f58ea40b
 AUX init.d 2211 BLAKE2B 5656083b4689db24bfa77b07704316123a4690e8160d355b42d6bdc359a9ace495ae52b72199e31573307b400ec6e9bea02cfd5e9e136a5faa7b3d94591b3a8c SHA512 66c6c4f30e93f759ca7a9875e23ed82843d9cc728c14c7bc7fffee3fbbafefa57244155649986c547264f500a21d0099efd1195d1810b47370c8f77ed79e4dde
 DIST qcontrol_0.4.2-6.diff.gz 11426 BLAKE2B 5f4374d2a6a2f79ca357827437d7ec42c6122b8f3ba008bb8c39adaf80a2edff24ed4f0abb29780ad70cac09eb1d39124d3d9762d603c896c8857ad7b8e7910e SHA512 ce450d04c72052c8e7ce0bf26d21d9942d3ea02b958b510efdf26d368ee69778eaf61bec2084c4d21cc1a5d281d1331e40b7bcaf388b4b59174a37ed037dd984
 DIST qcontrol_0.4.2.orig.tar.gz 18344 BLAKE2B c90d3d31ffd624bad11e70a2c700e0e058c9fa6cc2cfa6bb803471df67d07d03a88ae134d5543dbbefe30b5870089a29151614a545dc171de5eb4732d6592461 SHA512 f132faff54833f11ae79622dc8e33b4e0f2516f7377633ff47a4ebe71335503c5e4892723c049b00888622ce059026cd97c6856b425b94163ec09887bd21e81e
-EBUILD qcontrol-0.4.2-r1.ebuild 1464 BLAKE2B dd6758a5e88a759187f99cb790c2cff2db024fe9b61e9cc920080b3030397e056d61a4469e5029d03fc4b4995bea75952853cfbf7672fddff8e1490a790bb864 SHA512 fa18cf1eb376a5362b0bb75f15b8c56cbc445f8a37e15a7ebefd11967e37a12573a7bf859e03c723469c169207d432b13512f0e0279f69710cb7ff26c22843f1
 EBUILD qcontrol-0.4.2-r100.ebuild 1594 BLAKE2B bcdf7251d73111c61df1dbf1804fd4574042636756d9841db881e982f8c730f1673fa274dd42585bf48d1b33a6fef27de513e43ed605e8c8c3d58852387bff42 SHA512 42ffbf7e529c0fa5c67f79343849bd8e2d18e9668a9c85bb04f9ebade4c5f312fd7e9d09a69c5b50f3d5465b0d6e711965804ecc18c492b7267ef4132716619a
 MISC metadata.xml 367 BLAKE2B 8a20a869201a1a69097488f15283baa6eaff5e80667974605e34470d0fbeef210efce302a5feb1b30075273c468b96cf197125d7f7dcdef93faff7b35fb34664 SHA512 ee0131a33df4a79331dfe2a7485d71b05f8f386d3b6ce0b26ab76a7c9f8d9b20efb931fda54d499feb9dd6c3feba34299cf8943fbac2ffea2076e634d49087de
diff --git a/sys-apps/qcontrol/qcontrol-0.4.2-r1.ebuild b/sys-apps/qcontrol/qcontrol-0.4.2-r1.ebuild
deleted file mode 100644
index 3449c7a5c7ad..000000000000
--- a/sys-apps/qcontrol/qcontrol-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Send commands to some microcontrollers, e.g., to change LEDs or sound a buzzer"
-HOMEPAGE="http://qnap.nas-central.org/index.php/PIC_Control_Software"
-SRC_URI="mirror://debian/pool/main/q/qcontrol/${P/-/_}.orig.tar.gz
-	mirror://debian/pool/main/q/qcontrol/${P/-/_}-6.diff.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="arm"
-IUSE=""
-
-DEPEND=">=dev-lang/lua-5.1:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	eapply "${WORKDIR}"/*.diff
-	eapply debian/patches/*.patch
-	eapply "${FILESDIR}"/${PV}-Makefile.patch
-
-	sed -i -e "s/LDFLAGS=/LDFLAGS ?=/" Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LDFLAGS="-llua -lpthread ${LDFLAGS}" qcontrol
-}
-
-src_install() {
-	dosbin qcontrol
-	doman debian/qcontrol.1
-
-	insinto /etc/qcontrol
-	doins debian/configs/*.lua
-
-	newconfd "${FILESDIR}"/conf.d qcontrol
-	newinitd "${FILESDIR}"/init.d qcontrol
-}
-
-pkg_preinst() {
-	device=$(grep "Hardware[[:space:]]*:" /proc/cpuinfo 2>/dev/null | \
-		head -n1 | sed "s/^[^:]*: //")
-	case ${device} in
-		"QNAP TS-109/TS-209")
-		dosym qcontrol/ts209.lua /etc/qcontrol.conf ;;
-		"QNAP TS-119/TS-219")
-		dosym qcontrol/ts219.lua /etc/qcontrol.conf ;;
-		"QNAP TS-409")
-		dosym qcontrol/ts409.lua /etc/qcontrol.conf ;;
-		"QNAP TS-41x")
-		dosym qcontrol/ts41x.lua /etc/qcontrol.conf ;;
-		*)
-		ewarn "Your device is unsupported" ;;
-	esac
-}
diff --git a/sys-apps/roccat-tools/Manifest b/sys-apps/roccat-tools/Manifest
index f925a7ef753e..081f12040a5d 100644
--- a/sys-apps/roccat-tools/Manifest
+++ b/sys-apps/roccat-tools/Manifest
@@ -1,8 +1,5 @@
 AUX README.gentoo 858 BLAKE2B d3cdc925b286481491fdad08de6c2a61c811fecb1eb36fa1e0b2cedf98577f9f3c2deff4bb881c906bab3a799616b43601d2dae494674ae439f6bf561bd82417 SHA512 3f88197dc83d4bf7e3cb8fd71079754ffa355ddf5fcf151304ae439090da44b3bdef3ed9deab44b36ffffb4b28ded2a71b1abffe5d3e1aa87f56bfa264920a7b
 AUX roccat-tools-5.9.0-cmake_lua_impl.patch 236 BLAKE2B 833cb7662bdd1fc5942cfd3fd75fe3a7ce56616c8fb616403a056bbea6d0e5ecb8bd91b7ef39ecd12c30235172631eff839bc803910d1a8808c1d152db080bda SHA512 5bb4d236a053cbfed99f046d8cac4dcc1fb94535497e49f4be5338fc8c287623f4afeffa5164597d84aa16bca98b135d275f75e85df3e03bed95099caeb00d6c
-DIST roccat-tools-5.7.0.tar.bz2 3737735 BLAKE2B fdd86cef425f1f33309165673be52c8297380a1f0a722e827c2b3697c59dd787f4b473186ab5b8ff8fadcfc851f3bb5e76c8407d831b31f82cd360679d3c1a09 SHA512 209f9fa5302806a2d2681077e990a39a4913d47b82e73f9acd86f734affd8b3a7c0087e815e5cc1dfec1787d868d09b87211d9c2a90f2ced67c150eec1b2d290
 DIST roccat-tools-5.9.0.tar.bz2 3736671 BLAKE2B 4cdd0c6b50021cfae127a692d5a2a7fff5e7e1281da7add0cf9cd8f5fbfd8882186142d56982bf929867bde2950440f26ced167b52707c9d810ab53a62a4bded SHA512 d825fc372654257f330abbc7e611e87c4888924288ad56c8e57c9db5c8c25426d454ae1ab4dd591ef3b930bed410497c0aa88095d5319e2708f4b263d16eca00
-EBUILD roccat-tools-5.7.0.ebuild 2442 BLAKE2B ab3f4152fd8ff6f0575a5aa9a109e79044a2abc93315d6e93f07daa789a5bc15739218eafcaadc46258274951e688aa0252ca94c182868323f1822ebad5e9dba SHA512 b8cb3fdf8e5a28012155c324a9110a0ed8558be43795335da1ef57001119c104d26c12ff68e562502d481e46eccbba8b4000eeca35dc43ea7de634077c6fa28c
 EBUILD roccat-tools-5.9.0-r100.ebuild 3365 BLAKE2B bba0eafc756a93e220e3d75006c0e3b34f23c5b736a93f95b809a710fa53170d0206abd22282473d74668dee066176beff592e55f1d9eb6c08e90100bb22e11e SHA512 81a7861b19199516542923dec906d7d1dcb1244fa26f1368c00b2ce6a527122e1a506321bb44fda4a7d85d98d08d96f5a4d76917ab03df5846cec12c88f813ea
-EBUILD roccat-tools-5.9.0.ebuild 2900 BLAKE2B f39932a29c8565de43dc20c6317c1b279d27425d0d0bea521e68b90eb94b4f42a1a2779c07939f95f9d2dede21fe0d2952a78dba2dfec393064679c13da1ccec SHA512 25a2cdc3ffe014c3db690a1de4ca33796fa67108747b84d55bd0488725e1097ab811c772912cec4751b7319d7a9363dde862d238189e023a2a18b44c899a22dc
 MISC metadata.xml 327 BLAKE2B b3a42ce918857aaa3ebe1705560661d80d9dc1cce60b5d79bddc1ead356cced572fe18d8b8d18f6c8f2ebb80393cc02efc4df3ad711aca08a67a15a1abd93e60 SHA512 99ed72c1a2a183157d0aded6f95c41c81c9c3d97f81c7267743ad3431676e2af1d7e08e4904761583af17806f5befd7254ca9f2ad170266d038053c7076a630e
diff --git a/sys-apps/roccat-tools/roccat-tools-5.7.0.ebuild b/sys-apps/roccat-tools/roccat-tools-5.7.0.ebuild
deleted file mode 100644
index f8ddfcc8bd64..000000000000
--- a/sys-apps/roccat-tools/roccat-tools-5.7.0.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit readme.gentoo-r1 cmake-utils gnome2-utils udev user
-
-DESCRIPTION="Utility for advanced configuration of Roccat devices"
-
-HOMEPAGE="http://roccat.sourceforge.net/"
-SRC_URI="mirror://sourceforge/roccat/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE_INPUT_DEVICES=(
-	input_devices_roccat_arvo
-	input_devices_roccat_isku
-	input_devices_roccat_iskufx
-	input_devices_roccat_kiro
-	input_devices_roccat_kone
-	input_devices_roccat_koneplus
-	input_devices_roccat_konepure
-	input_devices_roccat_konepuremilitary
-	input_devices_roccat_konepureoptical
-	input_devices_roccat_konextd
-	input_devices_roccat_konextdoptical
-	input_devices_roccat_kovaplus
-	input_devices_roccat_kova2016
-	input_devices_roccat_lua
-	input_devices_roccat_nyth
-	input_devices_roccat_pyra
-	input_devices_roccat_ryosmk
-	input_devices_roccat_ryosmkfx
-	input_devices_roccat_ryostkl
-	input_devices_roccat_savu
-	input_devices_roccat_skeltr
-	input_devices_roccat_sova
-	input_devices_roccat_suora
-	input_devices_roccat_tyon
-)
-
-IUSE="${IUSE_INPUT_DEVICES[@]}"
-
-RDEPEND="
-	dev-libs/dbus-glib
-	dev-libs/glib:2
-	>=dev-libs/libgaminggear-0.15.1
-	dev-libs/libgudev:=
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	virtual/libusb:1
-	input_devices_roccat_ryosmk? ( || ( dev-lang/lua:5.1 dev-lang/lua:0 ) )
-	input_devices_roccat_ryosmkfx? ( || ( dev-lang/lua:5.1 dev-lang/lua:0 ) )
-	input_devices_roccat_ryostkl? ( || ( dev-lang/lua:5.1 dev-lang/lua:0 ) )
-"
-
-DEPEND="
-	${RDEPEND}
-"
-
-DOCS=( Changelog KNOWN_LIMITATIONS README )
-
-pkg_setup() {
-	enewgroup roccat
-
-	local model
-	for model in ${IUSE_INPUT_DEVICES[@]} ; do
-		use ${model} && USED_MODELS+="${model/input_devices_roccat_/;}"
-	done
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DDEVICES="${USED_MODELS/;/}"
-		-DUDEVDIR="$(get_udevdir)/rules.d"
-		-DWITH_LUA=5.1
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	local stat_dir=/var/lib/roccat
-	keepdir ${stat_dir}
-	fowners root:roccat ${stat_dir}
-	fperms 2770 ${stat_dir}
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-	ewarn
-	ewarn "This version breaks stored data for some devices. Before reporting bugs please delete"
-	ewarn "affected folder(s) in /var/lib/roccat"
-	ewarn
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/sys-apps/roccat-tools/roccat-tools-5.9.0.ebuild b/sys-apps/roccat-tools/roccat-tools-5.9.0.ebuild
deleted file mode 100644
index 3cc91e932e03..000000000000
--- a/sys-apps/roccat-tools/roccat-tools-5.9.0.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1 cmake flag-o-matic toolchain-funcs udev user xdg
-
-DESCRIPTION="Utility for advanced configuration of Roccat devices"
-
-HOMEPAGE="http://roccat.sourceforge.net/"
-SRC_URI="mirror://sourceforge/roccat/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE_INPUT_DEVICES=(
-	input_devices_roccat_arvo
-	input_devices_roccat_isku
-	input_devices_roccat_iskufx
-	input_devices_roccat_kiro
-	input_devices_roccat_kone
-	input_devices_roccat_koneplus
-	input_devices_roccat_konepure
-	input_devices_roccat_konepuremilitary
-	input_devices_roccat_konepureoptical
-	input_devices_roccat_konextd
-	input_devices_roccat_konextdoptical
-	input_devices_roccat_kovaplus
-	input_devices_roccat_kova2016
-	input_devices_roccat_lua
-	input_devices_roccat_nyth
-	input_devices_roccat_pyra
-	input_devices_roccat_ryosmk
-	input_devices_roccat_ryosmkfx
-	input_devices_roccat_ryostkl
-	input_devices_roccat_savu
-	input_devices_roccat_skeltr
-	input_devices_roccat_sova
-	input_devices_roccat_suora
-	input_devices_roccat_tyon
-)
-
-IUSE="${IUSE_INPUT_DEVICES[@]}"
-
-LUA_DEPEND="|| ( dev-lang/lua:5.1 dev-lang/lua:0 )"
-
-RDEPEND="
-	dev-libs/dbus-glib
-	dev-libs/glib:2
-	>=dev-libs/libgaminggear-0.15.1
-	dev-libs/libgudev:=
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	virtual/libusb:1
-	input_devices_roccat_ryosmk? ( ${LUA_DEPEND} )
-	input_devices_roccat_ryosmkfx? ( ${LUA_DEPEND} )
-	input_devices_roccat_ryostkl? ( ${LUA_DEPEND} )
-"
-
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-DOCS=( Changelog KNOWN_LIMITATIONS README )
-
-pkg_setup() {
-	enewgroup roccat
-
-	local model
-	for model in ${IUSE_INPUT_DEVICES[@]} ; do
-		use ${model} && USED_MODELS+="${model/input_devices_roccat_/;}"
-	done
-}
-
-# Required because xdg.eclass overrides src_prepare() from cmake.eclass
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	if has_version \>=x11-libs/pango-1.44.0 ; then
-		# Fix build with pango-1.44 which depends on harfbuzz
-		local PKGCONF="$(tc-getPKG_CONFIG)"
-		append-cflags "$(${PKGCONF} --cflags harfbuzz)"
-	fi
-
-	mycmakeargs=(
-		-DDEVICES="${USED_MODELS/;/}"
-		-DUDEVDIR="${EPREFIX}$(get_udevdir)/rules.d"
-	)
-
-	local lua_use=(
-		input_devices_roccat_ryosmk
-		input_devices_roccat_ryosmkfx
-		input_devices_roccat_ryostkl
-	)
-	local luse
-	for luse in ${lua_use[@]} ; do
-		if use ${luse} ; then
-			mycmakeargs+=( -DWITH_LUA="5.1" )
-			break
-		fi
-	done
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	local stat_dir=/var/lib/roccat
-	keepdir ${stat_dir}
-	fowners root:roccat ${stat_dir}
-	fperms 2770 ${stat_dir}
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	readme.gentoo_print_elog
-	ewarn
-	ewarn "This version breaks stored data for some devices. Before reporting bugs please delete"
-	ewarn "affected folder(s) in /var/lib/roccat"
-	ewarn
-}