gentoo resync : 05.12.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-12-05 02:47:11 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2021-12-05 02:47:11 +0000
commit: 2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch)
tree: c8af0fd04194aed03cf067d44e53c7edd3e9ab84 /sys-apps
parent: e9d044d4b9b71200a96adfa280848858c0f468c9 (diff)
130 files changed, 1967 insertions, 1322 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 6ef6af0595f5..3be685f3d1e5 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 690179c75aa6..f268103b142d 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -2,7 +2,7 @@ DIST baselayout-2.7.tar.bz2 30317 BLAKE2B 7b7c284b7d0a9608a0d03dbde0d62d793829b6
 DIST baselayout-2.8.tar.bz2 30236 BLAKE2B 0bac62dd5585f1f550da8c99d06a7f8ab6cdd473b0499a8f0ac58a5c43e3883b42adb7f80c172d894fae93a6ddb6fec7a65cad9897f4a2532b481c82065ed96b SHA512 506d7cc8399b530eabc9ba2d16cbb6c024350f9487a2a9168c670cee9876f62e5a716942f698c4883013d6ccc9591c2d7fc2ac9d782f0ce8d724371ca94c739a
 EBUILD baselayout-2.7-r1.ebuild 10197 BLAKE2B 5e5f767f37bdf286cd77d21512a855e1e2f5f26fd794838e3cb21634f089b66cefc4e915c9e88148f0e1f2a0067a57bfb029833572614c0190d54f862ff15659 SHA512 847e2ddae301a856b7719fe9134635ea79f0059107188aad8c554fda4da428f970a2ad4daf56491050acacd822175fa8ae18f22402e19677df9d920c525ce737
 EBUILD baselayout-2.7-r2.ebuild 10184 BLAKE2B febfaf2d2a646358c20e12039cd3b224a2fbcf5c12b566e8b33927fa5549b3f0d5b76392bf36cdefe7b14f84bf89b5caff5004ce54b862d238d5928d69526e87 SHA512 a5a45b479dfeac5212291d3d8053c822d06a45d8f82d24f8937b15bd3bf5fd6953ec3520121df243cea2cea52ea8d56894d27b03a272c85ca21ff52190551d8b
-EBUILD baselayout-2.7-r3.ebuild 11291 BLAKE2B f2794d10f18c74e358ce1e6fc1a9c3e29b7ab7b0cb0d656a53f990781707b29b9e173b96044c9c9e9c8d35b7b020624ad8e9d1bec1cd6b72f287e8c8759dc1cb SHA512 3eaec1f7a1bfd85dd26ad62b3756a7460e890cc893c6967aded70d85df722865664235924c6cbdb7d9be3572e94d059cf1df6a2b240a1e9923b3533ac68906eb
+EBUILD baselayout-2.7-r3.ebuild 11283 BLAKE2B d3385c5d78b3613708e94772e3ca8514780964889e3ae61573e6a8a2aa7c2d1d600492da5445349f75f6714958d3f5d0a801a72f037d87b958d3001c9ba28422 SHA512 6b85da4fdad76046162d4172c9d65feef93bac3e8827439b6362d7273b2e2564e51a5f40eea2fc1cb58f165194b507e048487f2ea85a6cd642636358f0e0bf80
 EBUILD baselayout-2.7.ebuild 10024 BLAKE2B 490416f9367b1236ac8879b273acc2920f77f1fb23edba5bc825358270f434e0facb8f2794baebce5841b2be2ee3a4da5fffa026585555902e582ff36ab37bd3 SHA512 6a629e68f58d23f8d9653bccca3ad6d52610bd87ab73c5d6b12c9b6e9762f34f2deb452d689c99ea4d66f1c4dbe88e13991f1b2ea900720fd8c8d92067aaca71
 EBUILD baselayout-2.8.ebuild 10904 BLAKE2B 5321408ff9d87d35030ab117881e167a623a49559fdad536244df844bc0883d75d81c3da522bf0f0bed519fc7c62ea1d967dc0e8880298fec6f0b0b8e248eb6c SHA512 640770bd69a2c521cecd97cee93340c1bae9f6c92b8bcefa08de33cdfdcfa52cbdfa0562d44d1efa6922f132d5bd3a6b7e6463da6ecc259528c8a73ca0b2db8b
 EBUILD baselayout-9999.ebuild 10904 BLAKE2B 5321408ff9d87d35030ab117881e167a623a49559fdad536244df844bc0883d75d81c3da522bf0f0bed519fc7c62ea1d967dc0e8880298fec6f0b0b8e248eb6c SHA512 640770bd69a2c521cecd97cee93340c1bae9f6c92b8bcefa08de33cdfdcfa52cbdfa0562d44d1efa6922f132d5bd3a6b7e6463da6ecc259528c8a73ca0b2db8b
diff --git a/sys-apps/baselayout/baselayout-2.7-r3.ebuild b/sys-apps/baselayout/baselayout-2.7-r3.ebuild
index c83d1da82dc4..a734733f48f8 100644
--- a/sys-apps/baselayout/baselayout-2.7-r3.ebuild
+++ b/sys-apps/baselayout/baselayout-2.7-r3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/bleachbit/Manifest b/sys-apps/bleachbit/Manifest
index f8aa293564aa..7d53f608a0e7 100644
--- a/sys-apps/bleachbit/Manifest
+++ b/sys-apps/bleachbit/Manifest
@@ -1,5 +1,5 @@
 DIST bleachbit-4.2.0.tar.bz2 606223 BLAKE2B c45a11db556b9c3e3a19583bfaa633244e2ea2e374ec8b883cba486126cfb33617cd7930af79d379711980ad4b56426b39a3e68532462be1918da1386369d137 SHA512 6d43da42c6a2a328c8fb766a3f00f4511e72a00836316c279c8dc3a24468abb4c2ce909b42c568ee0b8417c08827c7cb79ae197ae693b8d6ce60faf22422effb
-DIST bleachbit-4.4.0.tar.bz2 640690 BLAKE2B 577b5498eeb25c499753468fd6d20fa398423ee0f36837069ecd3c6e32d20686bdf2e41492d8b082551ad373266f98963d900bc68042dc0715a5f509945be352 SHA512 ad117a790803dc405752a4582b735351842305603de7ea9d98b0d59d93e8f75e18d7125958c1cb907891098f79502ebe5a560191384036506ac4ea66694f93af
+DIST bleachbit-4.4.2.tar.bz2 653525 BLAKE2B ae65e310d33c2e523244a32de1ff28081be940a6a2ed2aadf682218ebe7346de3b5f37ab457d4f16542730d617678effbcda461e7080c43cd81c17f6b959018d SHA512 247a1ed0e491e5e02c4bc9a5c2d11d5f1511ef9644b9edf34b1c9326e6515c33dfd60b98bb2dab59eac36ab5e1c9b5ed1e8d7c749261bde90450a2fc717dae6f
 EBUILD bleachbit-4.2.0.ebuild 1654 BLAKE2B ba53ddfd1efaf007bb5233f4bd66eab1781a8da8f4ddcc4f25e439f0443594ec471a2b1b32ce633efeb9f40ca5eab12b3c8cf563c737149cacca17c2a64d0f39 SHA512 20671f4b91425aad8b8d602e119b1bc2dba34560bc1a20e138ad454effbb78313420fe188ff25ac4b7faf463456f8af678a41c676038a98a657d3ef89fff3055
-EBUILD bleachbit-4.4.0.ebuild 1738 BLAKE2B d24c44d43b78b469383eac541887d92d21fd5f8028db13414ddc9dd4ca3efd508b71697b9ca805b4fba7bb89ef2eaa2c39ec69b9df835686b400121791e393c3 SHA512 53c3ee807a31be866b4f518cc4a3d05d04a5bad954ab0ac61cb5c48f6bbf49911e9f30ff1aa4d8fb08885b724ed3aae676fc0ac7313925c07b6d1c2b18685a53
+EBUILD bleachbit-4.4.2.ebuild 1755 BLAKE2B 7619ad3b2282dd95b9ec83c826b673e6602f762a1c8ef657365154d03f9c83d55b3121492a0c8c6bbe604b8273fd3231503b8923f18cf6b3f2869f969d21f19c SHA512 7835d2ef61864898137ead092184f4e4d9d878436c21569aff4a46d89c084628466e756e982078b9e1031149d5eab5811b02bd821e874179b8fb1495771c83a7
 MISC metadata.xml 557 BLAKE2B 61de1eec1e533aea9a008403d40069d8e7fb3ca2e1217f1ebf8746adf07725bf82011ee6597961443e6474de9908e3b8a70a6aef42439b4aa62a562212846378 SHA512 dc31e0aa896798f20540c5f7119aa7cf60a8ec5e498d8a7a7baf3d73b5287b03083e33f0816d84467acfc221d8bf0dfdeea59734b3048e4194693d63ec453214
diff --git a/sys-apps/bleachbit/bleachbit-4.4.0.ebuild b/sys-apps/bleachbit/bleachbit-4.4.2.ebuild
index 3b1fdfbeb132..72fbae3d20f0 100644
--- a/sys-apps/bleachbit/bleachbit-4.4.0.ebuild
+++ b/sys-apps/bleachbit/bleachbit-4.4.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8,9,10} )
 PYTHON_REQ_USE="sqlite(+)"
@@ -22,6 +22,7 @@ RDEPEND="
 		dev-python/chardet[${PYTHON_USEDEP}]
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
+	x11-libs/gtk+:3
 "
 BDEPEND="
 	sys-devel/gettext
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 43a56e328dc8..5f5bec6d111a 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -19,6 +19,6 @@ DIST busybox-1.34.1.tar.bz2 2476932 BLAKE2B 1f45f58db26ae0bae2eb728db3a7d49680d6
 EBUILD busybox-1.32.1-r1.ebuild 9640 BLAKE2B 1bf881647d58a197e690e068b81aa2522fdbecf69784862b1842d54ea1caedff7fa4d6bec8b69388bd8fbddfdd76d48d36b07b7147ebf7f5368df3219efb135e SHA512 c163d435a5bac776c519a539f1760134973314434e75c84dd9f427ea0a7c5fd9c41216db61444c97931b86a6cb6ae17fdc1f0d1c5f36118fc5006c89a3599b7d
 EBUILD busybox-1.33.1-r2.ebuild 9997 BLAKE2B 361c84459fba9270fc65e727da7cb679f246daf84aadda6fe1e662fefd234fa99fa50d33180311acdcf60cc86b7f081858efe695f8c278ce523afe117a16d242 SHA512 93b3177923c288aa08656a989f6db2d54df8d5208d4728f60a17ecc60122ae6d2a8c2926812f71b961de562fe2946213c80384a9990d71f48bbef2f070768eee
 EBUILD busybox-1.33.1.ebuild 9648 BLAKE2B 59715aafaca840cdac5b941fb5ad66619510b5cffc2fd252c2b1c8068638449c6ea7bff34f7262e64728b39c663185483db6ee74cedea07c669f6a4528ec4741 SHA512 c1b22a7535b4441ed47e53cac5a27dda04a6b58bdc8eaa96de558ae88cb4e2d10d720473284e569d3a93a53f14214566401bf7766c4fa5fe2a4d46a3a3803406
-EBUILD busybox-1.34.1.ebuild 9937 BLAKE2B fb48a1a27b71ca855ec7a0aa450216210316613cfa9bce696fbc0779f6cb0ba633ae102b10324e35a168cfb0b00ce05cf7bc1a61eca45089e61d504988557ac8 SHA512 ea9f0493291b6b1439add09f0d39ebf11c637a264e51432d026148ac667c00df9a9a3d7fe144595d2eeb2d82bd8013c6fcb10cb24f11aca929d053fa485476e5
+EBUILD busybox-1.34.1.ebuild 9929 BLAKE2B 44f8e556dbf7c2c63a3a5068e54d46ef3ac7215702614cd9b04583cb31412a2d5b67f8e4b0fb0e74c86b644eb73f124f6d5e02e5ff52aed3998e56fe5fbdaaea SHA512 dfaf2418c9b70a8ec82e86938469da2aa0a902fadbad99aee7670d55d4651cf363b3f043a8e0ee592085cc6f3e82b171e676edcfd9640ce2807362277633715b
 EBUILD busybox-9999.ebuild 9937 BLAKE2B fb48a1a27b71ca855ec7a0aa450216210316613cfa9bce696fbc0779f6cb0ba633ae102b10324e35a168cfb0b00ce05cf7bc1a61eca45089e61d504988557ac8 SHA512 ea9f0493291b6b1439add09f0d39ebf11c637a264e51432d026148ac667c00df9a9a3d7fe144595d2eeb2d82bd8013c6fcb10cb24f11aca929d053fa485476e5
 MISC metadata.xml 873 BLAKE2B d9c3725e1c3587d497894761d9eda08b670522d5c1a5518ea879cb5c9f222519005d28a36d6dea0b34d4bf4a2352e54aa151177f98ac730ce5b83e87ae4d35a2 SHA512 4c74f718046b41fbcf0111c797d6cdfa1f647914bfa5ff9aaedd6844ba1367722f225ed8ac17717d7b44c5ddc3b450e130da46cc0f6e21501b66cfd267a8f9ad
diff --git a/sys-apps/busybox/busybox-1.34.1.ebuild b/sys-apps/busybox/busybox-1.34.1.ebuild
index 4a2e50fc5d8a..b1a831ef90de 100644
--- a/sys-apps/busybox/busybox-1.34.1.ebuild
+++ b/sys-apps/busybox/busybox-1.34.1.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/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index 3eba6c1d915a..8db439c39eae 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -2,7 +2,7 @@ DIST checkpolicy-3.1.tar.gz 69072 BLAKE2B 31cb5ef52533b0a62f954e770278fc5766a961
 DIST checkpolicy-3.2.tar.gz 69035 BLAKE2B 263c582c8ed3c38822513899f3591edfc5d0132977451503a8b45d2074b5a1c5ce03973353b3ceaad44da913b4e35546cfef1988b68bd517618efdb942f994ec SHA512 133639595c2acc66c02b5a637c5e0c60d80ce2bae04f4a709d9fafabd31f9497d1a6e3334904b985c2a1bd94a7a7e3df782c2af2ae41d1fd79b69156a835edeb
 DIST checkpolicy-3.3.tar.gz 69286 BLAKE2B f22cb1b0dae5a89c0abb500c2f091beda7960493bd0dc3b9cb5bc8d2d08d507870e5db46f53ad87d0ddea5e3bbdb6c721a5c5e6824b37f554049000392af6a6d SHA512 40e7ccd804aa19f229eb76bdaeb79c87ed19004ac7b91674ecfb92d543573dc26f9d456ea25ed1e0ef8e1a69538e41c68b386a0743023f3ea83aa4350fc3ce30
 EBUILD checkpolicy-3.1.ebuild 1149 BLAKE2B beac3751ebcfc7969e662a3cc1b25a266b144db2155a8f469170781d1e6aa515a759d40adecec768e066f6424291e6fd7ed5c3e87f56eb39a309e0e56de45676 SHA512 68682e8384cd6ff456343fdfa611be2bce2e15edb732dc377e8839cd3b1fcf510d914d02c8b2433d34ee6e53fe5cfba46ad0712cdb25f91bff3532b5cf80c035
-EBUILD checkpolicy-3.2.ebuild 1019 BLAKE2B 4ce64afa38737ac28fcaa1f32f8ac017f2077d4cfa4d11d39f8aab684d7e926f37d4923f94b54f3d951674d68bdd1f3395d9a5595987c54531cd5a1c93b28ea3 SHA512 acdc25a5435099b4641e21a1a3d8403b0d7fefb11b1b3e64ac5dc7e1fd2f795308574095774ff8c639de2441a57e1f940a9cb331e8664cf4b7aec0663b1053c8
+EBUILD checkpolicy-3.2.ebuild 1017 BLAKE2B 0e0e91e52e8d29d930d79dd06315d5a541084fccf921fb0f4038a298d699584a21e394e8a02e4e557b9e2dd6292a0ddd854138e8e7bf2525c0563f2a64464a6a SHA512 d020aa3670ff300a88b881d03882fac22b8c52209c751beac90323ff729c90f48ee063476f68048f1ebd7ddf75d1a31017e89321fe615877f0ec6f61e48301f2
 EBUILD checkpolicy-3.3.ebuild 1021 BLAKE2B 6abe22c0fc3c4985f29f566335121a42227b70f7704adb1a732f2ed2591ccd35bbea6a81c3ce9b1b866dd87b9a43257153c0ce5d4e2bf34b910f6b9e3acb5bea SHA512 5c875d640ccfcde065e1ea2800a7e8759a4ca0a62f8df0d6b82aa732e80e29ba594c3dbe7b1aa0f7506f44a00b897322e6204e1b8c7d365ac75ac6935cb110a0
 EBUILD checkpolicy-9999.ebuild 1014 BLAKE2B 08372b851c56f8392c54270335c7b4a7aac00f39523f4a1cabbe5a3c1855c3687fb580016589beba2d208f4199a428b72df93a093a1519c3a91a3e01199b0ffc SHA512 fe151a9a059ca7643dc0349dccad1c0eb80cb5c6455b02b85a2aaa747c8e13bdbb3f9cdc3d71313249f8f00ec1b8d5979a253eeea0d0a6b982f77183f798114b
 MISC metadata.xml 248 BLAKE2B e1a2b6875d3af0d8180e4ebaaa1cb2f0a30752377d4205308d6633fc4e2e4f075042f6eccec815a68dd0d668873dcdd6b049ccbf5181d477a8283863677473f9 SHA512 aaf6c2ff94601377deef7dfab5be37ce905bfc0ff56f4880cd504c6ac53b69958e4e4e5f13b0d442cf3a9a22440437cb1621bb529859e35181ead0dc1aad0ebc
diff --git a/sys-apps/checkpolicy/checkpolicy-3.2.ebuild b/sys-apps/checkpolicy/checkpolicy-3.2.ebuild
index 486df7377865..bba94c05097a 100644
--- a/sys-apps/checkpolicy/checkpolicy-3.2.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-3.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~mips ~riscv x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index 2151fa938265..63ec4f9a4cd8 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,6 +1,6 @@
 AUX cpuid-20200203-makefile.patch 1341 BLAKE2B 54d2d82710d88d4f095f712b19488bdc44376aeeeb9395e7d9061ea4f8b33e4a38818937e29dbcf4f48455aca568c3d362b2898fadbfd0ba9b11edfee78878c6 SHA512 ced9f8b91c67b0a9a7aeb7f581cd101a1161810a1de0d876b417e55a56f13c775005f3879c576fed318b2f4809a40db3347dc456d73d9e529d10ff8ab51e1e79
 DIST cpuid-20201006.src.tar.gz 118994 BLAKE2B 05c547858358a92b0c9270066dc33e08693922e4ba765edcba7aca201811c54074a0cd683edb3e9dedf2bb0fd23682b3cc5725e4067b27ec27e0fe979eb22f56 SHA512 f037c1707b49e92f1bd605ec87a0995ae36215d075bcbadfed1d11f5fefda43391b48f10d2517334574aa7e243f0b73d22f1fcbfe1fb133aaf5bad1046e8ba5e
-DIST cpuid-20211031.src.tar.gz 124390 BLAKE2B 69f15a7a6506728a1049be58be43d6b23901e7a2347c4804cbac036fce10b9231df59dc6e49c07b6e66598c4140df8c73f7ecd1567590f30c1b4e79845645715 SHA512 a3d0782980da66e2fb824a907e90f81710a86c8bce110f4f027a4a0146fbecb7005df61dcd070aba3cea8bbd9d58cfb0ae627c7e4d5f3818f305c31600ee65fd
+DIST cpuid-20211121.src.tar.gz 128031 BLAKE2B e64cdfdb713b2fed2a76cfec2f29403f3aea9096b1838cd3f63a1fa3345704694a74d9c53482401765c9d480940972d0079fab8d9581963a874d98bc357eab2c SHA512 a70f6bd2f166c8d2f98da99d525c4b2eda411a3b18ae8a3ee7a8f8cfdb1b67c81ef88bb28a665d63e27d8b16bd043b4e961f4bd244f1ba4cf8ebc285385ca1ad
 EBUILD cpuid-20201006-r1.ebuild 597 BLAKE2B 3f7d8c98a6796dcfe78c80365f0d2238f1018cbc85a683ad9a28b3b70f936a99185427b4645073bb2d313821053e7c7d0d2c1c94a00b5330c8d66665690ea648 SHA512 5e3ac12a35b36d088e134b92f652723d8f466287a927cead8162ce321d974f53bb51bf964e9a6f66b42557413eaded47f47d18a6730bd6bb1874155cbd8564f0
-EBUILD cpuid-20211031.ebuild 599 BLAKE2B 8b8ba9702a202768a5371131b67bea23a5cef77329a62e9c5dfe390acc5bd88e152c990982686c6390add7db59aa4c34a4290098e810e268ce12408fdf53ed5b SHA512 ce063b76f6cb0a660d2fa23151399f9a0ac086aaf5024e35576b35ed4eb29afaecf0ec6e4a060e203331cbd5eb0d180fc8370d2db32787d8f55cf3fc778a5449
+EBUILD cpuid-20211121.ebuild 599 BLAKE2B 8b8ba9702a202768a5371131b67bea23a5cef77329a62e9c5dfe390acc5bd88e152c990982686c6390add7db59aa4c34a4290098e810e268ce12408fdf53ed5b SHA512 ce063b76f6cb0a660d2fa23151399f9a0ac086aaf5024e35576b35ed4eb29afaecf0ec6e4a060e203331cbd5eb0d180fc8370d2db32787d8f55cf3fc778a5449
 MISC metadata.xml 532 BLAKE2B 49d1eb34a9859763d42159adcf9a2dca3128af78aef52cedc4483950084238ba780bd841788f4b27eb72fc44e61c2c5bd264b6c6e2c57824ccf146b6ecad50e9 SHA512 f51db55a3cc5478afba39a42731122db8ac720af8685e093b6952efd2778c9f0668ac936d2a1cdacaf2586d62d0f13240d664a7bd4fbd18236c816e9e6745600
diff --git a/sys-apps/cpuid/cpuid-20211031.ebuild b/sys-apps/cpuid/cpuid-20211121.ebuild
index de0e99c961d4..de0e99c961d4 100644
--- a/sys-apps/cpuid/cpuid-20211031.ebuild
+++ b/sys-apps/cpuid/cpuid-20211121.ebuild
diff --git a/sys-apps/daisydog/Manifest b/sys-apps/daisydog/Manifest
index ac9e8ca7aa65..777f849c4b30 100644
--- a/sys-apps/daisydog/Manifest
+++ b/sys-apps/daisydog/Manifest
@@ -2,4 +2,4 @@ AUX daisydog.conf.d 115 BLAKE2B 55fa6089b54a2f5b4b56a5957020d6bab3dea492551bc841
 AUX daisydog.init.d 356 BLAKE2B 0b7c59435e39e17f1afe3678f84b25ff65276ebf93664d689f38a746c5c5b2945fa86e9f0d104a5b7577f7939214e4f4f15b04470af0c843468f7a732fcb082c SHA512 1ad3cdf515777e5ba8eedc40a82177ca7cfeaecb0ac82fe5d5757c81c298e43a8fcfc5f46f6d8d31c83534793d7acf798d8b16ce8d7a6bd2868820cebf898feb
 DIST daisydog-3182aa85c087446e4358370549adc45db21ec124.tar.gz 10395 BLAKE2B e172c8cf9172e69b3c88586a6a96ec69573500101bfef981f2c2090aaf9def8f9cbafa991ef68c1e03c1c7d607f0534f92bad0b06d944f85859223b3f62ff926 SHA512 0a7312a3d9459487da8d20a80568187f51d4ae786939afbf38b8b89747831b2f7e0e32a3414b5d60863e33bcdebad9e457ff9a8f75143a7b60bf68fc9de17cd5
 EBUILD daisydog-2014.05.30.ebuild 879 BLAKE2B 246ff4a06fdd58199a04403314f59f09021eb23d3927c03fbef9f685107370f76e767a9eac0368adceef1705da8f99e6d2428d0d3b71e481bfb7179acc744964 SHA512 bf73be36347e9f57dbbb69d697f1a442b34170d44dc595ff54951c2eae8601e073819cc63c1f2e91755bada046af224ef9eb1fd7454c8a5be035c7d62df5e3b5
-MISC metadata.xml 221 BLAKE2B 12ca7879e624ddb2085fbcf6c64b392796ef63aa3542bb51f80594cb6f319c2e7cc52660108a94f81ce540a19b07607ac599e82a21c4b5a46ccbf983c5d38d3b SHA512 c67d921bc7074f20a036d795b10293f39a9a2d6d21ccbbeee776a6ceff36d0e89f15bb98f6761de93f290addbf1447fddd20de80cec60c0987913d47e976ef61
+MISC metadata.xml 215 BLAKE2B 344b2d45a66df1c90f44ffca3343c1dec6f3fa2510ff1460d7652259f31f50bf80a8fef7a89ddd4fc86273290e98d04a1949ff881a9ca9464eaf81a422acfdb2 SHA512 059a722b5adb3ac6d86ab064c11bf5d472f7ad6156538798e7f61ee3b8c42d07ff7e2b951deac22472761526208214c3b7dd4950c09b894f419d0bbd00121f7d
diff --git a/sys-apps/daisydog/metadata.xml b/sys-apps/daisydog/metadata.xml
index 3f6127b56e7f..8041df927597 100644
--- a/sys-apps/daisydog/metadata.xml
+++ b/sys-apps/daisydog/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
+<maintainer type="person">
+	<email>vapier@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest
index b857071791d8..6a88a1aea983 100644
--- a/sys-apps/dbus-broker/Manifest
+++ b/sys-apps/dbus-broker/Manifest
@@ -1,17 +1,11 @@
 DIST c-dvar-c8ea9712a94186512c22c32f32c421d6a2db6feb.tar.gz 25212 BLAKE2B 37f02df4f0a4c7372826cd9db37de883cf40027b12f72f0d43cf08f08682d90e6c7e8c3756f90a9e6184713c98e331ad2b2c9cd3373a148b05e2a3a2305db413 SHA512 c134892b43a1b572c45f0f24d7c9c7e70b1326c8bc896995b491d86271a000e83707e5d5eeff631b66be31f3980df7146cd18c385263a3a8bd07f30840cf829c
-DIST c-dvar-eeb91604574f7c5b12b270f8355f7e6cf1720f4c.tar.gz 24723 BLAKE2B 5206b4e85cdeffabc91e0feca17762ce10bf69815bad8d739af5eacf499ee4fe03058db1d2f4b2fe06cd93fa48eb637e68b50726a40e8b431f0fc526f830f114 SHA512 21d793ae449290c21c98904a43482ce1cbdead9fd1cd857214feeedd2e04e829f6ec4a8372f6b237eeeb5fcb5f96901ef8374d497afe6f70316f6a944a385443
 DIST c-ini-204410a08d3a6c8221f6f0baf0355ce5af0232ed.tar.gz 13952 BLAKE2B 42c34e4ebe17d4c0904c395c72e56b0587c5f6b2cdf422cb800678844cf8516f9645718a04e9a10f6e747d1f56b2f1e563d1fa07db078e745761ae1e40ad395a SHA512 72eeaecbe0b9434b48d2ca9674dd1e722e612a730fd07ef27babb346a10ed7311b11c9d85f2aaf0cd84ddca7f926a78d76d066f453289bcbe849c4cacf72ec58
 DIST c-list-a0970f12f1f406a5578a5dedf3580cd682e55812.tar.gz 10124 BLAKE2B adb0face335aaa8206e597e404dcfea2b9d22035d4297442473918878ff9928ff5d614b20cb96de8a50c1418da83da5a49837c0677fe2a5f3db4e78cf3f2bfdb SHA512 51958b4c35acd84da89e694fc58a045b28d265f77043d302fe98f3507432363d20bfa611948fad37d0e5feb36b6232f742cde80e6243bafa3cd976c8b11cfc4e
-DIST c-list-f1eadf27377ef2f74b3cfd16185f54a219df2aae.tar.gz 9350 BLAKE2B c2db7f5e67f9575362c059545f3fa0bef4672e1195aeb57edbf50d8265e72f120540178cfaee8f49e0a9494e3ed56a4a10d23de237035d15b529dcfc47184da9 SHA512 c2a0f21bbf90b7dcfe9858aeb4f141202a7f5d7b980189f7ec6dec2eed9b70d78b82be5009ec7ae1a99911e2489a1734b8017cfb709d7625addda5b1a738dff6
 DIST c-rbtree-8aa7bd1828eedb19960f9eef98d15543ec9f34eb.tar.gz 25957 BLAKE2B 76b67a5efeafbf68fe3f1db732d1ad878cee7c23596dda096649c30205582f3d7fca99c5b99ced69b027cd3100351da03aacad00c3aa24d3a0604b09093ecb99 SHA512 57305a5a438a2dd69662dec02117d2636e50f901cb92a251c3844a343108ebeeaa208bb09dbeb22dc1b8d1171719442f4ccc248d89909cdd7310b7db6cfcd6cb
 DIST c-shquote-83ccc2893385fcca1424b188f0f6c45a62f2b38d.tar.gz 10622 BLAKE2B 1c705c47ca22dfb3cb0a277ea96156806d1c0e9913da48a2baeea4e2e455e7f417f48db24c94770b7e471655a1c109a23679ce11ed802447e0b41ac3c60f822e SHA512 499fb764a2f72e1151c0007975720b56912f88f0ef92bb88c6b1870fcc8e815af8b377e1e6fb9829426757781134d9ec20cf04cda273ca2a5c128705b36dd3ef
 DIST c-stdaux-8652c488b8f1c29629a5179d4551d0a691ae5901.tar.gz 13075 BLAKE2B ef08451574ea695151cbfdad2060324423c8abcf46ac8a86b3216b85017c9b4dd8399d0561cb4f2c731e9eb2883481db59292769560cbcbfc3e96823ceb70e9a SHA512 bb669b659955ea62734f401c9745059349b23e6ddbca56e72437929b9527647ff7ac6bba4bb06506e4d8d35f3a1e7c4eacd2d5b1e7cb21098faa144c932f2bb0
-DIST c-stdaux-c5f166d02ff68af5cdcbad1bdcea2cb134e34ce4.tar.gz 13054 BLAKE2B 9a550b2eece549f9e7dbc6c69aa58b940e933106cca931a503c12220b3632bf1d48bcd1a2d6fa3a9f3e29e34fbd5bc11eba1751d05a9db40d0c2af21d8e1e066 SHA512 a138d9a8672d63537e6c082946777bdd62d651e837121bf180d5ad0591d12fe2b13fc63499da39a68d2e3ca8da6a0826701ae4807ea78d5a7604e9f2d28760ca
 DIST c-utf8-0837214a9780b7d771a3b3ce9a49196ac0a9d52f.tar.gz 9340 BLAKE2B 4bfa39c39aa8db8b7d797d78081b5f3104c659e2ceefef65aa2d3c03ffb5889d772cb78328473e3557c943b2487b7bcb7b68d7dc7f2b95940b0448b3479f1b23 SHA512 2df368af5023fac6c7f2e018c0cbfd73225bf1c4e0d0387931352909323175652bcd3739e9e6b76a099aea5d3f0290198aa70c69ecc5e9ef22df214f8c75da79
-DIST c-utf8-8a8f07d623492d4b45532527f945b118a2b4299b.tar.gz 9331 BLAKE2B f5b380da37ba0fcef7f8324777180683748639dbbcaf8b16dcc3432cf69b58caed7b93c2de0ef590876ae7c2ee9fa02a26d8ae94c1fc58281812ccd9b705eb17 SHA512 04a3e4e744ae50e9e06080b05d4ad8bb08ced945dc42625a4c47e47feccd2dbae1205555a8857c98f344357c28846cc5d7273bd5fe2e13f454c4d11ee1303b28
-DIST dbus-broker-28.tar.gz 216484 BLAKE2B 8d8dd9d15efa8c276d6db5c4f50320c7d18498c93205f9cda2bb849b781def17c387d5768ef62963024ee99f163ea1a72e457098612a9e6cac39238f3eac533e SHA512 d8b8e0c665e3c0e33f50da99330ff4cfba8107bff2c7e03a9653bd89f740e69ed1dce750c7f737c78454e07294821ff545007f3927f12d7f35f53339e4747791
 DIST dbus-broker-29.tar.gz 216639 BLAKE2B 94c8b7ea01367eae176d9411af064a960a054d6fbeb2bdebe9ba983d0938443abeb521f32e0eb9ae28155d5c5ebcf461317223387ccfad624ddd24e6bc8e227b SHA512 4c31b8c15f5d1ada0eb9c63c905c9fc9b3b8336beb533974b9c2b2a6a89c306b77d029d1ddbccbad873f62cc0d02cc373a090907dd19eae1a8a7fc2e3a4c2113
-EBUILD dbus-broker-28.ebuild 1830 BLAKE2B b12f4e076b1744abfb216f5e37f6fd5f589d43546ad3b652fa181671d3ccbc865cf300cf720d4aa89ee72794c61650adaeab104c2b9340f51ad23ef65c580ae2 SHA512 9bc28978b7c72b6b22790cec8335ee9450c09a7cb73e3b4083227cbf9124eeebb7870c575f64dd133163fb81d9776dd264759111a315f96bdf940ed49296b7bf
-EBUILD dbus-broker-29.ebuild 1842 BLAKE2B 08bab1715b6da38bbeac3ca7f3ec47d39da680bebb958a1c4d2435250842414542ebde00f558ce681c2d18ae406330fda5549e3fd787273fc6dcd465b4bd7f1d SHA512 905b42bb284cac7a025308a6bb78728f4c66ffe687ae7923dddf358e1be820308bad9ab7a6ff07e97c1ed3bce4c4a76c173c9503cacda3363f3b5d82d8e9671a
+EBUILD dbus-broker-29.ebuild 1840 BLAKE2B 0e21056b3ef0afc032120cae741d3726315c66b42551ad0ace86f9fea9e0730ef5b2bc065b06f42184f282ec2dc783d31969f2ecd9d13485de9492911393ed46 SHA512 8e033bddf399be99b7c06ce0590a5a285922eb1f79457146f172641d1650005856417cda9b7bb5f65331afe3c3532cbde323f0f695ad1ea5e021f4c417d71bb5
 EBUILD dbus-broker-9999.ebuild 1837 BLAKE2B 228f861cbd77eb330ae11d954191869b859f1734f9761ba68db9d5bf0bc5bd35b6b00120841b188f23e598026599b8fd446e0324f45411efb1c4a9b7fc785ef4 SHA512 ecad5c3a76d37243daed86f5fb34e3510f9d502199feb3c707b85073c0cda4577d96f7ede49ae81cee66266e47e243bdbc07f335caad6e7855c91fe21ae7759e
 MISC metadata.xml 328 BLAKE2B 8d8eea6a3d5e3309106ec3e6f248c4b5cad557ccd5095794bd153cd270c5f43de508363646afce491d5e6cc3bff1dca1ca024c2e87e656401432ac2d833cca90 SHA512 971b4214d0a9f9a68ca12a309096b7345014d2e0f57e85e6e10ff0a09b533d5cafe153fa8082ac01609e3417a31afc319cb285a822194c9c672a57ce316340c4
diff --git a/sys-apps/dbus-broker/dbus-broker-28.ebuild b/sys-apps/dbus-broker/dbus-broker-28.ebuild
deleted file mode 100644
index 0f00dd372abd..000000000000
--- a/sys-apps/dbus-broker/dbus-broker-28.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2017-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
-else
-	KEYWORDS="~amd64 ~ppc64"
-	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz"
-	declare -Ag SUBPROJECTS=(
-		[c-dvar]=eeb91604574f7c5b12b270f8355f7e6cf1720f4c
-		[c-ini]=204410a08d3a6c8221f6f0baf0355ce5af0232ed
-		[c-list]=f1eadf27377ef2f74b3cfd16185f54a219df2aae
-		[c-rbtree]=8aa7bd1828eedb19960f9eef98d15543ec9f34eb
-		[c-shquote]=83ccc2893385fcca1424b188f0f6c45a62f2b38d
-		[c-stdaux]=c5f166d02ff68af5cdcbad1bdcea2cb134e34ce4
-		[c-utf8]=8a8f07d623492d4b45532527f945b118a2b4299b
-	)
-	for sp in "${!SUBPROJECTS[@]}"; do
-		commit=${SUBPROJECTS[${sp}]}
-		SRC_URI+=" https://github.com/c-util/${sp}/archive/${commit}/${sp}-${commit}.tar.gz"
-	done
-	unset sp commit
-fi
-
-DESCRIPTION="Linux D-Bus Message Broker"
-HOMEPAGE="https://github.com/bus1/dbus-broker/wiki"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="audit doc +launcher selinux"
-
-DEPEND="
-	audit? (
-		>=sys-process/audit-2.7
-		>=sys-libs/libcap-ng-0.6
-	)
-	launcher? (
-		>=dev-libs/expat-2.2
-		>=sys-apps/systemd-230:0=
-	)
-	selinux? ( sys-libs/libselinux )
-"
-RDEPEND="${DEPEND}
-	launcher? ( sys-apps/dbus )"
-BDEPEND="
-	doc? ( dev-python/docutils )
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	if [[ ${PV} != 9999 ]]; then
-		local sp commit
-		for sp in "${!SUBPROJECTS[@]}"; do
-			commit=${SUBPROJECTS[${sp}]}
-			rmdir "subprojects/${sp}" || die
-			mv "${WORKDIR}/${sp}-${commit}" "subprojects/${sp}" || die
-		done
-	fi
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		-Daudit=$(usex audit true false)
-		-Ddocs=$(usex doc true false)
-		-Dlauncher=$(usex launcher true false)
-		-Dselinux=$(usex selinux true false)
-	)
-	meson_src_configure
-}
diff --git a/sys-apps/dbus-broker/dbus-broker-29.ebuild b/sys-apps/dbus-broker/dbus-broker-29.ebuild
index 3016acfe03f1..b26194a37d38 100644
--- a/sys-apps/dbus-broker/dbus-broker-29.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-29.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
 else
-	KEYWORDS="amd64 ~arm64 ~ppc64"
+	KEYWORDS="amd64 arm64 ppc64"
 	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz"
 	declare -Ag SUBPROJECTS=(
 		[c-dvar]=c8ea9712a94186512c22c32f32c421d6a2db6feb
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index cbb653d4f8aa..99f5db1c5300 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -3,5 +3,5 @@ AUX dbus-daemon-optional.patch 2701 BLAKE2B 28054bf147ffc29d893017dd9b8a6c9b3a03
 AUX dbus-enable-elogind.patch 2801 BLAKE2B c9ef41ff7b31af6cbaf28ca16974fb62aa0f2492f1c6970b41216758768d1139d2ce9aabbb3aff952d625b0decd1e8c2b25f79bb0a13c146aa9453dd4f7b5c5a SHA512 84c5eacc9c305ce1fa9f7a50407b7e836a20c679273cef06004ff57665c27818d2c33e0cfa9ea91ae89c50da4f7b9a92077e607f0f17b9300892d16e881a7d9a
 AUX dbus.initd.in 841 BLAKE2B 7df68814224e066e6356ec30215cf76507c4c1d0b0fed7e97339cba680f7a6f4628b71ca5660f9bc2c0efde75b9a083c08b121d186fd7900b3dea0443a7c0760 SHA512 6bc5bf619369448a221e4eb7c5af421b7610d9488f0409cf1847539b94bc2554238a8e53a60432d7ef60f9b812a3efb0b2ae2ca2544b6ed77b845ec0f5ba1a21
 DIST dbus-1.12.20.tar.gz 2095511 BLAKE2B b467526e7e0281db7b8c7c178469fe006dab29ccb1ea197c02495bd297e8de766230b68ed86c4a7e05dbe09ca30ce941a15e0bf8030fe0df66c04febf0534b3b SHA512 0964683bc6859374cc94e42e1ec0cdb542cca67971c205fcba4352500b6c0891665b0718e7d85eb060c81cb82e3346c313892bc02384da300ddd306c7eef0056
-EBUILD dbus-1.12.20-r3.ebuild 7570 BLAKE2B e2b45dfd750abd71e37b162fdbc5dd3a14ea1de6fa5d56878fa8e9b39d21ceecbbfa08d9916159566579f3c7e145c94e3c02d090f299cd6e0a48bbd0e9cfdf40 SHA512 bb570e284f2c07e98709bce5c0a84ade205a1a943a50f2d60f1176e82a2199e40d28a8e640d75736a691eec3ebfa3c85cc68aa094209d78d22e18974bb8e7783
-MISC metadata.xml 596 BLAKE2B 6d21d91c952bb0fb0ac067a95e02555c2d7cf532c4327bae062ca902b5d4eb88d6be5e71715ed9f61c11db90e32888104d19b67c4be6258d41208b6157033331 SHA512 759367dfe6da3be576a5d6d641f64c93b799594d00fc304a94bb9a48b3bf3f02c6ad9285f21b83b4360f6c2c30b342644314af8089ae99157241c1e99abdfb34
+EBUILD dbus-1.12.20-r4.ebuild 7565 BLAKE2B f1bb612d6d5f65568f5a0410caf6f11a18652fb1ec0e7ec961f3a73287509ef5dee3a80698de06f77224c59bff14a9f2c742961cfdf6f7890ee9093b0e63d7d3 SHA512 3bc9a9f959f0ce7a226e8ca21d397b071f2bac2bcd8935cbc2402c5d1966a1961573448cde8b52a087c7378a57e36e7d407342572118e1837910868fea11e5d3
+MISC metadata.xml 501 BLAKE2B 7a39c6df0072e46a515e88bbf4023713826167924dda328657fc36f169f4918f92ef59127c435055d942018b6370c47d55fa288ccd6a88414e86e6fab65a0751 SHA512 b750d80e9c8a8cad6eb42952d72fd65868e69ab686a5bfc95896b1734960dab4975ff14b6c44637c0c9b80b76a55f826f2d86f6dfa4f075449a2660fbb85a79e
diff --git a/sys-apps/dbus/dbus-1.12.20-r3.ebuild b/sys-apps/dbus/dbus-1.12.20-r4.ebuild
index bd52c647f33c..bed9be8efd71 100644
--- a/sys-apps/dbus/dbus-1.12.20-r3.ebuild
+++ b/sys-apps/dbus/dbus-1.12.20-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
 LICENSE="|| ( AFL-2.1 GPL-2 )"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc elogind kernel_linux selinux static-libs systemd test user-session X"
+IUSE="debug doc elogind kernel_linux selinux static-libs systemd test X"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( elogind systemd )"
@@ -127,7 +127,7 @@ multilib_src_configure() {
 		$(use_enable kernel_FreeBSD kqueue)
 		$(use_enable elogind)
 		$(use_enable systemd)
-		$(use_enable user-session)
+		$(use_enable systemd user-session)
 		--disable-embedded-tests
 		--disable-modular-tests
 		$(use_enable debug stats)
diff --git a/sys-apps/dbus/metadata.xml b/sys-apps/dbus/metadata.xml
index 3a0efe6b8480..010eeadbdd2c 100644
--- a/sys-apps/dbus/metadata.xml
+++ b/sys-apps/dbus/metadata.xml
@@ -7,7 +7,6 @@
 	<use>
 		<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking.</flag>
 		<flag name="systemd">Build with <pkg>sys-apps/systemd</pkg> at_console support</flag>
-		<flag name="user-session">Enable user-session semantics for session bus under systemd</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:freedesktop:dbus</remote-id>
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index 183c09fb6d96..c5d1375c6dc3 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,5 +1,6 @@
+AUX ppc-musl.patch 706 BLAKE2B 5b5aff69fa1118ab22179b7cc937aaf1b9c0dd89df957814f68de2c40543ccf12dd8be4eeee29723043b72ac71bce24015986866c10f9ea92704c5e9b1245933 SHA512 c497e10eff10aa0706527438a3218ff5047622ad2c2ce2a2aa807341a352524cb955a3f5fa1f34a051c07a3f24ea395ec1276f11905ac988e5a2f57cb5caf646
 DIST diffutils-3.7.tar.xz 1448828 BLAKE2B d9f115e0ec9b2499545a3bef4e469fb7786d4a95e0a1c8459c885c53e8b1dc797027979e42c53c2a7df4e1e224942bd9ce5214813977af2bcc67f0698ea0c647 SHA512 7b12cf8aea1b9844773748f72272d9c6a38adae9c3c3a8c62048f91fb56c60b76035fa5f51665dceaf2cfbf1d1f4a3efdcc24bf47a5a16ff4350543314b12c9c
 DIST diffutils-3.8.tar.xz 1585120 BLAKE2B 573abbfba55c62ba30d2084ca68860e9681cfe92648407f7fb04e1aaed2e4719e2fb5a29cf25bd125d762f4dfd52f85ee91f2ec19b099365bada7fe27a0394af SHA512 279441270987e70d5ecfaf84b6285a4866929c43ec877e50f154a788858d548a8a316f2fc26ad62f7348c8d289cb29a09d06dfadce1806e3d8b4ea88c8b1aa7c
 EBUILD diffutils-3.7-r1.ebuild 1179 BLAKE2B aa0c831588bceba6c855b67d53b51fe853b94659c70f63e829540b46e61be3a87fa2dc3889f81640a819ff4ed1a0db2a8d2903b707f27f59bf5b839916271209 SHA512 3a4287c690502ea4890850726d42ae937f726821a712435eb749e1ef82ef40ab415739dc3981872c541a2007596b22319aea7909e1dabee721c3f076d733599c
-EBUILD diffutils-3.8.ebuild 1061 BLAKE2B b881418d23b680285d50f0a5f9e02e094612ef7aa18e652d0b18bcdd531784dd32a0853db5a85b1287a8a812da43a9144391ca38770114db2d77ee31e5e733fd SHA512 bf92d38ebfc7cb37551958bc8ce57c5ff8e063ee2aa224efb101e17605c8533549f2565d812a2864cc764c14aff48dc7ea4fa4cefd8b78e149f3cf7fa71ea428
+EBUILD diffutils-3.8.ebuild 1103 BLAKE2B cce9888b6c90edd28dd2e12cce849380c49e7cddf806e655ed9fc9c6fa8aa17f6a7a437c7c7563c973f22580613ca5fc7586206bda568f7bcb092c4b0e5f9c3b SHA512 914cb7da0b0fafd6ffa245051727cc2862052aedfd44ecaa38a6cb6d866380e48814070de3827b05752b688d82e3647714c96e8daa14084d84450f3b6a1bd12a
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/diffutils/diffutils-3.8.ebuild b/sys-apps/diffutils/diffutils-3.8.ebuild
index fc7ab80b4a3b..4cae3d13edc4 100644
--- a/sys-apps/diffutils/diffutils-3.8.ebuild
+++ b/sys-apps/diffutils/diffutils-3.8.ebuild
@@ -17,6 +17,8 @@ IUSE="nls static"
 
 BDEPEND="nls? ( sys-devel/gettext )"
 
+PATCHES=( "${FILESDIR}/ppc-musl.patch" )
+
 src_configure() {
 	use static && append-ldflags -static
 
diff --git a/sys-apps/diffutils/files/ppc-musl.patch b/sys-apps/diffutils/files/ppc-musl.patch
new file mode 100644
index 000000000000..d7d8255a444a
--- /dev/null
+++ b/sys-apps/diffutils/files/ppc-musl.patch
@@ -0,0 +1,18 @@
+Needed to fix build on ppc + musl. Doesn't seem to yet be in upstream gnulib.
+
+https://www.openwall.com/lists/musl/2017/11/05/2
+https://github.com/void-linux/void-packages/blob/master/srcpkgs/grep/patches/ppc-musl.patch
+--- a/lib/sigsegv.c
++++ b/lib/sigsegv.c
+@@ -221,8 +221,10 @@ int libsigsegv_version = LIBSIGSEGV_VERSION;
+ /* both should be equivalent */
+ #   if 0
+ #    define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1]
+-#   else
++#   elif defined(__GLIBC__)
+ #    define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1]
++#   else
++#    define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) ucp)->uc_mcontext.gregs[1]
+ #   endif
+ #  endif
+ 
diff --git a/sys-apps/edid-decode/Manifest b/sys-apps/edid-decode/Manifest
index 892499f1839a..01e8a0c7d894 100644
--- a/sys-apps/edid-decode/Manifest
+++ b/sys-apps/edid-decode/Manifest
@@ -1,6 +1,4 @@
-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-0_pre20211012.ebuild 669 BLAKE2B 88268520ce5bca8ebfd4f35688c5002e0b568afd5b0f366c55fe276cd71730b061ebb452f0285b69f636d407f8d3928bcf64555ad09707455306a2fbb8300043 SHA512 2eff4eb4c1e0a4b6fbb6799af9400fa97e9ea2456759d048d7b5b0212de538937e29a1605d6d9056d7be05d860c017a2629eab76536339ba8df020a96d8bd6a0
 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_pre20201230.ebuild b/sys-apps/edid-decode/edid-decode-0_pre20201230.ebuild
deleted file mode 100644
index 50b8e6af19f6..000000000000
--- a/sys-apps/edid-decode/edid-decode-0_pre20201230.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-EGIT_COMMIT="95d81c95f89424bc5ff541d941eeea4addeeda1c"
-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"
-
-KEYWORDS="amd64 x86"
-LICENSE="MIT"
-SLOT="0"
-IUSE="examples"
-
-S="${WORKDIR}/${MY_P}"
-
-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/edid-decode/edid-decode-0_pre20211012.ebuild b/sys-apps/edid-decode/edid-decode-0_pre20211012.ebuild
index b36f30c8fad8..548a4efcd1f6 100644
--- a/sys-apps/edid-decode/edid-decode-0_pre20211012.ebuild
+++ b/sys-apps/edid-decode/edid-decode-0_pre20211012.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="examples"
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index 2a89cac37c3d..07675cd0bc18 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -3,8 +3,6 @@ AUX bashrc-r1 114 BLAKE2B 9988db1b04fe28ed01d5303a524387d5ebac81568f20b3fc3f74fb
 AUX etckeeper-1.18.14-gentoo.patch 2836 BLAKE2B ddc957ac78997859f4f5b629b6d1e2d8a661bf55f3c5b5969f6d3fc0e09bea9dffb343a31e062aaf45d3f7d5bbcd39395165141c41aad56a4e60efdd76d6ba99 SHA512 d0389b8d2018f22af75d18781f6c166c50189e51604f341fb4eb259d58741b984a58a80e9db8ab979c4b6867d349655bc19787aabd0f932657e311d2a315f25c
 AUX etckeeper-conf-update-hook 787 BLAKE2B 39f981c9292559b61a48b23ed18055a668731e47d69efbac4838d88f0fdd44c34912b3c17b51d59c967af4e70fbacab9fc56b76467d693440752b15be05a43be SHA512 7b8a81520166be48235519368ae803125e1f3b20b8e2a27d4095db779135387818e63aed987f89282b809e90f3a50a91c0cb738561ea5a8501afcdb8baec3ed6
 AUX etckeeper.tmpfilesd 40 BLAKE2B 870679a3ef88348765025038a64480002c014ecad6e6b6f3db09935716a75cd9c315c13857db81e305e65c47da70ad3367dbf0f0a43dbe88c376ca659697497d SHA512 057871c3c0e416dd52a9879a3dba96347359d98ee884098f55351920c5275e4bfe984f68e13662e4e06f876a8c7cb2d4f0dc1f204e3bcdd74601c1e420861280
-DIST etckeeper-1.18.14.tar.gz 93528 BLAKE2B b36316b4a92ae7f885a1c0c0974fa69a3c1cee06ab9eb0bbee8c025f76b1dffcd19ac2f92fed49372873f54234ec1e8da023cab98097562d3eecd862ca4d98c7 SHA512 1bc01845d47ce3af1ef56474745843e8be6e005da90a21bed302fe73476fbf1f64b84fae7dac73139c394ca698bd146e1609fa34ebbc6737ba73a6f61e670948
 DIST etckeeper-1.18.16.tar.gz 93638 BLAKE2B 0cc91bd23d4d8ceeddcd18c9b6a93fbebdd5146296d565195b38432aa015b9317931e25e741e4639cdf15d7cb8235eaf9cb824f8afaf1c5fc13c954b8c3c294d SHA512 48a9f0089f72d62d68467b17a5a441dbf219c6b5b817b8ef2160b5f50eef6492257393c482a658ce11a97983ed037caa80b92e289049987bde5f8fbb22c98f07
-EBUILD etckeeper-1.18.14.ebuild 1705 BLAKE2B 6e4b27820a9de14ea5e1e0f6a588589983e3326a23ec968b0a53e3b486749e31de39cc230a0568bb32e889aea159effd15bb11a9002498c10a2091b196d7cc05 SHA512 d31598fc22846eaef27c8a653b72964de28ef944de6b627032b74cce5e5dce2ad220f56fd34581cf47d9e6bfae0b4c9e146f42758daaead79656995276999a41
-EBUILD etckeeper-1.18.16-r1.ebuild 2102 BLAKE2B 3fcc73bfc31c949e2f24a5e16199499233b28911104ac105cbbeda4976d182bf806e30a5f6953e1196f77e2063a0bf45ecb795d65c9db905e6f5d9d5e3811d7b SHA512 9814cb9059d6c0de1470f80961318671162061c83a9256ebfeb06f15d8b171d9e59f1501195ae7215282bd83b13c00a9356746fb30f85c96327eec1eeaeb6333
+EBUILD etckeeper-1.18.16-r1.ebuild 2098 BLAKE2B 33a08dc69f0dcbba7283aa783495b901019318951a19ffe50eed8b60e0acb5ae3640feb34d3d4fe6b031f123628d640fac67c579b8bc133b6d563c37cb121b77 SHA512 32ab7730bb28320c626f604c54e6ac4a8f80e74be6ff21bd39a1a42f482554e5227aed88050b9a091222d0b5d7bb33d6ead99eb1d2e97d603267dfe2f0024c0d
 MISC metadata.xml 785 BLAKE2B 7a93b0ed9e98d9e3512a2be8fb0a1f9b1790ab563d6865e46348be6b05c8965937548890ff312d90cc52052c6a177922faacc53fa1eea6f35bec6924bdb69aa9 SHA512 47adfa4031df7a657b55fdf529f4465c704f278804fb9b08ab334e0f44e714b3f106c94a73cd6e0c903c2d2633243d23c93374a35a0ec15686248da6dbd33fde
diff --git a/sys-apps/etckeeper/etckeeper-1.18.14.ebuild b/sys-apps/etckeeper/etckeeper-1.18.14.ebuild
deleted file mode 100644
index 19e82426b9ea..000000000000
--- a/sys-apps/etckeeper/etckeeper-1.18.14.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 prefix systemd tmpfiles
-
-DESCRIPTION="A collection of tools to let /etc be stored in a repository"
-HOMEPAGE="https://etckeeper.branchable.com/"
-SRC_URI="https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ppc64 x86"
-SLOT="0"
-IUSE="cron test"
-
-BDEPEND="test? (
-	dev-util/bats
-	dev-vcs/git
-)"
-
-RDEPEND="app-portage/portage-utils
-	cron? ( virtual/cron )
-	|| (
-		dev-vcs/git
-		dev-vcs/mercurial
-		dev-vcs/darcs
-	)
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.18.14-gentoo.patch )
-
-src_prepare() {
-	default
-	hprefixify *.d/* etckeeper
-	sed -i \
-		-e s'@zsh/vendor-completions@zsh/site-functions@' \
-		-e s"@/lib/systemd/system@"$(systemd_get_systemunitdir)"@" \
-		Makefile || die
-	rm -v init.d/60darcs-deleted-symlinks || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	doenvd "$(prefixify_ro "${FILESDIR}"/99${PN})"
-
-	newbashcomp bash_completion ${PN}
-	dodoc doc/README.mdwn
-	newdoc "${FILESDIR}"/bashrc-r1 bashrc.example
-
-	rm -rv "${ED}/var/cache" || die
-	newtmpfiles "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf
-
-	if use cron ; then
-		exeinto /etc/cron.daily
-		newexe debian/cron.daily etckeeper
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process "${PN}.conf"
-
-	elog "${PN} supports git, mercurial and darcs"
-	elog "This ebuild just ensures at least one is installed!"
-	elog
-	elog "You may want to adjust your /etc/portage/bashrc"
-	elog "see the example file in /usr/share/doc/${PF}"
-	elog
-	elog "To initialise your etc-dir as a repository run:"
-	elog "${PN} init -d /etc"
-}
diff --git a/sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild b/sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild
index 0591f38928ef..6c38aac1376e 100644
--- a/sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild
+++ b/sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://etckeeper.branchable.com/"
 SRC_URI="https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
 SLOT="0"
 IUSE="cron test"
 
diff --git a/sys-apps/exa/Manifest b/sys-apps/exa/Manifest
index 470cfe323129..3403bd5e6c60 100644
--- a/sys-apps/exa/Manifest
+++ b/sys-apps/exa/Manifest
@@ -119,6 +119,6 @@ DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbe
 DIST wincolor-1.0.3.crate 5030 BLAKE2B 165e38a7d234241081d3fed3477854c5241e2d6ea685230c9e44b64601f77953f1e65e9166a3e843e7bf5bc23c9af427d6e9718579f683e7ac1c96e14ed3618c SHA512 0fc5dc7f1c57bbf1a8a6d5342ca363384a14a464b53ce92ef08544925e7a9e8d031a457045233148ba10355e3c3f0cd34b08e12d54d2fcb10b3ed60ad678a492
 DIST zoneinfo_compiled-0.4.8.crate 7959 BLAKE2B 06b41aa69298319760eef3959c9447d9078ced6ea409b95bc0a3de5d9ddc1006d022caa23a64f46a9c6abf1eb077681ffaa3e03af0d533ec65d3351a4ecb3ac7 SHA512 e5337233b464cb97501a2694972a5707f6762ee567416bae876e0ee72aa0bb9cfd152a9253ba97c9fcb24a59e6b2fd5417d5567f7e17336ddc8dee121ba76589
 DIST zoneinfo_compiled-0.5.1.crate 8837 BLAKE2B 1d513b145a391ccb22d2110cce06dc1fc91e109d93cc7f2a056ceb5056a5a480b98ed3471cf8ff8fb8011f2d9c037b3bbd4f47dcedc0a56499e324ea5d7849da SHA512 4ad46983742ed37246f3ba5538fdf3a4dfc444ec635ffaa51d5daffa70c14e1876e703cd0a1f077e6b324e0d44d4b5e1e710b3543636fa9f33d509fa8bce333c
-EBUILD exa-0.10.1.ebuild 2686 BLAKE2B 138873c728ffc0a8c0ce2bc8d65f08cec7ba7f4b2d0e13ad2310aaced437a31c700f5d0adde6d46984efd8b0663f5b4a58a70cac7c8c02ad93769dac4cd52c99 SHA512 62310004e160d6933b37e2ae09d45ba4079c8d1bc3cb41e4c7d7fd1d8c7b540a1fc0dfe42e2b350168a3609b9bcdedd4d9f141fb9c1f258971e33346dedba7ed
+EBUILD exa-0.10.1.ebuild 2685 BLAKE2B ccde1bb1a11532a3f69addd1a5082d59669f42376bb5a3146407462c6c159305765f47e6e7eeb135275ab7ea890d0124447d7aa0a1a81d84b99cc37b07159c19 SHA512 3c0cb387acdc1405c9c9a6c498ccb1b41b64ded6260dcfb59615ec94b839aa85cf187afecaf03be57a67a92935b1398ef0b6657d30fe72905dfa8c738f2c1ce0
 EBUILD exa-0.9.0-r1.ebuild 2036 BLAKE2B 5344785f721a35548a99edfba4ff6fd3ad679a3eb57c9b94a0d10aea6b37744e0cf47a7ff4026d1e2eb4d07a8c9228800fb1fdaeba13b99733220d6e467abaed SHA512 4ac3694ebbc396f806d9b7b195a1a1fae0a0848d3794249c0830c71b37ef4d9212cd5e7a3e084114b90214be89401c925de440edd782873501e3d41f5be1ac9c
 MISC metadata.xml 718 BLAKE2B 4e2934573aa13eca3e25e2878b3e24cce6ba4d4edf77d33d18093a3d865a29e7493014a0b6b046204bf171315fefbb4157298b4c9c3c5f3f09b12d40a2362c66 SHA512 a4c1e97e87464da41fec5408d6dcb4f8538e163453c8a3c497663e0def2800c7621bfddccf211a97d4cc5cf8ab7c7e5009c5d44e6fc32c8a84125203e87b013f
diff --git a/sys-apps/exa/exa-0.10.1.ebuild b/sys-apps/exa/exa-0.10.1.ebuild
index f43c754979b6..df6492085619 100644
--- a/sys-apps/exa/exa-0.10.1.ebuild
+++ b/sys-apps/exa/exa-0.10.1.ebuild
@@ -81,7 +81,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
 
 LICENSE="Apache-2.0 MIT Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+git man"
 
 DEPEND="git? ( dev-libs/libgit2:= )"
diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest
index 23f319ecfb55..3f9d3e2bace8 100644
--- a/sys-apps/flashrom/Manifest
+++ b/sys-apps/flashrom/Manifest
@@ -1,7 +1,7 @@
 AUX flashrom-1.2_meson-fixes.patch 7977 BLAKE2B 5ac9e09c6fbcf08f36da1fc874511f7023338b0bffe775c61be9f7c253d6d8343833ec64ff86dc3b4733e90e67435e3cc0d52e6ae11c8d368fe2f21b6a85bc59 SHA512 a0e30c2a87775342302fabfd594c91015b6ea9fba71a7d1b294c399a8336167f85b07fdcc2ff80174cc43362ef5ca28965571ca52e1a76922ef59dcb15991664
 AUX flashrom-1.2_meson-install-manpage.patch 1208 BLAKE2B a4290c046d82a7c8b8dbfba0d58abed2384506d761272929ca7972c68a92a314de2ad17af5bd49cb86af5fea119d36fb126c45febdd5ac99210949158d33fc75 SHA512 1345bc880317e37d028bc3d40c98e5b5b4b17c7cde18d3b17762c9792cf0e4ac19613702ae1d367937f86dd3dbb02732851774d91ef1372e5bbb8f998346526d
-AUX flashrom-9999_meson-fixes.patch 6672 BLAKE2B 299d89375783134cd1465db0b49c2b024c12e18c5c8551902989dbbedd4e17abf51074e387c569505531346b36605d3877106b2f23906b3c4b76b5f874d5104b SHA512 d235f343d28dc2ef7541c6f3f996eb21f51260bfd9f87376f22631035524fb92dfe63c711692092dc9749248db5756048976ba168d7f9814f5381f9234d8c7ec
+AUX flashrom-9999_meson-fixes.patch 7589 BLAKE2B a4c5475cb4574a3571514205ce62765faaf667ef8e08e8f7bfd8cb0c6b3fa61b914bb0f19f65f74c614bff5cad8b35eea3d69a1cb80ffa1af3c3fbe621f2ee2c SHA512 64711cb2483e9fe47d6d1cf7c8229dd97fe41bc41bde06e4fe876d7d1e128dc01e61eeece9d31ac36f200a8f510be6a4f855269a0d9c3302cf4e081a39d0ca9b
 DIST flashrom-v1.2.tar.bz2 366995 BLAKE2B 091e01a91e12b486154ace334a5e74bccbb5f5311ad76e37f43a28167080757873d8c78b8f549d2e77eb984922c830895ba955b23eb6ee4fc24f1ffed259954b SHA512 8e01395a54d0d1344bc55e7e4975f43bb8e59ebe83fb5f2766d14f76756d718b487254ce9a19ef4093aed04fb9d40fff5fe8f709b18c512f6e6fad894f83d7b8
-EBUILD flashrom-1.2-r3.ebuild 4341 BLAKE2B 8036e77820ba03662c09fb74fbf7471379fc5a9afba2d45e3ce2858169820cd555448bee08dcd474f0a12206758c451b72a602ad879af4ac64f81c7415a5803b SHA512 f2e7472a4aaf9dead08d7cb71b6811c3d58486b55e6ef6a453f7224c6226cf9848593b5291b1b62b1700885c4fe0563cfcc1eb115dc0dcc8d0d7f944d8931504
-EBUILD flashrom-9999.ebuild 4710 BLAKE2B da42297fbf9d8f61f8180208faf0f713cd45a56331284d2497997de184f3ebb94aa7ded0354a978e30a45863126dd482c6ca685ceb9f4c7f81dfbae0b833ffb0 SHA512 6a530c9791ef111feb44dfaef6dd75719ec7a1eef7d668540e69313e01503fabcb77c324249639c0c71b25d7865e68f834f72d16912fb91ad7d1c143c908663b
-MISC metadata.xml 5038 BLAKE2B da17bde1ee18a9b870a60574b61f5b12cc359ce5ea8376ce3b7dd8c40f90a5cd84f92e07bdae83b5e2ba6a065fcad077143e6ac4c0293354fa07d5f6750dc4f6 SHA512 7672bc7988c9ad6cfaf2fd0918a7fdd1f90ed9af0baaa8378a0cbe653a9e51f53bc1dc955e266e6d9a3a0b6eaf2968210d68a40c0b5416d7522c1b646a914f63
+EBUILD flashrom-1.2-r3.ebuild 4348 BLAKE2B f1df27a4ad207fbb91a7a599b6d2a08357d5a3060774bc11916b4f5d1380765f0c5301c987cf68440ffbc50533a79c17b0087139f0eff106c487a1b085ce8ef7 SHA512 a9460ba8104096b4abe257211a321ae824c71c2e7aef5f064ef16088f6f4592472da8ce969688ec695c2e9420a85187a8111fb055af3b7f307e5b42afb7e75d3
+EBUILD flashrom-9999.ebuild 4722 BLAKE2B 8e275122e1d8d9c963c6d90bbf4364a63a49a0e5140079893b15e687fbd95a1a2364c5637a71d4f9a43d3874316b1ddf8cd480745532f6e069d461f6dd897153 SHA512 86d2fa477378033fce754ddb15cbbbb03a301136a8ae852bc041f8bf51f1253d8be02dfe1e7705b352ca73f46ff6f174c82cb2fc59f2cb6e28b8349a9059c5e2
+MISC metadata.xml 4876 BLAKE2B ad38e149e01f382b38aef8a5be73df52654e835665621f4e02696d9b837ce62206da16a6a1ee2b1c08b7e7f1c23329395fee81c9f319404aaf339a2a149b0362 SHA512 166e5d58869cc571872559ffb01a3c645ee4524aa81478c74a680b35bc53f472b55dfda78e49eb25f5438c1841bc58e796cdf8918f63c25d2aa7ea8c2ab807d1
diff --git a/sys-apps/flashrom/files/flashrom-9999_meson-fixes.patch b/sys-apps/flashrom/files/flashrom-9999_meson-fixes.patch
index 63c2e2ef7553..7651585f4f6a 100644
--- a/sys-apps/flashrom/files/flashrom-9999_meson-fixes.patch
+++ b/sys-apps/flashrom/files/flashrom-9999_meson-fixes.patch
@@ -9,7 +9,7 @@
  )
  
  # libtool versioning
-@@ -74,6 +74,10 @@ cargs = []
+@@ -105,6 +105,10 @@ cargs = []
  deps = []
  srcs = []
  
@@ -20,7 +20,7 @@
  need_raw_access = false
  need_serial = false
  
-@@ -88,27 +92,25 @@ if cc.check_header('sys/utsname.h')
+@@ -119,27 +123,25 @@ if cc.check_header('sys/utsname.h')
    add_project_arguments('-DHAVE_UTSNAME=1', language : 'c')
  endif
  
@@ -59,7 +59,7 @@
    config_atahpt = false
    config_atapromise = false
    config_atavia = false
-@@ -130,14 +132,17 @@ endif
+@@ -161,14 +163,17 @@ endif
  # set defines for configured programmers
  if config_atahpt
    srcs += 'atahpt.c'
@@ -77,7 +77,7 @@
    cargs += '-DCONFIG_ATAVIA=1'
  endif
  if config_buspirate_spi
-@@ -147,18 +152,22 @@ if config_buspirate_spi
+@@ -178,18 +183,22 @@ if config_buspirate_spi
  endif
  if config_ch341a_spi
    srcs += 'ch341a_spi.c'
@@ -100,7 +100,7 @@
    cargs += '-DCONFIG_DIGILENT_SPI=1'
  endif
  if config_jlink_spi
-@@ -168,6 +177,7 @@ if config_jlink_spi
+@@ -199,6 +208,7 @@ if config_jlink_spi
  endif
  if config_drkaiser
    srcs += 'drkaiser.c'
@@ -108,7 +108,7 @@
    cargs += '-DCONFIG_DRKAISER=1'
  endif
  if config_dummy
-@@ -176,16 +186,18 @@ if config_dummy
+@@ -207,16 +217,18 @@ if config_dummy
  endif
  if config_ft2232_spi
    srcs += 'ft2232_spi.c'
@@ -128,7 +128,7 @@
    cargs += '-DCONFIG_RAIDEN_DEBUG_SPI=1'
  endif
  if config_internal
-@@ -204,6 +216,7 @@ if config_internal
+@@ -235,6 +247,7 @@ if config_internal
      srcs += 'sb600spi.c'
      srcs += 'wbsio_spi.c'
    endif
@@ -136,7 +136,7 @@
    config_bitbang_spi = true
    cargs += '-DCONFIG_INTERNAL=1'
    if get_option('config_internal_dmi')
-@@ -217,6 +230,7 @@ if config_ene_lpc
+@@ -244,6 +257,7 @@ if config_internal
  endif
  if config_it8212
    srcs += 'it8212.c'
@@ -144,7 +144,7 @@
    cargs += '-DCONFIG_IT8212=1'
  endif
  if config_linux_mtd
-@@ -237,36 +251,44 @@ if config_mstarddc_spi
+@@ -260,36 +274,44 @@ if config_mstarddc_spi
  endif
  if config_nic3com
    srcs += 'nic3com.c'
@@ -189,7 +189,7 @@
    cargs += '-DCONFIG_PICKIT2_SPI=1'
  endif
  if config_pony_spi
-@@ -283,10 +305,12 @@ if config_rayer_spi
+@@ -306,10 +328,12 @@ if config_rayer_spi
  endif
  if config_satamv
    srcs += 'satamv.c'
@@ -202,7 +202,7 @@
    cargs += '-DCONFIG_SATASII=1'
  endif
  if config_serprog
-@@ -296,10 +320,12 @@ if config_serprog
+@@ -319,10 +343,12 @@ if config_serprog
  endif
  if config_usbblaster_spi
    srcs += 'usbblaster_spi.c'
@@ -215,8 +215,8 @@
    cargs += '-DCONFIG_STLINKV3_SPI=1'
  endif
  if config_lspcon_i2c_spi
-@@ -322,6 +348,26 @@ if host_machine.system() == 'linux'
-   cargs += '-DCONFIG_I2C_SUPPORT=1'
+@@ -344,6 +370,26 @@ if host_machine.system() == 'linux'
+   srcs += 'i2c_helper_linux.c'
  endif
  
 +# some programmers require libftdi
@@ -242,14 +242,40 @@
  # raw memory, MSR or PCI port I/O access
  if need_raw_access
    srcs += 'hwaccess.c'
+@@ -493,10 +539,12 @@ executable(
+ subdir('util')
+ 
+ # unit-test framework
++if get_option('build_tests')
++
+ cmocka_dep = dependency(
+   'cmocka',
+   fallback: ['cmocka', 'cmocka_dep'],
+-  required: false
++  required: true
+ )
+ flashrom_test_dep = declare_dependency(
+   include_directories : include_directories('.'),
+@@ -519,3 +567,5 @@ flashrom_test_dep = declare_dependency(
+ if cmocka_dep.found()
+   subdir('tests')
+ endif
++
++endif
 --- a/meson_options.txt
 +++ b/meson_options.txt
-@@ -1,5 +1,6 @@
+@@ -1,9 +1,12 @@
 -option('pciutils', type : 'boolean', value : true, description : 'use pciutils')
 -option('usb', type : 'boolean', value : true, description : 'use libusb1')
 +option('no_libftdi_programmers', type : 'boolean', value : false, description : 'disable all programmers depending on libftdi')
 +option('no_libpci_programmers', type : 'boolean', value : false, description : 'disable all programmers depending on libpci')
 +option('no_libusb_programmers', type : 'boolean', value : false, description : 'disable all programmers depending on libusb')
  option('print_wiki', type : 'boolean', value : true,  description : 'Print Wiki')
+ option('default_programmer_name', type : 'string', description : 'default programmer')
+ option('default_programmer_args', type : 'string', description : 'default programmer arguments')
  
++option('build_tests', type : 'boolean', value : false, description : 'build the test suite')
++
  option('config_atahpt', type : 'boolean', value : false, description : 'Highpoint (HPT) ATA/RAID controllers')
+ option('config_atapromise', type : 'boolean', value : false, description : 'Promise ATA controller')
+ option('config_atavia', type : 'boolean', value : true, description : 'VIA VT6421A LPC memory')
diff --git a/sys-apps/flashrom/flashrom-1.2-r3.ebuild b/sys-apps/flashrom/flashrom-1.2-r3.ebuild
index 286893be3db7..6465f20a4497 100644
--- a/sys-apps/flashrom/flashrom-1.2-r3.ebuild
+++ b/sys-apps/flashrom/flashrom-1.2-r3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-v${PV}"
 	SRC_URI="https://download.flashrom.org/releases/${MY_P}.tar.bz2"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/flashrom/flashrom-9999.ebuild b/sys-apps/flashrom/flashrom-9999.ebuild
index dedf1bc3ada7..58c8150f039c 100644
--- a/sys-apps/flashrom/flashrom-9999.ebuild
+++ b/sys-apps/flashrom/flashrom-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson
 
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-v${PV}"
 	SRC_URI="https://download.flashrom.org/releases/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
@@ -33,7 +33,6 @@ IUSE_PROGRAMMERS="
 	+digilent-spi
 	+drkaiser
 	+dummy
-	+ene-lpc
 	+ft2232-spi
 	+gfxnvidia
 	+internal
@@ -42,7 +41,6 @@ IUSE_PROGRAMMERS="
 	+linux-mtd
 	+linux-spi
 	lspcon-i2c-spi
-	+mec1308
 	mstarddc-spi
 	+nic3com
 	+nicintel
@@ -62,7 +60,9 @@ IUSE_PROGRAMMERS="
 	+stlinkv3-spi
 	+usbblaster-spi
 "
-IUSE="${IUSE_PROGRAMMERS} +internal-dmi tools +wiki"
+IUSE="${IUSE_PROGRAMMERS} +internal-dmi test tools +wiki"
+
+RESTRICT="!test? ( test )"
 
 LIB_DEPEND="
 	atahpt? ( sys-apps/pciutils[static-libs(+)] )
@@ -97,6 +97,7 @@ RDEPEND="${LIB_DEPEND//\[static-libs(+)]}"
 DEPEND="${RDEPEND}
 	sys-apps/diffutils"
 RDEPEND+=" !internal-dmi? ( sys-apps/dmidecode )"
+BDEPEND="test? ( dev-util/cmocka )"
 
 DOCS=( README Documentation/ )
 
@@ -106,6 +107,7 @@ PATCHES=(
 
 src_configure() {
 	local emesonargs=(
+		$(meson_use test build_tests)
 		$(meson_use atahpt config_atahpt)
 		$(meson_use atapromise config_atapromise)
 		$(meson_use atavia config_atavia)
@@ -116,7 +118,6 @@ src_configure() {
 		$(meson_use digilent-spi config_digilent_spi)
 		$(meson_use drkaiser config_drkaiser)
 		$(meson_use dummy config_dummy)
-		$(meson_use ene-lpc config_ene_lpc)
 		$(meson_use ft2232-spi config_ft2232_spi)
 		$(meson_use gfxnvidia config_gfxnvidia)
 		$(meson_use internal config_internal)
@@ -126,7 +127,6 @@ src_configure() {
 		$(meson_use linux-mtd config_linux_mtd)
 		$(meson_use linux-spi config_linux_spi)
 		$(meson_use lspcon-i2c-spi config_lspcon_i2c_spi)
-		$(meson_use mec1308 config_mec1308)
 		$(meson_use mstarddc-spi config_mstarddc_spi)
 		$(meson_use nic3com config_nic3com)
 		$(meson_use nicintel-eeprom config_nicintel_eeprom)
diff --git a/sys-apps/flashrom/metadata.xml b/sys-apps/flashrom/metadata.xml
index fe748a74d4c1..a60db379da54 100644
--- a/sys-apps/flashrom/metadata.xml
+++ b/sys-apps/flashrom/metadata.xml
@@ -16,7 +16,6 @@
 		<flag name="digilent-spi">Enable support for Digilent iCEblink40 development board</flag>
 		<flag name="drkaiser">Enable Dr. Kaiser programmer</flag>
 		<flag name="dummy">Enable dummy tracing</flag>
-		<flag name="ene-lpc">Enable ENE LPC interface keyboard controller</flag>
 		<flag name="ft2232-spi">Enable ftdi programmer, flashing through FTDI/SPI USB interface</flag>
 		<flag name="gfxnvidia">Enable NVIDIA programmer</flag>
 		<flag name="internal">Enable internal/onboard support</flag>
@@ -26,7 +25,6 @@
 		<flag name="linux-mtd">Enable support for Linux mtd SPI flash devices</flag>
 		<flag name="linux-spi">Enable support for Linux userspace spidev interface</flag>
 		<flag name="lspcon-i2c-spi">Enable support for Parade lspcon USB-C to HDMI protocol translator</flag>
-		<flag name="mec1308">Enable support for Microchip MEC1308 embedded controller</flag>
 		<flag name="mstarddc-spi">Support for SPI flash ROMs accessible through DDC in MSTAR-equipped displays</flag>
 		<flag name="nic3com">Enable 3Com NIC programmer</flag>
 		<flag name="nicintel">Support for Intel NICs</flag>
diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest
index d2c81d1284f0..137983c4303d 100644
--- a/sys-apps/flatpak/Manifest
+++ b/sys-apps/flatpak/Manifest
@@ -1,5 +1,5 @@
 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 2354 BLAKE2B fc4791a4ca049737cd44a8b972c43bcfa64a565b259aab8dbe4f21bd8d7dc063ba6e78e45714874c40328b76012b997a51c4a34deb4ab847b49b8e75245c6558 SHA512 6458b51b5c4c009402b9b4ca04f7c9fcf08776535e1cab95867dbb95308d8dc28ca9015a0ece4319bf65da0953ce14e17ec92b18a8441a07835e82808b17822f
+EBUILD flatpak-1.10.5.ebuild 2417 BLAKE2B c6101934112c06a45808d798916d8bbbb422b945671d3b57f958f59030e7b4f7e5143de10a3955263c51b50060cc8ea8ed3b83af5cd95c6ecb4a58ed215fe73c SHA512 3da93b5a0a7581d4dd8e15970834b9044f17ecca60304c24143fc06280c710197ab8c11981e49a10d9c8cba54c0093e3074c16e30c1b963ea707850c9353e606
+EBUILD flatpak-1.12.2.ebuild 2423 BLAKE2B 0c40f9666929437cd0d6656143c41568c5a968dcd3215a9117fae3f1a84c9d2eb9f9833ae5db1b5b36de1c4913dc6f3e2d51ead94f28c7d4e4b816f4d398492b SHA512 7c579099711ab8033fba546c2ed922b02a56b4aafb51e45021fff81ceb31b635950d629e8743eb25bf763341c57d1da4e61bb9b7e64c5d20c427c6fbce70e965
 MISC metadata.xml 325 BLAKE2B a8ca5c0feaab721a66653a8d5e084d2bba127d75faa0975a4dac7d4d7395801fc69bed88bf13663826188696ee5e25e18afc1b0d5161d27e15f36b9c88487146 SHA512 2736f22e733f2214b80c46b3280f90103e21c3211bea129614bcf372f05803b5d5148d34406e8aa332f7b21090e8aaa698bb1a25d767ccea21d3977f0894f464
diff --git a/sys-apps/flatpak/flatpak-1.10.5.ebuild b/sys-apps/flatpak/flatpak-1.10.5.ebuild
index b8320f23f5c4..25071038bf1f 100644
--- a/sys-apps/flatpak/flatpak-1.10.5.ebuild
+++ b/sys-apps/flatpak/flatpak-1.10.5.ebuild
@@ -47,6 +47,7 @@ RDEPEND="
 "
 
 DEPEND="${RDEPEND}"
+# pyparsing version pinned for https://bugs.gentoo.org/825230
 BDEPEND="
 	>=sys-devel/automake-1.13.4
 	>=sys-devel/gettext-0.18.2
@@ -58,7 +59,7 @@ BDEPEND="
 		>=dev-util/gtk-doc-1.20
 		dev-libs/libxslt
 	)
-	$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
+	$(python_gen_any_dep '<dev-python/pyparsing-3.0.2[${PYTHON_USEDEP}]')
 "
 
 PDEPEND="
diff --git a/sys-apps/flatpak/flatpak-1.12.2.ebuild b/sys-apps/flatpak/flatpak-1.12.2.ebuild
index 0796956affd5..23536ed75525 100644
--- a/sys-apps/flatpak/flatpak-1.12.2.ebuild
+++ b/sys-apps/flatpak/flatpak-1.12.2.ebuild
@@ -47,6 +47,7 @@ RDEPEND="
 "
 
 DEPEND="${RDEPEND}"
+# pyparsing version pinned for https://bugs.gentoo.org/825230
 BDEPEND="
 	>=sys-devel/automake-1.13.4
 	>=sys-devel/gettext-0.18.2
@@ -58,7 +59,7 @@ BDEPEND="
 		>=dev-util/gtk-doc-1.20
 		dev-libs/libxslt
 	)
-	$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
+	$(python_gen_any_dep '<dev-python/pyparsing-3.0.2[${PYTHON_USEDEP}]')
 "
 
 PDEPEND="
diff --git a/sys-apps/frandom/Manifest b/sys-apps/frandom/Manifest
deleted file mode 100644
index 8da4b7c2fa79..000000000000
--- a/sys-apps/frandom/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST frandom-1.1.tar.gz 8146 BLAKE2B a18a97c4650376cb2e3c6abfa8b6043c69426f83c9607c36614007426b7734f89a537206e7656b3fd901d69111683592e4511d0c94c7b111c8e77e6fbe660323 SHA512 f64bd1bc1482d223f84f344554b04a4a413be32cf6c348e006b831e68eea0165f1231e194536bb6867450dfc901e80e765e71ba6369209ce579597ad1cdfdeaf
-EBUILD frandom-1.1-r1.ebuild 666 BLAKE2B a8cca754a2eb1443b5bbe1126543a15db028ddc7b83ecb1aeeaa8b948d2007c83ff56b4b119a87d26ab7a2666add988cd2184afce79706d5fc3693a2b4b328f2 SHA512 ce20ec724ccc68f9967abc0dd5072d743e8d8c355138a8333e4f23bdf975f0980bdd5ff234b441c2c953001d1f0e0c3c960eb11a72169e831006153ef9d2a51a
-MISC metadata.xml 335 BLAKE2B 9caf4de176ed0f1609fbd299641e52ca4757d45394ac18dbae0b3decc6c9d92de08ccf689edaafcc943d3bc3af8397de09f65a037aba95aabbb2cd9592c9e4fc SHA512 3224fea1e46ebed741de7554c5dba8044cb1138fb0c45d849f2344d54017a0f8e829ceb901c0f3e731439ab46b3124b6b628dd345f64be4840107ede28ab79ad
diff --git a/sys-apps/frandom/frandom-1.1-r1.ebuild b/sys-apps/frandom/frandom-1.1-r1.ebuild
deleted file mode 100644
index 45a10e79afc5..000000000000
--- a/sys-apps/frandom/frandom-1.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-mod udev
-
-DESCRIPTION="Fast kernel-land pseudo-random number generator using the RC4 algorithm"
-HOMEPAGE="http://billauer.co.il/frandom.html"
-SRC_URI="mirror://sourceforge/project/frandom//${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT="strip"
-
-BUILD_TARGETS="default"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="frandom(misc)"
-
-src_prepare() {
-	sed -i -e "s:\$(shell uname -r):${KV_FULL}:" "${S}"/Makefile || die "sed failed"
-}
-
-src_install() {
-	linux-mod_src_install
-
-	udev_dorules "${S}"/10-${PN}.rules
-}
diff --git a/sys-apps/frandom/metadata.xml b/sys-apps/frandom/metadata.xml
deleted file mode 100644
index 9f7f82c5e575..000000000000
--- a/sys-apps/frandom/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">frandom</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 64ffc1b72d15..4615cd45e2ce 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -3,7 +3,9 @@ AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c61
 DIST fwupd-1.5.9.tar.gz 3712637 BLAKE2B 17429bdc3073a92b94de9bc67ce1955e928e8d6aeefa5f0ad39a9d15457f96c562ce5cfbc47e1fc450c31c2b9334ca3902ed63ef809e8d2cb5b5459cc54dec28 SHA512 ccd1246ab5b3c876251924a14d1c2c553b2df5702c6673978b1d627ea1028c3950241f73dd54e2fecb5cc204a1dc77e6597f7514eff6467beb50be7874352d78
 DIST fwupd-1.6.4.tar.gz 3891113 BLAKE2B b4f3a629c0594ee69a0e2ea727c8080f63e970a6e9964b53d007e490d6b538f5441a65de20412673ded181611342c7c1c1ec16eb0d05c69c149f635fed325269 SHA512 d0c788313f8cf00c6e0e238436668ab5885133933cd74202d3eb4a3377d1b123689dd7f3827d45853c92b98196d5d896027b471117af461356e2f3c3ec82f58e
 DIST fwupd-1.7.1.tar.gz 4025627 BLAKE2B 035796e8ebaafe139b8b6e7014f51c6e16a228d0ef697984f86e31c28f38aa62bc7d3bd64466b3f3c83c2605b229d7b3063287373c83ec4d962adca3c85cc6de SHA512 c695b66ebbe23908f5d6ef6d6084c092af8754e0677f094ee4d09b02d904f3f3cca0e460c5345a835c16b7303bba72209e216ba28285e44bce4872fffa136a5e
+DIST fwupd-1.7.2.tar.gz 3922633 BLAKE2B aec40de0bbadba9a8688617bf2f1a79b8952b8a30ac011b3656a3dee312295250e370a09b4ea2fbf35992f0124a7aa78b6e17200dc57c768d75d9ce3a94f6f18 SHA512 9cf47d13e31eaf11e2ffddfd26a0fb23a18049bcd7a54a1cb4e96003db8134cf01bbe83e507b90d429df78e478cb3c97bdd3d2c0e194f02994ef4c5a15347521
 EBUILD fwupd-1.5.9-r1.ebuild 4380 BLAKE2B f47d3b9dc882649c85549f3139ea2cd6473c21eee0a1750076b7dfad7c04caa6641f36704bc9bf978e047e16f9a07f12fcc862b22697ae4091c7f5cac31c2256 SHA512 f5d965dc302cd77877f13c0ccc3a952c71a6463b56b5d7aafce11ef4d673e46f9c486159be6e2ccfd1229d42ea014598705b867d7aa7795a5c9e0caf51a76506
 EBUILD fwupd-1.6.4-r1.ebuild 4477 BLAKE2B 899806f95e598ce0823a8e5af810b4edc5387884393e03fb51f3fe81cf37eb2f4cb96ec8461b20a4d0b016c142a9cb05113fd1fa6249a6883b0d92b780c37e02 SHA512 71e80891822d1e1a84cfa742ddde3fd7d6213ec9374fdfc7153db66d18129be99fb4eac9f137aa7b246dc9643dc6ffd50a9b728e9fc6b989a955b31b8417c019
 EBUILD fwupd-1.7.1.ebuild 4607 BLAKE2B 2a4f91e570ce3d7f0c204e46e7abd02fc78a8828392610ab94e4e721a4ade946477fda9db231f59cf929b7e0e7539d2ff6821084306aa6defc3c890fbaa6532d SHA512 969c631fa511c55473d1521d886c74de978f139a77de701f37404300ee33cf987ba44bc07a4b634a9ad3c7d8426efca21d6f10af560495a5ff96e899dbd0402f
+EBUILD fwupd-1.7.2.ebuild 4692 BLAKE2B 4ac7f8d7829ee531775f4617cb35fbb389cbd6d4b0180376d15167d5959ea41a19c258a4bb2d21d20981bf39c120776524eb60894cdfddee9e6b1b05b72edfc9 SHA512 6258d44b5ae09ad8efb989abc73e427929839bb6b2ca7b03a354092ad3f7ba163f7d5692be91e868b2d3515563b9104fcd710fb3cf533c21e15ae4551f3034a0
 MISC metadata.xml 1493 BLAKE2B f75354ee9b89d3be913749ffc0d1e8d0d57946f1d785d6cbdab3c6670c790e99666c1943a662d0f5f054e22d3b97e1f8e739640efc5e04659d0a6723ee35b279 SHA512 6ea568ca9c8cba4e0db1f6c06d5e57f539602e5bfa1ce9be2fb9fc7107e1e42dde715c7bd0737ad60246569b0e9fad275a4c451c427451b9692410becb3b05d3
diff --git a/sys-apps/fwupd/fwupd-1.7.2.ebuild b/sys-apps/fwupd/fwupd-1.7.2.ebuild
new file mode 100644
index 000000000000..4db8a29b8c7f
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.7.2.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 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="amt archive bash-completion bluetooth dell elogind fastboot 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 )
+	fastboot? ( gusb )
+	logitech? ( gusb )
+	minimal? ( !introspection )
+	spi? ( lzma )
+	synaptics? ( gnutls )
+	uefi? ( gnutls )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="$(vala_depend)
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+	bash-completion? ( >=app-shells/bash-completion-2.0 )
+	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/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]
+"
+
+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 fastboot plugin_fastboot)
+		$(meson_use flashrom plugin_flashrom)
+		$(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 archive libarchive)
+		$(meson_use bash-completion bash_completion)
+		$(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/grep/Manifest b/sys-apps/grep/Manifest
index 6f0e25009ec1..bab444380fe1 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,3 +1,4 @@
+AUX ppc-musl.patch 706 BLAKE2B 5b5aff69fa1118ab22179b7cc937aaf1b9c0dd89df957814f68de2c40543ccf12dd8be4eeee29723043b72ac71bce24015986866c10f9ea92704c5e9b1245933 SHA512 c497e10eff10aa0706527438a3218ff5047622ad2c2ce2a2aa807341a352524cb955a3f5fa1f34a051c07a3f24ea395ec1276f11905ac988e5a2f57cb5caf646
 DIST grep-3.4.tar.xz 1555820 BLAKE2B 4e1924d6d5eb66faca93b405cce9784d726a476f26a384c3b44375cb09f817008aeedaa701a30b6c1f21c030902d603a80ec80105b2d5d76eadf09b910d573a7 SHA512 0f1506bd19971fbdcb47a111277ca63e8ad045456f096980852fd0a61c860f29f4b369bbaaa5cbce4b0a81718e3e3274d9a078b491f2109baa9a02ce600ee206
 DIST grep-3.5.tar.xz 1586396 BLAKE2B 62c98acb29b9998e60b64cacbe82df4f03a8d8a427a060d00283506155e6acadc4d77e8b8c2fa110227715c314ac7cde38a38eff0b92eb0ec793c59ba2562ea5 SHA512 8367aa930ecf7fa5c07153666bf7991097648bd7bf4ca672e6b14e0bb806c89991ec55d2880812877761cbde1d33562f22803835d74bfcd293c2246e274306c4
 DIST grep-3.6.tar.xz 1589412 BLAKE2B 86be3af6718ea3bf29982e1618c0ea9afc135f07e452a7ac8b618b863c0754a979482d4d418e558e703e03a4afcef7818a84ebcbe119aa63cd2892ad09e1a772 SHA512 8934544a19ded61344d83ff2cab501e86f17f8ae338892e0c36c2d2d8e63c76817840a0071ef5e3fcbca9115eba8a1aae0e4c46b024e75cd9a2e3bd05f933d90
@@ -5,5 +6,5 @@ DIST grep-3.7.tar.xz 1641196 BLAKE2B acf03b1fe8065dac48d686de070bab9ecddae65c97f
 EBUILD grep-3.4.ebuild 1497 BLAKE2B 0636337bf9ffff4e59273390408831eaa1f3eabea247712850e0e622bf415869e293dde7c6829a78654fab88efe1b2657ba738e08e75d252ccae37f4b2d95bc2 SHA512 f9964eefb816efd635f992566777385a86c2c429c1d2bbee8117057f88f8c8072d46a1fe0c55e52924bb7feeb8376351ec19aa307ba2d928c139a3b73fcb3c53
 EBUILD grep-3.5.ebuild 1783 BLAKE2B 6e1d754fe158ba0a919db4e2f1a9f365450067dfdac4072621a8f5a2ded5dc2d63c06e1741ca6939ecb40042718c76c42a0a8bbc9b37ffbad38f6c0a66feea68 SHA512 b9b92a7572712a2127bae0763cc7df70db86a5b2bafa9a7665d575d4e4b96f05889bf0473b579cebf38e2372852338be14d71c3ba336cd9010c74c3debd54e14
 EBUILD grep-3.6.ebuild 1760 BLAKE2B b642c2ecb17b684a16d4c4a89c03880e93b044d2b1b13c49cb0ecba1995119d88d7e413531bebc725575b4efbbaad4a4ece9281656b7b41e147e3d68268e939e SHA512 7adc72cb0669c752c84dfb8583b458c9359c70e550c225ababec1999a8e39622f18c1ac3ad2492da9bce629e99af0ac789669ceb0649559cd9f80744d6b75088
-EBUILD grep-3.7.ebuild 1753 BLAKE2B f1eeb92a24a82d742b782e34f3834534e3ca6764bb1051b41aad38c9b05f4a6db08a8aac56de5a2fe83fbeeed2b2914c6a2cec74b50cab09fc8f6d5a8099d9b9 SHA512 fedf34c15cf8bc807fb5dc2094b2b124d16f83acf3d5563e39d12f0a6376ad2f5d710fe6d0a9d1cf569cdcf8e8352b3ab6c8f0ee476cc661fa31efa920515dcb
+EBUILD grep-3.7.ebuild 1795 BLAKE2B 0c2b50cd25e04eb913ffbc4be8b015ed4fb9ea69dad62a3809b7abb4dce6bd0c06f298749f2628b6c23be3a568c59c3aaf34168990ee8abe855318551ba5cc76 SHA512 e1aeda6a167d9d938a7e5001f9592ac619229f92b8b6b99d28a3d33822a30303a01b2bd6117ea71d435292118632291d512ef78aa86a209879e56c101a46d254
 MISC metadata.xml 335 BLAKE2B 9348d579c8858b0764c9e6edc144183686945cac2a68eead6e5ad83d364d293292ec6ef97bf87ea5c146048757d080e157bf9edf101177a8854d77305d8a9dae SHA512 3ea8b4569cfadab59ecabcf13c25941f9ad0db6c15b0625760339224aa4c82dc99b102c59c858de20d3ab9399db38f47e23d1b360ff86cfba6ede73b548ea7ff
diff --git a/sys-apps/grep/files/ppc-musl.patch b/sys-apps/grep/files/ppc-musl.patch
new file mode 100644
index 000000000000..d7d8255a444a
--- /dev/null
+++ b/sys-apps/grep/files/ppc-musl.patch
@@ -0,0 +1,18 @@
+Needed to fix build on ppc + musl. Doesn't seem to yet be in upstream gnulib.
+
+https://www.openwall.com/lists/musl/2017/11/05/2
+https://github.com/void-linux/void-packages/blob/master/srcpkgs/grep/patches/ppc-musl.patch
+--- a/lib/sigsegv.c
++++ b/lib/sigsegv.c
+@@ -221,8 +221,10 @@ int libsigsegv_version = LIBSIGSEGV_VERSION;
+ /* both should be equivalent */
+ #   if 0
+ #    define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1]
+-#   else
++#   elif defined(__GLIBC__)
+ #    define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1]
++#   else
++#    define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) ucp)->uc_mcontext.gregs[1]
+ #   endif
+ #  endif
+ 
diff --git a/sys-apps/grep/grep-3.7.ebuild b/sys-apps/grep/grep-3.7.ebuild
index 7b142e4d63d8..2a4b293b29e0 100644
--- a/sys-apps/grep/grep-3.7.ebuild
+++ b/sys-apps/grep/grep-3.7.ebuild
@@ -29,6 +29,8 @@ BDEPEND="
 	nls? ( sys-devel/gettext )
 "
 
+PATCHES=( "${FILESDIR}/ppc-musl.patch" )
+
 DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
 
 src_prepare() {
diff --git a/sys-apps/hexdump-esr/Manifest b/sys-apps/hexdump-esr/Manifest
deleted file mode 100644
index 7503d4ef5574..000000000000
--- a/sys-apps/hexdump-esr/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hexdump-1.8.tar.gz 7463 BLAKE2B 337a388e86a360a7493b8e40fee0adca64e552d41477d341bf03f346d207ac3baa3fcf1ef9fc5b7be66e9f3b6b59ceb2ccd2bcce9550f1a17212aa28acc2dbc9 SHA512 a0f0b9f0386b895b0dd07223e93ca72a7d87f4b0ad663d340cea8266ed7e801178b120c6a78b797a9e12412e7b9c76b45b8e395d1892c7ba3956a90dee45db3d
-EBUILD hexdump-esr-1.8.ebuild 748 BLAKE2B e2215e64c0ca5af56e32700540375d3fcc9569ea2300e015f57ceefcd4e37c410626a485858b0f067c3dc3ad726442a4a6fc12a2ff1d80812d9648ac60eda6c2 SHA512 058de7a9f865100a25c6e96216f8107bdb08222990c9aef46733903fb45d3053f31481e9a2d89b8f07fdd81a11e07033790c9416cce34d7fe1de3de9cadf1cca
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/sys-apps/hexdump-esr/hexdump-esr-1.8.ebuild b/sys-apps/hexdump-esr/hexdump-esr-1.8.ebuild
deleted file mode 100644
index 6dae9efa9ce9..000000000000
--- a/sys-apps/hexdump-esr/hexdump-esr-1.8.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-MY_P="${P/-esr/}"
-
-DESCRIPTION="Eric Raymond's hex dumper"
-HOMEPAGE="http://www.catb.org/~esr/hexdump/"
-SRC_URI="http://www.catb.org/~esr/hexdump/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-# tests are broken in this release(missing files)
-RESTRICT="test"
-
-src_prepare() {
-	sed -i Makefile \
-		-e "s|-O |${CFLAGS} ${LDFLAGS} |g" \
-		|| die "sed on Makefile failed"
-	tc-export CC
-}
-
-src_install() {
-	newbin hexdump ${PN}
-	newman hexdump.1 ${PN}.1
-	dodoc NEWS README
-	dosym ${PN} /usr/bin/hex
-}
diff --git a/sys-apps/hw-probe/Manifest b/sys-apps/hw-probe/Manifest
index 22cbfde9c5ff..0eab0a0496e7 100644
--- a/sys-apps/hw-probe/Manifest
+++ b/sys-apps/hw-probe/Manifest
@@ -1,7 +1,4 @@
 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
+EBUILD hw-probe-1.6.ebuild 2378 BLAKE2B b5d4b7dcc91ee79212b822f31cc4ed11e9576d5e3adf2c6f6d9a4d24710f4819da5a583e74637fe0ee8e8c360f45b41b30f5f03030b19a829f6be3c244930251 SHA512 71702ce2eb01ff59a6da2310722036c71c5b672eac5eb238805e68fb80035dea1c43143f6b9746f570d80e749abd34e66069777708293ce7215549942a1b5cc7
 MISC metadata.xml 647 BLAKE2B 522741fd8d5f7b64d686ce02dd5ccd7d9ba42df1e50a3e51921fa17c110c6db114ee22d5a903c8bb61a2a5f3884fad5e8b1a929a062af111fd52faf047638ab1 SHA512 ef6e4af1150d72b3cc26ba56267dae006ae8a19a8df2606a9f02df0dc6b091f0bd3dd9caee2171e896dd7b5e582b853f228e899dbd9281dd07b435a1da1f6b7b
diff --git a/sys-apps/hw-probe/files/hw-probe-1.5-disable-automatic-upload.patch b/sys-apps/hw-probe/files/hw-probe-1.5-disable-automatic-upload.patch
deleted file mode 100644
index 4f16c0d87fae..000000000000
--- a/sys-apps/hw-probe/files/hw-probe-1.5-disable-automatic-upload.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 6a211f965c21f1aa2e8612bcd7e2966ce8e8c607 Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <conikost@gentoo.org>
-Date: Wed, 23 Sep 2020 22:26:45 +0200
-Subject: [PATCH] hw-probe.pl: disable automatic upload
-
-Due security concerns, running 'hw-probe.pl' without any parameters
-shouldn't upload directly by default all data. Instead, the user should
-add '-upload' if he really wants that.
-
-Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
----
- hw-probe.pl | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/hw-probe.pl b/hw-probe.pl
-index b71f250..1bceb0e 100644
---- a/hw-probe.pl
-+++ b/hw-probe.pl
-@@ -217,15 +217,13 @@
- 
- if($#ARGV_COPY==-1)
- { # Run from STDIN
--    print "Executing hw-probe -all -upload\n\n";
-+    print "Executing hw-probe -all\n\n";
-     $Opt{"All"} = 1;
--    $Opt{"Upload"} = 1;
- }
- elsif($#ARGV_COPY==0 and grep { $ARGV_COPY[0] eq $_ } ("-snap", "-flatpak"))
- { # Run by desktop file
--    print "Executing hw-probe -all -upload\n\n";
-+    print "Executing hw-probe -all\n\n";
-     $Opt{"All"} = 1;
--    $Opt{"Upload"} = 1;
-     
-     if($SNAP_DESKTOP or $FLATPAK_DESKTOP)
-     { # Desktop
diff --git a/sys-apps/hw-probe/hw-probe-1.6.ebuild b/sys-apps/hw-probe/hw-probe-1.6.ebuild
index 504704b069f7..052acb3c44fa 100644
--- a/sys-apps/hw-probe/hw-probe-1.6.ebuild
+++ b/sys-apps/hw-probe/hw-probe-1.6.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${MY_PV_BETA}"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/sys-apps/hw-probe/hw-probe-1.6_beta2-r1.ebuild b/sys-apps/hw-probe/hw-probe-1.6_beta2-r1.ebuild
deleted file mode 100644
index d10255310db4..000000000000
--- a/sys-apps/hw-probe/hw-probe-1.6_beta2-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.5-disable-automatic-upload.patch" )
-
-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/hwdata/Manifest b/sys-apps/hwdata/Manifest
new file mode 100644
index 000000000000..d093497fc327
--- /dev/null
+++ b/sys-apps/hwdata/Manifest
@@ -0,0 +1,3 @@
+DIST hwdata-0.353.tar.gz 2206215 BLAKE2B e1c30d7d486a2f03eb8b59dfc12544a5e5a988295d5dc220e2d6a344991c62d8ded0e8e71a8b0907fb9fb7fe0bac8528386cc4665c903362db6ed6f0a6985b94 SHA512 f4bdea533a1cdf406d065da6a684b131b30f6a0b8fb791418d54b756c9297da981a8e25e128ef97af50ae88553e1473dba17a29c11a15490065faf9bf2dcd0d4
+EBUILD hwdata-0.353.ebuild 701 BLAKE2B f5ce8ea8926567d3966eb2f5acd4f794580627db5a26da3e71c835040dce80f33f84929106408ddd18a58c521619a83b5b2900302bc4ebb421853f708386f472 SHA512 145caa35bf70bc0ec2be24d6241cdff93bb118bd79e8227fb6715d58b86923c503e02c5bd3bf077d59e1a4277f693720432d877278390ac1fa602e198bb439b0
+MISC metadata.xml 248 BLAKE2B 4d2533691da4a661545bc76aae55b72077dd0f54a21c67450fad5565393db92779160e268c4ac7e1557cef6ac13e9476b32c6ff6e516c3afd404ab40a28164b3 SHA512 5c660412e95fdb471f41390d1d2fe96c549f2a00c932b2ce5832a56d3ce49df6b08991bfdcabcb296434d0d6599bdb3fb1ec4dbf7373fe2effaa6655ab411184
diff --git a/sys-apps/hwdata/hwdata-0.353.ebuild b/sys-apps/hwdata/hwdata-0.353.ebuild
new file mode 100644
index 000000000000..e6dfcf28e7a4
--- /dev/null
+++ b/sys-apps/hwdata/hwdata-0.353.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Hardware identification and configuration data"
+HOMEPAGE="https://github.com/vcrhonek/hwdata"
+SRC_URI="https://github.com/vcrhonek/hwdata/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+RESTRICT="test"
+
+src_configure() {
+	# configure is not compatible with econf
+	local conf=(
+		./configure
+		--prefix="${EPREFIX}/usr"
+		--libdir="${EPREFIX}/lib"
+		--datadir="${EPREFIX}/usr/share"
+	)
+	echo "${conf[@]}" >&2
+	"${conf[@]}" || die
+}
diff --git a/sys-apps/hexdump-esr/metadata.xml b/sys-apps/hwdata/metadata.xml
index 85e4ed814fa2..8cb7f9b298b9 100644
--- a/sys-apps/hexdump-esr/metadata.xml
+++ b/sys-apps/hwdata/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index ba0308bc0aef..58ecd56d62cb 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -1,4 +1,4 @@
 DIST hwids-20210613.tar.gz 3867741 BLAKE2B 64c4b0a83058a2052f7b132241008a3cc75452e93a9a57a9159c357c23fd09ee256abc2b94e700b5d8e8bd4e231ae12932d2c2f32fb03853207739cb3387047d SHA512 4568f6b8c0ca80ec772bd2785d4dc169d1d13a721472a15399158d9a7f31abbe414c5c8cfdf1a3b81cce4e33742a4b6e005e97e3e907643d0afdc8e953624fea
-EBUILD hwids-20210613-r1.ebuild 1812 BLAKE2B f81e6e1eeeefbf33fa23caa13b2be3aeb65ca27e937f42b9f549f67c6a735d3660a6b500c034970c53caa8fe69a6e0a48d042a591c5f6cef678727bf5b29bcd4 SHA512 fb676007968823fa172fb931218355cb56a77825f1468cd4c6fff4dd078d9b7d2fbdc8ce913a1e519dfdf866339c0feaeb1210514cde3e7355369c3aa8c89c9d
-EBUILD hwids-99999999.ebuild 1867 BLAKE2B baf5245fdaa4bc338b5548e9c99cca5ea3441cf237c4c1bb9ce26b8bdd0eaf24f45182a6e6e959385d334102994878e438c712c2eb037b613c8a75c16439b753 SHA512 0c24ad14a699b5e43d3f1856b051222a57313229524271cb137fcf334496ce95b29afda445e6df7142aedab9f8dfe30843394000904d0ca8007d77b2c163ca07
+EBUILD hwids-20210613-r2.ebuild 1815 BLAKE2B 2d6f63cc7f0d087f82e925413eafaba4719ce8fa7e62398a2713b9a064a2815915b6e49cbb2bd87fffb2916829c2247bc0341321c28fb87f6c3dade934d559e0 SHA512 c63987d13e542af70492fec4e7b8d7c8cba8d827a201ee62b403b5e62c8c1796799dd5eb0e1796c1b35caee80f7f662fa970a08566f702d50882250f2b6374ee
+EBUILD hwids-99999999.ebuild 1870 BLAKE2B cb582e874eec58c42234fa7293f3299c35c3c5cb4938c843d421b786435711a8c22a114fee47a445db71b725a5c587b5be60f5b9f2fece98096970197e483ec0 SHA512 5e75f240ecf5e3277632657e8dd6b73b9374b84ca27f7b3dfddef424038490b3731eb7731189da432f48b1412fd922a2b0d91d94dc0d4584473c59f8af005701
 MISC metadata.xml 688 BLAKE2B ed9af9131f4c007d87fc53131f1359c7f9f52d5a1786bb5b2f5c52742bc7ca14a851efd913749ca9dc922264571faa832c570e4cf593691d50e381eb61784fe8 SHA512 de901bae177f28c7887ef474c7fcc440fc4450c00af4edc66813a33983ac090163d8a466b86fd79bb61a9a124bd084bc03e005040b3efe70a4e2864112c6278c
diff --git a/sys-apps/hwids/hwids-20210613-r1.ebuild b/sys-apps/hwids/hwids-20210613-r2.ebuild
index b549c583317e..1918ad974880 100644
--- a/sys-apps/hwids/hwids-20210613-r1.ebuild
+++ b/sys-apps/hwids/hwids-20210613-r2.ebuild
@@ -22,7 +22,7 @@ IUSE="+net +pci systemd +udev +usb"
 REQUIRED_USE="systemd? ( udev )"
 
 RDEPEND="
-	systemd? ( sys-apps/systemd[hwdb] )
+	systemd? ( sys-apps/systemd[hwdb(+)] )
 	udev? ( virtual/udev )
 "
 
diff --git a/sys-apps/hwids/hwids-99999999.ebuild b/sys-apps/hwids/hwids-99999999.ebuild
index 8c09f82f4f23..a4f483a3048a 100644
--- a/sys-apps/hwids/hwids-99999999.ebuild
+++ b/sys-apps/hwids/hwids-99999999.ebuild
@@ -22,7 +22,7 @@ IUSE="+net +pci systemd +udev +usb"
 REQUIRED_USE="systemd? ( udev )"
 
 RDEPEND="
-	systemd? ( sys-apps/systemd[hwdb] )
+	systemd? ( sys-apps/systemd[hwdb(+)] )
 	udev? ( virtual/udev )
 "
 
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index ab24a1c4b7f0..08761daa70cc 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -5,6 +5,6 @@ DIST hwloc-2.5.0.tar.bz2 6688349 BLAKE2B 684367afa5fc056b9bf04b3a95bd8239ec70127
 DIST hwloc-2.6.0.tar.bz2 6728585 BLAKE2B 96099ae3527e11a83adc068e07756752d2effa38b4bae174045e5142a3457af8790e9fd3d778ff2d91708101aaf6e108affed7688918195e0f2bdbd55235ad46 SHA512 3f35ee685507469e2c7d4a2ab4c339eff24123b4bc21d96bc53fd2737a36bdd371f1e1e4440b410ecac6cf1881562187243bfbf846203cb3702a4c4c7be0d5df
 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 2929 BLAKE2B d2700b93da84746f22b26ff5b37b63fe7dfa25a33a4bc6e5deda9695241807ceb3a58c4dc787cc8fcf841a5070ca5435f20e2d54a834d5184d2a953b31de74e4 SHA512 99aa8785173360b31b3bfb1503902c911abe9600f559519c90c3b85bd02d165bf0de210d2d4a24898d559ddd007c8fc41c9c3649298cd89f079714b87a84f144
+EBUILD hwloc-2.5.0.ebuild 2927 BLAKE2B b55f392b146a4c650c6bff2efefbe486310d8b5bb89b356d4d890d5b3065f76ffd020458f104addc7dee721db55e87f92cb9e43c6b7fec8271f0d713c7a5519c SHA512 d1525f36a8e4bc523261414959ff71c48d5170fdf1d72dae8a748d5e5a4934e20c36054fae276c272234671bc0b93e83563e9f8ca5e5e1dca3a708ca611f02f9
 EBUILD hwloc-2.6.0.ebuild 2978 BLAKE2B 4c2bee72a5dc36d0f21a1bae9f30bcdb776841aec10ed1f85f310c381ac3e67e1dd2b7c9039b09350a9e3c695e8d53414269429d3ff065a0a860f06e77343f4f SHA512 e314467f21584298bd9143928e22f5a0208933ea16a7c2738d7acb0a4ddb802f7aed8395cfaa3a5592c4ab4d4b7db904b5706c513a82251b36c2987fe377a534
 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 0134baeceb16..62f46fe05946 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/inxi/Manifest b/sys-apps/inxi/Manifest
index 5dd4b4221810..e589d2e20168 100644
--- a/sys-apps/inxi/Manifest
+++ b/sys-apps/inxi/Manifest
@@ -5,5 +5,5 @@ DIST inxi-3.3.08.1.tar.gz 467132 BLAKE2B c0254174c0a48936e1f183c16f985838cf74302
 EBUILD inxi-3.1.06.1.ebuild 807 BLAKE2B 448c656ce3d29ab6068ef103521cb60cec55d27e74294d98885230a1a3b437999187f9633af2b30e61ee8235067750152bd0a67394e4cd071adccc836ef9fa9e SHA512 6f48f6171bf6bfea9bafe1540d7f2a3ad809e3a422a9988420599620133dddccae19423e74998ff988b6e42e45317563884aa4a265b15e9137e635426c5e3004
 EBUILD inxi-3.3.04.1.ebuild 812 BLAKE2B a1889935dae2f8bb4e2b123f40092a2afe972638165475caab81518b1c07320179cd6f36d66193675f885ffaa1ca8b1bc4d1e7b66f3c62d22c51f3166a1d4b5f SHA512 44641459e267d3bf1a8ecf96cff0d54352bf8faf261e33fa751ac1d79f7a6b718ef958300b79858f17362562f2883cf7d0523dcee2d665ec55d2818aefd9dd53
 EBUILD inxi-3.3.06.1.ebuild 820 BLAKE2B 729a7050c2a4227dc0ce4b0c01d6c2a8c545682503312d552e8f5f9018aa04354abe2370ac6b97e97cafd4d6fb9a8af3caf62b79caa4bb71ccdd57fe95ec4f29 SHA512 2cb0591495315c2292549627f3c205613caa14d631f147f3890ee208cac8ff4afc07c3d6e9446f12aa403608b4b520110411c2a90d5ffe9d98e73bc5c5100cb2
-EBUILD inxi-3.3.08.1.ebuild 820 BLAKE2B 729a7050c2a4227dc0ce4b0c01d6c2a8c545682503312d552e8f5f9018aa04354abe2370ac6b97e97cafd4d6fb9a8af3caf62b79caa4bb71ccdd57fe95ec4f29 SHA512 2cb0591495315c2292549627f3c205613caa14d631f147f3890ee208cac8ff4afc07c3d6e9446f12aa403608b4b520110411c2a90d5ffe9d98e73bc5c5100cb2
+EBUILD inxi-3.3.08.1.ebuild 827 BLAKE2B 7723e141a95cbafb5a890d0c8b845708a1c42cc705a821bc4eb8fcf82162a9e4d6def5db855031f0160e842b5f3b64ad601152c9bd248c9899258d12b52acefd SHA512 841094ecc09d3e471ebe5442518c0ff027cf476097e6e92c9ba81d33a3346de9bd1d561c180848fe08f2bb2009124db01c0450c3e8b93b23a3d36c7fb70ba23f
 MISC metadata.xml 613 BLAKE2B f444aa0759120064814cacf0fcba57059d87b1c014d78eea52304fb3afb9da9b905e30c1cf1399bfbc0d66442e3d892eb2657543014b905f2bf9a943dc8480d9 SHA512 cbe6e76cb003bb77134398aa1db5a24c47de826eb1f17b07e2cee647b9d58948596c2f4588c7c834332c096ce8b782799f07ed4f47a7b252e85e402324ba76bb
diff --git a/sys-apps/inxi/inxi-3.3.08.1.ebuild b/sys-apps/inxi/inxi-3.3.08.1.ebuild
index 3c22d8270f60..061f12f02b3c 100644
--- a/sys-apps/inxi/inxi-3.3.08.1.ebuild
+++ b/sys-apps/inxi/inxi-3.3.08.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="bluetooth hddtemp opengl"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/linux-misc-apps/Manifest b/sys-apps/linux-misc-apps/Manifest
index 09efccbdfa4c..ba570e8d00d3 100644
--- a/sys-apps/linux-misc-apps/Manifest
+++ b/sys-apps/linux-misc-apps/Manifest
@@ -1,5 +1,5 @@
 AUX freefall.confd 147 BLAKE2B b8fcd23306df7122e47e765dcba00cbec0fa7e2d9758d606e7e80cd3195b3fb7bce976fafef801812b425827f99689cde668106430119fcb57767bc816de635f SHA512 556472ab75ab8d3ccbedc44902a34bdef433430aa86fe5d8a125b27101f81e9c7c77e5a1fdfa84aef35078046e4b27a33eeb17d1745871f9e1f41e0ef64b2ba9
 AUX freefall.initd 1111 BLAKE2B c9c5de16da61124a4e984b47ca7cfa368cb5d02bfa85286f2cb9eaa50557da1b55d86b7a5beba5a5db60653c4a84b57276edc982782b7f8509d9a33cf45956e9 SHA512 e4d4d724276d9b64b80b29be5c28b9efc15556dd31545c85e45253aec2305d37af4b60a0be3f2f279c76c27aba5a968053a9bab7d08f2d559277701fd84375f4
 DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
-EBUILD linux-misc-apps-5.8.ebuild 6544 BLAKE2B 28a99d9acc4bd41c57b3ccb4beb2f51c276daa30d9f001695a87ac258d3debd28d67a3aaac19405832e83d61bb012d457acec79769b26c6b58890b111980314b SHA512 1c6c083cb8e32fb3cdd4a70417ef070ff7fe959759911ca9a5f67b82ddcf28964b5859e58d6085c8c661ed813b027ac58ff970de91a1c1dcad2b70d6a3193689
+EBUILD linux-misc-apps-5.8-r1.ebuild 6547 BLAKE2B fad7d15978d4be3845be69d9feb8d9bf968db5fb47b4c624c5e448ae7f4b5699744aac3fd5f59e20645a73f99a70d33d37b8a2a35c70ec4687cfc069a7424620 SHA512 b3c406b2f5b3654c119313882711ba48ae555c2c867cd145e8e058fee1207e6553525eb339a0ede9f1b08fa5fe1d0db66795df2a816a7ae765d733214db6e6d9
 MISC metadata.xml 319 BLAKE2B 6e9089b60c04b70d9201f28d9dbb92feebdd9626ec0a8283aa35ca6da730e2b4fa05a6ae5414409e35b8d0ce7299bc57ea5dedfb79e265a7cfb69fef92121cb1 SHA512 000c8949d342ff8cbfbffd714877e51dda73891af1deb77275dbf921fab9ff41eb217662254195c55bcafbe822d2e9bb3e49bc0b7791a4fcd61eb8848a1b1a4e
diff --git a/sys-apps/linux-misc-apps/linux-misc-apps-5.8.ebuild b/sys-apps/linux-misc-apps/linux-misc-apps-5.8-r1.ebuild
index 305b9ee03e9a..d89ebc89f32a 100644
--- a/sys-apps/linux-misc-apps/linux-misc-apps-5.8.ebuild
+++ b/sys-apps/linux-misc-apps/linux-misc-apps-5.8-r1.ebuild
@@ -43,7 +43,7 @@ SRC_URI="${SRC_URI} https://www.kernel.org/pub/linux/kernel/v3.x/${LINUX_SOURCES
 
 # pmtools also provides turbostat
 # usbip available in seperate package now
-RDEPEND="sys-apps/hwids
+RDEPEND="sys-apps/hwdata
 		>=dev-libs/glib-2.6
 		>=sys-kernel/linux-headers-${LINUX_V}
 		usbip? (
@@ -144,7 +144,7 @@ src_configure() {
 		econf \
 			$(use_enable static-libs static) \
 			$(use tcpd || echo --without-tcp-wrappers) \
-			--with-usbids-dir=/usr/share/misc
+			--with-usbids-dir=/usr/share/hwdata
 		popd
 	fi
 }
diff --git a/sys-apps/lm-sensors/Manifest b/sys-apps/lm-sensors/Manifest
index 541cba933b5e..01a302fa67c7 100644
--- a/sys-apps/lm-sensors/Manifest
+++ b/sys-apps/lm-sensors/Manifest
@@ -8,5 +8,5 @@ AUX sensord.confd 695 BLAKE2B e435c63a48da41218b793f9beefd5f9d1702aa80a525ca378e
 AUX sensord.initd 574 BLAKE2B bbc4e39d6b906a0e7539c4521420b9da686722eb6d26d486c29554c2cdc1b8c45d770c5e587f707d4fad0e34e083b2388dda194908a78c89e3ad4606cd61e464 SHA512 69abc9a92bfffae59f17a93e4792fd1f6b64285271693a443e1007adb73f95cb62a8dbf318f407f60fb3e3573d0e7ea11357076f14dbb58a0964f7b0bfe30b4a
 AUX sensord.service-r1 155 BLAKE2B 8a61565976b7d333dfb257d0e57a18140229bedb44fc095446e64de85d829f3d34802d4f762967cc503d527b8f28deaeaf3e0a93b3a4384b9c9b62a8b71d4dfe SHA512 83132636209f3e3717edad28ed230f767ee8bf00eabf3036238f64c370d1e42db1c14d1ed965c650da8aa3a6deb3ce7a0794425491ff7f8ce67e2fde934fc4fb
 DIST lm-sensors-3.6.0.tar.gz 273209 BLAKE2B d05efa2bf5f052158a9b3f8bbe925d45a8e00fd7fb07490ddf6c87db786c803fbe8a728693f36c301269b995c72d510657d02f2e94fbbe5a7e9f50a36214635b SHA512 4e80361913aff5403f1f0737fd4f42cffe43cc170ef48fff3914c9952f71990739d723f7b0b8120d9a01bcbbc829e964cfbd0a5cf18508af8f8dc825b49860bf
-EBUILD lm-sensors-3.6.0.ebuild 6444 BLAKE2B 2a8b5e5cad51b9a3cf8da1341b1fdda4b10a7b35f47a79a13734363580026ff21773204381c85192a2c3e8bcc8b0f4206b0c2ad73cedb1a85fbc961c475727b9 SHA512 31ee337e9aecf8bd066432b8fbfa4070ec84fd47d68bbdb9ce15733f4478af22b6900b256d22dbc8afab2adacde08f655da477d2c8e2b963cb4f1d1a7d10179d
+EBUILD lm-sensors-3.6.0.ebuild 6622 BLAKE2B 9e80658c28faa3254b57667c215d524854db92d2352106d7233053dbdf3b32732319de1d8cab12bae51bb114214474b543c4fea5cf7d2c720e155d76f6ca2a82 SHA512 1b8f7628e7a11ea350d79533950087428acd4c94925e2b335f9f15ba70064b5ac87097bc4219171b823d7a6e623a4078e137014d6bd7bde1461bc4633ac79491
 MISC metadata.xml 944 BLAKE2B 51d63cd4ecf93033ee09f766a240778fd71f666f26cab5b6e8cb19a10dcb174e88feb69d4dbea5e3d4b35a12d7d52dad7a96f8f53d6e3e366dd1383b9e5aaf22 SHA512 2bbd482a716a6cccd84d4ed299934205b6fcdb77c4e12805791273ca5b7d64d27ecd75f2a877bdcfdcd7a9c4e0df2b18a1e1045e4f5194f6169716893b459289
diff --git a/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild b/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild
index 1fcbdb4b3826..9fba4b6c08e2 100644
--- a/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild
@@ -134,7 +134,13 @@ multilib_src_compile() {
 }
 
 multilib_src_install() {
+	# We need to set CC and friends again here to avoid recompilation for cross
+	# bug #799851
 	emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		LD="$(tc-getLD)" \
+		AR="$(tc-getAR)" \
 		DESTDIR="${ED}" \
 		PREFIX="/usr" \
 		MANDIR="/usr/share/man" \
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index 69c99cb6f94e..489f81ac3a66 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -1,3 +1,4 @@
 DIST lshw-02.19.2b_p20210121-B.02.19.2_p20210121.tar.gz 2469481 BLAKE2B b9a886c21d6abde00f234cc93fc25ae2b4cf734ffd3fdea7847283fa44eef80bfddd6d83ab428c126ef6518eb8da35f3ba15d88cfc5dbb304813a4d28c173351 SHA512 699ee270eb9a8dd6652d7bcab5d99187585159428bdceab2e17add51e29d73a929a4d34168d92308e775383b9920b07e3b02e0781f9f1b1f099aff3550e9b0c0
+EBUILD lshw-02.19.2b_p20210121-r1.ebuild 2274 BLAKE2B 8378c433b01bda5db13ffef3d0eb8bba5137bdf6a631be8c1709d6ea1652aa439f1243c2c054ef9f07cfd87774f263e1b3b9e29f79872c22df3856482109a7ad SHA512 b1e5f955ae40158e2c509de07636c55a23b26b9d5eb6bb4dd86c9903cbbf20afa8840eb318b4e57c354c8a35a3b216ebd2df0efec6ddcfca7a9cad60d4a9c44c
 EBUILD lshw-02.19.2b_p20210121.ebuild 2262 BLAKE2B 76c1c74029c8115c2894a8bc13683cff4afe075442c2e09a81434dd799e329c5780e4c83420d70dad22f6644e9313a8f64b35d18e6c49859878090769e6e22c1 SHA512 ec6a140e7f30ab39965beef848362e8a20672f8da50fd670aac236f5d9caa97f4e555849468231fbd38631600f910f13b6c342b68a30c7f0ce93c45835ce3280
 MISC metadata.xml 462 BLAKE2B 0eca79307d6db1495a4799c970f6de55239b0b3b3636fb6ab833eccf824ed6569206a33272a2dbbc420d8f3d746ee8db7312fbc56f119f068634043699705e0a SHA512 948063d79d644ddfd3b559a7f113c73fa45a43d9282aad12400444d7e9431db44e0a5ef75fc0d866cfae9e0b67859df2b5996512e9eb296622546cb2bfdea9e7
diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121-r1.ebuild b/sys-apps/lshw/lshw-02.19.2b_p20210121-r1.ebuild
new file mode 100644
index 000000000000..494cae1b8fc3
--- /dev/null
+++ b/sys-apps/lshw/lshw-02.19.2b_p20210121-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES='fr'
+
+inherit desktop flag-o-matic plocale toolchain-funcs xdg
+
+MY_COMMIT="fdab06ac0b190ea0aa02cd468f904ed69ce0d9f1"
+MY_PV=$(ver_cut 3 PV/b/B).$(ver_cut 1-3)_$(ver_cut 5-6)
+
+DESCRIPTION="Hardware Lister"
+HOMEPAGE="https://www.ezix.org/project/wiki/HardwareLiSter"
+SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="gtk sqlite static"
+
+REQUIRED_USE="static? ( !gtk !sqlite )"
+
+DEPEND="${RDEPEND}"
+RDEPEND="sys-apps/hwdata
+	gtk? ( x11-libs/gtk+:3 )
+	sqlite? ( dev-db/sqlite:3 )"
+BDEPEND="gtk? ( virtual/pkgconfig )
+	sqlite? ( virtual/pkgconfig )"
+
+S=${WORKDIR}/${PN}
+
+DOCS=( COPYING README.md docs/{Changelog,TODO,IODC.txt,lshw.xsd,proc_usb_info.txt} )
+
+src_prepare() {
+	default
+
+	plocale_find_changes "src/po" "" ".po" || die
+	sed -i \
+		-e "/^LANGUAGES =/ s/=.*/= $(plocale_get_locales)/" \
+		src/po/Makefile || die
+	sed -i \
+		-e 's:\<pkg-config\>:${PKG_CONFIG}:' \
+		-e 's:+\?make -C:${MAKE} -C:' \
+		-e '/^CXXFLAGS/s:=-g: +=:' \
+		-e '/^CXXFLAGS/s:-g ::' \
+		-e '/^LDFLAGS/s: -g::' \
+		-e '/^all:/s: $(DATAFILES)::' \
+		-e '/^install:/s: all::' \
+		src/Makefile src/gui/Makefile || die
+	sed -i \
+		-e '/^CXXFLAGS/s:\?=-g: +=:' \
+		-e '/^LDFLAGS=/d' \
+		src/core/Makefile || die
+	sed -i \
+		-e '/^#define PCIID_PATH/s:DATADIR"\/pci.ids.*:"/usr/share/hwdata/pci.ids":' \
+		src/core/pci.cc || die
+	sed -i \
+		-e '/^#define USBID_PATH/s:DATADIR"\/usb.ids.*:"/usr/share/hwdata/usb.ids":' \
+		src/core/usb.cc || die
+}
+
+src_compile() {
+	tc-export CC CXX AR PKG_CONFIG
+	use static && append-ldflags -static
+
+	# Need two sep make statements to avoid parallel build issues. #588174
+	local sqlite=$(usex sqlite 1 0)
+	emake VERSION=${MY_PV} SQLITE=${sqlite} all
+	use gtk && emake SQLITE=${sqlite} gui
+}
+
+src_install() {
+	emake VERSION=${MY_PV} DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '')
+	if use gtk ; then
+		newicon -s scalable src/gui/artwork/logo.svg gtk-lshw.svg
+		make_desktop_entry \
+			"${EPREFIX}"/usr/sbin/gtk-lshw \
+			"${DESCRIPTION}"
+	fi
+}
diff --git a/sys-apps/lsvpd/Manifest b/sys-apps/lsvpd/Manifest
index b610c3f8b423..75358052dc35 100644
--- a/sys-apps/lsvpd/Manifest
+++ b/sys-apps/lsvpd/Manifest
@@ -1,5 +1,5 @@
 DIST lsvpd-1.7.12.tar.gz 90806 BLAKE2B 1b55c463602105c36654f7baaf5d7c8f27ec045f35a648e87327f5b0b1c19ec62f5701a48d51114435dc5edfc503b78c35eb109a7982d6e6c10df4dd0d20e4a1 SHA512 0a37a580432004c359080edd2b07ea44a68dcf81621e0ec3a89cf7c4ca0f64a29143cee154a8d39c1411f64bf229a8a19f10d9f2c95971374b97a4c05b1c1523
 DIST lsvpd-1.7.13.tar.gz 93269 BLAKE2B 9b92de69b810314dd8c84e300fabcce2117b16373b68c7e414cd6035f1b64f90fec2e2c4f0b623263d0f7de1e499464139e7b8ffa30e2e13b76fce50ea67ff4c SHA512 99039b622051a24d1d17a014a81c6909a403c4b3746c2e4e62b0822f1d14319b3fcd5c82c13ec240ef2110c8a08de5b74a39ed0dea8a482977a475566cd83d3b
 EBUILD lsvpd-1.7.12.ebuild 598 BLAKE2B 7693e27284afd64ec727f8ea620ac64164cda00c7df76ef390529b6838815e06b0faa985df66675a73c459464634c6e69a48d6c499fbfa5bbba3969d2c3fce4c SHA512 cf883c99713be270444d57c679a79fb88f1037a2b26d5434ad9aebc4055159776156ec7e0b415eabe4acb07f6f2431f0e61a96b78f8ba342439dbd8b2ac50bf4
-EBUILD lsvpd-1.7.13.ebuild 599 BLAKE2B 1ad60516626735e8d159892fdc8afdf1864d8ec468eb3c192a84d739d8cef983d853444a21c84b7b949bdad360bdb42b504e36d361ca26f7ac39f13abad5e6cb SHA512 01daa8ec44f644ae5dae5a4729a46858e72c55a2c79eb6ec91a0c5e92ae58b50d390cadba8ccde3d6624f9723a4a9f098763741cbaab83f25e0c543bb85312d7
+EBUILD lsvpd-1.7.13-r1.ebuild 600 BLAKE2B f306bd8e4e08121ec604d9ff6ab3bf60f953da47c098e705f87ba4253ee18a9fd0f6c519ecea0b6146a9e71c465cc84261f95ab876e77aeb9b2bbee88f3737c3 SHA512 f4984f2c8d28aaba19497d1ea55914e86db0dd8a75ef534ffe9868642dfa2baf04e3ebd5d15bd7994d74b2dec7981e0315ca6debfdf546c9a4c27ba5893dceb0
 MISC metadata.xml 989 BLAKE2B 7ebdc7122186b4592922dada5663240f97304867ffc6388bfacd4f27dc22928c46417afa71f7a7a0d4ac6e99f89c6e56afdace589b6a6eb0a8ca7eb5a75ff92f SHA512 a321b9e6e79a39866f36f18ceae469701737145a09bd6e721d2f23d04815344fc875d236c8a2c4a885770298259438fabf93faa21924c51ca9f180ad3e8e586f
diff --git a/sys-apps/lsvpd/lsvpd-1.7.13.ebuild b/sys-apps/lsvpd/lsvpd-1.7.13-r1.ebuild
index 915b79c32135..3cddc00234ed 100644
--- a/sys-apps/lsvpd/lsvpd-1.7.13.ebuild
+++ b/sys-apps/lsvpd/lsvpd-1.7.13-r1.ebuild
@@ -16,7 +16,7 @@ IUSE=""
 
 RDEPEND="
 	dev-db/sqlite:3
-	sys-apps/hwids
+	sys-apps/hwdata
 	sys-apps/sg3_utils:0=
 	sys-libs/librtas
 	sys-libs/libvpd
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index b4cae1444cbf..29a60731463a 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -21,4 +21,5 @@ DIST memtest86+-5.01.tar.gz 214877 BLAKE2B ef63eaabaf6d3d27b85c73618c692dd61cce5
 DIST memtest86+-5.31b.tar.gz 227779 BLAKE2B 14aced912bb84115278a3aff7650a3571918b823335aaf7d09880ef10374c320f64878765d93d2ee5a75e2b33ef6c9c4886a9a168955bd77c668f06f5c86a6ca SHA512 ad5891fd0c430ce7a5d0cde2d10dee20b66ad8060d47c3e70e038461d9cde3a78dfc13442b5b09da7c662741945a670353c72dbc08fd5ee8bae82256001a9541
 EBUILD memtest86+-5.01-r5.ebuild 2843 BLAKE2B 6094eb3d890de7f7fd72012104c0b467746a313a5ad04c3546e1932556889b108edc8b6ed44442c0443b2305c335c3bbcd4f178c80564b0da9d7a5e11fc17d6f SHA512 dcea721c0ac1abfe2f4f1ccf0972284025d841caf84d7d439ae1b4d9dd891e46418ab08cd4b0807dab93a132cc29a4ee4cae6f72da7cc5dc356e8ef6d3e40859
 EBUILD memtest86+-5.31b-r1.ebuild 2690 BLAKE2B b4370c3fcbcd83374d1382aaf5c58876e4ddfd47a1a44e4077e996b139027f84b906b81c710294209f3c91854fd2222ac457d9ee9e613d68b6aa5212aa0fab51 SHA512 56d8ab7c69d5293a61ec436cbb1931ccd21011fd40b662e22873d614563a661551b1a4123d8d8583fb1872b0e26945e31d4ec914f81828f82b53b0ef9bc3a261
-MISC metadata.xml 564 BLAKE2B 7ca87149fa07d85f49274c417ee7127ad040a24362cbf8086f973c34034ab94b4fc1d8ae9a2905762b384a9385f6d1fab2a636c7477c5f958bad57497a143f1f SHA512 73af6fa49e10885efb95d12daad96608f2626cc23bc78b8818d18e9135ed7af67cf72f96b85f44da0d827f28c2d80e7169849acde85b43532512b8f15e04018a
+EBUILD memtest86+-5.31b-r2.ebuild 2808 BLAKE2B 862a5c57f8b43106462c3d07ff45b65e133ad86d38316970a559714404383d2e95f55c0f36b4468278131c63ba58790a94f360886a56fcf973b3d010540d401f SHA512 a8bc74f164cad97ec486dc8c4b9efb3765349b7b1e627e1115e4dd4389347c8ca838225c3b62700a097aebd4d12e37a3576281b532cb5781d2cfd413ffa1fe96
+MISC metadata.xml 551 BLAKE2B 8d899e354f3c3e84526674d2eab5fb81f20a2c585d599cafe7a12dec4aa9bf2b004ce6f54010474b0abd2ec0b347b00937aef25cc162794520554dedc89471ba SHA512 519fa8bbbeda2f082ce1eb5874089a61041d2ae0902c73183fd4e619e14b137c1aca2cb4d81557afad5f9620713ba8ee324d7c7674ac0618e9dab8a5d7abdc0e
diff --git a/sys-apps/memtest86+/memtest86+-5.31b-r2.ebuild b/sys-apps/memtest86+/memtest86+-5.31b-r2.ebuild
new file mode 100644
index 000000000000..3962c3e9f986
--- /dev/null
+++ b/sys-apps/memtest86+/memtest86+-5.31b-r2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mount-boot toolchain-funcs
+
+DESCRIPTION="Memory tester based on memtest86"
+HOMEPAGE="http://www.memtest.org/"
+SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+boot floppy iso serial"
+
+BOOTDIR="/boot/memtest86plus"
+QA_PRESTRIPPED="${BOOTDIR#/}/memtest usr/share/${PN}/memtest"
+QA_FLAGS_IGNORED="${BOOTDIR#/}/memtest usr/share/${PN}/memtest"
+
+RDEPEND="floppy? ( sys-fs/mtools )"
+DEPEND="${RDEPEND}"
+BDEPEND="iso? ( app-cdr/cdrtools )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc-473.patch"
+	"${FILESDIR}/${P}-hardcoded_cc.patch"
+	"${FILESDIR}/${P}-no-clean.patch" #557890
+	"${FILESDIR}/${P}-objcopy.patch"
+	"${FILESDIR}/${P}-test-random-cflags.patch" #590974
+	"${FILESDIR}/${P}-fix-gcc8-freeze-crash.patch"
+)
+
+pkg_pretend() {
+	use boot && mount-boot_pkg_pretend
+}
+
+src_prepare() {
+	sed -i -e 's,0x10000,0x100000,' memtest.lds || die
+	sed -i 's:genisoimage:mkisofs:' makeiso.sh || die
+
+	if use serial ; then
+		sed -i -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
+			config.h || die "sed failed"
+	fi
+	#613196
+	use amd64 && sed -i -e's,$(LD) -s -T memtest.lds,$(LD) -s -T memtest.lds -z max-page-size=0x1000,' Makefile
+	default
+}
+
+src_configure() {
+	tc-ld-disable-gold #580212
+	tc-export AS CC LD
+}
+
+src_compile() {
+	emake OBJCOPY="$(tc-getOBJCOPY)"
+	if use iso ; then
+		./makeiso.sh || die
+	fi
+}
+
+src_test() { :; }
+
+src_install() {
+	if use boot ; then
+		insinto "${BOOTDIR}"
+		doins memtest memtest.bin
+	fi
+
+	insinto /usr/share/${PN}
+	use iso && newins mt*.iso memtest.iso
+	doins memtest memtest.bin
+
+	exeinto /etc/grub.d
+	newexe "${FILESDIR}"/39_${PN}-r1 39_${PN}
+
+	dodoc README README.build-process FAQ changelog
+
+	if use floppy ; then
+		dobin "${FILESDIR}"/make-memtest86+-boot-floppy
+		doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
+	fi
+}
+
+pkg_preinst() {
+	use boot && mount-boot_pkg_preinst
+}
+
+pkg_postinst() {
+	if use boot; then
+		mount-boot_pkg_postinst
+
+		elog "memtest86+ has been installed in ${BOOTDIR}/"
+		elog "You may wish to update your bootloader configs:"
+		elog " - For grub2 just re-run grub-mkconfig -o /boot/grub/grub.cfg, since a"
+		elog "   config generator has been installed at /etc/grub.d/39_${PN}"
+		elog " - For lilo, add the following to /etc/lilo.conf and re-run lilo:"
+		elog "    > image  = ${BOOTDIR}/memtest.bin"
+		elog "    > label  = ${PN}"
+		elog ""
+		elog "Note: For older configs, you might have to change from 'memtest' to 'memtest.bin'."
+	fi
+
+	if use boot && [ -e /sys/firmware/efi ]; then
+		ewarn "WARNING: You appear to be booted in EFI mode but ${PN} is a BIOS-only tool."
+	fi
+}
+
+pkg_prerm() {
+	use boot && mount-boot_pkg_prerm
+}
+
+pkg_postrm() {
+	use boot && mount-boot_pkg_postrm
+}
diff --git a/sys-apps/memtest86+/metadata.xml b/sys-apps/memtest86+/metadata.xml
index 8fcf6696aae3..359afa21d566 100644
--- a/sys-apps/memtest86+/metadata.xml
+++ b/sys-apps/memtest86+/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
+<maintainer type="person">
+	<email>bkohler@gentoo.org</email>
+	<name>Ben Kohler</name>
 </maintainer>
 <use>
 	<flag name="boot">Also install to /boot instead of just /usr/share/memtest86+/</flag>
diff --git a/sys-apps/most/Manifest b/sys-apps/most/Manifest
index d3acf480acfc..6faa5940ca5b 100644
--- a/sys-apps/most/Manifest
+++ b/sys-apps/most/Manifest
@@ -1,4 +1,5 @@
 AUX most-5.0.0a-donot-hardcode-path.patch 969 BLAKE2B 1089149fc01a3081760f422b73d4a691e3078f13df1a7045cf0f94d6991c762e4004088e9a0b89a9b6b39ec70782f1b86edb13c714ef2b2b33bd6ccd9f18435d SHA512 6da3424b5e9763bd8f89998ffe019230cc8e9c7fc9722235cc13830d50647f590f6a934ae025a063fe8fc1e8bdd2b4fc067fbc1569c7a0ebfa220b868b999271
+AUX most-5.1.0-fix-parallel-build.patch 761 BLAKE2B b2aeb5019305138ee0ac816c07595afcf95c07f7d3f477ace41931fcb85706909813056f9291d5002e2e583fdd3baec34f09b153a9d736e0009d3d7f6f4cf524 SHA512 492ebbc35c4a94514c252541a644c45b4904ad402fa0c45da03f9acb529dfdf46576429b67352cfde9defd76b772aa12ecd449f461b3f995a4d00f9ed63692c5
 DIST most-5.1.0.tar.gz 162172 BLAKE2B a3c0f3d85e7c4f4a014c174efb0d3d22b0fc2758e403ddccc74308399eeec616800e16db33554f0ca53fba674efba9dd93d51ed0c3f887b2c24fd3dd2335387c SHA512 cbc090283bbaafb8ffee9d6d1abc7b49cd58d54b742cf8dc86274351dee6398d1f24841bd1631ac40f861ad9e23569646133d3297317d9d514a7a38dd74533d2
-EBUILD most-5.1.0.ebuild 865 BLAKE2B 3685189fff6bfe88faf0535665e6cf106616ec63d205d106ee534c7da82dece2cb6103009112ee656cbf2c86d7d8805c01e02618db91df3a35940f0fb180f9a5 SHA512 f2c4bb745c7149bb72512df1361a7caec50f803c5e65efb21b9bd91dc63be00f2c57bd6737b0e59709e7a27802ad723d7195792e0e5dfc81bb4e56580b6c46e2
+EBUILD most-5.1.0.ebuild 917 BLAKE2B 14508a5b03c06d1fa4f94eb5b25710dfd6ebab34de570b360fc9cc3150fd1309d1d5ba39913ae1fce96af420fa416db6cda271ebcf2c29863a27555d7bd57c50 SHA512 87941a9e5a52f001519074a5e22146e453a253736bf0cf22939d4f6e6876df77e898951e8ed0ea22535bf98ad8e8c1dde4265027f99b22568831208a168cea6e
 MISC metadata.xml 272 BLAKE2B a253052dbe7dfd2dea2cdc3692698a5a94d0e2414979a348d56448cee6329b7fe29a1f252146f9ff04c1ea3b270996631395ecea454ac901eb726dc0b4dd9f29 SHA512 247c1006dd352c3cc7ee07dee2f283394767bdc0f72f0438a6cc845ac53549c05b3741c64ffedb992f003759e67f24aaa7121561db97d1b095c11269115746dc
diff --git a/sys-apps/most/files/most-5.1.0-fix-parallel-build.patch b/sys-apps/most/files/most-5.1.0-fix-parallel-build.patch
new file mode 100644
index 000000000000..0b5e5b2da3f6
--- /dev/null
+++ b/sys-apps/most/files/most-5.1.0-fix-parallel-build.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/795117
+
+Grabbed from NixOS (slyfox submitted this upstream):
+
+Upstream commit c9cfad50a ("src/Makefile.in: Avoid a race condition
+when performing a parallel build")
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -54,6 +54,12 @@ COMPILE_CMD = $(CC) -c $(ALL_CFLAGS) -DMOST_SYSTEM_INITFILE='"$(SYS_INITFILE)"'
+ all: $(EXEC)
+ $(EXEC): $(OBJDIR) $(CONFIG_H) slangversion $(OBJDIR)/$(EXEC)
+ 	@echo $(EXEC) created in $(OBJDIR)
++
++# C source files include autogenrated "config.h". Make sure
++# it's available before the compilation. Pessimistically assume
++# any source file can depend on "config.h".
++$(OBJS) $(OBJDIR)/chkslang.o: $(CONFIG_H)
++
+ $(OBJDIR)/$(EXEC): $(OBJS)
+ 	cd $(OBJDIR); $(CC) $(OFILES) -o $(EXEC) $(LDFLAGS) $(EXECLIBS)
+ #
diff --git a/sys-apps/most/most-5.1.0.ebuild b/sys-apps/most/most-5.1.0.ebuild
index 18b707ef38fb..991e0d5124af 100644
--- a/sys-apps/most/most-5.1.0.ebuild
+++ b/sys-apps/most/most-5.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.jedsoft.org/releases/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
 RDEPEND=">=sys-libs/slang-2.1.3"
@@ -18,6 +18,7 @@ DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.0.0a-donot-hardcode-path.patch
+	"${FILESDIR}"/${P}-fix-parallel-build.patch
 )
 
 src_prepare() {
diff --git a/sys-apps/mtree/Manifest b/sys-apps/mtree/Manifest
deleted file mode 100644
index 4a123264c736..000000000000
--- a/sys-apps/mtree/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mtree-1.0.4.tar.gz 34024 BLAKE2B 932684df56e0403ee3d30e4eee4250824a067cc5467d0f6b1b3ecc46c94c68367dd323221c70e17f08481d93eb0d3278bb6b3f78a930d4ec906a446f99c7a92a SHA512 b0f09d34584315633fd8fcbc6403ba1ec6bade7e5194b59ec168796d23b6f2d4aeda7112ce4b8b5773e2bf50dbda200700637e361214c98f30818a259294ead0
-EBUILD mtree-1.0.4.ebuild 643 BLAKE2B 8915882242a33f2468dbdd91bd142f332d946d5f67b17a224f245720cce7d65d256c8ac798e3fe88942684804523f197ac8f67cc8e44b2aa570f21f551881523 SHA512 ba5a7e4ef18108655bbdf7dc82b4332c6f9053f24843262ce31b20944e10b65c4a4c8359674fb4c8373d8f1926f543043d73d848d0e96e262b070870bfb75cf9
-MISC metadata.xml 338 BLAKE2B cfec2391592b8bf3d92817f1891e646df16026f5f38e2acb4eaf45a77113775e522a3526475b24429c83d8560ec78c13e117f36250786932550386f6993b3770 SHA512 026e67682b8b71a4281f182ed82849d2d613c7816c33a621f007f5522a1e590806bcaa3800131b748d20f7d2ad95d71fece42cb936f10524c0411a46732980bf
diff --git a/sys-apps/mtree/metadata.xml b/sys-apps/mtree/metadata.xml
deleted file mode 100644
index 37109ff76226..000000000000
--- a/sys-apps/mtree/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<upstream>
-	<remote-id type="github">archiecobbs/mtree-port</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/sys-apps/mtree/mtree-1.0.4.ebuild b/sys-apps/mtree/mtree-1.0.4.ebuild
deleted file mode 100644
index 151c42b2c734..000000000000
--- a/sys-apps/mtree/mtree-1.0.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Directory hierarchy mapping tool from FreeBSD"
-HOMEPAGE="https://github.com/archiecobbs/mtree-port"
-SRC_URI="https://github.com/archiecobbs/mtree-port/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/${PN}-port-${PV}"
-
-src_prepare() {
-	default
-	# don't install unneeded docs
-	sed -i '/doc_DATA=/d' Makefile.am || die
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	# avoid conflict with app-arch/libarchive
-	rm "${ED%/}/usr/share/man/man5/mtree.5"
-}
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 7d7094b52da1..7788bfd29036 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,11 +1,14 @@
 AUX openrc-0.44.6-fix-checkpath.patch 862 BLAKE2B 35aac37270c8ee779d2e3f0291e2f2e659cbebd6ab8e9cb4a7a0295a1a99331b94c86e411ddac98f415839781d2415771c7cc81d12749a6efed5396f54933581 SHA512 187f318b652d779252371812ae2b154e79e109fc1d4eadb8e86c9c83d639c1b03a106e2e982c4365b2204321abfb561421e8a239f1fd71281ee6dbad4e775e80
+AUX openrc-0.44.8-selinux-no-pam.patch 3543 BLAKE2B 394f173197f8c2fb83c3b7313420506f522c1fc94a3363a029c4293cea672a2d40f11d341409a379ad15fe86da917258a63dfc9a6c571cba5f45793da8a89f3f SHA512 13f9ffd2a8c320c0c129f5e4eb394198816d67132a2cf80edb9c283cf3cc758715521738fdba0da1175b1bb5a8c28ed1aa6518186ae5d9ddd60bb31ecaf0ad9a
 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.7.tar.gz 255444 BLAKE2B 8058e1fd8fcce46f53e73b56ec8da5eec9ba0807d657aef4ece2d49056c02a451c41155df96b167ff157863a85d77eb63796715b5191dd1c6c631c8f859d3090 SHA512 c6b3e2e30615d97a5185320a140ced881bc59ba31ea8dff5d80440396166af237826de6ffc7836ec141e305c92176cd9cc3dabff7e42ac0d80e5238513fefdb7
 DIST openrc-0.44.8.tar.gz 255668 BLAKE2B 13d023ea3346313ded9f9bff729c296a3317577ddc58cadbe57429833075776a3a3dc52dfd1c9e9721407b747df0f6471a81d12dc79216dc4b75222104208965 SHA512 ee8520b42df2f20cc770b9cc1a82eee4c7cb2e0d2e8b0788f5201e7c5ca864f414e97f679f3c25b808cb3641bc99cd74580dcd9777f4738f43adba65754ae679
+DIST openrc-0.44.9.tar.gz 254859 BLAKE2B 467f47e6bb09e0cea4c093f7516979112c2b70fb898a8030ef28ad78a20b89751256d545f21d295e948e791027c5b4b9e8b1cac244d3698161a449cc4bc1b38f SHA512 41488b2e699b1f66f334c4f90021b57a175ae1c9c77464bb747d38907a3a54cc1e48284484577d2f72cde8e4007b03e6529c549f462e8acdba8ffc796ac58239
 EBUILD openrc-0.43.5-r1.ebuild 5066 BLAKE2B b3e56275bd07558fa1b3a67e76c343d4368803ff8c806872e1fe7351667848640b722de86c5cac410d76e02d69a5adb764a942aafa180e22c4d79d7c90533e6e SHA512 8214a366eeb208c3f05302ec0f35a0bc9fb500951d102faa3010c0b8dc005d2d4a04609efd89351c76984ed18b0013e16367a0d257d809b667f69f981164dd46
 EBUILD openrc-0.44.7.ebuild 4526 BLAKE2B b8764b74d29d517878dc2152940840ca70f7486ad9e7c5eaaad69bc6e567b213f345dbf80160f2f8437d8ee4f22b9d51941e057678b3ab28a1790c6ec5ad2b6f SHA512 24727522c449166a6bdb32648fbab754a880536f6edb463523499efac000ebb2de2087bb4875ad7fb743c2cdbe6087cb4bb111ada9ce278166562958ceb776fe
-EBUILD openrc-0.44.8.ebuild 4359 BLAKE2B f53a464c885015589d13e32ebfb698f68cf3e89ed00b8fa2f0fcad61c40f64b208f89b2e01ca5e7802b2c2b9a528c5df8025aa738ed96b2ae867574f8679fc78 SHA512 0382a8624f6adcc5506c1d3a391b7e996c51e06888199a99d5666909981279a0991c01222f52fdae7e5c1dd8c217b9cc9ebf7e51f68886e2719d41158b32562b
+EBUILD openrc-0.44.8.ebuild 4439 BLAKE2B f40488139a43e7dcff4e9a75d6cf7ef38f0031e55d766e7ec8f11a184c7554e58598acfc86cabae7c2d88429cc65c3506b3c2ed783629896d722bf7d0b1e327a SHA512 0c81ccc39e2e1496ea9e1cda71230aad631da478b1f3017a057aed7b0779b3eec9830253a306f40efbbfd7adda6ab4e8e841b0187cb4299c3d1cfa66422f1223
+EBUILD openrc-0.44.9.ebuild 4359 BLAKE2B f53a464c885015589d13e32ebfb698f68cf3e89ed00b8fa2f0fcad61c40f64b208f89b2e01ca5e7802b2c2b9a528c5df8025aa738ed96b2ae867574f8679fc78 SHA512 0382a8624f6adcc5506c1d3a391b7e996c51e06888199a99d5666909981279a0991c01222f52fdae7e5c1dd8c217b9cc9ebf7e51f68886e2719d41158b32562b
 EBUILD openrc-9999.ebuild 4368 BLAKE2B a0e9a673ba22f1d0c6db4d959f3b786044c06bce370f6e5df8bc9d0d722f9bd4132a3549fcd66448a4a1a136584feaaae8ca391f074636f18f69878eec3b786e SHA512 2cba40f232e34a4a6afc5f270143e1daed775ca58802be11159afb57b9e19708a342ca3dfd5fb3b1b54d535f80b4d9bdeacecdb5a5c55ec7ec1ffd2c9ded6a68
 MISC metadata.xml 707 BLAKE2B 713b69a4e4d6a61051c9f6dfda46da3afa62c590c62b4f371f3949140eaecfa665a977091ac858bff99380dfc3758038ee6a96b0c8b88c142e2e751b20318fba SHA512 5260e1aec8973d42bf059b1f20b3a5f95b98608efeac614d46b20d774a3453c25348cea4a45d745abe829ad016dbc524080c482c1666032e969e08fefe1efc37
diff --git a/sys-apps/openrc/files/openrc-0.44.8-selinux-no-pam.patch b/sys-apps/openrc/files/openrc-0.44.8-selinux-no-pam.patch
new file mode 100644
index 000000000000..28749433f69f
--- /dev/null
+++ b/sys-apps/openrc/files/openrc-0.44.8-selinux-no-pam.patch
@@ -0,0 +1,89 @@
+https://github.com/OpenRC/openrc/commit/bd5cdaafadf997c0ab3c4ad362dbdfd7dc6fd987.patch
+https://github.com/OpenRC/openrc/commit/f3f0fde861b438c80f99afdd49fe175e9d0a68ca
+
+From: Sam James <sam@gentoo.org>
+Date: Sat, 20 Nov 2021 12:05:56 +0000
+Subject: [PATCH] meson: fix pam_misc_dep definition
+
+X-Gentoo-Bug: 824954
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/824954
+Fixes: https://github.com/OpenRC/openrc/issues/470
+Fixes: https://github.com/OpenRC/openrc/pull/477
+--- a/meson.build
++++ b/meson.build
+@@ -94,6 +94,7 @@ rc_sbindir = rc_libexecdir / 'sbin'
+ sbindir = rootprefix / get_option('sbindir')
+ 
+ selinux_dep = dependency('libselinux', required : get_option('selinux'))
++pam_misc_dep = []
+ if selinux_dep.found()
+   cc_selinux_flags = '-DHAVE_SELINUX'
+   if pam_dep.found() and get_option('pam')
+@@ -107,7 +108,6 @@ if selinux_dep.found()
+   endif
+ else
+   cc_selinux_flags = []
+-  pam_misc_dep = []
+ endif
+ 
+ termcap = get_option('termcap')
+
+From: Sam James <sam@gentoo.org>
+Date: Sat, 20 Nov 2021 12:06:37 +0000
+Subject: [PATCH] meson: link against libcrypt for SELinux if no PAM
+
+We use libcrypt's crypt() if we're _not_ using PAM
+in the SELinux code (rc-selinux, specifically).
+
+X-Gentoo-Bug: 824954
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/824954
+Fixes: https://github.com/openrc/openrc/pull/477
+--- a/meson.build
++++ b/meson.build
+@@ -93,6 +93,8 @@ rc_bindir = rc_libexecdir / 'bin'
+ rc_sbindir = rc_libexecdir / 'sbin'
+ sbindir = rootprefix / get_option('sbindir')
+ 
++crypt_dep = dependency('libcrypt', required : not get_option('pam'))
++
+ selinux_dep = dependency('libselinux', required : get_option('selinux'))
+ pam_misc_dep = []
+ if selinux_dep.found()
+--- a/src/rc/meson.build
++++ b/src/rc/meson.build
+@@ -50,7 +50,7 @@ executable('openrc-run',
+   rc_selinux_c, version_h],
+   c_args : [cc_audit_flags, cc_branding_flags, cc_pam_flags, cc_selinux_flags],
+   link_with: [libeinfo, librc],
+-  dependencies: [audit_dep, dl_dep, pam_dep, pam_misc_dep, selinux_dep, util_dep],
++  dependencies: [audit_dep, dl_dep, pam_dep, pam_misc_dep, selinux_dep, util_dep, crypt_dep],
+   include_directories: [incdir, einfo_incdir, rc_incdir],
+   install: true,
+   install_dir: sbindir)
+@@ -85,7 +85,7 @@ executable('runscript',
+     rc_selinux_c, version_h],
+   c_args : [cc_audit_flags, cc_branding_flags, cc_pam_flags, cc_selinux_flags],
+   link_with: [libeinfo, librc],
+-  dependencies: [audit_dep, dl_dep, pam_dep, pam_misc_dep, util_dep, selinux_dep],
++  dependencies: [audit_dep, dl_dep, pam_dep, pam_misc_dep, util_dep, selinux_dep, crypt_dep],
+   include_directories: [incdir, einfo_incdir, rc_incdir],
+   install: true,
+   install_dir: sbindir)
+@@ -95,7 +95,7 @@ executable('start-stop-daemon',
+ 	rc_selinux_c, usage_c, version_h],
+   c_args : [cc_audit_flags, cc_branding_flags, cc_pam_flags, cc_selinux_flags],
+   link_with: [libeinfo, librc],
+-  dependencies: [audit_dep, dl_dep, pam_dep, pam_misc_dep, util_dep, selinux_dep],
++  dependencies: [audit_dep, dl_dep, pam_dep, pam_misc_dep, util_dep, selinux_dep, crypt_dep],
+   include_directories: [incdir, einfo_incdir, rc_incdir],
+   install: true,
+   install_dir: sbindir)
+@@ -169,7 +169,7 @@ executable('checkpath',
+   c_args : [cc_audit_flags, cc_branding_flags, cc_pam_flags, cc_selinux_flags],
+   include_directories: [incdir, einfo_incdir, rc_incdir],
+   link_with: [libeinfo, librc],
+-  dependencies: [audit_dep, pam_dep, pam_misc_dep, selinux_dep],
++  dependencies: [audit_dep, pam_dep, pam_misc_dep, selinux_dep, crypt_dep],
+   install: true,
+   install_dir: rc_bindir)
+ 
diff --git a/sys-apps/openrc/openrc-0.44.8.ebuild b/sys-apps/openrc/openrc-0.44.8.ebuild
index 4e57ae57a034..182e1761f233 100644
--- a/sys-apps/openrc/openrc-0.44.8.ebuild
+++ b/sys-apps/openrc/openrc-0.44.8.ebuild
@@ -55,6 +55,11 @@ RDEPEND="${COMMON_DEPEND}
 
 PDEPEND="netifrc? ( net-misc/netifrc )"
 
+PATCHES=(
+	# Backported from master
+	"${FILESDIR}"/${P}-selinux-no-pam.patch
+)
+
 src_configure() {
 	local emesonargs=(
 	$(meson_feature audit)
diff --git a/sys-apps/openrc/openrc-0.44.9.ebuild b/sys-apps/openrc/openrc-0.44.9.ebuild
new file mode 100644
index 000000000000..4e57ae57a034
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.44.9.ebuild
@@ -0,0 +1,157 @@
+# 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
+
+	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/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 5df0f165cca0..4afaab2114b1 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -3,4 +3,5 @@ AUX init.d-pciparm 1758 BLAKE2B a9dd930da942c73d7a150938b2b58543f517542c4c675334
 AUX pciutils-3.1.9-static-pc.patch 373 BLAKE2B 39e44412bdde832e9812cd719155f7638d01cd49ebb5be638b2bd10627fe77279c4be79684e13c588b5d3b252eba66dc1a95275d60d40bcf12df46cf8bbdc807 SHA512 e20286ae41569236b549d13c703266f920f335609c1ad2e5d67fd1561f9e9c68d4ac1fd530f93a4451ec79a5496ed226b83db0c74935499f44cd47e94eb74f49
 DIST pciutils-3.7.0.tar.gz 516418 BLAKE2B fca6720cff73ec20559c666c76fdcd3b59cdf0e33e2c3894a82590d77c5d51cf22e667fe65d9f66a248a624c2b9c868f6e9b69f45f4b6d704b637afe55041e6a SHA512 8a8fb9dc44a8dd31f80e45a48f6693452c11d343b9dfed87dd5cea6846f38d001f294e4010cd7c0545e238fde45b0e9a8e88c67a43d80676a585336e3665a631
 EBUILD pciutils-3.7.0-r1.ebuild 2871 BLAKE2B 45bac6fb278e1ce05810ca8bb89a024cbe2e067750d7f7a333bc6ac6d53c65849c21e90c30e5996c357abbf58137f9475a5fd85c2ccd6ab3b9f3a126cc1019be SHA512 8327a20ddba2eec98128f7b58b3085ff0ba259bf7ceaf6a8c8497007bae07d96739ec0145f45d12d9249cc27b57ee642dcad18c7de7c1b3e34da57734a323d27
+EBUILD pciutils-3.7.0-r2.ebuild 2633 BLAKE2B e124b49d8b0b48b1d0ae0653df1564918f7f99bef1bd480650c41dcfa982de57b28d43024d9c4d3f39a8c07db7bf22d6ae37ff872f16e987a827d70b4eefa9a7 SHA512 44f8019bc0705498ac34878429332da2bcc63bb9e8a1fd7e4d3e2ebd61908bd215c8f08c35d15a52ba1b8117c3a3d8a2c1bdc7cc93b210ddb8a476c08a8fd235
 MISC metadata.xml 525 BLAKE2B 5a7a502d28b6e74db1f1f008adfc5d9c398fb7832c8c82e066c9d4834726a0cd1e97b9738ca21906468f3c2444f20bfcf715339a1314e34b2b43d4f5c631a659 SHA512 5e53a4261ea0aa0d58f7a16b5c8ddbc2e6bda130e49642a9dc220f39cd6a77b8fdf22c22fd7def106d4728b880b75371feea3d552981d03294b86b8cb7fd08c0
diff --git a/sys-apps/pciutils/pciutils-3.7.0-r2.ebuild b/sys-apps/pciutils/pciutils-3.7.0-r2.ebuild
new file mode 100644
index 000000000000..5c117edb478b
--- /dev/null
+++ b/sys-apps/pciutils/pciutils-3.7.0-r2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib toolchain-funcs multilib-minimal flag-o-matic
+
+DESCRIPTION="Various utilities dealing with the PCI bus"
+HOMEPAGE="https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
+SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="dns +kmod static-libs +udev zlib"
+REQUIRED_USE="static-libs? ( !udev )"
+
+# Have the sub-libs in RDEPEND with [static-libs] since, logically,
+# our libpci.a depends on libz.a/etc... at runtime.
+LIB_DEPEND="
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	kmod? ( sys-apps/kmod )
+	udev? ( >=virtual/libudev-208[${MULTILIB_USEDEP}] )
+	static-libs? ( ${LIB_DEPEND} )
+	!static-libs? ( ${LIB_DEPEND//static-libs([+-]),} )
+"
+RDEPEND="
+	${DEPEND}
+	sys-apps/hwdata
+"
+BDEPEND="kmod? ( virtual/pkgconfig )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.9-static-pc.patch
+)
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/pci/config.h )
+
+switch_config() {
+	[[ $# -ne 2 ]] && return 1
+	local opt=$1 val=$2
+
+	sed "s@^\(${opt}=\).*\$@\1${val}@" -i Makefile || die
+	return 0
+}
+
+src_prepare() {
+	default
+
+	if use static-libs ; then
+		cp -pPR "${S}" "${S}.static" || die
+		mv "${S}.static" "${S}/static" || die
+	fi
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	append-lfs-flags #471102
+}
+
+pemake() {
+	emake \
+		HOST="${CHOST}" \
+		CROSS_COMPILE="${CHOST}-" \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		RANLIB="$(tc-getRANLIB)" \
+		DNS=$(usex dns) \
+		IDSDIR='$(SHAREDIR)/hwdata' \
+		MANDIR='$(SHAREDIR)/man' \
+		PREFIX="${EPREFIX}/usr" \
+		SHARED="yes" \
+		STRIP="" \
+		ZLIB=$(usex zlib) \
+		PCI_COMPRESSED_IDS=0 \
+		PCI_IDS=pci.ids \
+		LIBDIR="\${PREFIX}/$(get_libdir)" \
+		LIBKMOD=$(multilib_native_usex kmod) \
+		HWDB=$(usex udev) \
+		"$@"
+}
+
+multilib_src_compile() {
+	pemake OPT="${CFLAGS}" all
+	if use static-libs ; then
+		pemake \
+			-C "${BUILD_DIR}/static" \
+			OPT="${CFLAGS}" \
+			SHARED="no" \
+			lib/libpci.a
+	fi
+}
+
+multilib_src_install() {
+	pemake DESTDIR="${D}" install install-lib
+	use static-libs && dolib.a "${BUILD_DIR}/static/lib/libpci.a"
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog README TODO
+
+	rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/man/man8/update-pciids.8* || die
+	rm -r "${ED}"/usr/share/hwdata || die
+
+	newinitd "${FILESDIR}"/init.d-pciparm pciparm
+	newconfd "${FILESDIR}"/conf.d-pciparm pciparm
+}
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 4781f61be062..95685e488c81 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,10 +1,4 @@
-DIST pkgcore-0.12.4.tar.gz 622553 BLAKE2B fc9df4f9499ad20cec439275880e469e1ffd8204b894c0a523ed27a3e55748e58634fca2af693fcc453e8aec068733a944331f7cea52e983e50981374239d534 SHA512 bc9eccd8d903e987df97354de008826dd52a7db0d9def064c56bb9425d1aa69e8fdf15dcfd0f86057c98a3c0adefee633a3c1cc9b689a334c126730cbdeafd0c
-DIST pkgcore-0.12.6.tar.gz 624740 BLAKE2B fb03cffd274d8c31f6eff33a0f9133dc0ef84a7e671d6f29cda938fca3e353d498173ae3e5ce7c5b7433e5e668096ae63ed7c4cc7108ad6edc7db3c247ce85df SHA512 18d01f7a52a7aeae0fcfd8ce81e27f98a204c3743e211a2dd182cabd6521c9d528663affbd98521a41ada17cbece860fce61d9e6a2dff2ca525da26741807c95
-DIST pkgcore-0.12.7.tar.gz 624992 BLAKE2B 93058dcf8eae891a7462b3125d648c218c034388daa8be86b4cbea34b82cbe7c484f354f4bf94bb3e4f25858783402d172231f773aded15b4dd902e52f9a3620 SHA512 2d25c3262a3fa806514d64a2f15664b8f0fe3ab2946ae681dd0ba7cebd8c9c9490500f809907f40eb5072763134d4e68cd75d17b2b7321a33fb55ebdad0768a7
 DIST pkgcore-0.12.8.tar.gz 624442 BLAKE2B d7e15fc659820e3cd6e4f7848413c12b2439d38900c9f64c582ba078d3fe874c12d66d39fdf59a7e4ff585d82d29fcad16c9af869b2388ed6e0af0be7d16d887 SHA512 d02087d4bada3bc2f87738b0ddedc72782b2facdf681927e84fed32dc6645e48ebde83de5aeb9eb0f64e01afe2ac511ae0f7450a2708698bbad872a60044319b
-EBUILD pkgcore-0.12.4.ebuild 1113 BLAKE2B 707e98f4ffdd8b2487c805d08ffe8953c95fc59e2a29e9756effa6dbb4eaafa457687a96032604594b121c32252242400c9a7609ee6be6f1cd61e50b2a67eba7 SHA512 18e5e6ea67c0c476a2232fc427d74ff52c0b92225f03d874f4018fa5b59c23a7a4ac79c4f11f50634e29ee09416f71801565fd26a48039bbf1c2078df09aeb10
-EBUILD pkgcore-0.12.6.ebuild 1121 BLAKE2B f4bcdaba4897269b8e3d0b928fe30b4b8d913bed49397fbd6b8c125455c8e92bc6f16986cfa2d8764d38a3d148eab74b67db3d90cc614104fea135124858dab1 SHA512 6eca87f6e49d9f06fb602d6e2c504922dfbe9b7067a51016b8d8c91015f221afd7cf6dca7fd0b0010d83b5122afe5731447bc3cd22f5f49be97d1fa195a82ad6
-EBUILD pkgcore-0.12.7.ebuild 1113 BLAKE2B 707e98f4ffdd8b2487c805d08ffe8953c95fc59e2a29e9756effa6dbb4eaafa457687a96032604594b121c32252242400c9a7609ee6be6f1cd61e50b2a67eba7 SHA512 18e5e6ea67c0c476a2232fc427d74ff52c0b92225f03d874f4018fa5b59c23a7a4ac79c4f11f50634e29ee09416f71801565fd26a48039bbf1c2078df09aeb10
-EBUILD pkgcore-0.12.8.ebuild 1121 BLAKE2B 71493afb287a5a1db0f187df74bc16706e38f7643c468f156871098263d0a9c839ebc0db26a0a2419211ceea503e9f381a6341232d50423e4083896049bb7331 SHA512 4c6154aeeca32d07d4503f4c35c88ed81c9ee6dd4a49651c753eab8df65c6f7dd23a164a24a81d5e8da1c2a77459e69a6af8eee1d877061c914ee420c9b5f5cb
+EBUILD pkgcore-0.12.8.ebuild 1119 BLAKE2B 117c2f732405dbc0e358acf784e4a821c1c2d8febd148bd7534943667cd827653870f21ec40f5ab5d79f0a8b2f2be49769fe74023ef1a0186f2d3d3a0bc058c1 SHA512 c23d967c0aaf2dbbd74688673979ec3067a17a7688f5b53d989c856b6952be51e061b6b7f68289d68fb9550d9d18e186968c131db0fc151267348841094cd284
 EBUILD pkgcore-9999.ebuild 1121 BLAKE2B f4bcdaba4897269b8e3d0b928fe30b4b8d913bed49397fbd6b8c125455c8e92bc6f16986cfa2d8764d38a3d148eab74b67db3d90cc614104fea135124858dab1 SHA512 6eca87f6e49d9f06fb602d6e2c504922dfbe9b7067a51016b8d8c91015f221afd7cf6dca7fd0b0010d83b5122afe5731447bc3cd22f5f49be97d1fa195a82ad6
 MISC metadata.xml 338 BLAKE2B 8e1efa689e0129b002ca035af4d3da753e9ef4d80029e01d2baceaca5a45a4c1c325ed25d58f38094a73564a033611e92a3b60d836967e9c664021d643bd0813 SHA512 019b2e934eb8f3a04148d4426466fc397983487122e10e9a2dc2f42e747bc7675947edf549e5ab5efb284d753de0af994a0a7a4f014ee22183a156afa4a462da
diff --git a/sys-apps/pkgcore/pkgcore-0.12.4.ebuild b/sys-apps/pkgcore/pkgcore-0.12.4.ebuild
deleted file mode 100644
index 94ce676970ca..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.12.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a framework for package management"
-HOMEPAGE="https://github.com/pkgcore/pkgcore"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-RDEPEND="
-	>=app-shells/bash-5.0
-	dev-python/lxml[${PYTHON_USEDEP}]"
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND+=" >=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]"
-fi
-BDEPEND="
-	test? (
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests setup.py
-
-src_test() {
-	local -x PYTHONDONTWRITEBYTECODE=
-	distutils-r1_src_test
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.12.6.ebuild b/sys-apps/pkgcore/pkgcore-0.12.6.ebuild
deleted file mode 100644
index 5c7eeb03645d..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.12.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a framework for package management"
-HOMEPAGE="https://github.com/pkgcore/pkgcore"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-RDEPEND="
-	>=app-shells/bash-5.0
-	dev-python/lxml[${PYTHON_USEDEP}]"
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND+=" >=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]"
-fi
-BDEPEND="
-	test? (
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests setup.py
-
-src_test() {
-	local -x PYTHONDONTWRITEBYTECODE=
-	distutils-r1_src_test
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.12.7.ebuild b/sys-apps/pkgcore/pkgcore-0.12.7.ebuild
deleted file mode 100644
index 94ce676970ca..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.12.7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a framework for package management"
-HOMEPAGE="https://github.com/pkgcore/pkgcore"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-RDEPEND="
-	>=app-shells/bash-5.0
-	dev-python/lxml[${PYTHON_USEDEP}]"
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND+=" >=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]"
-fi
-BDEPEND="
-	test? (
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests setup.py
-
-src_test() {
-	local -x PYTHONDONTWRITEBYTECODE=
-	distutils-r1_src_test
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.12.8.ebuild b/sys-apps/pkgcore/pkgcore-0.12.8.ebuild
index e443ee4ff75a..fd787036187e 100644
--- a/sys-apps/pkgcore/pkgcore-0.12.8.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.12.8.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/sys-apps/plocate/Manifest b/sys-apps/plocate/Manifest
index 3413d75d26ee..2a35004bf274 100644
--- a/sys-apps/plocate/Manifest
+++ b/sys-apps/plocate/Manifest
@@ -1,5 +1,4 @@
 AUX plocate-1.1.10-meson-use-feature-option-for-libiouring.patch 1833 BLAKE2B 4aba8c5ff0e5aade451ef02e60db223ff00f53c8d8e0761a83ae8a306348df0c42bb25549396684e75b4f1ae6d62b7b18972f2890291ba1643481c2401548c76 SHA512 8b8a08f0cbbe9455f5c2c88c609cab602bcb15f2f162c9ca597c779b550067ff430556df0d16f90221b615582e1d637e08b0cf29e013ef103fec0ccebb5b4c7e
-AUX plocate-1.1.5-no-systemd-check.patch 764 BLAKE2B f2a97b7c85339e7b7de663e1097e98178913766f88fdcea68b25f3285b14ff8791d668ca2a608ed6bcdf5f9b5b3c2cfedb2e76ad5c674bba03664ee19232e5bb SHA512 440b96a621c9f39f3b9a846342d5dc1d95ef7a8b5253e1c569582bddd6e1a544767996885c5f19a5bcc78cfc48f522f93631c382d2cd360a528141bc8a029aa2
 AUX plocate-cron.conf 237 BLAKE2B 531d6461309b520db31ab8f682ebbe56f2cd425222ebbc16a4662b606f5a0c6c62e4b1475a02ec3f244dde1ff73fe0ad16e0850aec53e6e8836fd0ba1273ad07 SHA512 ab055b052980783b5c63c716d7c12dcb19961a9f990c077e4f8c9bef4ca591bd281ac3941f872659a558a18b81c014dbc0655ff0a1872310670d8efc1d27cb00
 AUX plocate.cron 1392 BLAKE2B 89f7eb05879c0c1a6c30376d36dc469dde0b94df3758ae659012cf9fb6e9fb2783a0d8e53ea5f79d99e2f00be72ef24a254f2d91038a30dc9e19cd2b250782f9 SHA512 b15583e98e253c2fcb658bd9c1c589bacddb8b033eb565333d9f990b1fd320fcfbe1d950657c8b5823d4cb034ccad369bdd2178ef955e42aa9c2f8e8a0268b3f
 AUX updatedb.conf 898 BLAKE2B de832ebc92e103ccaf8923b2eb872ad8e1ef36be2dfaa463a054e3e9fc256102db676ab0568501b695d943fcb74ae6ab01585bf7301cc6aa9ce6d709cc1690b5 SHA512 8b0b32e949636aef46c5439b0c963cc113306cedb1e5c84dbbfa2efba6562ca6dd602fdbfa0b3bc9095b0cf30a619ebb366535406cdb461f20d012ec1af7ff9d
diff --git a/sys-apps/plocate/files/plocate-1.1.5-no-systemd-check.patch b/sys-apps/plocate/files/plocate-1.1.5-no-systemd-check.patch
deleted file mode 100644
index 2635a8007882..000000000000
--- a/sys-apps/plocate/files/plocate-1.1.5-no-systemd-check.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Unconditionally install systemd unit
---- a/meson.build
-+++ b/meson.build
-@@ -76,17 +76,9 @@
-                configuration: conf_data)
- install_man(updatedb_conf_man)
-
--if get_option('install_systemd')
--	systemd = dependency('systemd', required: false)
--	if systemd.found()
--		unitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir')
-		updatedb_service = configure_file(input: 'plocate-updatedb.service.in',
-		       output: 'plocate-updatedb.service',
-		       configuration: conf_data)
--		install_data(updatedb_service, install_dir: unitdir)
--		install_data('plocate-updatedb.timer', install_dir: unitdir)
--	endif
--endif
-
- # Requires having TurboPFor checked out, so not built by default.
- # Unless you have a recent Meson, there's no apparently good way
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index ececbf3b75b4..2736a62f0ff0 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -4,7 +4,7 @@ DIST policycoreutils-3.2.tar.gz 2817961 BLAKE2B 747cbd7b84ffa9153067340f8f1dc5a6
 DIST policycoreutils-3.3.tar.gz 2818092 BLAKE2B 0ed9f128a774176ebadb71f448af8dee8c616a706314783b646869e7ea91892e358d5bb03e3aece3d0e6dc3203852e4e2925482727df1e5c71e075236ee43e5c SHA512 db658990355f99a8e43f53d20cc67bf9e557b0a7837d1927c80f325b7f93ad47876382278a980b818484d6e31712a9b03e279f947ebc88c4be60a9f395607f98
 DIST policycoreutils-extra-1.37.tar.bz2 8809 BLAKE2B a7f6122c2e27f54b018174e962bd7f4c14af04e09bbb5300bde6967ea7f2dc5cd03b5787919a4e7f5288bcbc6747922962b5bd3b588ab1e3a035fbff4910d8f5 SHA512 0a85cd7cf279256b5e1927f9dfdd89626a1c8b77b0aeb62b496e7e8d1dccbaa315e39f9308fb2df7270f0bc1c10787b19990e7365cad74b47b61e30394c8b23f
 EBUILD policycoreutils-3.1-r2.ebuild 4624 BLAKE2B b467137228cf544f8467a109eb2a00fa80a8b1ddedeb13a60faf2dd0c9adf5c5b622ca045874c691cedc5429614c1d7c73dd385f8faad5ce1a95016c12790be6 SHA512 51e326cdb0f0103b40fee5826e8608e66d90b4ebf40b6313092f341f2438b49892813ef24d1bd60e00bd9102a31120db326ad47359c02fc7792d7fa9f755e32a
-EBUILD policycoreutils-3.2.ebuild 4479 BLAKE2B b2c21302b74e1c13f6bd842b91a72b4ff0a212597c5ab84e56123185db33e04b9d60cb11bc952ffeb72df6f8e2d3eb8190b7896c45cc3364b274a1e8db06321a SHA512 93866105e6c6145648c6c72c20fbd4e246836887275f13e22b8794bda7fc3dbbf93edf493acec5cd157dfe6e9f9d3bafc40e97a03084e22ae01f75bb21151aba
+EBUILD policycoreutils-3.2.ebuild 4477 BLAKE2B 9133046813efecb8e7d972e39d3054443c62e00bef6245e449ab89fb2c8ec9d4e86dee5851e4dd283b5e982b60b3409ffb4552e055697cf99fcea8fc8abbd853 SHA512 785a45d89ae90d7dea3133bca93662117454e507102d44ea75a0813527222b49978112cf78ff6fcc68a015ded52a5895d74dcfb8a98239de076092ca3237de27
 EBUILD policycoreutils-3.3.ebuild 4481 BLAKE2B 58bb10ff43da7cfdf706cd201e19abe70992d1fb49172f20aba80f7cda1bce21de7b7bbbd342c3586b4f18cea6b0d1505d4def30477abba257f78fad6c54c9f0 SHA512 73808abce9ab0c4f9b4714945cd98ab70a1bb37b14fc4326fd8e0ba001db1152af45f0fa315bab57a357aaf80a111d8f517ae6bc87ab4a7de449fe25624f9e78
 EBUILD policycoreutils-9999.ebuild 4481 BLAKE2B 58bb10ff43da7cfdf706cd201e19abe70992d1fb49172f20aba80f7cda1bce21de7b7bbbd342c3586b4f18cea6b0d1505d4def30477abba257f78fad6c54c9f0 SHA512 73808abce9ab0c4f9b4714945cd98ab70a1bb37b14fc4326fd8e0ba001db1152af45f0fa315bab57a357aaf80a111d8f517ae6bc87ab4a7de449fe25624f9e78
 MISC metadata.xml 1118 BLAKE2B b77b6c2e9fbc2fe7e0079d08c6e361f91131951db7f3babd217b6a122f780cdb1cf7624ab3af21066d65493b571516da7ba2f2dcb41fe6d1dadef4ffb12852fb SHA512 a1cce588f3d89b33399bc871da491480610c187379d62a4650c02955ff213b93f506a4d82e638a5ffc5ca3a2f4210b89c078406cc0d835d2603676e600b9d8de
diff --git a/sys-apps/policycoreutils/policycoreutils-3.2.ebuild b/sys-apps/policycoreutils/policycoreutils-3.2.ebuild
index 60b377c9efda..7299c44a1ddd 100644
--- a/sys-apps/policycoreutils/policycoreutils-3.2.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-3.2.ebuild
@@ -25,7 +25,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz
 		https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 	S1="${WORKDIR}/${P}"
 	S2="${WORKDIR}/policycoreutils-extra"
 	S="${S1}"
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 5d65b0aea1fe..095250229eaa 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -7,9 +7,10 @@ DIST portage-3.0.20-bug-796584-693f6bf.patch 2335 BLAKE2B 4922fad1fc34977b786555
 DIST portage-3.0.20-bug-796812-2ce11f0.patch 1292 BLAKE2B b7ca91f6d24e0eaf398ecdae8534ba19f88649ae91316a1cf074a04755a433038c04be49bce4d06306a03e25f7b83899205b971e40fba9248a56d5e65c48a2a8 SHA512 7de6d01d35e6e65be631a31e886b0b7d56d87211aeb1d5d3b8a60c3c6c510db368cca9280ea430675fd101434a15b3d1aef47d2a1d90a28fb634de46c2152768
 DIST portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch 10306 BLAKE2B 9ffcf396b983accef3263efa9f7a6d515cb5b669643abc5dfe610577abec80713d8a202950d37ed78625446f2db37559639002745dea7cc973d47f8befadca06 SHA512 f4cdf3dec98f7ba7da4d5454f4e75408b64934f59e4e1fc9f391a8fe4832b03c4598eef0affba01a415bcc2135d09d682fa612116ed1dbd753783268af243aa8
 DIST portage-3.0.20.tar.gz 1348818 BLAKE2B e8af0662d073110a921ef23865872b0440f5e549da92b828af3dc71010d0f49d98c429c52c90ed683407fcfee7bf17a504082166f2fcad9590d7435dd43dfb83 SHA512 69c1846dedf0cfa3f57b2748cf8e077ead05ab0185e785dfc6310439b8624cdd72449209a807f12f59a5175ba065f8cca1409d43bee6012900b2c8b1e7f9b7e9
+DIST portage-3.0.28-setuptools-install-depr.patch 1191 BLAKE2B 1601b8943be27fbebea8bfc5e927e9ba6c5e18b6b76a89f8b2b8525595f4693fe014d0bfd936b513a5d03524aba64797ef1bb1e85b0965426a6f36b6c9e9e07c SHA512 bb06c3f705e4a3e6fcc170fe36aa522184c573ef6e05dea3678ff9158472722d1b68fc480b89f4656786e024be6c5f6f656c386aeda467744bf8e9acdb6ffef5
 DIST portage-3.0.28.tar.bz2 1153994 BLAKE2B 8d9e3af04acd9bb5fdb3cff5b928abbf707db13f6c25afdac4399ea47adb67b2621ebb733927b4f9386e3f285fa7daac0423ae3fb0509a9df747b41c82865313 SHA512 148484b0384672116f2f2187eaddb56f646548324cd5f6c8e187a02bc965fb2bea6632214aed9b40c615acb89eb6124ab831ad85c59bac9a416b02a07506669b
 EBUILD portage-3.0.18.ebuild 8756 BLAKE2B f4a457de8df4a6c79568de33f898c56016ef44fc44b8965befd5c15dd16b93a800c8797ebfaddb0cb6e81c1a6f7af68eb297d9399bad9aa534ea75117eba73e0 SHA512 40329720f7ea7538da334479835cf21560f2e3c3420863593cbaf7dfb454dae1b01293256622ee09c05d3e7d8949e4f2839d1d1bd0911ccb9d6e63254003790d
 EBUILD portage-3.0.20-r6.ebuild 9875 BLAKE2B 5057f1c542c443088fb5349692da20e01a113be85748e17d02c3034355d66bb6b94932baca8016d90d5f58b7d00baee5ee1dfd22842d3f25c31a8255808c26a4 SHA512 cb309c78a7f02df7b7b67b8ffbfb03b27106fef0a59ab89858e9be2d1257a2c9efe7bc6f0d2a9fdcb2c4ab9bc82387f2460270676dbdf3128552f20377c461b5
-EBUILD portage-3.0.28.ebuild 8557 BLAKE2B 0b98c96b06eea280478adb73237acc22a7b5fc6511d4bbe99258baeac6b88cbd40d80bba033811842bcc143a7710bea3f4cbb731adb61c536ff43ff3893a3812 SHA512 1b16c5458ce8c3a0d37c183c6ea0a12559ed3f2bd36c9eba526fd70c815ad89a6e13fe2b4684800b707ff6766985406a4b4f8e0f4f8a0f1988052f0e7718e8bc
+EBUILD portage-3.0.28-r1.ebuild 8765 BLAKE2B d9037687539ff5db043dea28862d5b958e49ed1ce4a4df58119c0f8fc1592399fe76b4476b4ce57bf6dee02a16ed0660dc7554c03a24382227372fe101d77c9e SHA512 be5fc4e8e277896e57e750a570ad6f8d1fe16a05b66b7922f83104cf785d5db8dc6ef36b9eff41b24cc9981a934d9225c95d038e5fdda591d89ce96eda4c75d9
 EBUILD portage-9999.ebuild 7833 BLAKE2B 99166bbedf61282c15d7766beebb1327b3ecf91066b8164d6b2341d70cdf4741e8749b26f1fe1a707b154276fef6478e5f2f413877be0c202a6408febebb2664 SHA512 7c2bf11a5d9e9853f32fdd147fc5c9bdc69e780001484e5bf550845592acc463c8849cb760a16aefccfe636e6d951a7095171d2ee77c895d9ef619181e2e7e4a
 MISC metadata.xml 1483 BLAKE2B 5f164044c11b8fc7a103c459be58268403dab87fbbfeedd0f5fa4d1a4edf9ec7d4983cc7d5a3e6d298b268859fc1eb91723f0c98313e9b3b5dfb0368aedb1a20 SHA512 284a46b4708fc88734ca87f041fb6a88bc4a7e6a50ce03533a1eef9602694adcb09679b665a3793e4609ea85fd41b84438b27479ffa00ac53cbf9d4bb89a3402
diff --git a/sys-apps/portage/portage-3.0.28.ebuild b/sys-apps/portage/portage-3.0.28-r1.ebuild
index 18bbc5bc82b3..5142ff74cee1 100644
--- a/sys-apps/portage/portage-3.0.28.ebuild
+++ b/sys-apps/portage/portage-3.0.28-r1.ebuild
@@ -11,7 +11,10 @@ inherit distutils-r1 linux-info tmpfiles prefix
 
 DESCRIPTION="The package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
+SRC_URI="
+	https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2
+	https://gitweb.gentoo.org/proj/portage.git/patch/?id=c309328c4e1f6254251d31149ee47b4266d4d70f
+		-> ${P}-setuptools-install-depr.patch"
 
 LICENSE="GPL-2"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
@@ -80,6 +83,10 @@ pkg_pretend() {
 }
 
 python_prepare_all() {
+	local PATCHES=(
+		"${DISTDIR}"/${P}-setuptools-install-depr.patch
+	)
+
 	distutils-r1_python_prepare_all
 
 	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
diff --git a/sys-apps/ripgrep-all/Manifest b/sys-apps/ripgrep-all/Manifest
index 35eef8a725fe..2d9e196f66f9 100644
--- a/sys-apps/ripgrep-all/Manifest
+++ b/sys-apps/ripgrep-all/Manifest
@@ -159,5 +159,5 @@ DIST zip-0.5.5.crate 33064 BLAKE2B b10857e79c0548ce0aec9d1d7689e4b9c9d78756c7eaa
 DIST zstd-0.5.1+zstd.1.4.4.crate 26509 BLAKE2B 909a36290f48e65147f43a2a08edcfca42471efb28f2ef28f2e45246f91498d184749fc19a56aeddc0db3ff91a003cc39909e92fe3f899879fc9aa8b32f26ce1 SHA512 565a3898c24eb5efac75df6b76d327ce8a2e62f261e63c4e307ad8583604333d9e3ba6567b3d83c7eb771a1117b743e594dacfe3fdf7542800da921ec0ebef2d
 DIST zstd-safe-2.0.3+zstd.1.4.4.crate 16090 BLAKE2B afa8563797ea2684972c5d440cba2bea070a487d182d782bd1a14eab6d2cfded1bfd6634b1ac3e39a5548d24e90415d0d9a77c951572f9c3657a7f81fcabbd56 SHA512 05f45aa3440e84e72f9a2bc647a5c1b146399dc5424767fc6371aadb8f48cab24dcac5fbd1c856b770c9c777b983382482d76ab8b10b99ae9569f5ffda852ae5
 DIST zstd-sys-1.4.15+zstd.1.4.4.crate 2014730 BLAKE2B ac978e2103688671f1dccb30da144a144e76a5aa054aca4a46e9fa18070e432e0498cf36d6e6294b21b1f4d30fca46a3c1df2eed5841674ce81f2d90b4021391 SHA512 523eb1f4183deca8be3cb018e43b9e51f1910b9e04b42795fb23e036c6f13e2b81ac70ea11837200dc3061622562d360499ed3b939fd8ff23c486fbcc35ec779
-EBUILD ripgrep-all-0.9.6-r1.ebuild 3735 BLAKE2B 5141452486afa52cddd86ed2cd7afd63a9d101e13637e29e182f47dccd2efd69c7c0df2deb36a2aa7d39cfc56fac6607ae2c4b13b6f97dce45d8e5cd4f398940 SHA512 6d8f75092431b0024a25a0e9f234275eac6e47112900e405005ccffd1be53c6c57e2749f315d36d41d8185d9f471a9f65767f9137897cf3dc9e94e7c70eed938
+EBUILD ripgrep-all-0.9.6-r1.ebuild 3734 BLAKE2B 291f84d5344f31f8e8e907b1d20d73f4d68009b5e1f2f0587f30b2ee68b061e463ee7929a94e82054469617e4245c3a266882e5fe9d3bf4d62f8c493e6ca3801 SHA512 74ec461515eb656aede47f9f4be2f4096e1c1141d63f53b708aa81585cb91bd009e2e1d2a57167e2e7afe307f8be8e5d63e43cc271ff7fd564ddf13c936c98c2
 MISC metadata.xml 247 BLAKE2B 4e1dbdae308a736b571e2a7ab4a90c650461771c024127c95a33990f3973331ba5de3cc8fe960115af9bb06f49908d258211b2a4e07c0f8d2a9536c965d836c3 SHA512 734659aca9188fe48564f64e23622ef0201931c75e1306043902fcf487a4155e8027a378872a48c7e34a903cdd0363a8e237b0965b7f532f80eaf38353940dbc
diff --git a/sys-apps/ripgrep-all/ripgrep-all-0.9.6-r1.ebuild b/sys-apps/ripgrep-all/ripgrep-all-0.9.6-r1.ebuild
index f3c4070d21b4..957085f9a6a0 100644
--- a/sys-apps/ripgrep-all/ripgrep-all-0.9.6-r1.ebuild
+++ b/sys-apps/ripgrep-all/ripgrep-all-0.9.6-r1.ebuild
@@ -181,7 +181,7 @@ SRC_URI="
 
 LICENSE="AGPL-3+ Apache-2.0 BSD-2 ISC MIT ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	app-arch/xz-utils
diff --git a/sys-apps/secilc/Manifest b/sys-apps/secilc/Manifest
index fc55488eca51..b5853dad6f04 100644
--- a/sys-apps/secilc/Manifest
+++ b/sys-apps/secilc/Manifest
@@ -2,7 +2,7 @@ DIST secilc-3.1.tar.gz 176631 BLAKE2B e79818580d2a788d672574ebd77349f0c59b678d2b
 DIST secilc-3.2.tar.gz 179384 BLAKE2B 89a02ceeaeb221eb5e819f6c6f09cd7e4675971d1870850867f0e258e3cf089c048a2976016c8200cffcb7904aae01d7e9d6a0c086a2a33fb08020df10b92059 SHA512 ef60aaaba3a9b4d8da496ae80203a8c9595dc2f97f767432f6b3323395fda65293540ed9574e8d7d3f40854c3ad38a95a7b96939b6c689f02a3d04834b81ca45
 DIST secilc-3.3.tar.gz 181205 BLAKE2B ffccf2e6ea416f6e5a8270a488c6c6ed01b607af20fffed129f5d9b9957f2ab16e90a3fdbd57b597f1195987edf6a2ca1ae561cca62d176a01878fe24900f4b9 SHA512 11b2b6a56d588a71d8cc5b2e69e76579ddd3ea20e036bbfdbeefd8ed64a6dca3c8f963509a96231eb21807a195ec24e4807ef52dc2218ee0410ee0828ad77fa8
 EBUILD secilc-3.1.ebuild 877 BLAKE2B ec8b1f7e9874e234d561ac9deb26b128ded5599616bd2e501b6fb591e77c45942466c227103c7f040dd10ba49445e283e9fb410d3f18635c8f4eb9d0f0571b8e SHA512 e3d0bd0d5bcb480d10f7a7e188a13b380f6452a5f153a0c5abe3b58bd475225d271e127cb1ec6c9ea98e3405095992aa88cfceceaae7278281cc8ce0bded1904
-EBUILD secilc-3.2.ebuild 772 BLAKE2B 49c4cdaea7d58b8d3f7b5c3a392e12f3cb56534905cfb54a379f142667805d27ee7003c8a3cfc778a74887cd91d5ef4df5903b803be79389c559fe9f9371854d SHA512 1867606221210d55944a10ed38bf2a349ff0472e0e77c7091a823f2989ba811cd7df984c3457721f01dd63e66758789c73fb5b0fb4ba1aab300d881dd90eaaff
+EBUILD secilc-3.2.ebuild 770 BLAKE2B 0a03a4c536f52d34bb1355ff9ba957170875c41edb11648484469d355ef533ecd8cb2e4083aeba5eb46ac19b5ead308a92b95772d768763801f0e19360690fe7 SHA512 b78f66005b8b7d2672446acd60bca58ea14d3246152d5befae3114be524cd32f6faca8ba03543375b9a5cee3d7fb0245b2d664d0148d0e13a7f630163a9aeae4
 EBUILD secilc-3.3.ebuild 774 BLAKE2B d709fc9df54be7141f47f78cceaadf30103a4fc6fd29e134fbf296d3750b2523f0085e539c35900636f0d4c38d86f891661113ea2907a1ac91f9a061aac37f20 SHA512 9043484e9051e31c0a5bdb6420766f67a448b66acb1e8a6b3dabc99313a3b969e9fd8eb0437333f37295ef2202a60df67d9a25abc35dbb1e8703e163509351f3
 EBUILD secilc-9999.ebuild 767 BLAKE2B a29b9d94a0b73c83f2d3b403e85a0a8d2b279e0cb6f82af8e7efec6e4293a33dc43622aa817180eb501c67d8c42854bcd08aeee80c8f99795679f964428cc2d1 SHA512 0a179e4c5deabd685f48103c0ecc6ed190aed00122d91731a040916cd55b2853987c44cfe6315ff872119a7b53f9a1b8eea88dd7b8c24b66ba62c6cdb8e2af19
 MISC metadata.xml 518 BLAKE2B e04a38178db6390e78057059950b7c7ff090272739b618e75b5231176594a7fb3c2df88cfbf63575a3805bdb22f87c7f6aba7044bfc0c2c5e6ebdfef18b47d95 SHA512 a0d7f84a3578791107f46664b0da8078c37cf9a976d8aca31d462d2b19b82f1c7a0c7d5d43b9af59736983fa223238aabd1000d4eaaf18ee0a7759e2d6b0ce81
diff --git a/sys-apps/secilc/secilc-3.2.ebuild b/sys-apps/secilc/secilc-3.2.ebuild
index deb372f0b8f7..8058954b003d 100644
--- a/sys-apps/secilc/secilc-3.2.ebuild
+++ b/sys-apps/secilc/secilc-3.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/selinux-python/Manifest b/sys-apps/selinux-python/Manifest
index a35a60fff66f..997c2878d4fe 100644
--- a/sys-apps/selinux-python/Manifest
+++ b/sys-apps/selinux-python/Manifest
@@ -3,7 +3,7 @@ DIST selinux-python-3.1.tar.gz 2100549 BLAKE2B c5d207bad60c379259e3bfc8f029f76d4
 DIST selinux-python-3.2.tar.gz 2101106 BLAKE2B b4b185a7468de68eb2146011a9bc82ffb7db9878517833c1e8dfa23279aec3dfbf46a27b70b17c1e317a2c939bcf6d1748638fd4a078325b853de34ae3c51a6f SHA512 2c3483e27c4ad6942e23e39897e0eccf61b95d685ace62315678cb49739d300d4ca4a7a51fa7a9aacaa98737446a70923855d15827eb6275ffd6999be0b2a755
 DIST selinux-python-3.3.tar.gz 2101584 BLAKE2B 603aafbf316b744098bd34c79bf384d55624c086fd75147675a4a0715df3d61710a99d490f30b78d59a2c2a85fcc4db91772c24644a963b31e1a0d305c4bc83e SHA512 a69948a8b139a309f18632440e4204f49832a94b8b6be50e162d3dacb16698effeb1a77c44462e8cc7dc3dd600b887b9ab2fef618c31d3e0fe0de216a6aaebe3
 EBUILD selinux-python-3.1-r2.ebuild 2548 BLAKE2B a449b67df1783f7a74859bb5fda7c6c17d4c71c21abb5e3f286872befd15c6f8b85b0a12b67232682bc4e5bcdb6701c0b926d78b4b428d56cec6f0f264072ca9 SHA512 a7ca65aab8c6c7fbcd16e1b26a0b21569f72ffc10e7784ca6cba5cbc1bf4cb57fc846095abd0056d0e4ddb4dc6065b464defef55053e4d554cf5baa086bd70f1
-EBUILD selinux-python-3.2-r1.ebuild 3151 BLAKE2B 159662cefe46f74a32aeec0c15fd580e08c575e8cb7f46c5b7f8dd0550add8d435f5c1f12719c0e1f0cc171321f58a25613f3a7985ded8abfefd017496e7b621 SHA512 90c34db3aa7db0cf058635fa6da82b71d9c2f7c23f8c154bf7731545b4279451464df5b294440ad31c7f79bb5eb44ba6b9e84e7d88af27580fc2585cbd05b330
+EBUILD selinux-python-3.2-r1.ebuild 3149 BLAKE2B a828b900d32c908ab7c528f35deb47843746e4c71196f3d9be947df1ffb724b5e1ebb27b00410400152e2bfc293d26b1604a6b74df939fb236c4b2455ed79133 SHA512 b6eb9d5ac518de681df9f22bb3c0eac560152da2b658a662e0e44041024ab7049bb0981af2ab71f87f4e8da814ba0770e7308ce471ba3dbca4870448a96ea276
 EBUILD selinux-python-3.3.ebuild 3091 BLAKE2B f808560e53edca86a9bf4048f90f271039c7904da00cc71628ed3e34abbb5c57607ce8dfb408cfcfb98218baab88ffe95d13f044451b9fcbd3023c669ad3d6ba SHA512 badf21087e5b5d43791c2351c25ba2c087e9db7b1ef1a4db3a9bdf9c4283a03399cb999acb5dfb88e9c13c21e1c82f5684f0c041f0f5b081b9861eb2974aac0d
 EBUILD selinux-python-9999.ebuild 3091 BLAKE2B f808560e53edca86a9bf4048f90f271039c7904da00cc71628ed3e34abbb5c57607ce8dfb408cfcfb98218baab88ffe95d13f044451b9fcbd3023c669ad3d6ba SHA512 badf21087e5b5d43791c2351c25ba2c087e9db7b1ef1a4db3a9bdf9c4283a03399cb999acb5dfb88e9c13c21e1c82f5684f0c041f0f5b081b9861eb2974aac0d
 MISC metadata.xml 558 BLAKE2B 6fba5f27d19e5ea730bd1bfb9b63c536a86f0b47c7156388df9e9af9bda8856c8e4291bf822b469afb333638504d75f64215ef86f3bf65b68812a829b0e94f38 SHA512 df8eaff3f7e69d8d0f437d29dc38b654b81a5769c32e8c0fb98aeb83cf18a1598845d03d177b1837a6b0b628a34c524a52fae5672b7c186a6a8567f349b25304
diff --git a/sys-apps/selinux-python/selinux-python-3.2-r1.ebuild b/sys-apps/selinux-python/selinux-python-3.2-r1.ebuild
index 15b87bbd7251..e9ba19ba5815 100644
--- a/sys-apps/selinux-python/selinux-python-3.2-r1.ebuild
+++ b/sys-apps/selinux-python/selinux-python-3.2-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${P}/${PN#selinux-}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/semodule-utils/Manifest b/sys-apps/semodule-utils/Manifest
index 6bf4ac9d809c..6f9997175834 100644
--- a/sys-apps/semodule-utils/Manifest
+++ b/sys-apps/semodule-utils/Manifest
@@ -2,7 +2,7 @@ DIST semodule-utils-3.1.tar.gz 14257 BLAKE2B c8c9a1ce7c9c4f53b1f4c728d16b149fdc2
 DIST semodule-utils-3.2.tar.gz 14260 BLAKE2B 35c071c96071028d4a912a89b88d02672f1fb8c2d8d23c3cb472b607dad55acdf351ef870b4d52bb2bed7b816a199c18947afcd16e77b66268822288feb4af2a SHA512 f937647cc22f7ed719908bad64415d706fd97cf1dce484dbca2484b05b3295de40e31bec643b6caaf4e8be742b1f911428d393c5e2d1d0ae39a2a37fd3be9bc1
 DIST semodule-utils-3.3.tar.gz 14268 BLAKE2B 5b03dd731c28e29b146e9f75fa7ce5151e58df1ea6598356b1ad9ee6846d2ebf7ceb57c740aa0ae4b94e0a7356180bd8e608d6a9543b48251e553036f2b2833e SHA512 76aa0c9322889c7de100f3c5789bdf27b7073827fe2af371bd50a4517baa8442f35e53f16a93227dce93da0ceb054bea7e5ee17a46fe05e06f3c2d9925cf59dc
 EBUILD semodule-utils-3.1.ebuild 937 BLAKE2B 2a17b566209258d0f47adf56d8c38f7c920f6ceb053e07bfaf7dd51139e39a42cc60a4e1986ccb19b50c4bc89b1c97b3a133c02a38431127dfd17200e361e535 SHA512 e36fad3f19c5f81791e57a02ff677a42d02e8037b4cad66d24d7bf37fa50863954c8fe58c18d1416212d24537febed8b91bdfa6fa3ce9c79efb5c80675b3d476
-EBUILD semodule-utils-3.2.ebuild 808 BLAKE2B 0b1a8904210665e80b85aeb592cb9bc0e0eb574ab6dc8583f58ab22c00eca0c38cbcae0a6e8ad3f46cb0a7dab43bc8e74c1b26aa681fda8b04a8773926becd25 SHA512 95cb923afba92ed58410961e31b72c99e2df03dd62659a51497de35c6c8d0cb985e1b56582abee87c9f4d47f483343a9a0791429785d59a1c5dc11a92b4f6e1e
+EBUILD semodule-utils-3.2.ebuild 806 BLAKE2B cfa2dad68c85bcf6be3aedf1e2c5e6f071d98d98f72c7d48dbdc68896fb5c603701adc03cb52e105ab8063fd8431b8e2362ffb839c853127dc666f3907325f59 SHA512 699229f4a8ad869568eec8145ca1b1d014f2abbf870dde437bcef1c71149d3433383298590c0f9fdad9719b7ee284484e2ff43249a8c000e8b6b4987da1224a8
 EBUILD semodule-utils-3.3.ebuild 810 BLAKE2B ec38af054d489b5782728e6c61f75e9b537c22fedc0babfcc9c9760cfd1af93d9ade3aab08a53374586497724fa3812d9c6c2817ce061bf00aa1a0e81cd2d433 SHA512 e524646d89401e49b007ff969ddce63e06efc42bc16960bda20b84c03c1cb6b98e89ad0608eb24208cf9f0afc0ef8d786bc58430f28935ae524f6b3a70fad069
 EBUILD semodule-utils-9999.ebuild 810 BLAKE2B ec38af054d489b5782728e6c61f75e9b537c22fedc0babfcc9c9760cfd1af93d9ade3aab08a53374586497724fa3812d9c6c2817ce061bf00aa1a0e81cd2d433 SHA512 e524646d89401e49b007ff969ddce63e06efc42bc16960bda20b84c03c1cb6b98e89ad0608eb24208cf9f0afc0ef8d786bc58430f28935ae524f6b3a70fad069
 MISC metadata.xml 401 BLAKE2B de9fab42212c80ca7439bc2f09693f17a5da3e0c412a1599e12c9c02087487a68836ecf651b8b016b3215552cc88cd8b398d42eac783f0039d10d962205d280a SHA512 28d7ee52e3e1a41366554857904226d1fa9cea07726538c06913c65f7c12ea9d70a5d6ede253659e14f7672f6cedd90ac4ac572462220493e256f640a40876e5
diff --git a/sys-apps/semodule-utils/semodule-utils-3.2.ebuild b/sys-apps/semodule-utils/semodule-utils-3.2.ebuild
index 14d5e5bc116f..5a5792a677bd 100644
--- a/sys-apps/semodule-utils/semodule-utils-3.2.ebuild
+++ b/sys-apps/semodule-utils/semodule-utils-3.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 DESCRIPTION="SELinux policy module utilities"
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 8f0a656a9599..a07d6c681017 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -5,6 +5,8 @@ AUX pam.d-include/shadow 152 BLAKE2B 82d1f678abc60586ea873da7e2f4907349d77a64085
 AUX pam.d-include/shadow-r1 116 BLAKE2B bc7baa8e224cb90b6ef79762941b3b7505fcf4b8ed8c5da06a33a8a7fefa91098e4ac0c0f915eeca4a19714d60a2bf43e3922805347e3dfe0ccc80f210bf88e4 SHA512 ddecc5cc8f667f9931ddf5d98d89a986712c5a6e44826add1e1d9ead37064758a3879f6afd1fc45c89c216956593852051e2ef3abc52e2ab58a0e191adfe75d1
 AUX shadow-4.1.3-dots-in-usernames.patch 302 BLAKE2B a83f463be9267c3a704997b98d67cd0daddf8ee05debf447d091530517a855078bd53ce28c87045643b2b8c467dd09caad06a4eb0a6568c271e6a42b49a54dcc SHA512 ad20fb3f4f0292f39b5da796e41df71e9e8b1b81dd11a99b2d988440c1b435b0061333a0a5a37a909598d5a840a75946e8c59c74426bae7452de88cf673a5f7d
 AUX shadow-4.9-SHA-rounds.patch 1714 BLAKE2B 71dbc5189486cded95e34aa5d1b1a2af836004d42c0ccaf4b0fed7bdf525e87aaa73fd40ceb29b19eabc0043e20843aab846eaebce3e9d84d67a3106af8c3252 SHA512 f7b332818a2eb5b4c72021ca6f4befb5d067277599d9e57a5f68fa92dadfc40b6c3286627e42d237468ab3c41868b607ae35c08e2e60439ad5d08627318bfe4f
+AUX shadow-4.9-configure-typo.patch 806 BLAKE2B 3edc2b9fe1b6559617aa6a9d971d2dbc26c45ca1d8d2f5aef85b20f19e9c2f10b7c0b80fdf5767799dc25167bdcd5c81aa97e3bf37553a2e003336f06aed14a9 SHA512 e126fd489828819e8dbd64b367f7b9e38a43992938c8a1f3c36947071060f5f42b921c40a1b8ada5fb555450c7ce0924641ba47f12c519c07b1e5f13f55654cf
+AUX shadow-4.9-gpasswd-double-free.patch 931 BLAKE2B 034a929c86f9ce85aea4898836d94f5303684b0babf4b70b71fa80316421842b1fa100006199fdd16ef40da75073430ecbf3d8f812db6be6b39d820bc7e0351c SHA512 bfe68f6a54f5d477739aaa37ace842d0c1a0499aeccc505ca62d58bd01ad4dd9e43913cfcb757855f49eee932a7bceb018be4fbc96f852c3568b831cb3188ede
 AUX shadow-4.9-libcrack.patch 738 BLAKE2B 7ba0fd5e2c9c81bbefa75b2f1e29ed94ae32f302cf81c9ff978319bdb81a905248a638a535131df92c401383c184b22aff174d1a366e37a9dbb8756c9f7975ba SHA512 c967227926a5bd2c511ecc9d4e39b39aef50615404c79ad30d1e7bb967e09d52669ac9e2047d7d5039cdfad9b2dcf53f2de17a6d917cecbf9c8a72a77f1c0a10
 AUX shadow-4.9-libsubid_oot_build.patch 2933 BLAKE2B 9bc638bd1d0733c6e51b54ab1f1db132bd4499a24b33efc76c58c306267015ebd9e2e927e774c3631cfa94490bb249b4d2267a163ae85f9f6ba18b964fcc81d4 SHA512 7f42cd84cb606fde19750f26883c4650642499dc6cb0078bc733d5d61a51b39c9f1c3898000e2df8ceb84eaecadbab6ae502178bf51d205fe644bb8c58a62bfa
 AUX shadow-4.9-libsubid_pam_linking.patch 706 BLAKE2B 8d9b3f6ab2aea004275e6347568013b0092beb57d08a51e6bbca0480773525518febd0ec975dd37a9c071c5ec17d56541586b9afa12010081a392dc60cee4c13 SHA512 49a40045520358d1fb29daae30f9fef1f8aab4516596f16781d3702642ef70592959536d69f4755d57689fc6e30d029c5dfc545d95362e811a284900cb628b6b
@@ -12,4 +14,5 @@ DIST shadow-4.8.1.tar.xz 1611196 BLAKE2B 952707cdd55dc6c00dcbc60dbc3bf84ac618dbe
 DIST shadow-4.9.tar.xz 1627008 BLAKE2B 7a9a6a489115c7a20520cfec61f008fc0f70f7f50aaf539e94dfdcb20035d2de88ab3198e76812a4e3eb944b92c76c0ca2e85e35f4342537711c2c033248a72b SHA512 254cda49bb14505a7604821e7fa898bf4bf317d648e9ddc881ab80a6860d52053dfffacad6feab87c7d16608c35ed6b6cee99e7757eac930da3a7b31cdcd4b95
 EBUILD shadow-4.8.1-r4.ebuild 6134 BLAKE2B a3effe54f52408bfee5ed17134a58806e005aab38391d4ff78888e3ae18c86f0d76dd946c2494bc92901e8400e7b98db0e4045f004a8880cb6c437acff28d560 SHA512 2e7375dd6c94bdc85eabfe8cb65d0c7df4bb1bc9b2aff418824046a8af80493f3a481476f63bdc91abca4aefcc61105b2aa6c551e8b260b8da1db2d0587b56fb
 EBUILD shadow-4.9-r3.ebuild 6112 BLAKE2B 09778e7c21213de9f541bd46e50c647c9a64f83bb3556c9f1845d72504e394de42a3ee4e2f832ba9e532b8eb46f542160928ef4d6e0b97ca53060b4980be7445 SHA512 82753d7c7936d72b80dd759a94746c66cf89f68528584af369e2e1978807853e5d39364feea9b169e3c7beb0bbcceb46f2a1d11bbf0e7bd08ab55c0a84df9e6c
+EBUILD shadow-4.9-r4.ebuild 6207 BLAKE2B d48c118d9d149bdc0c4002ac99ab649571bdcb410e9cd1dabcc81e9009f255e00e52bc85f2c63b3d08a74e15f51179fd09ec8261d5f9173b8cb3333d157b8d70 SHA512 8e008190604c318430141905e13321f4d287242548a9e10c5a345b1fd0d02bd6e26213f4487142fce39dcda49ca805033250d907002e6e2f4a7282670378208a
 MISC metadata.xml 563 BLAKE2B c798cc562a973cf521347a9245dec0b6622144d0ea1d3a1cfb82aa9fc44bf9b3c26cf5f6a265a02399e1decfa7cf1db87df7d7eed7bb1a7ead74d2f156688ecd SHA512 024b490bd1197bebd41e53c74aa7ef72e0f46b5db88484d357b69a5f9acb14e790a2706e39fc83666c6cdfcee610571401c7288310775eb5341dbef3f1160c1a
diff --git a/sys-apps/shadow/files/shadow-4.9-configure-typo.patch b/sys-apps/shadow/files/shadow-4.9-configure-typo.patch
new file mode 100644
index 000000000000..1a6db304a013
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.9-configure-typo.patch
@@ -0,0 +1,19 @@
+https://github.com/shadow-maint/shadow/commit/049f9a7f6b320c728a6274299041e360381d7cd5
+
+From 049f9a7f6b320c728a6274299041e360381d7cd5 Mon Sep 17 00:00:00 2001
+From: Andy Zaugg <andy.zaugg@gmail.com>
+Date: Tue, 21 Sep 2021 21:51:10 -0700
+Subject: [PATCH] Fix parentheses in configure.ac
+
+Resolving issue https://github.com/shadow-maint/shadow/issues/419
+--- a/configure.ac
++++ b/configure.ac
+@@ -345,7 +345,7 @@ if test "$with_sssd" = "yes"; then
+ 	              [AC_MSG_ERROR([posix_spawn is needed for sssd support])])
+ fi
+ 
+-AS_IF([test "$with_su" != "no"], AC_DEFINE(WITH_SU, 1, [Build with su])])
++AS_IF([test "$with_su" != "no"], AC_DEFINE(WITH_SU, 1, [Build with su]))
+ AM_CONDITIONAL([WITH_SU], [test "x$with_su" != "xno"])
+ 
+ dnl Check for some functions in libc first, only if not found check for
diff --git a/sys-apps/shadow/files/shadow-4.9-gpasswd-double-free.patch b/sys-apps/shadow/files/shadow-4.9-gpasswd-double-free.patch
new file mode 100644
index 000000000000..d7102ce03c32
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.9-gpasswd-double-free.patch
@@ -0,0 +1,35 @@
+https://github.com/shadow-maint/shadow/commit/117bc66c6f95fa85ca75ecfdb8fbd3615deca0b6
+
+From 117bc66c6f95fa85ca75ecfdb8fbd3615deca0b6 Mon Sep 17 00:00:00 2001
+From: Michael Vetter <jubalh@iodoru.org>
+Date: Mon, 20 Sep 2021 11:04:50 +0200
+Subject: [PATCH] Only free sgent if it was initialized
+
+`sgent` is only initialized in `get_group()` if `is_shadowgrp` is true.
+So we should also only attempt to free it if this is actually the case.
+
+Can otherwise lead to:
+```
+free() double free detected in tcache 2 (gpasswd)
+```
+--- a/src/gpasswd.c
++++ b/src/gpasswd.c
+@@ -1207,11 +1207,13 @@ int main (int argc, char **argv)
+ 	sssd_flush_cache (SSSD_DB_GROUP);
+ 
+ #ifdef SHADOWGRP
+-	if (sgent.sg_adm) {
+-		xfree(sgent.sg_adm);
+-	}
+-	if (sgent.sg_mem) {
+-		xfree(sgent.sg_mem);
++	if (is_shadowgrp) {
++		if (sgent.sg_adm) {
++			xfree(sgent.sg_adm);
++		}
++		if (sgent.sg_mem) {
++			xfree(sgent.sg_mem);
++		}
+ 	}
+ #endif
+ 	if (grent.gr_mem) {
diff --git a/sys-apps/shadow/shadow-4.9-r4.ebuild b/sys-apps/shadow/shadow-4.9-r4.ebuild
new file mode 100644
index 000000000000..044718eed4c1
--- /dev/null
+++ b/sys-apps/shadow/shadow-4.9-r4.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools pam
+
+DESCRIPTION="Utilities to deal with user accounts"
+HOMEPAGE="https://github.com/shadow-maint/shadow"
+SRC_URI="https://github.com/shadow-maint/shadow/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="acl audit bcrypt cracklib nls pam selinux skey split-usr +su xattr"
+# Taken from the man/Makefile.am file.
+LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
+
+REQUIRED_USE="?? ( cracklib pam )"
+
+BDEPEND="
+	app-arch/xz-utils
+	sys-devel/gettext
+"
+COMMON_DEPEND="
+	virtual/libcrypt:=
+	acl? ( sys-apps/acl:0= )
+	audit? ( >=sys-process/audit-2.6:0= )
+	cracklib? ( >=sys-libs/cracklib-2.7-r3:0= )
+	nls? ( virtual/libintl )
+	pam? ( sys-libs/pam:0= )
+	skey? ( sys-auth/skey:0= )
+	selinux? (
+		>=sys-libs/libselinux-1.28:0=
+		sys-libs/libsemanage:0=
+	)
+	xattr? ( sys-apps/attr:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-4.14
+"
+RDEPEND="${COMMON_DEPEND}
+	!<sys-apps/man-pages-5.11-r1
+	!=sys-apps/man-pages-5.12-r0
+	!=sys-apps/man-pages-5.12-r1
+	nls? (
+		!<app-i18n/man-pages-it-5.06-r1
+		!<app-i18n/man-pages-ja-20180315-r1
+		!<app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1
+	)
+	pam? ( >=sys-auth/pambase-20150213 )
+	su? ( !sys-apps/util-linux[su(-)] )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.1.3-dots-in-usernames.patch"
+	"${FILESDIR}/${P}-libsubid_pam_linking.patch"
+	"${FILESDIR}/${P}-libsubid_oot_build.patch"
+	"${FILESDIR}/shadow-4.9-libcrack.patch"
+	"${FILESDIR}/shadow-4.9-SHA-rounds.patch"
+	"${FILESDIR}/${P}-gpasswd-double-free.patch"
+	"${FILESDIR}/${P}-configure-typo.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+	#elibtoolize
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-account-tools-setuid
+		--with-btrfs
+		--without-group-name-max-length
+		--without-tcb
+		$(use_enable nls)
+		$(use_with acl)
+		$(use_with audit)
+		$(use_with bcrypt)
+		$(use_with cracklib libcrack)
+		$(use_with elibc_glibc nscd)
+		$(use_with pam libpam)
+		$(use_with selinux)
+		$(use_with skey)
+		$(use_with su)
+		$(use_with xattr attr)
+	)
+	econf "${myeconfargs[@]}"
+
+	has_version 'sys-libs/uclibc[-rpc]' && sed -i '/RLOGIN/d' config.h #425052
+
+	if use nls ; then
+		local l langs="po" # These are the pot files.
+		for l in ${LANGS[*]} ; do
+			has ${l} ${LINGUAS-${l}} && langs+=" ${l}"
+		done
+		sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
+	fi
+}
+
+set_login_opt() {
+	local comment="" opt=${1} val=${2}
+	if [[ -z ${val} ]]; then
+		comment="#"
+		sed -i \
+			-e "/^${opt}\>/s:^:#:" \
+			"${ED}"/etc/login.defs || die
+	else
+		sed -i -r \
+			-e "/^#?${opt}\>/s:.*:${opt} ${val}:" \
+			"${ED}"/etc/login.defs
+	fi
+	local res=$(grep "^${comment}${opt}\>" "${ED}"/etc/login.defs)
+	einfo "${res:-Unable to find ${opt} in /etc/login.defs}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" suidperms=4711 install
+
+	# 4.9 regression: https://github.com/shadow-maint/shadow/issues/389
+	emake DESTDIR="${D}" -C man install
+
+	find "${ED}" -name '*.la' -type f -delete || die
+
+	insinto /etc
+	if ! use pam ; then
+		insopts -m0600
+		doins etc/login.access etc/limits
+	fi
+
+	# needed for 'useradd -D'
+	insinto /etc/default
+	insopts -m0600
+	doins "${FILESDIR}"/default/useradd
+
+	if use split-usr ; then
+		# move passwd to / to help recover broke systems #64441
+		# We cannot simply remove this or else net-misc/scponly
+		# and other tools will break because of hardcoded passwd
+		# location
+		dodir /bin
+		mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die
+		dosym ../../bin/passwd /usr/bin/passwd
+	fi
+
+	cd "${S}" || die
+	insinto /etc
+	insopts -m0644
+	newins etc/login.defs login.defs
+
+	set_login_opt CREATE_HOME yes
+	if ! use pam ; then
+		set_login_opt MAIL_CHECK_ENAB no
+		set_login_opt SU_WHEEL_ONLY yes
+		set_login_opt CRACKLIB_DICTPATH /usr/lib/cracklib_dict
+		set_login_opt LOGIN_RETRIES 3
+		set_login_opt ENCRYPT_METHOD SHA512
+		set_login_opt CONSOLE
+	else
+		dopamd "${FILESDIR}"/pam.d-include/shadow
+
+		for x in chsh shfn ; do
+			newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
+		done
+
+		for x in chpasswd newusers ; do
+			newpamd "${FILESDIR}"/pam.d-include/chpasswd ${x}
+		done
+
+		newpamd "${FILESDIR}"/pam.d-include/shadow-r1 groupmems
+
+		# comment out login.defs options that pam hates
+		local opt sed_args=()
+		for opt in \
+			CHFN_AUTH \
+			CONSOLE \
+			CRACKLIB_DICTPATH \
+			ENV_HZ \
+			ENVIRON_FILE \
+			FAILLOG_ENAB \
+			FTMP_FILE \
+			LASTLOG_ENAB \
+			MAIL_CHECK_ENAB \
+			MOTD_FILE \
+			NOLOGINS_FILE \
+			OBSCURE_CHECKS_ENAB \
+			PASS_ALWAYS_WARN \
+			PASS_CHANGE_TRIES \
+			PASS_MIN_LEN \
+			PORTTIME_CHECKS_ENAB \
+			QUOTAS_ENAB \
+			SU_WHEEL_ONLY
+		do
+			set_login_opt ${opt}
+			sed_args+=( -e "/^#${opt}\>/b pamnote" )
+		done
+		sed -i "${sed_args[@]}" \
+			-e 'b exit' \
+			-e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.' \
+			-e ': exit' \
+			"${ED}"/etc/login.defs || die
+
+		# remove manpages that pam will install for us
+		# and/or don't apply when using pam
+		find "${ED}"/usr/share/man -type f \
+			'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
+			-delete
+
+		# Remove pam.d files provided by pambase.
+		rm "${ED}"/etc/pam.d/{login,passwd} || die
+		if use su ; then
+			rm "${ED}"/etc/pam.d/su || die
+		fi
+	fi
+
+	# Remove manpages that are handled by other packages
+	find "${ED}"/usr/share/man -type f \
+		'(' -name id.1 -o -name getspnam.3 ')' \
+		-delete
+
+	cd "${S}" || die
+	dodoc ChangeLog NEWS TODO
+	newdoc README README.download
+	cd doc || die
+	dodoc HOWTO README* WISHLIST *.txt
+}
+
+pkg_preinst() {
+	rm -f "${EROOT}"/etc/pam.d/system-auth.new \
+		"${EROOT}/etc/login.defs.new"
+}
+
+pkg_postinst() {
+	# Enable shadow groups.
+	if [ ! -f "${EROOT}"/etc/gshadow ] ; then
+		if grpck -r -R "${EROOT}" 2>/dev/null ; then
+			grpconv -R "${EROOT}"
+		else
+			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
+			ewarn "run 'grpconv' afterwards!"
+		fi
+	fi
+
+	[[ ! -f "${EROOT}"/etc/subgid ]] &&
+		touch "${EROOT}"/etc/subgid
+	[[ ! -f "${EROOT}"/etc/subuid ]] &&
+		touch "${EROOT}"/etc/subuid
+
+	einfo "The 'adduser' symlink to 'useradd' has been dropped."
+}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 12d61efe1f3e..6950461c43b3 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -3,8 +3,6 @@ AUX 249-fido2.patch 2323 BLAKE2B 5977ec0bed24f25ef3c152aab8e8b40cc91c115256cad91
 AUX 249-home-secret-assert.patch 5057 BLAKE2B 59fada3228e726110ed865e80f85c62d2faca852b3c3fdc47135123da622697e448a8c2d8826c140240210513b7474d27e71383f6d41b561790135d67d9324c1 SHA512 2ad4e15a900a27c55ca32b065ff91ea51344eeb0b5508ab6310efe2537a66e5eaa80c4acd287fb57b2d531c79528577c6fd0599e29e862c05cf81dc439a6a7f6
 AUX 249-libudev-static.patch 1454 BLAKE2B 420f9452066ccf951033c1ae1e215284fa9d11f24777c68ecd0178db5c7571ee881451300d409468c1ba3f3b2ad4b35adca5b2761309c84b315bbabd45f6b97f SHA512 4d616b4b02981c4622951a46f23519e03c2d1228453837d31fe060db70afa24722883ca57c08c55cd9fd35c720a5ef2ecb11ab3313867e1b3cfc3682e45e3f45
 AUX 249-network-renaming.patch 1801 BLAKE2B e87caaee0a304589633683a0bc4ba302b0deb4f1a04b7a7c2cc5d791638a4a8134f655b11e8b6bbabf5dbbc853b4d3e2bb78b82555e66081026a19da17aa4793 SHA512 eb03b8ac0cb0793d04d77a47d108621313ac4504f75c2a3811ed8399e391a716036a248efa817ef996238eb28ef7bff9fea4ced10a801c9a3c8bf98a608d466d
-AUX 249.5-coredumpctl.patch 1218 BLAKE2B 29ba11b0a98f6ef725acd99d4238e4fbefeda75eaa72d428488c0815e7c71c836ef8739a9c8c46393afe80e721df8ccc61d1127a16584cc9c21dc6aa1b8f90aa SHA512 f9adce83bfc4b1dbf3de70f7ecd913309c087c99c964dad57028917ec3cf651726ac83d02400796d680d744dee1a2627ebe64a4e15b3fbfa31dd5c11f8669f3b
-AUX 249.5-revert-unit-start-rate-limiting.patch 15810 BLAKE2B b82d8f8fda19c576575cf08b6b9187c03076f4198ebd4a309d9bab6f909a82c6b9caf3c0a63db42d0455b7e9bd4f6392cfa187f4d50bcd4ae0af23bee504f31a SHA512 3d92129f03e2a647609bec88c6f755ee38d8cd5344dabff9523e03a33e38d45e5defdbaa9a3a1a84d6e59ab3916939bfc7625296c25305525595f482a4525f1f
 AUX gentoo-generator-path-r2.patch 994 BLAKE2B 2bfb42623221291030fa9f7310e9bf747351a26f6ffd842628298787b74d4ec562bacaa9fc5365f7e854f695dab5f74bc06883fefc1f210dce4fd415926817ac SHA512 98054222ea232e120625573b6a532c312eccc02fe657152610b7d056b964bb2165fffae9d17fd986cf547af885d44c26b117fe68df5b24e2607d37f3729d0ada
 AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed68272fcfa9cc34a309ff5d4cc2230f71a6f7fed42c79afb1c96605df141e8e40b2d8290d12ad3c18038269814f2df8 SHA512 d77d4dae9f8a7819c6d4855476f3163ee19f52b20f66a93e25818f0747404462c47e3cafbd82ba85ce1b3d2fdbabdd96a0398b71149b318c540d82403f8ad0ad
 AUX gentoo-systemctl-disable-sysv-sync-r1.patch 821 BLAKE2B f5ef796725e023bb1ed83b34a3e4d45bb008de9a134892a5321b37b56809c7a44530d18e33c7877177e8b64b2d89dfc2de844bed433db6d5e57831d20fbfb456 SHA512 8d697dbd305f6b95a4ddc47cf9d99a0e954f54e161bd59164917b62a78ff5c23fa2d5be2614569c0a2297595dae59e1ee71bb04da72cbe0c0807e1abd7da974d
@@ -12,8 +10,9 @@ AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f1
 AUX org.freedesktop.hostname1_no_polkit.conf 471 BLAKE2B 50d9f86b2c4813a90eac8a31f0f762eb1b9e0272024419bfffd1d8c4dbe9955541df5c1e5a14e1663db3c0194e95a8984e5ec0c8a65eb74d279f021c3ef3d348 SHA512 af38bfed2230a75e03de6831a5202e21af6c01e13670df1a5b1b454203bd9db47428a61aa9cf0a21841a11e7caa889e3f6147342ba5411649e00f334a8e03639
 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781
 DIST systemd-stable-249.4.tar.gz 10593723 BLAKE2B 466b3cb27c4bc6c85c9ba50f6614175b2c31a4c177d452542faa1395e99511440029b1a093dc80a5a1a0135eed09d8b1849572f36dba4e18a1396230bfc31adb SHA512 5b9ec28102538bc3dcb632ee16389ff20dccf4b723186f6ae2da119a1809d84db0d8bcecf9b75c5e2da8427f5543e1da281bbed1a154e529d8a82ea5128c465c
-DIST systemd-stable-249.5.tar.gz 10597897 BLAKE2B 5c573322ef9bcd9d019776d6e2d8625a741c1535c0d06661b5666c2438a70cfc4dc182919bb419829de27a4d93c16717ce24e668faf9bd6b09e57f8bd88be725 SHA512 d6f1a5a6f03f0ed05b111aee75da509c5868c523af6209f33e630724dd0c7e0d0abf16920795d587e6c31a5915d247ebc613cf26d4aecf39f82ebb0690fab75f
-EBUILD systemd-249.4-r4.ebuild 15099 BLAKE2B 7076124a49b1beeb8153cbca7868a1e828cb0ae9b2c0e5e3fa60db5473f2f1d3870a7010d5b9dda71acb81d98cff970758595d32b2944761c4f59dcd7f65463f SHA512 e4be3bdf1c30aa36b02ffcda10502371543bc616988ad8cd558651f01efc55a813532af9ad42590e13831be8025f674af273e0001fe670929b9442319c812bf2
-EBUILD systemd-249.5-r1.ebuild 15086 BLAKE2B dad65d652cbf7723121b07b2a623dbaae414d97179341fd2b78c86aa0b64c12086dd128fbbdb616e22201ac95932e96d29272a93c3bf14d52a4c1b253ebac7fa SHA512 a1cf432f246af2bddf5d90fce671cde62b227d2401b48f142480a71dbbda984ba57c7bf6fab23a20a0d86ea70bc116d4f3fc149d231d06bf72d12b8bf28393ba
-EBUILD systemd-9999.ebuild 15447 BLAKE2B 57772e77237210d88b764e48a3117a9eca0c55621b9d5c1e4d032c7ce2048833949cfd86dbab0e5f7ba7b54e91e82435c9c4d03cdba386045b460e194f6c1df8 SHA512 edc4591b9762d207bcbdceb1c7a99489fbaecd24f6729330e9d8d95d89ad5850527ffa4039ed0944d2901346445aa5f96ef40e1c793256b8ef755740d3cc908b
+DIST systemd-stable-249.6.tar.gz 10599611 BLAKE2B 9c0cbaa4319f2ce9a78dbe820d1b6df5191e6c632e2eac9f71f9ff9817564d9b3fc177d2aec0c0daea8ac33bbdc2066ad68a8967cf8857f4af3668b9a3e7d3bf SHA512 7a7791dfe4923c00987b924adcb1cd08c4d17af2b17b4c6c6c701856c6810cfda61f06821c39787339fc05293853c0ea61b9973fcf4495c7bf4f8054ecfae66f
+EBUILD systemd-249.4-r4.ebuild 15205 BLAKE2B 680eebb0d80ac2632a0544cb853fe368da8b25f1272dc0e6f79a53176874c0e07f623bff51e83fede85b5c5587183257ffaf1b1f174bac451a692d7b549f4cb4 SHA512 94042f7c52369dc4bff28e7edc739461845068448551f4983ed160ddd5678cfdd2d3a0053af15f13ab01ff6d118602cf41de22762e77f613255695b617f4ac5a
+EBUILD systemd-249.6-r1.ebuild 14737 BLAKE2B 50016925e397ab5fc909dad7e27ea890fbf8208513bfa57c66f51e9ddf763567e13145cefeaffe4ee989209aa21ba8f837d086ddfa082ae723fdb2893253d88d SHA512 0f7a9424d254bd2fc9c686cf2543fdf23a29a04e872505a24ed4d38c7efb4e7edc807fed02b4e1762be5673943bec3c0ebeaf990540a2ac7d6b6dd810b5fe37a
+EBUILD systemd-249.6.ebuild 14916 BLAKE2B e6c09e9542b550a4800b46d5907356c67cf9ac8e37bd1014553be57d264285a27f12a3dce34e6ccae2b3d56bc7da95248345473e6eec7b536fd9347f51a7aebc SHA512 9d24b376257a7f8f47ade1fb0eae68c951edc8c95f297fe115b74b3f75cf97349222716dcd6522e556ec99396fc242afa28c197bafaf179fdeb6097d5fb0814d
+EBUILD systemd-9999.ebuild 15239 BLAKE2B c3afd49031d4614ccfc93a7382a9a3f3356ec7f31070ed2bc8b2ce45b60fa558285b1c6560c67c2be3fd0c88b89f981f7d8f5cc45b0fe5063e291aca187f32d0 SHA512 e767442ab69a25a2554b0691d240cb822ac5ec633627a99d02460e477f57f9b05a349d06ceb7cea4b72101799be850290055c75a5dac56291972e000d7bffcfd
 MISC metadata.xml 2623 BLAKE2B f07eb8074cfbd61dfb5580b1ec83d6f26dc3aff248d3dcb6932c164921b96681d829516fc9106d3e95f152412f5da4665506402d3c07db58ebd6120f32c9c1a5 SHA512 d2579bdef5d5715fc0d2a699c547ed3dcd938a91ab586fa6b8ee6f9c251af3ea8d04bfd0fd1db60fc943064a12e2ead4efed11894846fcf31d304cb18ee8c43a
diff --git a/sys-apps/systemd/files/249.5-coredumpctl.patch b/sys-apps/systemd/files/249.5-coredumpctl.patch
deleted file mode 100644
index 2892f3477137..000000000000
--- a/sys-apps/systemd/files/249.5-coredumpctl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 473627e1c9fcdf8f819ced2bb79cb7e9ff598b0c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Tue, 12 Oct 2021 19:46:25 +0200
-Subject: [PATCH] coredumpctl: stop truncating information about coredump
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-With the changes to limit that print 'Found module …' over and over, we were
-hitting the journal field message limit, effectively truncating the info output.
-
-Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1998488.
-
-(cherry picked from commit 384c6207669eb0d92aa0043dbc01957c6c7ff41e)
----
- src/coredump/coredumpctl.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/coredump/coredumpctl.c b/src/coredump/coredumpctl.c
-index 3d44e51e32..7eba8330d7 100644
---- a/src/coredump/coredumpctl.c
-+++ b/src/coredump/coredumpctl.c
-@@ -555,6 +555,8 @@ static int print_info(FILE *file, sd_journal *j, bool need_space) {
-         assert(file);
-         assert(j);
- 
-+        (void) sd_journal_set_data_threshold(j, 0);
-+
-         SD_JOURNAL_FOREACH_DATA(j, d, l) {
-                 RETRIEVE(d, l, "MESSAGE_ID", mid);
-                 RETRIEVE(d, l, "COREDUMP_PID", pid);
diff --git a/sys-apps/systemd/files/249.5-revert-unit-start-rate-limiting.patch b/sys-apps/systemd/files/249.5-revert-unit-start-rate-limiting.patch
deleted file mode 100644
index 6d070e8d30d1..000000000000
--- a/sys-apps/systemd/files/249.5-revert-unit-start-rate-limiting.patch
+++ /dev/null
@@ -1,483 +0,0 @@
-From 4fa9d8f14523982482386d398d2b2669902f2098 Mon Sep 17 00:00:00 2001
-From: Yu Watanabe <watanabe.yu+github@gmail.com>
-Date: Mon, 18 Oct 2021 14:11:53 +0900
-Subject: [PATCH] Revert "core: Check unit start rate limiting earlier"
-
-This reverts commit ed8fbbf1745c6a2dc0b8cd560ac8a3353f72e979.
-
-This was causing problems during boot, see
-https://bodhi.fedoraproject.org/updates/FEDORA-2021-a1a52487e6,
-https://bugzilla.redhat.com/show_bug.cgi?id=2013386.
-https://github.com/systemd/systemd/issues/21025
----
- src/core/automount.c                   | 23 ++++++-----------------
- src/core/mount.c                       | 23 ++++++-----------------
- src/core/path.c                        | 23 ++++++-----------------
- src/core/service.c                     | 25 +++++++------------------
- src/core/socket.c                      | 23 ++++++-----------------
- src/core/swap.c                        | 23 ++++++-----------------
- src/core/timer.c                       | 23 ++++++-----------------
- src/core/unit.c                        |  7 -------
- src/core/unit.h                        |  4 ----
- test/TEST-63-ISSUE-17433/Makefile      |  1 -
- test/TEST-63-ISSUE-17433/test.sh       |  9 ---------
- test/meson.build                       |  2 --
- test/testsuite-10.units/test10.service |  3 ---
- test/testsuite-63.units/test63.path    |  2 --
- test/testsuite-63.units/test63.service |  5 -----
- test/units/testsuite-63.service        | 16 ----------------
- 16 files changed, 43 insertions(+), 169 deletions(-)
- delete mode 120000 test/TEST-63-ISSUE-17433/Makefile
- delete mode 100755 test/TEST-63-ISSUE-17433/test.sh
- delete mode 100644 test/testsuite-63.units/test63.path
- delete mode 100644 test/testsuite-63.units/test63.service
- delete mode 100644 test/units/testsuite-63.service
-
-diff --git a/src/core/automount.c b/src/core/automount.c
-index 0722abef23..edc9588165 100644
---- a/src/core/automount.c
-+++ b/src/core/automount.c
-@@ -814,6 +814,12 @@ static int automount_start(Unit *u) {
-         if (r < 0)
-                 return r;
- 
-+        r = unit_test_start_limit(u);
-+        if (r < 0) {
-+                automount_enter_dead(a, AUTOMOUNT_FAILURE_START_LIMIT_HIT);
-+                return r;
-+        }
-+
-         r = unit_acquire_invocation_id(u);
-         if (r < 0)
-                 return r;
-@@ -1059,21 +1065,6 @@ static bool automount_supported(void) {
-         return supported;
- }
- 
--static int automount_test_start_limit(Unit *u) {
--        Automount *a = AUTOMOUNT(u);
--        int r;
--
--        assert(a);
--
--        r = unit_test_start_limit(u);
--        if (r < 0) {
--                automount_enter_dead(a, AUTOMOUNT_FAILURE_START_LIMIT_HIT);
--                return r;
--        }
--
--        return 0;
--}
--
- static const char* const automount_result_table[_AUTOMOUNT_RESULT_MAX] = {
-         [AUTOMOUNT_SUCCESS] = "success",
-         [AUTOMOUNT_FAILURE_RESOURCES] = "resources",
-@@ -1136,6 +1127,4 @@ const UnitVTable automount_vtable = {
-                         [JOB_FAILED]     = "Failed to unset automount %s.",
-                 },
-         },
--
--        .test_start_limit = automount_test_start_limit,
- };
-diff --git a/src/core/mount.c b/src/core/mount.c
-index 9bec190cb6..af39db214b 100644
---- a/src/core/mount.c
-+++ b/src/core/mount.c
-@@ -1168,6 +1168,12 @@ static int mount_start(Unit *u) {
- 
-         assert(IN_SET(m->state, MOUNT_DEAD, MOUNT_FAILED));
- 
-+        r = unit_test_start_limit(u);
-+        if (r < 0) {
-+                mount_enter_dead(m, MOUNT_FAILURE_START_LIMIT_HIT);
-+                return r;
-+        }
-+
-         r = unit_acquire_invocation_id(u);
-         if (r < 0)
-                 return r;
-@@ -2137,21 +2143,6 @@ static int mount_can_clean(Unit *u, ExecCleanMask *ret) {
-         return exec_context_get_clean_mask(&m->exec_context, ret);
- }
- 
--static int mount_test_start_limit(Unit *u) {
--        Mount *m = MOUNT(u);
--        int r;
--
--        assert(m);
--
--        r = unit_test_start_limit(u);
--        if (r < 0) {
--                mount_enter_dead(m, MOUNT_FAILURE_START_LIMIT_HIT);
--                return r;
--        }
--
--        return 0;
--}
--
- static const char* const mount_exec_command_table[_MOUNT_EXEC_COMMAND_MAX] = {
-         [MOUNT_EXEC_MOUNT] = "ExecMount",
-         [MOUNT_EXEC_UNMOUNT] = "ExecUnmount",
-@@ -2249,6 +2240,4 @@ const UnitVTable mount_vtable = {
-                         [JOB_TIMEOUT]    = "Timed out unmounting %s.",
-                 },
-         },
--
--        .test_start_limit = mount_test_start_limit,
- };
-diff --git a/src/core/path.c b/src/core/path.c
-index 2b659696a4..e098e83a31 100644
---- a/src/core/path.c
-+++ b/src/core/path.c
-@@ -590,6 +590,12 @@ static int path_start(Unit *u) {
-         if (r < 0)
-                 return r;
- 
-+        r = unit_test_start_limit(u);
-+        if (r < 0) {
-+                path_enter_dead(p, PATH_FAILURE_START_LIMIT_HIT);
-+                return r;
-+        }
-+
-         r = unit_acquire_invocation_id(u);
-         if (r < 0)
-                 return r;
-@@ -805,21 +811,6 @@ static void path_reset_failed(Unit *u) {
-         p->result = PATH_SUCCESS;
- }
- 
--static int path_test_start_limit(Unit *u) {
--        Path *p = PATH(u);
--        int r;
--
--        assert(p);
--
--        r = unit_test_start_limit(u);
--        if (r < 0) {
--                path_enter_dead(p, PATH_FAILURE_START_LIMIT_HIT);
--                return r;
--        }
--
--        return 0;
--}
--
- static const char* const path_type_table[_PATH_TYPE_MAX] = {
-         [PATH_EXISTS] = "PathExists",
-         [PATH_EXISTS_GLOB] = "PathExistsGlob",
-@@ -874,6 +865,4 @@ const UnitVTable path_vtable = {
-         .reset_failed = path_reset_failed,
- 
-         .bus_set_property = bus_path_set_property,
--
--        .test_start_limit = path_test_start_limit,
- };
-diff --git a/src/core/service.c b/src/core/service.c
-index 701c145565..7b90822f68 100644
---- a/src/core/service.c
-+++ b/src/core/service.c
-@@ -2456,6 +2456,13 @@ static int service_start(Unit *u) {
- 
-         assert(IN_SET(s->state, SERVICE_DEAD, SERVICE_FAILED));
- 
-+        /* Make sure we don't enter a busy loop of some kind. */
-+        r = unit_test_start_limit(u);
-+        if (r < 0) {
-+                service_enter_dead(s, SERVICE_FAILURE_START_LIMIT_HIT, false);
-+                return r;
-+        }
-+
-         r = unit_acquire_invocation_id(u);
-         if (r < 0)
-                 return r;
-@@ -4451,22 +4458,6 @@ static const char *service_finished_job(Unit *u, JobType t, JobResult result) {
-         return NULL;
- }
- 
--static int service_test_start_limit(Unit *u) {
--        Service *s = SERVICE(u);
--        int r;
--
--        assert(s);
--
--        /* Make sure we don't enter a busy loop of some kind. */
--        r = unit_test_start_limit(u);
--        if (r < 0) {
--                service_enter_dead(s, SERVICE_FAILURE_START_LIMIT_HIT, false);
--                return r;
--        }
--
--        return 0;
--}
--
- static const char* const service_restart_table[_SERVICE_RESTART_MAX] = {
-         [SERVICE_RESTART_NO] = "no",
-         [SERVICE_RESTART_ON_SUCCESS] = "on-success",
-@@ -4629,6 +4620,4 @@ const UnitVTable service_vtable = {
-                 },
-                 .finished_job = service_finished_job,
-         },
--
--        .test_start_limit = service_test_start_limit,
- };
-diff --git a/src/core/socket.c b/src/core/socket.c
-index 31d88b71ff..f362a5baa8 100644
---- a/src/core/socket.c
-+++ b/src/core/socket.c
-@@ -2515,6 +2515,12 @@ static int socket_start(Unit *u) {
- 
-         assert(IN_SET(s->state, SOCKET_DEAD, SOCKET_FAILED));
- 
-+        r = unit_test_start_limit(u);
-+        if (r < 0) {
-+                socket_enter_dead(s, SOCKET_FAILURE_START_LIMIT_HIT);
-+                return r;
-+        }
-+
-         r = unit_acquire_invocation_id(u);
-         if (r < 0)
-                 return r;
-@@ -3423,21 +3429,6 @@ static int socket_can_clean(Unit *u, ExecCleanMask *ret) {
-         return exec_context_get_clean_mask(&s->exec_context, ret);
- }
- 
--static int socket_test_start_limit(Unit *u) {
--        Socket *s = SOCKET(u);
--        int r;
--
--        assert(s);
--
--        r = unit_test_start_limit(u);
--        if (r < 0) {
--                socket_enter_dead(s, SOCKET_FAILURE_START_LIMIT_HIT);
--                return r;
--        }
--
--        return 0;
--}
--
- static const char* const socket_exec_command_table[_SOCKET_EXEC_COMMAND_MAX] = {
-         [SOCKET_EXEC_START_PRE] = "ExecStartPre",
-         [SOCKET_EXEC_START_CHOWN] = "ExecStartChown",
-@@ -3564,6 +3555,4 @@ const UnitVTable socket_vtable = {
-                         [JOB_TIMEOUT]    = "Timed out stopping %s.",
-                 },
-         },
--
--        .test_start_limit = socket_test_start_limit,
- };
-diff --git a/src/core/swap.c b/src/core/swap.c
-index b25f68fb7d..3843b19500 100644
---- a/src/core/swap.c
-+++ b/src/core/swap.c
-@@ -933,6 +933,12 @@ static int swap_start(Unit *u) {
-                 if (UNIT(other)->job && UNIT(other)->job->state == JOB_RUNNING)
-                         return -EAGAIN;
- 
-+        r = unit_test_start_limit(u);
-+        if (r < 0) {
-+                swap_enter_dead(s, SWAP_FAILURE_START_LIMIT_HIT);
-+                return r;
-+        }
-+
-         r = unit_acquire_invocation_id(u);
-         if (r < 0)
-                 return r;
-@@ -1582,21 +1588,6 @@ static int swap_can_clean(Unit *u, ExecCleanMask *ret) {
-         return exec_context_get_clean_mask(&s->exec_context, ret);
- }
- 
--static int swap_test_start_limit(Unit *u) {
--        Swap *s = SWAP(u);
--        int r;
--
--        assert(s);
--
--        r = unit_test_start_limit(u);
--        if (r < 0) {
--                swap_enter_dead(s, SWAP_FAILURE_START_LIMIT_HIT);
--                return r;
--        }
--
--        return 0;
--}
--
- static const char* const swap_exec_command_table[_SWAP_EXEC_COMMAND_MAX] = {
-         [SWAP_EXEC_ACTIVATE] = "ExecActivate",
-         [SWAP_EXEC_DEACTIVATE] = "ExecDeactivate",
-@@ -1692,6 +1683,4 @@ const UnitVTable swap_vtable = {
-                         [JOB_TIMEOUT]    = "Timed out deactivating swap %s.",
-                 },
-         },
--
--        .test_start_limit = swap_test_start_limit,
- };
-diff --git a/src/core/timer.c b/src/core/timer.c
-index 5ecc9f35cf..e064ad9a2d 100644
---- a/src/core/timer.c
-+++ b/src/core/timer.c
-@@ -635,6 +635,12 @@ static int timer_start(Unit *u) {
-         if (r < 0)
-                 return r;
- 
-+        r = unit_test_start_limit(u);
-+        if (r < 0) {
-+                timer_enter_dead(t, TIMER_FAILURE_START_LIMIT_HIT);
-+                return r;
-+        }
-+
-         r = unit_acquire_invocation_id(u);
-         if (r < 0)
-                 return r;
-@@ -895,21 +901,6 @@ static int timer_can_clean(Unit *u, ExecCleanMask *ret) {
-         return 0;
- }
- 
--static int timer_test_start_limit(Unit *u) {
--        Timer *t = TIMER(u);
--        int r;
--
--        assert(t);
--
--        r = unit_test_start_limit(u);
--        if (r < 0) {
--                timer_enter_dead(t, TIMER_FAILURE_START_LIMIT_HIT);
--                return r;
--        }
--
--        return 0;
--}
--
- static const char* const timer_base_table[_TIMER_BASE_MAX] = {
-         [TIMER_ACTIVE] = "OnActiveSec",
-         [TIMER_BOOT] = "OnBootSec",
-@@ -969,6 +960,4 @@ const UnitVTable timer_vtable = {
-         .timezone_change = timer_timezone_change,
- 
-         .bus_set_property = bus_timer_set_property,
--
--        .test_start_limit = timer_test_start_limit,
- };
-diff --git a/src/core/unit.c b/src/core/unit.c
-index 69ed43578e..38d3eb703f 100644
---- a/src/core/unit.c
-+++ b/src/core/unit.c
-@@ -1851,13 +1851,6 @@ int unit_start(Unit *u) {
- 
-         assert(u);
- 
--        /* Check start rate limiting early so that failure conditions don't cause us to enter a busy loop. */
--        if (UNIT_VTABLE(u)->test_start_limit) {
--                int r = UNIT_VTABLE(u)->test_start_limit(u);
--                if (r < 0)
--                        return r;
--        }
--
-         /* If this is already started, then this will succeed. Note that this will even succeed if this unit
-          * is not startable by the user. This is relied on to detect when we need to wait for units and when
-          * waiting is finished. */
-diff --git a/src/core/unit.h b/src/core/unit.h
-index 9babd07188..759104ffa7 100644
---- a/src/core/unit.h
-+++ b/src/core/unit.h
-@@ -649,10 +649,6 @@ typedef struct UnitVTable {
-          * of this type will immediately fail. */
-         bool (*supported)(void);
- 
--        /* If this function is set, it's invoked first as part of starting a unit to allow start rate
--         * limiting checks to occur before we do anything else. */
--        int (*test_start_limit)(Unit *u);
--
-         /* The strings to print in status messages */
-         UnitStatusMessageFormats status_message_formats;
- 
-diff --git a/test/TEST-63-ISSUE-17433/Makefile b/test/TEST-63-ISSUE-17433/Makefile
-deleted file mode 120000
-index e9f93b1104..0000000000
---- a/test/TEST-63-ISSUE-17433/Makefile
-+++ /dev/null
-@@ -1 +0,0 @@
--../TEST-01-BASIC/Makefile
-\ No newline at end of file
-diff --git a/test/TEST-63-ISSUE-17433/test.sh b/test/TEST-63-ISSUE-17433/test.sh
-deleted file mode 100755
-index c595a9f2de..0000000000
---- a/test/TEST-63-ISSUE-17433/test.sh
-+++ /dev/null
-@@ -1,9 +0,0 @@
--#!/usr/bin/env bash
--set -e
--
--TEST_DESCRIPTION="https://github.com/systemd/systemd/issues/17433"
--
--# shellcheck source=test/test-functions
--. "${TEST_BASE_DIR:?}/test-functions"
--
--do_test "$@"
-diff --git a/test/meson.build b/test/meson.build
-index 6f8f257c2d..47c7f4d49a 100644
---- a/test/meson.build
-+++ b/test/meson.build
-@@ -33,8 +33,6 @@ if install_tests
-                        install_dir : testdata_dir)
-         install_subdir('testsuite-52.units',
-                        install_dir : testdata_dir)
--        install_subdir('testsuite-63.units',
--                       install_dir : testdata_dir)
- 
-         testsuite08_dir = testdata_dir + '/testsuite-08.units'
-         install_data('testsuite-08.units/-.mount',
-diff --git a/test/testsuite-10.units/test10.service b/test/testsuite-10.units/test10.service
-index 2fb476b986..d0be786b01 100644
---- a/test/testsuite-10.units/test10.service
-+++ b/test/testsuite-10.units/test10.service
-@@ -1,9 +1,6 @@
- [Unit]
- Requires=test10.socket
- ConditionPathExistsGlob=/tmp/nonexistent
--# Make sure we hit the socket trigger limit in the test and not the service start limit.
--StartLimitInterval=1000
--StartLimitBurst=1000
- 
- [Service]
- ExecStart=true
-diff --git a/test/testsuite-63.units/test63.path b/test/testsuite-63.units/test63.path
-deleted file mode 100644
-index a6573bda0a..0000000000
---- a/test/testsuite-63.units/test63.path
-+++ /dev/null
-@@ -1,2 +0,0 @@
--[Path]
--PathExists=/tmp/test63
-diff --git a/test/testsuite-63.units/test63.service b/test/testsuite-63.units/test63.service
-deleted file mode 100644
-index c83801874d..0000000000
---- a/test/testsuite-63.units/test63.service
-+++ /dev/null
-@@ -1,5 +0,0 @@
--[Unit]
--ConditionPathExists=!/tmp/nonexistent
--
--[Service]
--ExecStart=true
-diff --git a/test/units/testsuite-63.service b/test/units/testsuite-63.service
-deleted file mode 100644
-index 04122723d4..0000000000
---- a/test/units/testsuite-63.service
-+++ /dev/null
-@@ -1,16 +0,0 @@
--[Unit]
--Description=TEST-63-ISSUE-17433
--
--[Service]
--ExecStartPre=rm -f /failed /testok
--Type=oneshot
--ExecStart=rm -f /tmp/nonexistent
--ExecStart=systemctl start test63.path
--ExecStart=touch /tmp/test63
--# Make sure systemd has sufficient time to hit the start limit for test63.service.
--ExecStart=sleep 2
--ExecStart=sh -x -c 'test "$(systemctl show test63.service -P ActiveState)" = failed'
--ExecStart=sh -x -c 'test "$(systemctl show test63.service -P Result)" = start-limit-hit'
--ExecStart=sh -x -c 'test "$(systemctl show test63.path -P ActiveState)" = failed'
--ExecStart=sh -x -c 'test "$(systemctl show test63.path -P Result)" = unit-start-limit-hit'
--ExecStart=sh -x -c 'echo OK >/testok'
diff --git a/sys-apps/systemd/systemd-249.4-r4.ebuild b/sys-apps/systemd/systemd-249.4-r4.ebuild
index 01503d4fcf00..722d9f6b3f04 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
-			~KCMP ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~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
@@ -190,6 +190,12 @@ pkg_pretend() {
 		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
 		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
 
+		if kernel_is -lt 5 10 20; then
+			CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
+		else
+			CONFIG_CHECK+=" ~KCMP"
+		fi
+
 		if linux_config_exists; then
 			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
 			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
diff --git a/sys-apps/systemd/systemd-249.6-r1.ebuild b/sys-apps/systemd/systemd-249.6-r1.ebuild
new file mode 100644
index 000000000000..5f4dc1168d11
--- /dev/null
+++ b/sys-apps/systemd/systemd-249.6-r1.ebuild
@@ -0,0 +1,505 @@
+# Copyright 2011-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+# Avoid QA warnings
+TMPFILES_OPTIONAL=1
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *.* ]]; then
+		MY_PN=systemd-stable
+	else
+		MY_PN=systemd
+	fi
+	MY_PV=${PV/_/-}
+	MY_P=${MY_PN}-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils fido2 +gcrypt gnuefi homed http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd"
+
+REQUIRED_USE="
+	homed? ( cryptsetup pam )
+	importd? ( curl gcrypt lzma )
+	pwquality? ( homed )
+"
+RESTRICT="!test? ( test )"
+
+MINKV="3.11"
+
+OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0="
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
+	curl? ( net-misc/curl:0= )
+	dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	fido2? ( dev-libs/libfido2:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	homed? ( ${OPENSSL_DEP} )
+	http? (
+		>=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)]
+		>=net-libs/gnutls-3.1.4:0=
+	)
+	idn? ( net-dns/libidn2:= )
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	nat? ( net-firewall/iptables:0= )
+	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( app-crypt/p11-kit:0= )
+	pcre? ( dev-libs/libpcre2 )
+	pwquality? ( dev-libs/libpwquality:0= )
+	qrcode? ( media-gfx/qrencode:0= )
+	repart? ( ${OPENSSL_DEP} )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	tpm? ( app-crypt/tpm2-tss:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+	zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
+"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-${MINKV}
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=acct-group/adm-0-r1
+	>=acct-group/wheel-0-r1
+	>=acct-group/kmem-0-r1
+	>=acct-group/tty-0-r1
+	>=acct-group/utmp-0-r1
+	>=acct-group/audio-0-r1
+	>=acct-group/cdrom-0-r1
+	>=acct-group/dialout-0-r1
+	>=acct-group/disk-0-r1
+	>=acct-group/input-0-r1
+	>=acct-group/kvm-0-r1
+	>=acct-group/lp-0-r1
+	>=acct-group/render-0-r1
+	acct-group/sgx
+	>=acct-group/tape-0-r1
+	acct-group/users
+	>=acct-group/video-0-r1
+	>=acct-group/systemd-journal-0-r1
+	>=acct-user/root-0-r1
+	acct-user/nobody
+	>=acct-user/systemd-journal-remote-0-r1
+	>=acct-user/systemd-coredump-0-r1
+	>=acct-user/systemd-network-0-r1
+	acct-user/systemd-oom
+	>=acct-user/systemd-resolve-0-r1
+	>=acct-user/systemd-timesync-0-r1
+	>=sys-apps/baselayout-2.2
+	selinux? ( sec-policy/selinux-base-policy[systemd] )
+	sysv-utils? (
+		!sys-apps/openrc[sysv-utils(-)]
+		!sys-apps/sysvinit
+	)
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!build? ( || (
+		sys-apps/util-linux[kill(-)]
+		sys-process/procps[kill(+)]
+		sys-apps/coreutils[kill(-)]
+	) )
+	!sys-apps/hwids[udev]
+	!sys-auth/nss-myhostname
+	!sys-fs/eudev
+	!sys-fs/udev
+"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-fs/udev-init-scripts-34
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+BDEPEND="
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/meson-0.46
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		app-text/tree
+		dev-lang/perl
+		sys-apps/dbus
+	)
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+python_check_deps() {
+	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if use test && has pid-sandbox ${FEATURES}; then
+			ewarn "Tests are known to fail with PID sandboxing enabled."
+			ewarn "See https://bugs.gentoo.org/674458."
+		fi
+
+		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+			~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
+			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
+		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
+
+		if kernel_is -lt 5 10 20; then
+			CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
+		else
+			CONFIG_CHECK+=" ~KCMP"
+		fi
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	# Do NOT add patches here
+	local PATCHES=()
+
+	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+	# Add local patches here
+	PATCHES+=(
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-generator-path-r2.patch"
+			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
+			"${FILESDIR}/gentoo-journald-audit.patch"
+		)
+	fi
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		-Dsupport-url="https://gentoo.org/support/"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in PATH
+		$(meson_use split-usr)
+		-Dsplit-bin=true
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-Dima=true
+		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
+		# Optional components/dependencies
+		$(meson_native_use_bool acl)
+		$(meson_native_use_bool apparmor)
+		$(meson_native_use_bool audit)
+		$(meson_native_use_bool cryptsetup libcryptsetup)
+		$(meson_native_use_bool curl libcurl)
+		$(meson_native_use_bool dns-over-tls dns-over-tls)
+		$(meson_native_use_bool elfutils)
+		$(meson_native_use_bool fido2 libfido2)
+		$(meson_use gcrypt)
+		$(meson_native_use_bool gnuefi gnu-efi)
+		-Defi-includedir="${ESYSROOT}/usr/include/efi"
+		-Defi-ld="$(tc-getLD)"
+		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+		$(meson_native_use_bool homed)
+		$(meson_native_use_bool http microhttpd)
+		$(meson_native_use_bool idn)
+		$(meson_native_use_bool importd)
+		$(meson_native_use_bool importd bzip2)
+		$(meson_native_use_bool importd zlib)
+		$(meson_native_use_bool kmod)
+		$(meson_use lz4)
+		$(meson_use lzma xz)
+		$(meson_use zstd)
+		$(meson_native_use_bool nat libiptc)
+		$(meson_use pam)
+		$(meson_native_use_bool pkcs11 p11kit)
+		$(meson_native_use_bool pcre pcre2)
+		$(meson_native_use_bool policykit polkit)
+		$(meson_native_use_bool pwquality)
+		$(meson_native_use_bool qrcode qrencode)
+		$(meson_native_use_bool repart)
+		$(meson_native_use_bool seccomp)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool tpm tpm2)
+		$(meson_native_use_bool test dbus)
+		$(meson_native_use_bool xkb xkbcommon)
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+		-Dcreate-log-dirs=false
+
+		# multilib options
+		$(meson_native_true backlight)
+		$(meson_native_true binfmt)
+		$(meson_native_true coredump)
+		$(meson_native_true environment-d)
+		$(meson_native_true firstboot)
+		$(meson_native_true hibernate)
+		$(meson_native_true hostnamed)
+		$(meson_native_true ldconfig)
+		$(meson_native_true localed)
+		$(meson_native_true man)
+		$(meson_native_true networkd)
+		$(meson_native_true quotacheck)
+		$(meson_native_true randomseed)
+		$(meson_native_true rfkill)
+		$(meson_native_true sysusers)
+		$(meson_native_true timedated)
+		$(meson_native_true timesyncd)
+		$(meson_native_true tmpfiles)
+		$(meson_native_true vconsole)
+	)
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+	meson_src_test
+}
+
+multilib_src_install_all() {
+	local rootprefix=$(usex split-usr '' /usr)
+
+	# meson doesn't know about docdir
+	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
+	fi
+
+	rm "${ED}"/etc/init.d/README || die
+	rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
+
+	if ! use sysv-utils; then
+		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+		rm "${ED}"/usr/share/man/man1/init.1 || die
+		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
+	fi
+
+	if ! use resolvconf && ! use sysv-utils; then
+		rmdir "${ED}${rootprefix}"/sbin || die
+	fi
+
+	# https://bugs.gentoo.org/761763
+	rm -r "${ED}"/usr/lib/sysusers.d || die
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/kernel/install.d
+	keepdir /etc/systemd/{network,system,user}
+	keepdir /etc/udev/rules.d
+
+	keepdir /etc/udev/hwdb.d
+
+	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
+	keepdir /usr/lib/{binfmt.d,modules-load.d}
+	keepdir /usr/lib/systemd/user-generators
+	keepdir /var/lib/systemd
+	keepdir /var/log/journal
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
+
+	if use pam; then
+		newpamd "${FILESDIR}"/systemd-user.pam systemd-user
+	fi
+
+	if use split-usr; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+
+	gen_usr_ldscript -a systemd udev
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+	local locale_conf="${EROOT}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+pkg_preinst() {
+	if ! use split-usr; then
+		local dir
+		for dir in bin sbin lib; do
+			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
+				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
+				eerror "One of them should be a symbolic link to the other one."
+				FAIL=1
+			fi
+		done
+		if [[ ${FAIL} ]]; then
+			eerror "Migration to system layout with merged directories must be performed before"
+			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
+			die "System layout with split directories still used"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required.
+	systemd-hwdb --root="${ROOT}" update
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respected, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if type systemctl &>/dev/null; then
+			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
+		fi
+		elog "To enable a useful set of services, run the following:"
+		elog "  systemctl preset-all --preset-mode=enable-only"
+	fi
+
+	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+		rm "${EROOT}/var/lib/systemd/timesync"
+	fi
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-249.5-r1.ebuild b/sys-apps/systemd/systemd-249.6.ebuild
index e47a7beaa3d1..b0ff3632f09e 100644
--- a/sys-apps/systemd/systemd-249.5-r1.ebuild
+++ b/sys-apps/systemd/systemd-249.6.ebuild
@@ -20,7 +20,7 @@ else
 	MY_P=${MY_PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
@@ -177,7 +177,7 @@ pkg_pretend() {
 		fi
 
 		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-			~KCMP ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~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
@@ -190,6 +190,12 @@ pkg_pretend() {
 		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
 		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
 
+		if kernel_is -lt 5 10 20; then
+			CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
+		else
+			CONFIG_CHECK+=" ~KCMP"
+		fi
+
 		if linux_config_exists; then
 			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
 			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
@@ -226,9 +232,6 @@ src_prepare() {
 
 	# Add local patches here
 	PATCHES+=(
-		"${FILESDIR}/249-libudev-static.patch"
-		"${FILESDIR}/249.5-coredumpctl.patch"
-		"${FILESDIR}/249.5-revert-unit-start-rate-limiting.patch"
 	)
 
 	if ! use vanilla; then
@@ -495,12 +498,6 @@ pkg_postinst() {
 		rm "${EROOT}/var/lib/systemd/timesync"
 	fi
 
-	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
-		ebegin "Reexecuting system manager"
-		systemctl daemon-reexec
-		eend $?
-	fi
-
 	if [[ ${FAIL} ]]; then
 		eerror "One of the postinst commands failed. Please check the postinst output"
 		eerror "for errors. You may need to clean up your system and/or try installing"
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 485b6498181e..b422ee6c0681 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -30,7 +30,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
-IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils fido2 +gcrypt gnuefi homed hostnamed-fallback http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd"
+IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils fido2 +gcrypt gnuefi homed hostnamed-fallback http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd"
 
 REQUIRED_USE="
 	homed? ( cryptsetup pam )
@@ -134,6 +134,7 @@ RDEPEND="${COMMON_DEPEND}
 		sys-process/procps[kill(+)]
 		sys-apps/coreutils[kill(-)]
 	) )
+	!sys-apps/hwids[udev]
 	!sys-auth/nss-myhostname
 	!sys-fs/eudev
 	!sys-fs/udev
@@ -141,7 +142,6 @@ RDEPEND="${COMMON_DEPEND}
 
 # sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
 PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
-	hwdb? ( sys-apps/hwids[systemd(+),udev] )
 	>=sys-fs/udev-init-scripts-34
 	policykit? ( sys-auth/polkit )
 	!vanilla? ( sys-apps/gentoo-systemd-integration )"
@@ -182,7 +182,7 @@ pkg_pretend() {
 		fi
 
 		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-			~KCMP ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~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
@@ -195,6 +195,12 @@ pkg_pretend() {
 		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
 		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
 
+		if kernel_is -lt 5 10 20; then
+			CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
+		else
+			CONFIG_CHECK+=" ~KCMP"
+		fi
+
 		if linux_config_exists; then
 			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
 			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
@@ -285,7 +291,6 @@ multilib_src_configure() {
 		-Defi-ld="$(tc-getLD)"
 		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
 		$(meson_native_use_bool homed)
-		$(meson_native_use_bool hwdb)
 		$(meson_native_use_bool http microhttpd)
 		$(meson_native_use_bool idn)
 		$(meson_native_use_bool importd)
@@ -378,9 +383,7 @@ multilib_src_install_all() {
 	keepdir /etc/systemd/{network,system,user}
 	keepdir /etc/udev/rules.d
 
-	if use hwdb; then
-		keepdir /etc/udev/hwdb.d
-	fi
+	keepdir /etc/udev/hwdb.d
 
 	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
 	keepdir /usr/lib/{binfmt.d,modules-load.d}
@@ -395,10 +398,6 @@ multilib_src_install_all() {
 		newpamd "${FILESDIR}"/systemd-user.pam systemd-user
 	fi
 
-	if use hwdb; then
-		rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die
-	fi
-
 	if use split-usr; then
 		# Avoid breaking boot/reboot
 		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
@@ -485,9 +484,7 @@ pkg_postinst() {
 
 	# Keep this here in case the database format changes so it gets updated
 	# when required.
-	if use hwdb; then
-		systemd-hwdb --root="${ROOT}" update
-	fi
+	systemd-hwdb --root="${ROOT}" update
 
 	udev_reload || FAIL=1
 
@@ -507,12 +504,6 @@ pkg_postinst() {
 		rm "${EROOT}/var/lib/systemd/timesync"
 	fi
 
-	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
-		ebegin "Reexecuting system manager"
-		systemctl daemon-reexec
-		eend $?
-	fi
-
 	if [[ ${FAIL} ]]; then
 		eerror "One of the postinst commands failed. Please check the postinst output"
 		eerror "for errors. You may need to clean up your system and/or try installing"
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 4e984d3e2d95..5cb42035ae55 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -1,4 +1,5 @@
-AUX bootlogd.initd 259 BLAKE2B 78c1a1fe8583685656edb85e29f8dbed40bdd7272590bbdaccb52fe6e54cce0a077a28501c7c87bec55f046172545d940c52345551cd3c01cff0895d12b32a15 SHA512 05a3c2542ceaff85c02c5c30a52be8f1bb95741fffef306777ad1b248b527cdd921f009571e1f43d7a6ede0cc61cf490a1dbbbfe0a50b234c258ad7688a37ad9
+AUX bootlogd.confd 71 BLAKE2B 5ead856ebc0af512d47b410dc4197b3287594943e535dd29c9de1b654de6dabde0a98ec8da21175d055795b7693ae52b399a246ed8c2a0a37336c541acbef071 SHA512 ecce46e1d538855c81a5c814b29240b9891b0367b45db98c1b8e9eccd724f360ca7b95da948e25d14d881eb84391dab9fd2aeef132345157d8bf7867658d98f5
+AUX bootlogd.initd 276 BLAKE2B afc0ce0406b38d9d29398f054668f78f0d90994421b3a8a1be97ea7d2f909a6675ddfbbe8aa21918acf1147bbb147c0d2465825ec13d86c82c85320f6a5d97e9 SHA512 e2e7edcd896900eb5860310af29233b29f438a5d5c07a5ab459da2ff9117cbb21c2f9b8f17f6817068c5444b4cd5d255a2197912907c1af39bdd23d1d6e10641
 AUX halt.sh 101 BLAKE2B f3b8a24b6efce0ccffeb76f401af9f9bce752a541ea646dd6d357eaaa834be2049411148ec18b591283d85f42b0c3c1e41f442ba95c5f5b4cd9e87b39a83d51e SHA512 aaf46f9c74ae58027e59f32e5e929ff6529206d07fdf4e3f17962ccbc46c68d34e4e2839019708a763dead93b83ca8f457379491830ab43d6407247fd7ac2a77
 AUX inittab-2.98-r1 2124 BLAKE2B 57e40e8410a31ec73f581e2feb142c600e2ce687745a6135961c0f1ea31e77f1acf9b9be1cf4c1d55685802a913304056cf1f137686f14d89caa9ec973d751c2 SHA512 6ce22ba933158d1a0fc7d0eaa9536b1cdcd8baa90cddfe8b1bf7a1f7292ba7fc14b6b46968848301a2e573939b4e21ce8d64bf3a9eaeb4d038de7d113fd3b9fb
 AUX sysvinit-2.86-kexec.patch 3910 BLAKE2B fb62326925c78960142123da82ffd1de6319153cce234b0d1dc7546beecf67296f8b7d6e3eb0f633d8a4ebc83fc4cc586c4f92cdb48df1f766aa4af72b0fa0e1 SHA512 6ce3adf698554d15394edbe6dbfc62822859854d503b201c9f96bd81c2a8cd249ed44229a85dd8b97f454f9311abc5792e349f5cc512ff6d5570500d88044bee
@@ -6,6 +7,6 @@ AUX sysvinit-2.94_beta-shutdown-single.patch 1261 BLAKE2B 571b7cf40ccdbb27e65b31
 AUX sysvinit-2.99-shutdown-h.patch 2684 BLAKE2B 57c27b8646a0b47f66eb103450e645fa45220a1bf79da86207ffa1393c311cb4c4a2ad9b8b7bf81cc4ae2ccb2acb19b66fd575935d8a0b0a2a9b3899c0088c9f SHA512 ef33da0d5673180275c8120c6904a4214cf1308827a626d8d6a2aab67d7d25b5407f9efcaf6a7a4a09a8c409899242943f6a95881cc8c8898b780224f991f2f7
 DIST sysvinit-2.99.tar.xz 126908 BLAKE2B b82c745d5b695f918d4a163e7b9eaceccc07a46f73c3782c7771cc29a8600be13de4ff30891086df5773d60f37fa3b0f58566ccaf72cd70af68083b51152a38b SHA512 34f328d7d2e6ceddcddfebab49eb9c34e90dc96decf2caeb89dffd2ade54322fa4a3cb9fa1e1a4bc687e07fcb0a13e5aebe6186582a9f5c9153e1513baa87ddd
 DIST sysvinit-3.00.tar.xz 127072 BLAKE2B d1c4e509d7c13cf0fb9da290f875e7c0ab0666d843d75d4dd6885112248a859dd077bdf9cc926c4af58473da99a5229bb879c7094afd648d5ebe72597a3ba6a7 SHA512 ba834ac6c48528304373018bfb05dcdd3573d8081dd7dc95a44808804404d77ee4832fedb3f34e67d87f22f201f9526c54910a51c6ed2a42ac55b756843cd825
-EBUILD sysvinit-2.99.ebuild 3959 BLAKE2B 336dab1fcea056bb9c3dfcee0b59ba42b032aa18b4645f2bea76a64c0a45dbf314a71b0c1236f6ae941dda2f26f57ab0b18c1e1c5fd43363f32878029b37bd05 SHA512 5a4ccb62aa7dc2faee89b11acd4061a6678bda65999e516349a86d50774967d6554bb94912e83b5ca6d87eebf60036abb5deef39fac471629f9542550e553d3d
-EBUILD sysvinit-3.00.ebuild 3967 BLAKE2B 48967c9bb6525586026d78474fae39c0d2aa0f1fbb6161ff1f580f35974641b494ea3510c3c503b96876e6f30c2d7219449ab0b7ff40dc624e414f006752e626 SHA512 fc41e9ef6e2d5f19d74513a0285206acf9f477b8951b1e4da6daa78fa64cb6bc78f4d1fc084dbec986b79142f2a67e91c7b74592cdd92a5abffe711535f9611d
+EBUILD sysvinit-2.99-r1.ebuild 4007 BLAKE2B ed9f8a5878284684e2602bd9ee794e981b05aaa440da676b46bf3ec65c55f70aedce19798cdaba2e144112e9774f3436379dcfcc248520a083ee396c57bcd6a8 SHA512 9c5b021dd1b5a21072cc69fe8fd132abbe563fb8550b8f5f712ca7c274f40b7d01e49d313990f0cb1f44fd651dbadc54210df87b69f8134c3eb38720fefa941c
+EBUILD sysvinit-3.00-r1.ebuild 4015 BLAKE2B fe3ff8ec0b7d65fc7642cf7fcef783023f214c88cf76b8d6d2812d8da2074650524f72fd3cdfa786b2d9f3eb99b081d30216ac7e0b3f102e233bbef3548be152 SHA512 b19fdc80ba95eaf15027601439a8991a0e3a4904048efeec6e3f47f7fde81d87eb80ce56b0d5ec773d1b0bba9191cc2a0da9b6505a7c1c70a55260e14efc5580
 MISC metadata.xml 359 BLAKE2B c5bd566a590dd04ca51751f4985840a143515fb8f7d3d21e1ad7f35b042ce578dae87e8d86a6338f7346cb50012991ccc77abfe73cbf2a4195f8d3dda04708d5 SHA512 9eec819463d81e55845eb293c5bc822748dc28bb420cfe498077d2dec6947e4762a743ddaadba34576f10275e9176347ba98711b059c429b4125258718e8290b
diff --git a/sys-apps/sysvinit/files/bootlogd.confd b/sys-apps/sysvinit/files/bootlogd.confd
new file mode 100644
index 000000000000..ac456db6ecf7
--- /dev/null
+++ b/sys-apps/sysvinit/files/bootlogd.confd
@@ -0,0 +1,2 @@
+# Put your bootlog options into this
+#BOOTLOGD_ARGS="-l /var/log/boot"
diff --git a/sys-apps/sysvinit/files/bootlogd.initd b/sys-apps/sysvinit/files/bootlogd.initd
index a42219271a80..ef238c13922b 100644
--- a/sys-apps/sysvinit/files/bootlogd.initd
+++ b/sys-apps/sysvinit/files/bootlogd.initd
@@ -1,8 +1,8 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 description="bootlogd - record boot messages (sysvinit)"
 pidfile="/run/bootlogd"
 command="/sbin/bootlogd"
-command_args="-p ${pidfile}"
+command_args="-p ${pidfile} ${BOOTLOGD_ARGS}"
diff --git a/sys-apps/sysvinit/sysvinit-2.99.ebuild b/sys-apps/sysvinit/sysvinit-2.99-r1.ebuild
index f370b1a50ee7..9d78abebae42 100644
--- a/sys-apps/sysvinit/sysvinit-2.99.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.99-r1.ebuild
@@ -110,6 +110,7 @@ src_install() {
 	doins "${WORKDIR}"/inittab
 
 	newinitd "${FILESDIR}"/bootlogd.initd bootlogd
+	newconfd "${FILESDIR}"/bootlogd.confd bootlogd
 	into /
 	dosbin "${FILESDIR}"/halt.sh
 
diff --git a/sys-apps/sysvinit/sysvinit-3.00.ebuild b/sys-apps/sysvinit/sysvinit-3.00-r1.ebuild
index e2a06d6700d2..83d6e6f7635b 100644
--- a/sys-apps/sysvinit/sysvinit-3.00.ebuild
+++ b/sys-apps/sysvinit/sysvinit-3.00-r1.ebuild
@@ -110,6 +110,7 @@ src_install() {
 	doins "${WORKDIR}"/inittab
 
 	newinitd "${FILESDIR}"/bootlogd.initd bootlogd
+	newconfd "${FILESDIR}"/bootlogd.confd bootlogd
 	into /
 	dosbin "${FILESDIR}"/halt.sh
 
diff --git a/sys-apps/ucspi-ssl/Manifest b/sys-apps/ucspi-ssl/Manifest
index 01eda92723f1..00738d1647b6 100644
--- a/sys-apps/ucspi-ssl/Manifest
+++ b/sys-apps/ucspi-ssl/Manifest
@@ -1,4 +1,5 @@
 AUX ucspi-ssl-0.99e-fno-common.patch 1255 BLAKE2B 0a278c0340f2c8f7663afe25bc9478e5798e7fb51195a52fcf4a2ac887fd4d809ef4a617131f146a89095748208ecaea753746b6d4075cd528aad0ddac081a5a SHA512 87b0f8d955f4e9a0c3168d1ff7e29dd8844d34086b0aa77c2cc9b2bdbb1858a2e22e07178a18e04175e325e1e6fb4e4bacec89bdc3571dd973731344664012cc
 DIST ucspi-ssl-0.99e.tgz 112640 BLAKE2B 6db975f412723da1c6c76ff1040c27001c2d5b2b0c8bb3199f37226c31cf1e48f629aa1f8234319c844f2ccf8001d6d9ffd7700da2ae57b6cb22177cfc1e56f8 SHA512 231ef75eedc4f52f46c1f7d6f44feac54069d859da206f9ea874d3a8082dead1be310cc4b7da1148564847b5b452b691718b7ba8076a03145e2002e9250182aa
 EBUILD ucspi-ssl-0.99e-r1.ebuild 1547 BLAKE2B b0d1f523aafe6c1f3a9c8ad659c51398143371d994f0ae9dcad61cf957b1b7b1d053b2295b2ef663eef90948a2d99159f27f1c02d0c07e6f0a26e9d34bdc9a74 SHA512 6e3ec443d1bf876c5b009971c1a16c8393e21da4d6ae7687ed2404df1a4c516c4bb2c01140597d689e866d293c5b59a276d1c0d8f4cfc4184c245f23cc2e5e69
+EBUILD ucspi-ssl-0.99e-r2.ebuild 1489 BLAKE2B 68f7b6482cad27e26f0810b750a278d244d2e49142faf2a1423e390b1efe5b5c0c0a7b329f514f45976134ef98906579fe3bab0130febf2f7a76c90d6662b6eb SHA512 1c78223f3c98c1cb63663b147158a348175af80bbb9a23e0ba7978a4d71dbe60ef4c90b78a2ce4855a74afffa448a2ab36c6b4c05af1dfdccf77d03ed060c41d
 MISC metadata.xml 551 BLAKE2B 722aca8c638d9295469fff01028266cf48f77e8f81c88c103d9e8644f3336e86e4f9ab6a4faa8b6484d2e22478c5f1445dc4c6b233f0bf50117407a31d240ca4 SHA512 c63db8b7aeb9b543444cf0caa96152ed45896b7aa90b318b9f1225d6629a8b59365445ccfcec0a7afe0e520982cd668b0c1315b069b95baa81cf93cc766c6b68
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e-r2.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e-r2.ebuild
new file mode 100644
index 000000000000..af9a8b306679
--- /dev/null
+++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fixheadtails qmail
+
+DESCRIPTION="Command-line tools for building SSL client-server applications"
+HOMEPAGE="https://www.fehcom.de/ipnet/ucspi-ssl.html"
+SRC_URI="https://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="bindist perl"
+
+DEPEND="
+	dev-libs/openssl:=
+	perl? ( dev-lang/perl:= )"
+RDEPEND="${DEPEND}
+	sys-apps/ucspi-tcp"
+
+S="${WORKDIR}"/host/superscript.com/net/${P}
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
+src_prepare() {
+	ht_fix_all
+
+	sed -i -e 's:auto:gcc:' conf-cc || die
+	sed -i -e 's:-m64::' conf-ld || die
+	qmail_set_cc
+
+	echo "/usr/bin" > conf-tcpbin || die
+	echo "/usr/share/ca-certificates/" > conf-cadir || die
+	echo "${QMAIL_HOME}/control/dh1024.pem" > conf-dhfile || die
+	echo "/usr/" > src/home || die
+	sed -i -e 's:HOME/command:/usr/bin:' \
+		src/sslcat.sh src/sslconnect.sh src/https\@.sh || die
+
+	# workaround: SSL_TXT_ECDH is always set in openssl/ssl.h, even with openssl[bindist]
+	#sed -i -e 's:SSL_TXT_ECDH:ENABLE_SSL_TXT_ECDH:' src/ucspissl.h src/ssl_params.c conf-ecdh || die
+
+	default
+}
+
+src_compile() {
+	cd src || die
+	emake sysdeps
+	emake uint32.h
+	emake
+}
+
+src_install() {
+	dodoc -r doc/.
+	doman man/*
+
+	cd src || die
+	dobin $(<../package/commands-base)
+	use perl && dobin $(<../package/commands-sslperl)
+}
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index 3734c6293b1c..64ee015759ae 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -1,5 +1,6 @@
 DIST usbutils-013.tar.xz 98056 BLAKE2B d6e7925e180ba90f27ca12f13ed985f34e51b230ec08188c91bf39bb8e64baa319aa63d473318e1a4cb21b53808e8610f837ea0bb85657072f1c70107d037873 SHA512 eb1751e5b82f7a1bdffc667662cebee6fd42f466e59d4eb4c98f0d3723d740305377da1df1ba5831402fddbbd1697bbfa2abd22d9ed175e2dee55d6d007e9e54
 DIST usbutils-014.tar.xz 165884 BLAKE2B aea4f8edd3c7d7bc400fd63a8702b6d0bb50b8ed07196c4a0ed20a615eacf6373794afb9e7d5d81408dc3382848e965ecf8bc1bbec20837e4d1f96ba47cc40b5 SHA512 43c9f6ed14f8d01e014ef39a5d50b3b09031c6bda8261e0945b4cb4287c9107104175b386c2adc61dc7f9f476afb30f9a647a6ece6dee26b4133a4f10af72792
 EBUILD usbutils-013-r1.ebuild 1265 BLAKE2B a035c8d3aeaee690d4b618c98d75de6eafc39deda40ba306d5d628a508ea2c35cd1e522da0c0acfba2fea94b5956b00a5ea32bf56812a196d2ebf1980e494600 SHA512 35a854187104fd4a5768af7dd6ce57b75170b685a389a12f45ea5a75f916e46f32446b5af2c222923af206b64d19711cf6b6019071781619b0a6d8d60bc6fb2e
+EBUILD usbutils-014-r1.ebuild 1336 BLAKE2B be375524bcd52db5f68aabf15801721a88b1e8963c92a48af450a79b2ded08c2ec1d45e7426432d1202c5995a8778ac167ad3c2e6e5bc91a277e7e9853da11cb SHA512 f2255fdd6672d97f470548573c44800e909480e7a62bb32329dddba1992a7e8e21e41469d677a9a83b8dee77df61b490dd4eefc9467bf98ee862404d35a19a5f
 EBUILD usbutils-014.ebuild 1321 BLAKE2B d1ee5b521795e6e698f9138629f809de31c5e65c0943cfe565553f2ec770ca7ee3a7f1e1327c8fd2bee207747c510605c955a6fe0be3a278803bfe96e668b88b SHA512 325d1c06286f15d7d6af397a6727bb29a4578ee1f5979655dd718f6dffb7967f756dbe91d5d3b02c12860012abc2557c4e76b34943ba9793c5c0d03f02889adb
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/usbutils/usbutils-014-r1.ebuild b/sys-apps/usbutils/usbutils-014-r1.ebuild
new file mode 100644
index 000000000000..cee126405f8d
--- /dev/null
+++ b/sys-apps/usbutils/usbutils-014-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit autotools python-single-r1
+
+DESCRIPTION="USB enumeration utilities"
+HOMEPAGE="https://www.kernel.org/pub/linux/utils/usb/usbutils/
+	https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/"
+SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="virtual/libusb:1=
+	virtual/libudev:="
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+	python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}
+	python? (
+		${PYTHON_DEPS}
+		sys-apps/hwdata
+	)
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+	use python && python_fix_shebang lsusb.py.in
+}
+
+src_configure() {
+	local myeconfargs=(
+		--datarootdir="${EPREFIX}/usr/share"
+		--datadir="${EPREFIX}/usr/share/hwdata"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	newdoc usbhid-dump/NEWS NEWS.usbhid-dump
+	dobin usbreset # noinst_PROGRAMS, but installed by other distros
+
+	if ! use python ; then
+		rm -f "${ED}"/usr/bin/lsusb.py || die
+	fi
+}
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 2805450fb0e0..c2fecddb088d 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -3,6 +3,6 @@ AUX runuser.pamd 278 BLAKE2B 61afa98e02a4ee030176dad97b7aa7d7075b07584c0e9f2c254
 AUX util-linux-2.37.1-agetty_ctrl-c_erase.patch 1900 BLAKE2B 570c03cc5059198efdec4bfe367c560bcc863de61e8b0e1055535d4731525613ee20eaee5efeac6f96b399df1a60865c29e554df6684e3525f71dac821c8205c SHA512 e970c7b3c6e50bffc2e57f90f3284ba55906d71d286e8d23f06fd9905f66273796712cbd8cf3fa1a12bbb2dc404c72b790caba11ec63c8ff84ed9e4e041f64ca
 AUX util-linux-2.37.2-ioctl_ns-test-hang.patch 1308 BLAKE2B 87f9d63b91342c7560987438dad5e6ed43046233ae3400f91ff09767825b20ae2ff3886d8a7a3d7790dda11cffbf351c4047ac5397d1dbb98a548303d1caa8af SHA512 f0f0616a8729e302ef30b72437e34d7ac308e32206c0fdea2d3117da6a01d18b809016e2f46affed3b8fcaf156c64cd895a7460895aadcf39352fe724a3bfd78
 DIST util-linux-2.37.2.tar.xz 5621624 BLAKE2B 40ab80485781dfc58e6d0e98dae115b96f11ee0cc370524e1e13d3c4a4dfed3a5a4a248311f8ca645f6f84bbaf4785412ca8282b840af4e37a01312764885abe SHA512 38f0fe820445e3bfa79550e6581c230f98c7661566ccc4daa51c7208a5f972c61b4e57dfc86bed074fdbc7c40bc79f856be8f6a05a8860c1c0cecc4208e8b81d
-EBUILD util-linux-2.37.2-r1.ebuild 9343 BLAKE2B b9c2226fe48c6b3d89f1b2804c20e08b2272014cbe3e7febadc8ae2546056674da5f93b08d40a86b25f28ce69e069205d4f3cbf5fda1d0ed47fe9620cf9dab45 SHA512 9f7e296fd932f2948da569a5542a0e16f39941b785f7e4210e243beca49c4717ffec33f6a6a3ddfe54ffd4e1e2194ad15b936761a855ddf0c05fdd4fac270e4e
-EBUILD util-linux-9999.ebuild 9204 BLAKE2B 76f4e326f5bbc0eeb476e80c735f740c560dd3f89825018dda986eadea6100d355689d298e0195ecbb4ccb888a110aeecd4691580f9efbff55f68ca8bb08a045 SHA512 3354deeab09baa307d40a68dd214384e0112f24d8c3bb24a276e4014b31fd83702741a1ebdf578ef294e5241e17983505ec05f782d6795626505d37b8e1aab30
-MISC metadata.xml 1365 BLAKE2B 65b8e559657c4817f8dfa81f91b80c155c5fa06735d0815c14bf714df39ce5907a2690c861b1691bf34d437e09e7b7240bd87e1110e5a60d9dc0efad965dc8a1 SHA512 4de2b4db4d6566a2eb6a8a1a4e055610e91aae5677585435fea947af7a6e84400f81615cf3bdf7124a1b73aeeffc5baaf39862334b41a4ff4b87456ff6769810
+EBUILD util-linux-2.37.2-r1.ebuild 9412 BLAKE2B f94d8887209e0a2e547c1846483bffc3f6f371fb03904317b6a7e50bffded3d8eda64d6119af2c72dba64bb75844deb717b9daad96a023033bf3c2711f880b43 SHA512 d7a74218f362e0ff1807899001006824801f7da22b580cf43c8e621b03240d8bd33a3a78c6718ac1604897744c9552315d1b24330c3e94553294de6564fd5f1f
+EBUILD util-linux-9999.ebuild 9273 BLAKE2B 2e75725c64dd98defc943862687a53f9523e0984490881eb95a230882e10e841fbf092c58f58bca06847f8e6983c8f84f4e97e084353580b8277d3af94624fb6 SHA512 6e9ec2a82d177f18bbd5a21180f796127c12a97afafab5d16a7a5b5f3a8fe0af4510f7118beb864bd1dfe941d44b28050bd34cbd6959f44a81a7b5fc9134a583
+MISC metadata.xml 1448 BLAKE2B 5fb494f00e91500e600340c00734b34c953a9bec939bdbcf8c9946412290bfce34219057f8a7eeadca56ffc050ac4b043039efbeb9d1db2396bfd35917ccca10 SHA512 729b1e16d89447baaa37085bd8aa7a887984ac2c64810d4f81127aaac873f7d28f0299e10a1cb8ca151ff59553cbe8b734390ca26f6998044f0a889a452b907b
diff --git a/sys-apps/util-linux/metadata.xml b/sys-apps/util-linux/metadata.xml
index 6d41d90fe50a..140ce7d62535 100644
--- a/sys-apps/util-linux/metadata.xml
+++ b/sys-apps/util-linux/metadata.xml
@@ -15,6 +15,7 @@
 	<flag name="kill">build the kill program</flag>
 	<flag name="logger">build the logger program</flag>
 	<flag name="pam">build runuser helper</flag>
+	<flag name="rtas">Add support for the Run Time Abstraction Services (RTAS)</flag>
 	<flag name="su">build the su program</flag>
 	<flag name="suid">
 		install mount/umount as setuid so non-root users may mount/umount devices,
diff --git a/sys-apps/util-linux/util-linux-2.37.2-r1.ebuild b/sys-apps/util-linux/util-linux-2.37.2-r1.ebuild
index fc7d384e57b1..46c6b0ce7ed2 100644
--- a/sys-apps/util-linux/util-linux-2.37.2-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.37.2-r1.ebuild
@@ -25,7 +25,7 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/
 
 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
 SLOT="0"
-IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
+IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
 
 # Most lib deps here are related to programs rather than our libs,
 # so we rarely need to specify ${MULTILIB_USEDEP}.
@@ -42,10 +42,9 @@ RDEPEND="
 	)
 	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
 	pam? ( sys-libs/pam )
-	ppc? ( sys-libs/librtas )
-	ppc64? ( sys-libs/librtas )
 	python? ( ${PYTHON_DEPS} )
 	readline? ( sys-libs/readline:0= )
+	rtas? ( sys-libs/librtas )
 	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
 	slang? ( sys-libs/slang )
 	!build? ( systemd? ( sys-apps/systemd ) )
@@ -160,6 +159,9 @@ multilib_src_configure() {
 	export NCURSES6_CONFIG=false NCURSES5_CONFIG=false
 	export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false
 
+	# Avoid automagic dependency on ppc*
+	export ac_cv_lib_rtas_rtas_get_sysparm=$(usex rtas)
+
 	# configure args shared by python and non-python builds
 	local commonargs=(
 		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 3b364c69d425..8f1152f9d80f 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -25,7 +25,7 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/
 
 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
 SLOT="0"
-IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
+IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
 
 # Most lib deps here are related to programs rather than our libs,
 # so we rarely need to specify ${MULTILIB_USEDEP}.
@@ -42,10 +42,9 @@ RDEPEND="
 	)
 	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
 	pam? ( sys-libs/pam )
-	ppc? ( sys-libs/librtas )
-	ppc64? ( sys-libs/librtas )
 	python? ( ${PYTHON_DEPS} )
 	readline? ( sys-libs/readline:0= )
+	rtas? ( sys-libs/librtas )
 	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
 	slang? ( sys-libs/slang )
 	!build? ( systemd? ( sys-apps/systemd ) )
@@ -155,6 +154,9 @@ multilib_src_configure() {
 	export NCURSES6_CONFIG=false NCURSES5_CONFIG=false
 	export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false
 
+	# Avoid automagic dependency on ppc*
+	export ac_cv_lib_rtas_rtas_get_sysparm=$(usex rtas)
+
 	# configure args shared by python and non-python builds
 	local commonargs=(
 		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
diff --git a/sys-apps/xdg-desktop-portal/Manifest b/sys-apps/xdg-desktop-portal/Manifest
index 1d8ca552478f..aed79789ddc1 100644
--- a/sys-apps/xdg-desktop-portal/Manifest
+++ b/sys-apps/xdg-desktop-portal/Manifest
@@ -1,5 +1,3 @@
 DIST xdg-desktop-portal-1.10.1.tar.xz 479660 BLAKE2B 88a2b8ea890036bf0d4192fae4ae143e350d903a528e09a0bd7ffc7bda2a58b5c04ae80f1cec4357bb05cba8db417b6193fc6ef7f7dd65bf414f80a8ac2800c5 SHA512 5db0bd866674ff016d864646ea7f91f09a1b8fbc5ec735e4c97165af71770d2c7d3333e771062644dd522b32f67ead72bc7ef99186e3b069671c174d4d601fdc
-DIST xdg-desktop-portal-1.8.1.tar.xz 473052 BLAKE2B a7d0aa2aa1e8220ced3e4abff8a8284c521b983ce807cd3e0d7b5d22f98f6428b6de9a193ae3aced9c13473617f453d13d0af83c677e3d077906b6cf8a138d45 SHA512 447d287d6627a1086d97dc5ebda20dfb1d0ca8643cbe54a7af5f6205a122a7be9d1643fded592f922c015561b7e2f4c6b6df555db3e0d3c02aad5bbe944077b6
 EBUILD xdg-desktop-portal-1.10.1.ebuild 987 BLAKE2B ad57dd3a283dc008a022b61bdb0a23c8aa3476ca466a528387aa7ebffce602a75e9f1349f53e0f806d50e94a61eeb74774452bf0955cdf8b05ca3e40e438fd10 SHA512 6e9b80266a96c9b9f7752849395e0543bf083ccaa1490a94f73891530c9bfa03d25338a00b53f234c21ffecde74714690f9208d326d83e9aadf69f4458f972a7
-EBUILD xdg-desktop-portal-1.8.1.ebuild 987 BLAKE2B 6cb3b3a1ca0eb4216ec4bbd1a3661f166608e8ffd1284e24a17a73b8173fa0405c6ba113557fd86b1c3193966ab630a0c34bfdb97913bf658d065ff53bab31e8 SHA512 43d463812643df7b233739b88d17634f61397610986a128bb84909511ff2a441852f8fb5b51d1736c66ce94915fe30e0ff4e3135009ddce1be63640599f6cd5e
 MISC metadata.xml 361 BLAKE2B 29f050b1cf9380b76d4a779066ae0db5704da11ba9d97e1b2ed7c8d15003d534ecb83c4cd186e7f47e0e89b10e51299ee7bdd9acff9a02f9dc721647bca283da SHA512 872fc2c477635667b5593856f3fef346b96add82b754f9978c36c3c4e56a00516196faab14bac0adff40636c481ba436889b13549b2fc29412f3a21d1166fa25
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.1.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.1.ebuild
deleted file mode 100644
index 11fdb5187f8b..000000000000
--- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="Desktop integration portal"
-HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal"
-SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-IUSE="geolocation screencast"
-
-BDEPEND="
-	dev-util/gdbus-codegen
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	sys-fs/fuse:0
-	geolocation? ( >=app-misc/geoclue-2.5.3:2.0 )
-	screencast? ( >=media-video/pipewire-0.3:= )
-"
-RDEPEND="${DEPEND}
-	sys-apps/dbus
-"
-
-src_configure() {
-	local myeconfargs=(
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-		$(use_enable geolocation geoclue)
-		$(use_enable screencast pipewire)
-		--disable-docbook-docs # requires flatpak
-		--disable-libportal # not packaged
-	)
-	econf "${myeconfargs[@]}"
-}
author	V3n3RiX <venerix@koprulu.sector>	2021-12-05 02:47:11 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2021-12-05 02:47:11 +0000
commit	2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch)
tree	c8af0fd04194aed03cf067d44e53c7edd3e9ab84 /sys-apps
parent	e9d044d4b9b71200a96adfa280848858c0f468c9 (diff)