gentoo resync : 20.06.2021

28 files changed, 141 insertions, 645 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 338084eb300b..5de85837804f 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/ethq/Manifest b/sys-apps/ethq/Manifest
index 22f5e9342a2d..adcf30b9ecd3 100644
--- a/sys-apps/ethq/Manifest
+++ b/sys-apps/ethq/Manifest
@@ -2,5 +2,5 @@ DIST ethq-0_5_0.tar.gz 15830 BLAKE2B b18326f1564d08f94500aa934838053a3b84b78f3d6
 DIST ethq-0_6_1.tar.gz 23475 BLAKE2B 04d933294ba432ed69108022b0a2b13c47537902f66c6969bbd5afca144a977a6215a2164cbefd975d0f599bd8503feca79ef9e38856d8c9e6943c2cd2c3f99f SHA512 72c38ecb0cb6c7d6f522d99f2a6ec08bd2c42065d5f83d86890706a52420006fcdb5774a1457a66ccd5e174113e09c2a4285d311af334616a01c32ad8753126d
 EBUILD ethq-0.5.0.ebuild 1163 BLAKE2B e44cdf337ce09cd74b5acd6181e42ee3770b1c0dd6208103c6124520bfd37f58a5f80ea937575cbe77f067561847b9f71c590cef9f6509aca4e84ea5ddda562b SHA512 c008cfb872f7f0521e441ee51f3da5b74ebc17529bf1eaed7a9e4d7c23e36e86421708a44f42c463e94bc945af8cb8c9b78c20a0e5cd178eb30a9d5f223e69fb
 EBUILD ethq-0.6.1.ebuild 1137 BLAKE2B 9247848c08414e60a0b838c2b3a49676e28092065b32bc848a616b701d1b90c27b92f7c596d9213d68b34c8ad8e914cebc3fe919d2b9334b0f5f56c881d3011c SHA512 ac371c13b88fa8dc7bc5e87ae5c72b96cd18627e5b8b7cba40c14292121f22a81a4dc49460bdff3927b0d6781aefccaf585b519ab69c365fa7b0813ab10900dc
-EBUILD ethq-9999.ebuild 1076 BLAKE2B 976a1e0cef839705b93cb7f4292067b551272ff3b211d2cd539c09423be59247f6e7dd74811ae2f815914c5f93d07789c97850e3135fab4484ab0ddbf819decd SHA512 faf0a96368a6165e0a37ea82db076d8b8e6e8c9e89db38f5bbb35e8c2838afc1bed04c13e9d86048b902d15540903f6ca066ca257a3f385dff397af318e99d4f
+EBUILD ethq-9999.ebuild 1077 BLAKE2B 2b8d087fa0c4dd68fa10e8cef7f3edb49186a46813cf42263123309529af58cdf6a323c43a3ae08fd1b0dc1009cc9653afc5ec6cfaf17d1cdfdd2c06067b5c89 SHA512 78ceec7d190e7462bcf82a6720ceb4bf33c75451ddb22dae2c4a0e565805e8846df0b1876046159bc3026d4665efeba221c33f3fcc7b9eb14ccb8ff8e7880c8e
 MISC metadata.xml 657 BLAKE2B 42d6c240e11da7194084ce27240208ed46bd4b2352dc63851a2c2e2c51c2bc90f596766e985bcc395a10477c19b641c9a298417cbf36511efa14a31342792e01 SHA512 be3db53a8ff0ac2bc3c54febec669d34b949363c1e5087cd414c521395629123df47ba832c397c5d7f79586f5f75a79b26b03917445d4ee82f72cb47bd07cc7b
diff --git a/sys-apps/ethq/ethq-9999.ebuild b/sys-apps/ethq/ethq-9999.ebuild
index 930a13b4f96d..76ff4fd29c74 100644
--- a/sys-apps/ethq/ethq-9999.ebuild
+++ b/sys-apps/ethq/ethq-9999.ebuild
@@ -17,7 +17,7 @@ KEYWORDS=""
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND="sys-libs/ncurses:0"
+DEPEND="sys-libs/ncurses:0="
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
diff --git a/sys-apps/fwupd-efi/Manifest b/sys-apps/fwupd-efi/Manifest
index 51dc2740f166..254a6444495b 100644
--- a/sys-apps/fwupd-efi/Manifest
+++ b/sys-apps/fwupd-efi/Manifest
@@ -1,3 +1,5 @@
+AUX fwupd-efi-1.0-add-genpeimg-parameter.patch 1443 BLAKE2B 75b4230924fa6338ce089344dfd1a389452c195939cf04eacb5e0e92eaa5995ead1510f3b4f341385c1cab47f2b469d32ac017bc3c888c94b9f5c4956799f8e8 SHA512 3e08031a23afd58c3f20daa54b0506b82146e0dcc4c8568b7914f2db732bdf36f22a6d951adf76ea16a54c2130a0d9d5770381d21035c047eca0672ebfb7c892
+AUX fwupd-efi-1.0-pass-genpeimg.patch 774 BLAKE2B 86b3e04192c62a87d384dfd550f13937ab6ec72ddb89d2b8b341a3934aecbd06f4d0e500d2496006c60361d96e63cf5adba115b492865c31ebe1924e9ba6b85b SHA512 2f51f988cb488a0d1e0a4812c2bb06e1c15ebe5b57e4378c2d0869ca1a975e28819feb415c917779ef8b27aba6c9f3701beb94b38eb8e34f8ed7318823c5a02c
 DIST fwupd-efi-1.0.tar.gz 37465 BLAKE2B 89824d2f32d618802f56ebdb67838eed2759a86556a54a9da4f303220d99fbd2465673181d3d2806f4665061746cf7faebf633d4de8249e2c3f269fe0c22b679 SHA512 fd2fde665e90f40fb8c2235f09fc17618d8cb3f87a23ef37f7940a36c4f4b0f9ccef90745bdca1dd8827f60060e5fd95c139883ce08aedb00a249f6e809703a4
-EBUILD fwupd-efi-1.0.ebuild 1069 BLAKE2B d243fc64a0a1110e777842b6343b1cb3dc893883a0220a3e4b39b37b6ae41e7286b3d900ae1d797f75bf369d90cb97a823e92b6b188a9f598e07b774451d4416 SHA512 c8b2270bd1abb5f9240f15c4524ad8c1c80ee98ba2bdf6a225755c375baf2ed0014a231698292127f0cfcb186f63190a7d9334946882df9d42d78b134c92030c
+EBUILD fwupd-efi-1.0.ebuild 1171 BLAKE2B aebf9f17f7b556cc11ada1cf0e065ce373dbc54199fdd8bf996f9f105aebdd9e62fa44249767e1344e19eaff01d99554b1ca9a5be7f41bfba6503f82fa32d585 SHA512 c8202bd14c8655dc925e1b9698c049f4b682642c3279c1a7b906be2622ba1f13ae4afa76b6f5648bdcebd3af812c4d5bb6972c81fe9c790fa7258c980823c764
 MISC metadata.xml 506 BLAKE2B 13136a7a9c7c6dd0da4a85eaee0fa9b2545eae59b2dc8576ac679af1ec3818a973eceb08e7c3c5fb4c4ac965bd1519ea443080a5f7bd84ec04ae3d914a75d0a8 SHA512 dbc1db78b748d1ef5b6679c696da79e4834b00844a4c39102504cdede6cb72e7de3eb7975cee65e9f86f232dd20ec0ce998586c6ace9423481056071dc08c1f3
diff --git a/sys-apps/fwupd-efi/files/fwupd-efi-1.0-add-genpeimg-parameter.patch b/sys-apps/fwupd-efi/files/fwupd-efi-1.0-add-genpeimg-parameter.patch
new file mode 100644
index 000000000000..a9791b4e1144
--- /dev/null
+++ b/sys-apps/fwupd-efi/files/fwupd-efi-1.0-add-genpeimg-parameter.patch
@@ -0,0 +1,42 @@
+From 207e8bf4bdb8dbdf8800d4b5cbac5af746047f37 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@arm.com>
+Date: Fri, 14 May 2021 14:06:31 +0100
+Subject: [PATCH] generate_binary: add genpeimg option
+
+Add a --genpeimg option as the meson.build uses find_program(), so the
+binary could be anywhere.
+---
+ efi/generate_binary.py | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/efi/generate_binary.py b/efi/generate_binary.py
+index 0193e50..907af9f 100755
+--- a/efi/generate_binary.py
++++ b/efi/generate_binary.py
+@@ -48,13 +48,15 @@ def _run_objcopy(args):
+ 
+ 
+ def _run_genpeimg(args):
++    if not args.genpeimg:
++        return
+ 
+-    # this is okay if it does not exist
+-    argv = ["genpeimg", "-d", "+d", "+n", "-d", "+s", args.outfile]
++    argv = [args.genpeimg, "-d", "+d", "+n", "-d", "+s", args.outfile]
+     try:
+         subprocess.run(argv, check=True)
+     except FileNotFoundError as _:
+-        pass
++        print(str(e))
++        sys.exit(1)
+ 
+ 
+ if __name__ == "__main__":
+@@ -63,6 +65,7 @@ def _run_genpeimg(args):
+     parser.add_argument(
+         "--objcopy", default="objcopy", help="Binary file to use for objcopy"
+     )
++    parser.add_argument("--genpeimg", help="Binary file to use for genpeimg")
+     parser.add_argument("--arch", default="x86_64", help="EFI architecture")
+     parser.add_argument("infile", help="Input file")
+     parser.add_argument("outfile", help="Output file")
diff --git a/sys-apps/fwupd-efi/files/fwupd-efi-1.0-pass-genpeimg.patch b/sys-apps/fwupd-efi/files/fwupd-efi-1.0-pass-genpeimg.patch
new file mode 100644
index 000000000000..7e4dd1af3294
--- /dev/null
+++ b/sys-apps/fwupd-efi/files/fwupd-efi-1.0-pass-genpeimg.patch
@@ -0,0 +1,21 @@
+From 321f0750ee69cc62ab609f760769d880676f712b Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@arm.com>
+Date: Fri, 14 May 2021 14:07:11 +0100
+Subject: [PATCH] meson: pass the found genpeimg to generate_binary
+
+---
+ efi/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/efi/meson.build b/efi/meson.build
+index a496210..7cc1da1 100644
+--- a/efi/meson.build
++++ b/efi/meson.build
+@@ -215,6 +215,7 @@ app = custom_target(efi_name,
+                       '@INPUT@', '@OUTPUT@',
+                       '--arch', gnu_efi_arch,
+                       '--objcopy', efi_objcopy,
++                      '--genpeimg', genpeimg.found() ? genpeimg : ''
+                     ],
+                     install : true,
+                     install_dir : efi_app_location)
diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild
index fc3aa3397b23..1f99eec953ed 100644
--- a/sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild
+++ b/sys-apps/fwupd-efi/fwupd-efi-1.0.ebuild
@@ -29,6 +29,11 @@ DEPEND="sys-boot/gnu-efi"
 
 RDEPEND="!<sys-apps/fwupd-1.6.0"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-add-genpeimg-parameter.patch
+	"${FILESDIR}"/${P}-pass-genpeimg.patch
+)
+
 src_prepare() {
 	default
 
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index b8347856d941..60a56fd40e6c 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -2,7 +2,7 @@ AUX gptfdisk-1.0.6.1-spurious_mbr_warnings.patch 2708 BLAKE2B 538ee3c542fc7d0cfb
 DIST gptfdisk-1.0.6.tar.gz 207017 BLAKE2B d00e0f00dc8dce3b6088250aa39e05f41c96bee2218eec1dca34a160e70129d1006abc4341031994c53e77068b5de510b923c69858903627ccf786f3cc848a86 SHA512 a3bf95c813f707d9d41513295c3419916301a0e88b4c6ade70ad7d9422a507d519e092e68a3868d53092428d159bdbb248817c4f40d8ac88b0175d5afbd79dbc
 DIST gptfdisk-1.0.7.tar.gz 207723 BLAKE2B cebb0375294b4ff8f8eb522a4ae23259714d07d670a7bfbf8664586c948c1c8bee2674649a181a7c5d22f9dfe177feb7a9648ca9936c388b419faf7b52e789d8 SHA512 8a2067523479e34c76392571692b36e6c9eadcd0aca979f1ba09904930ed92a709bfdcdfa3369230a5ab2b5a751682dc7fb4645fb5f7f1c361ee8d28e104214c
 DIST gptfdisk-1.0.8.tar.gz 208958 BLAKE2B 03c74c43fead13e90ff6cd42405e15db726f527801a9e3f1d5f6a83d3fa58f0f8e58b35edc1b12b0b2e6c7849b657ce4493ac67204d25309e6f63fe7f57f766b SHA512 0818a238e57cf6de893da7c161e8aaf2d30ad917a47750de09967ce1d83d1ab6666fa043465abaffdc293d058acc3fa87f8bc93a4b03c7c5d9a9ceb8f5b07331
-EBUILD gptfdisk-1.0.6-r1.ebuild 1308 BLAKE2B 494064be22ec49402cd5a884ea03a4d130fa6a66d565efa4187dde06e5cbf511961dea8f3abbad31b741e94453956c3d5b2531a404ec0cefa51e8b30cc35d1d2 SHA512 ddfb19466f938f5f6a58f19dccfd80de3dbdbe2e488e63e6338df4272f585be567a7a74c9d8a32dd83ba34822ac558166ece8b8ff029a8bfa3d74a673e773581
-EBUILD gptfdisk-1.0.7.ebuild 1248 BLAKE2B 2046f80b5ed6322d855520dec795bd185fbe1c22b7f2bf26737de501708439840b0766c1dddea5639c97ecd5e756487afbb44137235dc49b32b8c4ae76377377 SHA512 8373b463fbd55f3070376b9884d04d9c81392145058433afa09f0ce3b1a05f20314b4dd6a614050554cdf13c4897ee463a93d0e9373fd3b0e10c91ec2749b112
+EBUILD gptfdisk-1.0.6-r1.ebuild 1317 BLAKE2B c9643518d97dc57249f180f465ec41f8fd72ff29e4f6afb0974847bf3ddfe3cbcab95cb74a3607ae840a50c7f5d2847ef4bbbe820d667df07227f8ec007c0b23 SHA512 c0df406581b8c115c60115f7be89445dc71618c68da11f33e04d2e9fe96bc02f60e90ed1e0b6ed10a42790670cd52d43e8a174e09d529de024b3b450c80519ed
+EBUILD gptfdisk-1.0.7.ebuild 1257 BLAKE2B 2694bcaf178d77161356930ea67497bc90c014fd5cb6696c3d3313f9d910113968ac3a1014e395fd83ff681933422cfd64ec487db3a7dbd4a12d7632b5618271 SHA512 03897c3553149aae5a61f6fdd4cee026ebbf5b4c12678df102cd48726a2aeb15cdaccff1142b5d3af3888610ecfc46cf8ddb8343f3da0ecd05b7053c388b0f06
 EBUILD gptfdisk-1.0.8.ebuild 1252 BLAKE2B 31480c49e299e1dc5b3f533998d6a473c930cf18652a62ced07c6a0b27cf82d571972b47ca42f1402d4c30ae9b8b044ef3385d59a828920dc0c24c9255612375 SHA512 8392f645d7fa03a51a243bcb8c42dbee4dc7832ac32fb84d3c61016f96825dffffb2d440f1765d70da89ab498de38e874d9eaf890b922ae93b9090653b90d79c
 MISC metadata.xml 339 BLAKE2B 3f08c8aa6a482a6d923388fcbf800cac3282c5c864b9fe27868491d10e7edb75ed04f8d7bc86f5295c90e338d99d59b275ae79813b4d549a04331992526c6979 SHA512 d8334a3e741adf97739f9fef66d7b38bfab9e2d189ac5fbc96ab27a7c1551938b6184ebb08b03ef8b6864f6e43d536836f373e03f3491cacc8f6ee3496f615b5
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.6-r1.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.6-r1.ebuild
index 08ba15498ca3..26bfd7909288 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.6-r1.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.6-r1.ebuild
@@ -27,8 +27,8 @@ DEPEND="
 		ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] )
 		kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
 	)
-	virtual/pkgconfig
 "
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${P}.1-spurious_mbr_warnings.patch"
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.7.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.7.ebuild
index ff07845b09b6..9093cf2c58db 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.7.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.7.ebuild
@@ -27,8 +27,8 @@ DEPEND="
 		ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] )
 		kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
 	)
-	virtual/pkgconfig
 "
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest
index d0dab1ff1bd3..50d1b3634d6e 100644
--- a/sys-apps/haveged/Manifest
+++ b/sys-apps/haveged/Manifest
@@ -5,6 +5,6 @@ AUX haveged.conf 147 BLAKE2B 7bdf29071f7a1a3b90266af308ab0a0a56c46f8c9ae8b6acc3b
 AUX service.gentoo 322 BLAKE2B 302a1506492e5122a03ea616de11dea493637d904cde1415abbbdeff3794251e911c6efee7d9331a4cb1e8dde1dbb579f46935cd52c58fbaeb77404b587985cb SHA512 7d7caaef45cbf268a1c1a813537a9e4ef6543addcfebe99fd178e37a8c516bbd5419fb8f47decf2370cee0562f066c72501b6c176307b1f5884b56f561386b88
 DIST haveged-1.9.14.tar.gz 496346 BLAKE2B 9df0b51dc5856b4b943a0c1c1c8f9b947dd3d22bdf45639920911e2619264fc771cba68ad70559b34523a6361cc5da588392bf0b24de1dbf824f1dfc7898a2bb SHA512 bdb6d9de667298d32b474bcbdd5f90c12b870b154b86f8817948de787d378b428bf823234f20129666bd1abced2f154643b5999e43975969f6bba87124650924
 DIST haveged-1.9.8c.tar.gz 494470 BLAKE2B 840aa0b985107feb38a7b5823f94de3473e79f75542565e571c4ec9b2640dddcabb09d598e101678defbdd2eb04fe2fc1fb1f8466157e53d7c41272131450dec SHA512 24167e8a9773d96b3c57cd3e57def7e291f3de86873e796cafc1a59d3f89818c6cb8d46d05e5ae4eb2683fc86b313b1acaed7f210724dadb7df3939e1b3900aa
-EBUILD haveged-1.9.14-r1.ebuild 999 BLAKE2B 51afa569d19e3faf73fdbed079f0c54dafc9702a30189c08a2088638b9fc019bb1bb66c37eb36ffb5221f1446104bbb66b2625f6e8bffc195513603e8e3086a0 SHA512 23adc32646f0d46618c43961e47d681806dfa63121a27d6af36c1efe7b4f772980d697dbf6150aff19989ad5fa7201e8ccd6f9158b37bb2e20ef47191ee9c559
+EBUILD haveged-1.9.14-r1.ebuild 1005 BLAKE2B 88aa8fc59fb863f794c6ea9e99f704742fe00a9d7979eda1d186e0522dd2d424dc88335608bde322d5874b84cc63afff266ee5b25e2c0572ff58b665c9996687 SHA512 55656a6df01feb321bc29d973449f4a513a9ad5a55f92d3181c02243a497c42be9ce933ba310935fd9233dd26e9bfb4821db122c808cfaf2e199c2329639fb2d
 EBUILD haveged-1.9.8c-r1.ebuild 1064 BLAKE2B 60289aa161de1a57286387bb5ad64e67287120e659763f3874bd10282cb32f42619d9e9c749b7a7cd2ac237208bf0ddb1ffa73550e46687d3f62f946c58a5e75 SHA512 7098595525b1d88bbf6d182332b843cb4e5c26baf450c9231a88c59d5da5b8ce9d0c045483a00213225b3b9d5fbd3bb17896183123a6e0c4321045e7f846637d
 MISC metadata.xml 371 BLAKE2B d44d1873136cfff8c9c1ae42ee0ded780af875987caecc98494afba60017c3da105423642f10f2475d344636d54c71885607649ceb4f285a477698b40449d2ef SHA512 640e188a0829d4408d9bc7ca0c7558222ed8148afef25a88a136c0ae5bb44531bc8352c9c1da1c13e395cb54d67c62a485fa4f6329ad7b76255def9d979b70d0
diff --git a/sys-apps/haveged/haveged-1.9.14-r1.ebuild b/sys-apps/haveged/haveged-1.9.14-r1.ebuild
index a90d3f4023e8..44aabb781405 100644
--- a/sys-apps/haveged/haveged-1.9.14-r1.ebuild
+++ b/sys-apps/haveged/haveged-1.9.14-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/jirka-h/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86"
 IUSE="selinux static-libs threads"
 
 RDEPEND="
diff --git a/sys-apps/heirloom-tools/Manifest b/sys-apps/heirloom-tools/Manifest
index b64fe0052e1a..a842f363e40d 100644
--- a/sys-apps/heirloom-tools/Manifest
+++ b/sys-apps/heirloom-tools/Manifest
@@ -5,5 +5,5 @@ AUX heirloom-tools-070715-glibc-2.31.patch 964 BLAKE2B c235d9c4d035c19617a1bdd40
 AUX heirloom-tools-070715-major.patch 2104 BLAKE2B 88a602e587dc8376e8eb8198308e64a05db642b596e89b8087b30a2d6d16102b18f0b033cce4c1a4711a8ebcbd4a508139a7fb098b1cdcc292ef63d183bbc576 SHA512 7cee022491768031d413a8854a05a34cdbb6061fe30fa8514072efd0056614218e989c3e03fe771ae79a022085460f8bcdbb147fac0dcc6d97ab49703eaa98de
 AUX heirloom-tools-070715-makefile.patch 581 BLAKE2B a74613af222aff0ec7e6e3e1c012bd444a0a1d74e9caa9ac6ee7b3175641f81966527d24dd2d67b88921943579b591e9f2f735bc427f0c8bfa66977078b2d537 SHA512 ab45b3feca27ad855e535ebae77537572b9d1b6b00bd7f973521d477e962691e56ec67ce5d900980b084758643d85db5af790447411374b488f6c440852cdf71
 DIST heirloom-070715.tar.bz2 1000080 BLAKE2B 8719e38b7e260b0ecb9d055672e0097954eee31acd6cde8c582f82055a3b7f66511bf3c876309d0e74a8c29ac334b58ed81c56df26d1b9c065994bd353affd20 SHA512 0b30b0f4c4c92a10ee2da263ea44666f445d96bac86ca4afb7bbb50d8278986e4145a7bcdf3ed9f75611bb956e93e16fc0e19874498ce3ae1a00e6fbb4f910c9
-EBUILD heirloom-tools-070715-r3.ebuild 2264 BLAKE2B 91057791685a3fd9594095756c6fddfa4b4c6ef24e8dacf127f732b1c07e2a1c78383c84e395eb12010b912abc70bf7c9fa1534179e2847ab1e37bb8b1847510 SHA512 ea2a0ade758b1167d99c01d252e9ae23189c0e7fbd8cca93b73ad72c6129890b6995e63ec22da1e84c456456c8ee5fb01edc92e0e43f03417c8477de2e8843db
+EBUILD heirloom-tools-070715-r4.ebuild 2288 BLAKE2B 5a84b190f8cc1215f08216f5567903c0f4e9150e4ccd80c28b84f91901654739eed9269594e698a63c8e7695df5205d385522644e615ac6f584f0bc71bca0530 SHA512 f3ef947e61037ee1f29da4e093e77406c15f9aaa5eec6e9bb6bf510e6b3f13d871d4a4eaac6d494d2993fad13d98a114e2a73c08cf18a1daafe55b1bb0ca1974
 MISC metadata.xml 245 BLAKE2B 47a82b79d52e71358e03914aba8d070a655449fec0e7a7285c93eae422f8b5f0e76cabd1decbf65192e4a3e4b97b677fe91d3ba89f26722a626b3f1927b91669 SHA512 33eb3d3f6130c2ddc9f443f89eea14440472c13e005e97ed283db7e365875d2b911b3e1d62f65f63eff15eade03d35f0874f123bdbd54ff4cd7df606a990639c
diff --git a/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild b/sys-apps/heirloom-tools/heirloom-tools-070715-r4.ebuild
index 1b9569f940fa..c91cfdb53b42 100644
--- a/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild
+++ b/sys-apps/heirloom-tools/heirloom-tools-070715-r4.ebuild
@@ -14,15 +14,18 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
+	sys-libs/ncurses:=
 	sys-libs/zlib
 "
-DEPEND=${RDEPEND}
+DEPEND="${RDEPEND}"
 BDEPEND="
 	sys-apps/ed
 	sys-devel/bc
 	virtual/pkgconfig
 "
+
 S="${WORKDIR}/heirloom-${PV}"
+
 PATCHES=(
 	"${FILESDIR}"/${P}-major.patch
 	"${FILESDIR}"/${P}-makefile.patch
diff --git a/sys-apps/intel-performance-counter-monitor/Manifest b/sys-apps/intel-performance-counter-monitor/Manifest
index 4694b3f4bd41..66abe7b619e5 100644
--- a/sys-apps/intel-performance-counter-monitor/Manifest
+++ b/sys-apps/intel-performance-counter-monitor/Manifest
@@ -1,3 +1,3 @@
 DIST IntelPerformanceCounterMonitor-PCM-V2.10.zip 950922 BLAKE2B 3b3b0cf3e12e1f57241e25b13848253157624ac49c1aaec74a0ec8fd2cf92dffa56e5c25299189bd886cb069897dd5a7117a71b5189487be89ee704a377bbc03 SHA512 a9a219495d9e99f8a8ffdae729c56e565c63856b81d71d7d188db2543d8d656535bb88f5701351a41aee948aeeeae304951cdf99dac7e6628bd43ba79bda757a
-EBUILD intel-performance-counter-monitor-2.10.ebuild 1257 BLAKE2B 57126cf0dd98af8761c7f32c86293779e8d53deda83a455ab00c451a5e4e9b8b8a3dc21e5127183179b18cb996a3f27d27fc171b594daf3c5776c15a9e3248b9 SHA512 213e53a11cf1ac420f07a4af5ea8087ad423bddaa1a54160a58b6d6a4e49807e8190301a4cca9ce2182ea6884c519b3bc6dd53d72640b1accbb35d7bc13dbe3e
+EBUILD intel-performance-counter-monitor-2.10.ebuild 1112 BLAKE2B e70bad83ebc6a3360e8d115ccf27fd4fa363f85711725c4f725da0aee59c64b7ede8409019f922d4edee5c0a076845a0d09417f41e01180e5fbe5b07d14900d7 SHA512 be4919dde28099d8aad4bd839a5120d4bcb3aadfa55e035124fc4a4df8a1a57c10d32348c81583414ee20d938050ac5530dcd2e05363a24c5c410ce207800580
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-apps/intel-performance-counter-monitor/intel-performance-counter-monitor-2.10.ebuild b/sys-apps/intel-performance-counter-monitor/intel-performance-counter-monitor-2.10.ebuild
index db62c90558ad..f3db85a77f66 100644
--- a/sys-apps/intel-performance-counter-monitor/intel-performance-counter-monitor-2.10.ebuild
+++ b/sys-apps/intel-performance-counter-monitor/intel-performance-counter-monitor-2.10.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 inherit fcaps
 
@@ -19,28 +19,22 @@ KEYWORDS="~amd64"
 
 RDEPEND=">=sys-devel/gcc-4:*"
 
-DEPEND="${RDEPEND}
-	sys-apps/sed"
+DEPEND="${RDEPEND}"
 
 CONFIG_CHECK="~X86_MSR ~PERF_EVENTS"
 ERROR_X86_MSR="Intel Performance Counter Monitor, requires X86_MSR to be set in kernel config."
 
 S="${WORKDIR}/${MY_PN}-${MY_PV}"
 
-src_prepare() {
-	sed -i 's/^#CXXFLAGS += -DPCM_USE_PERF/CXXFLAGS += -DPCM_USE_PERF/'  Makefile || die
-}
-
 src_install() {
-	exeinto /usr/bin
-		newexe pcm.x pcm
-		newexe pcm-memory.x pcm-memory
-		newexe pcm-msr.x pcm-msr
-		newexe pcm-numa.x pcm-numa
-		newexe pcm-pcie.x pcm-pcie
-		newexe pcm-power.x pcm-power
-		newexe pcm-sensor.x pcm-sensor
-		newexe pcm-tsx.x pcm-tsx
+	newbin pcm.x pcm
+	newbin pcm-memory.x pcm-memory
+	newbin pcm-msr.x pcm-msr
+	newbin pcm-numa.x pcm-numa
+	newbin pcm-pcie.x pcm-pcie
+	newbin pcm-power.x pcm-power
+	newbin pcm-sensor.x pcm-sensor
+	newbin pcm-tsx.x pcm-tsx
 }
 
 pkg_postinst() {
diff --git a/sys-apps/memtester/Manifest b/sys-apps/memtester/Manifest
index 87d1edefba4d..74cfd2a9de28 100644
--- a/sys-apps/memtester/Manifest
+++ b/sys-apps/memtester/Manifest
@@ -1,3 +1,5 @@
 DIST memtester-4.5.0.tar.gz 23286 BLAKE2B 841b68026a9b4eae69490c469dbaf062500b642d9ab11e3b1052e7c850e49af3665d0fd01c49670cf297ea5e03a4916ea01bb0219910d487de87568060115e2b SHA512 17df913509df33851fbc58751df993a77bff765a9799ac2b7976518b0a659a2322c9a93a7438e9daa314035e0c08cfcee5cbc97c6be1631917c47e221f15d363
+DIST memtester-4.5.1.tar.gz 23655 BLAKE2B bb7214a41f7cfa39dff6ab4f1efcd1788f5e6bd4cc1defba8c77ae030321703c1da7b6c1c6f1a67ea59e2cb9fc960772b710050b7c6d14b0799db4d9d99e9c31 SHA512 cf5744f11a931338a94158aee3047ad2dab18b0cb27b8998184a98f33aaebc678beec74841a2bcbbd7154cc2e46a20f746d9cae01a9274714bcedb93f29f8c80
 EBUILD memtester-4.5.0.ebuild 721 BLAKE2B 899588b6707b5cb7d7f5ecec63089e577202e3934981c2fb72785bffe0a0073c99f74a6bedcfdc34a5b84581a5f9103a9329eea2bfebfa76735a188ffe1187b7 SHA512 05557e5a04890b7fc6424e603493504793d68921c2325da5e94809b16aa431c79b34269e7119a8ad40474eaff09986302b908e4780b6ff3605b5b27cbe3ef1ee
+EBUILD memtester-4.5.1.ebuild 726 BLAKE2B 3a1154c21365b09c3fae329ec5d600b4450bfcf05622e4e93474bf98e66b0aa59e2dfb0ce2c0381c59ae4a09a4e0c058c63b80dcd50e6e05843ac75455ff0238 SHA512 e6c082e5bdb54f85089f51033c1e07ff1f5e09636df1700dfc16963b2aefb18500ac5ddf60a00dc3c715e0944b155592d535e1fbfb136800e99b64e5736676a0
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/memtester/memtester-4.5.1.ebuild b/sys-apps/memtester/memtester-4.5.1.ebuild
new file mode 100644
index 000000000000..2084213eb705
--- /dev/null
+++ b/sys-apps/memtester/memtester-4.5.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="userspace utility for testing the memory subsystem for faults"
+HOMEPAGE="http://pyropus.ca/software/memtester/"
+SRC_URI="
+	http://pyropus.ca/software/memtester/${P}.tar.gz
+	http://pyropus.ca/software/memtester/old-versions/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+src_configure() {
+	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -DPOSIX -c" > conf-cc || die
+	echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS}" > conf-ld || die
+}
+
+src_install() {
+	dosbin memtester
+	doman memtester.8
+	dodoc BUGS CHANGELOG README README.tests
+}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index a5c534755fb3..5936b3b6b912 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,18 +1,13 @@
 AUX README.RESCUE 134 BLAKE2B 2cd153e0077388f29e11779670086c50fb1a470b9bb76969a747313021bb85c37b20327ab2feb9b2cc715849245875e7d8a5ae6ceee84b4a33d532996cb793bd SHA512 0df49e479e551648519ea4db0986584463eed498f77b133bd0e517389e71f4ff4069f1a5017c39f349bae62baa2ac32d968048c396261a9045ff00a0e5aa8bf4
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
-DIST portage-3.0.13.tar.bz2 1049930 BLAKE2B 092e4a25896d613dcfcdaaa1c75f29d19112688328c4078a8ab2b24edcf1e26fff3273da56a79f8b35aada5e11e3cf7f14ef40aca742da0874ea7e907c4778bc SHA512 a9106fce311053523fd026c6c65cb85562bae69ab6ea6b5ae784044ffedbfeb0e3b1c3758ebea9204b11f885da383f9d8ee31d34ad52ac14f059cf97894e3590
-DIST portage-3.0.17-bug-775053-setup-globals-double-prefix-ff7d78.patch 908 BLAKE2B 51984f04bf9a9b448207f9f724a01e72f76a1df8f3da8a9cf263a870674458e885ed47aba7597b3a01d9ee3c86b687bcb9048356af9d7d2b015dac9c41c97baa SHA512 1aef52afcf4e5dca3afe7d746a868f5ea5a1afb28703e2087d620f5206cebdbf71e0d600d3354693e59f49cd92758f47e3aafb4625539af0cdec80b36109051b
-DIST portage-3.0.17-bug-775239-_test_lock_fn-tempfile-leak-d8a12c.patch 733 BLAKE2B 8281107d270908b49218603ef64b7580c5d6e0bf015eabef4c35f8ee9d76b2b7790f4b75404b9d85fd030c3a0f9183e88894d67bf547978f3fa0bed0630112cf SHA512 5ea4ccc7d517ea79a02fad77d20502d613cedf9df00edebf73972979bd5a469f47c14ae5b69b850f0ce9860b9fdf1b5bb283e138bd7be5b832928697e4bba42b
-DIST portage-3.0.17.tar.xz 970076 BLAKE2B 261d8d3b0da5bb77f37328219365a59d7ac56a22e887de59a6b702fcf895493f7a0aac1af744bc67b80c9e2aa730795e507764e9e1c807c247d1ccbe6f825d2f SHA512 6f4a50b005a67e6eea24600d10179fd48b4aa1de4cdf99bc310854dc303248408f8a31bca4135e4e530fcbd2b3d99c2f89644e4e4240e3a754fd97e949403ffc
 DIST portage-3.0.18.tar.xz 971692 BLAKE2B 0a8d2062fce1bf85a2f1025d17ddd3eafc987fd93c01f17bcc4487b23841e530451502417e24bbe58175b4fee871ceb528696775116a60f93b7b841d14ecf7a3 SHA512 d3f4b5258748fbef7b8ec000685b7e42804123a5c6b474bb6679666c2696a16e3bd202108df6e647770406539ff223bfd0deb1a3b4240e0a7ba1f2ec52aca2cd
 DIST portage-3.0.19.tar.gz 1347687 BLAKE2B 86eea08c2559b2d5a3eac39d8f7523380769710e7b4e3973463410bc291e746d9a36708e26d9b6456c06f67157fd04385c98ae28e25e48dba510fbaaab2d3536 SHA512 355153839219b93ae5d7c844ac5ed7ada10b2932d4a8e2b8208793fc33dfba3d46abe5ec7ecfbef9f16f23a6b21e57b7b14247f0b1fd85018a07e198bafa209c
-DIST portage-3.0.20-bug-777492-a4d8829-fix-055abe5.patch 5816 BLAKE2B 89c4be562de9be0d2a9c452a66500751a16db99a4069806cc767d358d56a0a787e0d9d872f95bd6c03fea7f543a19333a2b03f292009418b9da161065aa99aa9 SHA512 4cf114a7772baa8d37010d08d69dbb63a0b371c7369cff411663b545833f949b0c846d89793e38a61cd47ee5e3a7e8dd4335f03dd05f2b69fb6ff6299a446dba
+DIST portage-3.0.20-bug-777492-209be9a.patch 1758 BLAKE2B 9ed7b18ef8b73c59a08e5a2c2fba9365b37bd8cace32d5a275a4003cbf3f40f6a0a5a4d168dae987169e2017222a3af291d9a860a4494c994ef51ca851620db1 SHA512 38f402d1ecf125af7c454afdcee12221fa715f4e043c1a59073422025a12508a06a4bb77503bb75f6ed9603ff507499558bc1032157f5fc0aee9573bb18a6e4b
 DIST portage-3.0.20-bug-777492-a4d8829.patch 4549 BLAKE2B 9023c7bd3d173b48e1bfcf6d48c87f6b01731d6ec154132797c820a4c24ffedcaaf2eabf380d08c43238b377cb33c1be090fe8d213f8aef39b813ba2fab25672 SHA512 5575015216534bc0ddc0aa79bd2c1a96180d40dd8b3df61bb95e49a2d86e60da10a5eb8d658bf616da3f3f15ff6f4377d82e72ceca770304d2d79f1f25a26a11
+DIST portage-3.0.20-bug-796584-693f6bf.patch 2335 BLAKE2B 4922fad1fc34977b786555f1811e7b3b80e910bb940492eb735e95349f2ebb6c6f52642908fdc49e87c5f8b14f9171c8f32c627fe5ab472e645d5bc41c55bf33 SHA512 4032aef8de565e9ab166bf0f1b0fe4b4aec755eac4b8960dde57f89e08b00609a33cdce56f0f469292facb46aa088da4f3465cec935811cae4d00cca2254763b
 DIST portage-3.0.20.tar.gz 1348818 BLAKE2B e8af0662d073110a921ef23865872b0440f5e549da92b828af3dc71010d0f49d98c429c52c90ed683407fcfee7bf17a504082166f2fcad9590d7435dd43dfb83 SHA512 69c1846dedf0cfa3f57b2748cf8e077ead05ab0185e785dfc6310439b8624cdd72449209a807f12f59a5175ba065f8cca1409d43bee6012900b2c8b1e7f9b7e9
-EBUILD portage-3.0.13.ebuild 8441 BLAKE2B 26181a21486c1bbe225c5fdc09989fe1f9bdfe9c35dcb4b1dce6ac27a9248eef59b5ad518a8b1b20e9debb61b7079d2b8e08e6c27a9431875fd64a5d56c2ae45 SHA512 e1d17faba9d4f2f8ae9506b119eb5ed5353f84e6d6bf583696d8d48722dbb539b88eb4d652fd68c29367cd1ddbdf721a0f470b4da3d45f21b8cca6e11a5a5291
-EBUILD portage-3.0.17-r2.ebuild 9209 BLAKE2B cacc19c415c8c8a7982752319f914c66cfcd6d49972e71056350ff6cce771b48ee39a41298510eb42e7a5d04d06a9a683f558166bfef3c4356fe4a529a3fe50c SHA512 f5764228b3d0503b28a3cf941712ce62bb0dffab044f2a7c3e7e7b4309d87286996a9be20e7db2da915ec8cd51f1761147e634de5a148cb00b2acd69bae05f6f
 EBUILD portage-3.0.18.ebuild 8756 BLAKE2B 27048b15c8fdcae36bd51d56edeb0838b43e77a284930071833901f1484e14617f06090cdd1ed2ce6a166a78d272d9a37193b4d52f93942e9df1203715e09ae2 SHA512 38525aed603cfc379ff01f48f3bf3aa040b5355576c46515724350401ff948772b9aeed2b088f7d93805776ef4a55d32e02afa24b47cdfc7f298437c9019920a
 EBUILD portage-3.0.19.ebuild 8512 BLAKE2B cf8d97e8264830926303904e20b424a37f920d1431cbe3f4e352dd2416a1e7fc1546c8bca0b126da9ed1e111623557e4591b1c061df8a5aeabecaf94f90d74f9 SHA512 ff252978a99c5dc4fe7ab6cc8192eb9881d6b229d5933a0f10f57ca190b46c67f9899ff2ac16308b713ec43d3a01d4aac71bdc0f017d57e059c6c1a740c09083
-EBUILD portage-3.0.20-r2.ebuild 8983 BLAKE2B ce24083d90473e2eadffc9e4e6fb7502248c3c9c76a3a9a66981faddc9f836f302a3620b1e03ed82e6eefb71f74dd2e7c98fa58176a226ec4642c72bdaf82425 SHA512 c8e80caa5c839a232c81f48bdd2c6db6492f5a5085d5b9ce5736ed60d3397963d145bba1891286855b033f24fa42e2fb2a9ceca3f30e76e5d1db2278de1604ac
+EBUILD portage-3.0.20-r4.ebuild 9314 BLAKE2B a8e3d9ebeb6730bd6eb392751b14372ce052e5e4fc471e2a7932e3a27c2e7976b9a85c9bc480267deba1bbadea6fd87c76598b9f622313d2a32b3aafa74b2194 SHA512 6edc370d31a0306588e17e740f9715e351bd715f63cdcacb10f232d27f04258f6c58c04fc77e206400f1803f6e999a409b3ae032f1b295a7566fd77ede8347db
 EBUILD portage-9999.ebuild 7782 BLAKE2B 807fe6fe4aef995e67d2a1af8e51f1564bb6598be720600943adcf41dacce4f22f1f7c6eff9d6f2a0a817d893b983460eee1578b6da402acf6d69ed2e6e7c23a SHA512 e99bb356b89ae7d00cf97c76d2a03145465a75e191f4a6039a2f3a082e553ee4ce6065580beecc7d6ce7470e8236b773cf40c9fc372786033ed30694deb05b10
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
diff --git a/sys-apps/portage/portage-3.0.13.ebuild b/sys-apps/portage/portage-3.0.13.ebuild
deleted file mode 100644
index 489969e0c4a6..000000000000
--- a/sys-apps/portage/portage-3.0.13.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-TMPFILES_OPTIONAL=1
-
-inherit distutils-r1 linux-info tmpfiles prefix
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-vcs/git )"
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	apidoc? (
-		dev-python/sphinx
-		dev-python/sphinx-epytext
-	)"
-# Require sandbox-2.2 for bug #288863.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
-RDEPEND="
-	acct-user/portage
-	app-arch/zstd
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/findutils-4.4
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-		rsync-verify? (
-			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
-			>=app-crypt/openpgp-keys-gentoo-release-20180706
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	kernel_linux? ( sys-apps/util-linux )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-	) )
-	!<app-admin/logrotate-3.8.0
-	!<app-portage/gentoolkit-0.4.6
-	!<app-portage/repoman-2.3.10
-	!~app-portage/repoman-3.0.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
-
-	check_extra_config
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i lib/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions; then
-		printf "[build_ext]\nportage-ext-modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i lib/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use build || ! use rsync-verify; then
-		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
-			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
-			-w "/_BINARY/" lib/portage/const.py
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f ! -name etc-update -print0)
-
-		einfo "Adjusting make.globals, repos.conf and etc-update ..."
-		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
-
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use apidoc && targets+=( apidoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use apidoc && targets+=(
-		install_apidoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	dotmpfiles "${FILESDIR}"/portage-ccache.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	python_setup
-	local sitedir=$(python_get_sitedir)
-	[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
-	env -u DISTDIR \
-		-u PORTAGE_OVERRIDE_EPREFIX \
-		-u PORTAGE_REPOSITORIES \
-		-u PORTDIR \
-		-u PORTDIR_OVERLAY \
-		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
-
-	env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
-		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
-		elog "The emerge --autounmask option is now disabled by default, except for"
-		elog "portions of behavior which are controlled by the --autounmask-use and"
-		elog "--autounmask-license options. For backward compatibility, previous"
-		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
-		elog "Users can get the old behavior simply by adding --autounmask to the"
-		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
-		elog "change, see https://bugs.gentoo.org/658648."
-	fi
-}
diff --git a/sys-apps/portage/portage-3.0.17-r2.ebuild b/sys-apps/portage/portage-3.0.17-r2.ebuild
deleted file mode 100644
index c15b19433d3d..000000000000
--- a/sys-apps/portage/portage-3.0.17-r2.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-TMPFILES_OPTIONAL=1
-
-inherit distutils-r1 linux-info tmpfiles prefix
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-arch/xz-utils
-	test? ( dev-vcs/git )"
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	apidoc? (
-		dev-python/sphinx
-		dev-python/sphinx-epytext
-	)"
-# Require sandbox-2.2 for bug #288863.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
-RDEPEND="
-	acct-user/portage
-	app-arch/zstd
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/findutils-4.4
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-		rsync-verify? (
-			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
-			>=app-crypt/openpgp-keys-gentoo-release-20180706
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	kernel_linux? ( sys-apps/util-linux )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-	) )
-	!<app-admin/logrotate-3.8.0
-	!<app-portage/gentoolkit-0.4.6
-	!<app-portage/repoman-2.3.10
-	!~app-portage/repoman-3.0.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.xz
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.xz)
-	https://github.com/gentoo/portage/commit/ff7d78442895e53afb534c072477f98bada4f248.patch -> ${P}-bug-775053-setup-globals-double-prefix-ff7d78.patch
-	https://github.com/gentoo/portage/commit/d8a12c258cbe15b2725c51b1061e8297919b20df.patch -> ${P}-bug-775239-_test_lock_fn-tempfile-leak-d8a12c.patch"
-
-PATCHES=(
-	"${DISTDIR}/${P}-bug-775053-setup-globals-double-prefix-ff7d78.patch"
-	"${DISTDIR}/${P}-bug-775239-_test_lock_fn-tempfile-leak-d8a12c.patch"
-)
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
-
-	check_extra_config
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i lib/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions; then
-		printf "[build_ext]\nportage-ext-modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i lib/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use build || ! use rsync-verify; then
-		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
-			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
-			-w "/_BINARY/" lib/portage/const.py
-
-		einfo "Prefixing shebangs ..."
-		> "${T}/shebangs" || die
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				echo "${REPLY}" >> "${T}/shebangs" || die
-			fi
-		done < <(find . -type f -executable ! -name etc-update -print0)
-
-		if [[ -s ${T}/shebangs ]]; then
-			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
-		fi
-
-		einfo "Adjusting make.globals, repos.conf and etc-update ..."
-		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
-
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use apidoc && targets+=( apidoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use apidoc && targets+=(
-		install_apidoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	dotmpfiles "${FILESDIR}"/portage-ccache.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	python_setup
-	local sitedir=$(python_get_sitedir)
-	[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
-	env -u DISTDIR \
-		-u PORTAGE_OVERRIDE_EPREFIX \
-		-u PORTAGE_REPOSITORIES \
-		-u PORTDIR \
-		-u PORTDIR_OVERLAY \
-		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
-
-	env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
-		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
-
-	env -u FEATURES -u PORTAGE_REPOSITORIES \
-		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
-		elog "The emerge --autounmask option is now disabled by default, except for"
-		elog "portions of behavior which are controlled by the --autounmask-use and"
-		elog "--autounmask-license options. For backward compatibility, previous"
-		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
-		elog "Users can get the old behavior simply by adding --autounmask to the"
-		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
-		elog "change, see https://bugs.gentoo.org/658648."
-	fi
-}
diff --git a/sys-apps/portage/portage-3.0.20-r2.ebuild b/sys-apps/portage/portage-3.0.20-r4.ebuild
index 7f7c65e2f5a7..51a0f4f9f4cd 100644
--- a/sys-apps/portage/portage-3.0.20-r2.ebuild
+++ b/sys-apps/portage/portage-3.0.20-r4.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
 RESTRICT="!test? ( test )"
@@ -75,7 +75,8 @@ PDEPEND="
 
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 	https://github.com/gentoo/portage/commit/a4d882964ee1931462f911d0c46a80e27e59fa48.patch -> portage-3.0.20-bug-777492-a4d8829.patch
-	https://github.com/gentoo/portage/commit/055abe523c2c3f6c8f1dccfb53565209222f90c1.patch -> portage-3.0.20-bug-777492-a4d8829-fix-055abe5.patch"
+	https://github.com/gentoo/portage/commit/209be9a8bee13384dd04a4762436b4c2a5e35bc6.patch -> portage-3.0.20-bug-777492-209be9a.patch
+	https://github.com/gentoo/portage/compare/8e47286b7082aac21fe25402a1f9d03db968cd30...693f6bf5a54e2424e2ad49e1838b61f76bf78e40.patch -> portage-3.0.20-bug-796584-693f6bf.patch"
 
 pkg_pretend() {
 	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
@@ -86,9 +87,14 @@ pkg_pretend() {
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
-	# Revert a4d8829 and apply 055abe5 for bug 777492.
+	# Revert due to regressions:
+	# https://bugs.gentoo.org/777492
+	# https://github.com/gentoo/portage/pull/728
+	eapply -R "${DISTDIR}/portage-3.0.20-bug-777492-209be9a.patch"
 	eapply -R "${DISTDIR}/portage-3.0.20-bug-777492-a4d8829.patch"
-	eapply "${DISTDIR}/portage-3.0.20-bug-777492-a4d8829-fix-055abe5.patch"
+
+	# Apply regression fix for https://bugs.gentoo.org/796584.
+	eapply "${DISTDIR}/portage-3.0.20-bug-796584-693f6bf.patch"
 
 	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
 
diff --git a/sys-apps/sg3_utils/Manifest b/sys-apps/sg3_utils/Manifest
index 55d018d5c54f..9528ce379c9c 100644
--- a/sys-apps/sg3_utils/Manifest
+++ b/sys-apps/sg3_utils/Manifest
@@ -1,7 +1,5 @@
 AUX sg3_utils-1.26-stdint.patch 678 BLAKE2B 52a78fcc176492e6ca5a7a4465e76a3b6642b27c3b6dd77d5d0e8e7f7c59e564cd7e78f2297847db2e0c6b4611284cf5a67973ec9bcc533deab4625381f27d04 SHA512 07f7d46d70f79508169c482bbe251dd4057be4d546ce8ac4b0928ca8708c55086ca2765c78e5f894af1828ff7383ff33b5d354d4c1af9857a9122dfd6fc916fb
 AUX sg3_utils-1.42-sysmacros.patch 925 BLAKE2B 0a066dccd2e69c0a9a5e6ed20d87700e85061146956601777c754e9411b70de01456bb894091fb0ea0228eb060172601492ea678de158c4733f6ec423f176156 SHA512 f90ecb687f851a45684ad0b1f13269c4d674e849f6782b4f328d7f43f04209ee8442a7b428c27a57610f0ffc4c04343f357e700b22a6817835a3da09300a4f89
-DIST sg3_utils-1.42.tgz 1219231 BLAKE2B dd9ea2c324cb6f4c0ce770c90b7980da5e998bddc3a2be43a0aa9bea88dfe34291d0f58b393b2a5ac680c05dc673802ec9fae1ead37107bc49fa33bc7c4df503 SHA512 d16b65e36b2bccb4fc4c189f97e71fa38e6619f37d668a4ddd74a52c715fa62325288d9737812ed19c80547059dbd27be5a20565e27e1aabb571e8f5f8ac53ad
 DIST sg3_utils-1.46.tar.xz 1031800 BLAKE2B 034af23d10da49938979ea4d0041c6ce4309b9ceac13f06bd524011dccf285e88fbc5f4c3f261ec3e316db86278ccff235015de43d98b0b62ff05a2f98df0850 SHA512 0b4caab97ccc11fb45e88219e460b37c6ff69b8f3c79e513279aef51783ff22399d141253abdbf55db198db0815bc39d30e9b1e3bd7dda5e15c5f4dae3fe89cf
-EBUILD sg3_utils-1.42.ebuild 1047 BLAKE2B 29a471fa93e004cb38bd2e6ca9aed538d82c67b4a19e6870f14c17440bbda4bbebccaa2a6b2e2ea3973835d800d890d9d83c63659b1c2911be6a151e18c48c1d SHA512 df10bf8b262020f1b72c13e74ac5817a102ae4dc763f8f8fea6e3bdf51fabca1a8fe81a8fca77ea95ea3eedac8b94685b153f33adb37b87c6a3d6bd9169dd646
 EBUILD sg3_utils-1.46-r1.ebuild 1066 BLAKE2B 4871a822cc621c43c04838380cc6d4afc1360ecc851414106141c3e676d29fb236b0a7e386af7c629386beeeb8e2dbd15d083fda0deb8464901c0d3ba1e1325c SHA512 fc2717f60f31087fed00be923c0fa7e04a66928093f1a93524de9629a48f1292bcaa4a43599473ac8eb0da86ac6195f7ff5619643f30042a61598f61bf3deeaf
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/sg3_utils/sg3_utils-1.42.ebuild b/sys-apps/sg3_utils/sg3_utils-1.42.ebuild
deleted file mode 100644
index 358c4e36cde3..000000000000
--- a/sys-apps/sg3_utils/sg3_utils-1.42.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch multilib
-
-DESCRIPTION="Apps for querying the sg SCSI interface"
-HOMEPAGE="http://sg.danny.cz/sg/"
-SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="static-libs"
-
-DEPEND="sys-devel/libtool"
-RDEPEND=""
-PDEPEND=">=sys-apps/rescan-scsi-bus-1.24"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.26-stdint.patch #580236
-	epatch "${FILESDIR}"/${PN}-1.42-sysmacros.patch #580236
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	dodoc COVERAGE doc/README examples/*.txt
-	newdoc scripts/README README.scripts
-
-	# Better fix for bug 231089; some packages look for sgutils2
-	local path lib
-	path="/usr/$(get_libdir)"
-	for lib in "${ED}"${path}/libsgutils2.*; do
-		lib=${lib##*/}
-		dosym "${lib}" "${path}/${lib/libsgutils2/libsgutils}"
-	done
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sys-apps/tomoyo-tools/Manifest b/sys-apps/tomoyo-tools/Manifest
index ce11ba762043..97a2ef749a3b 100644
--- a/sys-apps/tomoyo-tools/Manifest
+++ b/sys-apps/tomoyo-tools/Manifest
@@ -1,4 +1,4 @@
 AUX tomoyo-tools-2.5.0_p20130214-warnings.patch 814 BLAKE2B 10a9966f726a47058388773500bc06bc6cebbdcf90eaaca5ecf8b2c1159618843645e55663892a5897c6741794b49cacf823a1fcee5e0e67e9a5c7e27ec3b892 SHA512 947caa5ce7f2c80e7e0b40042b09568c4fed731b530cf70c1fa24fa0f1a382dd41443f3db82a6aa6444c0ebcd25fd7de657c0f1990d69579e4645f3efa561e10
 DIST tomoyo-tools-2.5.0-20130214.tar.gz 210892 BLAKE2B fc9435c5b4c97a58d6e3b00cfa5b82e08732c0f6804a819e99872fbcf64e3e831f33766c23e0ab7d8767e0c806d8e2f7c18280ebedb198684c386e8c7c8bb637 SHA512 1ba6f6b3a3d4e644e6ee742beb64b09c6d527f130b1fe6d09a2e19760ced26f540ac8cc1e6f83fddacc3ef8844c3c23425191e4e0098c8b72b5ba3086adc9dc4
-EBUILD tomoyo-tools-2.5.0_p20130214.ebuild 1419 BLAKE2B 204adcc2d145149ddddf1fb09a500db270040224ae42f2157ff4063649e46efa5075d9497970cff2310c3b285f53579b18f8eea1fc38a59a5f5c5834f8756b3c SHA512 9136926024ad7823bbe5162f5849fcf3de98882ae62caed20b0448ea31d0e3e3bed8d12efa3116691eb58ac880351d9b5866fefff2d0df78ee73cc27a9ba0460
+EBUILD tomoyo-tools-2.5.0_p20130214-r1.ebuild 1421 BLAKE2B f35b37191eeaff92ab865a647f44e49167bd8121502064b2eff8817f3a29efaf8048b1ae46d47f878739593935f09f8e3cb8bc8d469e6e10c19bbdcdf4985f91 SHA512 cf0a6282f88b3a15689feb231555e417dcaa0e0e199ee91c4992f5ada4b12a9646562779bf20b5b5ca95e5d0b3f665c5d6d8d52fe7e475bce12cead9b75a3c12
 MISC metadata.xml 295 BLAKE2B 457d2e30395637e99931ce1dcf07a60d3c255b8e56ae338f0aae4489d6314ab4d147af16fb7c5976fbc3329625f0cd82d281918c6dc7f05db71b3b19ae5539ea SHA512 bcad45a60a3abfcb3054f0c82a733ccf5e0562f796cdafe414d2fb6e95301371591b1032404d83365d4a39a60bb1f3b2dd81d6a85592f72cced041cf36393ff1
diff --git a/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20130214.ebuild b/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20130214-r1.ebuild
index fe6c6041421c..e8e373515d05 100644
--- a/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20130214.ebuild
+++ b/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20130214-r1.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-COMMON_DEPEND="sys-libs/ncurses"
+COMMON_DEPEND="sys-libs/ncurses:="
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig"
 RDEPEND="${COMMON_DEPEND}
diff --git a/sys-apps/ucspi-ssl/Manifest b/sys-apps/ucspi-ssl/Manifest
index e7c8ea9961b5..7e38bbaaf932 100644
--- a/sys-apps/ucspi-ssl/Manifest
+++ b/sys-apps/ucspi-ssl/Manifest
@@ -1,4 +1,4 @@
 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.ebuild 1544 BLAKE2B 94b9b13e12a47bf4e87304348d7244f0e3f089b05ff2529c0182cee6a840b44f6c89398654f047dc17d6b500c29b0857c42f5cc849bd7ff3d0048a4a5b75bc60 SHA512 8da7d9309284d294dcf7aa84a9ed88403a4a430a05d3440d16ed4357df276b58b44f5d713a34c22adfe308ca34133adb1a5ef744f43f08b0c6187dbfe11d1092
+EBUILD ucspi-ssl-0.99e-r1.ebuild 1547 BLAKE2B b0d1f523aafe6c1f3a9c8ad659c51398143371d994f0ae9dcad61cf957b1b7b1d053b2295b2ef663eef90948a2d99159f27f1c02d0c07e6f0a26e9d34bdc9a74 SHA512 6e3ec443d1bf876c5b009971c1a16c8393e21da4d6ae7687ed2404df1a4c516c4bb2c01140597d689e866d293c5b59a276d1c0d8f4cfc4184c245f23cc2e5e69
 MISC metadata.xml 550 BLAKE2B da79281578d7c1fcb0646eb789b7b12e431ae96f645e9fbd944b1c1089a9321c65a66570a0c9a32ff6502a06794422bcb1129a3edba5016ca3d7f14821058a05 SHA512 e4f99e1cb7f634dfe7252a62fca125bcdc1f7f1e868c8b9786bd4e4d7b857fb983f2567a2022fea697bb4694911807fc0099d0641cb3025558f7bf22c235d2d6
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e-r1.ebuild
index d6906bf0ff12..a40eeae5407b 100644
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
+++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e-r1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86"
 IUSE="bindist perl"
 
 DEPEND="
-	dev-libs/openssl:0=[bindist=]
+	dev-libs/openssl:0=[bindist(-)=]
 	perl? ( dev-lang/perl:= )"
 RDEPEND="${DEPEND}
 	sys-apps/ucspi-tcp"