gentoo resync : 29.06.2020

12 files changed, 4 insertions, 278 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index d4cee25013ef..2172decbfc67 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/fquery/Manifest b/app-portage/fquery/Manifest
index 3b428e41b3c8..74283d4a8d13 100644
--- a/app-portage/fquery/Manifest
+++ b/app-portage/fquery/Manifest
@@ -1,5 +1,3 @@
-DIST fquery-0.2.2.tar.gz 14489 BLAKE2B 091c7893b835c41f071bfbd1d516b7e92aee57c67ddc3a31062e346a51002d1e235d4b35278a0d5e087c69ba1482210110a08dc7f020390a5b94304eff4aafdc SHA512 d8560a043a3e9d489232427c5911b650cca932cda1c2185c881834c8fd54d316bc650bf4d187da53cd9785adf17381e1cb7cddaf21e73d89f7854cbb33738587
 DIST fquery-0.2.3.tar.gz 14511 BLAKE2B ccc0162095cf270320c1e7a27ef6f19902ddc591ea04742b9645bbb80e67132d85c3f182d1f7fd536a819e96b64abc734b42728faf46a0f2ab01943f660705ee SHA512 0dc345b189bd18f5f1084ab2aea07390b547b6c663d03fa9cec968e5cef598fe58b6a294845ca12b020c78ff2a01ce7e5da0bb06a513c53b8b5aa357b071fb88
-EBUILD fquery-0.2.2.ebuild 589 BLAKE2B d267ee6f8d5086fac0b66c9498d674a12991a5872a6c9f80e56f72516b7638e710f31cc86bc3c680c52a76e9adc8d4da4018bed6bfb3ad681e537a9b62c710c0 SHA512 7fa67c7f57b30b750729cc8c01d207e4e54a0a622acac15b012d156e82b047f8fbc94221b595b899262545c55909cb1ced918bb0cf50fa85eabc210f85219905
 EBUILD fquery-0.2.3.ebuild 589 BLAKE2B d267ee6f8d5086fac0b66c9498d674a12991a5872a6c9f80e56f72516b7638e710f31cc86bc3c680c52a76e9adc8d4da4018bed6bfb3ad681e537a9b62c710c0 SHA512 7fa67c7f57b30b750729cc8c01d207e4e54a0a622acac15b012d156e82b047f8fbc94221b595b899262545c55909cb1ced918bb0cf50fa85eabc210f85219905
 MISC metadata.xml 290 BLAKE2B c5f2085bf717e6abb78ef95ec2221398667bd38a5bb4915ea6b89b17bb846f9b6ed47089c47b1f2c6baeab6147f8cacac9b4e913a20ac5d909432e6525863326 SHA512 89b8856e1eb7618964811ce381d36e758b17b7d3c9d364a1d715d31b4873599304c6f1883abf1f401841c760f7f7d6fa117bb1e0111702998ac79b6f08744874
diff --git a/app-portage/fquery/fquery-0.2.2.ebuild b/app-portage/fquery/fquery-0.2.2.ebuild
deleted file mode 100644
index ddd516e3ee51..000000000000
--- a/app-portage/fquery/fquery-0.2.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="Installed package query tool for Gentoo Linux"
-HOMEPAGE="http://hackage.haskell.org/package/fquery"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/hashtables:=
-	dev-haskell/parsec:=
-	dev-haskell/regex-compat:=
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/app-portage/hackport/Manifest b/app-portage/hackport/Manifest
index e047af0b14b6..6881c1c992a9 100644
--- a/app-portage/hackport/Manifest
+++ b/app-portage/hackport/Manifest
@@ -1,11 +1,7 @@
 AUX hackport-0.6.3-missing-ffi.patch 911 BLAKE2B 625631a2d2179f0568fa2d6f697cc591d88ba358e334a7cf574f10568b394acc28d8bc1b7a0ab13c6ab6d2fccdda56694fdc558387f03de13feda7192703c836 SHA512 f51b403d8781a064ba3c7ae00dec8f4d65e98d59b521586f8c2ce7060bfe49df94fcc00de0d41f39df38c92db2c520d59b65884fb09e96e4de9f9c286d16aa37
 AUX hackport-0.6.3-missing-test-deps.patch 2191 BLAKE2B 16ea252c7588cb8e64fc25e489a30cff629328f1e75068c1bea4a619c71dd95802a45cfcf28750b0348164848ed018dc8d4b73d3ee9168f5fafa69f3a78db6f3 SHA512 a73c0c80dd7081ead18d64664fbfe8b41483f60de6e1df9f3403c3334f9a7af9a405b78fcc7539cf788bf2faf47649585751bff24513a88c26bbc298a280b275
 AUX hackport-0.6.3-old-filepath.patch 1305 BLAKE2B de9aa9413b6611c7c1729420cf41e123cbef72fb222fd49d91845f5c2cd6b080fecb3492799d2a382ceba9b615b617aea42d600876753b8d89885aec519db980 SHA512 77715036e58be9eaa2e0e3e28b34c85d7742a3af9d129445ee0dce6d3f12fc94b38779ee2446c5547d554f2a43de5b2241bcb056bd3939ad2e48770ad310a317
-DIST hackport-0.5.6.tar.gz 1639896 BLAKE2B 2c5892b3206b4cbb10f8dcbce1d043446b7b804ae0b5d1e59c49c733c80194e79c9091cfc933cbc7e7a592c0747ee034d56969d4261ad0a6a585259d5e8b4f76 SHA512 5dc20f11392757224a6cf79d525792e14aba64ffb44c9dd9b4f0df4acd9c00127d85f2b1f23cf2063f80895dbcc90ccc745e8f9aba3ef82f7ae8364db155fe4f
-DIST hackport-0.6.2.tar.gz 1625948 BLAKE2B 9dbb7695d3ca806cfef342697717fa232be2156bcb76c87413907460a9cea2f8cdd517dce453ae7846a00df53ab46058c8f42bd36bc33580cb32452b82c77816 SHA512 99207c4903ee5f3fdcc648edcc3a39ed06f0629a1d5bda577fc2c443c544bfd746154bc5e9de044810c148b1a38028ec0fdf908513b4252c05bb6c9c6eb9aa92
 DIST hackport-0.6.3.tar.gz 1986620 BLAKE2B 6878b3f378b1c5303047c4e6ea27edd587527bc0f303dae8947f0e2a066452b5c4cf3a13594499c3b367ff515114f43c2fa7dece935a704f0f6855fc23f14100 SHA512 ef2f2125c89352207f82e02668bfd84c9e38d5ed3f8643d19d4f270cf7440169c7e6d24513f90e7d616900a06a429e54cf01a42363ff463d536fa37700b7d1cc
-EBUILD hackport-0.5.6.ebuild 1265 BLAKE2B 14c0e4692bdfa62cb118639e681886b537354b8f02132baa69e7098ec50e03e09d8f1da81a7ce5e1255e2423907e9af6fbb1e1c08250e256ea7c1a0bb1021140 SHA512 e7367caa9ee201016caa31e56aad82066a1e34989266594c60d42dfc44d45121dcc8c79304ecc71348e4d1d6b569666091908b368fd9f0b591b2b6a1b97cd6a5
-EBUILD hackport-0.6.2.ebuild 1263 BLAKE2B 4e1bda2c18c368209c20f6df94c664efeaf0fd5fbcd0e7e02da7d8fe0048963e7714bb06e5960fecd4dd1555449a44aa8ee7ca2497973b10c45fd1b0796dca5d SHA512 45a93a427efee5fecde630f9fa35e02267b58300f17498645d8bc11de6314421c10aa597009482bd97492b194988cab5c8c888aa26f218410a704c4b5331e681
 EBUILD hackport-0.6.3.ebuild 1420 BLAKE2B deab9182864e89057f0a0a646eb0badecb723e166c988d860a37fd3acb57d7bae4a8a18ae932c3008ad4c31b3d6ff1599016cc3119794fb9ea524e6829dc433c SHA512 349ef2d5b76c3e2150bf6d84849d014ef3762ca717c363851afaa9020c9d8ea7b7617a81851ee2bb6d3e2a8538f61e838ab6dbae805183652046e9bde29872e9
 EBUILD hackport-9999.ebuild 1387 BLAKE2B f216639e69d90b1559cd6cfab740b70876e3bf987cd336d1928a6ec0237cff4e9a051342e94d597eb1293be23bc0865a9be3502d3c155d390c5c6a317d7260c8 SHA512 e97c2b38bffb404301a528e4da160c0b6456a3485e11cc4e921577026be978ab30488fbbe78c1b37e6aeee46cd5c88aab2719b3ea1caf0d8ecee2c66790b5fc0
 MISC metadata.xml 497 BLAKE2B 513f311e8507da5bc7ab496ee848d1d50459839bd7df3b318583807d4d2ab056faf8284fe4417a5a81eea35c0b51ddc18b21b77c2569143d48eecc57a66e97ad SHA512 8f4884fa20eb6a46b2007e99a6787f51a7d8f6a8cbb18b1c7f12541914f6d6959274ace8f9576529e5ab6a372d3904f54d11470e9f5d81f6ee066628e1fc2de3
diff --git a/app-portage/hackport/hackport-0.5.6.ebuild b/app-portage/hackport/hackport-0.5.6.ebuild
deleted file mode 100644
index feeb100454d4..000000000000
--- a/app-portage/hackport/hackport-0.5.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5.9999
-
-CABAL_FEATURES="test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Hackage and Portage integration tool"
-HOMEPAGE="http://hackage.haskell.org/package/hackport"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # tests are broken: need path to ebuild tree
-
-RDEPEND="
-	app-portage/repoman
-	dev-haskell/async:=
-	dev-haskell/base16-bytestring:=
-	dev-haskell/base64-bytestring:=
-	dev-haskell/cryptohash:=
-	dev-haskell/ed25519:=
-	dev-haskell/extensible-exceptions:=
-	dev-haskell/hashable:=
-	>=dev-haskell/http-4000.0.3:=
-	dev-haskell/missingh:=
-	dev-haskell/mtl:=
-	>=dev-haskell/network-2.6:=
-	>=dev-haskell/network-uri-2.6:=
-	dev-haskell/old-locale:=
-	dev-haskell/old-time:=
-	dev-haskell/parsec:=
-	dev-haskell/random:=
-	dev-haskell/regex-compat:=
-	dev-haskell/split:=
-	dev-haskell/stm:=
-	>=dev-haskell/tar-0.5:=
-	>=dev-haskell/xml-1.3.7:=
-	dev-haskell/zlib:=
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hunit )
-"
-src_install() {
-	haskell-cabal_src_install
-	doman man/hackport.1
-}
diff --git a/app-portage/hackport/hackport-0.6.2.ebuild b/app-portage/hackport/hackport-0.6.2.ebuild
deleted file mode 100644
index ec10c7ce40f1..000000000000
--- a/app-portage/hackport/hackport-0.6.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Hackage and Portage integration tool"
-HOMEPAGE="http://hackage.haskell.org/package/hackport"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # tests are broken: need path to ebuild tree
-
-RDEPEND="
-	app-portage/repoman
-	dev-haskell/async:=
-	dev-haskell/base16-bytestring:=
-	dev-haskell/base64-bytestring:=
-	dev-haskell/cryptohash:=
-	dev-haskell/ed25519:=
-	dev-haskell/extensible-exceptions:=
-	dev-haskell/hashable:=
-	>=dev-haskell/http-4000.0.3:=
-	dev-haskell/missingh:=
-	dev-haskell/mtl:=
-	>=dev-haskell/network-2.6:=
-	>=dev-haskell/network-uri-2.6:=
-	dev-haskell/old-locale:=
-	dev-haskell/old-time:=
-	dev-haskell/parsec:=
-	dev-haskell/random:=
-	dev-haskell/regex-compat:=
-	dev-haskell/split:=
-	dev-haskell/stm:=
-	>=dev-haskell/tar-0.5:=
-	>=dev-haskell/xml-1.3.7:=
-	dev-haskell/zlib:=
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/hunit )
-"
-src_install() {
-	haskell-cabal_src_install
-	doman man/hackport.1
-}
diff --git a/app-portage/porticron/Manifest b/app-portage/porticron/Manifest
index 165bf67ce128..0995c2dbfc3f 100644
--- a/app-portage/porticron/Manifest
+++ b/app-portage/porticron/Manifest
@@ -1,3 +1,3 @@
 DIST porticron-0.7.1.tar.gz 6530 BLAKE2B 6eec2bcab3e3d7661783c4fcf8f5521aac5700e4c642112d074187af372ea51137a7bfc06cd14c86f55e6b1414b2af766454a829c815294606a8bd18141e7c07 SHA512 ba2f365011e1ad2f7cb67d655839fa425791ab95309753719b4a4206db735f141d473d24bbb68da25a88db54919d033f53efaf497c26de71f3edb4a39dcc957c
-EBUILD porticron-0.7.1.ebuild 575 BLAKE2B 4c2e18dc7536f663d4ca95413e577de85042619aef1dacde59d1ca2fa510954e2ec89fdfe2779865374817998d958b9785da71e8717fdf4ba384ef6eba02e69e SHA512 619b91e8aed8b818ebf63eb1c5cf411a9064083b02bce5128241ce42d720dcc3d5809c80c197b77a533e9c5429efb4c8a69c8136a67e555528b3a89802e320d8
+EBUILD porticron-0.7.1.ebuild 573 BLAKE2B 608ef8b6a2ea94b6179fd330ed5c08e93b6fa059aa97d00a8ad9a6feb0beb11f4b2142b0b015330e291aacc95fcf47c47bbd4204083495822e660892f8b9087e SHA512 2ddf7297c7e438d2ac84f87d7c2dec43db94128fdb7aff4f2f646c488c2e106a0c29d0ce9c600f492ee649ddad070bae7f3b2057a9f80d7d208c2c5586f7c157
 MISC metadata.xml 253 BLAKE2B ad8e5cfca6065d748c657aa2b9d8aef6bb41bde317916762fb57b6c64ee9a08d3e085dfcd260c49df33ff3fe4dda7d0e72cfd0e99d0513a04ebdd3f9639d5346 SHA512 912bcda064b63efa5586eadc7702c84081b57478a2be9a31293c94e86b8d0e7f98344c8426a99972885981ff25efd6b705c3a3a3ab4b931f5cc56237f021aaaa
diff --git a/app-portage/porticron/porticron-0.7.1.ebuild b/app-portage/porticron/porticron-0.7.1.ebuild
index 74ceba2df79e..0dc432df2d72 100644
--- a/app-portage/porticron/porticron-0.7.1.ebuild
+++ b/app-portage/porticron/porticron-0.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/gentoo/porticron/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
index d5604ef3b141..5600b6323710 100644
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@@ -1,10 +1,6 @@
-DIST repoman-2.3.16.tar.bz2 86739 BLAKE2B dc3e3b5e72df751cfacc17e6f5c847160438a4d6f5d86b4dd17ab8a3a69cd0502f2965934c456ea7538f228c40364535e861c489ab2a09a0df14183b111e9a38 SHA512 d0e8bee1e3bd6dd8aecb1278fc7877768552612c4638488b61a9b8856ad9cd7333c7d52f0c334925d90170a1d8af20e9ead6533edbc10cae02baec629dece121
-DIST repoman-2.3.20.tar.bz2 87313 BLAKE2B cc0ff9b651e01b12202b32d48979f42ffde6e8a7c72095a3f75228a54892bc11c521f015738443133bec223f9ca0faf5687388680ddfd19e07514f873094b0f9 SHA512 edb5564de920156fd89b4df136d86b73401d4d5cf591abc2fbbf97f0ebb7bb43ed17d076560a76a1f3269d19a64c7c52d48540134a9fb86d9fa952d1702e01e2
-DIST repoman-2.3.21.tar.bz2 87094 BLAKE2B feb972d9585440d2a5ed6800146a1d7027fde4c5e7a70904905837261776b9c09bc9bfc6c4da8248a1420635ad8443b31d7716990e6425db3403c8bb74ddca5d SHA512 537c6f6152134df4cd99321b812a1e02608ef0621e674214789dc79ca6540ff1ddab05d100e2bbc2fd0d85664cd92549fb39f8da3cf6850c1a190a88a95814e5
 DIST repoman-2.3.22.tar.bz2 87026 BLAKE2B 52262339410b95d47df19e225493075d6e9f763e85b7fa9c982c47ed88b652620d3ab083781c9e4747d8e3659795de7a05163b00339065ce5d84f8babfadc1dd SHA512 8be75f58127452ed162b0f5feac96110b82f7a06fa904c65f6084dff4c542602870cde7fde5cf4108b04142d433c1167dc5bccdf839064dbce2278ea789f77ae
-EBUILD repoman-2.3.16.ebuild 1938 BLAKE2B d9d1b277e1d47c55860fa63cc64679506a9804ff377901040b9544193b822837e9badcf226e43e14d347fe3affdb37a07725d60e770f382aaa72062795857046 SHA512 24d352d5e56a61297459450f976cbb585a6d6cbdf6b995a85443596d7f92b457d40f2c3ba162c1bdd728306668794cbd81374ced5d949fea2713fbc6a4c2ff23
-EBUILD repoman-2.3.20.ebuild 1968 BLAKE2B 73858d208a8664ade18846502077c7d612b00cd17cd4d075ef0fdba27933f1654a039b1ffb7a3812de8be6b00623e52da004bbcf6c4e91fca2899a421ded3c76 SHA512 1d1ab128783bc184c40565e27bdf9d878fdf9e8a8918c9a823b1cde4fae8b070ef39e65430de2acd7857301302c415fc7f9eaa8382667c994f833c090efa6a48
-EBUILD repoman-2.3.21.ebuild 1977 BLAKE2B 41da484879b21c481600ce57bcfbc1c64cd0561d0d67803651596d89a447c6a4b0a2053f652b0e8e3074b4c22356096d54bd5e0c9b00aadcd6e66f6d3909109f SHA512 68e092e1446425de2d01488a8257888d1487547653bce8a4a13b7ff99a01033d1307a27df2d8e55e520661a18db1993a48e7bae0db24eb4ac4f92123cb5720cb
+DIST repoman-2.3.23.tar.bz2 87108 BLAKE2B c1190433bd8aedf59e1ddf192dd14cca13e3bdae7367decd6bf64a79021f54a63f21ec49d5737b90c46be3894f4d3ff11bf5bd2868c9ebf65e44b4eb3bb4eee0 SHA512 9d01fadc5820501a9bfb9c1b6d9634ecbc14aacdc448bb440d1e37d47f7e4bcdea8269f8ba90e3783d84f31121870a9d7b165f58b78f0d0f0f4e822a25687d1b
 EBUILD repoman-2.3.22.ebuild 1968 BLAKE2B 73858d208a8664ade18846502077c7d612b00cd17cd4d075ef0fdba27933f1654a039b1ffb7a3812de8be6b00623e52da004bbcf6c4e91fca2899a421ded3c76 SHA512 1d1ab128783bc184c40565e27bdf9d878fdf9e8a8918c9a823b1cde4fae8b070ef39e65430de2acd7857301302c415fc7f9eaa8382667c994f833c090efa6a48
+EBUILD repoman-2.3.23.ebuild 1968 BLAKE2B 73858d208a8664ade18846502077c7d612b00cd17cd4d075ef0fdba27933f1654a039b1ffb7a3812de8be6b00623e52da004bbcf6c4e91fca2899a421ded3c76 SHA512 1d1ab128783bc184c40565e27bdf9d878fdf9e8a8918c9a823b1cde4fae8b070ef39e65430de2acd7857301302c415fc7f9eaa8382667c994f833c090efa6a48
 EBUILD repoman-9999.ebuild 1974 BLAKE2B 006e49015b7b252a4105f4f5f4c2bdbe2e828a44004c93a2a263be178793d245346b2eabf9688ac8c69f33066f393550aeec18fd5b1a90c52f0dac533743a503 SHA512 b568772c42fc7cd3ba1ea6daae580c3ca3c0fd5aebea530d3c47e3762f66deae9f8b4ac09a22412ec3dfb6372cc112e0851ac3d69da4649abd9d0fbc73bd5190
 MISC metadata.xml 472 BLAKE2B 7433ca0ddf5b8554caba0893b28e5681419f18e7f8d28c1c202c98b9a198ea4222958dd537247e29e2f3300ee051860315b15ca7fbd92ba2c4fe614a43171942 SHA512 53566a405056159de7412ea3b447ce6a7b73833fe927a04b5576bc77b2f4b181de8413956ff2b0b1836025352566b0a44252c2ebaf313cfea4020ea5490f3ab0
diff --git a/app-portage/repoman/repoman-2.3.16.ebuild b/app-portage/repoman/repoman-2.3.16.ebuild
deleted file mode 100644
index d142e1a16cfb..000000000000
--- a/app-portage/repoman/repoman-2.3.16.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
-	S="${WORKDIR}/${P}/repoman"
-else
-	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=sys-apps/portage-2.3.43[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-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" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-pkg_postinst() {
-	if [[ -z {REPLACING_VERSIONS} ]]; then
-		elog ""
-		elog "This release of repoman is from the new portage/repoman split"
-		elog "release code base."
-		elog "This new repoman code base is still being developed.  So its API's"
-		elog "are not to be considered stable and are subject to change."
-		elog "The code released has been tested and considered ready for use."
-		elog "This however does not guarantee it to be completely bug free."
-		elog "Please report any bugs you may encounter."
-		elog ""
-	fi
-}
diff --git a/app-portage/repoman/repoman-2.3.21.ebuild b/app-portage/repoman/repoman-2.3.21.ebuild
deleted file mode 100644
index 43a2b3082a48..000000000000
--- a/app-portage/repoman/repoman-2.3.21.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
-	S="${WORKDIR}/${P}/repoman"
-else
-	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=sys-apps/portage-2.3.80[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-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" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-pkg_postinst() {
-	if [[ -z {REPLACING_VERSIONS} ]]; then
-		elog ""
-		elog "This release of repoman is from the new portage/repoman split"
-		elog "release code base."
-		elog "This new repoman code base is still being developed.  So its API's"
-		elog "are not to be considered stable and are subject to change."
-		elog "The code released has been tested and considered ready for use."
-		elog "This however does not guarantee it to be completely bug free."
-		elog "Please report any bugs you may encounter."
-		elog ""
-	fi
-}
diff --git a/app-portage/repoman/repoman-2.3.20.ebuild b/app-portage/repoman/repoman-2.3.23.ebuild
index 9dfe116e98f2..9dfe116e98f2 100644
--- a/app-portage/repoman/repoman-2.3.20.ebuild
+++ b/app-portage/repoman/repoman-2.3.23.ebuild