gentoo resync : 20.10.2021

48 files changed, 1201 insertions, 400 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 479b21138555..e9bcac82b2b5 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/ack/Manifest b/sys-apps/ack/Manifest
index f630bfb90fd8..846316f9c4ad 100644
--- a/sys-apps/ack/Manifest
+++ b/sys-apps/ack/Manifest
@@ -2,5 +2,5 @@ AUX ack-3.3.0-gentoo.patch 315 BLAKE2B 8fb44f3540a3567519f626c954f52c37945a48644
 DIST ack-v3.4.0.tar.gz 251106 BLAKE2B 192d1e851ef5bd3547e21fe49cf276180eb278af783209046c02e4a1ae1471c7b24aaf6825223aad96dedea9fd266576a2021dcb808b0e229312e8237e2f7afd SHA512 cc8de5a784f63a8f48b9548e930972578866d0fcc520febc6002d1ce4f9b55aabb0c8e87860586a668d94b5091c66194c05a07c584fe30fad2c5d786aee95db5
 DIST ack-v3.5.0.tar.gz 249718 BLAKE2B dedd11b424f7274c45dabfd0ddf2c92ee9d15ccf40d251c79159aef6e93071c963291722a2024db1d4828ae02c1310d3fec366ca8bd5f249da2c0c73f7e303cb SHA512 f5b9321fc62cf2ab86fa7dc933dd44245314ebd26bee2d8769f85c15fc8b4493d0757ca4430708f0ebea5692f9c73ad17cc00bc46d1f611b8489b30811df307d
 EBUILD ack-3.4.0.ebuild 817 BLAKE2B 8c6ea1cbe26c32e24e89bc28da057ea62b8cfb39af9b2d47abd91b6468c42c2389e0cc81b4ba3e905128b3dd3fd5046f07639f5870385e01dff2ad23801d083d SHA512 c2b0cf0c6147bea5bf242e0041ce7156aa87ec6c4b3c82ae07694d6167b99570123da0aa581bd40369c4ff267fe0117556635f7462c5252b3e099e0e992eeb5a
-EBUILD ack-3.5.0.ebuild 817 BLAKE2B 8c6ea1cbe26c32e24e89bc28da057ea62b8cfb39af9b2d47abd91b6468c42c2389e0cc81b4ba3e905128b3dd3fd5046f07639f5870385e01dff2ad23801d083d SHA512 c2b0cf0c6147bea5bf242e0041ce7156aa87ec6c4b3c82ae07694d6167b99570123da0aa581bd40369c4ff267fe0117556635f7462c5252b3e099e0e992eeb5a
+EBUILD ack-3.5.0.ebuild 824 BLAKE2B 37d847da5aa42702402ee167cfe3eb23abacc46531a4797c262cd7dddaaa60c783e302f37876e81384404d63905f445cec5278937ed1463421b00bf9d7f0aebc SHA512 916ab826c95d963cade68077ca0b990c5875e2aea738306b835133225af3c9b31ddd0250c4e21197e512285d82e48857b1e5213333fa20ef682de5102399d61b
 MISC metadata.xml 1750 BLAKE2B 4c431f95146db206d87d2be9bfa147d0fcf00adbcb0f03fea0458d96339466b37ad6f99adc3158d15c47786a4b3eb0deaee1ead644ab803366d7094a215c9802 SHA512 5ec8e33d0f21431cdcccc5382adf485a5e462e387253681115ba520900afd1459878e5b695becc1e16a1adec43a919ce177adc17161cb5e7a02049143696edc7
diff --git a/sys-apps/ack/ack-3.5.0.ebuild b/sys-apps/ack/ack-3.5.0.ebuild
index 054e17840055..af03295ad884 100644
--- a/sys-apps/ack/ack-3.5.0.ebuild
+++ b/sys-apps/ack/ack-3.5.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://beyondgrep.com"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/bat/Manifest b/sys-apps/bat/Manifest
index 3fcfd64c1089..0563ca3e1b78 100644
--- a/sys-apps/bat/Manifest
+++ b/sys-apps/bat/Manifest
@@ -251,5 +251,5 @@ DIST yaml-rust-0.4.4.crate 48359 BLAKE2B 3c504a593663eff6ccdc96b949f2bf5ff9e9030
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 EBUILD bat-0.17.1-r1.ebuild 3825 BLAKE2B 0e3129e4e0a406384f96b0669836708e20c655b782bc8cdf31772c3adb487018c89f794a319092901b3497e85625260db3680a5b7dd813b7461fd58c3d20ed63 SHA512 3d4d476f9c020c583c681752c0d039fc7abbc31c9ecfe5ef4fef04786e3b77a27ae619f2231c4fb54de4c60bc79d2b74668bca5fd45d5111f916f5e18df6d4dc
 EBUILD bat-0.18.1.ebuild 4216 BLAKE2B 7242e6acaba30ecd35dcc0ed855c362016804e14e6dbd1eed62c3a038a9034b1a37c231cef490a99a114a7f4bb0da5631ce2b1bcea3e9814b5a730fe73891fa1 SHA512 5a4442df4a899821261324a486b38882ede10b8d88b5c3846d0600f545de53df0f9ae8fd66f94012eee47cbb480b29a01f50df53a78d4d0e4a1c1ae9c7343f2c
-EBUILD bat-0.18.3.ebuild 4266 BLAKE2B 7be42345b0f96e6c49b29cbe62317072034e26b009939af8a9610f966a4a8e12a26022ef71953ea7563a4f0e585ac703372405fea38f3415c69dc8dc783cf9f8 SHA512 1028bf6131741f96679952edd7ba451569d3351746603231a52f77361c293af3a7fbdd284a7754c4c859e6358f06823f5585a27746e2cd5e27908ea2da498247
+EBUILD bat-0.18.3.ebuild 4271 BLAKE2B 2237107a561039b64b42afa1d974d5bc5779eec37567ee18209de900b31d84baad7d5d8c1eb3089b0cde333ef2f7bd9f625eea22e202f8af24db3b569957791c SHA512 ce1e4d33170c3d365c343bcf16e7d4cbaa6f711c3fc68834b305cc9a8cddfcee7cbce0fa2f450fec4794bd35e654e2d6639f13e62d90eea0b2373c5bab7f4174
 MISC metadata.xml 849 BLAKE2B 5c57de94ef22a5be55abec3a0fe429b40d24605bbc49322cd607baf4a3efcb34edd4ac4370ae60c377055800134722166d70d1f39a4a959f3c5f6844b2444e93 SHA512 18a02a2d6a13c23415d57c7303170413b4466c4f35138b3d9ceeba0acae94bea9b7d7443feda1d9611d8812665d915007e13fca5df3051073905050734a8b626
diff --git a/sys-apps/bat/bat-0.18.3.ebuild b/sys-apps/bat/bat-0.18.3.ebuild
index e39b326ba9a5..98c5f4a06cde 100644
--- a/sys-apps/bat/bat-0.18.3.ebuild
+++ b/sys-apps/bat/bat-0.18.3.ebuild
@@ -164,7 +164,7 @@ SRC_URI+=" $(cargo_crate_uris ${CRATES})"
 
 LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 CC0-1.0 ISC LGPL-3+ MIT Apache-2.0 Unlicense ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index d4c82de24c4d..2b609960462e 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -17,7 +17,7 @@ DIST busybox-1.32.1.tar.bz2 2444679 BLAKE2B b0258345d40628d8c12b4cc5c3efdb318cfb
 DIST busybox-1.33.1.tar.bz2 2453694 BLAKE2B 2dce3427ab7703c56cbb3bdc0c93c1fe1c6dc24c5b467b6213b8f9cf55223ec63136b3837970e41293cc3d55d320599945d29a69a4ef8b4b3ab9fb5e2a527632 SHA512 d24931432f65e4e79cf54a6c2b91c9cafba817b637d337f456ce8f505434fc06c4345c65cde4fe2a019650a8a089a6f5336bfafb5ef64a4f14659a9d0b3ddb1a
 DIST busybox-1.34.1.tar.bz2 2476932 BLAKE2B 1f45f58db26ae0bae2eb728db3a7d49680d611f489c4633d1fdf2827d3c33285721e232f722ac1f80f2ad7616352df9fd6b8880bcb5fa0dc6787b70c897dd033 SHA512 fb7e53a56c07b1098a12ee7232ad5401b147816648a0619b3b5358fdcf0915cfbb054500c0e0dd4acb3bc0a93a584b62bc5448e1f16b28004f58b39518a13b9d
 EBUILD busybox-1.32.1-r1.ebuild 9640 BLAKE2B 1bf881647d58a197e690e068b81aa2522fdbecf69784862b1842d54ea1caedff7fa4d6bec8b69388bd8fbddfdd76d48d36b07b7147ebf7f5368df3219efb135e SHA512 c163d435a5bac776c519a539f1760134973314434e75c84dd9f427ea0a7c5fd9c41216db61444c97931b86a6cb6ae17fdc1f0d1c5f36118fc5006c89a3599b7d
-EBUILD busybox-1.33.1-r2.ebuild 10000 BLAKE2B 9073abc218b9a5917df838e37931502ffe9a6065c10fcca5bad2c192b399376dc1c04a50c8499fd4fcbe3f30ce6d05d743a6f6b6db13ca51840b95dc01cea34f SHA512 77c432a8ddd39ce7901e981e41d95c1cd21c9598a40e02ad7ecb292406875064d97ff58b4698dec7fbb06ed1d5da83547b09336b41aeb584625e2052782b09f4
+EBUILD busybox-1.33.1-r2.ebuild 9998 BLAKE2B 59394c0faf07f5e0a50c6ef4cb71b267623f87c3bf9d59f5ef1c101cd09f712bf8fd30f49068d1b31a5f2972217f7a3d0f17d608cfe8b14f1af208f0eb3cc013 SHA512 2b044d19940ca6b0dd40f8453a7bad6795102bb9137e53bd798110d4d0122093226bf4b17ae4cffbb8b7967fbcf0cd3ffe3828bfd4e53a457e01153fefe90663
 EBUILD busybox-1.33.1.ebuild 9648 BLAKE2B 59715aafaca840cdac5b941fb5ad66619510b5cffc2fd252c2b1c8068638449c6ea7bff34f7262e64728b39c663185483db6ee74cedea07c669f6a4528ec4741 SHA512 c1b22a7535b4441ed47e53cac5a27dda04a6b58bdc8eaa96de558ae88cb4e2d10d720473284e569d3a93a53f14214566401bf7766c4fa5fe2a4d46a3a3803406
 EBUILD busybox-1.34.1.ebuild 9937 BLAKE2B fb48a1a27b71ca855ec7a0aa450216210316613cfa9bce696fbc0779f6cb0ba633ae102b10324e35a168cfb0b00ce05cf7bc1a61eca45089e61d504988557ac8 SHA512 ea9f0493291b6b1439add09f0d39ebf11c637a264e51432d026148ac667c00df9a9a3d7fe144595d2eeb2d82bd8013c6fcb10cb24f11aca929d053fa485476e5
 EBUILD busybox-9999.ebuild 9937 BLAKE2B fb48a1a27b71ca855ec7a0aa450216210316613cfa9bce696fbc0779f6cb0ba633ae102b10324e35a168cfb0b00ce05cf7bc1a61eca45089e61d504988557ac8 SHA512 ea9f0493291b6b1439add09f0d39ebf11c637a264e51432d026148ac667c00df9a9a3d7fe144595d2eeb2d82bd8013c6fcb10cb24f11aca929d053fa485476e5
diff --git a/sys-apps/busybox/busybox-1.33.1-r2.ebuild b/sys-apps/busybox/busybox-1.33.1-r2.ebuild
index 3c04d7136121..e66cc1864b40 100644
--- a/sys-apps/busybox/busybox-1.33.1-r2.ebuild
+++ b/sys-apps/busybox/busybox-1.33.1-r2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=${PN}-${PV/_/-}
 	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	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-2" # GPL-2 only
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index e20a8745b6a5..66f945ac7181 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,4 +1,4 @@
 AUX cpuid-20200203-makefile.patch 1341 BLAKE2B 54d2d82710d88d4f095f712b19488bdc44376aeeeb9395e7d9061ea4f8b33e4a38818937e29dbcf4f48455aca568c3d362b2898fadbfd0ba9b11edfee78878c6 SHA512 ced9f8b91c67b0a9a7aeb7f581cd101a1161810a1de0d876b417e55a56f13c775005f3879c576fed318b2f4809a40db3347dc456d73d9e529d10ff8ab51e1e79
 DIST cpuid-20201006.src.tar.gz 118994 BLAKE2B 05c547858358a92b0c9270066dc33e08693922e4ba765edcba7aca201811c54074a0cd683edb3e9dedf2bb0fd23682b3cc5725e4067b27ec27e0fe979eb22f56 SHA512 f037c1707b49e92f1bd605ec87a0995ae36215d075bcbadfed1d11f5fefda43391b48f10d2517334574aa7e243f0b73d22f1fcbfe1fb133aaf5bad1046e8ba5e
 EBUILD cpuid-20201006-r1.ebuild 597 BLAKE2B 3f7d8c98a6796dcfe78c80365f0d2238f1018cbc85a683ad9a28b3b70f936a99185427b4645073bb2d313821053e7c7d0d2c1c94a00b5330c8d66665690ea648 SHA512 5e3ac12a35b36d088e134b92f652723d8f466287a927cead8162ce321d974f53bb51bf964e9a6f66b42557413eaded47f47d18a6730bd6bb1874155cbd8564f0
-MISC metadata.xml 638 BLAKE2B 4083a5345a86f777dc0edb0357a1c5cec512de8c0de321aa2b0b1c69b6a662b424062bb44b9311fa8fd0f8b34885e22e5485d34a9300315d4becc68c9058ef08 SHA512 102f4d67cb9ca229b96bfecebee519845f65f3d0e2b01acfab4759b50539c0b5a395df85a5dc34e5a44b4d765b98934b7558bf99696f216051d665a585bba997
+MISC metadata.xml 532 BLAKE2B 49d1eb34a9859763d42159adcf9a2dca3128af78aef52cedc4483950084238ba780bd841788f4b27eb72fc44e61c2c5bd264b6c6e2c57824ccf146b6ecad50e9 SHA512 f51db55a3cc5478afba39a42731122db8ac720af8685e093b6952efd2778c9f0668ac936d2a1cdacaf2586d62d0f13240d664a7bd4fbd18236c816e9e6745600
diff --git a/sys-apps/cpuid/metadata.xml b/sys-apps/cpuid/metadata.xml
index d62e2fcf80ac..e13a97c088b5 100644
--- a/sys-apps/cpuid/metadata.xml
+++ b/sys-apps/cpuid/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
diff --git a/sys-apps/daemonize/Manifest b/sys-apps/daemonize/Manifest
index 29ac6bdd7bf1..91f332ac2680 100644
--- a/sys-apps/daemonize/Manifest
+++ b/sys-apps/daemonize/Manifest
@@ -1,3 +1,3 @@
 DIST daemonize-1.7.8.tar.gz 66009 BLAKE2B 323b98357c1750ae051378d8d432a4997fb3d162f65f102a3f7d5e1c0271eec77aad7f5253c4712209c9c2cba1c725b3daeaf1c240dca31be13990d3a833fbc0 SHA512 77cb7f6d41fd3484222831540aa8dedcd1f3cbb2f4be2a9b5e0bc1c848fb1392b616ff30b9ff3bb46f3decd1ff2829dbf7130887f81ed66a7cd2c710755a0836
 EBUILD daemonize-1.7.8.ebuild 527 BLAKE2B 9db600c45da6ce7a3ae3d313c6eb9b4c587b30b2acb7f0ff0a283f7f422b1b8ea281a39cc2fd9f709cd786c7ea82e8a62bd2bc61b67bf595a0e9e8df5a7d08e5 SHA512 891abb31a94ff492db6bf4d111ce3012c0d879e6d362f2a7d82c71042c15d8526e724b143aa25c452619dcc9b8d36ae7a03d2d74e90be921b8df608ce8ffaa45
-MISC metadata.xml 324 BLAKE2B dff6081ee6e786a9f5029afec089d5fd7cf46c0801c2192e37d7cf075cc301e363aa3a483d8c26863595a896398f480be6a911b1519340020bbfba9dd7169f00 SHA512 6238ef43fe3ac36012c69219fa0d9141c3781881bcc4d3adc952660b741667b3f45b099377e0900547c57012a3315d6b3a715bb6aa2db830d6e82b49deb42400
+MISC metadata.xml 246 BLAKE2B 2ed97744eec9b524dcddde6477471f603e6a1f29eb23aea98b08aa247eb09d269b3aff31363c82797c21486b281790adcd1b557bba0809539b1a83e97bdfae58 SHA512 10a8487babc616439de96562c6068b462b2e3c28d3522e7a5a992a7db1f432c6a2f9e89fbdc18ed98db4e2812f3691ef7d21f47c9b3bb6b6b95e305d9a4b6815
diff --git a/sys-apps/daemonize/metadata.xml b/sys-apps/daemonize/metadata.xml
index 071db5359e2b..512ee969340e 100644
--- a/sys-apps/daemonize/metadata.xml
+++ b/sys-apps/daemonize/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">bmc/daemonize</remote-id>
 	</upstream>
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index 773e5779c166..ba1bcc4117f8 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -1,6 +1,8 @@
 AUX debianutils-3.4.2-no-bs-namespace.patch 1168 BLAKE2B 1951a40e7f3c2a872a7dbe3ecc7a1a8587af5d56ce3ffde76608ffc7d5cde099fede8b4da76247ccabd7060b0306d2311db716b12e0bd4fb6062ea782fd2dd3d SHA512 05ffb53243a178e91d67066a30039e9ccc21caabe7769e8920548c615b6d9d23959125f2fc9073cc70ba3f3502df7d780db59e4768e7add2682af98079bd6bd4
 DIST debianutils_4.11.2.tar.xz 158132 BLAKE2B c2a95c90b4267e3b1d61c21db562f960b4666982c488e69a757fb0a7a42e8e739d44f553edd8cf532df30c492e999920ab63ec3580479de7de5d901d75de76fc SHA512 0bd9098beee78b3c8dae839f0c29e9f142cbb22f2ced473cf7ae47a14d9493ba882c1829eba213780392a87a3223b3689729754c8ded80a091efaef3f6f903fd
 DIST debianutils_5.4.orig.tar.xz 103640 BLAKE2B ac59ffcf7ef9523a67127e5565cb87eb694a0297eb81acba53a5ca00a2f16d024e21ba1ef6eff5079194c2cc751712fe9ad5814603deeeaa05d28343ff79a409 SHA512 a5501bdc46e203bd0cf357e5c83bb556ea7294ee603498399427dd49536848e006b21967f6239c3d808c8b9653d65f28536cf388dd18b749e54a235cc9326850
+DIST debianutils_5.5.orig.tar.xz 104448 BLAKE2B 707c9072ddf1fa0c61fc66f84aea26bac7bf6f31948880ad4711e89f8f4a665ae4104e998f27e53e288b3453a71876ef44038f8e954f19055ed1049eb9b9981c SHA512 230310428ee7c145c74bb666ae729754352295230f38ef4e22f7566970c5186d607cd827a5603a678815bd48d4a1eb2716f55c32494ec75eb665651da6a56e6a
 EBUILD debianutils-4.11.2.ebuild 935 BLAKE2B b02267258f6285fe997d10d55b0d66b7b57b9cf06fed5b569272cc9b43c4276867e637de35b94eb8887136182b360f5a9e87cd2e2fee40f670e7d9e102624a39 SHA512 062c35544f1c3dd8e876fba48a9afd234857e3494401cac2774f966a45d8ff61325f25d1a65ba4ee6d19cf455312c796ac8f3da1009d4d3877bcf7a41437dfdc
 EBUILD debianutils-5.4.ebuild 904 BLAKE2B 9b413759ceb25b6a3bf136e40016ab6dd42170b39649fe651ea514a7f4d1178d4bad352f6c63d467df168a040e878d9762b06e60d32415602f84966f12557a0b SHA512 3e2f9c50297b1741497ae0dfb98d22d4cbbff9171ccc5966088887193e4b7ef6a83a64e4a4797066e8e552616e7192b8abe35d0fa52746b5f63e06048443bda9
+EBUILD debianutils-5.5.ebuild 1045 BLAKE2B 30d9f5dd334c2b16692c8d11fd1443b6fbca6d83935b63c5d21066b94334e6c225b29a79b946300d553f97c8b08499884249ed0a4a10c70fe970a7f88c0a5da4 SHA512 bae4a140ccfde8a1a81f5e5ee531c0746a647f37f6121a34b7d04f25f4b9aa58797ee869bb8f0aa978dd6705de7d2b9ffb8ea540fe04411e738345be7ac5b018
 MISC metadata.xml 446 BLAKE2B a681b76916f27a5d016fa34c6c6ce4abe887c1f46232cb6cd759ba699eca0cba865ff7b0d33900b1f9e858e016532815b18bf86cc211b97f57a1c0a56580d125 SHA512 c080d8ae5511a0870aa778f744518a2482e7d61ff9e653a808b3959571b8bb47dc90b1b1f2feaccc323df0521f4ae91efb43fa31bd6c8a72075c8b2e9dfeb829
diff --git a/sys-apps/debianutils/debianutils-5.5.ebuild b/sys-apps/debianutils/debianutils-5.5.ebuild
new file mode 100644
index 000000000000..d0de1167825f
--- /dev/null
+++ b/sys-apps/debianutils/debianutils-5.5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="A selection of tools from Debian"
+HOMEPAGE="https://packages.qa.debian.org/d/debianutils.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.orig.tar.xz"
+
+LICENSE="BSD GPL-2 SMAIL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="+installkernel static"
+
+PDEPEND="
+	installkernel? (
+		|| (
+			sys-kernel/installkernel-gentoo
+			sys-kernel/installkernel-systemd-boot
+		)
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
+
+src_prepare() {
+	# Avoid adding po4a dependency, upstream refreshes manpages.
+	sed -i -e '/SUBDIRS/s|po4a||' Makefile.am || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	default
+}
+
+src_install() {
+	into /
+	dobin run-parts
+
+	into /usr
+	dobin ischroot
+	dosbin savelog
+
+	doman ischroot.1 run-parts.8 savelog.8
+
+	dodoc CHANGELOG
+}
diff --git a/sys-apps/edid-decode/Manifest b/sys-apps/edid-decode/Manifest
index 8555fc9c21f0..892499f1839a 100644
--- a/sys-apps/edid-decode/Manifest
+++ b/sys-apps/edid-decode/Manifest
@@ -1,4 +1,6 @@
 DIST edid-decode-0_pre20201230.tar.gz 110090 BLAKE2B ffd43a26060bcfdd35cc174a7a1a4d6e21e8206f5ca16fd4bd0237f3e6887597fa95fe2f70e9168ae73db68350348cff0a65d81d311e417b841defe882fd3ef4 SHA512 f459c7e37fd2890fbaab4180b85ccb48c6d8443841e627cadabddd09ca486cb8b2c8645510b91c9ffdbc4ac5ae3d482834a32eea7c7f306120823e610280d421
+DIST edid-decode-0_pre20211012.tar.gz 130090 BLAKE2B 22fcfeee726cf33c22ebeac38648145735d493fa211ef5e8536198549ea80e31fa676a9aa4c55db21019f255426be67a1123524ffa92f44e1a7efa541c8ea24f SHA512 276047a626569e0fc3e8a21764cc580a0b9fb210be1c924cf8a7bec34a436f0cfab5d84b324cb31723bced66ce44e08f99ae58a2c5b09dc2bc4b8084114b915b
 EBUILD edid-decode-0_pre20201230.ebuild 670 BLAKE2B af3b34e5b5bcc498ce1eb1745e53efa95eb5c86b7d4cc47eb586ebf6f386a83b9e7088f8821af82b0ec737c21ac608dd012c5d70d399e1cd9a7a5abf7260be6b SHA512 429f4ad3cc489cd81225d8ae6659b31a1f8949103fbc96f0244811447efc2597002fc97b4d66234d9cb760773908430bdb06852c06d522c003c4c9c6bb46e420
+EBUILD edid-decode-0_pre20211012.ebuild 671 BLAKE2B 4f9c983d8566041e86658ed7ae638e47d0f7b8757e2fa21cf4545637158617e8c3aca465dd536d3c834970c6394dea82d0801ecdd27e062da700d807b4b1fbcf SHA512 76d9dd96854bb0cc8a6db49282f367ad7deafcc1df49a3ccfd5b87255186f06454ef124be83e96a016a10bf65fbaabba9988c923a0e687d06bb63bd060b28fa5
 EBUILD edid-decode-9999.ebuild 550 BLAKE2B 6e79eb700ebfe891bcd2f5451ecb80a27bcbb29af23d0126f5105f984372986c23527e7781b5f5db1737fd1c6c3efe8688e2de6c84e1515f7ad6cbaf7b783739 SHA512 c913ea25760f4ef10d56c1467f3de2a9c79bac6f0f25768989207aab8354dc0fa8903d100773fb81cfdc0118d8ae6762ab9436db11c0cfba7e270fbd17bc3d76
 MISC metadata.xml 647 BLAKE2B 42d8d41db31a4748f5ffad976c0ad35ff483073c286236d77f3c6fc91e854844e519bc8d4761a02880e116faca88c43c16bea37c008719c8adb8f55f4226ac83 SHA512 c7c46f576fd17b42a06a6b241d3a5b6f5dfb9597e824f00ff311feba48a587ecd821285ecc3fb46d3533b6bdd352b34a69ec8886e0e7e8da38dbd29055effbad
diff --git a/sys-apps/edid-decode/edid-decode-0_pre20211012.ebuild b/sys-apps/edid-decode/edid-decode-0_pre20211012.ebuild
new file mode 100644
index 000000000000..b36f30c8fad8
--- /dev/null
+++ b/sys-apps/edid-decode/edid-decode-0_pre20211012.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+EGIT_COMMIT="985024f0ccb7eb0014397f2d562ecebfdd340c3b"
+MY_P="${PN}-${EGIT_COMMIT}"
+
+DESCRIPTION="Decode EDID data in a human-readable format"
+HOMEPAGE="https://git.linuxtv.org/edid-decode.git/"
+SRC_URI="https://dev.gentoo.org/~conikost/files/${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples"
+
+src_compile() {
+	tc-export CXX
+	default
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+	einstalldocs
+
+	if use examples; then
+		insinto /usr/share/edid-decode/examples
+		doins data/*
+	fi
+}
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 6e07f651f153..998681feb843 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -5,6 +5,8 @@ AUX file-5.40-seccomp-fstatat64-musl.patch 723 BLAKE2B cb6e5151b863328a4764f38f4
 AUX file-5.40-seccomp-fstatat64.patch 727 BLAKE2B 164574b98126ad8804c7a3ef51c80567a83d89c609b731b84f2d5e0b8fe54d060f45b6db38258ece2e2af1e0d0674e4fdf5b62df6217695d06042bb86ad72f5b SHA512 5e5364659e2c96e438000e698f9099be1d2bee94890c51ed849f6e0d139ba637a8026d975200476636cd8282791b6c3e5b71326fb8519323d6c07604975b5b0c
 AUX file-5.40-xz_magic.patch 1277 BLAKE2B 3af2322360ab9d7b3340dd34a2190e249dac5d0dc91843efd07e9fdd92f48ebab0a67decae23e68d9dc6a5fae38880d56977dfa4b3a72d74e362c8f3aab42fee SHA512 4e9e64c1ac0e7e95a113577a32be0fe2f2c2d9acbbe323622c2409d2e1b9f9a6cb3e8572569bbef156ca06c6470ee7db38d2579582622f224919eb37243319e5
 DIST file-5.40.tar.gz 1004214 BLAKE2B 4e15a1ca62fe7c03c90b0e509dc899b87f4474f758ad3d08172b3d838dc3f7c2954ba1074eeeeb3da8c04b8df84eff2b8cdf3177da334a926914429df67f60bf SHA512 3b70df75fa4c9050d55b1ffdc28e5f3c8b8ef7d4efd1a06bf53f113b676d81114a85aae56e0897d32b53716662d64ad18ab251ca8c92c6405c69eb758bb99afb
+DIST file-5.41.tar.gz 1064097 BLAKE2B 56fe8a58d9497bb1bfe3ed6b3ce5df70dd27cc308eb0cfdac8e91ba81c733a96aa622c120ac59079986c6d84901c6f2d82fa24f698d481d7f77e6cfdd432d648 SHA512 bbf2d8e39450b31d0ba8d76d202790fea953775657f942f06e6dc9091798d4a395f7205e542388e4a25b6a4506d07f36c5c4da37cfce0734133e9203a3b00654
 EBUILD file-5.40-r3.ebuild 3556 BLAKE2B 52835f37e7c4c78cc5239e86a2b096da50200e2cee7d07d904242f7c42eaa8369d1e4ed5b9239d53708e4bc7bfd54a55e7856c0850e8247a471bf68f529a8d71 SHA512 03fe26852e181ecd4ffd456482abb31717eaa3d3190a33a116cb9b3abac66532b7802d1dfe3bfaeac8a30c45d9a683ee0529e5d200a6e83c41ca7c3cfa16b14b
+EBUILD file-5.41.ebuild 3355 BLAKE2B 750df996eaf9a5384e80f6a188eca765945ddc22be2555fe7d5bfd4f9d5da845d24d7b7d263607f0fb169f197fc24d6953881bfa1e96d90c20c100542f167d14 SHA512 b818b49befa9dd286123cb462ee091edaaa7066b4ff14ce8fc373f2281fbd08e0f0c6407eafd1efbfdd4ee3a3476e3fa03171ac736e778393fbec3db2f25ba39
 EBUILD file-9999.ebuild 3273 BLAKE2B 691dabede60ccb8f756ee3a03a5e2db17f58e556cc19f28493685996ac637e7343803a5667e591fc1b336611458b8550c222238983d797fa21e1fe66c60d1625 SHA512 20a7db1cd42cb5c47d5a0c7a607b3e547e1e76b6fe3effd8a456425929312981b47d940c4deee82f14b20e6be50416206aae4b32cbab80bbdf459cce76443347
 MISC metadata.xml 382 BLAKE2B 204b7440b6a18907045d7eae05e8c99d017fa57b5178462125b998d8b3af3e2be656353f5c69823f3b5ea4d86e7e6c028229af27abaf2f7ace6f181f9ebf4153 SHA512 0e56117ac1957f2393ab47dc875e5f07851f3866014388418f84668f5f9767f6ca83963547442606e1c637ed3bcbb81b317cf994de4a04cd28725d8f6cb49b5e
diff --git a/sys-apps/file/file-5.41.ebuild b/sys-apps/file/file-5.41.ebuild
new file mode 100644
index 000000000000..cb9244c374de
--- /dev/null
+++ b/sys-apps/file/file-5.41.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 libtool toolchain-funcs multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/glensc/file.git"
+	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"
+fi
+
+DESCRIPTION="identify a file's format by scanning binary data for patterns"
+HOMEPAGE="https://www.darwinsys.com/file/"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="bzip2 lzma python seccomp static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	python? ( !dev-python/python-magic )
+	seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
+	"${FILESDIR}/file-5.40-seccomp-fstatat64-musl.patch" #789336, not upstream yet
+)
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautoreconf
+	fi
+
+	elibtoolize
+
+	# don't let python README kill main README #60043
+	mv python/README.md python/README.python.md || die
+	sed 's@README.md@README.python.md@' -i python/setup.py || die #662090
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-fsect-man5
+		$(use_enable bzip2 bzlib)
+		$(use_enable lzma xzlib)
+		$(use_enable seccomp libseccomp)
+		$(use_enable static-libs static)
+		$(use_enable zlib)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+build_src_configure() {
+	local myeconfargs=(
+		--disable-shared
+		--disable-libseccomp
+		--disable-bzlib
+		--disable-xzlib
+		--disable-zlib
+	)
+	tc-env_build econf "${myeconfargs[@]}"
+}
+
+need_build_file() {
+	# when cross-compiling, we need to build up our own file
+	# because people often don't keep matching host/target
+	# file versions #362941
+	tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
+}
+
+src_configure() {
+	local ECONF_SOURCE="${S}"
+
+	if need_build_file ; then
+		mkdir -p "${WORKDIR}"/build || die
+		cd "${WORKDIR}"/build || die
+		build_src_configure
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		emake
+	else
+		cd src || die
+		emake magic.h #586444
+		emake libmagic.la
+	fi
+}
+
+src_compile() {
+	if need_build_file ; then
+		emake -C "${WORKDIR}"/build/src magic.h #586444
+		emake -C "${WORKDIR}"/build/src file
+		local -x PATH="${WORKDIR}/build/src:${PATH}"
+	fi
+	multilib-minimal_src_compile
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_compile
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		default
+	else
+		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog MAINT # README
+
+	# Required for `file -C`
+	insinto /usr/share/misc/magic
+	doins -r magic/Magdir/*
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_install
+	fi
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest
index 039b41c54689..03106dee8726 100644
--- a/sys-apps/flatpak/Manifest
+++ b/sys-apps/flatpak/Manifest
@@ -1,11 +1,5 @@
-DIST flatpak-1.10.0.tar.xz 1504300 BLAKE2B 213fb5449b075250cbec9f43ea5b02afae809b8e58d3be0afd39a70d78431f7efc7912462ce46061a53aa4dc2ef8f5e9504cdaffe4b39d2f53292736442ceb3d SHA512 8eaabd66cbd26f5288fb72cddcd195ea4702243e9f5ceff425836b5f305e2b7a4172e67d30cc0e74ad97937c007e8f4ab81080a7ada3f528d05f74845c923aeb
-DIST flatpak-1.10.2.tar.xz 1507856 BLAKE2B b19b04d536b43a7bbb7f479e495538137402ff46bee3be5d180d12983c4e69b8726628bb69aea64917163a4722a34987b631a073c94083cae50d79dd7d74db20 SHA512 c932b9aa2803aa5b453917174bf282d82924aca7341d72555e2557fc588ccefa0eaf32b956f75752c17cd8f73b687d4a688ebd64df36680b80b5ff5750468597
-DIST flatpak-1.10.3.tar.xz 1507484 BLAKE2B 862d42db1395b8542bee0c9502392fe617d9dc17d002f70c95a168a23aaf31ae9ab8cbb72b63234fab95f3ed2e165362ebdfc4f0694152a1740aa2643dfece1d SHA512 ff51383d4ead0f39926125eec706e5a4d38a739874a9d499adf432cfa05685643cfa411f7a247c8512ec10af8440deda0be06f4cc0808e8ba80941b07e49b633
-DIST flatpak-1.11.1.tar.xz 1534700 BLAKE2B 811ac946fe6616d201ffc621881b396b6787ce435bdceb34c9fa3e162f20eba966d88695bcd6e3716b1f949976ac628a085249785c4e39989be5139cd89fdfaf SHA512 0121b4fcf159311c7480d1be29cd169a39ae61fcea9532f25b266b585038a07a930ff418a9c5b9645aab2510de78ad32c8ae8556991c8d2d7c08ab1e3cc819d1
-DIST flatpak-1.11.3.tar.xz 1544504 BLAKE2B 7a2f8e2dbbddf3e0afb355b98d3995f1276c7ff1b27ef873a3f262f8b34024c191d61c1dca33d58f50e19c18b2557b7de61a732f188470f4cfa751e5f3b64479 SHA512 5f0f6e42c8aec80fda348782742075dfaabf00c516c610e08f89a053a818011d52d5a459887d6f7490b1cc58899544e7ceb300e86cce8da55f24e1c53ee9dd17
-EBUILD flatpak-1.10.0.ebuild 2343 BLAKE2B ac0c0593efb4dd67708f92eb67b3d8967822e7052cea13bde89620b8548a9952e933a851a47dc4898994ad9c001088b4997730c7e32d4a104634a71567eecb99 SHA512 318b49b5bdd1ff3c0a84b3c23e1c27161a57a5a8e9e27cb483b28da4f2acc8f1566ce89c6c3bd9ffef44bb8b0478520f4a55a4095c0e6f85639f248a7a08fa5c
-EBUILD flatpak-1.10.2.ebuild 2343 BLAKE2B ac0c0593efb4dd67708f92eb67b3d8967822e7052cea13bde89620b8548a9952e933a851a47dc4898994ad9c001088b4997730c7e32d4a104634a71567eecb99 SHA512 318b49b5bdd1ff3c0a84b3c23e1c27161a57a5a8e9e27cb483b28da4f2acc8f1566ce89c6c3bd9ffef44bb8b0478520f4a55a4095c0e6f85639f248a7a08fa5c
-EBUILD flatpak-1.10.3.ebuild 2351 BLAKE2B 95c29f8d377f935d0bd73262fad8c5c045abc78c0bdaa05672b27085a3ec2018f4411101dc004d093ff8ab717a57731110d7345718a5c4af2d0034ce58758466 SHA512 b60ef6b60442dd48ef3e4bfd01b4b4c8f527fa40f47711ac7d26a622eae1bfe8ce1fd2084a0ca29d3798d0e64bf683098158d214b566fc555e7f7c48e7558a0e
-EBUILD flatpak-1.11.1.ebuild 2351 BLAKE2B 95c29f8d377f935d0bd73262fad8c5c045abc78c0bdaa05672b27085a3ec2018f4411101dc004d093ff8ab717a57731110d7345718a5c4af2d0034ce58758466 SHA512 b60ef6b60442dd48ef3e4bfd01b4b4c8f527fa40f47711ac7d26a622eae1bfe8ce1fd2084a0ca29d3798d0e64bf683098158d214b566fc555e7f7c48e7558a0e
-EBUILD flatpak-1.11.3.ebuild 2351 BLAKE2B 95c29f8d377f935d0bd73262fad8c5c045abc78c0bdaa05672b27085a3ec2018f4411101dc004d093ff8ab717a57731110d7345718a5c4af2d0034ce58758466 SHA512 b60ef6b60442dd48ef3e4bfd01b4b4c8f527fa40f47711ac7d26a622eae1bfe8ce1fd2084a0ca29d3798d0e64bf683098158d214b566fc555e7f7c48e7558a0e
+DIST flatpak-1.10.5.tar.xz 1511032 BLAKE2B 704ce0b5828728f1bb438dca2c1cd0b84277547fbb08400fe11abf243f5d9b5a6219c79188b362174f2a61eea42ae548d4279646838f3de3e4e75b8782f3dabe SHA512 8c2e365ce442a092c15178a8b39daecf21bfe162078c9a323e68d53194413f174e329812dd01d8da6bbfba3b0087aeb4d92a44067df3f6fa0253e33014d138ae
+DIST flatpak-1.12.2.tar.xz 1541068 BLAKE2B 78162c9ccf0b7b18e69c2594865999fc052a507b255b855f3879cdac0c86dbfcabc6a282f0a4de548d3e85142b0b3c8c26d21825f35e6a2f25ebc1aa13ff2b8b SHA512 4887fe540a821f2c8539fbe1fd89b1cc350126a6fa90c1acf070e08db0de1073406a061f5483bc7a7ef9b07f73409beb7bc02d055d4b3ae1c33ba5c318e11b6f
+EBUILD flatpak-1.10.5.ebuild 2348 BLAKE2B 5a49a2773e347ef5a6a7f29f617069565f2f9ee34b5ff6f1f30ab5b3084be12b1370752124dc407cf8d936925e5f347d4fc592cfd7de79d47dea7df0a663504a SHA512 283da0b5ffd7c1e234296eb415de1e6671c28c335fde59651bfdae53439dac4dd0d034e4ceb16c02b0ec96b5f439bb2d971b98398b2bdba7d1239deebeb0d867
+EBUILD flatpak-1.12.2.ebuild 2351 BLAKE2B 95c29f8d377f935d0bd73262fad8c5c045abc78c0bdaa05672b27085a3ec2018f4411101dc004d093ff8ab717a57731110d7345718a5c4af2d0034ce58758466 SHA512 b60ef6b60442dd48ef3e4bfd01b4b4c8f527fa40f47711ac7d26a622eae1bfe8ce1fd2084a0ca29d3798d0e64bf683098158d214b566fc555e7f7c48e7558a0e
 MISC metadata.xml 325 BLAKE2B a8ca5c0feaab721a66653a8d5e084d2bba127d75faa0975a4dac7d4d7395801fc69bed88bf13663826188696ee5e25e18afc1b0d5161d27e15f36b9c88487146 SHA512 2736f22e733f2214b80c46b3280f90103e21c3211bea129614bcf372f05803b5d5148d34406e8aa332f7b21090e8aaa698bb1a25d767ccea21d3977f0894f464
diff --git a/sys-apps/flatpak/flatpak-1.10.0.ebuild b/sys-apps/flatpak/flatpak-1.10.0.ebuild
deleted file mode 100644
index 62dc9a6edd2e..000000000000
--- a/sys-apps/flatpak/flatpak-1.10.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools linux-info python-any-r1
-
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-DESCRIPTION="Linux application sandboxing and distribution framework"
-HOMEPAGE="https://flatpak.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="doc gtk kde introspection policykit seccomp systemd"
-RESTRICT+=" test"
-
-RDEPEND="
-	acct-group/flatpak
-	acct-user/flatpak
-	>=app-arch/libarchive-2.8:=
-	app-arch/zstd:=
-	>=app-crypt/gpgme-1.1.8:=
-	>=dev-libs/appstream-glib-0.5.10:=
-	>=dev-libs/glib-2.56:2=
-	>=dev-libs/libxml2-2.4:=
-	dev-libs/json-glib:=
-	dev-libs/libassuan:=
-	>=dev-util/ostree-2020.8:=[gpg(+)]
-	|| (
-		dev-util/ostree[curl]
-		dev-util/ostree[soup]
-	)
-	>=gnome-base/dconf-0.26:=
-	>=net-libs/libsoup-2.4:=
-	sys-apps/bubblewrap
-	sys-apps/dbus
-	>=sys-fs/fuse-2.9.9:0=
-	sys-apps/xdg-dbus-proxy
-	x11-apps/xauth
-	x11-libs/gdk-pixbuf:2=
-	x11-libs/libXau:=
-	policykit? ( >=sys-auth/polkit-0.98:= )
-	seccomp? ( sys-libs/libseccomp:= )
-	systemd? ( sys-apps/systemd:= )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=sys-devel/automake-1.13.4
-	>=sys-devel/gettext-0.18.2
-	virtual/pkgconfig
-	dev-util/gdbus-codegen
-	sys-devel/bison
-	introspection? ( >=dev-libs/gobject-introspection-1.40 )
-	doc? (
-		>=dev-util/gtk-doc-1.20
-		dev-libs/libxslt
-	)
-	$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
-"
-
-PDEPEND="
-	gtk? ( sys-apps/xdg-desktop-portal-gtk )
-	kde? ( kde-plasma/xdg-desktop-portal-kde )
-"
-
-python_check_deps() {
-	has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	local CONFIG_CHECK="~USER_NS"
-	linux-info_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# This line fails because locales are in /usr/lib/locale/locale-archive.
-	sed -i 's:^cp -r /usr/lib/locale/C.*:#\0:' tests/make-test-runtime.sh || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-sandboxed-triggers
-		--enable-xauth
-		--localstatedir="${EPREFIX}"/var
-		--with-system-bubblewrap
-		--with-system-dbus-proxy
-		$(use_enable doc documentation)
-		$(use_enable doc gtk-doc)
-		$(use_enable introspection)
-		$(use_enable policykit system-helper)
-		$(use_enable seccomp)
-		$(use_with systemd)
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/flatpak/flatpak-1.10.2.ebuild b/sys-apps/flatpak/flatpak-1.10.2.ebuild
deleted file mode 100644
index 62dc9a6edd2e..000000000000
--- a/sys-apps/flatpak/flatpak-1.10.2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools linux-info python-any-r1
-
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-DESCRIPTION="Linux application sandboxing and distribution framework"
-HOMEPAGE="https://flatpak.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="doc gtk kde introspection policykit seccomp systemd"
-RESTRICT+=" test"
-
-RDEPEND="
-	acct-group/flatpak
-	acct-user/flatpak
-	>=app-arch/libarchive-2.8:=
-	app-arch/zstd:=
-	>=app-crypt/gpgme-1.1.8:=
-	>=dev-libs/appstream-glib-0.5.10:=
-	>=dev-libs/glib-2.56:2=
-	>=dev-libs/libxml2-2.4:=
-	dev-libs/json-glib:=
-	dev-libs/libassuan:=
-	>=dev-util/ostree-2020.8:=[gpg(+)]
-	|| (
-		dev-util/ostree[curl]
-		dev-util/ostree[soup]
-	)
-	>=gnome-base/dconf-0.26:=
-	>=net-libs/libsoup-2.4:=
-	sys-apps/bubblewrap
-	sys-apps/dbus
-	>=sys-fs/fuse-2.9.9:0=
-	sys-apps/xdg-dbus-proxy
-	x11-apps/xauth
-	x11-libs/gdk-pixbuf:2=
-	x11-libs/libXau:=
-	policykit? ( >=sys-auth/polkit-0.98:= )
-	seccomp? ( sys-libs/libseccomp:= )
-	systemd? ( sys-apps/systemd:= )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=sys-devel/automake-1.13.4
-	>=sys-devel/gettext-0.18.2
-	virtual/pkgconfig
-	dev-util/gdbus-codegen
-	sys-devel/bison
-	introspection? ( >=dev-libs/gobject-introspection-1.40 )
-	doc? (
-		>=dev-util/gtk-doc-1.20
-		dev-libs/libxslt
-	)
-	$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
-"
-
-PDEPEND="
-	gtk? ( sys-apps/xdg-desktop-portal-gtk )
-	kde? ( kde-plasma/xdg-desktop-portal-kde )
-"
-
-python_check_deps() {
-	has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	local CONFIG_CHECK="~USER_NS"
-	linux-info_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# This line fails because locales are in /usr/lib/locale/locale-archive.
-	sed -i 's:^cp -r /usr/lib/locale/C.*:#\0:' tests/make-test-runtime.sh || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-sandboxed-triggers
-		--enable-xauth
-		--localstatedir="${EPREFIX}"/var
-		--with-system-bubblewrap
-		--with-system-dbus-proxy
-		$(use_enable doc documentation)
-		$(use_enable doc gtk-doc)
-		$(use_enable introspection)
-		$(use_enable policykit system-helper)
-		$(use_enable seccomp)
-		$(use_with systemd)
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/flatpak/flatpak-1.11.3.ebuild b/sys-apps/flatpak/flatpak-1.10.5.ebuild
index a931e50425ab..b8320f23f5c4 100644
--- a/sys-apps/flatpak/flatpak-1.11.3.ebuild
+++ b/sys-apps/flatpak/flatpak-1.10.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://flatpak.org/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="doc gtk kde introspection policykit seccomp systemd"
 RESTRICT+=" test"
 
diff --git a/sys-apps/flatpak/flatpak-1.11.1.ebuild b/sys-apps/flatpak/flatpak-1.11.1.ebuild
deleted file mode 100644
index a931e50425ab..000000000000
--- a/sys-apps/flatpak/flatpak-1.11.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit autotools linux-info python-any-r1
-
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-DESCRIPTION="Linux application sandboxing and distribution framework"
-HOMEPAGE="https://flatpak.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="doc gtk kde introspection policykit seccomp systemd"
-RESTRICT+=" test"
-
-RDEPEND="
-	acct-group/flatpak
-	acct-user/flatpak
-	>=app-arch/libarchive-2.8:=
-	app-arch/zstd:=
-	>=app-crypt/gpgme-1.1.8:=
-	>=dev-libs/appstream-glib-0.5.10:=
-	>=dev-libs/glib-2.56:2=
-	>=dev-libs/libxml2-2.4:=
-	dev-libs/json-glib:=
-	dev-libs/libassuan:=
-	>=dev-util/ostree-2020.8:=[gpg(+)]
-	|| (
-		dev-util/ostree[curl]
-		dev-util/ostree[soup]
-	)
-	>=gnome-base/dconf-0.26:=
-	>=net-libs/libsoup-2.4:=
-	sys-apps/bubblewrap
-	sys-apps/dbus
-	>=sys-fs/fuse-2.9.9:0=
-	sys-apps/xdg-dbus-proxy
-	x11-apps/xauth
-	x11-libs/gdk-pixbuf:2=
-	x11-libs/libXau:=
-	policykit? ( >=sys-auth/polkit-0.98:= )
-	seccomp? ( sys-libs/libseccomp:= )
-	systemd? ( sys-apps/systemd:= )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=sys-devel/automake-1.13.4
-	>=sys-devel/gettext-0.18.2
-	virtual/pkgconfig
-	dev-util/gdbus-codegen
-	sys-devel/bison
-	introspection? ( >=dev-libs/gobject-introspection-1.40 )
-	doc? (
-		>=dev-util/gtk-doc-1.20
-		dev-libs/libxslt
-	)
-	$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
-"
-
-PDEPEND="
-	gtk? ( sys-apps/xdg-desktop-portal-gtk )
-	kde? ( kde-plasma/xdg-desktop-portal-kde )
-"
-
-python_check_deps() {
-	has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	local CONFIG_CHECK="~USER_NS"
-	linux-info_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# This line fails because locales are in /usr/lib/locale/locale-archive.
-	sed -i 's:^cp -r /usr/lib/locale/C.*:#\0:' tests/make-test-runtime.sh || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-sandboxed-triggers
-		--enable-xauth
-		--localstatedir="${EPREFIX}"/var
-		--with-system-bubblewrap
-		--with-system-dbus-proxy
-		$(use_enable doc documentation)
-		$(use_enable doc gtk-doc)
-		$(use_enable introspection)
-		$(use_enable policykit system-helper)
-		$(use_enable seccomp)
-		$(use_with systemd)
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/flatpak/flatpak-1.10.3.ebuild b/sys-apps/flatpak/flatpak-1.12.2.ebuild
index a931e50425ab..a931e50425ab 100644
--- a/sys-apps/flatpak/flatpak-1.10.3.ebuild
+++ b/sys-apps/flatpak/flatpak-1.12.2.ebuild
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 785f510206a3..9394f3b4079c 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,13 +1,16 @@
 AUX fwupd-1.5.7-logind_plugin.patch 265 BLAKE2B 7959a4cb059a2207b0048f474ff9e0a3e3ab625d6db5e7dacafb7b6190c9718bd8659760579c6ee16fe22fefcc9ec4837f7b2635b1ff5f555ffda36cefacab48 SHA512 a809831e307549f109fbc2c705b80535d885db92a96b72d07f9ef7a954e52ffa2204331e608bc719d41ad038888adfeb23f6ed708c6a769c436f81b4086fedbb
 AUX fwupd-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch 1105 BLAKE2B 898f70b2baa27de6678b415ffe9671e2599ff69d9f1ad52cfcefd271d5c5c936bf32276970ef36a88464f11ea1956d90bedd64989adeb9f87be6a2e4d82bcd14 SHA512 106112dedd1c205604b6588ad08092cdb5bcdc1bab3f2e415526faf7af3075ed442d61b3f31a3d0421b683d6f772fb196f93131d3f2f8227b65a6dc781ec6461
 AUX fwupd-1.6.2-dell-dock-requires-gusb.patch 716 BLAKE2B 470db7243fa0e7398778ef8c5d716013e04ef6429e1b4a35b644c3f4bca7148f3bb9f2fc08814b82edc50e1605dc00feb2691f3f1c09b371afdeb1b838181a6c SHA512 08546194d1dfe27a09b10feb6d63a1f29cae881a0ac23bd1497b91eea44fff21559bb67ab5feac3b5613d4f99626708dade0127cb6c7f5ea4c842612c0323ec3
+AUX fwupd-1.7.0-elanfp-requires-gusb.patch 641 BLAKE2B 54dd8413a9608a9e1711622af3422ad874839c7083009c964f8cb2d198103e551d9bb262fc87da3dec0913829defbff358a2777aed1b11c0a42463d930a6f35b SHA512 fbe76f0db8364dd62b86fffaac16d8cf79eb65cbe71862030641c56d9b779c579f4528d176fbc382f055bee144fed5b2c9823486d3354d7de41240035307eacf
 AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7
 DIST fwupd-1.5.9.tar.gz 3712637 BLAKE2B 17429bdc3073a92b94de9bc67ce1955e928e8d6aeefa5f0ad39a9d15457f96c562ce5cfbc47e1fc450c31c2b9334ca3902ed63ef809e8d2cb5b5459cc54dec28 SHA512 ccd1246ab5b3c876251924a14d1c2c553b2df5702c6673978b1d627ea1028c3950241f73dd54e2fecb5cc204a1dc77e6597f7514eff6467beb50be7874352d78
 DIST fwupd-1.6.2.tar.gz 3885963 BLAKE2B 183abc4d620b884a276dece39ad1e57f606c2237a5fa03b76ede2e1c93bb9548d6641e35490d96e22abbbfb3c1852697a688091f62086f6b2e9d3366e796888e SHA512 a743b37c5969939cc3eb708b0af2e8f6c665848868473c29edf9db110cef5ac62da3c042cfa9617a2f10b2a9d153d0d4146a1832a18bc71fadcbf9a7b5cea1b0
 DIST fwupd-1.6.3.tar.gz 3888812 BLAKE2B 08d24fde80010d50e2396f59d743a00e640c1fcc06f6ada566ebcff48d25f1dc33676a40d13e1b684e45fd9483af1d9755ef3ac00bdaa8a37236589c03bb8a4c SHA512 837bcfe57873315ade8f3ff82d290d492dcb047387db5a642e6e7fc8e9ff7c3cabe5892692e2d4b5b0c5bd69f8a253bc364c61f23013c161a350b39de7d58e67
 DIST fwupd-1.6.4.tar.gz 3891113 BLAKE2B b4f3a629c0594ee69a0e2ea727c8080f63e970a6e9964b53d007e490d6b538f5441a65de20412673ded181611342c7c1c1ec16eb0d05c69c149f635fed325269 SHA512 d0c788313f8cf00c6e0e238436668ab5885133933cd74202d3eb4a3377d1b123689dd7f3827d45853c92b98196d5d896027b471117af461356e2f3c3ec82f58e
+DIST fwupd-1.7.0.tar.gz 4102985 BLAKE2B 9a29621e029c526d513304863294ee69f14ff1cf069b388fe5dc6037b2f030ea24136f18d9096abcc449376295996e3184c1c969f8dda329f2786622ba1300a7 SHA512 148f161f0e8d008fa20091c747baf4a205bc2e76ddc5dbb3676e3f2a15ca5d6d1454b572ea0336f185b5ef3a8ca8bfd3ad1098649e095a58c9822d4dbffe2987
 EBUILD fwupd-1.5.9-r1.ebuild 4380 BLAKE2B f47d3b9dc882649c85549f3139ea2cd6473c21eee0a1750076b7dfad7c04caa6641f36704bc9bf978e047e16f9a07f12fcc862b22697ae4091c7f5cac31c2256 SHA512 f5d965dc302cd77877f13c0ccc3a952c71a6463b56b5d7aafce11ef4d673e46f9c486159be6e2ccfd1229d42ea014598705b867d7aa7795a5c9e0caf51a76506
 EBUILD fwupd-1.6.2.ebuild 4560 BLAKE2B f85eebae29ee6e20705e7db84bbf8ebc33d109a1fc063c6225c24faf70e1289ae693da3ba6bb36c53ab56e5cfefe39c99a684bbf5393abca8c94b082ce5c9a50 SHA512 f9556caeb5e6678a7bded64b97523e5917a81500a2f7791963c18c769e7e650e3d435c4fd0efe4bb3a0e771d95e294be28bee28a798c974abfaa252de90eb5ea
 EBUILD fwupd-1.6.3.ebuild 4504 BLAKE2B 78cb6e9716c4109fcf2e26cad2c8d5d84d952a1514827f2b48106b8b15d9a65085468396fee88584bc498441ed230dba5b150f682326e982c2fe45620aa3c1ed SHA512 01927eff188e8bf7fa80d394f9666bcc47266bf7e685264da4484ab4c7966adab92669007473c1602b31253cb35ec9bef44737bf4ba78d0ac8b1cb4d9799c255
 EBUILD fwupd-1.6.4-r1.ebuild 4504 BLAKE2B a5efb85ec19fd9484769314b6fcdcdffd1a7d331150496385e1f071421eaa20580c3b7590e52d83e36f752e8953fb6415873cff29fca9a70ea2e66722d4cf105 SHA512 f79dea7b0732564e976507863d39ea2af2d02a4218efc683476f9be1a18248ec8a25f1ff7729a44d5ff0171dc725cac3ebc3057b25c8704365c127a9ac6b9cde
-MISC metadata.xml 1348 BLAKE2B 118050b55b34009e6c684f563e70801decdbbb72d74fa2f4f3f2f9fc1451dd2bf2ddb63d3303ca9d2f85eba14e9fe302cb4bdf6e487d9fd4883e62e61adc398f SHA512 28988ca295040f8a4abb56a6993c115378e13ef15c6abe96417ad475ad622738663c49b8875eee0e515f767290e2d903f2a483b37a7694f9b91a3d0475627468
+EBUILD fwupd-1.7.0.ebuild 4652 BLAKE2B 48b044c4754efbecee6eca050b64b3678f03dff3e8bdbe9ac3ddc6dd127c4dd73324ca65af97785892208356bdfef913798bcc3c380465180ff60f5dc34753ff SHA512 ed311b4b86b348db0132679ae6f959ec6785917ca48cc31d67fef1ea8b443a7b9a980e478df477a7ccdc8e3089d9f5c77b19ae3de3cc5cb374a1f21e68676763
+MISC metadata.xml 1429 BLAKE2B be825264920779449312aca9b1de8aff1811c6d8a2f7e46b184214e41f7658b2af9731172f6950e146bcf9fe175a757b814ea97cab8cbc835c76d57b714f0f15 SHA512 824e5d791e4b631af5b2559cc99f43e19acd6f07e33bb540c1e1bce3ff7eaa336a1c5f325317c79958907a581cab61f53f2465c23927323dcf44dcd179e224c0
diff --git a/sys-apps/fwupd/files/fwupd-1.7.0-elanfp-requires-gusb.patch b/sys-apps/fwupd/files/fwupd-1.7.0-elanfp-requires-gusb.patch
new file mode 100644
index 000000000000..fec6aab4a3ce
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.7.0-elanfp-requires-gusb.patch
@@ -0,0 +1,22 @@
+commit fa403db414301c247aef1bc895795a04b06d9298
+Author:     Thomas Deutschmann <whissi@gentoo.org>
+AuthorDate: Fri Oct 15 15:45:55 2021 +0200
+Commit:     Thomas Deutschmann <whissi@gentoo.org>
+CommitDate: Fri Oct 15 15:45:55 2021 +0200
+
+    elanfp plugin requires gusb
+
+diff --git a/plugins/elanfp/meson.build b/plugins/elanfp/meson.build
+index e8bb8255..2b5d7fde 100644
+--- a/plugins/elanfp/meson.build
++++ b/plugins/elanfp/meson.build
+@@ -1,3 +1,4 @@
++if get_option('gusb')
+ cargs = ['-DG_LOG_DOMAIN="FuPluginElanfp"']
+ 
+ install_data(['elanfp.quirk'],
+@@ -27,3 +28,4 @@ shared_module('fu_plugin_elanfp',
+     plugin_deps,
+   ],
+ )
++endif
diff --git a/sys-apps/fwupd/fwupd-1.7.0.ebuild b/sys-apps/fwupd/fwupd-1.7.0.ebuild
new file mode 100644
index 000000000000..2e580029d434
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.7.0.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit linux-info meson python-single-r1 vala xdg
+
+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 ~riscv ~x86"
+IUSE="agent amt archive bluetooth dell elogind flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	^^ ( elogind minimal systemd )
+	dell? ( uefi )
+	minimal? ( !introspection )
+	spi? ( lzma )
+	synaptics? ( gnutls )
+	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:=[introspection?]
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_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?] )
+	logitech? ( dev-libs/protobuf-c:= )
+	lzma? ( app-arch/xz-utils )
+	modemmanager? ( net-misc/modemmanager[qmi] )
+	policykit? ( >=sys-auth/polkit-0.103 )
+	systemd? ( >=sys-apps/systemd-211 )
+	tpm? ( app-crypt/tpm2-tss )
+	uefi? (
+		sys-apps/fwupd-efi
+		sys-boot/efibootmgr
+		sys-fs/udisks
+		sys-libs/efivar
+	)
+"
+# 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
+	"${FILESDIR}"/${P}-elanfp-requires-gusb.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 -e '/platform-integrity/d' \
+		-i plugins/meson.build || die #753521
+
+	sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \
+		-i data/builder/meson.build || die
+
+	vala_src_prepare
+}
+
+src_configure() {
+	local plugins=(
+		$(meson_use amt plugin_amt)
+		$(meson_use dell plugin_dell)
+		$(meson_use flashrom plugin_flashrom)
+		$(meson_use gusb plugin_altos)
+		$(meson_use logitech plugin_logitech_bulkcontroller)
+		$(meson_use modemmanager plugin_modem_manager)
+		$(meson_use nvme plugin_nvme)
+		$(meson_use spi plugin_intel_spi)
+		$(meson_use synaptics plugin_synaptics_mst)
+		$(meson_use synaptics plugin_synaptics_rmi)
+		$(meson_use thunderbolt plugin_thunderbolt)
+		$(meson_use tpm plugin_tpm)
+		$(meson_use uefi plugin_uefi_capsule)
+		$(meson_use uefi plugin_uefi_capsule_splash)
+		$(meson_use uefi plugin_uefi_pk)
+	)
+	use ppc64 && plugins+=( -Dplugin_msr="false" )
+	use riscv && plugins+=( -Dplugin_msr="false" )
+
+	local emesonargs=(
+		--localstatedir "${EPREFIX}"/var
+		-Dbuild="$(usex minimal standalone all)"
+		-Dconsolekit="false"
+		-Dcurl="true"
+		-Ddocs="$(usex gtk-doc gtkdoc none)"
+		-Defi_binary="false"
+		-Dsupported_build="true"
+		$(meson_use agent)
+		$(meson_use archive libarchive)
+		$(meson_use bluetooth bluez)
+		$(meson_use elogind)
+		$(meson_use gnutls)
+		$(meson_use gusb)
+		$(meson_use lzma)
+		$(meson_use man)
+		$(meson_use introspection)
+		$(meson_use policykit polkit)
+		$(meson_use systemd)
+		$(meson_use test tests)
+
+		${plugins[@]}
+	)
+	use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
+	export CACHE_DIRECTORY="${T}"
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if ! use minimal ; then
+		newinitd "${FILESDIR}"/${PN}-r2 ${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
+}
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index 4d30edc6fd6b..d1dfe55c1e5e 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -16,6 +16,7 @@
 		<flag name="dell">Enable Dell-specific support.</flag>
 		<flag name="flashrom">Enable flashrom plugin via <pkg>sys-apps/flashrom</pkg></flag>
 		<flag name="gusb">Enable <pkg>dev-libs/libgusb</pkg> support</flag>
+		<flag name="logitech">Build and install Logitech bulk controller plugin</flag>
 		<flag name="nvme">Build and install NVMe plugin</flag>
 		<flag name="modemmanager">Build and install Modem Manager plugin</flag>
 		<flag name="spi">Install Intel-SPI plugin</flag>
diff --git a/sys-apps/hw-probe/Manifest b/sys-apps/hw-probe/Manifest
index df32c0b55853..22cbfde9c5ff 100644
--- a/sys-apps/hw-probe/Manifest
+++ b/sys-apps/hw-probe/Manifest
@@ -1,5 +1,7 @@
 AUX README.gentoo 296 BLAKE2B df18c0796912c5cfe6e8f88427ea690512bfd519aa3502528df6f6936571497937a22f8edcd9e9143d915e648f9b341043141cc6d0ae35de55d22d44c0335f6e SHA512 4ae61b89352a4bbe70f4ea1b85eb19e58c2b81475722dda25c289fbe15e7e6e07df51b08471c5d3c5d7a3b12cc09ba599e0d2158dee68c9c66f60908d57b4326
 AUX hw-probe-1.5-disable-automatic-upload.patch 1140 BLAKE2B 47ae86326941c5a86f9efd7614509a9af36261c51ef85f21ea1172ae91c3966c113aa51f8841a56005f75b0370b57dff6196fe49a77c766ce1efd9003ee0e249 SHA512 7cbe2dc17cb513086f85052b43349fb64bd12a0f3671bb37109a20d62cf565f8bc8d9e798a7d0a7e53896d187e8c575f850861e381885f2ac1f40d2c0c919063
+DIST hw-probe-1.6.tar.gz 158879 BLAKE2B 96d36be283d497df8aed944f3ba14c620e3abc7d3dd728c274f3ebaca3f064d1ac92bd4d47cbae51500264d785feda25082950fde6fdbd6c1b35f48736015659 SHA512 9ef51c0acc450d1f2073c03885e097231a745a456ae384825c56804f94c62ac85bf4c795627e6ea738636fa83d50d7ef60e20c6dd9621247ff06c51461d91249
 DIST hw-probe-1.6_beta2.tar.gz 143569 BLAKE2B fc7b7562f86eb1b26fef32a8ed9b4a8d01c5621bedbc7e810d5a011c53d528b000ff9df312cf5e3f0ab455558e08e2b9a3ddcd543cd6856208466721f9a0e13c SHA512 2727e7b0fe449cbb6dd21fc112660df4ec666be845bbfd21037b41372a499dfb80c8c2dc37bd222032c68faadff91192a6d6f5229353cb0fc63b8e3dbd715f5d
+EBUILD hw-probe-1.6.ebuild 2380 BLAKE2B 284ca257c11e56bd355a9fdd030e9f4c5814ecf0d3aec8b090ed3141342a37aad0f86e774d08570fc88c83ecf439611372415bf04457fcd6d4008c2f311e1145 SHA512 84a4f07b78f065179efdbc30251940e3f4e57b4a06bbaa0bf5f4ebfc8e6c83f740d4fecf83165340e4364450b8e69934fb92196c1f49b899e6f69de50469aa17
 EBUILD hw-probe-1.6_beta2-r1.ebuild 2447 BLAKE2B df0aa62976532b17319cf17259211cc493008be2478855574979eb73b3f8cb471eae04ee8b315c49a5eefc828a7be6896b6d2dbe8114a584be42c6b878bd6318 SHA512 43d9118e85be8fdf07b96c1e32c3cdaa27b5e3b2da9b9780fe133481b087be04b33b276618283ec596fc381ead99b7f1765175f89ca04793641065aefc496e0c
 MISC metadata.xml 647 BLAKE2B 522741fd8d5f7b64d686ce02dd5ccd7d9ba42df1e50a3e51921fa17c110c6db114ee22d5a903c8bb61a2a5f3884fad5e8b1a929a062af111fd52faf047638ab1 SHA512 ef6e4af1150d72b3cc26ba56267dae006ae8a19a8df2606a9f02df0dc6b091f0bd3dd9caee2171e896dd7b5e582b853f228e899dbd9281dd07b435a1da1f6b7b
diff --git a/sys-apps/hw-probe/hw-probe-1.6.ebuild b/sys-apps/hw-probe/hw-probe-1.6.ebuild
new file mode 100644
index 000000000000..504704b069f7
--- /dev/null
+++ b/sys-apps/hw-probe/hw-probe-1.6.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV="${PV/_/-}"
+MY_PV_BETA="${MY_PV/2/}"
+
+inherit optfeature readme.gentoo-r1
+
+DESCRIPTION="A tool to probe for hardware, check it's operability and find drivers"
+HOMEPAGE="https://github.com/linuxhw/hw-probe/"
+SRC_URI="https://github.com/linuxhw/hw-probe/archive/${MY_PV_BETA}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV_BETA}"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Digest-SHA1
+	net-misc/curl
+	sys-apps/dmidecode
+	sys-apps/edid-decode
+	sys-apps/hwinfo
+	sys-apps/pciutils
+	sys-apps/smartmontools
+	sys-apps/usbutils
+	virtual/perl-Data-Dumper
+"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	default
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	optfeature "showing Machine Check Exceptions." app-admin/mcelog
+	optfeature "showing additional I/O statistics." app-admin/sysstat
+	optfeature "showing display data channel (ddc) information." app-misc/ddcutil
+	optfeature "showing smart card (reader) information." dev-libs/opensc
+	optfeature "showing Vulkan GPU hardware information." dev-util/vulkan-tools
+	optfeature "showing information of attached scanners." media-gfx/sane-backends
+	optfeature "showing GPU information provided by MESA." media-libs/mesa
+	optfeature "showing zeroconf statistics." net-dns/avahi
+	optfeature "showing HP printer statistics." net-print/hplip
+	optfeature "showing status about rfkill switches on communication devices." net-wireless/rfkill
+	optfeature "showing additional CPU capabilities." sys-apps/cpuid
+	optfeature "showing hard disk (HDD, SSD, ..) capabilities." sys-apps/hdparm
+	optfeature "showing available I2C sensors." sys-apps/i2c-tools
+	optfeature "showing additional hardware and system information detected by inxi." sys-apps/inxi
+	optfeature "showing information about tested memory for faults." sys-apps/memtester
+	optfeature "showing 'Plug & Play' devices." sys-apps/pnputils
+	optfeature "showing systemd boot process information." sys-apps/systemd
+	optfeature "showing ACPI statistics and tables." sys-power/iasl
+	optfeature "showing information about NUMA." sys-process/numactl
+	optfeature "showing additional GPU information provided by MESA progs." x11-apps/mesa-progs
+	optfeature "showing available Xinput devices." x11-apps/xinput
+}
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 957276ed197a..7dcc47219b00 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -4,5 +4,5 @@ DIST hwloc-2.3.0.tar.bz2 6414781 BLAKE2B 60bc80ae73d0ae9ff9a438474efe682dfff2814
 DIST hwloc-2.5.0.tar.bz2 6688349 BLAKE2B 684367afa5fc056b9bf04b3a95bd8239ec70127d5e582948ca16a09323614ad0ef77278a120544af0a740b456f1ba24bffc861b9f132293fafb7da0597d0b688 SHA512 9e8b829868cb9f5fd2fe84d8515d0dc8725ddc84c788a61c1e9e918eb2b29659eb73cf22a4189e6b887f5bfa3255c206f4ba924bd7fe2c88c185f4308c0949cd
 EBUILD hwloc-1.11.13.ebuild 2167 BLAKE2B 0518fb6472ee433835781125b914e68c788e5d219c5a120ddf99df6d3770de279c769a0c4fdfa6638a0b747190adf9f32e090cf1f4ecfc5d678a8f09dcb22058 SHA512 cad8bbd45d68521c0e5aa1fbdbdb763eeafdcb7b406aed1fd1d61dde9285d523da2e031c907f9dc5729d921298dafff126a1b493b66b21f0c7bd00e67f50d03a
 EBUILD hwloc-2.3.0.ebuild 2926 BLAKE2B 42a8053f8baa463ccc1805d3586698d7e99e57498d14ff2c633148b258133a6ddd6f0370a15e6dc3d0ea87827f4229e40b23e1f21e8aaa1d1a9a282fa2883bae SHA512 8f855c6dca0daf997c37f0dac6f295698b2c3037c270ba12a20978ac61d82f98485bb082c68407c0609fdc1c585dabf491d653bb188ea9d4f90d82a931d55bb0
-EBUILD hwloc-2.5.0.ebuild 2933 BLAKE2B 29056c11f00907327a283b9a42ca73824c90dd75de0bf6d12ee7101ab37ae98478b8d265ac7f316e1fffa79d3af42134f06dc0302644dc4730621ad3ca247101 SHA512 a8f6ea94b0026eb3260f152d3ee50b4985bcaf564f302df367e3e5fffacb1368c396e09933db8f37a17d5d6f27197ebc450da07305ffb6a666a7011a2061087a
+EBUILD hwloc-2.5.0.ebuild 2929 BLAKE2B d2700b93da84746f22b26ff5b37b63fe7dfa25a33a4bc6e5deda9695241807ceb3a58c4dc787cc8fcf841a5070ca5435f20e2d54a834d5184d2a953b31de74e4 SHA512 99aa8785173360b31b3bfb1503902c911abe9600f559519c90c3b85bd02d165bf0de210d2d4a24898d559ddd007c8fc41c9c3649298cd89f079714b87a84f144
 MISC metadata.xml 1704 BLAKE2B 4b0dde09ca25988c711048ffef54dcb0ec39e3afde391bb68a288b13232f18339a6b2391c942a2ce261777f4575b973e7517e69277e7be852f44c807db62d5ed SHA512 70b020e6cc65180537d11e9f55f033e1c56cb5c708e7b643e38e83eab9e84bf0f4b8460b3b81e9b6cbb701a7be4a554214a1c6aac3bdb31be4e580321c798317
diff --git a/sys-apps/hwloc/hwloc-2.5.0.ebuild b/sys-apps/hwloc/hwloc-2.5.0.ebuild
index 7142d8ae3ffa..0134baeceb16 100644
--- a/sys-apps/hwloc/hwloc-2.5.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cairo +cpuid cuda debug gl netloc nvml +pci static-libs svg udev xml X"
 
 # opencl support dropped with x11-drivers/ati-drivers being removed (#582406).
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 5a5bb62ce2df..ffb5a753fcb1 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,10 +1,15 @@
+AUX openrc-0.44.6-fix-checkpath.patch 862 BLAKE2B 35aac37270c8ee779d2e3f0291e2f2e659cbebd6ab8e9cb4a7a0295a1a99331b94c86e411ddac98f415839781d2415771c7cc81d12749a6efed5396f54933581 SHA512 187f318b652d779252371812ae2b154e79e109fc1d4eadb8e86c9c83d639c1b03a106e2e982c4365b2204321abfb561421e8a239f1fd71281ee6dbad4e775e80
 AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a20ef625a1959e77dbf38cd1756838337fb39a061c4ee19a39cccd2f5867fab9f04fb916a74029aaa SHA512 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec
 AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb
 DIST openrc-0.43.5.tar.gz 242146 BLAKE2B 993d3895588e8f1383049006834f944faaae0f889d3afcae5bff697db9f26383712f18aba52ce07d835f1d2bbe8ef19ef116ad60141d1eb0650767430d1d9967 SHA512 680c1549a8a37eb3a719f3e026888d045d26c98357d6e6eaf09069a23a001272deaca8cac4a9b8fd79f489c4cfb4fe2c7b5d481d1469798a8f5ec470d0cadbe3
 DIST openrc-0.44.5.tar.gz 253815 BLAKE2B e0d1ed26a18f59a226a44b3cf041c9b8017fbbe304aa5986d8e5ada17530594ac1a8099bf392ee6cd41c6668ce69a51ee1776817745b568e182bfbeac3a01799 SHA512 95b9399168522ead967a9f1de8ddce3826de997ff0e1acd56b342dc41cf18ea527598ea316e0e377916582a4f6a109a12233bd302e72ae93b3f1bcb81bfe7a4a
 DIST openrc-0.44.6.tar.gz 253905 BLAKE2B 3a1b337fde50e54fa6d7cabf4f1103889dbda8b04dd98c1ef19ec6ed778a4a1006afb8c9bcc6944b12219f2a2adf2f4dd5afe6243b7a69c23d5effed77cb4224 SHA512 203e48781d5c6d1c0839439823f0f26d2fcd44cd03512379993df684693098080cf7253cffaafca76032551146c36c6fff7bc0d7c848725dc2bccf7519da6d3a
+DIST openrc-0.44.7.tar.gz 255444 BLAKE2B 8058e1fd8fcce46f53e73b56ec8da5eec9ba0807d657aef4ece2d49056c02a451c41155df96b167ff157863a85d77eb63796715b5191dd1c6c631c8f859d3090 SHA512 c6b3e2e30615d97a5185320a140ced881bc59ba31ea8dff5d80440396166af237826de6ffc7836ec141e305c92176cd9cc3dabff7e42ac0d80e5238513fefdb7
+EBUILD openrc-0.43.5-r1.ebuild 5066 BLAKE2B b3e56275bd07558fa1b3a67e76c343d4368803ff8c806872e1fe7351667848640b722de86c5cac410d76e02d69a5adb764a942aafa180e22c4d79d7c90533e6e SHA512 8214a366eeb208c3f05302ec0f35a0bc9fb500951d102faa3010c0b8dc005d2d4a04609efd89351c76984ed18b0013e16367a0d257d809b667f69f981164dd46
 EBUILD openrc-0.43.5.ebuild 5005 BLAKE2B a3725838bfd17681923474879383e3ec0b08cea121ea1e0c7ec62c83f726ac5deb35d82143217f7a2ffca3190ee058accfe770b89c1a3294be65a394c7c3b5e3 SHA512 f0fe7ceaf9a2066abe235fc6bd857045c354a4e33c2e9e41c2a65f02e03364ff6fc331a1b6f41627da9edcddf4b9f72bc2af1f31c711a9dafe3d6c3b4c8ae277
 EBUILD openrc-0.44.5.ebuild 4534 BLAKE2B c9e833d7b41f15e76dc1877493f06567d22bfcab7f9e62abaa30b8540b1d2d46fa83098259368ffd3ab2b93881f973d4335128c1ed70b937d465ec611c0e27db SHA512 0cc39723a7bf28ef6bcdda6893ac8ce1f3c06050f6754afeb81832635d56525c28d0af4d479b8d3199792e084165f515b32eab3747cb64a635cc552087550fb5
+EBUILD openrc-0.44.6-r1.ebuild 4587 BLAKE2B 166de8659e2af23277ac62880e0bed31bcc59c28a774c63e94523f2e0523ccb5ba4708962df4533c1b876d74484d79d282831f457d698ca2d9c725966c084619 SHA512 505249633af31bab11d0fbbf01f618286ca9d8fcc587403a3348b47c2373b6aea9ac8afd94da771dca6d80fb50245874c2bfd9ef5b1be8c2a71380e39b980ab2
 EBUILD openrc-0.44.6.ebuild 4534 BLAKE2B c9e833d7b41f15e76dc1877493f06567d22bfcab7f9e62abaa30b8540b1d2d46fa83098259368ffd3ab2b93881f973d4335128c1ed70b937d465ec611c0e27db SHA512 0cc39723a7bf28ef6bcdda6893ac8ce1f3c06050f6754afeb81832635d56525c28d0af4d479b8d3199792e084165f515b32eab3747cb64a635cc552087550fb5
+EBUILD openrc-0.44.7.ebuild 4534 BLAKE2B c9e833d7b41f15e76dc1877493f06567d22bfcab7f9e62abaa30b8540b1d2d46fa83098259368ffd3ab2b93881f973d4335128c1ed70b937d465ec611c0e27db SHA512 0cc39723a7bf28ef6bcdda6893ac8ce1f3c06050f6754afeb81832635d56525c28d0af4d479b8d3199792e084165f515b32eab3747cb64a635cc552087550fb5
 EBUILD openrc-9999.ebuild 4535 BLAKE2B 7320f6dc00ac1df21449846c389bc6cba8797da82bebb2b2055eb83e79351e593a0a9137222dca1f02de05ca6e1fe86f05531c51793aff2f0ee3376bc35ef91d SHA512 e59d13f838fbf466855c6049f8d743c952aa22cb97f1c617aff167db36069fc1e5c6aac283aa4920c33ca95ec2f0ec3598b1501c5aaf06cb8bbec69d8129031f
 MISC metadata.xml 707 BLAKE2B 713b69a4e4d6a61051c9f6dfda46da3afa62c590c62b4f371f3949140eaecfa665a977091ac858bff99380dfc3758038ee6a96b0c8b88c142e2e751b20318fba SHA512 5260e1aec8973d42bf059b1f20b3a5f95b98608efeac614d46b20d774a3453c25348cea4a45d745abe829ad016dbc524080c482c1666032e969e08fefe1efc37
diff --git a/sys-apps/openrc/files/openrc-0.44.6-fix-checkpath.patch b/sys-apps/openrc/files/openrc-0.44.6-fix-checkpath.patch
new file mode 100644
index 000000000000..e1ef97d981dc
--- /dev/null
+++ b/sys-apps/openrc/files/openrc-0.44.6-fix-checkpath.patch
@@ -0,0 +1,33 @@
+From cc45b55f895d0c21b5ac3e5a65b0bf00f76adeb7 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 8 Oct 2021 04:52:55 +0100
+Subject: [PATCH 1/2] checkpath: fix allocation size of path buffer
+
+strlen's return value isn't enough to be used
+directly for (x)malloc; it doesn't include
+the null byte at the end of the string.
+
+X-Gentoo-Bug: 816900
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/816900
+Fixes: #459
+Fixes: #462
+---
+ src/rc/checkpath.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/rc/checkpath.c b/src/rc/checkpath.c
+index bab22692..c4dd7d9d 100644
+--- a/src/rc/checkpath.c
++++ b/src/rc/checkpath.c
+@@ -151,7 +151,7 @@ static char *clean_path(char *path)
+ 	char *ch;
+ 	char *ch2;
+ 	char *str;
+-	str = xmalloc(strlen(path));
++	str = xmalloc(strlen(path) + 1);
+ 	ch = path;
+ 	ch2 = str;
+ 	while (true) {
+-- 
+2.32.0
+
diff --git a/sys-apps/openrc/openrc-0.43.5-r1.ebuild b/sys-apps/openrc/openrc-0.43.5-r1.ebuild
new file mode 100644
index 000000000000..98648ccc0246
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.43.5-r1.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic pam toolchain-funcs
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit bash debug ncurses pam newnet prefix +netifrc selinux sysv-utils unicode"
+
+COMMON_DEPEND="
+	ncurses? ( sys-libs/ncurses:0= )
+	pam? ( sys-libs/pam )
+	audit? ( sys-process/audit )
+	sys-process/psmisc
+	!<sys-process/procps-3.3.9-r2
+	selinux? (
+		sys-apps/policycoreutils
+		>=sys-libs/libselinux-2.6
+	)
+	!<sys-apps/baselayout-2.1-r1
+	!<sys-fs/udev-init-scripts-27"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	bash? ( app-shells/bash )
+	!prefix? (
+		sysv-utils? (
+			!sys-apps/systemd[sysv-utils(-)]
+			!sys-apps/sysvinit
+		)
+		!sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] )
+		virtual/tmpfiles
+	)
+	selinux? (
+		>=sec-policy/selinux-base-policy-2.20170204-r4
+		>=sec-policy/selinux-openrc-2.20170204-r4
+	)
+	!<app-shells/gentoo-bashcomp-20180302
+	!<app-shells/gentoo-zsh-completions-20180228
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.44.6-fix-checkpath.patch
+)
+
+src_prepare() {
+	default
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
+	fi
+}
+
+src_compile() {
+	MAKE_ARGS="${MAKE_ARGS}
+		LIBNAME=$(get_libdir)
+		LIBDIR=${EPREFIX}/$(get_libdir)
+		LIBEXECDIR=${EPREFIX}/lib/rc
+		MKBASHCOMP=yes
+		MKNET=$(usex newnet)
+		MKSELINUX=$(usex selinux)
+		MKSYSVINIT=$(usex sysv-utils)
+		MKAUDIT=$(usex audit)
+		MKPAM=$(usev pam)
+		MKSTATICLIBS=no
+		MKZSHCOMP=yes
+		OS=Linux
+		SH=$(usex bash /bin/bash /bin/sh)"
+
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+export BRANDING="Gentoo Linux"
+	export DEBUG=$(usev debug)
+	export MKTERMCAP=$(usev ncurses)
+
+	tc-export CC AR RANLIB
+	emake ${MAKE_ARGS}
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+
+	keepdir /lib/rc/tmp
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/etc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	if use pam; then
+		# install gentoo pam.d files
+		newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+		newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+	fi
+
+	# install documentation
+	dodoc ChangeLog *.md
+	if use newnet; then
+		dodoc README.newnet
+	fi
+}
+
+pkg_preinst() {
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"/etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+	return 0
+}
+
+pkg_postinst() {
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	# Added for 0.35.
+	if [[ ! -h "${EROOT}"/lib ]]; then
+		if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib
+		fi
+	fi
+
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
+		ewarn " net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn "Or, you have the option of emerging openrc with the newnet"
+		ewarn "use flag and configuring /etc/conf.d/network and"
+		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+		ewarn
+	fi
+
+	if use newnet && [ ! -e "${EROOT}"/etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
+		ewarn "as soon as possible. Not doing so could leave you with a system"
+		ewarn "without networking."
+		ewarn
+	fi
+}
diff --git a/sys-apps/openrc/openrc-0.44.6-r1.ebuild b/sys-apps/openrc/openrc-0.44.6-r1.ebuild
new file mode 100644
index 000000000000..4886ab05cc4a
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.44.6-r1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic meson pam toolchain-funcs
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/"
+
+if [[ ${PV} =~ ^9{4,}$ ]]; then
+	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/OpenRC/openrc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit bash debug ncurses pam newnet +netifrc selinux sysv-utils unicode"
+
+COMMON_DEPEND="
+	ncurses? ( sys-libs/ncurses:0= )
+	pam? ( sys-libs/pam )
+	audit? ( sys-process/audit )
+	sys-process/psmisc
+	!<sys-process/procps-3.3.9-r2
+	selinux? (
+		sys-apps/policycoreutils
+		>=sys-libs/libselinux-2.6
+	)
+	!<sys-apps/baselayout-2.1-r1
+	!<sys-fs/udev-init-scripts-27"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	bash? ( app-shells/bash )
+	!prefix? (
+		sysv-utils? (
+			!sys-apps/systemd[sysv-utils(-)]
+			!sys-apps/sysvinit
+		)
+		!sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] )
+		virtual/tmpfiles
+	)
+	selinux? (
+		>=sec-policy/selinux-base-policy-2.20170204-r4
+		>=sec-policy/selinux-openrc-2.20170204-r4
+	)
+	!<app-shells/gentoo-bashcomp-20180302
+	!<app-shells/gentoo-zsh-completions-20180228
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-checkpath.patch
+)
+
+src_configure() {
+	local emesonargs=(
+	$(meson_feature audit)
+	"-Dbranding=\"Gentoo Linux\""
+		$(meson_use newnet)
+		-Dos=Linux
+		$(meson_use pam)
+		$(meson_feature selinux)
+		-Dshell=$(usex bash /bin/bash /bin/sh)
+		$(meson_use sysv-utils sysvinit)
+		-Dtermcap=$(usev ncurses)
+	)
+	# export DEBUG=$(usev debug)
+	meson_src_configure
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	meson_install
+
+	keepdir /lib/rc/tmp
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/etc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	if use pam; then
+		# install gentoo pam.d files
+		newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+		newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+	fi
+
+	# install documentation
+	dodoc ChangeLog *.md
+}
+
+pkg_preinst() {
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"/etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+	return 0
+}
+
+pkg_postinst() {
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	# Added for 0.35.
+	if [[ ! -h "${EROOT}"/lib ]]; then
+		if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib
+		fi
+	fi
+
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
+		ewarn " net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn "Or, you have the option of emerging openrc with the newnet"
+		ewarn "use flag and configuring /etc/conf.d/network and"
+		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+		ewarn
+	fi
+
+	if use newnet && [ ! -e "${EROOT}"/etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
+		ewarn "as soon as possible. Not doing so could leave you with a system"
+		ewarn "without networking."
+		ewarn
+	fi
+}
diff --git a/sys-apps/openrc/openrc-0.44.7.ebuild b/sys-apps/openrc/openrc-0.44.7.ebuild
new file mode 100644
index 000000000000..8edadaf9e4e1
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.44.7.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic meson pam toolchain-funcs
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/"
+
+if [[ ${PV} =~ ^9{4,}$ ]]; then
+	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/OpenRC/openrc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit bash debug ncurses pam newnet +netifrc selinux sysv-utils unicode"
+
+COMMON_DEPEND="
+	ncurses? ( sys-libs/ncurses:0= )
+	pam? ( sys-libs/pam )
+	audit? ( sys-process/audit )
+	sys-process/psmisc
+	!<sys-process/procps-3.3.9-r2
+	selinux? (
+		sys-apps/policycoreutils
+		>=sys-libs/libselinux-2.6
+	)
+	!<sys-apps/baselayout-2.1-r1
+	!<sys-fs/udev-init-scripts-27"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	bash? ( app-shells/bash )
+	!prefix? (
+		sysv-utils? (
+			!sys-apps/systemd[sysv-utils(-)]
+			!sys-apps/sysvinit
+		)
+		!sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] )
+		virtual/tmpfiles
+	)
+	selinux? (
+		>=sec-policy/selinux-base-policy-2.20170204-r4
+		>=sec-policy/selinux-openrc-2.20170204-r4
+	)
+	!<app-shells/gentoo-bashcomp-20180302
+	!<app-shells/gentoo-zsh-completions-20180228
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_configure() {
+	local emesonargs=(
+	$(meson_feature audit)
+	"-Dbranding=\"Gentoo Linux\""
+		$(meson_use newnet)
+		-Dos=Linux
+		$(meson_use pam)
+		$(meson_feature selinux)
+		-Dshell=$(usex bash /bin/bash /bin/sh)
+		$(meson_use sysv-utils sysvinit)
+		-Dtermcap=$(usev ncurses)
+	)
+	# export DEBUG=$(usev debug)
+	meson_src_configure
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	meson_install
+
+	keepdir /lib/rc/tmp
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/etc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	if use pam; then
+		# install gentoo pam.d files
+		newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+		newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+	fi
+
+	# install documentation
+	dodoc ChangeLog *.md
+}
+
+pkg_preinst() {
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"/etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+	return 0
+}
+
+pkg_postinst() {
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	# Added for 0.35.
+	if [[ ! -h "${EROOT}"/lib ]]; then
+		if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib
+		fi
+	fi
+
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
+		ewarn " net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn "Or, you have the option of emerging openrc with the newnet"
+		ewarn "use flag and configuring /etc/conf.d/network and"
+		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+		ewarn
+	fi
+
+	if use newnet && [ ! -e "${EROOT}"/etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
+		ewarn "as soon as possible. Not doing so could leave you with a system"
+		ewarn "without networking."
+		ewarn
+	fi
+}
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 1985af1a26ac..77bf1c474f61 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -5,6 +5,8 @@ AUX pcscd-init.7 408 BLAKE2B 54e4995a169b7f816b0de9b409ae94a8328e792b50872d58398
 AUX pcscd-udev 330 BLAKE2B 50e99953aec238fe98c6aee5219d3978b44d37c90ce74c9cb8e19b37c8677001e9b1b3701df8246bf051c6cf8b5c971f86bf1f580bfcbff270b8937328ca887d SHA512 06b672135fda9f83af4f030ff8078f8e1194ced529334c17c1a93f81ee9a5d4448bcea5ffec398f01d957a6607fbde7f69fbc23d727bb3ffad48a305cefe5c26
 DIST pcsc-lite-1.9.0.tar.bz2 755963 BLAKE2B 30d027ac61aba1f57224c88ffc4ec8568dcc2747f3f7e24be07e7ce52bd23ad7a71b6a2f78d912f827a4c02a22c13ff16bc1450c02bafd92bc87ac0e34a2bbcb SHA512 35c85b15ab54c14403a080d6671b3d986910372651d46a5477111172d42c6d2cf58f4a3ce95427e7a84f6b4d3bee30ea57bf69b855f753160a3c6e72f93e34f3
 DIST pcsc-lite-1.9.1.tar.bz2 763525 BLAKE2B b85364f5e2a92450b020bfc28439774c6a6ffb9016ea4072d1925fbc1cef76cd370b298c0b414ba322205d859018308bd7101ef89c5b6f96b97e4f223035ac35 SHA512 4f59ea6acb5b258092018f10609987e12b8e601049e6ffed4b4b82abd3c4b35c38a60e1cda28fdc884202e694d1bc3a3b5d930c5b1e9c1b9c309bd17ef463e63
+DIST pcsc-lite-1.9.4.tar.bz2 776581 BLAKE2B fb870fab3bfc7ae372a62c678a0321445f14c36c84c4fff8b7bf4e17f14b64575128fdcf7c8642cd03cb3586d6846845196a93d02b037090f49b88bbee896caa SHA512 d812fd4c6e906f277a73863c4170d96c30245c5fd0a8329e78923533320d71c6591b3f282695bcd69823c8cc381d8d438736bb7ab2262ab24c9d89434368659e
 EBUILD pcsc-lite-1.9.0.ebuild 3167 BLAKE2B 9172b138a531936e2de9bd0d9d961d252f88d57950ae414b6ea3816f0d25f60406ede13d3d1e17159bf33681d7294526e9778f42a10292aaf846a70c6978c208 SHA512 baacae6682f43ce2ab5d89c5e278d11cc9cc5420d14821bbaa7b03e000884953d9aa1cda9df634d090444ba16af9fb7e2ed7e12d5b6d568ab4808960f5ee16da
 EBUILD pcsc-lite-1.9.1.ebuild 3181 BLAKE2B 5d67ccc4a2705aa85746347ff32f6d15e6613ea40ea244d7c810061a3dd5c023606f070b6d73544e4ef9f86ddfe4444e37c335177d65eb2a02ba06d4abb8ce0a SHA512 c8fee2822eada5dd7cbbe334be1ca72318a009fde315c8dc46fb9380f8f76a0965445bfc858bbadff1baae6bf80353223b59eb4990c9097970d8d891d07f9a02
+EBUILD pcsc-lite-1.9.4.ebuild 3177 BLAKE2B fd18ffc059482439a4a8e3f098687824a7b65d6905de5fa33da384459234dad3a17af1f3028f47e0f26c2017d4e510310cf6c7d0d1155880dadfe3354491d343 SHA512 3a0e0cdef7ee44ee9fc4fb80cdea1bdad870278eafa292236387c711d80d3205f6a898384ca7d58839c55bc521479fa9bbe27b331e5abd3f4e87c6cd0e298761
 MISC metadata.xml 1083 BLAKE2B 8dc3fe1bbd660b4ea9db99fb8f82b905843d96005928f42aa4007e13aa6e0a75af83f1552b434136c8584b98ddae6a0c68776fbb1096da29433864536405fdf3 SHA512 da7d9e3842429795970dd73ffab39e031188e6fd585d144e6348007c55eeb67dcb8e5e04aea1115796f73ff1d455887e0c00301da2b9e689551fef8144c2f388
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.9.4.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.9.4.ebuild
new file mode 100644
index 000000000000..8ff5b8ae62e2
--- /dev/null
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.9.4.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python{3_8,3_9} )
+
+inherit python-single-r1 systemd udev multilib-minimal
+
+DESCRIPTION="PC/SC Architecture smartcard middleware library"
+HOMEPAGE="https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC"
+
+SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
+
+# GPL-2 is there for the init script; everything else comes from
+# upstream.
+LICENSE="BSD ISC MIT GPL-3+ GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+# This is called libusb so that it doesn't fool people in thinking that
+# it is _required_ for USB support. Otherwise they'll disable udev and
+# that's going to be worse.
+IUSE="doc embedded libusb policykit selinux systemd +udev"
+
+REQUIRED_USE="^^ ( udev libusb ) ${PYTHON_REQUIRED_USE}"
+
+# No dependencies need the MULTILIB_DEPS because the libraries are actually
+# standalone, the deps are only needed for the daemon itself.
+DEPEND="libusb? ( virtual/libusb:1 )
+	udev? ( virtual/libudev:= )
+	policykit? ( >=sys-auth/polkit-0.111 )
+	acct-group/openct
+	acct-group/pcscd
+	acct-user/pcscd
+	${PYTHON_DEPS}"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-pcscd )"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch
+)
+
+DOCS=( AUTHORS HELP README SECURITY ChangeLog )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-maintainer-mode \
+		--enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
+		--enable-ipcdir=/run/pcscd \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		$(use_enable doc documentation) \
+		$(multilib_native_use_enable embedded) \
+		$(multilib_native_use_enable systemd  libsystemd) \
+		$(multilib_native_use_enable udev libudev) \
+		$(multilib_native_use_enable libusb) \
+		$(multilib_native_use_enable policykit polkit)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	newinitd "${FILESDIR}"/pcscd-init.7 pcscd
+
+	if use udev; then
+		exeinto "$(get_udevdir)"
+		newexe "${FILESDIR}"/pcscd-udev pcscd.sh
+
+		insinto "$(get_udevdir)"/rules.d
+		newins "${FILESDIR}"/99-pcscd-hotplug-r1.rules 99-pcscd-hotplug.rules
+	fi
+
+	python_fix_shebang "${ED}"/usr/bin/pcsc-spy
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in"
+	elog "the pcscd group, to avoid running as root."
+	elog ""
+	elog "This also means you need the newest drivers available so that the"
+	elog "devices get the proper owner."
+	elog ""
+	elog "Furthermore, a conf.d file is no longer installed by default, as"
+	elog "the default configuration does not require one. If you need to"
+	elog "pass further options to pcscd, create a file and set the"
+	elog "EXTRA_OPTS variable."
+	elog ""
+	if use udev; then
+		elog "Hotplug support is provided by udev rules."
+		elog "When using OpenRC you additionally need to tell it to hotplug"
+		elog "pcscd by setting this variable in /etc/rc.conf:"
+		elog ""
+		elog "    rc_hotplug=\"pcscd\""
+	fi
+}
diff --git a/sys-apps/progress/Manifest b/sys-apps/progress/Manifest
index 722345fe8a82..1ccd974a315c 100644
--- a/sys-apps/progress/Manifest
+++ b/sys-apps/progress/Manifest
@@ -1,3 +1,3 @@
 DIST progress-0.15.tar.gz 58549 BLAKE2B a75d9b4cb965419cc1677ff80d1990c2b2069031e71e982ff6e83381cbac53aee37e9cc22984e132929c0502dc89f860022def62b886e7b6122f2111aa314fc6 SHA512 8b446d04e156b8d3d905caf9a8c9eac2ff2d24ca3b118ebdf6b2aa9f9f99d0d219c026020c33bc3f2fff936f4a29d95f89fe1cbc1ab66b7b33f5e32bf18710ca
-EBUILD progress-0.15-r1.ebuild 591 BLAKE2B ed72cfda89caacafd3670c75e5277ec6ebb044e3c7bfb4b8889bf7d99515cef15b0568cc41f00ce370a025f86dc94689d0ddcbb8ee9a11aa38f1d064de564bf1 SHA512 5019e992a0a5a5597e29d62f566540f25127a1d53172ec71ccc7e677b44a8f1fdd38c7def686fefc653e7e70eebceace83553c3b772b89e7172e2c3b947066de
+EBUILD progress-0.15-r1.ebuild 603 BLAKE2B 13889ceb6a1c988a53a73f31f3e73dd468a3ac4b2ad7feb4837bde5542a022898f5e131ab569acdf3bcb3ca411c328e76d39987dac7672e015515dd1b1d3bc44 SHA512 0eb3bf8abb98102cebf61fa374f940aa98984d459962a3fcfdbffbe88406f38f6e78adac3d5dccb046bee1c806ff26eed43b426db624970ffb57f3fc2e8df141
 MISC metadata.xml 336 BLAKE2B 19a9d6403f36544172a2a88261882161345a4d7f7f90bc053083267a4d4c207f43afa8c4fa28d703c1f0d72a9ea388ee12f35cbcd836a280f9db9c5711bb35d2 SHA512 7fbcf150daa720dd08d18dc1c81076c581920add07297574578deaa441ae88c3f013186e72dbebcee14221609776a9f1170d21ba901bcbe39438febbd4aebc65
diff --git a/sys-apps/progress/progress-0.15-r1.ebuild b/sys-apps/progress/progress-0.15-r1.ebuild
index 7b1766238200..f1294e6e643a 100644
--- a/sys-apps/progress/progress-0.15-r1.ebuild
+++ b/sys-apps/progress/progress-0.15-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Xfennec/progress/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 
 RDEPEND="sys-libs/ncurses:="
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/pv/Manifest b/sys-apps/pv/Manifest
index 8560df761d52..9543c28b6239 100644
--- a/sys-apps/pv/Manifest
+++ b/sys-apps/pv/Manifest
@@ -1,5 +1,3 @@
 DIST pv-1.6.20.tar.bz2 115310 BLAKE2B b50623f623231e8e8615f960bad83d10e12d5274c57d23ea843d16fce30b3e690284b2d9b01f82a16b9790e2bf26f80f560e226589a62ca677a2cf90ea007691 SHA512 e445f91b298ed285ddab54a3f8a6b5d5297e2e2eb8ad7b2ee2cbacca4adda9c6ca2bf3c77bf2a93373d3875c5b3b0b345d3945cbd91fc2647c6c25f1661a6752
-DIST pv-1.6.6.tar.bz2 109220 BLAKE2B 1cfb60e49f6301f0d990467a58013522bbc1e28e2936a1a2141918af05149b59b6cc494f290d99ee7072247b8f0e230b799cd5dae6f8aa59d116691319e952cb SHA512 cc841b4bd00e4e8fcaed97da094ebac4a11af1c3f843ce5f73d0c3ab20aca29498c6b1a224c653d40127304d8269d96f413df66b980809e9278ff9544c834a26
-EBUILD pv-1.6.20.ebuild 1487 BLAKE2B 444c26d4cdf1a65eb57bd3488e67a215f0015f0ef03ff7206d9498dccc0454a3c0533c68a146190629d435622d9ea423670c82d675eb600d91549dcace0f8a19 SHA512 6d22d56a9505d69d2d4fc6a684e9498bc4be276832af9bd306c97b5b649841e900882666dca94c051ad65de0a43822b3bb2dcb0b9ac8a5e655f78f75c2ac3ac1
-EBUILD pv-1.6.6.ebuild 1379 BLAKE2B 0f3f018c0325aaef297dce38a6ae1917f9b53eb2499f38a020666d5d3da567c18f23ba173af6d805977450a6bf4c01bc25dd340728ad435ed46fb040508621c6 SHA512 f0cf93a3f5ee11c5327e640b3965da60b66115fe293016e7b35f57ea704a65b7dbe4844a2ec4d75176e4aa2901a2d342b1e2ef9485dcc52a6696ac0a730b345a
+EBUILD pv-1.6.20.ebuild 1487 BLAKE2B 922c6e85bab5f80bbe8d3a1b79e8d00b1513ad70423b5ffbf54beabe387bde343fcac3e8189b5178d38522c0e92de382d2e0a962b4d5de4a08775448a99fa501 SHA512 60f73e5601b002d656028440343f46adb55517b6fa373d9953d8817fad4c53ec0972ee0a60166c4fa5a66dc6fc5b37ea2de7151c876c46b4ac82a85f4f689a2c
 MISC metadata.xml 483 BLAKE2B c6240298c7a79c7d5839c593b0139c990477ce67aeb92b585bbb09a07d51bbe9bd75aaeac678ddd81c05cc6f9e36860ad8cfc889204e835019f854477a5bc7bf SHA512 082cac9d7bcff373929e3c0a7af524b65c48cc427755232f981ccd4947466f2f3325a75f691f1bf79e74eebde3e53b4ebd4c904b40affc0d7fbd243f8ab36605
diff --git a/sys-apps/pv/pv-1.6.20.ebuild b/sys-apps/pv/pv-1.6.20.ebuild
index 86f4bf74e302..5d9b8a174726 100644
--- a/sys-apps/pv/pv-1.6.20.ebuild
+++ b/sys-apps/pv/pv-1.6.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.ivarch.com/programs/sources/${P}.tar.bz2"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x86-solaris"
 IUSE="debug nls"
 
 PLOCALES="de fr pl pt"
diff --git a/sys-apps/pv/pv-1.6.6.ebuild b/sys-apps/pv/pv-1.6.6.ebuild
deleted file mode 100644
index 6b7c79cfe1ab..000000000000
--- a/sys-apps/pv/pv-1.6.6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit linux-info toolchain-funcs
-
-DESCRIPTION="Pipe Viewer: a tool for monitoring the progress of data through a pipe"
-HOMEPAGE="https://www.ivarch.com/programs/pv.shtml"
-SRC_URI="https://www.ivarch.com/programs/sources/${P}.tar.bz2"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x86-solaris"
-IUSE="debug nls"
-
-PV_LINGUAS=( de fr pl pt )
-
-DOCS=( README doc/NEWS doc/TODO )
-
-pkg_setup() {
-	if use kernel_linux; then
-		CONFIG_CHECK="~SYSVIPC"
-		ERROR_SYSVIPC="You will need to enable CONFIG_SYSVIPC in your kernel to use the --remote option."
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i configure -e 's|CFLAGS="-g -Wall"|:|g' || die
-
-	# These should produce the same end result (working `pv`).
-	sed -i \
-		-e 's:$(LD) $(LDFLAGS) -o:$(AR) rc:' \
-		autoconf/make/modules.mk~ || die
-}
-
-src_configure() {
-	tc-export AR
-	local lingua
-	for lingua in ${PV_LINGUAS[@]}; do
-		if ! has ${lingua} ${LINGUAS-${lingua}}; then
-			sed -i configure -e "/ALL_LINGUAS=/s:${lingua}::g" || die
-		fi
-	done
-	econf $(use_enable debug debugging) $(use_enable nls)
-}
-
-src_test() {
-	sed -i -e 's:usleep 200000 || ::g' tests/019-remote-cksum || die
-	default
-}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 4137449b17d5..b7bd541d2db1 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -8,6 +8,6 @@ AUX gentoo-systemctl-disable-sysv-sync-r1.patch 821 BLAKE2B f5ef796725e023bb1ed8
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781
 DIST systemd-stable-249.4.tar.gz 10593723 BLAKE2B 466b3cb27c4bc6c85c9ba50f6614175b2c31a4c177d452542faa1395e99511440029b1a093dc80a5a1a0135eed09d8b1849572f36dba4e18a1396230bfc31adb SHA512 5b9ec28102538bc3dcb632ee16389ff20dccf4b723186f6ae2da119a1809d84db0d8bcecf9b75c5e2da8427f5543e1da281bbed1a154e529d8a82ea5128c465c
-EBUILD systemd-249.4-r4.ebuild 15113 BLAKE2B 0763088cbb5f3b1f1fff8f17f0596f37d43f4a9d9bec7c6fab0eb09d8140848bd65c47449ad69d86398dd52a6bc3eb822dcc1a6f9044e3523b4b9eb2fad5ec59 SHA512 b649eebb835a2b04ae6ee23e0577a9f0f6e4f11214e32251a9a951c23e9c8635c36eddbac4c6766344c1f1924b162a505a30c76959f7ff54b4eaaa7363656807
-EBUILD systemd-9999.ebuild 14959 BLAKE2B 5c7c194f8c77192ebeac60008869d391bbb244e365049b04b67ecf8aa65d22eb75332ccdb891259f410bc18105751c3833ddee6338be7916c4040e1ffa218563 SHA512 4d55ba26f3cb034504f809e7ead7d5f271f3b47550def41ec96fbb877c45b847763af3182c29afff8e4f54906709f83c2384958fcaa9d92f04695c21720131d7
+EBUILD systemd-249.4-r4.ebuild 15099 BLAKE2B 7076124a49b1beeb8153cbca7868a1e828cb0ae9b2c0e5e3fa60db5473f2f1d3870a7010d5b9dda71acb81d98cff970758595d32b2944761c4f59dcd7f65463f SHA512 e4be3bdf1c30aa36b02ffcda10502371543bc616988ad8cd558651f01efc55a813532af9ad42590e13831be8025f674af273e0001fe670929b9442319c812bf2
+EBUILD systemd-9999.ebuild 14945 BLAKE2B b427e2f0c2fc28fe9d67432426dbcc2aa83893aae17c9cdf3ca25dfebb0b3e8ef194ab6964bdc8d7a71afb8f0b6e509ad15579889dd8d8c9c9fc4ff7a8df3d01 SHA512 16aac9a616c40e08414f71a704f3866ef98d830fb0751fc503e719e184b42334b5a4f43a940034f48372ccbbecff4218886c2d4ec26d636e63e1fc8f46081c5a
 MISC metadata.xml 2468 BLAKE2B 62d58ff16df9bc0ea157279e4fe750cff42d02bc61a8d545671adf01da4de5359184a3247c2423b49fd9a104efdbdc879fe5a4e46f5ddc5810d6046cf8896473 SHA512 99408e7635e3deb8ceb2c58a56632d0ee1947865729b56eca9ce6626e61ef201c5b42e9d4baf6784bd6021380f8d592b01be00ea488ce475310be63c3501407c
diff --git a/sys-apps/systemd/systemd-249.4-r4.ebuild b/sys-apps/systemd/systemd-249.4-r4.ebuild
index e0cb67e37c96..01503d4fcf00 100644
--- a/sys-apps/systemd/systemd-249.4-r4.ebuild
+++ b/sys-apps/systemd/systemd-249.4-r4.ebuild
@@ -177,7 +177,7 @@ pkg_pretend() {
 		fi
 
 		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~KCMP ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
 			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
 			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
 			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index fa00fa787b42..8348517478b6 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -177,7 +177,7 @@ pkg_pretend() {
 		fi
 
 		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~KCMP ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
 			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
 			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
 			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
diff --git a/sys-apps/yarn/Manifest b/sys-apps/yarn/Manifest
index 4d2ed880ae4b..63cd755379ca 100644
--- a/sys-apps/yarn/Manifest
+++ b/sys-apps/yarn/Manifest
@@ -1,7 +1,7 @@
 DIST yarn-v1.22.10.tar.gz 1244965 BLAKE2B 6a9471a6905d89481665c099f00a985daacc8c7953327ee12b3d70f3f42dc304ceca01446281964d1af7a005ecae4a12ca55df637732e52821b4ecb9cdce6418 SHA512 d75dccd318f280abcbfd8d78b63546e11e7a8459c5dd737d0c8da2742cd5d7e3d7a5e668ce680234b0c09e71d128787777061d24c6e3ae4b6626086461e3ce25
+DIST yarn-v1.22.17.tar.gz 1246198 BLAKE2B ae0b86cdb248a0f81d1a4a23d15ef9aab185fcda7ef7f8873959c3e54dfc305219afb2416264911098c4e3a6a65a33d248ff97c8e0ca043b118de64e003c3d9b SHA512 1f4a76e35057687d1437d21e1fffd14fcdad9793df36b695a52a44a16f844fb966a29342eb5799f80f880ef53c14ce86a39bf1d7ad929dc0cbf09d598d106b89
 DIST yarn-v1.22.4.tar.gz 1244785 BLAKE2B 1f1eeb829096eaf19a8fdb48b46fa736769d9d3c247759e434413665186e4cccb750024afa836dae8a0130fc472df3c01805d263d81346e1dd7509e1b106e88a SHA512 a1833b862fe52169bd6c2a033045a07df5bc6a23595c259e675fed1b2d035ab37abe6ce309720abb6636d68f03615054b6292dc0a70da31c8697fda228b50d18
-DIST yarn-v1.22.5.tar.gz 1244837 BLAKE2B cf5054893c8937ceb6788c27f23005386449664b36dc31c6c0c3548438f1fdc5c5ec4b1b1642786c4d8732faf46ab58d2784d3768e12233f241b9b1c6f173734 SHA512 c33c040ed57eb05c04905b8996db31a34099f0c18dbf1818959c5592514abc99f1180592561ec5d3e760c084dbcf2dcdf3ebb4fe8918f082b6aa089cf10921bb
 EBUILD yarn-1.22.10.ebuild 1069 BLAKE2B 362375e59c35e3a4a8c8d8990bbc9662ac2a0da9ce389007b824c8cd2c6369dce2e6a4ddd3bb85934a689829b9dcbdb74fd35bff11d00f26eb88546af5e86eac SHA512 7886b477b9e87d0c7cc67d219693564d17ec018c391f99ce874ffe0726bb9c5e9137755af58bac5151238e8099096ca246c644c29c08adf2d681a6df28c08f2f
+EBUILD yarn-1.22.17.ebuild 1070 BLAKE2B 930b0fa3571b98ec24310ba4e15677191c2fe01682a9144a72dc00ae72c6f1f5056f5a23e11839fa35fdb8caa56e3a8c9f91e5a47b76c2bb02c74ccb40e888e4 SHA512 f1dc152e76face546f46a622fffe23894d4569c1f66e239efd130b5aa50e9ede28bfa7fcf8597ab84870ee5a5bb75b0f1b2459cb5ee5dd10db57ba67b4016e97
 EBUILD yarn-1.22.4.ebuild 1057 BLAKE2B 40ca4f1e345f8914a672817c21b0a5974ac314b9bc10f54937dd7d607f492725e7e41632d4b75a0ab62b43607a2aa90b6f2ea83b4a1844ae098f0f12cefc7b45 SHA512 a50ec0902a9a509918b979a634350e048d9ba5f768cceab11b1b2af08076aaa85cd2e22174934f010330eb9ce0c08402ac77cfb7a58d6e33d7162e27784c261b
-EBUILD yarn-1.22.5.ebuild 1058 BLAKE2B cc521c197011573800b7671b187d0f5507df0dfb9283f4f5355cb29fc9c1f72a7e5e34589928bab4fea27a2d26f735b6274b011486efa70c6f347ff51327c4cd SHA512 ccdce002d42bd31f614e92bb8703eeba3c713504b1e2feb03120d76c35475328ff40772c1b3b237c48e87e09a86f4ba149bf3f38aed3d52a3a6f303b33621dc4
 MISC metadata.xml 685 BLAKE2B 9957b4bfeb2729a4cb8bb0f717a431fb0713e5b198565245037369c6f7892ef3a51aee4b5fc650b91728baa49ef5d05b518a3f0b0f52897de861fc57c275d386 SHA512 ba7ecb814fb0888255afb243394f55cb7c4489fa5c8843c1ea6f9e0c24f21c30247a39150f1cfc51aed86010201f2f201d9fd9c09e7ce93b6d498a4a3f3c16d1
diff --git a/sys-apps/yarn/yarn-1.22.5.ebuild b/sys-apps/yarn/yarn-1.22.17.ebuild
index 706453936e75..1c2aa5d2cfdf 100644
--- a/sys-apps/yarn/yarn-1.22.5.ebuild
+++ b/sys-apps/yarn/yarn-1.22.17.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://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 RDEPEND="!dev-util/cmdtest