gentoo resync : 15.06.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
commit: d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree: 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /dev-perl
parent: e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)
284 files changed, 1610 insertions, 1710 deletions
diff --git a/dev-perl/Bio-Graphics/Bio-Graphics-2.400.0.ebuild b/dev-perl/Bio-Graphics/Bio-Graphics-2.400.0-r1.ebuild
index 49bd6518bd84..3b523ece82d4 100644
--- a/dev-perl/Bio-Graphics/Bio-Graphics-2.400.0.ebuild
+++ b/dev-perl/Bio-Graphics/Bio-Graphics-2.400.0-r1.ebuild
@@ -15,7 +15,7 @@ IUSE=""
 
 RDEPEND="
 	dev-perl/CGI
-	>=dev-perl/GD-2.300.0[jpeg]
+	>=dev-perl/GD-2.300.0[jpeg(+)]
 	>=dev-perl/Statistics-Descriptive-2.600.0
 	<=sci-biology/bioperl-1.6.924
 	>=sci-biology/bioperl-1.5.9.1
diff --git a/dev-perl/Bio-Graphics/Manifest b/dev-perl/Bio-Graphics/Manifest
index 4d26b1d8c018..a09de076d5d5 100644
--- a/dev-perl/Bio-Graphics/Manifest
+++ b/dev-perl/Bio-Graphics/Manifest
@@ -1,3 +1,3 @@
 DIST Bio-Graphics-2.40.tar.gz 1105973 BLAKE2B 9b2d5d8406155ba65b5f51fe5f0d832383640985bde125e31784b102789bfc288565714f216ff9bcec0a7d25ff9874c974d6037b21f51d11f48a992807f7edf5 SHA512 a575ced7b5e59ad0f2b81ecc44f441760003b80bbe8f4f2593d4f2258d967a537ffbe35b031c8fda94c0c2e64a0687739fc789a05edfc2a0b38e336f037f21df
-EBUILD Bio-Graphics-2.400.0.ebuild 509 BLAKE2B 2308c320cb27cabeb771a499d2d91d93c9155a7cc67fe9332e3ced475251aa85bab12cf88410bc5ceda3e11b72642dbaa0684226052277e5466c5c02f3528b6a SHA512 019cc1eac4f92ec979e62eae4bd0f9d488f695dab4bc52f7ab9451cfd23d70ed60be139a18b3caa52caa629012135b22a4e6d8e064d34d38199becf162b4e0f6
+EBUILD Bio-Graphics-2.400.0-r1.ebuild 512 BLAKE2B 00e78b7bd3fdccd422904b1313f3b41457d1da0941553aead0eaa00543be81b6dc0a17e0faacd7815804e675922ebd570733550e0fd865b4ba776570ce19deb1 SHA512 4abbf322af4467cded0c28b3ea51f66b77f797541669bc5c8dd019f9a831d6a9efadcce9fb33ba6acccf64d8416ab1dc48f25cae624e7dd18d9ef77f31fbb440
 MISC metadata.xml 8865 BLAKE2B 9f55cb0cba88aca2985dbf955afa1b41afd230e88aaae85faaa7b8b0b22dfc9d0b532bffcfdfa8b7d41b376b85d2975d965451fadf4ff684f7d90a12fcded207 SHA512 0a1927fa1a3edc3e3994c3af61dcccda7a5f25c755d95a1a7318f7e5611c834bec57a3001202f14309f9ef70892bc4bcf6f310a16a8ad19a04a0281fc3b49ae2
diff --git a/dev-perl/Bio-SamTools/Bio-SamTools-1.430.0-r2.ebuild b/dev-perl/Bio-SamTools/Bio-SamTools-1.430.0-r2.ebuild
index ed1ab08f8255..b06de25d3541 100644
--- a/dev-perl/Bio-SamTools/Bio-SamTools-1.430.0-r2.ebuild
+++ b/dev-perl/Bio-SamTools/Bio-SamTools-1.430.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,6 @@ DESCRIPTION="Read SAM/BAM database files"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-LICENSE="|| ( Apache-2.0 Artistic-2 GPL-1+ )"
 
 RDEPEND="
 	>=sci-biology/bioperl-1.6.9
diff --git a/dev-perl/Bio-SamTools/Manifest b/dev-perl/Bio-SamTools/Manifest
index 20ab8026fb3d..810a2c95e3a4 100644
--- a/dev-perl/Bio-SamTools/Manifest
+++ b/dev-perl/Bio-SamTools/Manifest
@@ -1,4 +1,4 @@
 AUX Bio-SamTools-1.430.0-legacy-r1.patch 2934 BLAKE2B 17e310aeac8d2548e168c125d498b623fb3ea6ac59da52c9dd7918c4a42a5fe6c3a11488fe67d833f265151330f339e6700bb323e5e6f355a445e58b96546246 SHA512 ac995f9a55e7cac70238f7945f56f91bbbafe207dc55b05115d519737c9a626fa57ccb265c78f028c1a03297bf5916dc60b7d51fe9988b30d27021b03717c750
 DIST Bio-SamTools-1.43.tar.gz 340833 BLAKE2B 2b488667b86ef1bedb7cf74dfdcb3abc0302d9f309c1fc3077682bb400c8307f3b7d8fb1a9015a26f9a17f9e9955845d160512aa3273c368b720fe51b4392458 SHA512 cd5bc6213c093f5105399c95278803afcc537bb3d191686cda0193b82fda2580749bf7533791899939a78963fcc0d6b36eabe9c309c9c6816a9849e3c892c41b
-EBUILD Bio-SamTools-1.430.0-r2.ebuild 920 BLAKE2B 50b8fa8031cab3b4fa3e6e5b83e5901e12ed6240cc6ca95e3a63ee517721f67554b6d0673a3a52bc0c357c2db3186585f14a79ba85b570c99d6859785ee83dff SHA512 b9e602fa134518d301b43a045d92bd6d260bcdb25e1dfd20cdbc0a02b78fc7809f1408789795375a2f1f025107aec02c4d58edb4d4c44d69e094b5d34fffe1af
+EBUILD Bio-SamTools-1.430.0-r2.ebuild 874 BLAKE2B 80ca29b4e33e1e80c4fada1400c38fc0de270f095bf7817ead733205c5647a55d63c1d6ae8025d3d958ededa482b9a6c090d6deffb878e6bd7c8f7132156632a SHA512 f2fc73985d63806f24f97ec46f8a4d58e19ccfe4611418d761bdbb6307b02c097938ee6cd608b4ba4fd544dc0c6b906a955d9a251139617ad5495070e0b35e1d
 MISC metadata.xml 1642 BLAKE2B 8e00b2305f870d0007a22f366376d77d359df2ab54d279da2c7b791da320f72e7d110956251c3adcddaf8b4b318110b5ff4b6cde4a6cd359cbb403f666c7de93 SHA512 d518abd6c3f99c370ce401f7fce792b2d55d29fc2baccb54f8a32f2e2c385acf3dd7f31f3c3fc0764fb3b754e4bd3378eef0002a0e4d48b2ae2a116c85379c50
diff --git a/dev-perl/Business-ISBN/Business-ISBN-3.5.0.ebuild b/dev-perl/Business-ISBN/Business-ISBN-3.5.0.ebuild
deleted file mode 100644
index 360f6fa32f37..000000000000
--- a/dev-perl/Business-ISBN/Business-ISBN-3.5.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=BDFOY
-DIST_VERSION=3.005
-DIST_EXAMPLES=("examples/*")
-inherit perl-module
-
-DESCRIPTION="Work with ISBN as objects"
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE="test barcode"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	barcode? (
-		dev-perl/GD-Barcode
-		dev-perl/GD[png]
-	)
-	>=dev-perl/Business-ISBN-Data-20191107.0.0
-"
-BDEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		>=virtual/perl-Test-Simple-0.950.0
-	)
-"
-PERL_RM_FILES=(
-	"t/pod.t"
-	"t/pod_coverage.t"
-)
-src_prepare() {
-	sed -i -e '/^pod\.t/d;/^pod_coverage\.t/d' t/test_manifest || die "Can't fix test_manifest"
-	perl-module_src_prepare
-}
diff --git a/dev-perl/Business-ISBN/Business-ISBN-3.6.0.ebuild b/dev-perl/Business-ISBN/Business-ISBN-3.6.0-r1.ebuild
index 597ec032b37b..b28425bcadd6 100644
--- a/dev-perl/Business-ISBN/Business-ISBN-3.6.0.ebuild
+++ b/dev-perl/Business-ISBN/Business-ISBN-3.6.0-r1.ebuild
@@ -11,14 +11,14 @@ inherit perl-module
 DESCRIPTION="Work with ISBN as objects"
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="test barcode"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	barcode? (
 		dev-perl/GD-Barcode
-		dev-perl/GD[png]
+		dev-perl/GD[png(+)]
 	)
 	>=dev-perl/Business-ISBN-Data-20191107.0.0
 "
diff --git a/dev-perl/Business-ISBN/Manifest b/dev-perl/Business-ISBN/Manifest
index f882bc9c45ef..b97f50deb579 100644
--- a/dev-perl/Business-ISBN/Manifest
+++ b/dev-perl/Business-ISBN/Manifest
@@ -1,5 +1,3 @@
-DIST Business-ISBN-3.005.tar.gz 361815 BLAKE2B 1c6feb5ca5eaa88b01739ed63af997e39d32cae3efe6c9f0b803b306764e9710c66c01977564058585fa6797ab820801dc24f7cd0b67576787a2ba80f6816006 SHA512 f341a0d24c717032e9e6f179fa800bf7bb4be3e340cbd2f23a480b8f76fa24db58cdcbb41c1ee2fe063408bf6d2f7b0191ee657387723090d3f497582cf61579
 DIST Business-ISBN-3.006.tar.gz 362014 BLAKE2B 4bbebed021c99a0db692d4a296c1942f6d6dd0e8dd96b7180235c2ee99b274d8ddcf10edcdb690c50d674948eebf0c03602d39c9571ddd9d72d5c65bf6eb0323 SHA512 a30344409fedf2833c390fb61654a82620b00bb5647a7e366e6e1667ef68d210ca7884aa228266d0fde75e17e05a4b2cc89d8e2abc2dcaf6a17a7132ed404ee7
-EBUILD Business-ISBN-3.5.0.ebuild 753 BLAKE2B 6a2e0b96b884fef834114e16bf30d86de9c742f97f2dbbc31b379c986fa81e9b2378b1bd4b6a0334026333074ca99c295046a836cad9accea2c1d1ee01b85cf2 SHA512 d7cae7a31da78cd23eb4fa1cf390187e62473e01ec1b9f60c4c4184ac7c642da6fd498a11bb26cb976502423eddda4fd87205bf29a4ad8e1f97b9a15503009f5
-EBUILD Business-ISBN-3.6.0.ebuild 763 BLAKE2B ef3044a62457573b548e6090661173e6f8e62b277f996fc66681022a1d41be87a460e041bbe625aaa772aacf6b60f226ce94ade4d42cd4ed9bb63a8382ced04b SHA512 0f04944fec91448b4e40af9ffb04425475761dfd8220104d290c83f56cb6c485c5a2dd5bde840a74cee1db680742bb00363747e545188c74c855858d42a8ea68
+EBUILD Business-ISBN-3.6.0-r1.ebuild 765 BLAKE2B 9f2031db5e4151304aefb3b793a15bfca33dfa2e34d52f604fa92cfb45434924879b785fa6056f5727d8bde5b4b7e07883d819965efd3e3269acb761afaed9dc SHA512 f80c7db4735c5f712ea4d1aa6ddc6a0dd581eb8fbd9eb909eccc350e9587e39492c2d078fd968741a41ab6954577d5bd04c605b7f1fce40804c57b215ae4fcda
 MISC metadata.xml 631 BLAKE2B 245ad524744ec4f43bce27fb6d58efce3bc872fbd8e4862b7f72603adcf9056b25d29f60bef840642bdfa8a8954622700bd0fc74ccad5bb00d307eb81bfdf799 SHA512 eedb04ebc345fa817b9efe29db6e79060e9f04cd7be3c1886fcfd5d81080b0043750d5cd985bb3cff1f704ddeb1906389226f16198184106b4144e09309552a3
diff --git a/dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.14.0.ebuild b/dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.14.0.ebuild
index 1640ed76f966..cb9d12e06006 100644
--- a/dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.14.0.ebuild
+++ b/dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.14.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Verify requirements in a CPAN::Meta object"
 
 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"
+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="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/CPAN-Meta-Check/Manifest b/dev-perl/CPAN-Meta-Check/Manifest
index 3bbb6677c2b8..fe97283533eb 100644
--- a/dev-perl/CPAN-Meta-Check/Manifest
+++ b/dev-perl/CPAN-Meta-Check/Manifest
@@ -1,3 +1,3 @@
 DIST CPAN-Meta-Check-0.014.tar.gz 13187 BLAKE2B 49e21dd269265f6ce279fe88430d9eb3b7bcd65e932da18eb7b6e762a69c20683279c9413157b8df432c480a8950097ee288013e648e062fe55280088276a48c SHA512 a10af09a7ce771ca3983adea8053d141750fd09849609a28e7f973831fd3a3ece55281841aec93c099154bb59135986da4983bf612ae4e956c45dbb3f2770f5e
-EBUILD CPAN-Meta-Check-0.14.0.ebuild 804 BLAKE2B 7b7cfb62cd067db463430bef42fe2ae01d2f180718b22f81754c89f082f78b8f300aecdb9a32b6ea253d131c94199f7afa90a3eafb4ba9ce7e8b26ee5b3751e3 SHA512 3527647d3276013dbbd93fcf9101cee7904d7001eb7344d497c1f768bad20e52405406f548fe4944bed537d4cc877fb62bfef87702377fbf266ff9e6c26bac75
+EBUILD CPAN-Meta-Check-0.14.0.ebuild 803 BLAKE2B 3428dd12ec685ddba4ecb7936b4a47d8bd3c0403cea778f299de69dd49f095155ef4b8dd5b5af6f1d9d611ccaf5c3bcd0bfb6cc6ab8f3cfa5e3a197653598cd6 SHA512 eb7c88f6ed62a0d48ade6940c6a21c77c0f1aa9e2c523bd6b5b3ab2d4393771b6c4c3b1870c7e7bb65b3806cbe129d3fcaff40dcb87bd6a636e487de041b63a9
 MISC metadata.xml 391 BLAKE2B 5d0a2b94e3a37af2aa336e3f7ae1455eb85d7dd575c91ab8617d950cf6b21a2f77ccad678e3d5630b5902321e23837d8584af1886985c138b4c6101efb30e580 SHA512 bc37f7b063ddb1b27a00462f8273c2b3e6324f06f6d852a64a939e377206fbe36e0b9be1a3778283092a16ad016cccd1af59bdf33dc3c029fea5ba320ca8c8cb
diff --git a/dev-perl/Chart/Chart-2.4.10-r1.ebuild b/dev-perl/Chart/Chart-2.4.10-r2.ebuild
index 75caa8c91992..b6f4cb4ea112 100644
--- a/dev-perl/Chart/Chart-2.4.10-r1.ebuild
+++ b/dev-perl/Chart/Chart-2.4.10-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,6 +19,6 @@ RESTRICT="!test? ( test )"
 RDEPEND=">=dev-perl/GD-2.0.36"
 BDEPEND="${RDEPEND}
 	test? (
-		dev-perl/GD[png,jpeg]
+		dev-perl/GD[png(+),jpeg(+)]
 	)
 "
diff --git a/dev-perl/Chart/Manifest b/dev-perl/Chart/Manifest
index 1a542c6a3249..56df9aa59a2e 100644
--- a/dev-perl/Chart/Manifest
+++ b/dev-perl/Chart/Manifest
@@ -1,3 +1,3 @@
 DIST Chart-2.4.10.tar.gz 1698207 BLAKE2B 3802c5fe0247dc47747b0d6bbbdbe2af5fc772791f7f7b02adc2156759090f43fdac34aa45dec56652ab53aba4198f9232d9afef3faf6fc2a818c3dd8df27106 SHA512 e8327c46e0cbcea0ed8f723b7b369f4b694c0d7050d3fab35371e0717938292b5bacd3e367ed87e272dc258db020c378690405f93d23ba0ed546dc29dd59e37d
-EBUILD Chart-2.4.10-r1.ebuild 515 BLAKE2B e8fa83144cbe8793d42d955219ef41cf419e6a6ddbb8eca121054f026564c08b0470c9d644a5fb59db22295fdd8604d978764d7da9cd9492c3ae4f86672faaac SHA512 3c771cfd8598e2c27f848325d3d3b0cdc7ee7a52834aee2f94f3f04f19e59ddd22c55b1c1826adbddd8bfeb7473f7d7e345703c65ebd08e6423652e6d6a70e28
+EBUILD Chart-2.4.10-r2.ebuild 521 BLAKE2B 0adb999e5033e142ede3a771488400e8199ac6d01950f5a8b0dd9ce8b431dbbf1bd743fb5e83c9cd267e7a842a4cd8aee5113f0568fce4b4fe669715f0bd1c83 SHA512 81394a03d1d07c50c1966fb0e4f8618b7765997b5e68ad31aedf3f649a1e02ccab22c4c7e878af94f857ddb3c295fb659845f71ff12a6157ab517b6a55f0180e
 MISC metadata.xml 1317 BLAKE2B 9867a224db2a023a4fe4d7660782feb78cf5b81f09b5422208f9ca01b86de09fa316367ca05cf6ecfa66c1ecd0e5c174508fa46a1642d8df4d0a772b412d2730 SHA512 c2bdb8598314f6fa8d3a55a665b00c049ab3e2a27588d8a205a907b34512ab249fcfc6e28f54653a3ccc2c4bf853503ab1c4908a7ce0aa9a0134732a3711e8e6
diff --git a/dev-perl/Clone-Choose/Clone-Choose-0.10.0.ebuild b/dev-perl/Clone-Choose/Clone-Choose-0.10.0.ebuild
new file mode 100644
index 000000000000..c83252a04b60
--- /dev/null
+++ b/dev-perl/Clone-Choose/Clone-Choose-0.10.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=HERMES
+DIST_VERSION=0.010
+inherit perl-module
+
+DESCRIPTION="Choose appropriate clone utility"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-perl/Module-Runtime
+	virtual/perl-Storable
+"
+BDEPEND="
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-Test-Simple-0.900.0
+		dev-perl/Test-Without-Module
+		>=dev-perl/Clone-0.100.0
+		dev-perl/Clone-PP
+	)
+"
diff --git a/dev-perl/Clone-Choose/Manifest b/dev-perl/Clone-Choose/Manifest
new file mode 100644
index 000000000000..1a723754884b
--- /dev/null
+++ b/dev-perl/Clone-Choose/Manifest
@@ -0,0 +1,3 @@
+DIST Clone-Choose-0.010.tar.gz 10828 BLAKE2B 0a07211af1f1be7370520eb55f0bb663fa4c02642cbbcc20643137e719eade61e59548119cd79fc1442c85cad07840bbf08eb782a0b2ca433dff4f0bfdd0d327 SHA512 5dbcd1b031ddbdaff81c46c5a48eb51b31bfe451e0777dc88a107d2b104e8708f08a5717a0f82f4d03efb8610e2b42fcb2dc1269e3262ece16b9a503d606face
+EBUILD Clone-Choose-0.10.0.ebuild 519 BLAKE2B fd45126f31396ae0ef3f99a7b0fc37abcd120e2171c7c6063822fa19c258b61850cba2ab862c0338948b944beb873da5c86fcb43dc1039de0baa609535023fd8 SHA512 814417a598a6c35f4ef48fccb98c7622f41a8102a7c5f4c04e0bb4ac55e4dd62edf3826fb70bb9ccce278eddbe66042f2c0351be8afa29f7db676d71e9a08009
+MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/dev-perl/gtk2-spell/metadata.xml b/dev-perl/Clone-Choose/metadata.xml
index b35f1faa6e8c..2b9a936fc0a1 100644
--- a/dev-perl/gtk2-spell/metadata.xml
+++ b/dev-perl/Clone-Choose/metadata.xml
@@ -5,8 +5,4 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
-  <upstream>
-    <remote-id type="cpan">Gtk2-Spell</remote-id>
-    <remote-id type="cpan-module">Gtk2::Spell</remote-id>
-  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/Config-AutoConf/Config-AutoConf-0.319.0.ebuild b/dev-perl/Config-AutoConf/Config-AutoConf-0.319.0.ebuild
index b9f2b5f574b0..9914bdd1bd36 100644
--- a/dev-perl/Config-AutoConf/Config-AutoConf-0.319.0.ebuild
+++ b/dev-perl/Config-AutoConf/Config-AutoConf-0.319.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A module to implement some of AutoConf macros in pure perl"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Config-AutoConf/Manifest b/dev-perl/Config-AutoConf/Manifest
index 0abeeddea986..1ca5eb87be9a 100644
--- a/dev-perl/Config-AutoConf/Manifest
+++ b/dev-perl/Config-AutoConf/Manifest
@@ -1,5 +1,5 @@
 DIST Config-AutoConf-0.315.tar.gz 49738 BLAKE2B e1fe0be1c113a66583d4db40c81c74bd7f1884155c1f0da180546c2c26a2bb4b496ab4f8fce9f5a5cf4e22a15ace8fae8f2bf51e5a4cb662e8a58d5a9e83a808 SHA512 ab52d4d19ede25b1f7030b461b931f5cd5bc5f0af50a584a015b367ff2085b2e58826f079290a22194f50ef063c2ba8b469ced913e4c306f788ef28efa41f2e1
 DIST Config-AutoConf-0.319.tar.gz 52118 BLAKE2B 8c0596a22d7accab0366f33f4f72315356abb61ccc3c0c816651724fc21a091607c48b4bb69b5441771795c432376e0811ecaa799b3b7b38b05d6cbdae80c29c SHA512 156b40e9728f9b02530cb490b31a0d439414ab5c4b43a216f7f649c23f62462a441923dc02d22735fcd44a70a5314fc8e9465047261f0e61a2013c05ff69a3bd
 EBUILD Config-AutoConf-0.315.0.ebuild 676 BLAKE2B 9eb69c1d3712a637d67637c2bd13b2bc55a34d0f691e543553fd68b5a5125a32fbb58864411a85a9f535a8b0327f8a736648b39a47d328df4bc3039a7f0516bd SHA512 b4232d65d0d2c1715f6c704108f3db2e0201cecff3194b01f62d2e682cf65b294a9a10337ea9802677cfb5f7453bc49fb113cb15b1a0bcce63b7e0a77cdfe114
-EBUILD Config-AutoConf-0.319.0.ebuild 720 BLAKE2B ce780300b55c31280bd7bc5351fa0953919454c33b685425efd45e70adce6c54debc73ccf48a8cf35610263017ca3112ed75ef9670a8080733d9f7538da39ff7 SHA512 dc50ea4a8b4e2caa8cd6a293d1072fa38b05ae1c483326e2bff8acdf708490b38321ab6764e5c28af7027bd96d3977fc86b36671cb89cd04aac7888a605de154
+EBUILD Config-AutoConf-0.319.0.ebuild 717 BLAKE2B 125ae7f44812b64dbb440b8095a383b417020433689f1c84affec037b042f86fcfb2597069dacc49463536d3ca1188bde80e2aeeb343a15fc91474caf4bd4a75 SHA512 396e995f9a87d1bfc20fb3b1eeac21f50601d6d7610dd8791a62154992ccdf41ea8e4d92e211fc1585d2242deca15f395b43736e6722f7670a0fdde22399519d
 MISC metadata.xml 402 BLAKE2B 4cdc91bf4199fc7257fd8e1e24844b3a7e5dc6dc365e9f2e1d62c8928427138f43219dae7d87168c6706d59da3218f6da9668937920fef89942e005e6052eb56 SHA512 89053a14b4b092051ebb66bf194123691701f5a4c85cf31a3d0c4b6f063c93f1bf2211bf38f98318fb1dc2bd5705eedc07ef6c37e83683cbdf9114512cb1a25e
diff --git a/dev-perl/DBI-Shell/DBI-Shell-11.970.0.ebuild b/dev-perl/DBI-Shell/DBI-Shell-11.970.0.ebuild
index 23d02c212a56..ba0b2a80862a 100644
--- a/dev-perl/DBI-Shell/DBI-Shell-11.970.0.ebuild
+++ b/dev-perl/DBI-Shell/DBI-Shell-11.970.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Interactive command shell for the DBI"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DBI-Shell/Manifest b/dev-perl/DBI-Shell/Manifest
index 6d690eccd103..ad51ca5e4c68 100644
--- a/dev-perl/DBI-Shell/Manifest
+++ b/dev-perl/DBI-Shell/Manifest
@@ -5,5 +5,5 @@ AUX DBI-Shell-11.950.0-sprintf-warn.patch 732 BLAKE2B 4866aa33b1cc810201ad88ffe3
 DIST DBI-Shell-11.95.tar.gz 51147 BLAKE2B 299d553eccd1c295b4221997d2ee95ebb1f0b865691e78d9864ab6ad39190593e3286551f7484f8e5dd028e126c3e7a9d5c3e3e73fa52ab7cdaaea6318257365 SHA512 a19fa2573dc20cb6844a523653f588da1eca56b4e8138b789cd7aa5c50b255ee4b374eda9baae588b5bdcd42183c9384f1fb8234d11022e02cb7f81dc0bd6c84
 DIST DBI-Shell-11.97.tar.gz 57123 BLAKE2B 0c4d459dda185b6fb2ea292912da4624e1a4ed33aa4487eabf5c6c5be6571c1e8d32b29b703749fe562ebbd60aa389f62d5e3461863c5777490345451bf8cad8 SHA512 74bf7244691b8dee967bae4076b59b912d66ac08f48f8468531d003db6d85d43d836116f8314961602a002b58fc9f6d3bea88076e1d7e2783d430137dec68f4b
 EBUILD DBI-Shell-11.950.0-r2.ebuild 536 BLAKE2B c3a807838ce300c2c5ffab50b5c366cb2b7a03798bf7cea239ee88a43b92a526db58583d7b9e2db4bb2a9c971a74f0e89f94eb9f41196b15c65e19dad4b1cd96 SHA512 c89696be45dff3644be42c5e31817d0e823d837be5c71ceb20320b98bf05c1cd535a102446301d82211d74d1dc5b61db278402d1d6a54e0bfd1861b07a4c69db
-EBUILD DBI-Shell-11.970.0.ebuild 824 BLAKE2B 6ed7e0ed5e9132d95ffd2e76dec8f562349abb775e0b43f2112be3835493bc40b0731654295282046cb13da0a278285c44891d82515baa84d03cc5a6fcf7d434 SHA512 301be84456f4c687dcf5adbcf3b986fa808b888dd855e3f20d5dbbb4a2c89f0741c3b48e88d7dedea7141393b48a8855984a5f7b94a5ef0c6390893dfa99555d
+EBUILD DBI-Shell-11.970.0.ebuild 823 BLAKE2B 3044528d43019ce7ae43c9e911817b2ae20366587bd5be11ff53399fe0a14c34988b4f6f1373f19b363980fc6f070589c7bde4011f3f6ff0c28db95cf69551f4 SHA512 cf80a94a1568cf484fe30513cc1fddb98d433c6e89d321c0da18de1e6af41043e488a485f2fdfaa751f75bb32f2d8e4a3ffeb0921bcd32d8eda3d44c5a8ef1d8
 MISC metadata.xml 1566 BLAKE2B 352004488429827dfe8163710f775a349755fc3bf9c6765134843806ae2031de390b08d832ffbe79e79f799762f7af3c1bdbb7cea5969f7568c691bcad2b6b2f SHA512 934918cea42ddc00fe782b37176250008b04bf5741cd4072b5cbac572c6f508fc615b9a2fd6fb4f93bbeb87f62503aa0262abdfabe2b4ef16eaee402c96b7fbd
diff --git a/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.740.0.ebuild b/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.740.0.ebuild
index 96f6effc61b8..8d89f0408b8b 100644
--- a/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.740.0.ebuild
+++ b/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.740.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Parse and Format DateTimes using Strptime"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DateTime-Format-Strptime/Manifest b/dev-perl/DateTime-Format-Strptime/Manifest
index e4ce5f7f284b..f521c2ff25ce 100644
--- a/dev-perl/DateTime-Format-Strptime/Manifest
+++ b/dev-perl/DateTime-Format-Strptime/Manifest
@@ -1,7 +1,7 @@
 DIST DateTime-Format-Strptime-1.74.tar.gz 105317 BLAKE2B 997a76591b710f61e003998fc97ec26a8c5ce43dff83e42dd9cab5b13238c21e40f327afe46a0258b9f8e725abfc35d0d9957cf4e89936aa17cf79b1f7d111d9 SHA512 3b2b640f93956e82aff47f068c596018700615414c9b9ccf8d6bf68ad7b626ec86a831ec2b68807d7f137c10d4b8cfa5d2d50a6304252f3dfecbe9ff94e59617
 DIST DateTime-Format-Strptime-1.77.tar.gz 114321 BLAKE2B e942f79b4d54aac70b922f4c4b0649bef65a4b80a1aeb784409186c74a8e9dc3cf878460a9282ae947ce6a354da964a67403c5f0c2dd83e33ec2f36f07555497 SHA512 d6f997831ffe054b6052dc7d9a783fa64fb2dd90babbd97ea2dd11eacc0e6d1a6718c2dc877c444863be502482f6fc856f02f0feae8abb36220b60f417ee87ec
 DIST DateTime-Format-Strptime-1.79.tar.gz 119122 BLAKE2B 8125e095d6bc9c14b26278bbf2d7b04b783533f75f441637b13c5d5a117bf248b4db6db8da3e8c72e4c39aa45acc38a00816eba21ee29ab13e953021b84086b6 SHA512 842da603c4314e2506f12de2a8ce5e7bf29b183d6064b7f40b663934fba3612e26073835c49c5f58accc9727f1c1883d48deb69e11ceec28f9f47e776c4e2d7c
-EBUILD DateTime-Format-Strptime-1.740.0.ebuild 922 BLAKE2B bc50c1f2a5ee9658eb54017b257ba20a99f7ff462b40b2f79c617ad6469030212dc5b0d2a21fc199b9c23613da7e3ffba69cba54e323a58174be42774d88ca52 SHA512 ce7e13be7172673ec5698bd9f943d00d74af8a05c67f67e7cfb20085d313a0bbd0dd337dbb7a556b50b29877e246f523beec32c55f989301f4206e8f4ec0c92f
+EBUILD DateTime-Format-Strptime-1.740.0.ebuild 921 BLAKE2B f80a4214958208d8e61c27766c7eab5d133bef9f19a737f129fb11da8073afc4f544b62a2a38cabfb4a56cf3c59d3ea0ff0b58ae32e46fc33bcac7d3965c2a4c SHA512 ab7a774cd136c4727fa286bca8d2adaf5743dcad34a0e45047fa6aad15a5b41200a1dc72d5d249783eccdf0adc4564d4cfa6c023169c6bf8bd18ddb2b739ba93
 EBUILD DateTime-Format-Strptime-1.770.0.ebuild 879 BLAKE2B 0a7b394365c8c728f03c3b1efb6823060d24651deeed05e19a5fcd93ca08f084cf52e6047731310326c3bf7d64285d6bb6d993e5c6b5691d0487e336af5383c9 SHA512 67ac48dcb32edf43dfdd77d96e26b44202925811a3d84b8a4ed464c753906cbe8f0b2384293ab6403bf249ea548f1fa7b312f99b14c126b8e60d234df1ba54e0
 EBUILD DateTime-Format-Strptime-1.790.0.ebuild 879 BLAKE2B 8ea29a7cab892e5022bc28d0d5ad7c382e00f459f02251a298e9f464fd814c266cea097068c453029d2ffb094817622c48123157895bfcaa7fbab066454ad14e SHA512 b07a764e1cece1654115c64ba3c3f129f32c15d44766b4d2e38a9c19a16d0025f6acd72418a8f9f9c3e1c2f99ce7b343427f31b720ef3c1ffd8a847bd73cc345
 MISC metadata.xml 501 BLAKE2B 0f79c43ee9cab97c8027a8bceea775c4e2579514e8e6062fb44d95cc04de45d2b60249e62c90c073ff0bd0de5e979d82aea6398e43b35fcd826ae67fe41ea93b SHA512 498bfbf685542fe1e8920f007e004338d06a0d28b88faf8a323370015a3697ba22be57b47b2d77ebcb5620e353dc8079cf6a05b03493c17e28074221895825c5
diff --git a/dev-perl/Devel-CheckOS/Devel-CheckOS-1.860.0.ebuild b/dev-perl/Devel-CheckOS/Devel-CheckOS-1.860.0.ebuild
index 101861705a0a..f2027a0f27ad 100644
--- a/dev-perl/Devel-CheckOS/Devel-CheckOS-1.860.0.ebuild
+++ b/dev-perl/Devel-CheckOS/Devel-CheckOS-1.860.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Check what OS we're running on"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ppc sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Devel-CheckOS/Manifest b/dev-perl/Devel-CheckOS/Manifest
index d08603c112fb..2c32c616b4a4 100644
--- a/dev-perl/Devel-CheckOS/Manifest
+++ b/dev-perl/Devel-CheckOS/Manifest
@@ -1,5 +1,5 @@
 DIST Devel-CheckOS-1.83.tar.gz 33177 BLAKE2B 3c328c02d5fc18ee1af01ed28fd04520de223abaeec35fde926006896995c3fadcd8102fedaee44b6e2763063d6ebfb2d9f4fcd52afbdcfc9c9c88c113783e93 SHA512 3fef830aac2fef3946c40b5aa29c74e55137485ec6cd7dfe851bf961ddadb462811bbe1560e972be5b6ace603123af18a43f4df9c6df72e2fdfd2205399734f3
 DIST Devel-CheckOS-1.86.tar.gz 33703 BLAKE2B 5b9906bef035c1f388bf91ea00ae1bc371375b3c2387e5b5f362f36fe77d7e7f67e8d0b570e9eeb3668e39b24de9715de8533d9c28585aac8c90c306972390d1 SHA512 8f3c87a18a014549b0c1490c09e365e53ee016c8a19bd3945396b1f449f373ac1f2f89ddca3f9fa4c6051cbad1cc32fbb42c76ee9ddfa3d3e2e7ca3fa125a6f0
 EBUILD Devel-CheckOS-1.830.0.ebuild 540 BLAKE2B 045bd9a1082237640a40a5d89749934872e5a7e61357be93469194fc9dbad4b777a1a0f0aee76bac7dcb2dc414ba63640503e4eeb7ae3757b29015d3c13ba4e8 SHA512 6fc579d238d58b0eeaad5991b00056cbb25eb44c8d58c713660527ce43d1cdda6421094649f6f97a15cafe446274b0617e31a1cb93cb25673ac80fd925056674
-EBUILD Devel-CheckOS-1.860.0.ebuild 525 BLAKE2B 0a54b0cf7efb07e50eb7e8ade7901eef237375b79ea38c5239f00835c0f5c0b8ae7bc01ce6a4d7f5696501c7ab8c3bf4928fad8cea789058b49d50b313df5710 SHA512 16146ee91b6e8180ad2b24b1e0bbdb43135feab1fb8bbbbb751d52ac0e425367e9c5c46d6b36e74ea4800e4943ca86452aca94f87b9bcffaea1a93fe9eacb433
+EBUILD Devel-CheckOS-1.860.0.ebuild 521 BLAKE2B b050cc6421ec10fc27994346ee581311b8ad4607f7cf27c884c7289bcb25c9e701d044a0a4cc0573aa847d3589417c508968171813c6e6b4c2d6c596bdf24476 SHA512 83a5325990a15b5635b0f411adff5d14f9bc12d24386697204b140756edf3961f0b8181cacdaa6e8a7aef4e78461a71c5116729c80371ca3161b7f4807942de7
 MISC metadata.xml 5699 BLAKE2B 84f8bc868fdb5f575f17cb0e5e85d1c2fa52021da57204d42bad4fb83f822337bc9f4c3f6ab3d88e56eee5cd98e116f8532caae316f37a880e987fe24d00bb12 SHA512 9b25d99f8a6a4b5ee7d2941f2dfa1a07d22be5df4a0093d5abff4138d242607fc4529b18b504f449c90f53609a69e6786fa1b3c684be86d6fd5a334558b819fa
diff --git a/dev-perl/Exporter-Tiny/Exporter-Tiny-1.2.2.ebuild b/dev-perl/Exporter-Tiny/Exporter-Tiny-1.2.2.ebuild
index 2b22e6f49b09..2b66897b9e1a 100644
--- a/dev-perl/Exporter-Tiny/Exporter-Tiny-1.2.2.ebuild
+++ b/dev-perl/Exporter-Tiny/Exporter-Tiny-1.2.2.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="An exporter with the features of Sub::Exporter but only core dependencies"
 
 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"
+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="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Exporter-Tiny/Manifest b/dev-perl/Exporter-Tiny/Manifest
index f3f80644679d..25a7c52002cb 100644
--- a/dev-perl/Exporter-Tiny/Manifest
+++ b/dev-perl/Exporter-Tiny/Manifest
@@ -1,5 +1,5 @@
 DIST Exporter-Tiny-1.002001.tar.gz 32304 BLAKE2B bb16d9195f5b8b68f9e786820ca21fed1501df51f7bc77fdeb7d37aeadbf5a944c55fc18cc12acaf5f74aa649f66996a910f5a0533e9b2f8be4739c4a7ae4e16 SHA512 b247e7785e02c3346f231736a430c2d54e5ac93c175892090c40121c86eb255ce4d138c65e31836fd2970b45fb71dc7e68ea3c45a06a9e9c4135b45df48621d8
 DIST Exporter-Tiny-1.002002.tar.gz 88456 BLAKE2B 28799f2e5872ee10f73c696291aff42ee47e79f878420770da46ce5923e7668b6b8bd9e88c0662d18d33b5e0c91e177360670ec38df57175c5d9732344780ff6 SHA512 b6d39ba1824f6c9d68cf75e7f28fd896c2c475e419f0b1aadec58d4e7e5c8d3fd7bf85d841758772055470de56ad7a3ad6787cfd9d6c5d61d8449cf8f40bda8d
 EBUILD Exporter-Tiny-1.2.1.ebuild 704 BLAKE2B 3da231c9075072fe23102d04e47be862d2b46257a6f2ca65e6dc0fc1c06cbfa1525a88b67129bfcd8432de42951505a146c3f63cd71efe6aab4a0a54bec7de9d SHA512 22bb9b517157933a83d9bd1c205c1b4b2c3b962b9c6efd1137a90781a3cc996b1a714a7ea5a4ca3e71ba2466e7e6dba5656de6b9d04fe0f8c9ce19047158bbc3
-EBUILD Exporter-Tiny-1.2.2.ebuild 1014 BLAKE2B 63a7db5f30677bda4d450ea68658772b239057ef57c42b91231b4ed48d8cd540a4e5b3ebc2290fef97be619a2c721159531d60b52e67455723af4e6c52e43f52 SHA512 aac0e1087115d963a394df5d9220b2c2d049496692af9fcf07fe7281cb95bb21378dc2d88a7d62d5b3ce82a09d8e5182fde21de781175147afff92a87d4f9cca
+EBUILD Exporter-Tiny-1.2.2.ebuild 1013 BLAKE2B 91a75eb15fe59d22346af30c892098ba7d81a360e86927418c2c5bb86bae1cf39389454aba5559f64e30a8b7aa75198b099405db07442dee60aa8419fac29060 SHA512 09e1abf6b51205d6d1d0786be59b981b79a848d47162e66f97647d8a7b95752a2e3bde427a64f10fcf1c6e0d89ac81c9645df6326d18c67384574b84c281d2e0
 MISC metadata.xml 526 BLAKE2B ff3d85e25fb9fc01e22051e32193d99818a9ea73ed6ac8385ec4cb4a2734cb63e46c78c4c8467fdeacae7a66931fe608638080ca1eb5e615b926c4d35c9c494b SHA512 92bf9ce5fa1f9e099d8984eb0be24cfeb9596c50ce420f9d1c9e2ff62ed51ca2a7b23d95ae685ebd2657e5b607910d02492f0c93c6d0b926187ede4a35356679
diff --git a/dev-perl/FFI-CheckLib/FFI-CheckLib-0.270.0.ebuild b/dev-perl/FFI-CheckLib/FFI-CheckLib-0.270.0.ebuild
index 319ce80c6530..e77f4d8c369c 100644
--- a/dev-perl/FFI-CheckLib/FFI-CheckLib-0.270.0.ebuild
+++ b/dev-perl/FFI-CheckLib/FFI-CheckLib-0.270.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="Check that a library is available for FFI"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/FFI-CheckLib/Manifest b/dev-perl/FFI-CheckLib/Manifest
index 65e507801098..67af5ab7b3e7 100644
--- a/dev-perl/FFI-CheckLib/Manifest
+++ b/dev-perl/FFI-CheckLib/Manifest
@@ -2,6 +2,6 @@ DIST FFI-CheckLib-0.25.tar.gz 28512 BLAKE2B eb9a843d230dc048fddd547c1fdd1a3b748b
 DIST FFI-CheckLib-0.27.tar.gz 29371 BLAKE2B 194ac6102f32d9107e112d20ea85d82ce8b948f0d421f29b09f3557548a593991ee8cf096e924c09a0c7195a32cf666ee8e01af41377ab3d8cc7bc245e6ad23c SHA512 0a6cf93fc0461e6b21533007b2d9956f14bf7acf6bffdbe5274b43f8c3d9defabfb60854e31b95cfe430d2cecdcddeafdcc9514daca6a4807697cf10c280a6d7
 DIST FFI-CheckLib-0.28.tar.gz 32051 BLAKE2B 5e124ecea4959b910c8fad5de17ef5b3bbcffe680e8db090fe8e9d9fd6b128e4e5ea947def214c65b9a35fa4a8c4468424228b020a112ba0e4cd5aaa42888371 SHA512 9ac42e7153902cd178d9ee7d3db7edb96deb30c8b53cdd6c14706cde200598ecd98031c8e17394fcd1fb2c770a0ec776131e2ff93491d6b307a6e595fd788d5a
 EBUILD FFI-CheckLib-0.250.0.ebuild 588 BLAKE2B 36dea3e6f53d4d8f760888ec4e15c8c1da284b4b0d60dbb5f9e4ad979cb7924cce6f3b00b7f27927bce7359b8f13a1185be86eaf78e14c7b4d9678cb7146650a SHA512 6cf7499433acac1ab364fe531ab5b257b4b5b58b910fede1dfc8ac1be733752e91da04107f28b6e9bc10eeacc5e03ab3d400a455b72a9f6e9655d7104848cc19
-EBUILD FFI-CheckLib-0.270.0.ebuild 581 BLAKE2B f1373771816c034780d8a285dfd7b3c0a2fd440d4c6616ba482737c731610dc04b08f21f4ec038d9a3a1b54e50b677a60ff5fcc4a21f43785a6e17ef2021010a SHA512 c023ba40bc28a747845a453edf7c590690123246c8fc707a5fa83b0ff9f4a77ef4cfab77b028ff510029013cd847c6b338c10ab4adf6b250a36a6451d5c2193f
+EBUILD FFI-CheckLib-0.270.0.ebuild 580 BLAKE2B aea79afdeaec9241782b2c809b355664027b5b47e4df0c5683b0215fec5d5249a40d1893aaf2ba61e780f9dde945bc2b364a50b9f228e3d37d37212fafb55a29 SHA512 a8e791b068dc4c690e3b6be71a66a33f125295761caedb8aabd0eb7f8a2e4fb27d1c0c848287d9f3956cc3dbb359424c72ff9c0146450b7349e1d85e3682a76e
 EBUILD FFI-CheckLib-0.280.0.ebuild 653 BLAKE2B 79385b3ea6265584ce4201752dca94afa55c326900b7d45f21a473bf3b84bde235bd05c92a73851cb7fcfbafc1c65899fc87f911d2682b2cd67d07133f73ac93 SHA512 5800d60dc186e3155d1e75b2e8acd7679ffb96c668cab58f23645e1be7fb8ec770a64760fdcfe05063407d73c48cb5a23e6143c7f6e2094751fb5e9c3d1453fc
 MISC metadata.xml 396 BLAKE2B 3a8692f73d6f2cf8012bfc60fa107ebf582b75409735eb8cfc8ed9a5088fa26aba51230353616a2b4ef26d8a80205b3204f7624782ec543752be173350ad6698 SHA512 d1131f6d33aa0053a0b7fb7a6d3beedf924b19a55034c724e5146faaad810ba2381f74a8f14b3ddf670482a54f39c2c8b17a2a13fee6767a734a28c30eb35c1a
diff --git a/dev-perl/FLV-AudioExtractor/FLV-AudioExtractor-0.010.0.ebuild b/dev-perl/FLV-AudioExtractor/FLV-AudioExtractor-0.010.0.ebuild
deleted file mode 100644
index 39a724124067..000000000000
--- a/dev-perl/FLV-AudioExtractor/FLV-AudioExtractor-0.010.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=FVOX
-MODULE_VERSION=0.01
-inherit perl-module
-
-DESCRIPTION="Extract audio from Flash Videos"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="virtual/perl-ExtUtils-MakeMaker"
-RDEPEND="dev-perl/Moose"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/FLV-AudioExtractor/FLV-AudioExtractor-0.10.0-r1.ebuild b/dev-perl/FLV-AudioExtractor/FLV-AudioExtractor-0.10.0-r1.ebuild
index e0317725c636..09861029ed51 100644
--- a/dev-perl/FLV-AudioExtractor/FLV-AudioExtractor-0.10.0-r1.ebuild
+++ b/dev-perl/FLV-AudioExtractor/FLV-AudioExtractor-0.10.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,14 +10,16 @@ inherit perl-module
 DESCRIPTION="Extract audio from Flash Videos"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-perl/Moose
 "
+
 BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 "
+
 PERL_RM_FILES=(
 	t/author-critic.t
 	t/release-distmeta.t
diff --git a/dev-perl/FLV-AudioExtractor/Manifest b/dev-perl/FLV-AudioExtractor/Manifest
index b6006cc4c6f7..435928bcbfcd 100644
--- a/dev-perl/FLV-AudioExtractor/Manifest
+++ b/dev-perl/FLV-AudioExtractor/Manifest
@@ -1,4 +1,3 @@
 DIST FLV-AudioExtractor-0.01.tar.gz 14291 BLAKE2B 040c59918636b76fd2d4c08bf6d04c62e8c7184ac11d9f1db0b1c04dbadd3f3fd6c72725d449a61d7109bc6f8485fa6b693c3814508ba2d381a3c0a4a914d533 SHA512 060be09279aac3ebc57c3ba780320913f5219ef667ef7d394daf530bfe3c038a03ce0e6de1e4598577f1c50bca51e7221c1d42b00d4ab75b8d94d7d1dd529b87
-EBUILD FLV-AudioExtractor-0.010.0.ebuild 352 BLAKE2B 33225245a30b455b6156a66ce44eb2d8aa57695a90e153406da29abfebe0fea87007ed7725e60c7dd3fbad3e8072c59fda71eb51ab153a82cf403a9fa9dd12c5 SHA512 91baff0bdd693c74ef35f659499b2011799f6ada066fe1e6b9f344c225c8cd5a00923ad3405b691ff9bf668dfb3bc71bafc670edb819796fdb3c85c977656d2b
-EBUILD FLV-AudioExtractor-0.10.0-r1.ebuild 458 BLAKE2B e162731ce8cfdb39a1b3d7a5771e51006cc27447c88a7a3f88fca160cb057894c2d315d7dda32a80d613d1c2e82ed3005b865a0d66d93e082cfc56f890da3552 SHA512 54afb195056a62e6d0eed2d1f0c84aa1cb4178b22a479f7be2f8b847de34a65cf7d06ac7ac7dd13eab1e2281a4c207bec717eec040a59b0a567cb21189dbbd9a
+EBUILD FLV-AudioExtractor-0.10.0-r1.ebuild 458 BLAKE2B 963267a646d4190e3344680e0fb54ff6bfd71b18763c164f3276f8b75a40cf80e58aefb11e19a6098389654c03e90f2051ec224f09190e1480f3e0f4dd0c0674 SHA512 f7eb2a70736584bc5ea47d28986f4b679c97fc59dc60ee767b506048052f72a8e01c09b6e01714b35735bae9165dd35938b2a7327f7d482f7692629ce793f83e
 MISC metadata.xml 504 BLAKE2B b7c5f5f4a57c6f88581c14a04ee3e14b79a5dfbedbbd372b6dcd30fd7bffadd497b1dc066cc1979fced607656ca055ce9bf28d7dce3d131d43c6519316f81142 SHA512 9e52cafb28ccebb193c8be46a8f334e303c030af71cd938aa8dd0e22157dbe4f894ea0793868126fd279701e4fb9b6ed7fa363a9960c4d14e66ac78168cf1a59
diff --git a/dev-perl/File-BaseDir/File-BaseDir-0.80.0.ebuild b/dev-perl/File-BaseDir/File-BaseDir-0.80.0.ebuild
index c96d5b3a79bd..90b199f898d3 100644
--- a/dev-perl/File-BaseDir/File-BaseDir-0.80.0.ebuild
+++ b/dev-perl/File-BaseDir/File-BaseDir-0.80.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Use the Freedesktop.org base directory specification"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-BaseDir/Manifest b/dev-perl/File-BaseDir/Manifest
index 8113a6715265..765f669bb1a1 100644
--- a/dev-perl/File-BaseDir/Manifest
+++ b/dev-perl/File-BaseDir/Manifest
@@ -1,5 +1,5 @@
 DIST File-BaseDir-0.07.tar.gz 9888 BLAKE2B 345c20687bc6c0d0096ab90a2f53d7d85667c12ca0f7c49e0e23e682dbc8e2f9876ec3790d3193b053b31f8d1d6c3db9a631dd1128662cd5605e093b989552f1 SHA512 782ed883f37aeb28c4c71a10108865b2cc152c2a7a6015f84cf775be452493a3f599182d213a934e48bd64ffc74369bea61ad89f26f8b7b0c2f94504f107b35d
 DIST File-BaseDir-0.08.tar.gz 10052 BLAKE2B 63b1d9777c332f3d4a56e4ae53aa78f1b5793af52b2c4e749586b33d7700c1e5b66e386a770faf8d9d3d04bc0d296dce69f1d9f2bf36e44839b43d089c6981ff SHA512 6b44edca34906c34d574933c21c0e3a1a236a431a3ac12caeabcc2638688dfe1c02efc9a1e75a2c2cd522de0dca00df0620cd262c184ec938cc97766d1121f99
 EBUILD File-BaseDir-0.70.0.ebuild 920 BLAKE2B 1759cda330fdedd8686c9204e77ee9d6715029cb9c5a5611417c6dfa8096a271f35e3c21b6b6dfd51028e9d89cc2a362ba0179f762d0b6d213775d43cf9f842a SHA512 4c19aba43c7762f699807c4ec51ef2615161e41dcb6fa5ee77eec1b0a94e7f76a96dc04d3c427d130ec2fbf73023315c79f571b88116c8c03e522aae36ee92bf
-EBUILD File-BaseDir-0.80.0.ebuild 874 BLAKE2B 5d69ab3d8f9ec26eb2f58f6505d093b4d7edd9dadef849b82dfe5d03cfdbc383a5ee63fae2fd913f47a1dd954dbbb3332bddf3784eecd99b2b7d1de014e6db5b SHA512 e135dcdf3b9ccb507af693bafd25e7ccca88ccb6d4b8461cf74d68ad8f88cc875e608e9803edb13d525c9d9162f10874f058f8cba9961250fa05da466122aa21
+EBUILD File-BaseDir-0.80.0.ebuild 873 BLAKE2B a9b4dc3f25a30d8933e17a8cdb0f84692eca6847b5485942e040997f33db7e9b3f0c55443486aeab027321f1a74d0be4f0bc688a58c20b3201e83749e95002af SHA512 04f4fcf18f6afecbca89de71eae52ad724e03897a207b527c59f4b7fbdbd259c30461315a5eb1744f5bcc2e92f3f1ee551a8ee370b29050a040c5215cf6f6d19
 MISC metadata.xml 519 BLAKE2B 875987e9e16f33472bc355fa0b6dbe05f0659d134c2e095ff64c758f20a26ca6fecb3d413d8308c0b3e91d35c8c84c250152ace8eb81de928aa1bbb386859044 SHA512 1d6892e71323a869a4f1ed70c1c32c0877a3dedfc13c2d019e833c0a2b230dc434a99821852dd52a60e35dd44e5254e51e7f6930fb8478356b495fca77905fc9
diff --git a/dev-perl/File-Copy-Recursive/File-Copy-Recursive-0.450.0.ebuild b/dev-perl/File-Copy-Recursive/File-Copy-Recursive-0.450.0.ebuild
index e3da17924df6..d4c56ad4be83 100644
--- a/dev-perl/File-Copy-Recursive/File-Copy-Recursive-0.450.0.ebuild
+++ b/dev-perl/File-Copy-Recursive/File-Copy-Recursive-0.450.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="uses File::Copy to recursively copy dirs"
 
 SLOT="0"
-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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-Copy-Recursive/Manifest b/dev-perl/File-Copy-Recursive/Manifest
index 539628a464b4..705a13e3fb25 100644
--- a/dev-perl/File-Copy-Recursive/Manifest
+++ b/dev-perl/File-Copy-Recursive/Manifest
@@ -1,5 +1,5 @@
 DIST File-Copy-Recursive-0.38.tar.gz 10843 BLAKE2B 5bba9545224c919e8de3e3bb48cbbd3b6707022cd4df43358c78582562c29f728688d91168c15e43b0cb6705cf65957c32c45fa2ba3dcfdb7b6a8530ebc70576 SHA512 49e5dbfc5bdbc554ad8a019c25db85ebfa55765a73758d95271b5f3de9550fd68b4d99aa287898d86bc6c11ea8de97469a85c53d4ad8534594b411be1f18eb87
 DIST File-Copy-Recursive-0.45.tar.gz 19256 BLAKE2B 15a6065883d3b53e51c168a3d67eaf0a78d13c354a73bc2e58eda541980c0b709f2ba431b97486c112d74354b98a4d81a30a13db0fe12e5022fe65ff7eaef2e9 SHA512 6d8a6c55bc54bfe5ce3834527776c6b1466d5672f5f8901c27053188bbc78e87dd62bed8d330c04079b02d0967be0a8d0cd779e67973cf79a2c6ff87d5921c60
 EBUILD File-Copy-Recursive-0.380.0-r1.ebuild 456 BLAKE2B 565064fcf9642f64f9c3afa4429f87f8b22275a5e71d650e63593a461ed9150d82d0ea051fddc6326b8c34d58efa3272c03f3dc3925511e0cee8e4cba2ef3851 SHA512 b62908ffb6ee6100e5a43219b70bd9fdb1c8b68783396a626788f808828d199009a51e045807621c394727194da6a126b6bf69d63c7b289e6c83ca42fa682a4a
-EBUILD File-Copy-Recursive-0.450.0.ebuild 653 BLAKE2B fa35762f9742cab42fa2384740edcb11574b2a36c2ba0410d5943c38fef0b72b65f9bb2cca825eceda015c25527780800c5ec88b33fddaae2ac835356c102223 SHA512 7d9e61c7faee41ba32305a9d4ccbb8fb6fd3941d15121090aa3a6d383e602501802d76b3c7eaeb2da822875f5f852b56e3b3a0a2803a960c6eca14b9af81cdd9
+EBUILD File-Copy-Recursive-0.450.0.ebuild 652 BLAKE2B 488e8194b6af0355eb6bef2b0ebd37033bfbfa9a836fec4203f18edb7340d2a996b0e029807e7ffde38f03b53ea880ad164f69d37b18bb4f9fe8f617f10e621e SHA512 b50d2c9f3a4a5701c5f38cea27b6da1a01b1034879c6247221823d6d0587bb5589d1ee4118394ed247fe08aa037d15be8660e88c0fdef6a53f2512f26c150b07
 MISC metadata.xml 411 BLAKE2B e7ad5cf73916c9e73cf4f4ec8985c1e607ce601014c696d4b50f3b86133a7b811e292212987ea29146a103da68a1562230b13e0f7d4b6f3d2c56cfcc4274682c SHA512 e985cd6973bdcc89176854669990e5ae810cef2946925d89a2ca976534a4dd483861d30221e51704445dd3b80d1790ca7202b9a41c9c87e90736e51ea5f149dc
diff --git a/dev-perl/File-HomeDir/File-HomeDir-1.6.0.ebuild b/dev-perl/File-HomeDir/File-HomeDir-1.6.0.ebuild
index acf78ca0256c..4f2a68277edb 100644
--- a/dev-perl/File-HomeDir/File-HomeDir-1.6.0.ebuild
+++ b/dev-perl/File-HomeDir/File-HomeDir-1.6.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Get home directory for self or other user"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+xdg test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-HomeDir/Manifest b/dev-perl/File-HomeDir/Manifest
index a17f29f185b5..9f2cfa11b875 100644
--- a/dev-perl/File-HomeDir/Manifest
+++ b/dev-perl/File-HomeDir/Manifest
@@ -1,5 +1,5 @@
 DIST File-HomeDir-1.002.tar.gz 35441 BLAKE2B 01cbebbcc18958cb0056160383880c9749a1e43a4c27e2da9d6a190985929b53b25d3cb50d84766a1a9bc9607c64265c2fd622dc1d0eb4884d7c799edb02ff12 SHA512 4862c78f65785579d4978d3c4d36ba2a71fb78f069b5671d0cedabd6d187fb4377ae40be45b0abfb00df8dd362fbc28032aab2f39acbbe9f1d7bc4a5b24863d4
 DIST File-HomeDir-1.006.tar.gz 35855 BLAKE2B d6339d483dfa32158138cb17e632074236ae67a0ae1ae1529a2bf38efc6fa3d9c83b4163cf6e1b9850353ead5d287625d3d1d1cf753f5757c16dbb664b941e0f SHA512 1ea90d68ed059ef5e890f6afb1280673dd5a597956f282c4ae8b4471c1751aa3cb2fcbe9caa6b2976937d11fd7233aa85a2dea611f87c79e0ddd1a501ceb890d
 EBUILD File-HomeDir-1.2.0.ebuild 745 BLAKE2B 8e97b4bf23ee87442c50419b9833a96575e7e821dd40a5c9cd1b8aa9f8b2aaba4b64622cfbd523638a8ec18502cde65efb9dea14b97de16d6bf8e567604446bb SHA512 a7e665c68dc45131c74e23d4193dcfc477494b6123ea5d3f3700e47b851455efd40708afdf9c3c7d7682d714db6a82a62bbf95b513fd502e02343ad11529d996
-EBUILD File-HomeDir-1.6.0.ebuild 762 BLAKE2B d53bfde7e5da099622fd6249b716be089d6d97017469f860b15a9169d6dba9df32c5d3ba8f5b6b5691ed4a00bf2f5426e16602331c7c1b9051ed1d047a908afd SHA512 f89e25ed3dc03079ff1c4231a52ab4eede44ec6023c9d96ffceaa90d0e0eaa90448ee8ce3fc52ae63105611d6ad4c7f5d1d0c903cafda357d4a31356cd88388e
+EBUILD File-HomeDir-1.6.0.ebuild 759 BLAKE2B 872eadd5566f8adc93f5d563b66bc3a4902379b018191bb868a61339d6b5f4b78fafdf7beb3295164fe76658bc3d1da66e1297829c5b173b135b9ad541bb270e SHA512 0a2f35a74c9c2e72a043d66bc4718728aaa0eaef691800ce5e4803c83b44c25fb010c4532b8f37cbf8ab05f8abb4d720aa8048b46cd73402dc5d28f57740c748
 MISC metadata.xml 1137 BLAKE2B 4ce7a1606a1369adc17ba42a2af8aa1df1ab6023143a903b20d36c9353dba085f3c68e674defc3fba9870821b1da1a1ae3dbb9540d14799dd3eeab9d38cd2bc7 SHA512 e415430c594769a7bd66bccbedeb6171236c3d70629bd2e1266a67684ff878a74e0480020fe22a52426f104577e5a998dc9bd42de9febcdd8be5ab46277c2fe6
diff --git a/dev-perl/File-LibMagic/File-LibMagic-1.230.0.ebuild b/dev-perl/File-LibMagic/File-LibMagic-1.230.0.ebuild
index 7de775b7d667..3c4b49ab0711 100644
--- a/dev-perl/File-LibMagic/File-LibMagic-1.230.0.ebuild
+++ b/dev-perl/File-LibMagic/File-LibMagic-1.230.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl wrapper for libmagic"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-LibMagic/Manifest b/dev-perl/File-LibMagic/Manifest
index f1825ac59c97..f30f7c0b238d 100644
--- a/dev-perl/File-LibMagic/Manifest
+++ b/dev-perl/File-LibMagic/Manifest
@@ -1,5 +1,5 @@
 DIST File-LibMagic-1.15.tar.gz 124847 BLAKE2B 84767d73b6a3c160bdbcd202b807011bcffefd93e69f3c7d2e072ba1be87ab0ec9864e5deff03a62e609ef270cc9dbf32a6cb2f06ccdad4171d24d57d3532305 SHA512 bd6e2ac57bf7a4443ceab5143b9381805941600d436fe1b04364f9ab26f60a3a9d142576619135b3e4fa7449b2aa379960dbe24dd19c5fdaa379963a13490d5e
 DIST File-LibMagic-1.23.tar.gz 167761 BLAKE2B a409cdfbb7ac448858202ad79ee7b5cceb7d0bd17e42de108818ca6b03e8f8688f15dd5b5b0adc8ccab1a97174b02ccd93d5660dce2c04f585449182bd25a2aa SHA512 894ff64051e607f3b788f52568221cae3a99b7386b534c62c33fccc46d1242d3e851970cd9063a1c1535732f76e2bc2111568a8e83b4ed6efecfedd8facc5cbd
 EBUILD File-LibMagic-1.150.0.ebuild 696 BLAKE2B 57a10e90ec9673dce5fe95f89b78feeccb08dafff4f68f9810118f881efe15b5711261684788b12a9587d647858e999af8eeadbfcf969b718dc2ccfdb015a441 SHA512 036bf04caa5339bb994335134020fe1a2f1e38a326464f7f3755c94f68a0f611d6d7ed8c7d1038000b4b1aa7690b1e30adc65c436d50f61aa3f7285a9226c640
-EBUILD File-LibMagic-1.230.0.ebuild 850 BLAKE2B 331d9c1055e84f8ccc8603a993bf0e12571f936abeb8c05f4ce6cda55a145ca928ed4d799ea1bef7481396443eb89fd9a24de9955a29b07c79fe65486fccb82f SHA512 0b945a5adeac1e06fa43dc30057fa2b1a9d4102102c31b6e62cbb4fc34f57e78dd21fa790c92d305263dff77245c39570f45001f69bfa2fe305c4cfd8b01d94d
+EBUILD File-LibMagic-1.230.0.ebuild 845 BLAKE2B 7266b9fab3cb6f8f125b845312e7a836fb91ba259ef9f4e3b1e785eac65356cfd85736b3e3b2538ba6afef2903f21c0e5d640b94cbf6edb58146555f54602692 SHA512 567cdefdda2941b8d72d714c5e4e0f56077a561edf58891f13d6bcb60c08b361b1710c503c5515fe687ee3957a791dca0e6a87d1c6bbd672de6547f0073af662
 MISC metadata.xml 585 BLAKE2B 3a7ad3d16e1452026e42fbde6ef7f947baa0d7e71d9bfd2295eba3ca8b80e5513c803795f00f8ea9ea588ce867d8484a4128ce3e48354b956e5065e0f89bea0c SHA512 b798c56c67255dc74215d401223377d669dfde623b14640d271aa65c90ed1e78e8b86c28d8deb8b970d7937ae628380025f03ba8c235bd4a10f1ae2e68095f17
diff --git a/dev-perl/File-Listing/File-Listing-6.70.0.ebuild b/dev-perl/File-Listing/File-Listing-6.70.0.ebuild
index 1f7897a8fd97..22f2a3df6dcd 100644
--- a/dev-perl/File-Listing/File-Listing-6.70.0.ebuild
+++ b/dev-perl/File-Listing/File-Listing-6.70.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Parse directory listings"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-Listing/Manifest b/dev-perl/File-Listing/Manifest
index 9f8285449778..07678c8494f7 100644
--- a/dev-perl/File-Listing/Manifest
+++ b/dev-perl/File-Listing/Manifest
@@ -3,5 +3,5 @@ DIST File-Listing-6.07.tar.gz 61081 BLAKE2B edd4282dfb134ea5f2ecf4f227596aafd1c5
 DIST File-Listing-6.14.tar.gz 80562 BLAKE2B ab5b0974c9e8077195b2e3a5749228b07e0176bba5419aca35f0b1fddc22d1ff3d4c294ffa12d9d091074003518f805c37e5bb19ac6d82ef6ede4f0848f1a1bf SHA512 858339b15a455db570d15b02e801ab0e0afd47da71685002083cbcc1a0f89783fcad4e840e0381f186046ab2f355dc0f593dc8c9c0a2da0fc6f17a35265924ab
 EBUILD File-Listing-6.140.0.ebuild 706 BLAKE2B e639063b79774e2738558312ba9d57659dea9c5ba8eafbfbe3a8ff0b32a01507bf3ebcd8565c6e4e0a1c264b5b6a90e961cd8253c9f89436488ee84c7cffcc55 SHA512 654421da2e01cdda81e6a65899759960a024bc48f1e96a28c1e052c8c09b6c8e8617c9f3021943dbef687146f3a427c80e46e0633163f093b2e99cfd879375f6
 EBUILD File-Listing-6.40.0-r1.ebuild 536 BLAKE2B 3f053c0ac63693abeb95677137e00ad633d2c54da5d0bc52b7cc7536cf057332d40cb361538421b5d77d1bfc5caa0fa7960c8741c74306fffa6c4abc3bd1a58c SHA512 2f74dd12a6ab9c363645e081f72f290b6d7b2c5e944517137fe97bd13d02b0076eddb29096984fb295d5e5b7440f5deeadb6bc3403ff93b6c3059ec497d8aa5d
-EBUILD File-Listing-6.70.0.ebuild 652 BLAKE2B 67425e5cbaa4e8084dc5de7b84fdcb52a5905265543f898c6bd1bd0baded151623a67c805f7f5e3d6638bc19ab1c67700b321745b5f6a81bc307132bfe0c8863 SHA512 198a47156317d840d899e4fd52eb1f82dd3c2abc46adcf956b8398670dfa492103437aff8d2d1380df282777d04fe1a01a37aa1de97f9605d215bb7b178473d7
+EBUILD File-Listing-6.70.0.ebuild 650 BLAKE2B 22826744b93f23eba6cd4c99c447e9fd8b7451142ecaa2e485ea383e076e07608e3f1c2c0eecc81587671f11b215123f868d12b4dff255b8e71c4e88465cc981 SHA512 ebb6c8f77659bdf621de89acdcae4cfa7bbd2b4eeda6a8bd479eb69f584ff60144a882413e59e2b1ae1647a4b2a50c1dff17cbf494787e913c3848eb6b19198b
 MISC metadata.xml 710 BLAKE2B 1c457d9433ee8dbfa2736ae85335aecfad189e75bf11b906ddd77970621b51652d8d12ce2e928aaaa49898445206b73c75941e1fba8c7eba29a153d3ada7dcf1 SHA512 8ddb71e18d85c8811f4cd58b8808434cf609edbe989e5d0d8e5a4ab5b9c1c6c260e6f175adafc22453ddf9fec43fe350597553eb6bdf937508300cb8f6c7f83b
diff --git a/dev-perl/File-MimeInfo/File-MimeInfo-0.290.0.ebuild b/dev-perl/File-MimeInfo/File-MimeInfo-0.290.0.ebuild
index 9355c3515392..c75b5b1fca9e 100644
--- a/dev-perl/File-MimeInfo/File-MimeInfo-0.290.0.ebuild
+++ b/dev-perl/File-MimeInfo/File-MimeInfo-0.290.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Determine file type"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-MimeInfo/Manifest b/dev-perl/File-MimeInfo/Manifest
index 2906f1526668..48c9936c057c 100644
--- a/dev-perl/File-MimeInfo/Manifest
+++ b/dev-perl/File-MimeInfo/Manifest
@@ -2,6 +2,6 @@ DIST File-MimeInfo-0.28.tar.gz 32561 BLAKE2B 18a200876fd5b466c52866bb68c6343a8a8
 DIST File-MimeInfo-0.29.tar.gz 33113 BLAKE2B 5653316aea954cf82ad1c13474b6bb2740834185e12c150b4dba27c1f194986e4c1685764635c1a82659d1c6eb0fdccf66d456a67f9845153e21bd5133c16182 SHA512 3b012843a0934e2df78a28e52efec3cbe10b06fd2be7f3d63f64309752240af2e7ef9440a839aa170197f1037baee5fdcf1c1303fd57349841f37ee7001b68dd
 DIST File-MimeInfo-0.30.tar.gz 36132 BLAKE2B a87f9efe05d6b09cda4f365e9395e5677bf80a2baa5eae6592c01da4e6aac46994f82676f4383f0f538c8bdd6b70a4ba7aa1eed4c038eace6586839f2a9ecbaa SHA512 44030d2e2be66cb67d4329f8f308bf114014c511fe965979600157d62deffd5c2f05fdf883cb02d98f00d5d0b77c56e252cd377a398461ec421fe7491cd544ec
 EBUILD File-MimeInfo-0.280.0.ebuild 705 BLAKE2B a546bf761c39a96cb87c164c28c0401c9f0851e5eff2898d5d239c48b4effc731bd158be62dc88c6ae1468c5adb04117b8591efc35f5569dcb94ac06bf0b62c7 SHA512 c0db3093ae8aec6d3a663f52793a02adb0f45faa13fc8163fca3bd607748fb92c2e22ab3493776155639d09e4628d15422c19501a3304a83499107eb15317d32
-EBUILD File-MimeInfo-0.290.0.ebuild 717 BLAKE2B dce481417d7f1f83b22d236a56fc1d702b0e25bdf4849d8fda7fcb2c7a40ba3d37f033c0fe659542b3daaa1ddaa3a08a34689a0b5f5ea58304700c8b6bdae744 SHA512 02c36f00748348b790dc783f21f8cbd5f793f1f77c34b22dbb5b5d3154f931025721ed1733dbe53a8b4a448c07a58f775cb7cba2e33cb623fa9015bbaf8c2463
+EBUILD File-MimeInfo-0.290.0.ebuild 716 BLAKE2B 7fd424a4ca703a7d57887ab618c4d62d5ee586d33c78bef7f2e94e7e32338479a70eb9c605a4d926a1619338020ee68fa454570cb4bae87272747c66d795be68 SHA512 23d712493fccc8888c4a0e48770917a7d3afda7508e3bab1f1af6c3dac96450421e760fe50a14018cc1d64e80ac521df170f160c7cdb66d0bb41bab8284372f0
 EBUILD File-MimeInfo-0.300.0.ebuild 748 BLAKE2B e666e7e52a9d783d2fb4b17251355195128e56759c5942f117920b3f1596bade047f366a457721b832174908d8a1299906ee03306e4276e15c9be929342dd9bb SHA512 9fdfcdde5ae03cec1e1d803462b74fbf07ea125a3b47941cf752d52629484922cbbe085681f0fdb48e4f2aa9c6c5b040eb6a4514dd943a74b7265b10257812f3
 MISC metadata.xml 607 BLAKE2B f55da2dfd584d8fcbe2cf7f6130877f24eb882986c95b77c3d9981fb72658add64a5acdd41eb53b2eb215bdf9d50caaba6891462fa666da8c4deb5b165df4645 SHA512 064d2744a58bff1f5c0f092ab1b8c154a2557cd8c2f4ab8d221b0265a38fa15463ec1288466e3175d59f758d145bb4237c33a8b178ca135514c7d58902a7ccf7
diff --git a/dev-perl/File-ReadBackwards/File-ReadBackwards-1.50.0-r1.ebuild b/dev-perl/File-ReadBackwards/File-ReadBackwards-1.50.0-r1.ebuild
deleted file mode 100644
index 47fc590612b7..000000000000
--- a/dev-perl/File-ReadBackwards/File-ReadBackwards-1.50.0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=URI
-MODULE_VERSION=1.05
-inherit perl-module
-
-DESCRIPTION="The Perl File-ReadBackwards Module"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~x86-solaris"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/File-ReadBackwards/File-ReadBackwards-1.50.0-r2.ebuild b/dev-perl/File-ReadBackwards/File-ReadBackwards-1.50.0-r2.ebuild
index 9bcbfd61820a..d22b8147e331 100644
--- a/dev-perl/File-ReadBackwards/File-ReadBackwards-1.50.0-r2.ebuild
+++ b/dev-perl/File-ReadBackwards/File-ReadBackwards-1.50.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,9 @@ inherit perl-module
 DESCRIPTION="Read a file backwards by lines"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
+
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~x86-solaris"
+
 # Race conditions between 'bw.t' and 'large_file.t'
 # deleting the same file
 DIST_TEST=do
diff --git a/dev-perl/File-ReadBackwards/File-ReadBackwards-1.60.0.ebuild b/dev-perl/File-ReadBackwards/File-ReadBackwards-1.60.0.ebuild
new file mode 100644
index 000000000000..c1c08e576ed5
--- /dev/null
+++ b/dev-perl/File-ReadBackwards/File-ReadBackwards-1.60.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=PLICEASE
+DIST_VERSION=1.06
+inherit perl-module
+
+DESCRIPTION="Read a file backwards by lines"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
diff --git a/dev-perl/File-ReadBackwards/Manifest b/dev-perl/File-ReadBackwards/Manifest
index 72068177ced9..5995fa27acc7 100644
--- a/dev-perl/File-ReadBackwards/Manifest
+++ b/dev-perl/File-ReadBackwards/Manifest
@@ -1,4 +1,5 @@
 DIST File-ReadBackwards-1.05.tar.gz 8943 BLAKE2B f1e8703b04cfc94f69f1d953ee0f979e9d887bad97320b0b3d377f338dc074f8b9dbcd425523f6e3ec72c77c436cf7411098717eeca62bfd3230e603356ee623 SHA512 8e1eeeda0acfdc0b9e1f5234cac37348890fb962e5edd395804d6cf9ab2c221217e2714025303493cafde7ce77721e6c09b2b53825dadb978fafe68f6d7b8c20
-EBUILD File-ReadBackwards-1.50.0-r1.ebuild 324 BLAKE2B 564b8670dc0d003619b070d5161c5da6fd0762eb918b1de5f3a09b9fe8d9abdabd08acd68d6217364dcd6470ce833435eac30c511f67f2b38cf10a903f46c10f SHA512 004b2205931239935a91d751e90a24df130d6a0f961ba92cc5ef49a61c86b79e4a14761cb27d0572a035a34c8c7e6de39e9f182f9e40276eb85847e3dfed9b67
-EBUILD File-ReadBackwards-1.50.0-r2.ebuild 387 BLAKE2B 5805029d1cec266b1fda947de2647e49e85068e9aed5f3519c4f079f7f88732e92b76fe1576adbea09f1521561bedd002baa84059bdf144a3dacbc09911d58ed SHA512 9ff1164d4feecbcfb59f27d31ec8a51a21192c0381d55feb588d26e5fd5e2bd95098123373af194e022baa94cf6925746f5f20385438de56141063ed7fa8ed90
+DIST File-ReadBackwards-1.06.tar.gz 9739 BLAKE2B c3252c1618e9b1f767da62ddddb073b7a6e0f4b78f6ba119baebefc9890411921470752e1649513ecf068ec3fba3b163db4957261c467678bf01994ccb4874aa SHA512 43b7ebe58728272fbc0518fe6572b31061ba09665443240558b9035573d075c28b52d6230078f24616110d54e51477ad122c985d4fcdb3c3d288cb24e476fe45
+EBUILD File-ReadBackwards-1.50.0-r2.ebuild 385 BLAKE2B f77ab665736ec7912ebfabc7bc439139ca7d5ea3b55fb3cdb7dbb4d4e7597d7c0dce30f1b6b2a25336afd0e603aa5b54c7be94f52bfa811246f30c85e91c3773 SHA512 5360a141f26fe554c15a71deb1b279b309ff01b25abe32deed514e5f625172be4836732f0f50335454b2efbecabface22895ec79493f0cd58d1d9abf813869ec
+EBUILD File-ReadBackwards-1.60.0.ebuild 302 BLAKE2B 77fc3260de4b2b468bf5211483a0c1130c7529a53cdac27906022feae3950bbd93a798167a8e6a2f8c22bc320135b1d0ec4b1906cb2965e1adc09d8cda96d2a5 SHA512 86bbe56af7c3f5b135aa2472db27b3bdf516419322149ba73cdf7fe90e579e9806fdde96ecbac8bbbb31e861e00fa133ed918333ad67b53ed93880a9763fed77
 MISC metadata.xml 408 BLAKE2B 72b0ef4b0d7eb4df27861a4cd9f16b3e65c5ddfd33cdc451584bc127a1c2e89b9b7e573844e7211fb0da921dabadc45260b97b66037514fb56170ff79dc4b6d7 SHA512 df086b73fd20f77a8f0b220d689a6a6fbc09dfe6fe5a31bf21724e77e8d59c8965fdae89330b7eca0f01d1e1884322e12e2262254b821dbd3f6d3a31b71fdce8
diff --git a/dev-perl/File-Remove/File-Remove-1.580.0.ebuild b/dev-perl/File-Remove/File-Remove-1.580.0.ebuild
index 26ad7585af0e..7771178a504e 100644
--- a/dev-perl/File-Remove/File-Remove-1.580.0.ebuild
+++ b/dev-perl/File-Remove/File-Remove-1.580.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Remove files and directories"
 LICENSE="|| ( Artistic GPL-1+ ) || ( CC0-1.0 public-domain MIT )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-Remove/File-Remove-1.600.0.ebuild b/dev-perl/File-Remove/File-Remove-1.600.0.ebuild
new file mode 100644
index 000000000000..eb2c20851b4a
--- /dev/null
+++ b/dev-perl/File-Remove/File-Remove-1.600.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=SHLOMIF
+DIST_VERSION=1.60
+inherit perl-module
+
+DESCRIPTION="Remove files and directories"
+LICENSE="|| ( Artistic GPL-1+ ) || ( CC0-1.0 public-domain MIT )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	virtual/perl-File-Path
+	>=virtual/perl-File-Spec-3.290.0
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.280.0
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-IO
+		>=virtual/perl-Test-Simple-0.880.0
+	)
+"
diff --git a/dev-perl/File-Remove/Manifest b/dev-perl/File-Remove/Manifest
index 60bea10a6464..fb6ed7a22245 100644
--- a/dev-perl/File-Remove/Manifest
+++ b/dev-perl/File-Remove/Manifest
@@ -1,5 +1,7 @@
 DIST File-Remove-1.57.tar.gz 22157 BLAKE2B 1dff9819789795497491f17f24887f701e519adba507e4cb3e833a4921598c043bfe3fb5f00565e8e58593500be1c9a98d5f156cdc9d5a815ddb0e704095cef9 SHA512 dec41e9ffaabe953e72386fa0f5112fe6ebaac0fdf6752256749162d505aaf17b905500fcf52d0cb2ef944788b8e13cb3b2cf37be8671a47aab9081e228bc92e
 DIST File-Remove-1.58.tar.gz 25575 BLAKE2B 20673b6384817cc93378a1bf7a6b0cae52815a8d4d5ada2727d0adf26abcfca31e144bd9ad8267cbd1fa8b1f8860cc529db9e336e8da7cc1a6d568701920914f SHA512 2d616751328d57ff6975775189f92745fb3cb1d69675049ebddd96a2612c11c62c1995a70720efe4e73a9c10b9a2ec5528b90d468815e7c2ee395145241608e2
+DIST File-Remove-1.60.tar.gz 25997 BLAKE2B ffb98155d757bae6ec0d4f56dabdb78749fc968845e284797d0f0611fe9068722a007c7e0e890179720745d1451c926575949f36642dceef7071468a2863c7c6 SHA512 7781629896f16f0b34574a879803473002249c32cf03001f4c1c290edd379571d96d5b1049874f9f71bdb8d7881c3f30a86dcdd0d4f42b4e78998cd6a96de750
 EBUILD File-Remove-1.570.0.ebuild 696 BLAKE2B 4087300a325e12c6b1bce6159319ca749fd3618ae4c1f52e8fc4e233ceec860f0d22252b3d93c59cc81cc20afa20b39535947c248ba3e7c7ad309ec203995694 SHA512 f68781624ead53acfaf9b983263d3c8bd3a9145944cdc10c68740147baebd8a1a9ed891c294a3367de7091be6c1f1c83c6ccec2c61d11fb7721aeda7ac60b4b1
-EBUILD File-Remove-1.580.0.ebuild 728 BLAKE2B d8da11de70f706c15d9ef01fa727b06a0baf1dee04294af24b9dba9b0f25e444591f6c01388d3f5bc3d54d2d5b7cdb5ce77c8297392510def7d59e050c398074 SHA512 fe28f832f3092d6b61061e432a2f85fb271d6d935fb8f6d50aba183dc7a33a3ddad47af8e1ddf7e65b662b6b80de2f57a9343392c834618cb80cc2e77c7c9e8e
+EBUILD File-Remove-1.580.0.ebuild 722 BLAKE2B 6ea759b7afdae9a9de30a2ebd0338ed0241ffb0a8b8a6cf085fa2d54a39c2c224f2ed5378930ee523dd859b80ed6cf920864869e7216e03effdd83ce5f4b8969 SHA512 a5cd7ae4b9fdb16ffb11cc49be49a912abcdde2431c21d09fcc34e4738cb0c798b20ad5a76ce48cdbe49d175b2f1e0a8aac5d8678a8272e43c30e0723237736a
+EBUILD File-Remove-1.600.0.ebuild 707 BLAKE2B 19a50f323a7e0d9b7cc82717387df559354b6d843b7c15446a38fed8cfe2538d6bc0663a7657312c192f1232fe66457d7c4a8ac32cf3a35bf546da371048d4f8 SHA512 42384718ac9f51d8995a8bc50a763ade5ff4ab953b5f218b4a51af228077ca1759f72a4ea57cec31a72054ec5077640c471c3b18819275c2c1f36f8d2df14d70
 MISC metadata.xml 394 BLAKE2B 12f606d262b6dcc55390f4d23a8aa7624ac0c09704ca261e7698404b20d16d4f31cc09ed6fa6516cccee1f20bf7cf895dbc13af15d7e2fd08008541ddb6c932e SHA512 a7ac4d8ecc1b0e4be8268ce717e2ccd67dc652719497f8906665347e8c33d6c85c53e88e340fd34382b9cc41c62b7e098d491b8a999365ec11f6fd02b363723e
diff --git a/dev-perl/File-RsyncP/File-RsyncP-0.740.0-r1.ebuild b/dev-perl/File-RsyncP/File-RsyncP-0.740.0-r1.ebuild
deleted file mode 100644
index 8d726fc79812..000000000000
--- a/dev-perl/File-RsyncP/File-RsyncP-0.740.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=CBARRATT
-DIST_VERSION=0.74
-inherit perl-module toolchain-funcs
-
-DESCRIPTION="An rsync perl module"
-HOMEPAGE="http://perlrsync.sourceforge.net/ https://metacpan.org/release/File-RsyncP"
-# Bundled files make for some weirdness
-LICENSE="GPL-3+ GPL-2+ RSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	>=virtual/perl-Getopt-Long-2.240.0
-	net-misc/rsync
-"
-BDEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-0.700.0-make.patch" )
-
-src_prepare() {
-	perl-module_src_prepare
-	tc-export CC
-}
-src_compile() {
-	mymake=(
-		"OPTIMIZE=${CFLAGS}"
-	)
-	perl-module_src_compile
-}
diff --git a/dev-perl/File-RsyncP/File-RsyncP-0.760.0.ebuild b/dev-perl/File-RsyncP/File-RsyncP-0.760.0.ebuild
index 8f1d9c6227ff..129d48d63e20 100644
--- a/dev-perl/File-RsyncP/File-RsyncP-0.760.0.ebuild
+++ b/dev-perl/File-RsyncP/File-RsyncP-0.760.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ HOMEPAGE="http://perlrsync.sourceforge.net/ https://metacpan.org/release/File-Rs
 # Bundled files make for some weirdness
 LICENSE="GPL-3+ GPL-2+ RSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	>=virtual/perl-Getopt-Long-2.240.0
diff --git a/dev-perl/File-RsyncP/Manifest b/dev-perl/File-RsyncP/Manifest
index 424a103f9796..477109989129 100644
--- a/dev-perl/File-RsyncP/Manifest
+++ b/dev-perl/File-RsyncP/Manifest
@@ -1,7 +1,6 @@
 AUX File-RsyncP-0.700.0-make.patch 980 BLAKE2B 997e84bdd3183c324e76df69279fa00ec09663d73906607b3a0d2518d73f8391aab2214221bb797dadd4031b6f1e195f465cc5153e004c1e415a5ce4da9c8eaa SHA512 dccabb516cb4036efd8372c36343b02916ec1576c64f5c449eff1e7f0aac450f732ac4b190578426c52cbfedd3e5df28b4851cf350621a381b605065f473df14
 DIST File-RsyncP-0.74.tar.gz 167122 BLAKE2B a5a5d3fee8301710ce36ba493e8b20c5ac5835f669cd35462bbe2390432b59e4ee38a8b5585cc8616fe11d646bfd4c4a2477b328584c526b4ed354e7b4ee7abf SHA512 0585c2f0b145875e9a13523d829b2ed9907e1e38c526f630a79a5b5dab36b6a9012375620ae92292e5977735c106bfab905bb121f56df5ca4494e1efcbd02cb6
 DIST File-RsyncP-0.76.tar.gz 167744 BLAKE2B e718a8cd18f3bf7c3d8b9ceb440c19b9544c232f2889532a15023ec1da6947085d4d07efb7edf7b1366830005f784e03b76bb9526d5ecb0072b3c0ab5fb88494 SHA512 b81d9ce63181605939e8aff87c9e56ab276899f019f44eb3f149e7ee0d44a94fcbee771381ebe6ca8281c2de0d57d9cbdbcb972ccb7406a0aefd920040603bb3
-EBUILD File-RsyncP-0.740.0-r1.ebuild 715 BLAKE2B 00cc6360f817c6f335029a3f37f27ffaf6391f9f6c81ca76a6e000c58c337e32649d515a61e7e877c465dbb4ad75ffdb4ff56b382297e3a624c58ea6701589e5 SHA512 83e2f810a99dcb7cc4b7cf3c10daa5d7e2b828609f27bae745765946463e0b3564cfdf02b37783527ceed5868de8b49994a8bd917ae76da2836b8349ea91b44f
 EBUILD File-RsyncP-0.740.0.ebuild 558 BLAKE2B b09dba2266a301437bb1d2949cdd82bc6d574e6a9873ad0cc904a80c48b22f952f249095415f3a5a6b24ee8f48f6e8bd09a99c3caa1244321b2f3e8344f75f3f SHA512 d60837035a4c5da60cff66428987b1f13861047c9fd11d5aa4cae05cbf96a50b1929d9299c33f47e4d6f2d5a35a9fc44519ad72fbef06e2767c9555811fe9c03
-EBUILD File-RsyncP-0.760.0.ebuild 715 BLAKE2B 7901d903076f9e99ece5250fef47185b921325ea23720c6fa2c3bdaf53f2fd17f2670e3e48abd5aff73c74de3d4a4c84d0aba84d34bb55a09cc8c43a6970f280 SHA512 fc95c73a91054672595f03a404c8fe3c454b031a2608725fe8605e711387b1b722e2b3235d79fcd9b2e40f09d9bb38660806a56797d9e3d9e6ff4ced2c484286
+EBUILD File-RsyncP-0.760.0.ebuild 712 BLAKE2B 3192b8f7eac3447540d27012d25b8aa322fe3092567d88db1582764f6baebdd43849803bb2189464ea052251f046ceec6ff65e79eee17711ce0e599fe6bd70d4 SHA512 6c4e7d15e2e178c57d353eb896a93342bd6f5b7909cfbc0808f372faa407683a135bf4c7ec9c1ba80b5c074d8aa20e3910f65ab07d465ea123f77fa724ce5937
 MISC metadata.xml 653 BLAKE2B 642c61b5ad211e758076a4d1bbdc4d58d2a22cf86cc785b338411596a388ba1cea7fb495ef637d42ec954ed4189c3d02afe389cd6bb46d18b5cc98fff111f8df SHA512 86a6bbac2ff781bd326a976880fc1f4abe06d2f96c89ed1c1018363034a836481aa16ea94dba68fac659d18ec69e5d5fdf545a4173e904382190f2b5fb7c0f92
diff --git a/dev-perl/File-ShareDir-Install/File-ShareDir-Install-0.130.0.ebuild b/dev-perl/File-ShareDir-Install/File-ShareDir-Install-0.130.0.ebuild
index 73051c86f735..b5d60e097b0e 100644
--- a/dev-perl/File-ShareDir-Install/File-ShareDir-Install-0.130.0.ebuild
+++ b/dev-perl/File-ShareDir-Install/File-ShareDir-Install-0.130.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Install shared files"
 
 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"
+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="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-ShareDir-Install/Manifest b/dev-perl/File-ShareDir-Install/Manifest
index 3bed2c3958b0..43ddc3ad0270 100644
--- a/dev-perl/File-ShareDir-Install/Manifest
+++ b/dev-perl/File-ShareDir-Install/Manifest
@@ -1,5 +1,5 @@
 DIST File-ShareDir-Install-0.11.tar.gz 31187 BLAKE2B 4be6bd829fc9b2784069ba3ee8f54fadd390e3bd003d43a7754f3469fc14c01a5587044f045abe806688ed4442088256264d983ccf4080caec8b8062912e2acf SHA512 6611f6c3221ec52db7582f30b2159dba22ca8d899666526c069298b3350ced9e3b46872baaceb30f7a27e3c744c929ca4967fa820d14bbfdb41e5ed5485a9f72
 DIST File-ShareDir-Install-0.13.tar.gz 31191 BLAKE2B 53bde507e8fcd0c75030bd977bc6a55d6da810c99102269e46042ebe3873d8fbb224d967cafa87dee4bd02ca18b968f525129986bf7204f84251d7f86f0588b3 SHA512 a119e38491fad8ae0ebd95913e3b608e09a2b99376a5160e75083a28abe4f83c4f6a36df216365527ff87bf8ec095254b16a2f6d2515c69f34609df8672605ca
 EBUILD File-ShareDir-Install-0.110.0.ebuild 867 BLAKE2B 0ba01b0efc73eda28fc16a1beb910272b2227bbd21c971cac32707fff6e0fb79e8d445c3db3eb1ed63367b4baa118ba00de7c0e6e80b3c39925740775fcb3ea9 SHA512 12342830cbd2a3d884073f47266030dbbfd4fbd2081d5e261ea446d5a570ff31243ba3540e0fd4d4e55a5d69038b3d61dbe923aadc3ed3046c978cc6a9ad0859
-EBUILD File-ShareDir-Install-0.130.0.ebuild 672 BLAKE2B 3687a9308bfe6fb2e13655c2638442c845f06ce3379155ebf03ebb7ef68ac763eb72bca782df296dc36d83be71181bcd3f73bdfdb803e2a1a337a5655e4a2d7b SHA512 19379fd8941ace9a75088cc6a3f29642f6e9dc2df93d4d86747e89646e1fa842d66d003f9a36256ef6e5a126f1f94bdd21cbe9e5a445f4e923e7bcaa018face0
+EBUILD File-ShareDir-Install-0.130.0.ebuild 664 BLAKE2B 8968c7e73fe46998357c0975aa9b8060d7c253de2026feb61c39ba7b4adea39ed16140a43ca5f2d9d662efcb6fbd718888bf6039f0e2026b2aef75291e706b1a SHA512 31ff3557787555f6ec8369eea1dd1c2fe68f92576f635941183852ea8f54dcafec6e3d2543335afb7f2111fbf1ec7fed42b0b382f7254c97603fdef55cfd8f5b
 MISC metadata.xml 415 BLAKE2B bb5f387e0912230ab8096ba0ca1542b30665647f37d0989c7dc11619978bef2ac9e64b0668f46cd70205fc20b820f879657e705a96e35e481aa98388d232db5e SHA512 0bda1e6c71c01da3c4062b9d29b71377874971cebb570d0cdc5289680c864f5ff6879b557698ef4fadf86475ae62ba6904d59bd85a6bbda3be9778f4f21eb986
diff --git a/dev-perl/File-ShareDir/File-ShareDir-1.116.0.ebuild b/dev-perl/File-ShareDir/File-ShareDir-1.116.0.ebuild
index 73a977979355..5c6fc3d56c95 100644
--- a/dev-perl/File-ShareDir/File-ShareDir-1.116.0.ebuild
+++ b/dev-perl/File-ShareDir/File-ShareDir-1.116.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Locate per-dist and per-module shared files"
 
 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 ~x86-solaris"
+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 ~x86-solaris"
 IUSE="minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-ShareDir/File-ShareDir-1.118.0.ebuild b/dev-perl/File-ShareDir/File-ShareDir-1.118.0.ebuild
new file mode 100644
index 000000000000..70d494cbc177
--- /dev/null
+++ b/dev-perl/File-ShareDir/File-ShareDir-1.118.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=REHSACK
+DIST_VERSION=1.118
+inherit perl-module
+
+DESCRIPTION="Locate per-dist and per-module shared files"
+
+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 ~x86-solaris"
+IUSE="minimal test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!minimal? (
+		>=dev-perl/List-MoreUtils-0.428.0
+		>=dev-perl/Params-Util-1.70.0
+	)
+	virtual/perl-Carp
+	>=dev-perl/Class-Inspector-1.120.0
+	>=virtual/perl-File-Spec-0.800.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	>=dev-perl/File-ShareDir-Install-0.130.0
+	test? (
+		>=virtual/perl-File-Path-2.80.0
+		>=virtual/perl-Test-Simple-0.900.0
+	)
+"
diff --git a/dev-perl/File-ShareDir/Manifest b/dev-perl/File-ShareDir/Manifest
index 937402205e76..685f2403235e 100644
--- a/dev-perl/File-ShareDir/Manifest
+++ b/dev-perl/File-ShareDir/Manifest
@@ -1,5 +1,7 @@
 DIST File-ShareDir-1.104.tar.gz 20500 BLAKE2B 567327d46e5ecde5c3ca8044c6ff7af5b502ba88a35eb3d697f73732338991e0402b1d1143f8ed364a4d76162996344bd0bebf91695e2242be3b0d8185ac2f23 SHA512 0fbe1a1b822e0de324fd05c7cc230a1022e74eb7ae9ec66281b57d2c4144a600f34395cfbfa08218b64a88cc2bbe3ab94abb6339cc65aef19a82191e1ba2ed52
 DIST File-ShareDir-1.116.tar.gz 27487 BLAKE2B 88b898ea6d139b21bf9f64f183c808192e3bcfcd260524aa5e03b4ce05211fc8d5e0d5ca8cf9f1cad8e58b7ff029835cd35cb343588a9b2e862e612549cd1c0d SHA512 5fcd75254c446f02ee377e6b5848baad95c73779b8525b0ee1699fe675ddd2bd67d0dc057f47b0991ec136de16e06a4891a4b14a78bd96c3e2468640053bbe0e
+DIST File-ShareDir-1.118.tar.gz 29631 BLAKE2B bdb2c2d786efda84567d56611fdfbf027665e6d0df21a1e4bcd92824dfa32ac9272cf4b2fb0eb2260317957af150df8a6919027bc664c594ac931ad48cec3f0d SHA512 890f33e96333f7b07707d722e59e7da9a287112062814ef294594ac67f2f7349f905c009e6cd70d3af3a4de85335b074ec5a61194f9b0495f3e793d6ca635853
 EBUILD File-ShareDir-1.104.0.ebuild 720 BLAKE2B 9817613cc6cb6efc67ce96f2c86036ed45640c43ebcca8127134f053d6e9e05a3c7dcf8962f070d5e37c73ca03f2a4895566108b188b526366fcf5538fa1fb54 SHA512 97c1ddc784812006ad4c79c23754fd9943fc919662697c855bf439c21ebdef695208b43db1be614d737f1370dbdf7d6ccdff3f52adbaee7a43e4a19e14426939
-EBUILD File-ShareDir-1.116.0.ebuild 1024 BLAKE2B e6d692c3bbcd053e0152f1379c39432bd3187e7be7f07fde147ca829ad3f7fb6c920b91b581b91103978d81e2616b8ba8bfe8a3dd80f1dbdb84bf52ded479a96 SHA512 5f76a8ef708bf9673c8fc70db4de9d815b861d1f2aaf9b7358fa79e088b9d3297d7b003fd796334b286fb60ba87f4b20c19dfb28b8977984b6530ae36252f18f
+EBUILD File-ShareDir-1.116.0.ebuild 1016 BLAKE2B 2046351f19de04add8335bbe60850210adc5f330a7875b0bfaec0c96505acf7008ad86420ab09105b8c8b1cba74e328d6b81deca7c427a4b7a6bcd53d6eed28f SHA512 0e7e6037fa98abde8263ed86fb384eb535af41fbc2bc64becd03e4168bb6c0066a432207cc37af755ceba508072c7b95295e3c705c3aa4c0536c1a6c12ccb8fd
+EBUILD File-ShareDir-1.118.0.ebuild 826 BLAKE2B 88aa4c4b1cef86202086e29a473607d7cbb90a63e0fb458b033932ba8c9220bc442c0060e2cc1f4ec594a6fc2b53feeabd0c52dd4abd619e086f92d9313a405c SHA512 7d1395e6333f7cf1f639523a11a75a682a389e13b7107ba09d99d3d57b515a71b4d495bc4e850ef17272ba4093295bfe3d7c58709015a046e22b16ae71510e78
 MISC metadata.xml 398 BLAKE2B 393f7f6723e23146e3c509b6fe955eaaed1800a4fd5b07bb01e793a4f4fa4045e75bb9e8fa19a7fc3ee424ef4e890465fdfb1d33079fb05771c8ce3b6ea9a185 SHA512 f13082c7aa0e876a02c76e56d91d53fcca5e0bf56b4b32c8219a4f18349287d07ad93f61bd2db22b213a90312534112fbe2d7cf493dbbc91633ef63115bf72f8
diff --git a/dev-perl/File-Slurp-Tiny/File-Slurp-Tiny-0.4.0-r1.ebuild b/dev-perl/File-Slurp-Tiny/File-Slurp-Tiny-0.4.0-r1.ebuild
index c67e9d660f6d..30ad335b02ca 100644
--- a/dev-perl/File-Slurp-Tiny/File-Slurp-Tiny-0.4.0-r1.ebuild
+++ b/dev-perl/File-Slurp-Tiny/File-Slurp-Tiny-0.4.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A simple, sane and efficient file slurper"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-Slurp-Tiny/File-Slurp-Tiny-0.4.0.ebuild b/dev-perl/File-Slurp-Tiny/File-Slurp-Tiny-0.4.0.ebuild
deleted file mode 100644
index a53631b00ea5..000000000000
--- a/dev-perl/File-Slurp-Tiny/File-Slurp-Tiny-0.4.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=LEONT
-MODULE_VERSION=0.004
-inherit perl-module
-
-DESCRIPTION="A simple, sane and efficient file slurper"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	>=virtual/perl-Exporter-5.570.0
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-File-Temp
-		virtual/perl-Test-Simple
-	)
-"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/File-Slurp-Tiny/Manifest b/dev-perl/File-Slurp-Tiny/Manifest
index 02c27debf6fb..669bea12a38e 100644
--- a/dev-perl/File-Slurp-Tiny/Manifest
+++ b/dev-perl/File-Slurp-Tiny/Manifest
@@ -1,4 +1,3 @@
 DIST File-Slurp-Tiny-0.004.tar.gz 12841 BLAKE2B b6b5f418ccfaa46aa5fcd199c0417a9d81af12ce2196c0094969cad192bfa4e97e578922bb9c62d9e7400b15faa9da3de6496f7b2844157312b909d921e34c9a SHA512 916af1da5375ced4ebc00cb2b908e53b027e7b4fcad9069d5109eb2c0623faaa1d2d4fc8aeefb22861c7304ec913696cec85c280a82fd9aa7236c902427bc5cf
-EBUILD File-Slurp-Tiny-0.4.0-r1.ebuild 638 BLAKE2B f16d7260d6f1a752567d9bec395d48432b63a62ed35700e4ba1ae063a8f0a1721004e6a1c8ed3ecadfc5cd02b9e1653d9e98976de694848c7128f53784c8879b SHA512 ef7aa2dcb230e34e7a78dfd84866e75335e4b5f51f311b404ab64a9f389de60ea848dfc75216930ad70b765491f7d167102a2682e4fa27c6d88fea1f06032bd9
-EBUILD File-Slurp-Tiny-0.4.0.ebuild 634 BLAKE2B 18a8442b152465e85d53a0f2fcc16c2ce16260514e6f023b02c14d67ab5c7cc4d01eb4dd130c5023ecb7f021f0756afb25ebc9de5aa11f759f27a48f5d52f5d2 SHA512 86efa7aef1f1b289546a53a2e0f1397a253d01d8491b51b2aef8af62bacfd8b9b785d137c1f795168caff31289959e2d02e1c44a30b4469d1e29a6cbd51de807
+EBUILD File-Slurp-Tiny-0.4.0-r1.ebuild 631 BLAKE2B ab840152ab09126e5a2abfb1349903ffbbff19e8d859d1e39893cb732768e9b8ad9d418758434d3b229116344ef264fa50d3419ccb5ffce693bcda866c402cd0 SHA512 1e1915c30546b8a7938f480eeb01af96049ef890d1e5f88c829c6dd5a777fae46501c66951b2367e4e3ddef107df3856cd47bccc853d3d45ff2882cfceceb8b9
 MISC metadata.xml 472 BLAKE2B 250549206ccc8d735348a9288c9b5a9f7e7ac6b6d1d2882173c0971bcd7cadb5dcf5b661e8e78f4e1fd1ffdec46645a75a0863e723adb59754642937b21ff165 SHA512 f2cd690dc0b73c7a061d3831c5f3cd30dbe65ed5c845c80222ed2c23b41758efc0381f2bf535960332d5805d0558132155881fead1ffc6dc1d428fb9bf47c29a
diff --git a/dev-perl/File-Slurp/File-Slurp-9999.320.0.ebuild b/dev-perl/File-Slurp/File-Slurp-9999.320.0.ebuild
index 96234af416c6..a8e8fa4ee709 100644
--- a/dev-perl/File-Slurp/File-Slurp-9999.320.0.ebuild
+++ b/dev-perl/File-Slurp/File-Slurp-9999.320.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Simple and Efficient Reading/Writing/Modifying of Complete Files"
 
 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"
+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="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-Slurp/Manifest b/dev-perl/File-Slurp/Manifest
index 34edda0fe603..51bdf3462d70 100644
--- a/dev-perl/File-Slurp/Manifest
+++ b/dev-perl/File-Slurp/Manifest
@@ -1,5 +1,5 @@
 DIST File-Slurp-9999.27.tar.gz 37734 BLAKE2B 2e2589b834e1092a869a9527395d9ed589f0dafac99b13ca3e802c4bf159ebc55f7b28284a13effdcbd476b7c7d7727a9b25735dc9f9b1711a9ec63444d44888 SHA512 24a5e2b93f7fda65cbdf0e54687de3af511cfd3909dcf4c79610882bf4f119afdf2bd60de28fcb8d9155b94a29ca4f901e28930a810949e490ba1c584d7a6ee0
 DIST File-Slurp-9999.32.tar.gz 34574 BLAKE2B d75d7253945908328124ef46f53d86fba7ba0751e87ae493f071b03844d17b969371d1b26fddbc94f4b788475b09b5ee76c3d2c0b6f1c0c64959da0be95dd0f0 SHA512 413337e0257e95e8e8d2aabf684bec81e746000a741809935b058490b8c42b494064f724e618b250330d8bb67a0a7a2a5adad17e3e6c96d4b193531a192a4d56
 EBUILD File-Slurp-9999.270.0.ebuild 772 BLAKE2B e08445df8db472e70fc58bd69a2fdb24a9f194d4853286cdc9c72238c63bd2eaaeb3a27532234bb622b11b2174e2b5353146cc97033c007a7142ebf1f46cf64f SHA512 9fbd6cae17584030acc8d45a7a92fa09a72cbcf6a1efc50033a453960c978f10a35a1f999cd07510b63e82b6b47b62e56f1038683903a60c8e705ec0d3d1fabf
-EBUILD File-Slurp-9999.320.0.ebuild 837 BLAKE2B 29ec91cfa0d57a6a1d375e824a5100d6eaa64eb8dae7d41258ab969414146c044be3c7e86a54f3072211c06fc10ae64f6ccf9e68150de2754d66d12e4ad4ef69 SHA512 d4452c6a84dbc29ecda63d2dbaf0d52b0705a0b6e783feee236a38d38372c023520ccaac54e1d35cd61f8cd1d134df8d35f1e225631e10fb20fbc59157210a68
+EBUILD File-Slurp-9999.320.0.ebuild 830 BLAKE2B b21e3bc7cfec028114209db3ca3ec77124a02c026c0c9bdde50b7128b2fcfd791419eb844c6a6eff8399bf323a598da75054078f85e04c848c203fcee9b3aa7a SHA512 1bf3927fe43734367b0eb275d5bf58d41ddf1efb6f21e788ec0b9b7caeacdc6c098a0bc8f947a7673c56ae6d1869ba5319d8df5bc20e28395120ecbbce1b2c7f
 MISC metadata.xml 392 BLAKE2B 1f26c92590188aceac252580091405f51e615666b62b9a6ad2b0ae2a980a42aecd02abb1179d848d1dc7de16505599697b544e182c58f178eaa4d766642fcb1a SHA512 0523fea20212b3d74c23ec0ab59a1ee4db16d81ce91f742569c9d6c04e23e7637a7a0aafd7eb8b42cbc059bfdef27ee8794b8ca89a82f8d284f14916fb4af7b5
diff --git a/dev-perl/File-Slurper/File-Slurper-0.10.0.ebuild b/dev-perl/File-Slurper/File-Slurper-0.10.0.ebuild
deleted file mode 100644
index 775296a1c87c..000000000000
--- a/dev-perl/File-Slurper/File-Slurper-0.10.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=LEONT
-DIST_VERSION=0.010
-DIST_EXAMPLES=( "bench/*" )
-inherit perl-module
-
-DESCRIPTION="A simple, sane and efficient module to slurp a file"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-perl/PerlIO-utf8_strict
-	virtual/perl-Carp
-	virtual/perl-Encode
-	>=virtual/perl-Exporter-5.570.0
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-File-Spec
-		virtual/perl-File-Temp
-		virtual/perl-Test-Simple
-		dev-perl/Test-Warnings
-	)
-"
diff --git a/dev-perl/File-Slurper/File-Slurper-0.12.0.ebuild b/dev-perl/File-Slurper/File-Slurper-0.12.0.ebuild
index 35a8148339b0..9b949edaebb4 100644
--- a/dev-perl/File-Slurper/File-Slurper-0.12.0.ebuild
+++ b/dev-perl/File-Slurper/File-Slurper-0.12.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A simple, sane and efficient module to slurp a file"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-Slurper/Manifest b/dev-perl/File-Slurper/Manifest
index 9bc239c80932..4a68949f8e3c 100644
--- a/dev-perl/File-Slurper/Manifest
+++ b/dev-perl/File-Slurper/Manifest
@@ -1,5 +1,3 @@
-DIST File-Slurper-0.010.tar.gz 15905 BLAKE2B 92ead775ff7c796c0cfc7631160e7483b9defec4d603e9d5a7f7f3380788f6af2a2463f1c0fa66f21339f8a61651e4e9b48ffc829ba9765158c911df4531ec2b SHA512 a6e2a86d76d2e4c49a8df17a453a3da530cb62324cb91793c4bd6e7cabc4f5b4b4fadda8aa0f98390ac950a94a4b82cb3ec547caaba88bf61ec0aa086e298832
 DIST File-Slurper-0.012.tar.gz 15517 BLAKE2B 07f451e93e5fa8641a4b8156a61b9a9c1a9c9dc36b33c4991e1686e44b37730af3a9541de33396cdec6bac1d08ec1bf9db505e6fa07f3c95187c4901016955a5 SHA512 276b510c85b4e28fff4b8bd77c81031367b073426138743efb5d54fe01fa9825409f86090788779e96625b43207d1f864f348cc11554c51d36868dfed568f2bb
-EBUILD File-Slurper-0.10.0.ebuild 783 BLAKE2B 78886f385c875e4194b98a9c25656dcdf45fa35f6c895c90d029b71896987203ccab3c4cc4d395dc606786e9d2c30bd9f54d3d7ceb7bba908e8814ec39f20108 SHA512 60bebe87fd076192bcc4ccb0ef2193cedd076478eade8d406e84d4a55559abc1da8823c3e183ad125384218d7eb64e31504078bf4af9413c819859f19d7feb28
-EBUILD File-Slurper-0.12.0.ebuild 797 BLAKE2B 09cf4b67282f0a055d65480af9ef3344e65864ee47629819f2ae8ae084c3ada8a63ddd1e4f685daa99333802b6796dca608f9efecfe9426b2b6c28208a0982c9 SHA512 87000dc94148db12cdef69a2eabe8327034e995e0193c5895b975999cc24ba99e308d4c9516d72500a2b012a835b616b8ab63c0288f65a9443ed731d38e1aca0
+EBUILD File-Slurper-0.12.0.ebuild 792 BLAKE2B c6c475dbe22be02ce39a881848f8db7a0f86661ab22b08306da65d03c97d54ea2d668f196c2d607eade5493536b84bf3d5c907e5aed265a9d2ee7346fff83786 SHA512 1db3b055a35c1719235a6b5885124c50d3a07f8ff112ece7bddc38351461dd042c38c5fe2a2834345bebdea7756646e6cbdabb08ae275c4d4df94d3c282f7e4a
 MISC metadata.xml 481 BLAKE2B 2f8f554f6beb1ed6ac889fe379ff15c4bd76fb8ad050ea6a14f400572aebce11a7bf91468d62ec2844c00c1827928809fb48344f326b55b61f3e4913842641cc SHA512 62906c3487d2b3b8ea9bdf5a5d6fd6aaed39500bc41346fb918363771220742c31de061eb825916f3897a229e8b92bbff87a9181551718cc3fde1eccd9b60600
diff --git a/dev-perl/File-Stat-Bits/File-Stat-Bits-1.10.0-r1.ebuild b/dev-perl/File-Stat-Bits/File-Stat-Bits-1.10.0-r1.ebuild
deleted file mode 100644
index b355febf7353..000000000000
--- a/dev-perl/File-Stat-Bits/File-Stat-Bits-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=FEDOROV
-MODULE_VERSION=1.01
-inherit perl-module
-
-DESCRIPTION="File stat bit mask constants"
-
-LICENSE="|| ( GPL-2 GPL-3 )" # GPL-2+
-SLOT="0"
-KEYWORDS="amd64 ~s390 x86"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/File-Stat-Bits/File-Stat-Bits-1.10.0-r2.ebuild b/dev-perl/File-Stat-Bits/File-Stat-Bits-1.10.0-r2.ebuild
index 3cb3a0708b90..612ffd6ac885 100644
--- a/dev-perl/File-Stat-Bits/File-Stat-Bits-1.10.0-r2.ebuild
+++ b/dev-perl/File-Stat-Bits/File-Stat-Bits-1.10.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,4 +11,4 @@ DESCRIPTION="File stat bit mask constants"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~s390 ~x86"
+KEYWORDS="amd64 ~s390 x86"
diff --git a/dev-perl/File-Stat-Bits/Manifest b/dev-perl/File-Stat-Bits/Manifest
index eeca762e9df5..3069bfd968b1 100644
--- a/dev-perl/File-Stat-Bits/Manifest
+++ b/dev-perl/File-Stat-Bits/Manifest
@@ -1,4 +1,3 @@
 DIST File-Stat-Bits-1.01.tar.gz 9348 BLAKE2B 7f281109e194f5c6226051ba3df9b220e5bf2058ffae7e46f277673c66667aee0f728f48416ce5a0ed77abc6a4450483ca02c972cf4fa2b72be3097089a47e16 SHA512 8f9f22e4677baa9b996c0b6228bfd41cfa983b9a6581fc96473c2f3d3e0c79894f31ecb44cb2c371b45be2afcc08f71c9f40d1e15c2f6655b48ef208b33d1218
-EBUILD File-Stat-Bits-1.10.0-r1.ebuild 317 BLAKE2B 0aa31ef94de3a6b0b0e2b1b09cd3de7a9636c3608bf8acddcd620cadb0861595ca92a4dede4a6005a631cc614b4d5414baa13b65008d74dcd1a81c2ac113d64b SHA512 2d25e5e2022e7bcaa7b62f092673174561c3ebd52e5833f1eba1fbd34fd47892932484fe786a3eab623216e5699d899c859c4a9b8f63442ba9f29ea1f0513c86
-EBUILD File-Stat-Bits-1.10.0-r2.ebuild 271 BLAKE2B 1af86e3560f0b869ade71bd8c6044f42b1bf025ab9d723a41c755e4ae098a506133c7e5a1796f016393893be42590fb67efd7181e7d70aedd05f85ea15167331 SHA512 5d4bb396fab100bdada5d43aea4fb018ff6240108d8513e428eb741a623af0c9dc62aae567dfe44f33b49cea30c99141e99498a1d7db9b749308df684a81b75d
+EBUILD File-Stat-Bits-1.10.0-r2.ebuild 269 BLAKE2B 095b5fc5cc41eeed37d6ad878e986166d727b4a5feec39863e59775396cdac3511f59ac9be2df640d78c9e1cd4d525e6fa8bcd83520e69d3ab9fc73e4ef37b19 SHA512 2e412a684008949d2a3944e4e6105a7dc6d6a6d0e7dcf040477454e597043bdfe5ffeac877e514793d6961634c8575c8de2fa27fb41970e24825769531b77774
 MISC metadata.xml 471 BLAKE2B dfc8fb7815748f7a1b7dd0a66e1bc37fcdaf7f9f844a7b2e1a00abcaba6d2cc94683dd6207b8f60f9a84c74ea9a408bbaca60f51cf38d4a87df61144eafb5719 SHA512 274e9b07c23cfcb0dadd89eeb8d32c2f545b6d2ee98c8d613ba861986d91a144d80cf09bf78c881acbac0ddb88b62b1677db662e34f4d3d9c2f6c8a8c06da610
diff --git a/dev-perl/File-Sync/File-Sync-0.110.0-r1.ebuild b/dev-perl/File-Sync/File-Sync-0.110.0-r1.ebuild
index d78dc62a634e..1190dca4b3ab 100644
--- a/dev-perl/File-Sync/File-Sync-0.110.0-r1.ebuild
+++ b/dev-perl/File-Sync/File-Sync-0.110.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,11 +10,12 @@ inherit perl-module
 DESCRIPTION="Perl access to fsync() and sync() function calls"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ppc ppc64 sparc x86"
 
 BDEPEND="
 	virtual/perl-ExtUtils-MakeMaker
 "
+
 src_compile() {
 	mymake=(
 		"OPTIMIZE=${CFLAGS}"
diff --git a/dev-perl/File-Sync/File-Sync-0.110.0.ebuild b/dev-perl/File-Sync/File-Sync-0.110.0.ebuild
deleted file mode 100644
index 4a16a119c596..000000000000
--- a/dev-perl/File-Sync/File-Sync-0.110.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=BRIANSKI
-MODULE_VERSION=0.11
-inherit perl-module
-
-DESCRIPTION="Perl access to fsync() and sync() function calls"
-
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/File-Sync/Manifest b/dev-perl/File-Sync/Manifest
index 258a4ac872ca..67ad0f3c6a16 100644
--- a/dev-perl/File-Sync/Manifest
+++ b/dev-perl/File-Sync/Manifest
@@ -1,4 +1,3 @@
 DIST File-Sync-0.11.tar.gz 5842 BLAKE2B d3a6c64b38a8194a5e61dd22a999430ac76cc0809d78573ce51ba630f9e2204e00931f0c862b8498284ef4e8cbe64cb8bbbca4fcd8cf35f620bb0221e6a12813 SHA512 32816efa26185f2f26d5a469aa48baf1d22242ec620b663e5fbfdda3ffb360e6d2e1c7349989fa34b8cd84567b7a312863dba2be855cd6e696f67759ef4512b6
-EBUILD File-Sync-0.110.0-r1.ebuild 419 BLAKE2B 6627dd170cbb88516321dc40e802114ad9b6355b177baa17020a6d6d3fdd9f4855f16d30354ac3ff1c2e0a13c33d04630d9fd7ac711855fbef045b65dd367060 SHA512 2f20b168b065e737b41eda82b1ab3c523220cd0ca7cbb455a7795274e4d3f0d8e9250c8334c8d312c13c0408dc8544f9ad2192a87127b20a8cb5b98253ea066a
-EBUILD File-Sync-0.110.0.ebuild 319 BLAKE2B a019545ed9e355961c916b0f90d575db2818c362933891fa8cf4eb1403b0746271881262bd497160444aa30f7885b48ada0116ac0285d0ab0d4628f447069a6b SHA512 1f9201207e6f623bbb58c504e478c0dda442dadffcf6850bad13e3f73160b80c4de259e412accb7e88fd503d29a7cd13e91f97915ba969ef118a7627a6c8982f
+EBUILD File-Sync-0.110.0-r1.ebuild 415 BLAKE2B ccf6544a915c188e3a60c4b8dec88b74b445bfdf49265c0cbfae76e78e884998feeb3589d94084ac7011c8e42e415fb044ae3782b0abbfd0148727c5323a9056 SHA512 64c03343f938f3c00644600f5370b31448e22c4874a1c777a00a82a419a4e28fe9429532b8dd712b5da4044e86136d6de13c6a44d8c226d2a811190310ad4ae9
 MISC metadata.xml 390 BLAKE2B f0e7f22c169c3298a6b16fe48a63cd119b7ec26bf42b08767192f5735b8dc047193f753527fc34977142b0989b6cafbfa80e829e58f7fcfff609d2469205143d SHA512 b6994dc9674bdabf924707e2dcc60e58137b2cb5c1fb0c5999cc0bbce65694ccd5d5bd57728e98d39e19d03c53384c177886660fe72caeb83e7b3e62894e3aa4
diff --git a/dev-perl/File-Tempdir/File-Tempdir-0.20.0-r1.ebuild b/dev-perl/File-Tempdir/File-Tempdir-0.20.0-r1.ebuild
deleted file mode 100644
index 5c263be8977a..000000000000
--- a/dev-perl/File-Tempdir/File-Tempdir-0.20.0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=NANARDON
-MODULE_VERSION=0.02
-inherit perl-module
-
-DESCRIPTION="This module provide an object interface to tempdir() from File::Temp"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/File-Tempdir/File-Tempdir-0.20.0-r2.ebuild b/dev-perl/File-Tempdir/File-Tempdir-0.20.0-r2.ebuild
index 774777b76841..fc57a2b8b49a 100644
--- a/dev-perl/File-Tempdir/File-Tempdir-0.20.0-r2.ebuild
+++ b/dev-perl/File-Tempdir/File-Tempdir-0.20.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="This module provide an object interface to tempdir() from File::Temp"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86"
 
 BDEPEND="
 	virtual/perl-ExtUtils-MakeMaker
diff --git a/dev-perl/File-Tempdir/Manifest b/dev-perl/File-Tempdir/Manifest
index 660db365a130..2bf2833767ca 100644
--- a/dev-perl/File-Tempdir/Manifest
+++ b/dev-perl/File-Tempdir/Manifest
@@ -1,4 +1,3 @@
 DIST File-Tempdir-0.02.tar.gz 1768 BLAKE2B 5f9350717e3b0d32f2bd9b09e42f1f4b5742ce6d7bf372665fbaa99998f964c26a4c525c152393a04f4e1d37d8604a9f2919a2dec763e1ca39e7a719687aafcb SHA512 8af7dff03dfa3575ade1c8178159901350fe322b6b9f23ef275e292b5856104ff13bb48222c9f42d5087c54b4fb8e5e87513c2946b682a1b047623042f6b34e4
-EBUILD File-Tempdir-0.20.0-r1.ebuild 337 BLAKE2B ae07fb656ea1dc67f5c9b3e802c1de248335d7aba67d2a740cb5fe1364dc8fa77175db0a5d05289517fb5af2def6c60926c1f1180a7c3c8a2217f2fa3a0ccb32 SHA512 c1eba003f3854d50b40da007eabab5506b1e6bbadbd04c7907c3a7471415d4b1072ac2d086d861842f690e2d7acac5c2b082b8edc2e0a5104045464000ecc4be
-EBUILD File-Tempdir-0.20.0-r2.ebuild 360 BLAKE2B ff3305e80464d0d1b01e34382e6cfe64369b3c5f88ce4a6f1ee461ccbd99c87cfe236874b672b55b38f5c36df189ee4d8180fe9554ba2f334d1e7c3fdb38ca3f SHA512 987be6d32ded96ee6f0bb029f3deb1826a50dd7076ef4934a4d8a0bf9424d14da6e5131221b3ab449c6b019c8a09bcdf73c11c4c4dcfa5d93c14326e5b441033
+EBUILD File-Tempdir-0.20.0-r2.ebuild 356 BLAKE2B bd0a63862527e85b936046009dce7b490e7dfbf9ade7d1602e31e09a5aba0a275ba52c5e150b44ff129fe6697e030798a2d94eccaed079d51e600b8034f09eb4 SHA512 6ffa0046bfb91fb0c3e4129d2fb14b9e1f19762c9251492a7cfd791566b66b82bdf4f66e4ef184d8b2fdaf47ed173673d5f248e4018c2a5fbfbf015a06247f13
 MISC metadata.xml 396 BLAKE2B 724d8d739bcc0177d15563facb9ce65a2396d484754dd33133a6efe79499e252b7466a9e72a0b80f503544a343ee4cfbfe9e2098062b6cf27123baa17e749261 SHA512 07b0000860bf6da6832b3e574bf90f1b2d1b89ea09056bfd24df7c798d45dd8077c2f67ec0b4caa9cc476119cf7fc4b223a15118edf497c59c062f989e9679cf
diff --git a/dev-perl/File-Type/File-Type-0.220.0-r1.ebuild b/dev-perl/File-Type/File-Type-0.220.0-r1.ebuild
deleted file mode 100644
index 6f002496283e..000000000000
--- a/dev-perl/File-Type/File-Type-0.220.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=PMISON
-MODULE_VERSION=0.22
-inherit perl-module
-
-DESCRIPTION="Determine file type using magic"
-
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.28"
-
-SRC_TEST="do"
diff --git a/dev-perl/File-Type/File-Type-0.220.0-r2.ebuild b/dev-perl/File-Type/File-Type-0.220.0-r2.ebuild
index 9bcbc7a65e86..afa3744c1609 100644
--- a/dev-perl/File-Type/File-Type-0.220.0-r2.ebuild
+++ b/dev-perl/File-Type/File-Type-0.220.0-r2.ebuild
@@ -10,14 +10,14 @@ inherit perl-module
 DESCRIPTION="Determine file type using magic"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ~hppa ~ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=virtual/perl-IO-0.10.0
 "
-DEPEND="dev-perl/Module-Build"
+
 BDEPEND="${RDEPEND}
 	>=dev-perl/Module-Build-0.280.0
 	test? (
diff --git a/dev-perl/File-Type/Manifest b/dev-perl/File-Type/Manifest
index 50f008a664c9..55d17a1639af 100644
--- a/dev-perl/File-Type/Manifest
+++ b/dev-perl/File-Type/Manifest
@@ -1,4 +1,3 @@
 DIST File-Type-0.22.tar.gz 157463 BLAKE2B 47586de453200d48e5731226e06a33cac75fe3eca4165323c23b3d33934e58ddd4efbabf2e803b94c9e8a567dba0e87277162c30ff163152eb9ab41175809179 SHA512 d1d673c9ffd9940c9a77209e23274a62a359798bd0df4a0cafeeef16ae59c20c890b3428a3273c3e7adbe9fdf20eeea79d4aa44fb706163f24a1c8a3e228f694
-EBUILD File-Type-0.220.0-r1.ebuild 410 BLAKE2B 2b8ba32c57090be9055035affbc152117c84c9a8bc1c7bc173afc137cc9fc0697ef0cf9c0c755b1e4a9aa1dd186482ea9f07508f29e700ab5d326f9edd20d96d SHA512 4c1457586bfa5332d3815a8961089ff744ef1b06faf3a7b2699c908da848ab0573e8bc7b70127685ca8a802e37e8efc46a8b6b953e0769da2ede16fdaaecf20e
-EBUILD File-Type-0.220.0-r2.ebuild 536 BLAKE2B dd9f386347ad9b2eb560a5ecd2ebba243cda73a9e287a2395a72177f2a6eb3f039e0d9548d925c68d0b0ea5884c608d06b078fcaf64a8e326ce1b4c2890f480f SHA512 6813366274a774cf30a823cde01ba1aabd61d742558b4364a843f37d4cdf868f73b797b5a826be5f61ca0fa40b4b22450a1cb4e6cf8ed3e3ef1672d1566f1f74
+EBUILD File-Type-0.220.0-r2.ebuild 503 BLAKE2B 66ca9b7b3b53b798b8f564b18c9815db5cc9db8c5a2c29562fd1a68e53015217db222420d2163db1bce898960f594e4464b13a9e39a1b2277ed8bdf3e2a88d71 SHA512 df51f97b96509027afaac0488c3e54fe5254330bbee23894775de6aa1fda70064e873e9a40ea78ba22c5b6728cf46c51399cf7b2b7bd191abb1c4dbde932a9b5
 MISC metadata.xml 456 BLAKE2B 5540f09c0aa0e8abca4817d257ffcddf3e229c32439b3fc44039081fc067e33e3f8ceb8d0a25baf1879cd60f1565297426e8e6fbcffa836e64560becaa3becee SHA512 6d8a4248038e065475fb78fda11253fc5c5b8ec9e6b7e99337000c566115c80d219b1ccf90f9c71147d9b0b924b164acc0e4378794d2371ec8b22c860fdb89e8
diff --git a/dev-perl/File-Which/File-Which-1.230.0.ebuild b/dev-perl/File-Which/File-Which-1.230.0.ebuild
index 66e05d5f9b33..fff8522c977d 100644
--- a/dev-perl/File-Which/File-Which-1.230.0.ebuild
+++ b/dev-perl/File-Which/File-Which-1.230.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl module implementing 'which' internally"
 
 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"
+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="test pwhich"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-Which/File-Which-1.270.0.ebuild b/dev-perl/File-Which/File-Which-1.270.0.ebuild
new file mode 100644
index 000000000000..d84b87b1b9c7
--- /dev/null
+++ b/dev-perl/File-Which/File-Which-1.270.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=PLICEASE
+DIST_VERSION=1.27
+inherit perl-module
+
+DESCRIPTION="Perl implementation of the which utility as an API"
+
+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="test pwhich"
+RESTRICT="!test? ( test )"
+
+# Was part of File::Which, but depends on File::Which
+# so this keeps legacy integrity in place.
+PDEPEND="pwhich? ( dev-perl/App-pwhich )"
+
+BDEPEND="
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( >=virtual/perl-Test-Simple-0.470.0 )
+"
diff --git a/dev-perl/File-Which/Manifest b/dev-perl/File-Which/Manifest
index f7a84e7b0a04..b7116362f76d 100644
--- a/dev-perl/File-Which/Manifest
+++ b/dev-perl/File-Which/Manifest
@@ -1,5 +1,7 @@
 DIST File-Which-1.22.tar.gz 21685 BLAKE2B ec2ecbdaf9e5f25e2d8928611a63438b0f2372f46c400159fcb3276ec8f03a244feed36d388bf89ca0abf3f844736b25abd6fed49d80e325e22a763c1980df1e SHA512 9efd8cc6d08e82a429ab3b0ec5193cb894432311338dc4cdcb73b4536a40bf4829c414e75e5dcb0d03b9190511b232f1d27e441657afa7299b0a5b882877f2d1
 DIST File-Which-1.23.tar.gz 23293 BLAKE2B 8a02bcdb27c052a344297c70cfea6b944ba004bdca9680d910cfd7b7ed30acae6365e13e00bab325254042cd8754da9557ee4cfab9d2291e5c505cff7e1662f3 SHA512 73c48642f448abdab2a3cf39409db50bb311cbd7ea352f5dc70f6e97296d9b09ab7e1738482864aa7f7e300a8f74b19b7ca9949fe3102f61e08fe08c9be2a4ac
+DIST File-Which-1.27.tar.gz 25146 BLAKE2B 9252da514e45eac03bc415a0c5eede6731f0cd05df0a7894b975edccdac338e711f7793da75a94419e1ae737034c612f595a312d20a59244b2f6572eda2822cb SHA512 8a6164c4af915e93924b1d62864e492b1c5067856e505c50b9a5cce0600d73bdcda5f7e35a9f37134d9e89949b45bbd0a5426cb56121604aea1a3cfe48d55e5c
 EBUILD File-Which-1.220.0.ebuild 723 BLAKE2B d388d476d9634df5edcd8f6a203ef288c3c83eb0abcf1a99ebfc42ced90fad7a10499f308c39bbe12a010d44916323aa8a024fb1b47f4788af19480e93fa53c4 SHA512 33b2d636ef1440b5887d50037682533c432d84a7414b743b76d35a44aba71d364f5241f01f04380ee71306c2d19648cbc03ede5fdf5b967ad41ea278ce210519
-EBUILD File-Which-1.230.0.ebuild 720 BLAKE2B 21e3bc35117ff05662ea2815569d96e256fa0b3e4446488154233023787f4e8657026be7a3000ef16e4c8285fc011c9bbb5d72372b250c33c77f6b2347b105f8 SHA512 11b3e1ba5672c0baf8a6dbaf78565567cd9a07ab3077b69a1c91a10f46e4b6392de81cd2a1bfe18b7de7e1eeddaafdc6441efa66c940bdf34e8e206ef1222d39
+EBUILD File-Which-1.230.0.ebuild 712 BLAKE2B 7996d5834ff47a97cced0d0fb387b595a054b749c06b0c7b28e8c53b71b72f6217f9ffeb7e19df7c4d98158db1ca9d766347e7745f6639fa84a6a48007c7722a SHA512 93160b91169009a6101c345f8e91e155227c649629a027d1968636e4ffa526a910d2ea2c1209e4f666ba1209603131598f40b81d988d7474c131c0673892d3e1
+EBUILD File-Which-1.270.0.ebuild 728 BLAKE2B f46299a6d4765eb1903e717d72d4aa42944885f429488c05d9c3e2ae819d66ea48882ec625c640f276f9ddb1be69b72c0bb33681b153841f720bfb43d0f0736e SHA512 d432ef90c64299c5fc34031b0747f228402539f7f71547ae6c67b3268265d1679eb3a276c260c3cb10aecc8f7acaef71d5f43b8ee3961c698e1cfd47898043cb
 MISC metadata.xml 519 BLAKE2B dad66f597916a87de8fdaac5afab5aac9a4f6aeb21e492a2eb61e15bcd354cd3e4d2dd02934b2463553c8f774ca945859103d4d127ee13c843f5cb8752dc0c95 SHA512 2f7f593061c1a254bdc712c25723fadfbbb70f9d680250cfd5d8077608dfe27f8472edc2bcf1ea50c029a1b36ddeb58cc1af900178275d6ea6720e4242a33a49
diff --git a/dev-perl/File-pushd/File-pushd-1.16.0.ebuild b/dev-perl/File-pushd/File-pushd-1.16.0.ebuild
index 67f835b1969a..3e6fa1a895ee 100644
--- a/dev-perl/File-pushd/File-pushd-1.16.0.ebuild
+++ b/dev-perl/File-pushd/File-pushd-1.16.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Change directory temporarily for a limited scope"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-pushd/Manifest b/dev-perl/File-pushd/Manifest
index 521d179d2423..1d4c8ef8b0a2 100644
--- a/dev-perl/File-pushd/Manifest
+++ b/dev-perl/File-pushd/Manifest
@@ -1,5 +1,5 @@
 DIST File-pushd-1.014.tar.gz 20674 BLAKE2B 0e06d1c527aa2cf34c2d55302ec255e4aedbeded7a9c3cc0c4d40bec0b97ddd3c49fa13ee1e36764b9ef17db293cd4c63580bc471a723bfe9eb717eabc6f2aea SHA512 f81b852b6c64d330291b382df83b6cd15c807bbefb00fc51ccbf709ee7c6deca57f996cbe86322b81adf0b14e608d4f63f969330561b7c25a4a7b32f0e3df6bb
 DIST File-pushd-1.016.tar.gz 19798 BLAKE2B 1bcef90dac2cf9f086fab915f108d01f047f532cedc9aa2ce32f1e4b5d164abdf3f6826a3b5e959b6bd745ae5067047a45b579f98e988267eeb25d2a32335866 SHA512 f80f24831c28aed6efcb036db8da2404aadf1005ed751a82c10071a24572c05758eb1785cd9d1f9fdee86a20cf83b41bd73125862d8d24bfa240cc0d6b33ccdd
 EBUILD File-pushd-1.14.0.ebuild 740 BLAKE2B 85797301668e06a00d458154caf89b42b023daa738b1c16d785b41b62a5ab3b328c6821e47801618efa9f48da8b4989bae8696ff536267c3a9ef65e2b7546b93 SHA512 516086bdf87bd42976220f1e4a3f67850af1e18dc9098320b5f51f1e2db88a15730d345316eb609488c3da4f68ede0fdf57fae6d35acd31e07dee9cb911f59a1
-EBUILD File-pushd-1.16.0.ebuild 725 BLAKE2B 6b2e937f058510f242d88a4e19a27febeb27b29c59b8208082412248f9c50f5d892c03b232f22cf389ebb048075435c50b00ec174defa22f434e9e8c84888345 SHA512 3ecc713d7dadcf577c3f8bfa70b23da43c49b1fa148928c791e62fc20e20c3d9fe10bea9f8ab5e6e69ae4e67758402cf8bbd3d40c7b845494d22a5e022b1839b
+EBUILD File-pushd-1.16.0.ebuild 718 BLAKE2B f8f242ae4b7f16228b8c52043d44a5890beb621359443148f832924fafd3aa3a7208e363c68a5de4b3ebc986ca2a8df45be3bb17ae056e4f2620964fb40d4518 SHA512 e81c210f13d9a70c3fb158c5c36ecd5681b3c18850f5b7522b6d36b47ed29141745573f638c53d028113298e17b385bf7a39a2d5295cbc186d2bb08649055f37
 MISC metadata.xml 392 BLAKE2B bdc5e64729f046e151159ce2c8003b077054d1196a911595c80be4becab313fbf90a3889334d76e661497e4a180cf34995c907cff823271772eac0cc0ee97c8d SHA512 af0eeb03c65f2b1b820087db10cfb986f176dcb78f23ff98e883e9f31878867d5fe6d161f01e9c5baefdc80fdb025c1623f50993f83df9cd24405846ba4c53d2
diff --git a/dev-perl/FileHandle-Unget/FileHandle-Unget-0.163.400.ebuild b/dev-perl/FileHandle-Unget/FileHandle-Unget-0.163.400.ebuild
index 73897cfd8c88..7d0632ad2e28 100644
--- a/dev-perl/FileHandle-Unget/FileHandle-Unget-0.163.400.ebuild
+++ b/dev-perl/FileHandle-Unget/FileHandle-Unget-0.163.400.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A FileHandle which supports ungetting of multiple bytes"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ppc sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/FileHandle-Unget/Manifest b/dev-perl/FileHandle-Unget/Manifest
index 2008a6510879..fc9e742f2bff 100644
--- a/dev-perl/FileHandle-Unget/Manifest
+++ b/dev-perl/FileHandle-Unget/Manifest
@@ -2,5 +2,5 @@ AUX FileHandle-Unget-0.1634-no-authortest-generation.patch 1660 BLAKE2B 30127d74
 DIST FileHandle-Unget-0.1628.tar.gz 40259 BLAKE2B 6f63e89d8a25e1296c8af63ab138b0032de63a5e9557a77ab99a76747516ed6c098e23a2b1542d88da5034db28b2c5a9884712f42e83b5818b773bdfddb5dff1 SHA512 7c4aca0c7d22ab7091c19b7bc5876ed4f83ff961e49900e0ec70124cedc4e34109a31edf5180c6958772f85a021e2be6a8a9e69c393b495e413c24a8b2b6ff3f
 DIST FileHandle-Unget-0.1634.tar.gz 42660 BLAKE2B b7f4993e1247ac5b80828ba56137acde6660576934d42abb9628ef4afbd82b69849a95670625ce56044c12636fc81b5aab4297135b17cc4af2f4651beabaff4a SHA512 a649eb586897d4ae305e2e71325e322bfb5fd26e1352c92241c9a2a499bfca85d3322897598abcb25404a06d4f32dd4f945c5d7369024eabea793c6a500bc36c
 EBUILD FileHandle-Unget-0.162.800.ebuild 755 BLAKE2B f94ae3d10159740667d151ca97fd7aff9bba61fedb1be0212c552db6683a0e0d9fc3f8a6f9edacea7e1aaa724933421b87c3cf9f6b22309faa03803c93ee6e52 SHA512 86c48df6a56cbb52c35adc4cc18b44725c9ec1978853e2508a3e119d84a3ccf946ecb95ee7d308173d7f40931b58266c002e1a53db55e42882bb3e468b286044
-EBUILD FileHandle-Unget-0.163.400.ebuild 690 BLAKE2B 614b969d4e8d3ccf645661712b5d1986922bd0f8c0f58e8bfd32432bdb3c36c56e4618d75a11b1e8259de9d0273bbdd9ee82453f6d227d345c73f23b0f9e4eda SHA512 7304d7a8d250b96f696f96a79751f072642b079b336909be4947e40b15602dcd38fdc98b7b2649296e9f5215ccdb2a8f76b418ed9284a0e9e22a8790bf9670dc
+EBUILD FileHandle-Unget-0.163.400.ebuild 686 BLAKE2B 6ec387975b6fe98fb54af0a2c779608156ff7d058906543f75cc2443495f0396753cc52a04686dc4a9787870ea7b2c1db4fd026bfbbfb769f62ffec2e7388793 SHA512 91233ac8f9e2cb46d828ac8f4644758f1ade1c98fd06408496bc973c73b226f48aadf2b9db9952c0179678e9dac4f617f32b4914b5f83c3ead8727798e00a2a4
 MISC metadata.xml 473 BLAKE2B 8be9b7251069b656a763a9d2be6dc207215d2d5761566f3d901cbafb6c6f9155af907e56ed9c771878af352da100ae53ae3178a1f8e0a8ac0f63106e594167fc SHA512 85c994ee5aa379b8fb4b289cdf4c3575de7d63d147b7d8851c45ddc015525f77e11fa4b3c5cb0cc14c6d6973f8efd2f29d7b528042a059001e8279122e895df0
diff --git a/dev-perl/Filesys-Df/Filesys-Df-0.920.0-r2.ebuild b/dev-perl/Filesys-Df/Filesys-Df-0.920.0-r2.ebuild
deleted file mode 100644
index 2490d1b77b7c..000000000000
--- a/dev-perl/Filesys-Df/Filesys-Df-0.920.0-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=IGUTHRIE
-DIST_VERSION=0.92
-inherit perl-module
-
-DESCRIPTION="Disk free based on Filesys::Statvfs"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
diff --git a/dev-perl/Filesys-Df/Filesys-Df-0.920.0-r3.ebuild b/dev-perl/Filesys-Df/Filesys-Df-0.920.0-r3.ebuild
index 6c4c62ab0d6f..fdfde0182869 100644
--- a/dev-perl/Filesys-Df/Filesys-Df-0.920.0-r3.ebuild
+++ b/dev-perl/Filesys-Df/Filesys-Df-0.920.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,10 +10,12 @@ inherit perl-module
 DESCRIPTION="Disk free based on Filesys::Statvfs"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
+
 BDEPEND="
 	virtual/perl-ExtUtils-MakeMaker
 "
+
 src_compile() {
 	mymake=(
 		"OPTIMIZE=${CFLAGS}"
diff --git a/dev-perl/Filesys-Df/Manifest b/dev-perl/Filesys-Df/Manifest
index 4f9ddb05fe13..c15724d5398e 100644
--- a/dev-perl/Filesys-Df/Manifest
+++ b/dev-perl/Filesys-Df/Manifest
@@ -1,4 +1,3 @@
 DIST Filesys-Df-0.92.tar.gz 7113 BLAKE2B a6023cfbe90feda3b2e2a7181985cb92c88310030cbe3a2474e1663867ad18510fa883a9aa8e08a971ec7446139975f7adbf71900ba2639554b5b4243dfe1c38 SHA512 3fa49740d1853b2f7011459053521474ca7194a825033246fd1ff01a124b5eaaf941a4c4666335d4586fe0e68d8c85700ccb2f3471e3c3ca1c01a1962696fece
-EBUILD Filesys-Df-0.920.0-r2.ebuild 265 BLAKE2B def891dc9b4c643e64be45eb6eefce06c00d01875199c4f00672edbf1d11b5b48f7db2d1859ea030da9c4eae13b9a2356edb6b9447ff7680198cdcb75408b727 SHA512 a301e84569c4d4ed4049d5b0a5e17a21e95044770cffe45d1f8e2179aa264ffb503216b71424e53f66df82f3b40342c6d01d3e6c79ecc590d4eba736a713100c
-EBUILD Filesys-Df-0.920.0-r3.ebuild 380 BLAKE2B 1898ae0cc0ab0e6da143058c30616b7b1e479337cfd071407f8230dd0cc2054ed55826af72e044b22ec10374029349485e3cca01fe39d249e7b82a0acc2faf2b SHA512 c2ae268b82e2e3be5441f1c67e602e0505ddf2dc5c44b635fcd31c0045bb912ba120c0ab907907283607d2d5b2162ac635dcfcd2a22fc5f5a0bef0e39f93b285
+EBUILD Filesys-Df-0.920.0-r3.ebuild 380 BLAKE2B 9836757efd28adadaab3b4562f0e89237511f2725650792681eaa81b555685bb177e403a9cd004d3c390b29cc7a3072494dc9c2e2c3b35353633934b717ce584 SHA512 9c48d36023319a5e32ae07c4f199b4afce0ca35435b998dd4f211318cfbfcd1d08c1049cca73dfff577d332430100b1c391cd58e1bfe73fc362e94d34b0ae449
 MISC metadata.xml 392 BLAKE2B bf682d7c469edaa1584ba5d08a9df214f89d70eb7498fe0b27bce18d38b9f7baf5762b0abd0272ee340e85fd2e8e98ae9098c95ce2784999e7c355bd0f0c4cc0 SHA512 94106221baa36d736af014bc6b2d54eef76c122435ff79e14a5f8420f5db8d8be8bb8946dbea994644d2ee105cfab954a1a12d982a42c16281c2e2086a6815af
diff --git a/dev-perl/Filesys-Notify-Simple/Filesys-Notify-Simple-0.140.0.ebuild b/dev-perl/Filesys-Notify-Simple/Filesys-Notify-Simple-0.140.0.ebuild
index d10514850ab3..455c90b42881 100644
--- a/dev-perl/Filesys-Notify-Simple/Filesys-Notify-Simple-0.140.0.ebuild
+++ b/dev-perl/Filesys-Notify-Simple/Filesys-Notify-Simple-0.140.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Simple and dumb file system watcher"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Filesys-Notify-Simple/Manifest b/dev-perl/Filesys-Notify-Simple/Manifest
index 3654e1f53a6c..b1bfefd1e18c 100644
--- a/dev-perl/Filesys-Notify-Simple/Manifest
+++ b/dev-perl/Filesys-Notify-Simple/Manifest
@@ -1,5 +1,5 @@
 DIST Filesys-Notify-Simple-0.12.tar.gz 12935 BLAKE2B 835e45ca61fe7e624b5e14df16d897a56c8f108cc17a9002a8192f01f46a4542a9a6dce5c75ddce40323db87713cf1ddb59b8300be096bc1e8d195bc1436b4ee SHA512 3edb9a5087b82c87bea1b4092a3c7c264ec6f8da391052593e504b16392ea1a84771bbcbad21d623f727682cc6ab4474fe6a7e346c8bebe13f60d39e83594e2b
 DIST Filesys-Notify-Simple-0.14.tar.gz 13429 BLAKE2B 303b1576f1f98fe016ad31e435683cc7535f3f0270c358a6ca5878d9872c792f2ead8aaa737f915bc27a605146a3f78353c8b5301da300448afa3f26bf7c709f SHA512 45fe097beb925e913af9c48704f5f550931c70673455258249127dff27abe1955e0e968f37c7c0f4c798a20be78b1055362c69ec2906e8e2633b21f68b198208
 EBUILD Filesys-Notify-Simple-0.120.0.ebuild 429 BLAKE2B 2e42499cf133ffc656bde40559e48fd72710cb408b45a79bb149dff16b0f3ad6e05d58cf22d378fbd315f41f03eb5b5a917afab1c4a02f08df8ce1e55d41c3aa SHA512 cb2c96f148f76183af54f9fc9f47a4de9d5753c1ba55a728550d1fae38a29b6bf7f0b9cb45f5a4353f446aae268ed6584827cd60002f92dda7ff064212fcc869
-EBUILD Filesys-Notify-Simple-0.140.0.ebuild 505 BLAKE2B 73658dd3b6de1437f4230f66d5c03451d159f1751ac1694ccc1e88a6ff2ea75d88b10d12d0f78f70e56ce40eea49be1084ea4b00a7ee89df44f0b27406f04f6d SHA512 38e402691a48a82a5916c951e7ffe4aa9b283639a65ad5525e575229fd5c32901be792d4640d97f19658919cef94b1a994e30a8208cf7b1e858119e1416da7a2
+EBUILD Filesys-Notify-Simple-0.140.0.ebuild 500 BLAKE2B c6be5be2ce46cd17135bebb09d9b21d3c2027837f544e852e32f716babe31ad39735d3ad254b18dd3d3a99d75792af3a4f0d162da811d80f91c9087325e6ca54 SHA512 dfb5534d45f2921c7d3cffb6c764ce69c5dd80bdb1b6d1d84aeae3274c915f6c4e24d63b9d34a3c5f4bfa18dae0afa779642567a348cbb4cd2ec02b52114b235
 MISC metadata.xml 415 BLAKE2B 5389cfa2f8af1168b08c31219e255fcebbbaf14388e38b74ee08a2b97e4065100b31331048f31320611561737d5182a5f8b84c191759d074970424af15830065 SHA512 311d3b0d79d16f7cb4d9fad2441fdcd66e56cbddd7b683e4e96c7eb86c4b4c4ffe5cbba73491127e72db9fc900564891f17df4da702955c3875dabd92d4c1bdf
diff --git a/dev-perl/Filesys-Statvfs/Filesys-Statvfs-0.820.0-r1.ebuild b/dev-perl/Filesys-Statvfs/Filesys-Statvfs-0.820.0-r1.ebuild
index e91241c15f58..ab1a121cc8db 100644
--- a/dev-perl/Filesys-Statvfs/Filesys-Statvfs-0.820.0-r1.ebuild
+++ b/dev-perl/Filesys-Statvfs/Filesys-Statvfs-0.820.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for statvfs() and fstatvfs()"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="virtual/perl-ExtUtils-MakeMaker"
 
diff --git a/dev-perl/Filesys-Statvfs/Filesys-Statvfs-0.820.0.ebuild b/dev-perl/Filesys-Statvfs/Filesys-Statvfs-0.820.0.ebuild
deleted file mode 100644
index d1362ac4c0e0..000000000000
--- a/dev-perl/Filesys-Statvfs/Filesys-Statvfs-0.820.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=IGUTHRIE
-DIST_VERSION=0.82
-inherit perl-module
-
-DESCRIPTION="Disk free based on Filesys::Statvfs"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-BDEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/Filesys-Statvfs/Manifest b/dev-perl/Filesys-Statvfs/Manifest
index 911853b2fe3b..d56d6e1c07f5 100644
--- a/dev-perl/Filesys-Statvfs/Manifest
+++ b/dev-perl/Filesys-Statvfs/Manifest
@@ -1,4 +1,3 @@
 DIST Filesys-Statvfs-0.82.tar.gz 3964 BLAKE2B cceb3bac06716f234fdb39e4118d6024da7d8b810c45626c9103b875d43699144a144b9ba6f78be4402a1ef6c8ac04d6b2e45e596acf7aae6258069f037f6974 SHA512 4c62a73b8c4066f7d182e0810b508743a766e708ac5bf52ded8a1f271b95ceab546d10d78d5ca9719c1d50c5b729ceb3e8a1b56950d2abf559080e52a2f9d22e
-EBUILD Filesys-Statvfs-0.820.0-r1.ebuild 387 BLAKE2B 37a783aca3487becb60ae143fbeaff98c40d01fac1e6d4788d2d2f21396611e1e334b1c4bab9389e8c3abcecc0257eeebfcb2d4c66331aa96ddd14e61e28ebf9 SHA512 348ce9cb2039f7acac030a8760652dfa9d6a43c30821bc687a2e72d362519fcbfff17f7f61b1aaf2f28df12faa665ee8d8fb7777585eb81db597432120cdf796
-EBUILD Filesys-Statvfs-0.820.0.ebuild 305 BLAKE2B 283222025a37398435446f9c43b696fabcbe28afe61bfe9f8697203a96d24991d82d8d604d4e70b5b0fa8e833a57563936953ffda233d42fd53d2f591de4c7b0 SHA512 8c004a79017b9fa7bdddfeb4be82b6479c009bcf57ade44bad22a57dbc170456b2ce081ba1c6a55903e0f33949adcc9ecb947d7b7e240d332328080b0cd5f48b
+EBUILD Filesys-Statvfs-0.820.0-r1.ebuild 385 BLAKE2B e4593c71fa59b56962f13086e8ab15800bdcf1dc6007a50844960cc30cef75af00a96f49a2d7f7f91a34b62ac4bc85fd761be56ce33454fce78afd3e2c2ac573 SHA512 eeed514ff2965a45267c0cd8a68133b0e241644d135259130859c985f623fde93cf1a1f54a096f94b5ff37db762f6adbf746b4e21d0432b64fc7c6f79d856af7
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/dev-perl/Filter/Filter-1.600.0.ebuild b/dev-perl/Filter/Filter-1.600.0.ebuild
index 3320cf17de8f..12d10c060b7d 100644
--- a/dev-perl/Filter/Filter-1.600.0.ebuild
+++ b/dev-perl/Filter/Filter-1.600.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Interface for creation of Perl Filters"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	virtual/perl-ExtUtils-MakeMaker
diff --git a/dev-perl/Filter/Manifest b/dev-perl/Filter/Manifest
index 6e606275bb86..8fe696be2bcb 100644
--- a/dev-perl/Filter/Manifest
+++ b/dev-perl/Filter/Manifest
@@ -1,5 +1,5 @@
 DIST Filter-1.57.tar.gz 92255 BLAKE2B 33eaa676892f189e8e6ad8a86bd1a3769c3f7db08b65b7d0b349a884be44f1e098dc15c5c178406575c3c553af79a5c5ad6dbb58d0a5768eb96c81b378dfc050 SHA512 6e0fe52ace85b329a73a79522a8227b64017701c9949d89271257bc6c50c263074084a50c500a3250959617707261ea71abd2432678c0741f4ad713e03ddefec
 DIST Filter-1.60.tar.gz 95351 BLAKE2B ac7a53644e4423a5b34432f11a9354ff5ee9cbf56a3d790d86ec7ef2c5dc7468d6ef793b4c23b8258c8b8aba74198700c0b8800bdfdfea9fb890b6c78be20e80 SHA512 be6ecb9d37c8384de34e842e1e46a24c43592cb1995178ef7a100ef8b028e506d26c044ae9fd1e4672344cbc2dae06b9136b27eced5470cfce683017129cf248
 EBUILD Filter-1.570.0.ebuild 564 BLAKE2B a2ab75568e8f9229c6a7292f828d5cb61514cd7c6293516ff3f4fff40f462654a7f2ae0fc95830dc6ce4c1fd445273d5714f9dcb00ebd09fc86fb36e1784ed95 SHA512 2531ba595bfed301b653e48cee7b392d481eb9735a2d44660fa2b4bfe2ef5b240745b1aa0bd2317ec8945c519a71c480e97bbf6c65880e2a82d9448952950f83
-EBUILD Filter-1.600.0.ebuild 704 BLAKE2B 5ad29e00f998acf1a85fdc313c39a81ace710985eb2cc3844f10cb9f7cf2d999f907def7041248b35db8405194d2fc6d5a5d17257c3de4d842285c90c2a9c122 SHA512 9e99b466aa4b6499283cde081917e4de583746a8ad18f552345fba4df09c597d4395ab29b42dbcc11d9aa4a429aa7533fe4f7ef5b603ef17e610f83efad02c0f
+EBUILD Filter-1.600.0.ebuild 697 BLAKE2B b7dae02e0109bda2b441ad39ae633133aae5168548e1d98d4581f65f4afdaf3f9ef94784f569165d1d97950f12fbdec5249aef9a757855064a6c05aac88181e5 SHA512 0c074f986a7ec0a403792fe48f8ccd68ce1ba7ea1c5149603f59a77983958a9e2fb273b55df774fd1902544d1d4288f27e2dff92127d7e992ad5fbcab36fe08e
 MISC metadata.xml 811 BLAKE2B c9d1834f90abfbbafb088a12301aed652a32e42919498da65e0b403483074c6ea3cc2d3c8d1025372ea548ca7c063bbcde932d9dadc82ae041bd70290df48e44 SHA512 f44f5fdeeddb28cc350e61f8ed6e049f78dffce1849441662c4560fb9315fb2fb29c4fa99a2442679105315b0dd2d2826b08fce8388ea80fb0b131314896a4c9
diff --git a/dev-perl/Finance-Quote/Finance-Quote-1.490.0.ebuild b/dev-perl/Finance-Quote/Finance-Quote-1.490.0.ebuild
index f1be588ccac2..9ee9e6fad745 100644
--- a/dev-perl/Finance-Quote/Finance-Quote-1.490.0.ebuild
+++ b/dev-perl/Finance-Quote/Finance-Quote-1.490.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Get stock and mutual fund quotes from various exchanges"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Finance-Quote/Manifest b/dev-perl/Finance-Quote/Manifest
index 604103702c5e..dd99e2ff52d8 100644
--- a/dev-perl/Finance-Quote/Manifest
+++ b/dev-perl/Finance-Quote/Manifest
@@ -1,5 +1,5 @@
 DIST Finance-Quote-1.47.tar.gz 270335 BLAKE2B 585ab3736b7ea448b083f4dbbed460ac442fb30285041b7b0bf2a52d6b2d533a8d1eb1d9bfa72cc1cd7a3d4664d2cb5104eb539ecd6b1042083548b8ef605333 SHA512 a900ed3e305edb8c713dc4a885b912ad9a9f873cb501d66d393a39aacd8a980af1bd4fb0fdf5bce8e2b2aeec744e811b861a2803a6fb0d5c71ab6b8d1c3a57f7
 DIST Finance-Quote-1.49.tar.gz 274659 BLAKE2B 1fb4523a576960b48b855807945ef79bb18f68c82c5cf8eece8dcea910c3bc2669dd07e635d74cd0a85639d9eff27337687faf5a4fc213bedde4ee720d6e6149 SHA512 5b4b8836e1529409f1f6aa41345bf906ba2cc1c1b44e89b59765a883cf0db082cef9df91a4eaa671e494f5e9a842c4e1fbfcc31e57964d74f7895f3e25c4d91c
 EBUILD Finance-Quote-1.470.0.ebuild 1348 BLAKE2B 63bffd3eb4c18fa3206be9ca37544eac1d07faeffbbc18a7c2a5b77417cd49e5f8b3c7d4f8d560d617171b0f060951a0408b394d5c1b643de807457e286e7cc0 SHA512 ba7b904a49b38b93b61d899b9e8375100dc365b27c1ef5c095858705927a68b68ad898b280a21779fae2082aebf3e152ef1502d0be9e3425549c291591204b85
-EBUILD Finance-Quote-1.490.0.ebuild 1477 BLAKE2B b39e55e439fe7d4e2029474372036dc014b6b020e2e99478363140c0c7bb927a6959f54a54202c60b699e1d0861e519ec7060e01cf75e2c84cc8e4aa9a67fc04 SHA512 9b42fade2e51cb771d7833c070e3f02077826e8eaec99329ce178235a1db93bccc6f63d912b0bdc7cd80b6675696cb1c3c985b61e25a14410780b5cc3bc8656e
+EBUILD Finance-Quote-1.490.0.ebuild 1474 BLAKE2B dc14dc19585e70074fcf9a7571b6b2250630d5f2ca872b14cf22d7c0495915aadbd12aa566a355e8e0a4c44fca6642c4ad1d71678e1548dd77a745aecd088ccf SHA512 375dd6fc8de42f2c0d29ac5788afa0f0af82c7f91a94b3b7d3e7fdc86427f02ba438ead1042d8f0e0375f2e4dba05008a8fdafab7a8ba755c4887d8678133eff
 MISC metadata.xml 4377 BLAKE2B 79ecc8a7b3f036b8123050e1acaab4038a20518e21555c43d8d50b5c85509d04d40767d3582f797c2c97b3ee58355b46ef3a32a591ed92a58c2e8fb65ed36566 SHA512 023bffad560438f06c3d20f17b771f6e67c591f4d822fd061629b503b7812ee4b63f16ed9d7e31f74e690bcec0573a2b55ffadac3bf1699c40cd12b3953f0079
diff --git a/dev-perl/Finance-YahooQuote/Finance-YahooQuote-0.260.0.ebuild b/dev-perl/Finance-YahooQuote/Finance-YahooQuote-0.260.0.ebuild
index 52967e2a862c..b272abe52ff1 100644
--- a/dev-perl/Finance-YahooQuote/Finance-YahooQuote-0.260.0.ebuild
+++ b/dev-perl/Finance-YahooQuote/Finance-YahooQuote-0.260.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ DESCRIPTION="Get stock quotes from Yahoo! Finance"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="
 	>=dev-perl/HTML-Parser-2.200.0
diff --git a/dev-perl/Finance-YahooQuote/Manifest b/dev-perl/Finance-YahooQuote/Manifest
index ecfee0df7b82..46a11c77b702 100644
--- a/dev-perl/Finance-YahooQuote/Manifest
+++ b/dev-perl/Finance-YahooQuote/Manifest
@@ -1,5 +1,5 @@
 DIST Finance-YahooQuote-0.25.tar.gz 20650 BLAKE2B 5fb69ee7c82fc5f58218dae74fd7ea827a55c0cadf56db5ff744d28403998ca7ca6f65ce5b23a8dba9aec2ad397d2dc61e8f711226af82bfeab3bdae9a0ddf42 SHA512 be1d906187916a62b50775a42e6b7ead983e65d2d3738ff8c76e4fb3c4c67eb8c01f8c95f181547547ec7624119b6be41b4299731e6a8dc76ecfc1c38779bf72
 DIST Finance-YahooQuote-0.26.tar.gz 21407 BLAKE2B 2fcf0051d5825b5c6eda50239222eed375082084e333d98bab8eb4ac8dc2cabff5775e0813fb8ed919b9ea8c41d137ed3036dc08e4620e473cb2610b93729203 SHA512 c0ac83f413566b7e9f6009256fcd60315140fcecc919b92865f10da314d181ae37a4e5ab7de8cd0a7e6af83ab03b5d5d96e0d51815065c554c581e0e3d82df2c
 EBUILD Finance-YahooQuote-0.250.0-r1.ebuild 1243 BLAKE2B 9c76285df35f2b99c43adc3a39c24fa06fccc3a2e802f10b3a966e0133a7c2175e987d76b08565c6443af40e608f22b0c381d70888ac76d0080c9e5d29de49a7 SHA512 685132a00bc36d9007fb280755c917f7f5f47cf3b2d605a40c1dd6b102cec2a4bc1ea006b9e1087d0f9d059c18cc34783003114d4ff718e521fc0af3e63b2d94
-EBUILD Finance-YahooQuote-0.260.0.ebuild 935 BLAKE2B eee73194a9b3d992156814b934b013d038fe97726f83a69441e02941f2f4eb3a4a27d403eedcfe13867d519fc7a7813216ef6d08e11d0599128eb05e33944822 SHA512 e1ea6ce893796d9df90192810cf496b184f9f22862969bddd7c4d54881237b988047d87365f46cdce67e96828cdf04b5de365c638ed00c534724a881d944e7a8
+EBUILD Finance-YahooQuote-0.260.0.ebuild 932 BLAKE2B 222d05a3324e689938cddd981597375cc0339d5f295abde25b8130a9b710df58cd5126dd991601b4c059420ccad8eae0de3ebd14eede90d4b6e2bec9700af320 SHA512 6a693dc78c5b4c7c7485d3bda777cc66fbb55b889ccb46489703b16b9e60d3f4c6a84c65d754c449cfbe6edc822c5c573096e7a3c03fd5de631cf941b6926fbe
 MISC metadata.xml 467 BLAKE2B abd033bd791fe1135f3a5504f4ea7070aa1181b80634aaee4e210d005cafc42d99bc174f22bc3f67c9e0a6ae9e9f4c6ca8fdb90e27c8b9558e8ff813a9f0b341 SHA512 edbea61456d99f3d4677bfd7e181a09c2c22f3ef2e161d35396ffdd70f0d957bad8bc13480457caaeb0d8c12a2726566f003eb45ea7ced9a83b888d7cf54d86a
diff --git a/dev-perl/Font-AFM/Font-AFM-1.200.0-r1.ebuild b/dev-perl/Font-AFM/Font-AFM-1.200.0-r1.ebuild
deleted file mode 100644
index 956e81864cff..000000000000
--- a/dev-perl/Font-AFM/Font-AFM-1.200.0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=GAAS
-MODULE_VERSION=1.20
-inherit perl-module
-
-DESCRIPTION="Parse Adobe Font Metric files"
-
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc sparc x86"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/Font-AFM/Font-AFM-1.200.0-r3.ebuild b/dev-perl/Font-AFM/Font-AFM-1.200.0-r3.ebuild
index b279f82659d6..a050244f3672 100644
--- a/dev-perl/Font-AFM/Font-AFM-1.200.0-r3.ebuild
+++ b/dev-perl/Font-AFM/Font-AFM-1.200.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,17 +10,20 @@ inherit perl-module
 DESCRIPTION="Parse Adobe Font Metric files"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ppc sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
+
 BDEPEND="
 	test? (
 		media-fonts/urw-fonts
 	)
 "
+
 PATCHES=(
 	"${FILESDIR}/${PN}-1.20-custom-test-font.patch"
 )
+
 src_test() {
 	# nimbus sans l medium r normal iso8859-1
 	TEST_FONT="n019003l" \
diff --git a/dev-perl/Font-AFM/Manifest b/dev-perl/Font-AFM/Manifest
index 612c7d3e8f49..06c7fc338df6 100644
--- a/dev-perl/Font-AFM/Manifest
+++ b/dev-perl/Font-AFM/Manifest
@@ -1,5 +1,4 @@
 AUX Font-AFM-1.20-custom-test-font.patch 1345 BLAKE2B 3ac709c550233e4cd47f740b5135d055ff28090b47602970d0e55d9a5875bfb9a5275a59aac8d7a8699513518474acb5d06f409ecec5851625be4d6029f7cb5c SHA512 cfde2d260b920a3ac6a103412f6642e77851f0d8a2d8420b001430636a6b7f83aedbcf5f3e6162b11970d1957221f6d812bf6554d5a190ecd8add9ae83c22c57
 DIST Font-AFM-1.20.tar.gz 10421 BLAKE2B 791b5da799811d62335b39f6d1c4e9c7b49cba83b46b4c7f1ee50a9789847a69f63f733f7d7dd319a0cd032876b04737eb671759b7dd836ac465f8e0372a85b9 SHA512 1fc74f0dbbed52937d512465a021148e93b2e0698189a6fc17eb1aa8951c934b0060a0256883118dc2a3a9086025468e0a851706306876568466bf4638fdb618
-EBUILD Font-AFM-1.200.0-r1.ebuild 290 BLAKE2B 619016ec72fdf48bd961b433bde18daf2f1642b9b7e18db72076a46fae847d1baad2b24a3bd76dcea44dee010c4ec21611e1c81bc186e10e0c4419ee9f4d7c89 SHA512 37173747d9533303181c28f8c1cf54ab1c8e325f883282aae8f05c87f875691a11c075f0b62cab6a8b9a5a5813648de61331d4f2f3e5cdfc54b9eab5aa7db307
-EBUILD Font-AFM-1.200.0-r3.ebuild 595 BLAKE2B e1031de82a4afff8aa49efa754a1c5845866ac480ed3733d14da36546d4e56e3d59acf75a7d0051f489ada5866987f0e341cad99051d522d80e328ba65d7a716 SHA512 5ec69841499fa95c9def60af9c76b712bdf7d8d2ce0e330a80789c6b06d2e5e84688ac1f5098dd9cda90e6700e7f12fd47c09ec864ec33def7b7ecbeddcaface
+EBUILD Font-AFM-1.200.0-r3.ebuild 594 BLAKE2B a0ed5d6a8b1cddce4295822d04b5b38fd1f44561544331f6c5afa06ad3c3e739f1babfe56335d0501c2e960ec589e8bae09adcda0284440e946ac45f006100f1 SHA512 ffdd07a1b640b59ae266c6e4bef4ce1851519191d8f85cfa4498adfbe93c9614604f855b31ac7a3752d120b6d85a87ce166b35b60070436e3df72daa4ddea912
 MISC metadata.xml 1285 BLAKE2B 3d500208bef6eda7f8d4c8384fe29b18d2b57a7ca38de4cedc52570b815a4d892d2434e7f6c9d9d0bef81a907b941897e9d79ad9b6ce0a76b01c0c627d2967de SHA512 287ba32c48ecd2c1f90abeb42e51db71669b851bd3e9bdd21ed6b63859f794673f59d86a32791b682ab30e2f0d3b6c21a258b24ce9f77f4a3ea0bb4a5c31fb97
diff --git a/dev-perl/Font-TTF/Font-TTF-1.60.0-r1.ebuild b/dev-perl/Font-TTF/Font-TTF-1.60.0-r1.ebuild
index 6a7c870e7413..fd3218305110 100644
--- a/dev-perl/Font-TTF/Font-TTF-1.60.0-r1.ebuild
+++ b/dev-perl/Font-TTF/Font-TTF-1.60.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="module for compiling and altering fonts"
 
 LICENSE="Artistic-2 OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	virtual/perl-IO-Compress
diff --git a/dev-perl/Font-TTF/Manifest b/dev-perl/Font-TTF/Manifest
index 7e2fc3bdc25c..1add1a3d57d1 100644
--- a/dev-perl/Font-TTF/Manifest
+++ b/dev-perl/Font-TTF/Manifest
@@ -1,3 +1,3 @@
 DIST Font-TTF-1.06.tar.gz 256048 BLAKE2B 573309f6c45680bec72ffdc05cf0e485eb1eb46c57e9ff49b94f7f4d465b31cc15c6c3e9f9ffbc696bfac24c310dff2542a881b56dd3d0bc07bad307662b2d55 SHA512 2995544511e4cf9b1aa9a900b2272bf63a137fbbb752f2501d66c057b8272f7eb6f84326ed6121ffcbeb210f8f38b9219f59420a5a4b6664ce07aecc758ea029
-EBUILD Font-TTF-1.60.0-r1.ebuild 534 BLAKE2B de34361ab1c3cd2f322f79dbdb7d2ba3c3db2fb0ccdd0552bfacb52963ada7ad13a3d049e6bd9cd27a63934582ef79dcfc6562a5db473a337070f18455657e2d SHA512 052ef3e79ad61bfcaaa82822eb6528ac61bbc70b2dc5bf1f791cfcc714a90c7b793cf1d30c427554237a26909045a8559d0540a85f159739356e46d6c78666f3
+EBUILD Font-TTF-1.60.0-r1.ebuild 541 BLAKE2B a7fc19c48e6c954e6b5548850f19e6cc0fb699882ff12a844f0a73b0686d252150d706549c406ab5f939d298419a02290d0b22f18dd5cac469ad6b9162419552 SHA512 543db1038d809a5fd1db7d5b046de36ea32b5178adbd60017b27f11c9f8e84796c82351be9a2ce91b5d1ed8beaaf5707ac32e85c89ce10b1cc905335bf79625e
 MISC metadata.xml 5258 BLAKE2B 6f725042095cea463e031b16883be99c33285b448214bf78f628fe27529bbadd86d2a21723baf0746eb5199c4d32ef4a935b03b387db8d9eca2058cdace7ed83 SHA512 88597083a58c7a610ddf609c4324ffb93b42fbbe3c32c8bbd53f74368376900da46d5d6d1a9ccee4b622b3427f4c1112f814581e5b6955ebf8360bccc792739a
diff --git a/dev-perl/FreezeThaw/FreezeThaw-0.500.100-r1.ebuild b/dev-perl/FreezeThaw/FreezeThaw-0.500.100-r1.ebuild
deleted file mode 100644
index 314954d89c54..000000000000
--- a/dev-perl/FreezeThaw/FreezeThaw-0.500.100-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=ILYAZ
-MODULE_SECTION=modules
-MODULE_VERSION=0.5001
-inherit perl-module
-
-DESCRIPTION="converting Perl structures to strings and back"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE=""
-
-SRC_TEST=do
diff --git a/dev-perl/FreezeThaw/FreezeThaw-0.500.100-r2.ebuild b/dev-perl/FreezeThaw/FreezeThaw-0.500.100-r2.ebuild
index 509855ec05d8..f758a33b6263 100644
--- a/dev-perl/FreezeThaw/FreezeThaw-0.500.100-r2.ebuild
+++ b/dev-perl/FreezeThaw/FreezeThaw-0.500.100-r2.ebuild
@@ -8,10 +8,10 @@ DIST_SECTION=modules
 DIST_VERSION=0.5001
 inherit perl-module
 
-DESCRIPTION="converting Perl structures to strings and back"
+DESCRIPTION="Convert Perl structures to strings and back"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
 BDEPEND="
 	virtual/perl-ExtUtils-MakeMaker
diff --git a/dev-perl/FreezeThaw/Manifest b/dev-perl/FreezeThaw/Manifest
index 8a024e596228..497e4e1e56cb 100644
--- a/dev-perl/FreezeThaw/Manifest
+++ b/dev-perl/FreezeThaw/Manifest
@@ -1,4 +1,3 @@
 DIST FreezeThaw-0.5001.tar.gz 11800 BLAKE2B 658071a36e4c7469140ff2d7537dbe6fef412d3b133c7edacbcaa1b3156407f4ac0c615b7567c19e4c712d75d097c68220cd19f3f71c68800ac337fdf0dfd84a SHA512 c655099e361541d214961d072fcd9afdbe2c491a41de4a20bc29db8e36570806dc13197001e5a412b5523225442578ed42abe1e644a7f59b9e0498f15b90a45c
-EBUILD FreezeThaw-0.500.100-r1.ebuild 403 BLAKE2B 1ba3a2a686e5ec35d2523b566955225f050d29a938b929c87d7210369b4a611ba9ba1ce67be036b20c2895a31856b8b3815c33fd761c23eb58c052f486de4284 SHA512 a9716a40516ea8e97df2a77241ff4914d16ed5ea875b84359e6d5c8328ed2909976ef03922f3ed7a2a629ee466f38332a4413d5707f520e7e7c687915fd50e36
-EBUILD FreezeThaw-0.500.100-r2.ebuild 426 BLAKE2B 0f171f399ad1449a7813fbc4013100b6a8313fee2d50fd263a2a2620b3f925ab9c181435167c31235eb78ec4e04ac46206a0d4fe3f5ef32348befc3179d2af61 SHA512 add9c79428338e4f9d1eb8531d7f930b33b6f28e8f5b4c0a953a0871cd150944e1a93be7f8954f16feb02058caa5076244ed148eb2332f6d08afd9f05540e2aa
+EBUILD FreezeThaw-0.500.100-r2.ebuild 419 BLAKE2B 3b4acb9d2efe8d64403de3d2eee30e84db12225dc82544826d26742ff2699002d77e441c96179b3ed545e916b8da2d1d54784262d2fdbe0d32b69e2ecea5a14e SHA512 224a34e1746f3b808f1899c98154f3ff425a0883a305ab4e9ee4ee2179938ce4b3a82d70b44b94a6c585fc4a152e7132bbd3de0a84a113455a8fd9051c490f15
 MISC metadata.xml 391 BLAKE2B 80c988d824a1c114b7074cd7a218ea196ceda697109aed13556f89ff34723e925837a52af7447a832dda096f37a38f18d4dbc3b7d1935238f3d3b1ed55e77422 SHA512 641591e10cce64c849709967d541bdbc3da47ff52f2bbb6c663dd1a7649ce484bbba1b37a2ece2c6b0463314b42346e940bddf0f921973ee3cf3ce03eede08b8
diff --git a/dev-perl/Frontier-RPC/Frontier-RPC-0.07_beta4-r2.ebuild b/dev-perl/Frontier-RPC/Frontier-RPC-0.07_beta4-r2.ebuild
deleted file mode 100644
index 92fbcd158c92..000000000000
--- a/dev-perl/Frontier-RPC/Frontier-RPC-0.07_beta4-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_VERSION=0.07b4
-DIST_AUTHOR=KMACLEOD
-inherit perl-module
-
-DESCRIPTION="Perform remote procedure calls using extensible markup language"
-SRC_URI+=" http://perl-xml.sourceforge.net/xml-rpc/${DIST_NAME}-${DIST_VERSION}.tar.gz"
-HOMEPAGE+=" http://perl-xml.sourceforge.net/xml-rpc/"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-perl/XML-Parser
-	dev-perl/libwww-perl
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-perl/Frontier-RPC/Frontier-RPC-0.07_beta4-r3.ebuild b/dev-perl/Frontier-RPC/Frontier-RPC-0.07_beta4-r4.ebuild
index a5c1e90a4bfa..b6ac54cb255c 100644
--- a/dev-perl/Frontier-RPC/Frontier-RPC-0.07_beta4-r3.ebuild
+++ b/dev-perl/Frontier-RPC/Frontier-RPC-0.07_beta4-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,9 +12,10 @@ DESCRIPTION="Perform remote procedure calls using extensible markup language"
 SRC_URI+=" http://perl-xml.sourceforge.net/xml-rpc/${PN}-${DIST_VERSION}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
+	dev-perl/HTTP-Daemon
 	dev-perl/XML-Parser
 	dev-perl/libwww-perl
 "
diff --git a/dev-perl/Frontier-RPC/Manifest b/dev-perl/Frontier-RPC/Manifest
index 58ca23dd35bf..dd25faf6743e 100644
--- a/dev-perl/Frontier-RPC/Manifest
+++ b/dev-perl/Frontier-RPC/Manifest
@@ -1,4 +1,3 @@
 DIST Frontier-RPC-0.07b4.tar.gz 21696 BLAKE2B a6eeae0d4b4512e6ee94b11bccbff743eb446ef4f417eb10b70b3a5c24528a5b36f7f0252117be21345d0a7485a861cf704baccaa804e6f113f79300d328419d SHA512 417275aa6a47ab36fe208be65bbe13f367144531de32aeb0c5cc9e133da9125c3498fa3dcf57ccc9e7b2cd7aea75f17d7db1b9b9dbd2da9135c0778e4a3a1cc3
-EBUILD Frontier-RPC-0.07_beta4-r2.ebuild 585 BLAKE2B d5d52d6dd959195f12968fcfafeb36f6830eaf0bbbbc791f59d288332824658819fc65ed02351971b5f3228b3c9d84f38a6895d290567cc728d0de8ef9dc2157 SHA512 fe884c099c34a11d230c9d1dcc3070329b20d77e1d3413e350b546e7182058872ed66ea9198a9c23b48dc79bb4c5ce3374d15cbdbfaaa45964545667453d6866
-EBUILD Frontier-RPC-0.07_beta4-r3.ebuild 586 BLAKE2B 5982aa1ce9626f55ff22c40a6efcd30aa7ac66298a9198484f598cbca1b0695475d5860be8a02f20796a8b92a679715fdb8d1197c62b8eeb7bca1ba0cc24a4e7 SHA512 caccbfcb4ee2d9e8b6668ffaf3feae95b75b9e83c6002839f141b577a68c67a53cae5627e74e6b3dc7d86f6402ac6d6cf44a66c9437b6c0f9e96870b5d6f0d13
+EBUILD Frontier-RPC-0.07_beta4-r4.ebuild 602 BLAKE2B 48da564fbda1b33a0dd4c754431ca282e9774f2e1cbe7469fe819c2c1da803397de0ef3f56963daab2800410635497194ff678a9aefd0de456c98283c0074a70 SHA512 4dd7ebbefa5234e7e620648b790156b3723bd359fa45e442e8756fecebe3be0ef03cbfb06882e6fc4f739dd5b3e1f9e03848b76b8c05850e6f863d3f8e22bffe
 MISC metadata.xml 1203 BLAKE2B 566e7531aab834180e03fe3fb8bb6db58a9ff497be4de905e65073e446b868f996928b33534d33102523114f629c62f987fec9cf48e090093d768d2a8a6ef250 SHA512 d39ee4afa8a5021cc009e663fc0626a22338dabfabbee29d45c3036f0c86b76b0d160a9078d92c6c8fd58b44ddb019763db6b5a5981090515d3e4b9ca5cdd5db
diff --git a/dev-perl/Fuse/Fuse-0.16.1-r1.ebuild b/dev-perl/Fuse/Fuse-0.16.1-r1.ebuild
deleted file mode 100644
index 24e53406acc6..000000000000
--- a/dev-perl/Fuse/Fuse-0.16.1-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=DPATES
-inherit perl-module
-
-DESCRIPTION="Fuse module for perl"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="sys-fs/fuse"
-RDEPEND="
-	sys-fs/fuse:=
-	dev-perl/Filesys-Statvfs
-	dev-perl/Lchown
-	dev-perl/Unix-Mknod
-"
-BDEPEND="
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( ${RDEPEND} )
-"
diff --git a/dev-perl/Fuse/Fuse-0.16.1-r2.ebuild b/dev-perl/Fuse/Fuse-0.16.1-r2.ebuild
index c4b3462bcde1..63ec67d0d35b 100644
--- a/dev-perl/Fuse/Fuse-0.16.1-r2.ebuild
+++ b/dev-perl/Fuse/Fuse-0.16.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ DESCRIPTION="Fuse module for perl"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Fuse/Fuse-0.16.1.ebuild b/dev-perl/Fuse/Fuse-0.16.1.ebuild
deleted file mode 100644
index 7fc42e8bf035..000000000000
--- a/dev-perl/Fuse/Fuse-0.16.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=DPATES
-inherit perl-module
-
-DESCRIPTION="Fuse module for perl"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-RDEPEND="sys-fs/fuse"
-DEPEND="${RDEPEND}"
-
-# Test is whack - ChrisWhite
-#SRC_TEST="do"
diff --git a/dev-perl/Fuse/Manifest b/dev-perl/Fuse/Manifest
index 33ce7ee7808d..dfe91cf99bb9 100644
--- a/dev-perl/Fuse/Manifest
+++ b/dev-perl/Fuse/Manifest
@@ -2,7 +2,5 @@ AUX Fuse-0.16.1-ioctl-header.patch 538 BLAKE2B 5847af1a52ee65786769ffc0470eb9e6e
 AUX Fuse-0.16.1-no-dot-inc-tests.patch 7183 BLAKE2B 929d96c80644042c24f7142008d48406202dc63c6080e987828ac60a99144e935462d1b202cb52a3e7e88c93b0dc87902d6b057654e3c37ef6dc4c73ff6b48f2 SHA512 6ff2e591e903461524d5b077b423383c1be84d9a2dfec8fffafa0bec2c476c3dc9c9564de0e928cb00182c8cf4b28a9e5223f07c740747559caf0e5b41901830
 AUX Fuse-0.16.1-tempdir-override.patch 5423 BLAKE2B 8dde768491065c2034bf4eaf7658d8bf34c680a2bd5d2ed0b0ee25b1e66970f650b0dd15dee131ec50a4fd43de8d084011b229c81416022941645a8a7e9f4398 SHA512 61ea03089f35ddb112e8d04326ea7973b9d9f2117f6c3597f6fc04e4516fd5289bf0d4a2ce5aff68627013d8f6b6c4ac60e4e0c0bf07832aca617fdf52bf71f1
 DIST Fuse-0.16.1.tar.gz 43004 BLAKE2B fe3a1b39c7c6d4198c06dfc8deccff592b3c546823adcc7b5b910b5f50760db382a349084d82749cb9eff205d39e71221557b8a93d34f9d603ea5551acf2c397 SHA512 77de154f537fba0fb2d896d6eb35d7787c0863ec48ad1cbeb9040de0e73e593798cddfa279e88157e78c6716dcfd16f045558e15ff663b82e4fa11d87779c1d0
-EBUILD Fuse-0.16.1-r1.ebuild 456 BLAKE2B 903598c489b94b42ea5b1645d7dfea0c6436a902c0da1bc81b6df51492659c0620aacc262f2bc38152ba6d9e5f582fabd0985a84536d56e6b7d6a4ab4bce9a65 SHA512 e59a9dc9bd4a3b46397a16194de2f6ac35e2ea50f5189a388e2854146d9b63992219819ef28a2fcac6d97e925662989c72935128f6308bdfc2b0bbcd72824661
-EBUILD Fuse-0.16.1-r2.ebuild 1250 BLAKE2B 18fa4cda078e02e8a9fb36070e62be50112927c23afbcd2688d8f9bcfc6764d52deb9de1e1f0a71e9494b182a8fcf833696152a2557c17e4248c66b1c1225c2a SHA512 157f1e404c00dcce025c3f7b5905d120413906f790d88d7f97dc9cfe156968f25e6a56cc955ef4822a3acecf0b861fad7a750353c09e22ca4b21b38e73b8f3fb
-EBUILD Fuse-0.16.1.ebuild 328 BLAKE2B 4db624f39ee79824d7791338c8571f15022189f05361a85ddfaaf52a23424adf8f5a3fc35a7f6f4f1bf0b860cfff3ac761287455c153925869369f9bab9df0d7 SHA512 1227737867cb5d2282b13ae9edc44d8404187c5b2f7fad816ec1824b6509883ca9272c48932a3cf92e2397cdad1d7d0619fcb2d0dc091d251cbb84f4f5c9f49d
+EBUILD Fuse-0.16.1-r2.ebuild 1248 BLAKE2B cccf0cdb30386cf0a97af8f164a1e1a14e18489372bd1d00b842dd9d4c100ccc7b3bd3f14afd97a8d124d57b0599179b09df8bf9cbb7beada4dc67d4c838eec4 SHA512 9bc1ffb9c9d433bb495966fa7bd06e13e15d8c52f37f7e1fc90a3e9560fbf8a41f368443e42420ad50ab627e9835486267ae15f04d9cf1e724cc926498ec7244
 MISC metadata.xml 438 BLAKE2B 9c164dae47c2e4689de12848d5680b7ec63f5f22fd1835feb7824cf950818543a366b7d08d519ada377cd424f6dc763c1a3670386b53c8a4cbdb47473a032faa SHA512 1ea08ff1c4f5898f51f190ee42358b90972d9dd89fc9bb3eea782fa4d4573343b7663edc5e488dc990b58e215f98f1185e8543782b76e4192ad4482291c388ac
diff --git a/dev-perl/GD-Barcode/GD-Barcode-1.150.0-r1.ebuild b/dev-perl/GD-Barcode/GD-Barcode-1.150.0-r2.ebuild
index 1c2acad01e01..390ce254aad9 100644
--- a/dev-perl/GD-Barcode/GD-Barcode-1.150.0-r1.ebuild
+++ b/dev-perl/GD-Barcode/GD-Barcode-1.150.0-r2.ebuild
@@ -1,19 +1,16 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-MODULE_AUTHOR=KWITKNR
-MODULE_VERSION=1.15
+DIST_AUTHOR=KWITKNR
+DIST_VERSION=1.15
 inherit perl-module
 
-DESCRIPTION="GD::Barcode - Create barcode image with GD"
+DESCRIPTION="Create barcode images with GD"
 
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE=""
 
 RDEPEND="dev-perl/GD"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
+BDEPEND="${RDEPEND}"
diff --git a/dev-perl/GD-Barcode/Manifest b/dev-perl/GD-Barcode/Manifest
index 18d1bb61b0b3..23c0c276c81f 100644
--- a/dev-perl/GD-Barcode/Manifest
+++ b/dev-perl/GD-Barcode/Manifest
@@ -1,3 +1,3 @@
 DIST GD-Barcode-1.15.tar.gz 892881 BLAKE2B 4c1b8e7f97c01f8c2295e68d2ef2045eb2b65af7f4c5e3695263fab11d8065e09aef64df4d35cdf482269faf5695f0f2a8b97d468a9d5f69749487def8e4ee5a SHA512 3128ef0376f2d31b55bdf9e206a16982632a7e7e7eae6d0d846fe0f80f3998a893f22f910a7d053e15b9fd94a9408805a7b862d735e6be03e1fcb9ff7d4d5155
-EBUILD GD-Barcode-1.150.0-r1.ebuild 349 BLAKE2B f91721992c6a7943ee435f3be8ec64a8acc2349be06b34a753ce032b352fbdfcc6b0443dcaf74d79bed83063f5508b7c0c6387c8d29a402078e2779fdb87f44c SHA512 31b15666e6883b33edcf1035fc3a3954ae1aa3e30383bd32fe00edd7bb801ed79320f944b71bb027937a2a2c4b180920b7cb76903984e430dd8e3a2d87679d77
+EBUILD GD-Barcode-1.150.0-r2.ebuild 310 BLAKE2B 0ec451d6f5f7525800981a34f79fece84d9319cc3d3a3215983b7ab7bd3bfa1e19996992d08e4e61f5e518b9b4d9131c02397502f115912efa3ca024c625c1df SHA512 d87745b709782f3d48501ac7655869d0b0f0568698bad71574342ab2b8b2601eeceff1bbe7904fa7a990470605a742784cc8f4787089fef87359cd3bdec04856
 MISC metadata.xml 1187 BLAKE2B 812b8b5aa39946e0a696b8a43cb6be2ca04a8bae6a37e10b67a5bb4ab67124be883bb8839ae53646ffc1533d03b20ec2a88405a536f6da3e8c53b0a603ab04ae SHA512 fccbc94c5b90713c1cc0c726ca6610eacea68b92e5cc5274484c03f2f54628fc35dc6d5dd2698e5fbf7d88131a041a8e7d3b38bef6865a08e56996dd75c2ba00
diff --git a/dev-perl/GD-Graph3d/GD-Graph3d-0.630.0-r1.ebuild b/dev-perl/GD-Graph3d/GD-Graph3d-0.630.0-r1.ebuild
deleted file mode 100644
index eed218eb4c48..000000000000
--- a/dev-perl/GD-Graph3d/GD-Graph3d-0.630.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=WADG
-MODULE_VERSION=0.63
-inherit perl-module
-
-DESCRIPTION="Create 3D Graphs with GD and GD::Graph"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-perl/GD-1.18
-	>=dev-perl/GDGraph-1.30
-	dev-perl/GDTextUtil"
-DEPEND="${RDEPEND}"
diff --git a/dev-perl/GD-Graph3d/Manifest b/dev-perl/GD-Graph3d/Manifest
index 3feae5962721..668c5be105a2 100644
--- a/dev-perl/GD-Graph3d/Manifest
+++ b/dev-perl/GD-Graph3d/Manifest
@@ -1,4 +1,3 @@
 DIST GD-Graph3d-0.63.tar.gz 97855 BLAKE2B db862650290970d8521dd9da2490a8eb10119dfb885f0100fd4d75a035c0fcb367614d7d483c6c9c650944fea671de181449917f8bb1bc44b519857ea364393b SHA512 4792461322e7f37a671c1ec87bceb4591f69a90d328d816b19b7fc1013c053c1d66de2f94511c010bed0a8cc6363ee46f928c864614703d399231e149012d559
-EBUILD GD-Graph3d-0.630.0-r1.ebuild 420 BLAKE2B 7037b720ed89161af6ef853b7032c059381de683d270ee7805865652a48bfe2426adce1431bb29d34ffeae337855a978037b7dab937e03c5bcef5b7ae1fa25f8 SHA512 1f691d4efa7d7f37bf81b3d99888de348029569b28cbd6cf495fff46e6c218b8cb897b6f1a80cc7f12b10b7985dded885f6476c09c57a565c4f7c902b80351e1
 EBUILD GD-Graph3d-0.630.0-r2.ebuild 416 BLAKE2B a77b6f68c38d4c185cfe2eb8383eadf0a8747a601018a4840bd9b9a2de1214a3ea5c36135caac0251b62cfff07c6057bfb29e09860ce5a3583e429a9a0166949 SHA512 f8deb964f27f1b75fc51d012669297669cbdd11bc1b8f7437fe481a071ad1677d8d51121da94d9f915079e6c9fe679f1c8e151621f1657d3ba176d5f9ffe47d5
 MISC metadata.xml 786 BLAKE2B eb115ec38a3b39966717fa92eb04b5765932764cd0a36839fd1639ed424ad417cbeca6382ab2a6dc2ca32221c8ce299545c6715160dc0926f0c8c8c12412c2f6 SHA512 cbbea768f087b71d77f412542d2d7eaa85473b83ab39e01d1d21d77fda2efe928052384c88d53fa901b4cb226c0dccb61a26225c32c6879fdf2b4730f3eae6d1
diff --git a/dev-perl/GD-SVG/GD-SVG-0.330.0-r1.ebuild b/dev-perl/GD-SVG/GD-SVG-0.330.0-r2.ebuild
index 6d34fc262a61..e0af267239df 100644
--- a/dev-perl/GD-SVG/GD-SVG-0.330.0-r1.ebuild
+++ b/dev-perl/GD-SVG/GD-SVG-0.330.0-r2.ebuild
@@ -1,20 +1,17 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-MODULE_AUTHOR=TWH
-MODULE_VERSION=0.33
+DIST_AUTHOR=TWH
+DIST_VERSION=0.33
 inherit perl-module
 
 DESCRIPTION="Seamlessly enable SVG output from scripts written using GD"
 
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
-DEPEND="dev-perl/GD
+RDEPEND="dev-perl/GD
 	dev-perl/SVG"
-RDEPEND="${DEPEND}"
-
-SRC_TEST="do"
+BDEPEND="${RDEPEND}"
diff --git a/dev-perl/GD-SVG/Manifest b/dev-perl/GD-SVG/Manifest
index de57f1d4802b..edde243acaa8 100644
--- a/dev-perl/GD-SVG/Manifest
+++ b/dev-perl/GD-SVG/Manifest
@@ -1,3 +1,3 @@
 DIST GD-SVG-0.33.tar.gz 46347 BLAKE2B 21b21491e9fa4ec7ed625cd6b318a96ec79060e36bf93a7a66c9ff088753291ff196affac74a42c99e3cc3da5e70cde810798fd5bdc228e2c637555d9b9bbd97 SHA512 2fc214b26448f381d8b97d14c5698b939c2ce8c6fd525a44d530da29f2deb5611c0111c75a577ba91273e97d0714220efbb709aedac67fb0dbbd82e6e4973890
-EBUILD GD-SVG-0.330.0-r1.ebuild 365 BLAKE2B 1d81e9e094fb04025c7a29542984743a6c7434333c652b55bae0a86717c06fea6f9fe696622d82415d65c261e1c4f7497e8ef0b095c081c6af1a19bb01855a1b SHA512 6f0e0cd018c2f2cbe752a1fa627e95975f6b098e0bb35b7932baacded43292e4a1802bbf74f10480cdb30b12144208382425dbbbdf9083a04f6bcd25279fdf62
+EBUILD GD-SVG-0.330.0-r2.ebuild 337 BLAKE2B 3270068383b24abac4bdc4d051a27429f57ea6d8bd10346b55ca21ad04a2409cd61ffc4618a41a5f9dbab1c2dc587d49c26e6a9232fb54dd8afe20fa9cdf6867 SHA512 b4310bc513ba8e3b3be59fba7890a612eb5408815b73a1b28563e37f930b73471413733bd49ab693307b99056784eab64b0c666299615e8570a08b6f614244ad
 MISC metadata.xml 568 BLAKE2B dc2b0a5eae6502e61e72ce92ae16b9945563e7d48e24a6db7104a1c6e42d4bdc58931e20ae00274efe84d5e276c6ac17e607ad455e5b87628ae6aca66557f472 SHA512 2fed8c6464ddabccb0fc255711582f5daf886b730a74194f9e66b97b367f4003d3ac98ccb2bb705b986315dd1171a00c52b3ce90c5c7dbbb5e37aca20ed58c4a
diff --git a/dev-perl/GD/GD-2.730.0.ebuild b/dev-perl/GD/GD-2.730.0-r1.ebuild
index d6d5874dceeb..508ee098dd71 100644
--- a/dev-perl/GD/GD-2.730.0.ebuild
+++ b/dev-perl/GD/GD-2.730.0-r1.ebuild
@@ -11,20 +11,15 @@ inherit perl-module
 DESCRIPTION="Interface to Thomas Boutell's gd library"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~sparc"
-IUSE="animgif fcgi gif jpeg png test truetype xpm"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc"
+IUSE="animgif fcgi test truetype xpm"
 
 RDEPEND="
-	>=media-libs/gd-2.2.3
-	png? (
-		media-libs/gd[png]
-		media-libs/libpng:0
-		sys-libs/zlib
-	)
-	jpeg? (
-		media-libs/gd[jpeg]
-		virtual/jpeg:0
-	)
+	>=media-libs/gd-2.2.3[png,jpeg]
+	media-libs/giflib
+	media-libs/libpng:0
+	sys-libs/zlib
+	virtual/jpeg:0
 	truetype? (
 		media-libs/gd[truetype]
 		media-libs/freetype:2
@@ -36,7 +31,6 @@ RDEPEND="
 	fcgi? (
 		dev-libs/fcgi
 	)
-	gif? ( media-libs/giflib )
 "
 DEPEND="${RDEPEND}
 "
@@ -61,12 +55,15 @@ src_prepare() {
 src_configure() {
 	local myconf
 	myconf="VERSION_33,GD_UNCLOSEDPOLY,GD_FTCIRCLE" # Per line 284 of Makefile.PL
-	use gif && use animgif && myconf+=",ANIMGIF"
-	use jpeg && myconf+=",JPEG"
+
+	# The following flags do not work properly. This is why we force-enable
+	# at least some of them. See bug 787404 as tracker.
+	use animgif && myconf+=",ANIMGIF"
+	myconf+=",JPEG"
 	use truetype && myconf+=",FT"
-	use png && myconf+=",PNG"
+	myconf+=",PNG"
 	use xpm && myconf+=",XPM"
-	use gif && myconf+=",GIF"
+	myconf+=",GIF"
 	myconf="-options '${myconf}'"
 	use fcgi && myconf+=" --fcgi"
 	perl-module_src_configure
diff --git a/dev-perl/GD/Manifest b/dev-perl/GD/Manifest
index abd77e4ef878..275e7c095b23 100644
--- a/dev-perl/GD/Manifest
+++ b/dev-perl/GD/Manifest
@@ -2,5 +2,5 @@ AUX GD-2.560.0-rt106594.patch 1253 BLAKE2B d7d05d2c492782a90e877932dd9a12aeedc5d
 DIST GD-2.66.tar.gz 253000 BLAKE2B 1a1d5374c06fcb07849e504c8c5c6f00443890cfb728fd02b4c94838d754c2f04bbda80cfa8e2a7b08a3c07cbed32aa6a499468dfb044865f833b3486965d2b8 SHA512 37d3da70f4e0b89b0166488a1f8a48c508ff5e515653fe1b10602cb708ae0ce713c617dcae21c48ec795799fb0e061762696e6a65bb8ba359859223d15677c61
 DIST GD-2.73.tar.gz 261203 BLAKE2B 088cb4d3c846d61e89631c7fef6b0273489297f0613e1ebb98c33b404a613431c79a5e72c2b757450496ef8d86aabe387b102a4c8d22d69532b8d8e989bac9bf SHA512 0c360c86307c8a2484bd8e1fb4cf24e27f7976bcfd830d9070fdc3775d233845734c59796082d498276aa715f30c9452c492b0d5bd75e488c1e9c5fa76490709
 EBUILD GD-2.660.0.ebuild 1489 BLAKE2B 7f5d3c7fc11662353a27be7eebc9e5ba69f24fb11a0d7bee6dd1cb4dc8b2d844fcf20ad15b408c8baa0a68172d823648a057df6989e9e636fdcd286cb1e9a7f5 SHA512 e4c72da6ca0757b4d06fb92e5565244bf56b1b093c80fb073fd1eb42ad4f4816d942387cd42a24f0c7f12ecf84bb9c3f38160f7e17a597048658542910de8c1e
-EBUILD GD-2.730.0.ebuild 1544 BLAKE2B 69038bf78e6cc656539167e2b8d9f0e6f4bdc076ad90f9b41dc5e5706275573aeb7ab682d948a6840c4c72449214c23b078e7aeb748ee8d395714c7b7368f790 SHA512 67b1b53891e669ed6b0b82d4371aeda264f7e0d8361657473b12b6d786c92ccb5531210c3293d201f6bcb9ef13aed6f6477809a800e889e9255814ee79f687dc
+EBUILD GD-2.730.0-r1.ebuild 1563 BLAKE2B a67ff38a135bc61595099c413972b8557e50465453de836529f2550f777290d2eb05404398414be845ff99fc8af4b606bad167da928a33f89d15ef6e4d33f014 SHA512 a19019084d6c3c23c9d6de2a21bb0e3ee313aea5548644c7803ae2c15cf501c6b4746808ea074d58edd19ebb495e10e6176f7987b76349b3b663ba3a4e88133f
 MISC metadata.xml 852 BLAKE2B ab7abbcbf4d6d62266365794525899c41cb9119ac9173363eebb2573e682671c3e7b7cf032d450d90c19a9ba692915f2cbf706e2a90260c80f8e8eb251cee763 SHA512 7b5fe91b323a991d33efaa0b4eb5e4cb96ae8b279035e72a9d9937e08d64cfc7ae39d6ee720becabaa434d55088f05bb4352ff57e7abd63abe0c1949771a3f86
diff --git a/dev-perl/GDGraph/GDGraph-1.490.0.ebuild b/dev-perl/GDGraph/GDGraph-1.490.0.ebuild
deleted file mode 100644
index 8b6ddb3d4c86..000000000000
--- a/dev-perl/GDGraph/GDGraph-1.490.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=RUZ
-MODULE_VERSION=1.49
-inherit perl-module
-
-DESCRIPTION="Perl5 module to create charts using the GD module"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-perl/GDTextUtil
-	dev-perl/GD
-	media-libs/gd"
-DEPEND="${RDEPEND}"
diff --git a/dev-perl/GDGraph/GDGraph-1.510.0.ebuild b/dev-perl/GDGraph/GDGraph-1.510.0.ebuild
deleted file mode 100644
index 1154f99a5543..000000000000
--- a/dev-perl/GDGraph/GDGraph-1.510.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=RUZ
-DIST_VERSION=1.51
-inherit perl-module
-
-DESCRIPTION="Perl5 module to create charts using the GD module"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/GD-1.180.0
-	>=dev-perl/GDTextUtil-0.800.0
-	media-libs/gd
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.640.0
-	test? (
-		>=dev-perl/Capture-Tiny-0.300.0
-		>=dev-perl/Test-Exception-0.400.0
-		>=virtual/perl-Test-Simple-0.880.0
-	)
-"
diff --git a/dev-perl/GDGraph/GDGraph-1.520.0.ebuild b/dev-perl/GDGraph/GDGraph-1.520.0.ebuild
deleted file mode 100644
index 720c67c5fe79..000000000000
--- a/dev-perl/GDGraph/GDGraph-1.520.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=RUZ
-DIST_VERSION=1.52
-inherit perl-module
-
-DESCRIPTION="Perl5 module to create charts using the GD module"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/GD-1.180.0
-	>=dev-perl/GDTextUtil-0.800.0
-	media-libs/gd
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.640.0
-	test? (
-		>=dev-perl/Capture-Tiny-0.300.0
-		>=dev-perl/Test-Exception-0.400.0
-		>=virtual/perl-Test-Simple-0.880.0
-	)
-"
diff --git a/dev-perl/GDGraph/Manifest b/dev-perl/GDGraph/Manifest
index 99c2f50e2300..4a54cc425592 100644
--- a/dev-perl/GDGraph/Manifest
+++ b/dev-perl/GDGraph/Manifest
@@ -1,9 +1,3 @@
-DIST GDGraph-1.49.tar.gz 155643 BLAKE2B da76c442d51713b8839ee89c22734345730121f698f4ed45cc3cc5f5ec6a09f409dc2744cccc8979ac003b5aa6bca922a73ba22af8a8fc22d966e4f7a852a002 SHA512 720cc51dda41963be087bb39418642f75dade1bbab54cd4d788c18c9328f3fbd6a5c0f73027bb0be64d44cd94b0c5f2d67c48d4b0c3c34736ac8f7bc8cba95ab
-DIST GDGraph-1.51.tar.gz 156175 BLAKE2B d2cee141c9702c7584a90bf652f47670d5492ac8836c1c9d229010084ab606caba7cc12f0578e1b89b9b8f7c9b22a3f28d9c222777ed4a3df73576cb0857acad SHA512 c9cafdc90905fea8689cac32d0429ae987a933ae090de9894c9f70668db5c636e9363e76a656898df667dd0b0b4f593a64f3327f0b8a9738f74cd2cd937005e0
-DIST GDGraph-1.52.tar.gz 156349 BLAKE2B 93eefa2a1c342e0e8822bc3bd49837b9a5a882f15085aaf1888511631d064d5c6069b4c95ea11fa519edc3fb061dfe4a4e1dbf2d07cf4db1eba7dd20fe1bedb5 SHA512 9a213a5fb44608f3984ed763659fb0cb631bdbc34e89683eb3d4cb776de7fdd1cf4c9e339cf02e0035d4978bfd0d82723e1576c40720af917f50bb0363fd26e0
 DIST GDGraph-1.54.tar.gz 157158 BLAKE2B d427f135998c8e60e62ea0e94d1a8c2c48756fdd3d7fe2ab230f342657a684cacc3b3a9633cfdac16a5e65d01e2093043b5d8d4050082821e95b30ababc545e4 SHA512 0dd0da5fa0e879cf2addcbfdd02ee8e9e6af715b88b451dc29fe5028f30d7ba7fa0e126d07e7bb4f9a63e40b3be95a9cc0f6c061ea8644ba0ee7fdd2a7964fce
-EBUILD GDGraph-1.490.0.ebuild 413 BLAKE2B b19bfd4181112e005412059f07f552db25a8efb5c0d263c1d60cae6744dfedb77c29ecb47210c11b35e5bb6a92e355fad9713a15cfa18a1e3b59e29990f2874e SHA512 aeaf67d1b20d0bf9421f73c580a99aba799b019a6cad32c9fe7bcbdd6b721ac4b95044f8d256c4e3f6629f9ec4e97ade3c5febb6b1fe324198e3fb18b665fca5
-EBUILD GDGraph-1.510.0.ebuild 619 BLAKE2B 566287277695686f8e98f53c84ba5549931cc313e2d85ae2bfbd73e2390d1db10ad7a21c750f3c7c5696c1f15f634481195c381e301ebed6bd942d1f85d92e97 SHA512 f0f8cea367138409138d0321924e960a17e0604d4e1b2675a738e9529b6118cc3e9e9353e77939b82ea56ac2b1795b62c77bdf8069bd5d8ecd448830fb24356c
-EBUILD GDGraph-1.520.0.ebuild 619 BLAKE2B 4c84500b6a1ed0427f7c3516b51b23e44f6432faba71859f829eeca48e2bafb4f9a0b3d0c0ec433e2d5c93146326c05e71a422d4d2c5879c9122537c14b183cf SHA512 33194326c72f865a48af128e9aefb5441c7ab04c3768c60af34b96a70c8c23054776575be9ed5f560745fb158fc3d9011bb5230ba7978beec7e63a67661193f2
 EBUILD GDGraph-1.540.0.ebuild 626 BLAKE2B bd5c2ded8f4170088e7eb125863fd909b094e2892e53f88fb175e6f9c0f2548a3ce902b51631962a5e3b190983c355e7a973948db3cedb81be9cc56fecc7d345 SHA512 1eff750e3c39f5682d7ccd1af0a84615287281dd1cd31ca3419634504a97521b00eed16d5d5772991f7a5378bfa13bba41a7701153da8b139f5d8d376dc794c6
 MISC metadata.xml 1212 BLAKE2B dac36fc8d38ddc79653e34777cce9f3bc7a7d636a84945cc78fc0df5697be2590012ca2a61a19df87f1fcb89833d15441fedb9bffa629032b83e6542aa6f2032 SHA512 6aded283f8bbaab312b2cf1e8e18e4700b05b9fe1b8f49b06390ce5421f7c9a41916782c8bb62b5334d2a0089f81a1f58e1a3c2f229f1860dce90138bd41d2fc
diff --git a/dev-perl/GSSAPI/GSSAPI-0.280.0-r1.ebuild b/dev-perl/GSSAPI/GSSAPI-0.280.0-r2.ebuild
index ae7a3752e5f8..b245660df2e3 100644
--- a/dev-perl/GSSAPI/GSSAPI-0.280.0-r1.ebuild
+++ b/dev-perl/GSSAPI/GSSAPI-0.280.0-r2.ebuild
@@ -1,21 +1,24 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-MODULE_AUTHOR=AGROLMS
-MODULE_VERSION=0.28
+DIST_AUTHOR=AGROLMS
+DIST_VERSION=0.28
 inherit perl-module
 
-DESCRIPTION="GSSAPI - Perl extension providing access to the GSSAPIv2 library"
+DESCRIPTION="Perl extension providing access to the GSSAPIv2 library"
 
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="virtual/krb5"
+RDEPEND="
+	virtual/krb5
+"
+BDEPEND="${RDEPEND}
+	test? ( virtual/perl-Test-Simple )
+"
 DEPEND="${RDEPEND}
-	test? ( virtual/perl-Test-Simple )"
-
-SRC_TEST="do"
+"
diff --git a/dev-perl/GSSAPI/Manifest b/dev-perl/GSSAPI/Manifest
index 0d58bf711095..68093f57b149 100644
--- a/dev-perl/GSSAPI/Manifest
+++ b/dev-perl/GSSAPI/Manifest
@@ -1,3 +1,3 @@
 DIST GSSAPI-0.28.tar.gz 67915 BLAKE2B 720dcaa7c3a03902f6a33190769f04665ff72a4a0308ebfa0e8d0d576e020f30dbef1eb1eb49295e703528e90ef21c1583a11c23cdc1a68f5588e6e929ef86be SHA512 4bae4729c216da099f6f0479ef34874fa62c1afc57bf56860e1ce082e9e6a902ec072f9e976ab2f1914df1bbad6b6689af04a9867b3ca1a9f11d0287e58aa204
-EBUILD GSSAPI-0.280.0-r1.ebuild 482 BLAKE2B 1a6cd882a0f234fd4b27cd1055b2171cf0c12cedf5bc3512cce725690658f872f24fe53465b4e53f6f2ec3bc16413cf2a0e44339c6199181bba641d7256c1347 SHA512 497ab4215d47f0977d78d123ba77795dc048a6dd9dfdad33ecf22ecb7ecb3a30a73000891f85069c29e1c47c0aac2d3f94c3620bdab730c1b85881e3df35caf2
+EBUILD GSSAPI-0.280.0-r2.ebuild 480 BLAKE2B 1f7ca17d566ac3d7acaebfee900512904e99a6aafbfdbbd8bf6649607dd8598f769d501ea8c1ff5f3dacfdb9a89d8c8e7a450fd1d6ac2d562323f480e4f75e3e SHA512 61b1dd83ac79ce34f40d30dc3af16d35f8392fa4fcfaa0316e1f702f25447a8591ed17d06e5c82b35a45ba15e54ae2f221e049fa4f12b4a9fb6a3ab6f7c5b233
 MISC metadata.xml 565 BLAKE2B 86b4ad964ffcbdeb8e22b933fb2d36b229c2d55123fc46f42d95a34e0968b0499873990111199d46ddc353b0bc678d74b1a30f01a03a9a011130181f188e590e SHA512 a4f81fa84d30dbd8eb5aef34cd114ca4307edb95da7f1b80d4b055e7b23956b819723a7d886998a5c0b5308a446345d33934b5e4a778bdef55ea1ec0a61b38d9
diff --git a/dev-perl/Gearman/Gearman-2.4.15.ebuild b/dev-perl/Gearman/Gearman-2.4.15.ebuild
new file mode 100644
index 000000000000..7f88f74bf37b
--- /dev/null
+++ b/dev-perl/Gearman/Gearman-2.4.15.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=PALIK
+DIST_VERSION=2.004.015
+inherit perl-module
+
+DESCRIPTION="Gearman distributed job system, client and worker libraries"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-IO
+	virtual/perl-IO-Socket-IP
+	dev-perl/IO-Socket-SSL
+	dev-perl/List-MoreUtils
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Socket
+	virtual/perl-Storable
+	dev-perl/String-CRC32
+	virtual/perl-Time-HiRes
+	>=virtual/perl-version-0.770.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/File-Which
+		virtual/perl-Perl-OSType
+		>=dev-perl/Proc-Guard-0.70.0
+		dev-perl/Test-Exception
+		virtual/perl-Test-Simple
+		>=dev-perl/Test-TCP-2.170.0
+		dev-perl/Test-Timer
+	)
+"
+
+mydoc="CHANGES HACKING TODO"
diff --git a/dev-perl/Gearman/Manifest b/dev-perl/Gearman/Manifest
index 95cfcf6e6bde..cd5640ce9ede 100644
--- a/dev-perl/Gearman/Manifest
+++ b/dev-perl/Gearman/Manifest
@@ -1,3 +1,5 @@
 DIST Gearman-2.004.009.tar.gz 47063 BLAKE2B 4917d711407231d392844cd37390e0a73dc0a85d2e08584177f0986fa7dc16122d03280baf22a1121ea8478126caa3c68af961e59d007874ba5327736e61d2cf SHA512 4c0ad8dfa8af1200f29b61954efba03fa0d629a40bfea379025b5f01b2f8305394a516680fa7564d68c0231359ed5866daff9278b4350fbdc1a0b20bdb34eeed
+DIST Gearman-2.004.015.tar.gz 48847 BLAKE2B 60613a622c238c4736df6d07dcad714d882f6ef8a83831b18461857d3ae560966fd3ac5ab9bf83ec1dd1fbe994450ae2eb7e4fea5ad44802403bd88d10c325d5 SHA512 020eb3ca55f8ef33f546f60c6cb8c70d2dbbae21f11e0c165443569805040df7b2a0c89bec9de1d3c7733c3edf25bffa8faf69857c29f8b2371b5e06f5b0fd11
+EBUILD Gearman-2.4.15.ebuild 889 BLAKE2B f96efacb499f2409836360654887993bc8784f4660428b68e05f2ab2498e3e4f04793f3402f45dea8509e132f39618d5dcd4e9dfeff0264454431388081fa6ed SHA512 6880785b43bb03d01ad73064b76b88ab247c629afb551759096cdbc72f08330e20553d19dc7f6ebd58d81382962c207505084befd0777396f627e8a635c5adbe
 EBUILD Gearman-2.4.9.ebuild 888 BLAKE2B 098d60cb71b462fc327bd488983fc07342cc4a96b55767fdba9371b327d995276b8b2973dcdc41243920e3a69ef616dd118cbaff13857ea277b209075cef2861 SHA512 ee8f9e77c868f1f5843e82ac7e292ced4ab7436eb64bfa885272771ace2452fa7485b1ae06f3e6b47c31ecd971ae2094ec46cb7e62e3e8dc5962d114007dae8f
 MISC metadata.xml 1057 BLAKE2B 98993ea6f4d1af5edb863a219ccc5fc3960cd6887e8c42847c061b969a4c75272c9613e5498b86d8d981bd68bbb696e88f3670f1c36b48532098e2046f378774 SHA512 36394554c8e32d2e9812f19ef5597b3f36d796459380a1e61002f1b8b9850d968f61dbc13c9dfa378891122f8bc955ce34b365b98d4b5af098c27a3c0ac20dc9
diff --git a/dev-perl/Geo-IP/Geo-IP-1.510.0.ebuild b/dev-perl/Geo-IP/Geo-IP-1.510.0-r1.ebuild
index e742c4b5e111..2985be70e374 100644
--- a/dev-perl/Geo-IP/Geo-IP-1.510.0.ebuild
+++ b/dev-perl/Geo-IP/Geo-IP-1.510.0-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-MODULE_AUTHOR=MAXMIND
-MODULE_VERSION=1.51
-inherit perl-module multilib
+DIST_AUTHOR=MAXMIND
+DIST_VERSION=1.51
+inherit perl-module
 
 DESCRIPTION="Look up country by IP Address"
 
@@ -15,8 +15,7 @@ IUSE=""
 
 DEPEND="dev-libs/geoip"
 RDEPEND="${DEPEND}"
-
-SRC_TEST=do
+BDEPEND="${DEPEND}"
 
 src_configure() {
 	myconf="LIBS=-L/usr/$(get_libdir)"
diff --git a/dev-perl/Geo-IP/Manifest b/dev-perl/Geo-IP/Manifest
index a175cf9623f7..74bc4b53a10f 100644
--- a/dev-perl/Geo-IP/Manifest
+++ b/dev-perl/Geo-IP/Manifest
@@ -1,3 +1,3 @@
 DIST Geo-IP-1.51.tar.gz 155629 BLAKE2B bfbbc00f53b6f564bc26252cff89e4bc97a2840c59014349c6f2af50d4130bb54068c9e96b4eecc4d7285a180da97d4da7f1c1364d36fdd3cd5f86bcd79ab17c SHA512 1149a2457a5a971a47585300ac68e71537fce4af3396aafe12ccb298b4a9e90b5fb0bc8bb01dec80698c3c57ae8e045a04c53747cc0ce80f8c4d3dd033ed76b3
-EBUILD Geo-IP-1.510.0.ebuild 485 BLAKE2B dd5e1eef83dc68e293868e753bb0314334c3fa1ea2fd52bc59ce0ec7bfc07efc4d2f205f527070fa7a89a5d27700908f84eb67fb9425beb08e2fcc4090505f2b SHA512 56503bc96c6bad4b3e81b11c9b1be178add03d1eea0bb971a70801269571911d88d366adb50334be075d5520db2b34610781f5293d531fb7f0a3b3079fb3e3a8
+EBUILD Geo-IP-1.510.0-r1.ebuild 479 BLAKE2B 6013c0c3f74e066ef6980700dbf86a3be1dd7391ac3dafb47df9eece273fba7a35ef8360917f59449a66632230c029a9e1d3b74cdfa47ea64f92017c7298cfe9 SHA512 8d51cf33b50c8784f3cc8e737c5ed86f65915b57e9f02c91e3192fc237d2f658eabc114ac8445a09f6c1cd866d7bba9cae54746dcbe104a0b025e8e1a7ee4c04
 MISC metadata.xml 651 BLAKE2B 5db3030b2bc6bfff69a40bcec5fd896e16b47848d8f41f157d1677fda72160961b0144bd71f2e41ca239d8790b08cef4786ce85405256514e765e48c9feb8ec5 SHA512 dc66b597cf7c8486f5a67318a99236df001ae8255876b7a4d09db928334bcce4756ad5253bd613bf87867e4095c32a4d403f09440bf976539f19d2562a8ace75
diff --git a/dev-perl/Geography-Countries/Geography-Countries-2009041301.0.0-r1.ebuild b/dev-perl/Geography-Countries/Geography-Countries-2009041301.0.0-r2.ebuild
index 0950d54e1b73..ff1c249e66c9 100644
--- a/dev-perl/Geography-Countries/Geography-Countries-2009041301.0.0-r1.ebuild
+++ b/dev-perl/Geography-Countries/Geography-Countries-2009041301.0.0-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-MODULE_AUTHOR=ABIGAIL
-MODULE_VERSION=2009041301
+DIST_AUTHOR=ABIGAIL
+DIST_VERSION=2009041301
 inherit perl-module
 
 DESCRIPTION="2-letter, 3-letter, and numerical codes for countries"
@@ -12,6 +12,3 @@ DESCRIPTION="2-letter, 3-letter, and numerical codes for countries"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/Geography-Countries/Manifest b/dev-perl/Geography-Countries/Manifest
index c9fa4e72c27d..917ef2111177 100644
--- a/dev-perl/Geography-Countries/Manifest
+++ b/dev-perl/Geography-Countries/Manifest
@@ -1,3 +1,3 @@
 DIST Geography-Countries-2009041301.tar.gz 10545 BLAKE2B 10be8c1cd0081f5ae418a13ddef86ac31272ce300f130d1b3bc33b235c3abc9c7ee5a8d655199d227fdcde53dad30b2f04ed775a2abf50bead6ea89cb8a23259 SHA512 4197edced04c7330dfd8ba7fbf137c3b6e47fe6402b3f90bacbfddf790dc38420c500846fd1abf0a4b99a2558d651086f3daffb0e52df9b679f5aacd9a1a203d
-EBUILD Geography-Countries-2009041301.0.0-r1.ebuild 369 BLAKE2B 1125da767430f9b59ed514dfa7c548b5c82a140ffafa1737e6b03ec5a132d70dab9278bf415d8cd6ead88f62a5c468f23557f8618c6562f83b2bbab2e75670db SHA512 02ed79c07a18e10fb6687b55f21ea7e0589d1866d44152d17450f8f57d8c36585702037128d12adc987ab6f67ec4f10d0f0086e629ab772eaa2804c472a71db5
+EBUILD Geography-Countries-2009041301.0.0-r2.ebuild 342 BLAKE2B 0f87cccca150c17e0ef903651ef94c3c8b87663cc29413cd38f5f74f98b27b035a2ae1b1f28784111f5330870855be2639c8e3dd6088508430ec8f7ad98318dc SHA512 29e19b0fe552756f454bad51c5c06c76cc4a597b0428f8ebf9477355d076621dfd1c5016fc4e155ec17959777765f2f1b8ce2c969df3b19cdf80ed9da59c9fab
 MISC metadata.xml 410 BLAKE2B df19d823e9d0c2d1fdda15609858c6e3322077301785fea7e01925c7e9d8daf5da1f9ce6516e1cab68bc6cb0c67ba489d85bb2cbea5c953f487163eb77f17138 SHA512 cb707d523fb0bfb1a540885ef581568da22c1b53115331b20d5e14f2e1a65d6f78c7f50a964c3764ca44b7cb0634b5628cb7373765c40c6803bb4682faff3050
diff --git a/dev-perl/Getopt-ArgvFile/Getopt-ArgvFile-1.110.0-r1.ebuild b/dev-perl/Getopt-ArgvFile/Getopt-ArgvFile-1.110.0-r2.ebuild
index 3e189174f0b3..adb5a9d06336 100644
--- a/dev-perl/Getopt-ArgvFile/Getopt-ArgvFile-1.110.0-r1.ebuild
+++ b/dev-perl/Getopt-ArgvFile/Getopt-ArgvFile-1.110.0-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-MODULE_AUTHOR=JSTENZEL
-MODULE_VERSION=1.11
+DIST_AUTHOR=JSTENZEL
+DIST_VERSION=1.11
 inherit perl-module
 
 DESCRIPTION="This module is a simple supplement to other option handling modules"
@@ -12,6 +12,3 @@ DESCRIPTION="This module is a simple supplement to other option handling modules
 SLOT="0"
 LICENSE="|| ( Artistic Artistic-2 )" # Artistic+
 KEYWORDS="amd64 ~ia64 ppc ~ppc64 sparc x86"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/Getopt-ArgvFile/Manifest b/dev-perl/Getopt-ArgvFile/Manifest
index 8bca682f8668..364a9f5c3a4a 100644
--- a/dev-perl/Getopt-ArgvFile/Manifest
+++ b/dev-perl/Getopt-ArgvFile/Manifest
@@ -1,3 +1,3 @@
 DIST Getopt-ArgvFile-1.11.tar.gz 19469 BLAKE2B 10d7a55fb9c88408cd5b39949b13b0bb42e8f71e010048713cc8725053a6785aead8b05755a2bcaf0f6f9403f3bcc9bce0ac4a690b51cd75f97ea2674a818824 SHA512 832e9ec6de3dfa4aaac68faedd3561cac570761e0de805e084e8dc7b386579cd0a18278aeb262ea82fddbdf8277b17bbd7593c15d41b1d6d7de4739fc8cc8f11
-EBUILD Getopt-ArgvFile-1.110.0-r1.ebuild 388 BLAKE2B 2a2e32e4f5c72a8eeded0131541b194d82cf68526c9086caae0dd24f4917dbdd7c3daa1a4976ccd1a633531fb74024cc67d4ffa37fff61db70f7922da0ae721a SHA512 c12bb380901e4d0360c6324d9ed022d7e3d0e04c6475b037679c3782424150e4ec585b2340c76790c00a51f1fcf092c26cb7bef3025a2c326ebdacf3c4472e1a
+EBUILD Getopt-ArgvFile-1.110.0-r2.ebuild 358 BLAKE2B ac24bc78e752980fb2fc3d4da5a400a3bcf6bf17ebf1b20cf8fddcea29e41b3fccd12f64a5718599fba6cc188eb4355fd9503ad6fdfa5719f6400c208c56b051 SHA512 521d6e80cf389279233fda645674b2a91d6e3ac3be91bae1d26bb9db98fb866e33bbb40b1728f0d3b7098e639993924a688b954d26a4d29f7e41c6dcbe4a8352
 MISC metadata.xml 402 BLAKE2B 8de2b4a8a59056728f8778c3edeb504d304f1253fdf7a092d52737fa0481f5cab913a8f435402893f888cb5b390ee0df70d941a6ab417fee85d3ea85769a1d19 SHA512 e5d0266528fb33f50c167681a9d6e903757ccae940c88f6019ad1b03e88636a7401638d41dbf1fdb682d4fe4fe2bfeabd662733c9321aeea0b9d288f63eed1cf
diff --git a/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.109.0.ebuild b/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.109.0.ebuild
new file mode 100644
index 000000000000..c975095d9c6b
--- /dev/null
+++ b/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.109.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=0.109
+inherit perl-module
+
+DESCRIPTION="Getopt::Long with usage text"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="test minimal"
+RESTRICT="!test? ( test )"
+
+CONFLICTS="!<dev-perl/MooseX-Getopt-0.660.0"
+
+# File::Basename -> perl
+# List::Util, Scalar::Util -> perl-Scalar-List-Utils
+# Sub::Exporter::Util -> Sub-Exporter
+RDEPEND="${CONFLICTS}
+	virtual/perl-Carp
+	>=virtual/perl-Getopt-Long-2.330.0
+	>=dev-perl/Params-Validate-0.970.0
+	virtual/perl-Scalar-List-Utils
+	>=dev-perl/Sub-Exporter-0.972.0
+"
+
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		!minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 )
+		>=dev-perl/CPAN-Meta-Check-0.11.0
+		virtual/perl-File-Spec
+		dev-perl/Test-Fatal
+		>=virtual/perl-Test-Simple-0.960.0
+		>=dev-perl/Test-Warnings-0.5.0
+	)
+"
diff --git a/dev-perl/Getopt-Long-Descriptive/Manifest b/dev-perl/Getopt-Long-Descriptive/Manifest
index e3b150015a17..759ba40f14ea 100644
--- a/dev-perl/Getopt-Long-Descriptive/Manifest
+++ b/dev-perl/Getopt-Long-Descriptive/Manifest
@@ -1,3 +1,5 @@
 DIST Getopt-Long-Descriptive-0.103.tar.gz 32683 BLAKE2B 9e457690d61e8b2330761ffd09174403d7e485c80af84d2cc61b7443762dcbe9832a15c589b729536103e80c75556f60040d5d1d3637a5eb3226bf1cc1d57ce6 SHA512 9229575bde794fa1213871fbb33a12222737d7979cf4c290200fd85c7da9e3227539809b8380a88a85675429ceb61e505bac8cc4e1408ca63ba92b4e1b33149f
+DIST Getopt-Long-Descriptive-0.109.tar.gz 33959 BLAKE2B c936f820654a5a14dfef706f26514334463b119b161643bbeb831802d9b7403c49f1cccd0414da855ef1bed424d88b78a220f037fb2d723ecce8d7ede54840e9 SHA512 9bd3af84119264c9e7e72b470f54782fe0a9e37e6071052a7b43af9529087841f77f06f81a70e4cab05380558216893b0902aabefcfbc970916f65614666969a
 EBUILD Getopt-Long-Descriptive-0.103.0.ebuild 977 BLAKE2B d787db62716b270cb9d482392c0b24d46c8165dd1b3a1f6edb80635dc009143ab300c84d64e0cd1a8197d602d2d47c2ed72a5ebd2404826d4cb6be4f7c7f8689 SHA512 8d1f30fc8ab4f7ecf381f67bc3737912acbc4873472fa9a8a681b2a1ff7a971d3cc19976e7e8920cdd79f559bb5bfcf7b2c2380c2c388cba12ab1e45ea8c131f
+EBUILD Getopt-Long-Descriptive-0.109.0.ebuild 984 BLAKE2B 6085b004a80182fccbb9851ccd5d10ffe211c743ec8c4a27e07d168bf85ef1c95d6c1e0f46b110ee0942f24426ce8f3fcbc2b4c332039b60ec670c0e447a1445 SHA512 25b56721637e037e5698e3d39f4ad9c316c9d77f35961d7a17b49db0d81dd5fc85eb6b6a1436e8f84b26034ee1d6236ffd1dd3d7d7755ff032be87d146d8ce31
 MISC metadata.xml 576 BLAKE2B 284499ae9040033acd83c3f9ca6f5263c1b0652146333fff6e808587149264f7114d523c116c84f1e133cb558da9095403197da0c90f917777791e869515aef1 SHA512 4a83ea267c2c7d62a81da04c2afd355b6a6d35a1fb6dd8e2fb22b23e59b269b01ce6a91e1a76ca36ae6c621bf33e0fad295c733cc7f84255416c0aa146162bcc
diff --git a/dev-perl/Getopt-Mixed/Getopt-Mixed-1.120.0.ebuild b/dev-perl/Getopt-Mixed/Getopt-Mixed-1.120.0-r1.ebuild
index bd4ff962a2fe..a0559a6b79d0 100644
--- a/dev-perl/Getopt-Mixed/Getopt-Mixed-1.120.0.ebuild
+++ b/dev-perl/Getopt-Mixed/Getopt-Mixed-1.120.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-MODULE_AUTHOR=CJM
-MODULE_VERSION=1.12
+DIST_AUTHOR=CJM
+DIST_VERSION=1.12
 inherit perl-module
 
 DESCRIPTION="Getopt::Mixed is used for parsing mixed options"
@@ -18,9 +18,7 @@ RDEPEND="
 	virtual/perl-Carp
 	virtual/perl-Exporter
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
 	test? ( virtual/perl-Test-Simple )
 "
-
-SRC_TEST=do
diff --git a/dev-perl/Getopt-Mixed/Manifest b/dev-perl/Getopt-Mixed/Manifest
index 5d5b087d29a3..541c2cf93525 100644
--- a/dev-perl/Getopt-Mixed/Manifest
+++ b/dev-perl/Getopt-Mixed/Manifest
@@ -1,3 +1,3 @@
 DIST Getopt-Mixed-1.12.tar.gz 21423 BLAKE2B a3ddc209c0c3308aebc922316f72072aab1579a288e7de46b1b263b5736f236f8d03f14a95b5006bc858fe68c9aabd3a2bd8296405e4ddb8abea1e60d2986af3 SHA512 74e7d0e7cf854d18b69cf36caf9647f78660db1b21ceb6750aae15aec5e40947902834d7f178adeae442f83958157809a2f95f1873c120dc3093c35d1fdc0ad2
-EBUILD Getopt-Mixed-1.120.0.ebuild 501 BLAKE2B eb29af35fabb820a4b95e235ae2179a917da281df661d43e4f3b4f261233de66209ea171b079bdc6792fb2dbd099a59ab0eec777eac3790ab5d42f1bf7de6900 SHA512 b947b6c432435da1adeef4649b27a9d483ccd73a64e43c943c10569192709343c9aa036cf235e7f14c7b456d99a64258fa84e5b3964c30fa57b2f52d68e0cda2
+EBUILD Getopt-Mixed-1.120.0-r1.ebuild 485 BLAKE2B 75d26fea07afacf15fd3036efb127b33f0207021496a21b9ec85d6c510ecf971a6ff25000a3073a640dd1d46e07817fdba68937dffa05b4d305f7f8ddf27e258 SHA512 55ecd1cb200084b9f8b391a67307b7a72f74c67ab92c14a71e9750de1c965a10089678c7d71a93e4ad4c9f7d176e760ff910b2a797ff9853360724d7c70c76be
 MISC metadata.xml 396 BLAKE2B f571cfd6f95fc59f06a46ea53dc2682706b84b755a4692e785400069a8ab0792a1bf252cf577aa20a977aade983005ee3ab0c816d691bece37f8d1adcb87e8ab SHA512 47dab0acf571b2e97683b7635b2d006aa3ac31bb80769053df689fcc7549186830b0f0db2a18e96a5a5446aa0c2cca2ac68324fdd6405c815e23e492e6c8bccd
diff --git a/dev-perl/Git-Wrapper/Git-Wrapper-0.48.0.ebuild b/dev-perl/Git-Wrapper/Git-Wrapper-0.48.0.ebuild
new file mode 100644
index 000000000000..ef88907f9d71
--- /dev/null
+++ b/dev-perl/Git-Wrapper/Git-Wrapper-0.48.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=GENEHACK
+DIST_VERSION=0.048
+inherit perl-module
+
+DESCRIPTION="Wrap git(7) command-line interface"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-vcs/git
+	virtual/perl-File-Temp
+	dev-perl/File-chdir
+	virtual/perl-IPC-Cmd
+	virtual/perl-Scalar-List-Utils
+	dev-perl/Sort-Versions
+"
+BDEPEND="${RDEPEND}
+	dev-perl/Devel-CheckBin
+	virtual/perl-ExtUtils-MakeMaker
+	virtual/perl-File-Spec
+	test? (
+		virtual/perl-File-Path
+		virtual/perl-File-Spec
+		virtual/perl-File-Temp
+		virtual/perl-IO
+		dev-perl/Test-Deep
+		dev-perl/Test-Exception
+		virtual/perl-Test-Simple
+	)
+"
+
+src_compile() {
+	perl-module_src_compile
+	local MODULES=(
+		"Git::Wrapper ${DIST_VERSION}"
+	)
+	for dep in "${MODULES[@]}"; do
+		perl -Mblib="${S}" -M"${dep} ()" -e1 ||
+			die "Could not load ${dep}"
+	done
+}
diff --git a/dev-perl/Git-Wrapper/Manifest b/dev-perl/Git-Wrapper/Manifest
index ff1ba7f48110..cf56457d28d2 100644
--- a/dev-perl/Git-Wrapper/Manifest
+++ b/dev-perl/Git-Wrapper/Manifest
@@ -1,3 +1,5 @@
 DIST Git-Wrapper-0.047.tar.gz 30416 BLAKE2B cfe969bd4d60ec0252cd9d78d753ff3200a8bd1a522617dba5436361817eee969d9310bc40aa68651697c75ead5a6764d4e8b02031dd70d256b2124f0c8d9181 SHA512 9a2c9bf30a9b803170adfeae9bbe41e1b0fc9e67fe477d4fdf1d20a57917c69c1c6be2a90fbc382f85cf83a209b39a9a3431276b33a6e7655b8cd240d1a68e78
+DIST Git-Wrapper-0.048.tar.gz 31531 BLAKE2B 18d74644a0e3d37b60e69a86f70b5a0769627c5dd2b7d1986c960443f4bb7a2f9cc3f1cd3e6bb120c27cfb5bc5e6fc5bcf7a11ece27af7abdbd4cf42914ba3dc SHA512 2dce8cc1c05a321ba31c3c78cfb6e3c793fa3d47d03c459ee559540eb31db71d9c641b4c1dbcd5782d84031a7aaf6024c5b60c2ae71b94d0a7a1f19f9746ec03
 EBUILD Git-Wrapper-0.47.0-r1.ebuild 933 BLAKE2B c56c59329441b6ac62357a7c0042951ffd9493b7162c502ca869331b1ecb11ca5c1b620e39e634828b181f80659714756722b14b4beb70c740c9c173d18ba9e8 SHA512 cd0804da117c994bc43826e3c44d3602e88e85d6d2b9d7eb14a781d0720533927cf39107224f232df33f0918fbded8beaef7d126f302b025ac86521036c813f1
+EBUILD Git-Wrapper-0.48.0.ebuild 935 BLAKE2B 391bec3cd05ce2d6f895506dccc1000e651fb9a4a6f2a0ed799122cf4e95e8dbd9dc92ba118f59b4c69cd1c3c803cf80b2df41adc144f93132abae95c0f9a6f3 SHA512 609af96e7f182fd3d1be6c33b726d5b68b1b1f3803822e486e9fc806eb7a96ea29d9ff972b287bc331315c37b7acac0f0be47eec0d676004bb4ba9235577fc98
 MISC metadata.xml 746 BLAKE2B e27db1b09cd2083e08a0aafc0eb8abd99716a7798b61a1d06a1201f093eef3d8751e640d447addc35decee772ab211a8a90604ba5883668365f87f9a034a162d SHA512 e6bf1104078cada85479ce7570723e369f5f049d1c10c16745453d579c99270d69fb6634e5f88af4c138968641e94da3f554833fa985ba60d5dbda49749a9f74
diff --git a/dev-perl/Glib-Object-Introspection/Glib-Object-Introspection-0.49.0.ebuild b/dev-perl/Glib-Object-Introspection/Glib-Object-Introspection-0.49.0.ebuild
new file mode 100644
index 000000000000..5512348e7a2b
--- /dev/null
+++ b/dev-perl/Glib-Object-Introspection/Glib-Object-Introspection-0.49.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=XAOC
+DIST_VERSION=0.049
+inherit perl-module xdg-utils
+
+DESCRIPTION="Dynamically create Perl language bindings"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-perl/glib-perl-1.320.0
+	>=dev-libs/gobject-introspection-1.0
+	>=dev-libs/libffi-3.0.0:0=
+	>=dev-libs/glib-2.0.0
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	>=dev-perl/ExtUtils-Depends-0.300.0
+	>=dev-perl/ExtUtils-PkgConfig-1.0.0
+	${RDEPEND}
+"
+
+pkg_setup() {
+	xdg_environment_reset	# bug #599128
+}
diff --git a/dev-perl/Glib-Object-Introspection/Manifest b/dev-perl/Glib-Object-Introspection/Manifest
index ff139efa0216..a7f987f8af7c 100644
--- a/dev-perl/Glib-Object-Introspection/Manifest
+++ b/dev-perl/Glib-Object-Introspection/Manifest
@@ -1,3 +1,5 @@
 DIST Glib-Object-Introspection-0.043.tar.gz 80985 BLAKE2B 2f921b35167c45bc04e8d3505f85978d485d4f1244001cd2de7d1b1d3370731345757a0745852e0a047583e28d7b9ff0b18470714170c1d09b11b1e72a760c11 SHA512 b812ac4faca2f1df1192f7ac2374f5552811c353a363a33b3e6877c568ef68f0b4e1b8181a4738988017150317eb27e43976989cca802e7ba24d2a3cc2fa537e
+DIST Glib-Object-Introspection-0.049.tar.gz 88081 BLAKE2B 4d7d114dfe9b39f19feb4ed9ff40f7058e0c6b0e3851e45f3aa653b8222c1d3b3e68d1e900663435fcbae8fd627e41b44fc06b1775d0910127b32e1eff812a2c SHA512 fa927661dc761bfae9dba87e1e2d519b10c3aac4d6dcea37764972a0413a4f5025a12df640d66928b631c2933d4b0e6d02b559ea2c1eaa38fae6f7a9d98fe322
 EBUILD Glib-Object-Introspection-0.43.0.ebuild 577 BLAKE2B 9394da410e57aaf744450bf04f19e5c42b2a5638c31128aaef70eaa10e3a1e63a86324ee3bb6c9cc91a4652548b6b3fe28892c71464866b2f7b30e73354a85d0 SHA512 4b49f9c694dd7efd1d9955ed529aba3e1d19e8dc5a8fa0c170641883b0cfdb650d3087b8135de6bde8ea48e1700be5181feabed32e9d4622ced24dd7a08f7e53
+EBUILD Glib-Object-Introspection-0.49.0.ebuild 595 BLAKE2B 39c6d30c5732254f20968956c51a11212eb935d3dcd543208888fbcfa0c8fb0a4911e9fda321e16de949ba1ccf65972601a9baf249364d44daabb08044bf8da5 SHA512 f25c2df49086888141d885e7817095d2ad2de783a92f3cca77954373272393880ae2fc9e969641a4daea80c9779befc4e9fc2e06b72262ee97ef714fd50af5fa
 MISC metadata.xml 411 BLAKE2B e0ca06fe4a914e212161185d5563f93c3a958541dcb41d3ae3f863faac466f03b73e8051d94d97378e2a990208d29650367db65fe3a1f724ba6029db668b5e4a SHA512 c8bee7700599fbe4d559b1c1fbe4ff14933ccc01964dc4e40699e931681d667559de418ce301f4404a7aac0ecbedafcc15b4e5c3fab8c91c87c9727254b2a10c
diff --git a/dev-perl/GnuPG-Interface/GnuPG-Interface-0.520.0-r2.ebuild b/dev-perl/GnuPG-Interface/GnuPG-Interface-0.520.0-r2.ebuild
deleted file mode 100644
index fd6f4ac222a3..000000000000
--- a/dev-perl/GnuPG-Interface/GnuPG-Interface-0.520.0-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=ALEXMV
-DIST_VERSION=0.52
-inherit perl-module
-
-DESCRIPTION="Perl module interface to interacting with GnuPG"
-
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-crypt/gnupg-1.2.1-r1
-	virtual/perl-autodie
-	>=virtual/perl-Math-BigInt-1.780.0
-	>=dev-perl/Moo-0.91.11
-	>=dev-perl/MooX-HandlesVia-0.1.4
-	>=dev-perl/MooX-late-0.14.0
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.360.0
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}"-0001-fix-spelling-error-settting-should-be-setting.patch
-	"${FILESDIR}/${P}"-0002-Generalize-the-test-suite.patch
-	"${FILESDIR}/${P}"-0003-subkey-validity-of-an-key-when-we-have-established-n.patch
-	"${FILESDIR}/${P}"-0004-ensure-that-test-covers-all-signatures.patch
-	"${FILESDIR}/${P}"-0005-add-gpg_is_modern-to-test-suite.patch
-	"${FILESDIR}/${P}"-0006-Modern-GnuPG-2.1-reports-more-detail-about-secret-ke.patch
-	"${FILESDIR}/${P}"-0007-test-suite-match-plaintext-output-across-versions-of.patch
-	"${FILESDIR}/${P}"-0008-fix-test_default_key_passphrase-when-passphrase-come.patch
-	"${FILESDIR}/${P}"-0009-clean-up-trailing-whitespace.patch
-	"${FILESDIR}/${P}"-0010-fix-capitalization-of-GnuPG.patch
-	"${FILESDIR}/${P}"-0011-ommand_args-should-be-command_args.patch
-	"${FILESDIR}/${P}"-0012-use-fingerprints-as-inputs-during-tests-to-demonstra.patch
-	"${FILESDIR}/${P}"-0013-move-key-files-to-generic-names.patch
-	"${FILESDIR}/${P}"-0014-fix-spelling-s-convience-convenience.patch
-	"${FILESDIR}/${P}"-0015-added-new-secret-key-with-different-passphrase.patch
-	"${FILESDIR}/${P}"-0016-Test-use-of-gpg-without-explicit-passphrase-agent-pi.patch
-	"${FILESDIR}/${P}"-0017-Kill-any-GnuPG-agent-before-and-after-the-test-suite.patch
-	"${FILESDIR}/${P}"-0018-Use-a-short-temporary-homedir-during-the-test-suite.patch
-	"${FILESDIR}/${P}"-0019-Make-things-work-with-gpg1-assuming-plain-gpg-is-mod.patch
-)
-
-DIST_TEST=skip
-# Nearly all tests succeed with this patchset and GnuPG 2.1 when running outside the
-# emerge sandbox. However, the agent architecture is not really sandbox-friendly, so...
-#
-# Test Summary Report
-# -------------------
-# t/decrypt.t              (Wstat: 0 Tests: 6 Failed: 2)
-#  Failed tests:  5-6
-# Failed 1/22 test programs. 2/56 subtests failed.
-
-src_prepare() {
-	sed -i -e 's/use inc::Module::Install;/use lib q[.];\nuse inc::Module::Install;/' Makefile.PL ||
-		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
-	perl-module_src_prepare
-}
diff --git a/dev-perl/GnuPG-Interface/GnuPG-Interface-1.20.0.ebuild b/dev-perl/GnuPG-Interface/GnuPG-Interface-1.20.0.ebuild
new file mode 100644
index 000000000000..e7ab6efaf1ee
--- /dev/null
+++ b/dev-perl/GnuPG-Interface/GnuPG-Interface-1.20.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=BPS
+DIST_VERSION=1.02
+inherit perl-module
+
+DESCRIPTION="Perl interface to GnuPG"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-crypt/gnupg-1.4
+	virtual/perl-autodie
+	>=virtual/perl-Math-BigInt-1.780.0
+	>=dev-perl/Moo-0.91.11
+	>=dev-perl/MooX-HandlesVia-0.1.4
+	>=dev-perl/MooX-late-0.14.0
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.360.0
+"
+
+src_test() {
+# Nearly all tests succeed with this patchset and GnuPG 2.1 when running outside the
+# emerge sandbox. However, the agent architecture is not really sandbox-friendly, so...
+#
+# Test Summary Report
+# -------------------
+# t/decrypt.t              (Wstat: 0 Tests: 6 Failed: 2)
+#  Failed tests:  5-6
+# Failed 1/22 test programs. 2/56 subtests failed.
+	perl_rm_files t/decrypt.t
+# Needs to run a setup test that spawns a persistent daemon
+	DIST_TEST="do"
+	perl-module_src_test
+}
diff --git a/dev-perl/GnuPG-Interface/Manifest b/dev-perl/GnuPG-Interface/Manifest
index 54f303e34f24..1914df0517f8 100644
--- a/dev-perl/GnuPG-Interface/Manifest
+++ b/dev-perl/GnuPG-Interface/Manifest
@@ -20,6 +20,7 @@ AUX GnuPG-Interface-0.520.0-0019-Make-things-work-with-gpg1-assuming-plain-gpg-i
 AUX GnuPG-Interface-0.520.0-0030-gpg-2.2.6.patch 1897 BLAKE2B eca30b9a8485f7cb960ff343d1b575f324fcf6895c0fd723d14ebcccba14c69dd775ae315130af94a3246e3f8ddedb4ea9ba9c4c894f5e63b05fa8197e82f584 SHA512 5826dbc85925ac810dce695ea747ab2a4d361811295ce4f83925416c8c5842f8486e4275a3e610069157fa37e377413a39f1684ce94f618a99c46e7f6884264c
 AUX GnuPG-Interface-0.520.0-0031-gpg-2.2.8.patch 1511 BLAKE2B 3eee783efd64848bc0e86a0e0768c8dc77f8e28819fdc466913ac029cef7fcf42ff67edf89762b4b023d58df7c740b7d3d6a56ea2598699637edf5fb12840464 SHA512 7f8597d4a25e1492475810e47fb7988d74411cbe6ad537889c65bf37119572d1ae0c24e2f5c99d77d12edee3c46dd0e635125ee7a7dde99abeddd19d43fe7aa9
 DIST GnuPG-Interface-0.52.tar.gz 63733 BLAKE2B ce068177b8467356b57aae95a61e4746e4f690272083e465c877533a5ab0eedaaf271586aaffe7e4f979034d04bd49fc483047654426f23cfb904a98326454c3 SHA512 911f47a3b52249e8b39133d4040b86147793d9dd6a78d2b279674d6bba0cd38de5c919bf12b241b0e977790575502531afab6b1d2c05739d050c16d05d52fc49
-EBUILD GnuPG-Interface-0.520.0-r2.ebuild 2551 BLAKE2B aa027817241c32443debfcfd5152d5405b8d49d532dd670b28c8f2914924e708ed42951fd70c540b4b927202d0e2de72bbabcd450df0a4cb3efc63c0242e2e8e SHA512 af359488b27f603aad2c051ce001036f2f2c9c3f52a8e36e9c2a53c6e0f7ef26fa0c9231f278b474de57fa1bb9b532e6f523ce5fbd1e056ef373cbfb30158af3
+DIST GnuPG-Interface-1.02.tar.gz 75523 BLAKE2B 4b1311bbd930ae6719db9d7d25e247804c1f71f29da52b1896086ff4905cfdf09792d85fa9e90da462e974279cc673bacdcd2b6a32171eca1be861df5f712a98 SHA512 ff4365aa75fbcd2dc77c915ec36c0b578219ae1a2148e936b4769221f91c78a3bc3d371159b5130e7bee36ecf0e169b6a16e3a160d2598811d6f70850119f6e4
 EBUILD GnuPG-Interface-0.520.0-r3.ebuild 2758 BLAKE2B 760a4a62c7d5413bce55f5f48d4068d6744cdf4efc2db42a62c902cf6704204a95b7dbf13fef3626f6c5e7ca5a9ef8f7de8dd8c349d97d1ccccfe587adfac844 SHA512 e90a32bd241a390d2f6ac1f2aed15dbb8e1c7e0bd343af52aa70cfdf36df803490d9a19c16e2666b30c4757d2f1207ed47354fe50fd7df6d7f1f7ad8b0b0c9b9
+EBUILD GnuPG-Interface-1.20.0.ebuild 1025 BLAKE2B 52f953f3fed485f4a78212ef9a76d97fafbd65957273f895423572089f4098d8299dcf4c84efde9d8d076369b7246d7fdc2053c71f60b467bfe7f558502ab580 SHA512 3d73090c93b78e31820551d1dc1ebd5b19a67fde4d3705067bb3baee3df1c2d40d8ab1454e8a4bf4a657f13999a394d6e9fb4db3e6ab62fa9d3f0b1501d369d2
 MISC metadata.xml 1209 BLAKE2B a29e49d03ea5216897ae8d8ca55472c4d41d75a2722133dd2782b504db464740f15b5c017e09efb9a76da76b482f3f33e5b8cd8279402d51e14c201c8840d9b3 SHA512 3589a6d227ccde1efd9a0842e98b7f4c3d4f5434a9e62feba4a6764d1fdc4c0dc7390bba15bb52053520931c4ed4ff05235ec98efbe0239a4a9da12b30092cfb
diff --git a/dev-perl/GooCanvas2-CairoTypes/GooCanvas2-CairoTypes-0.1.0.ebuild b/dev-perl/GooCanvas2-CairoTypes/GooCanvas2-CairoTypes-0.1.0.ebuild
new file mode 100644
index 000000000000..e1d7f269acc3
--- /dev/null
+++ b/dev-perl/GooCanvas2-CairoTypes/GooCanvas2-CairoTypes-0.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=ASOKOLOV
+DIST_VERSION=0.001
+inherit perl-module
+
+DESCRIPTION="Bridge between GooCanvas2 and Cairo types"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	x11-libs/goocanvas:2.0[introspection]
+	dev-perl/Cairo
+	dev-perl/glib-perl
+	dev-perl/Gtk3
+"
+BDEPEND="${RDEPEND}
+	dev-perl/ExtUtils-Depends
+	dev-perl/ExtUtils-PkgConfig
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+	)
+"
diff --git a/dev-perl/GooCanvas2-CairoTypes/Manifest b/dev-perl/GooCanvas2-CairoTypes/Manifest
new file mode 100644
index 000000000000..aee05e9ef984
--- /dev/null
+++ b/dev-perl/GooCanvas2-CairoTypes/Manifest
@@ -0,0 +1,3 @@
+DIST GooCanvas2-CairoTypes-0.001.tar.gz 13527 BLAKE2B 492def35e1cb5142f37804c3e7b10ea5fd966c838b44e6f67f26cf19d08f12867e7f28a6901ed3d40798c6fd3498dd1a6149eb8ca9e18be66bb82343aa8dce32 SHA512 00478eda62bfb80393635e0c5eaa86cf43646e74df1ec61f9fac58f4792e8deabeede3f6dbfbaf8844c850f3ca729f3f27090449670f9eeeafcf2ec3ccd316c0
+EBUILD GooCanvas2-CairoTypes-0.1.0.ebuild 553 BLAKE2B 5b0698059af829a41a0ac29fc70147d89f24be78c0ab3892f143591049e85049042c9f22567bcc5874a96d0215b42c04b09891ecc0dcf7fab88ffc3d0e0ef20d SHA512 d70ce6729bb88c7b4357084daca657acbd0c79817243287b14c2b266b5b32c49ac78dec1eb71d938a4e660104c97b3f5d5152fb00c0d91254ff105ad915aeb56
+MISC metadata.xml 666 BLAKE2B 901d6e2a0029c0a9c24fa8bfdd06f1d2913043babbcf21c23a04560606bf53fb94c8d67e25d2a4ca45e933f96920b0e790b31a53b583cdad830ec75918d84125 SHA512 6b6ad6f1b4caef3f750cd2ac1d8069e47d0ad3eefaf18c6bb7059168bf0f7957c9d0ba5ca994a6103772e76c6a93f42cf853bb136796a8ac46f84f287881ac51
diff --git a/dev-perl/GooCanvas2-CairoTypes/metadata.xml b/dev-perl/GooCanvas2-CairoTypes/metadata.xml
new file mode 100644
index 000000000000..c868aeda75ba
--- /dev/null
+++ b/dev-perl/GooCanvas2-CairoTypes/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>alexey+gentoo@asokolov.org</email>
+		<name>Alexey Sokolov</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpan">GooCanvas2-CairoTypes</remote-id>
+		<remote-id type="cpan-module">GooCanvas2::CairoTypes</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-perl/Google-Ads-AdWords-Client/Google-Ads-AdWords-Client-5.8.2.ebuild b/dev-perl/Google-Ads-AdWords-Client/Google-Ads-AdWords-Client-5.8.2.ebuild
new file mode 100644
index 000000000000..e12f6564ae26
--- /dev/null
+++ b/dev-perl/Google-Ads-AdWords-Client/Google-Ads-AdWords-Client-5.8.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DIST_AUTHOR=SUNDQUIST
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Google AdWords API Perl Client Library"
+HOMEPAGE="https://github.com/googleads/googleads-perl-lib"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-perl/Class-Load
+	dev-perl/Class-Std-Fast
+	dev-perl/Crypt-OpenSSL-RSA
+	dev-perl/Data-Uniqid
+	dev-perl/TimeDate
+	virtual/perl-Digest-SHA
+	dev-perl/File-HomeDir
+	virtual/perl-File-Spec
+	virtual/perl-File-Temp
+	virtual/perl-Getopt-Long
+	dev-perl/HTTP-Server-Simple
+	dev-perl/IO-Socket-SSL
+	dev-perl/JSON-Parse
+	dev-perl/LWP-Protocol-https
+	dev-perl/libwww-perl
+	virtual/perl-Scalar-List-Utils
+	dev-perl/Log-Log4perl
+	dev-perl/Math-Random-MT
+	>=dev-perl/SOAP-WSDL-2.00.10
+	dev-perl/Template-Toolkit
+	dev-perl/URI
+	dev-perl/XML-LibXML
+	dev-perl/XML-Simple
+	dev-perl/XML-XPath
+"
+
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.400.0
+	test? (
+		dev-perl/Config-Properties
+		virtual/perl-File-Temp
+		dev-perl/Test-Deep
+		dev-perl/Test-Exception
+		dev-perl/Test-MockObject
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/Google-Ads-AdWords-Client/Manifest b/dev-perl/Google-Ads-AdWords-Client/Manifest
index 9490f6c2a28f..ed23fe77bd4e 100644
--- a/dev-perl/Google-Ads-AdWords-Client/Manifest
+++ b/dev-perl/Google-Ads-AdWords-Client/Manifest
@@ -1,5 +1,7 @@
 AUX 4.14.0-no-dot-in-inc.patch 2576 BLAKE2B 599a34aabdea3b3995704712e26ffa0a88c545185fe205f37b3c618fd7063e0ede55895a9797aa1de1490cd0ba634653aca235892f17410b257b199ed16ce612 SHA512 1fb62aee9081303c1d1186a1fd388e698f519ea5856fdf86e65af2044945b85952c2dcd96b0a0a5ec4234fe82361b2e076143918193218f54934c93120b54ccf
 AUX 4.14.0-unescaped-lbracket.patch 1656 BLAKE2B 96bc78ecbc3a2ed7408a509184f88a9ee2c9ac2b2d0b4ad8c8567dcf57646d823bc92938097a7984678c18569b9d8ceb1c9f27ae76afef6ca906c4f5997f85b6 SHA512 8ba173dff927bf5dd7193d88fe110bdaf71b44b54e3e5a3a0d8ff161ce492a36324c5e69dfca268577ecbbf81d3b99247f7fe305bd4bd2f172e59ea52b9146c1
 DIST Google-Ads-AdWords-Client-4.18.0.tar.gz 8921326 BLAKE2B 6e012147b212f734b7c6910b2f59085652acf45a4971157cd6854d37316bc238edb8b1bb1358c1dac200ce43a326f104d02de9ffea9f0ac19839180936943602 SHA512 b0905c69f52909f160e563fd4e24413256d14797d7d9bf40bb1193d7bb42deb65c4030a6d117a9c6a3b1fa6bcbb20ac6a5922dcfc4ba7c67566157e4097d5391
+DIST Google-Ads-AdWords-Client-5.8.2.tar.gz 3194633 BLAKE2B b2e05294dbc60f8725d2f764defe1108db8a93f5f5e10da9ff8b7dcfe1aaf0877f92bde4ae3937310bed6ec5c73225f5edd243c5864beeb8f070ae1235087437 SHA512 d38689358872511613e0d596ee0233070848f7ea5368cbabd0b13e91bb8fa9259af83ec7cd3d852e9aed1eac0769d7c4a097adda3da730eb49aaec127cff54f6
 EBUILD Google-Ads-AdWords-Client-4.18.0.ebuild 1230 BLAKE2B f5d36e6ab69e3f0d70ef3d0ad4f001e29656a91ab164a512c91d7cfe96f7b29e71bf2eec2ecf8c4aa52922a1b49c7cee4777ef4fe1826ff91c441b8e871d0011 SHA512 dbae42f3c6d52350397a470bf6d5fc433043d0f6e60d433f71275500b5e112b5b637856ca36af706dbf1105b495642132454b3354468a8d5dba5f56229d5b7f9
+EBUILD Google-Ads-AdWords-Client-5.8.2.ebuild 1195 BLAKE2B 78f8a36f7834cb2654e46345442aa7f007603c6fab7f23c4adec5cdb7b021ae8ab8fcf834148847cab10474cc30119b617e82bd9f96a1342ce4b9aaa3a1261bb SHA512 52c0dccbe39ae2b5fc04194521d395cf5b1bb50c3532f0849b6071324f7a7afb5d398a03c1654b9f3209405974fd691890ff5522d9a880200004d20767b4cbcb
 MISC metadata.xml 4424 BLAKE2B 517363b807ff8182aa3c6568f66054962e69528681a9549d4bbf6c6648414dc65e0a20f1201c2c2640820c9333f0a74eb84eb30c5c57ec57c6b041ea3b6414ce SHA512 a561f60bdeec595bd9bd11b80aca2c457aa652f01260fd49602c2568f8cbab269d7d49a71466726dedc2cbc5e789aa693c1856995c73a7239f6bf5d5cbbeff50
diff --git a/dev-perl/Graph/Graph-0.972.100.ebuild b/dev-perl/Graph/Graph-0.972.100.ebuild
new file mode 100644
index 000000000000..a23539805adb
--- /dev/null
+++ b/dev-perl/Graph/Graph-0.972.100.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=ETJ
+DIST_VERSION=0.9721
+inherit perl-module
+
+DESCRIPTION="Data structure and ops for directed graphs"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-perl/Heap-0.800.0
+	>=virtual/perl-Scalar-List-Utils-1.450.0
+	>=dev-perl/Set-Object-1.400.0
+	>=virtual/perl-Storable-2.50.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Math-Complex
+		>=virtual/perl-Test-Simple-0.820.0
+	)
+"
diff --git a/dev-perl/Graph/Manifest b/dev-perl/Graph/Manifest
index e597ff92174e..74baab92ef20 100644
--- a/dev-perl/Graph/Manifest
+++ b/dev-perl/Graph/Manifest
@@ -1,3 +1,5 @@
 DIST Graph-0.9704.tar.gz 146930 BLAKE2B 38c4be274166f3c3d7443fe75981f4caf44a06eedf8e562e7259c771c47bef4529db2ce980ea8aa250936b898efcb24dbbd9718f37ee57f133ed88cb7de6755b SHA512 1eed5049577112cc2e41a83f6b3b6a22a08170597b5cb89e2eab6cc68386bfd989d3953d7ceab85bcfbd7d097a6925bd8eb43f48eed1ac07469ea4b2432149da
+DIST Graph-0.9721.tar.gz 146928 BLAKE2B 15b5390afbf6e6076daadfc5c3a8d8729ee1322f5a676276d5a3e1b63cfaa379e9d0428431a36d7bd50caf27b62c9e2fb2cbb23faf2806233fad06fa7cf62bfc SHA512 38edc400214c60be475c7b733e769b4bf1fff680eb70b999d46d037cd314d50cc882d8b6547161abe2e765a5c1385166f9b5489d2df1b9a4332acd98eadfbc7e
 EBUILD Graph-0.970.400.ebuild 418 BLAKE2B 48d2a295e06b9e92d7d6c24c7421c07fe784200670f575007bfc50f4cee0c13bc106b30796cc35df904d71d4535880ed262d32207e4dd3ed14a93fae0c6373d3 SHA512 227db59bb51943536d887e9a655b3c224e57414414e93cfd6172fe4041595ce46f77de6037630781718c4d1296462447ab494ed192f8f19fbf0d4ab8e69ff6fd
+EBUILD Graph-0.972.100.ebuild 592 BLAKE2B 9b6b0fb584a18044eb9a167729fb022017932f32d841dda1a3a3b7d5ee840c863557b1cdecc8daf4e8f0ef33750208403d1459a2b9a5f4649bb4275e4a2c07d6 SHA512 88582facf7859a40092772421ee56448ca8df1fce57319c0069dcc53c4b0a8a237fda3a2d046e7a2b903fa7961e1875eb21b7c37c02f48941243dcac9bbfb578
 MISC metadata.xml 1715 BLAKE2B d1af15c3828ffb05e866b0023b1f6219b0edcf704d57ad31c5e1c62c9c1d347cd03ffbcdaee6fe0253de2610bbe07f9f137d5cb1019b700ca17e6fdef7ff944a SHA512 59ec40b275c4f427d3c703f4834605d7c2e0d4feb3c88cdb83d0768c7d42aa6566d22fbec6b8e5188db63c87eebe13d69c00d64299af6f8dac76d635d2413ce7
diff --git a/dev-perl/Graphics-ColorNames-WWW/Graphics-ColorNames-WWW-1.140.0.ebuild b/dev-perl/Graphics-ColorNames-WWW/Graphics-ColorNames-WWW-1.140.0.ebuild
new file mode 100644
index 000000000000..f30aaabcda43
--- /dev/null
+++ b/dev-perl/Graphics-ColorNames-WWW/Graphics-ColorNames-WWW-1.140.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=CFAERBER
+DIST_VERSION=1.14
+inherit perl-module
+
+DESCRIPTION="WWW color names and equivalent RGB values"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-perl/Graphics-ColorNames-0.320.0
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.420.0
+	test? (
+		virtual/perl-Test-Simple
+		dev-perl/Test-NoWarnings
+	)
+"
+
+src_test() {
+	perl_rm_files t/10pod.t t/11pod_cover.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Graphics-ColorNames-WWW/Manifest b/dev-perl/Graphics-ColorNames-WWW/Manifest
index 45da1add4872..35d072be994e 100644
--- a/dev-perl/Graphics-ColorNames-WWW/Manifest
+++ b/dev-perl/Graphics-ColorNames-WWW/Manifest
@@ -1,3 +1,5 @@
 DIST Graphics-ColorNames-WWW-1.13.tar.gz 18563 BLAKE2B f9b3dd87e714540d057b8e6ef9bf07ef92eab62cc5d8b8cd3564bc2413f4fd3dc4a1ed63c07b0a267ba213eda3b3521df9f429bd1b213eb5afa02befd466e478 SHA512 9f385082de3c97aaa533571c02bba17ef154b7f44b1da2c470cce9cde2d13a4053a16d12b4679bddfa6a8a6628bace3b482258cdd86f3855de9ce5558f6b4d29
+DIST Graphics-ColorNames-WWW-1.14.tar.gz 19837 BLAKE2B 0ab3f566e125549672b7e407c18f1db7408cd60928bc0a4a235a2b05c22966ee778d723194659d74154e17d59344b98b28a370782d45a37544ab753f3bf0c1a5 SHA512 c704906b61ede24591bd25a040eb3412489cbc508004eefcc8b88a3ce6acd6ff6de0c45cbba4929bd5b70ba1e998d050bf93baead9283dd9f91b3f069da13384
 EBUILD Graphics-ColorNames-WWW-1.130.0.ebuild 557 BLAKE2B ec3423ce5478b2e1456a2071971f7574d61f23aed211663d0ec09d6e66a8c97298b5bb4605efd36f5ec9eb1ac221e076cf146ccba31bb21cab983e8c81285bf9 SHA512 bea66f1c83beb89abc84cb074ec2d58e81d63d808ace93dbc9fae0742dc814262b0827a85910d3606f11acd4ce6bf5d2f9165b4f4dc3416a6361979448e86cd3
+EBUILD Graphics-ColorNames-WWW-1.140.0.ebuild 554 BLAKE2B ac341feaf58300a3315b22d55134757483f373b743092b7fcfd4a334a8a160f2ce808f6e127e4b5e928551e44aa9fbdeed0292e5e4b297260a275478780fb986 SHA512 1e6f6b020bece636f9d58496ade127295a77d2e822b07683ac5abc2ad09dcff7eb73e6dfc079279931320bec52bc269851fa322b3ead2411be8dfd5fd131fd0d
 MISC metadata.xml 670 BLAKE2B 5026300d015c419e615e7b5dc98bdd4c363229bd2e536db89abbcd55f4b15fb018fd231cdc8c9f57862612af3201900e293da42b32e67a7f701ce52a531a9df5 SHA512 1fb75466a0b2cefc39de2e4af57745e0244aa42c17079c49b41eb0a0e934fd9ff67b150c94e7e0b1cbd801ddb15be081a1a10df5d2b15b6df2e4f5c6530b9097
diff --git a/dev-perl/Graphics-ColorNames/Graphics-ColorNames-3.5.0.ebuild b/dev-perl/Graphics-ColorNames/Graphics-ColorNames-3.5.0.ebuild
new file mode 100644
index 000000000000..965552235b88
--- /dev/null
+++ b/dev-perl/Graphics-ColorNames/Graphics-ColorNames-3.5.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=RRWO
+DIST_VERSION=v${PV}
+inherit perl-module
+
+DESCRIPTION="Defines RGB values for common color names"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	virtual/perl-File-Spec
+	virtual/perl-IO
+	>=virtual/perl-Module-Load-0.100.0
+	virtual/perl-Module-Loaded
+	dev-perl/Color-Library
+	dev-perl/Tie-Sub
+"
+
+BDEPEND="${RDEPEND}
+	test? (
+		dev-perl/Test-Exception
+		virtual/perl-Test-Simple
+		dev-perl/Test-Most
+	)
+"
+
+src_test() {
+	perl_rm_files t/90-pod-coverage.t t/90-pod.t \
+		t/90-file-port.t
+	perl-module_src_test
+}
diff --git a/dev-perl/Graphics-ColorNames/Manifest b/dev-perl/Graphics-ColorNames/Manifest
index 1373af3a8c4b..68314b0ed855 100644
--- a/dev-perl/Graphics-ColorNames/Manifest
+++ b/dev-perl/Graphics-ColorNames/Manifest
@@ -1,3 +1,5 @@
 DIST Graphics-ColorNames-2.11.tar.gz 21686 BLAKE2B 2e96f32f166799249aa30986a8426df9e72c60228e4b3a00e4937344a742e89913b32b885192b621f8e13748b447ede6c3a4cba21e0d0ca58e775b2f20dea6b8 SHA512 673baa5bf623011abd84f01644d534867113d40f1142dd87b4c05c62b13f0eb3ac4aa32df01c7fb20788f03d8527effff696b9cfaa9f30d0557ec42354259e93
+DIST Graphics-ColorNames-v3.5.0.tar.gz 33955 BLAKE2B 7cadd3dd0d4d31c497cafd743a49b95da2919ca39739b4a358c6cbc5a1292a86fd308b33e88a696c382a5eb6914477120857393c2ba605bfb256add7342cf0fa SHA512 7577d3a52307eb53dbca0eb6db19accd44cb517b9d5d6d1912c51d537fe3646d88834844487ecb500e988f222bd24848d15c9952039376d159f2286ab6157a1e
 EBUILD Graphics-ColorNames-2.110.0-r1.ebuild 778 BLAKE2B 562a217cc6821c6733fab978bfea7e0614ae3167eb6e8779185245e69c5d678d7af0e3cdfaee3ac6253493cd0fe71e8f245a71c39d34fbc8ca7a18e67628948a SHA512 4251cbd09251412fcb183760f14c053b183ff66cc7aeb98a1ffd5298bb0cd93352d220c98dd7e4bf4ef037d63a4e00233b5be43101ddb9991d6ef3d5196624b4
+EBUILD Graphics-ColorNames-3.5.0.ebuild 697 BLAKE2B 13b3d7befa737b5ba61702a3716250ab44520c026f8fb6d0c836764981ffaadeac3c21a0abb2c8486d12d0b1ddbcc0fcffe0f2742bd54b0ccce2838cc2fdb1d3 SHA512 7753ca51ebafe276d952327b16aad78876c19bf84bf4b23bd5c14230871f08ca8b6e895387755da3ce40e160a8c222ecab827fa3554484b8785ae2adc6cfa88d
 MISC metadata.xml 795 BLAKE2B 66d645bcbc8adee6f96620eab5824598130c3c2489f71482c1341ba2707573ea0a01556c73680b5f8e71c3c36830171c26f2cade29b0628494c118e3168bc5f6 SHA512 4672c2e05ce2b34920a1c26a0c89e1beddbc6fb90aa8948d9d6ba4d7cfac4fd826f06007e6fff252f5775a5a326ca77b5b6fd3fc7a9f5ce9d14369a2276c7057
diff --git a/dev-perl/Graphics-ColorObject/Graphics-ColorObject-0.5.0-r1.ebuild b/dev-perl/Graphics-ColorObject/Graphics-ColorObject-0.5.0-r2.ebuild
index fbc2d511eb85..7f67a56c0510 100644
--- a/dev-perl/Graphics-ColorObject/Graphics-ColorObject-0.5.0-r1.ebuild
+++ b/dev-perl/Graphics-ColorObject/Graphics-ColorObject-0.5.0-r2.ebuild
@@ -1,27 +1,23 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-MODULE_AUTHOR=AIZVORSKI
+EAPI=7
+DIST_AUTHOR=AIZVORSKI
 inherit perl-module
 
-DESCRIPTION="convert between color spaces"
+DESCRIPTION="Convert between color spaces"
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+
 # Pacakge warrants IUSE examples"
 IUSE=""
 
-COMMON_DEPEND="
-	>=dev-perl/Graphics-ColorNames-0.32
-"
-DEPEND="
-	${COMMON_DEPEND}
-"
 RDEPEND="
-	${COMMON_DEPEND}
+	>=dev-perl/Graphics-ColorNames-0.320.0
+"
+BDEPEND="${RDEPEND}
 "
-SRC_TEST="do"
 
 src_install() {
 	perl-module_src_install
diff --git a/dev-perl/Graphics-ColorObject/Manifest b/dev-perl/Graphics-ColorObject/Manifest
index 19fc7b254518..68bb138ecc87 100644
--- a/dev-perl/Graphics-ColorObject/Manifest
+++ b/dev-perl/Graphics-ColorObject/Manifest
@@ -1,3 +1,3 @@
 DIST Graphics-ColorObject-0.5.0.tar.gz 22764 BLAKE2B 7c1e6b48124e1cbcce395801ac401e89ec2b2e3f88067aaf23ea7d18cdcad67c20714a5cc7cc18fa3c07490514a29391e98c13d5c966f6429b273f75d90c78aa SHA512 d27a76549d91380cc3f3acc9dfd265bf9d8c64b013f0a012d7deabfb11d2fb3d25062c9f3c9786aeb4841f570749fb68f43141581a6d28e961e8dfc8a2feff5e
-EBUILD Graphics-ColorObject-0.5.0-r1.ebuild 598 BLAKE2B 089abd3e487de42920c2739599caa2b43584ace2b115609239000856e7798930eb5eafe08ec14a1fd6e9e5ec895de2bfe4de8e4e7daef2cccf1c9f3312063d09 SHA512 6f37f50b818453a6711b96576b54bb30c8bc65d698114dd83abfa98bdde139b79d3165b0b940f01fac624230db5c6b8e0eb2619713c82f4292b88c3588fc0cfd
+EBUILD Graphics-ColorObject-0.5.0-r2.ebuild 540 BLAKE2B d5282506a1056e52fd673b529f890a36941aa91ff06173cec38dae721c801fef4fa63cf1e54c615449edd09bf2582bb6bb671b58594d99a2c4633c44d6d45f28 SHA512 a0ebc02bcfe37ab474f6b5cadf305e8d62f3f637a677b15445f8b919c82938ccd17bb3b02a51dc97e7b9b4e7cc54950cfefe441e0b79547dd26ac6d1bd81781e
 MISC metadata.xml 412 BLAKE2B 540c8544243506130fd4f33c03e6c03ee77e49444a6b00619a3e041c4e9070915b2476330050b32b4899ef7784c80118099a39e540d4b5512cae37a54cfbe281 SHA512 c670f2fbf397dfa0f0f6d1927fe27ad12d64abbc9ca1c460acc1b37b188023c981b27b1748ea61fdd780db081cb46ca3cf29c074a1df64e6a5c75f9817a4ee17
diff --git a/dev-perl/Gtk2-SourceView2/Gtk2-SourceView2-0.120.0.ebuild b/dev-perl/Gtk2-SourceView2/Gtk2-SourceView2-0.120.0.ebuild
new file mode 100644
index 000000000000..f57a698af8d6
--- /dev/null
+++ b/dev-perl/Gtk2-SourceView2/Gtk2-SourceView2-0.120.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=XAOC
+DIST_VERSION=0.12
+DIST_A_EXT=tar.gz
+inherit perl-module virtualx
+
+DESCRIPTION="Perl binding for the C library gtksourceview"
+
+SLOT="0"
+LICENSE="|| ( GPL-2+  Artistic-2 )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-perl/Gtk2
+	>=dev-perl/glib-perl-1.160.0
+"
+DEPEND="${RDEPEND}
+	dev-perl/ExtUtils-Depends
+	dev-perl/ExtUtils-PkgConfig
+	virtual/perl-ExtUtils-MakeMaker
+	x11-libs/gtksourceview:2.0
+"
+
+src_test() {
+	virtx perl-module_src_test
+}
diff --git a/dev-perl/Gtk2-SourceView2/Manifest b/dev-perl/Gtk2-SourceView2/Manifest
index 3d6cb560ec96..a4a6b36ae0c1 100644
--- a/dev-perl/Gtk2-SourceView2/Manifest
+++ b/dev-perl/Gtk2-SourceView2/Manifest
@@ -1,3 +1,5 @@
 DIST Gtk2-SourceView2-0.10.tar.gz 23420 BLAKE2B 68a9bf701483a734a7f58abc863c0a6af454fd8aea90b5ff3c6175696028c64480dd0acfefdd51a7e2b9503f652728bbe8d4f4867932553b8142f5953b32260c SHA512 29e5ea143fb013d95638be10463f5b316dc38212481b720b15ee569a6c3a4ec432d0550128d1fcac5adc35df02e0180ff2a378bcfbab620f332fff78e078453f
+DIST Gtk2-SourceView2-0.12.tar.gz 24647 BLAKE2B 048e44d954ad14736d3a9f631e6370ac055ab979502b9c9ef07f35398bfd24f10fd587cb1d86bb22951b7189efffe18ee9919f0b77df89821583e9b79e126de9 SHA512 c82741a23b9cc0560a70afeab7b0728a4d3e6769515bd68f894708d6f9ab72772fca5f4d74750e76e71d44a48732e6366bb1953f0d712148d0bc73c5aa27e450
 EBUILD Gtk2-SourceView2-0.100.0-r1.ebuild 575 BLAKE2B dfd06fb62ce9f485d34dbc4c3f0597a13b206e27ffc8d76afe3a9016942c06f5cc243ee14f426dbea6720c19980dab615cff3704761e4d5dacab3565ecb14658 SHA512 8eda896c1927651970893f628b5653220cafb2f3eae255d0b1442988d028014a19a60fc9f93f22d2f333165fa79710f7c8ec113f7ae40f2361743e9cf9078623
+EBUILD Gtk2-SourceView2-0.120.0.ebuild 572 BLAKE2B e9ddec093efde1a708ba88e063a569798f55ec218a31c3e10720eacdefdabb3d22c5caae0d9f2316c97159d3180f8d949e9d1a13c8a1d152c6f8cbe40ecaa1ff SHA512 bfe39c925500aff2620c7a693edc613115e9f1f06e0bcfa2da51e17bb2ae77ccf4a83ed182aeb0762f3937dbe78efd8da408eef007706f531d6676f5f8941349
 MISC metadata.xml 403 BLAKE2B b4cab6478e5ab76e7bf6b0421e0b60977519164c371933ca7723ba0a6399eb1166de999c6e359eaefe1c19914872a6d3f44c72951d676bd0afdc774946c0a19b SHA512 b9f3c64f7936576df43769d466b475ea7708d7276cb9c1885b9229bdbb1b0e3815a8f06a2f9227c75597b228d6a62447c4e0729b7c3d82e3246e063ac3f455ce
diff --git a/dev-perl/Gtk2-Unique/Gtk2-Unique-0.70.0.ebuild b/dev-perl/Gtk2-Unique/Gtk2-Unique-0.70.0.ebuild
new file mode 100644
index 000000000000..e118c73fbd09
--- /dev/null
+++ b/dev-perl/Gtk2-Unique/Gtk2-Unique-0.70.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=XAOC
+DIST_VERSION=0.07
+DIST_EXAMPLES=( "examples/*" )
+inherit perl-module virtualx
+
+DESCRIPTION="Perl binding for C libunique library"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/libunique:1
+	dev-perl/Gtk2
+"
+DEPEND="${RDEPEND}
+"
+BDEPEND="${RDEPEND}
+	dev-perl/glib-perl
+	dev-perl/ExtUtils-Depends
+	dev-perl/ExtUtils-PkgConfig
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.05-implicit-pointer.patch )
+
+src_test() {
+	virtx perl-module_src_test
+}
diff --git a/dev-perl/Gtk2-Unique/Manifest b/dev-perl/Gtk2-Unique/Manifest
index 6750a63642d6..f949a3b308ff 100644
--- a/dev-perl/Gtk2-Unique/Manifest
+++ b/dev-perl/Gtk2-Unique/Manifest
@@ -1,4 +1,6 @@
 AUX Gtk2-Unique-0.05-implicit-pointer.patch 427 BLAKE2B 2b6964502ae1e4b2cfe04e16be92ac3f21f6be4fc419a9c2a047dd42d040560ba7fcffe5abf3f4fe36b9bac9d78bc775392d524e9e644afbddd8aec6f4a53a63 SHA512 37b7ff60b49ff1e2cdac2d35538433df7be2d6232dbb1e9dad3a458ade36a2d083cab808120f064d6c851bee2ddfc4a919b46fbe8eae24d05e317290651c10d8
 DIST Gtk2-Unique-0.05.tar.gz 11158 BLAKE2B 657a321687af9be3d3c5024e04589ab87a0f98ec5b11c88e2a388e1d4705154d5af790fc675fc928fcf556f1546b78975112ceb7c9e96f03fedc1f04c552302a SHA512 9ed700de45e6d7e5410ff4b4313869be9127b7933faf862f4f34f4330165dbda4b1d983efddedcd71487d0cdbf10982a7b76af7cf60339ae3359f57271177492
+DIST Gtk2-Unique-0.07.tar.gz 12755 BLAKE2B 2220a736fbe4c2bad95ed5dd28c908d23617f8c374be91718ea05fada3d914641b9f64bab7bebe0d3689a54141e7b8d9d78d6fe755fb4f4a50e213eba2563273 SHA512 62975a16840be7af7d5657c816367572d1b5140585d1275331e2d05dcefe18ebcccf8cb81747da92f12e085a5bef1c0ba2dcf4d2fc886baef97a22317e1e04f6
 EBUILD Gtk2-Unique-0.50.0-r2.ebuild 555 BLAKE2B 751862fc62b84704e1e3f6994fda7113933077a65e82fa981ecd7c6d8bba0628e98c70c6322b85026b82fd0846bcaa5fe0b7e32e770ac25ec648cf1824a7e97f SHA512 df24fc30c7d989dc3ed2051729c4286da94aa267dc622cb4d4f345603f281e7add5639257ff0240521c647eac67238f463c649da462ee2b907ebdf0d519b09ad
+EBUILD Gtk2-Unique-0.70.0.ebuild 575 BLAKE2B f29de4cb3825abc07cad3f81b28c67ed67f801fb5957b4a344550998c19db0e091f55d7248444cd226b3af143c9bef9e87c1b0d131c4b45e135ab27bf41e776c SHA512 2b836fbf6ff11e59c80c01930f5b8cc6d68d8ff12d98e80735ae09b85b4dcbda6980c867801e63ae98cfb62e59b64f14da8f3c9150196bf94b798fda3969e5d8
 MISC metadata.xml 394 BLAKE2B c0f79421dc3e916830122bbb05f687601a2f944554a9feccf2b00000293330a551143021345433d5495b99bba4c669adf44daadcac15f1d2e4506808ca058bdd SHA512 cae7fbcef063eeec3d909a39d1004def6eb1c13234e12c30a02719d37f5db97a7a53d8119be96a7a996232ae3f6b0bf2839484d7a1a148f3ac93416f963080d7
diff --git a/dev-perl/Gtk3-ImageView/Gtk3-ImageView-4.0.0.ebuild b/dev-perl/Gtk3-ImageView/Gtk3-ImageView-4.0.0.ebuild
deleted file mode 100644
index 921e28e06dc7..000000000000
--- a/dev-perl/Gtk3-ImageView/Gtk3-ImageView-4.0.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=RATCLIFFE
-DIST_VERSION=4
-inherit perl-module virtualx
-
-DESCRIPTION="Image viewer widget for Gtk3"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-perl/Cairo
-	>=dev-perl/glib-perl-1.210.0
-	dev-perl/Gtk3
-	dev-perl/Readonly
-"
-BDEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		dev-perl/Carp-Always
-		dev-perl/Test-Differences
-		dev-perl/Test-MockObject
-		dev-perl/Try-Tiny
-		media-gfx/imagemagick[jpeg,perl,png,svg,X]
-		virtual/perl-Test-Simple
-	)
-"
-
-PERL_RM_FILES=(
-	t/90_MANIFEST.t
-	t/91_critic.t
-)
-
-src_test() {
-	virtx perl-module_src_test
-}
diff --git a/dev-perl/Gtk3-ImageView/Gtk3-ImageView-6.0.0.ebuild b/dev-perl/Gtk3-ImageView/Gtk3-ImageView-9.0.0.ebuild
index ebce005b7376..3d42b612a761 100644
--- a/dev-perl/Gtk3-ImageView/Gtk3-ImageView-6.0.0.ebuild
+++ b/dev-perl/Gtk3-ImageView/Gtk3-ImageView-9.0.0.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-DIST_AUTHOR=RATCLIFFE
-DIST_VERSION=6
+DIST_AUTHOR=ASOKOLOV
+DIST_VERSION=9
 DIST_TEST=do
 inherit perl-module virtualx
 
diff --git a/dev-perl/Gtk3-ImageView/Manifest b/dev-perl/Gtk3-ImageView/Manifest
index 25c4c62b971e..b731c7c03857 100644
--- a/dev-perl/Gtk3-ImageView/Manifest
+++ b/dev-perl/Gtk3-ImageView/Manifest
@@ -1,5 +1,3 @@
-DIST Gtk3-ImageView-4.tar.gz 14329 BLAKE2B e4dee495e83392cc14e8fbd050658a1647bfa3f71e3711610e4df502d92adcce67800fd3c1e5ce09464fdb2e22a92ad7a1bdb52fb119f86712ef898cbf208abf SHA512 d723fb826f510ceccc6116b43baac4e1e42b59f91a0da5d8e9acf5b4ce608807119533fa965ba5aa623511aa9843b81488fd931d58417a2f3dd4f5db45238d64
-DIST Gtk3-ImageView-6.tar.gz 15444 BLAKE2B 1f026895328912443d4e08fbeb2ee9826818c09b00d06f087417f141d2c5b193e13840a09162c47fc5c0d642d0738cf290038a541f5e14303382a14a0245213d SHA512 68fc3371fe3d62163523d81732f0716fe15623a53139e8050e3bddc12c694a9ae2e89855b9926e14b18803e9c7a586b925b613e1cf364cb449b850fe70b571ab
-EBUILD Gtk3-ImageView-4.0.0.ebuild 681 BLAKE2B d34bcfabd119e76879463829d87fbda70d0b1a0323fb6826156a4d36c1f4f441a52b591aaf3e51995bfe446fa973148516b16026bdfb109edf4201017994e9de SHA512 c40ad0ac50852b261eb6ea9ac7d87cfca47ea725a00008b0f84e983e4ac5ffa86c99955708e0fc6b66957fad5fec27891d4af6b156dc922ba087d0feea27f47c
-EBUILD Gtk3-ImageView-6.0.0.ebuild 694 BLAKE2B 3cc1f6b35ac13d0ff603908331432c92f08e920b96fa35b49bf3c466f61581e49504a927c47bd4c7bc684a43b4985fc0ab2013b06e6bcddd7520c9d0a97968d2 SHA512 4427496e10a434ef53268f1036c443e0e44113faeeaaba383f8f6adcd4c3dbc3ecfc5b603364e3376cf8017731cdfb9e0e0e7b108d9d91d1425d4e62c1638bf2
+DIST Gtk3-ImageView-9.tar.gz 16083 BLAKE2B f64723d2ee468c7ab423292bba8d995a62554877567fdfdd272e527920e037147783fcb9cea99ba1688f09303ee321abaee0e334a67db46bda6b0ed7e1ff9415 SHA512 1a52c53a03b6f9dd6abc69dbb03a8dd80df77e266eb972cb2438bd25d49765b203a70e2dfee1ae3cfdd27b4d987f9573eef3e47968c80550771dd3edbcf831cc
+EBUILD Gtk3-ImageView-9.0.0.ebuild 693 BLAKE2B e4dd5f0b6a67c34ea2971411015452c1d012611cd313733195ef7cad72adfee8a7c88c68d7489109a3bd571fb0ecaf8bc17c727fdf105a67722ff18ca33aa263 SHA512 3fb7e6b406aaf211ae4893f6c1ffb01d646b6b951ccd50cd66cdedccaf2534002a410630a47ed48bb444ebaa8436e439c68bb90a852542a70ed723bed355c55c
 MISC metadata.xml 952 BLAKE2B 767e779369ef5947f563c8fe2bb5592058a4c6ebc29a3be7ca49fe7a2ef586484afb15e46632e6db87e5eb92932602e10cc7a875cd3803537866f5ee1d52dec8 SHA512 a2e7a668fae93388d88a2c2db675d715a720866425f91885702a362e3932ed60ca6b1a08dbef4e44623518d4b9c224948bc51e7db315d8088f3d3a6cdd96b47f
diff --git a/dev-perl/Gtk3-SimpleList/Gtk3-SimpleList-0.210.0.ebuild b/dev-perl/Gtk3-SimpleList/Gtk3-SimpleList-0.210.0.ebuild
new file mode 100644
index 000000000000..db09532de5f1
--- /dev/null
+++ b/dev-perl/Gtk3-SimpleList/Gtk3-SimpleList-0.210.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=TVIGNAUD
+DIST_VERSION=0.21
+inherit perl-module
+
+DESCRIPTION="A simple interface to GTK+ 3's complex MVC list widget"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-perl/Gtk3
+	virtual/perl-Carp
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/Gtk3-SimpleList/Manifest b/dev-perl/Gtk3-SimpleList/Manifest
index f8a80f92dcc1..3f1bdafb46d5 100644
--- a/dev-perl/Gtk3-SimpleList/Manifest
+++ b/dev-perl/Gtk3-SimpleList/Manifest
@@ -1,3 +1,5 @@
 DIST Gtk3-SimpleList-0.17.tar.gz 18817 BLAKE2B 61219e333682549346929022e864d051e26167abf41927f4133effe8d52cd1def0f96d010699142b444fc2edb26f7f8723dda14338d0cb01638c75c80fe9809a SHA512 9103cc46e1627be30a5f912f96939c2e86e1f8e174f300957cb4509a2b2f14fcf89f542dbffc8786ba851cdb9f6dc1aea08e47f6d29072d45528e8046768409a
+DIST Gtk3-SimpleList-0.21.tar.gz 19124 BLAKE2B 3d04013bd70f3514d9aabfda7a9a823be1aa4a69c89c930e29529c49aa92baa9f140c80571aba7b98481104e080d2325a5b5d24e0e1691f52693c557431ae84f SHA512 45f13add5465d586a6888c426c252cf886644dc95d981d697dc78d01fe66e7820c8f866206583c103fa35b63c349ba46c7da58a447e77a8c778c54b57dddc973
 EBUILD Gtk3-SimpleList-0.170.0.ebuild 472 BLAKE2B f544b75978a2cc672e5dc8a62c4cb20a05e3fd8f52e26734eabaf1d9d550cd6c2cee8f31414c345255e6a25848e2796e8a99d51bec132fff1ba39950508dc5bd SHA512 fbf8fb68ee23f9b55cf9f1ac3e6733f966187a863d4f1a9f08911c12d84e6d3b810300cc3a0adc194bc5f8f7dacdce92e4f2174427250a4216a5c37c8e564472
+EBUILD Gtk3-SimpleList-0.210.0.ebuild 475 BLAKE2B eb519c497b5f2d5dd695eab1cb1ceac415552a1e522c4303eb14d6b8acf44c69273b0f37dd5812b1dca0319c8f7db2c1b5f92fbdbbfdb0eb7c50a219745d6ba4 SHA512 cccf1844afe3f4a1d16226f11f265e8aa0069689ea1038a58bf2685dcb3d8cc281b30240b716503553eb1655baed28eca8f8c8f4e3be79c5ff4d2a80ad88b931
 MISC metadata.xml 547 BLAKE2B ed1ebbab39f94d5d09e18632dac104f090e47e8f613b720b1b80c262bc0c05db0819857ab3765352875e5fd1c7544bee9eaf1db86e7a41624cd31a69d11fbf63 SHA512 0ad403a40e3a704dcb56811883e4dfda7b578027bedeadcb672a7b2bc5d7460ab6e0ab894094640638e86a9047d60fa7e19c47d0712463ab124080c80ef2a65d
diff --git a/dev-perl/Gtk3/Gtk3-0.38.0.ebuild b/dev-perl/Gtk3/Gtk3-0.38.0.ebuild
new file mode 100644
index 000000000000..fe4650b300c9
--- /dev/null
+++ b/dev-perl/Gtk3/Gtk3-0.38.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DIST_AUTHOR=XAOC
+DIST_VERSION=0.038
+inherit perl-module virtualx
+
+DESCRIPTION="Perl interface to the 3.x series of the gtk+ toolkit"
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	x11-libs/gtk+:3[introspection]
+	>=dev-perl/Cairo-GObject-1.0.0
+	virtual/perl-Carp
+	virtual/perl-Exporter
+	>=dev-perl/Glib-Object-Introspection-0.43.0
+
+"
+DEPEND="${RDEPEND}
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.30
+	test? (
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
+
+src_test() {
+	virtx perl-module_src_test
+}
diff --git a/dev-perl/Gtk3/Manifest b/dev-perl/Gtk3/Manifest
index 8f75d269315a..6558477d1f5a 100644
--- a/dev-perl/Gtk3/Manifest
+++ b/dev-perl/Gtk3/Manifest
@@ -1,4 +1,6 @@
 AUX Gtk3-0.34.0-gdk-pixbuf-test.patch 1992 BLAKE2B 3f81159c626971f91ce4272ac7e89b693b6d11c430950e48bb24f9b581b2a485a562f5f5170ef44f3b26bf45c7e2b8090307bee2556dbf72fb9e569113875d0f SHA512 ee2864b036a5463df4c821c3a424a62411954e9799be485076013ff1f36b0dd19b678cbb9a7ea1bc3d5365a15986958241b15b8e4009ec91392e0401e234049a
 DIST Gtk3-0.034.tar.gz 56327 BLAKE2B 338e80954d210c79ece7db48cd421bbedab1ea9b005aa70425b42d794e226208349624c4484f0ab943ffb0ab1a1686dd5ae5d7f9c90157a272f4aa92a6c268b3 SHA512 2102a64091d288a7d89bdbfd9cd08b3a9ec5ac2c1276fdf49fb756c182223ba1951152d89bc0f448893d8401ca9f4db57c3d3a2271b3aa82eb1e9ff63cf3cf9e
+DIST Gtk3-0.038.tar.gz 57426 BLAKE2B 76e74320c9bfaa19bd71b58742037d4acb85920466d0af88c3a276f5e4bf2d34c94ee3b278d385914da498794086924de19f4ed1c280b6b0b793d15d5fb3ca27 SHA512 2289184a25deec342b9519028cc5ebb3a66137d7891366485e4b6a1ef52a4a28b5ba8083a317a56664d4ea6eb1bc0619477d1ca169baf79b868467fba27f82bf
 EBUILD Gtk3-0.34.0.ebuild 746 BLAKE2B 2baf1e714b3d7ee042d0391f4c3411c22a630d0beacfe2ec45b4a86433b12262b966e46b92c62dfe06dc5a82dda8ce94f82fa36b20a34e95635ba9661484a982 SHA512 6002a76f2b28417c1c0b0fb25b9aeff4b1b83670a1d9c9f5ee1c86a6acc4f8f7e3ec995d6cdd7fb654558762f4d88e8cc6e4d942bb349e2e3ec5143f2a0bc8a9
+EBUILD Gtk3-0.38.0.ebuild 677 BLAKE2B a1ee2f3cbebc1c53ca47e646e4d8d74f7f88d6c830b7d1b99c003c328c128d0b93f38940758a5eadbbd7dcca01ac8e304b293df1b8b16e983c5dc88651faa75a SHA512 dd153b6ebcbc534b7d6af069873f8381b7883287bff4c80ad1b945a38aff39bcd1ed47bd04cfe12189ff92902172add66b647cce525ed68b1cd6c92de939b1e1
 MISC metadata.xml 446 BLAKE2B 08890607349229f01a933a55328fde3124c66ccc04048f5eca5aaa2462d19ddff80f847725776fce3d9ea091698036c9b1e3b1417fc30c793b88e06da9b653ba SHA512 167e690fa554eebaa685050ae5200d4be0141c5c387440d4a0d101ca9f89a2257885fe7afed49cff8ce90f5a387b3c8fa441d2c7a4bd17f46ae30335e41469d1
diff --git a/dev-perl/Guard/Guard-1.23.0.ebuild b/dev-perl/Guard/Guard-1.23.0-r1.ebuild
index 226ea9f196ed..d511a04d320b 100644
--- a/dev-perl/Guard/Guard-1.23.0.ebuild
+++ b/dev-perl/Guard/Guard-1.23.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-MODULE_AUTHOR=MLEHMANN
-MODULE_VERSION=1.023
+DIST_AUTHOR=MLEHMANN
+DIST_VERSION=1.023
 inherit perl-module
 
 DESCRIPTION="Safe cleanup blocks"
@@ -14,5 +14,3 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="virtual/perl-ExtUtils-MakeMaker"
-
-SRC_TEST="do"
diff --git a/dev-perl/Guard/Manifest b/dev-perl/Guard/Manifest
index 757d6c53e8bd..34519b7184cd 100644
--- a/dev-perl/Guard/Manifest
+++ b/dev-perl/Guard/Manifest
@@ -1,3 +1,3 @@
 DIST Guard-1.023.tar.gz 7065 BLAKE2B 369c7dcb2ba7905319b7c7bf68327186e2b7bae95639ba9ab03eed6a1a6558e1f9ba5f6ecdd7a8c54c921f2a628d68450a37778c594fbec8d22163cb02bab58c SHA512 a991d6f9ebfadffbcabaccc45d964c40c46c7212c6de089f0c496040e151236c59cc7dd7076464f0ef96936f2c4cd462fbedf8e729d522f1090682eda976676f
-EBUILD Guard-1.23.0.ebuild 311 BLAKE2B 79199acbf0c1606a83009d9e6b28733d86d29724586850d4662ba0d53e7ca8cca85e1bf8332bec9e2088565d69745625c5e025047ad9033e9df0f4e881d575ea SHA512 b9ee17ec6a9a224d5a91f0bfc7d2665394fce66eb2d0bdaf4db2b893c1144105aea8346eba1fb2e49f38844eaa8c861702125f8924f55ba486ddb583574a1176
+EBUILD Guard-1.23.0-r1.ebuild 289 BLAKE2B d9a8f94416550008395e7f0a0c497320e3d0b1a63514b5aacafdfa29802b11887aa00714e3e6761a076f9824a5348c57d202ec5957d989b42339e1284b441436 SHA512 2a0d8ecf5362cfac8696460d42d349b112f36f7849894e5fd5c9038a6057ab8a8db2800785e11d56fac114e78114cde67ce8892bb7c1257b44c65e544af289b0
 MISC metadata.xml 381 BLAKE2B bf0ed0f83d783eb2f61cfbdda8a994bce60a5876f7684527254e75c108890e47d7ae2ce93635710191cc49c2bba9dd201308fcf3823cf708aa8500500da7f864 SHA512 2446434328b68c4712034f323b8ab23d94ae16c1c778059aea350babf6fc447f4e4674bab2934acecd34a779648c70f964f7e7896f1af47bb7963534e7c6b379
diff --git a/dev-perl/HTML-Clean/HTML-Clean-1.400.0.ebuild b/dev-perl/HTML-Clean/HTML-Clean-1.400.0.ebuild
new file mode 100644
index 000000000000..5c086e598f0f
--- /dev/null
+++ b/dev-perl/HTML-Clean/HTML-Clean-1.400.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=AZJADFTRE
+DIST_VERSION=1.4
+inherit perl-module
+
+DESCRIPTION="Cleans up HTML code for web browsers, not humans"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="!<app-text/html-xml-utils-5.3"
+BDEPEND="${RDEPEND}"
diff --git a/dev-perl/HTML-Clean/Manifest b/dev-perl/HTML-Clean/Manifest
index 7dc2acc80a3d..95b2bdf8e9e2 100644
--- a/dev-perl/HTML-Clean/Manifest
+++ b/dev-perl/HTML-Clean/Manifest
@@ -1,3 +1,5 @@
 DIST HTML-Clean-0.8.tar.gz 48157 BLAKE2B 1618782d270fdb9997bc39617967e0db1bd58191694f098f7fdf43e1090c69e9e52102dce9517eb4cdc4e0bb1beeabde68e4e09a39b15836e719d5fa89fdb9b4 SHA512 5e9fdf49c1fccbb35c769394dac2013972bea070579983c5c2e99105b2f9a4ca6594966ae88770fc6ae1ee6b9388a07d61830d0451d6957197114d35dc5cc1e4
+DIST HTML-Clean-1.4.tar.gz 48598 BLAKE2B eb5001517bf77e24f107aec95244786e7c477330f71ac03d18b26a9f2fe766a832bdbc1a07623b59eaaad3dd84bf82119852841e794d29099d77c947b3dd4800 SHA512 a675b2ae0f7472d4fe44d3402687c4a7d87d33b30894e2c1d9639552fa5f58a89b35b52be17f95058a5ce690a996451c877d1c723b9b6f3919f437da8d458004
 EBUILD HTML-Clean-0.800.0-r2.ebuild 369 BLAKE2B 590adc121b4817690977a5b43518b9d13f5a8f5af9dedd491809a5a7c23768f04094e8309fd45f9fd743e73ee880238d50b0c3185d6faa5c2c626d5a71c52cdd SHA512 d8d278a268f1aaed409b289598bc23b9f8a934916176c996d169713225da4b89182b3649e3561e534902e41f132d361413457ad48f3cc2b6d56f302f3d53aabc
+EBUILD HTML-Clean-1.400.0.ebuild 377 BLAKE2B 6885e6a9218c079a7e0aeedd3cf7531123034e57e01dc59f3db3365a8789fe13b75836604a1f71c9f395e2d287a29f76b01b720b5e1fe7ae0e7a3f2010128123 SHA512 cf43c8bead62474cd8488ff30beabe6256f80eea8cb87363ec267a84816121d4e37616bf5bccf93755b2fe5e541e56e555928f7e18dd46f49d959575e349a08b
 MISC metadata.xml 392 BLAKE2B c89789fd471d7d9d1a55f9fbeb43ef4feea70b5e17194e01c693bc2611701851c0a9faf0ad0ff8b4af42e6a53a2c526736f5a8612709c8fe2f5e91dd3e67f278 SHA512 38f13304a42607e51a77ea2bd82c238d232c61b4ffe669c879fa71a538aca17d26a77a877269f4130736b2757bafb7cfca6f59298e04d26584ad322f37d626ee
diff --git a/dev-perl/HTML-Element-Extended/HTML-Element-Extended-1.180.0-r1.ebuild b/dev-perl/HTML-Element-Extended/HTML-Element-Extended-1.180.0-r2.ebuild
index 26cba271f3de..b052a079c4a4 100644
--- a/dev-perl/HTML-Element-Extended/HTML-Element-Extended-1.180.0-r1.ebuild
+++ b/dev-perl/HTML-Element-Extended/HTML-Element-Extended-1.180.0-r2.ebuild
@@ -1,19 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-MODULE_AUTHOR=MSISK
-MODULE_VERSION=1.18
+DIST_AUTHOR=MSISK
+DIST_VERSION=1.18
 inherit perl-module
 
 DESCRIPTION="Extension for manipulating a table composed of HTML::Element style components"
 
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~x86-linux"
-IUSE=""
 
 RDEPEND=">=dev-perl/HTML-Tree-3.01"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
+BDEPEND="${RDEPEND}"
diff --git a/dev-perl/HTML-Element-Extended/Manifest b/dev-perl/HTML-Element-Extended/Manifest
index 92d27608378c..8cb03bb1c01e 100644
--- a/dev-perl/HTML-Element-Extended/Manifest
+++ b/dev-perl/HTML-Element-Extended/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-Element-Extended-1.18.tar.gz 19823 BLAKE2B 22ff7536c23f1a7523b0b4bfd98b11836a5757a3dc9975acc99fb63a93032d892d6a3d1c283b05b85f63f803c673d39cf6ce418d84404796233ac37801e20c4f SHA512 b11e75660c393c89974825ed46cfe9145ed8562da45ae14547352fea481d8fa64d61500e3d1601ba5f0f14aba67b554ff5257de8de9280a74f76cebc70abb26e
-EBUILD HTML-Element-Extended-1.180.0-r1.ebuild 422 BLAKE2B 5bf2e875356ed933b98a3a0e28010f7595d592f9b92bc0b846ea4d096d4586812c5b1e4532a2b7a08f42de32d6416546d580930d337d0eae35a0d5f9e5e16630 SHA512 33cdfa0d46391eb51e66df22d2c627eed63ae7ecc8a10fa971d82442ef9366b608c0c83a4af9ec1d1a3746f0f572706efe83460d74d9678343364315746bb592
+EBUILD HTML-Element-Extended-1.180.0-r2.ebuild 396 BLAKE2B c5e5619e73e2ff16b30a9141cb8f27ca781eb211ad4e8daea5312a0a20eb416ba00f159e2a192b4ceab9e09b2b044135c74655afc19d32880933b96fc6625389 SHA512 497dcaaab39d0ded66b457e155fa1d0b1d952c36ff707405c6e357d2c285f6b58351f76916407c2d546566315caeb39a99a584e694d54e01a39caf2c446d2857
 MISC metadata.xml 1067 BLAKE2B f4eb00f8f74af45cc832e1f1d1364079177254b1d9d22e53bb21324de48fe798837cc9ba5a32ab8ab8286b9caef81ce7d3a9049650a370df3fb2d79695c7c333 SHA512 33695c43b09780c6b624e9ad5f0aaa7d0f7d3b57bbc040ce8d175f90537b7fbeb4b85de63323bc376e977fd304e1b5ca32419c78a2465d68fd021954c4be48bf
diff --git a/dev-perl/HTML-FillInForm/HTML-FillInForm-2.210.0.ebuild b/dev-perl/HTML-FillInForm/HTML-FillInForm-2.210.0-r1.ebuild
index 72fecaa47282..269aea85c63d 100644
--- a/dev-perl/HTML-FillInForm/HTML-FillInForm-2.210.0.ebuild
+++ b/dev-perl/HTML-FillInForm/HTML-FillInForm-2.210.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-MODULE_AUTHOR=MARKSTOS
-MODULE_VERSION=2.21
+DIST_AUTHOR=MARKSTOS
+DIST_VERSION=2.21
 inherit perl-module
 
 DESCRIPTION="Populates HTML Forms with data"
@@ -18,10 +18,8 @@ RDEPEND="
 	dev-perl/HTML-Parser
 	virtual/perl-Carp
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? ( dev-perl/CGI )
 "
 # the dep specs are rather incomplete
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/HTML-FillInForm/Manifest b/dev-perl/HTML-FillInForm/Manifest
index 3aa19900a9f0..cb73ee628dd1 100644
--- a/dev-perl/HTML-FillInForm/Manifest
+++ b/dev-perl/HTML-FillInForm/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-FillInForm-2.21.tar.gz 17823 BLAKE2B 482b53f3f7fa84d2948dc2ec00406d77946d9332197974628604dcc5626ba05e294dfc0a6db15873ff6433b7e8c4d7dc1727d8820a297de2eb91021eb59d9923 SHA512 05a755635478a797c4711e812a7fbd0428e61b4a4dbb3f8b62ed929122bb4b138aa3d86f2d99ace01d9e7f9486663e64b2c50490d0084c861cbdf8c25645be96
-EBUILD HTML-FillInForm-2.210.0.ebuild 496 BLAKE2B 9476c104ab0e70c77944dfcf9ff93cd36bc6dd8f78b86bef412658771e5c8a374722caa7e16e7510480aa15a31b8459d312de82acdedaf8a3f81a395f5e3d077 SHA512 1d26dcfd741299536b81de974aa58e6e095192743409e9f9a5cf510c0659b28c96be1746685bc101411a9bb38682110034e32b395b40f7e90b7cd4322643d47c
+EBUILD HTML-FillInForm-2.210.0-r1.ebuild 469 BLAKE2B 7d2df329e6f75181c5f3b6515304da35919fa9bc05fd0db1d79f79d26b56087dcf942998ebfbd4efef5d86c0697860796abe781952468077d711fd4812264a18 SHA512 5d68edb9c2783088c0e7fa83bbc1d9e92ab40afab76037e437bb2f4b0aa565c9737db21ec394aa3a04c4ad1e32542424a518f2e3c81d277d5bbee7702fe24709
 MISC metadata.xml 402 BLAKE2B 0f72be63f506d6ef939c29ddc258710617c8642937b2ee27de7b5766c75d0ac15e6a85a1feb786332f1a675eebdad963bb0ce39b0b8adcab64143bbcf883388f SHA512 e82a43af9478ddc8239c27629b191a5bc93bc3d6764ca4d194a34f3863e5601fee34d91ad99590f7ec62ad9a7dd796194ba0c6f937a4b74d98a4a0ce57f1dad1
diff --git a/dev-perl/HTML-Form/HTML-Form-6.70.0.ebuild b/dev-perl/HTML-Form/HTML-Form-6.70.0.ebuild
new file mode 100644
index 000000000000..2e3800a1741c
--- /dev/null
+++ b/dev-perl/HTML-Form/HTML-Form-6.70.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=OALDERS
+DIST_VERSION=6.07
+inherit perl-module
+
+DESCRIPTION="Class that represents an HTML form element"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!<dev-perl/libwww-perl-6
+	virtual/perl-Carp
+	>=virtual/perl-Encode-2
+	dev-perl/HTML-Parser
+	>=dev-perl/HTTP-Message-6.30.0
+	>=dev-perl/URI-1.100.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/HTML-Form/Manifest b/dev-perl/HTML-Form/Manifest
index 4a0b796130a9..05e540047a9a 100644
--- a/dev-perl/HTML-Form/Manifest
+++ b/dev-perl/HTML-Form/Manifest
@@ -1,3 +1,5 @@
 DIST HTML-Form-6.03.tar.gz 23522 BLAKE2B 61605abce3af5d685b858191e4bfa5b37626522bd63ab817e5260c15479eaa61d86157c8aff3134136f97ba019104bfa33f2c4ee6c04f01a5854682f81c7b20f SHA512 d93644c9f440f1e0289fa708459e461721910d62c825f382cf913cfc4faa9934fb78ccd929385a4a36605cbc9512e50b56776c6562cb90b31cb1519c1abce7a8
+DIST HTML-Form-6.07.tar.gz 41503 BLAKE2B a0f77744a467dd553bc316e4064b6b334abc405017a9e65c4d5063055a5afad13a40b3fbc71e108661369e5f803e2321bb1240915c9cd6f26f957c21a0f8e4a1 SHA512 32aac4bb85609c2c596e771678bd4d36f3e34deaa3de7333f089c8f887045780db949b5a1573254557eb0247713232cca5e90f89a80e0d53049840660ad3017e
 EBUILD HTML-Form-6.30.0-r2.ebuild 586 BLAKE2B a8e2fdece76fed9ba44b16468148dffb9b7f1434e3e132bccc8654e9dc3259bb5d3e9f515a04b52fe1758b60c7c27aa1f4b406c463c9c855b50510c190b1717b SHA512 63af43dfe0aa80f9decb0cd64f227a700958deec9bbc69b1fb7597955496d5d04267e4e065c4fb99c4f47205e3171ee842d6ef7f88f55cabb162e9269e6a3c49
+EBUILD HTML-Form-6.70.0.ebuild 746 BLAKE2B cbe6ab2f1a1623b3ad789d1ea9ba35dd9fa9d58faa1aa1ea6b9b36634555b6c84cc72a891e5a9aa2724e1770d53afc674cfd3bf1aa6727410e80f7d870537975 SHA512 4cf4947fd274b902a1549252e1b509d9288eb8aff4d5e2891d6fed51c66b366351c02f312cca0d73b6c994b4f0ba90bf3b4ee253d49b3ac36a5397305f779f32
 MISC metadata.xml 909 BLAKE2B b9e1be45fe8fb419e2a0ded97f6eac10b8d77899a3aebc4ae2ac5b81d867fe75d8d6ce8c78bfbdd1da8a621ba17b306fe34480c49a6d9e50933fe54471e43b5e SHA512 a8b0ec2f4a5c1951c8b4feb7502bb9dccc2f75bf2f40c29835993e25ca76640d14947237b6fcf5748b97d1c0051aa5cb68491471a0827cde0e3b3287606d4e14
diff --git a/dev-perl/HTML-FormatText-WithLinks/HTML-FormatText-WithLinks-0.150.0-r1.ebuild b/dev-perl/HTML-FormatText-WithLinks/HTML-FormatText-WithLinks-0.150.0-r2.ebuild
index bc3e6f1c76ed..920891efde8f 100644
--- a/dev-perl/HTML-FormatText-WithLinks/HTML-FormatText-WithLinks-0.150.0-r1.ebuild
+++ b/dev-perl/HTML-FormatText-WithLinks/HTML-FormatText-WithLinks-0.150.0-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-MODULE_AUTHOR=STRUAN
-MODULE_VERSION=0.15
+DIST_AUTHOR=STRUAN
+DIST_VERSION=0.15
 inherit perl-module
 
 DESCRIPTION="HTML to text conversion with links as footnotes"
@@ -19,9 +19,7 @@ RDEPEND="
 	dev-perl/HTML-Tree
 	dev-perl/URI
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	>=dev-perl/Module-Build-0.380.0
 	test? ( virtual/perl-Test-Simple )
 "
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/HTML-FormatText-WithLinks/Manifest b/dev-perl/HTML-FormatText-WithLinks/Manifest
index 836c0b913061..bf983e7204e8 100644
--- a/dev-perl/HTML-FormatText-WithLinks/Manifest
+++ b/dev-perl/HTML-FormatText-WithLinks/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-FormatText-WithLinks-0.15.tar.gz 11915 BLAKE2B 74edae2a6503aad6d016ec97c125f2c17924c89a84b5027b08dc4e7554adcb6a5961cb5a5e38cc02f7d50e988a5589074c1bf7f5e54c63d0e9a9ac713bd34c57 SHA512 cdec4ba94c3f9dfd4e9c8b03be0e24068b23b634499bce062e0b281b26ad3a0288c0d4cc35b4db62fd81ad5f0a0f9ce42a59478af10a81ca2f5901ab79cdf550
-EBUILD HTML-FormatText-WithLinks-0.150.0-r1.ebuild 493 BLAKE2B 2ad1b29918b60ced57b1461f99b189f62129812be245c4e3e2e518180aa811a357da03ed8ca186ce4baa13669aa1d69584fc2b48d0a426f95d3fb60724b7cb9c SHA512 796b7db348acfa967bb726f492e66feddf0a5badc98324056aa5b2121793d10380dc60bed6a38d7b59eccf4c5aad4ed076310fda6b6190ac427252eb299d6971
+EBUILD HTML-FormatText-WithLinks-0.150.0-r2.ebuild 466 BLAKE2B abeaf454740c5823fe1477c974ce49fb2bfed8a0b946bcd62343f88c5a7d13b627281de491c3a73319266a43baba1d44af51871c3899ee1a498ac066c0bd2b9e SHA512 4d7e1cc2489f1dd096189db985fcdcd46fe88688519248a3c6f490870dd0481741cb9cbc0677a032212f6a2d3216ee4e1d41b645ffed31861ed2eb6d8b4b2be9
 MISC metadata.xml 579 BLAKE2B 886dacdbbd4a654cfd6534344bb611cd8f9f533505595fe410f7136eee57a97c89294e4fe42b13c7030ebc0fb0c5e5d5fe235334f9c926546389a71eaf52b4fe SHA512 03899045487e0745216c249cc498b7d2e9d36d652297f3a5d5fb1ba5c142bb4903a64826bfdd7cb25c0ee22348fd74964a868c842a7a89aeacbe2a13a5d1bb15
diff --git a/dev-perl/HTML-HTMLDoc/HTML-HTMLDoc-0.210.0.ebuild b/dev-perl/HTML-HTMLDoc/HTML-HTMLDoc-0.210.0.ebuild
new file mode 100644
index 000000000000..288ea1e184c7
--- /dev/null
+++ b/dev-perl/HTML-HTMLDoc/HTML-HTMLDoc-0.210.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=ECHERNOF
+DIST_VERSION=0.21
+inherit perl-module
+
+DESCRIPTION="Perl interface to the htmldoc program for producing PDF-Files from HTML-Content"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-text/htmldoc
+	>=dev-perl/Devel-CheckBin-0.40.0
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-Tiny-0.35.0
+	test? ( >=virtual/perl-Test-Simple-0.980.0 )
+"
diff --git a/dev-perl/HTML-HTMLDoc/Manifest b/dev-perl/HTML-HTMLDoc/Manifest
index e3c611952bf0..95bf17492f07 100644
--- a/dev-perl/HTML-HTMLDoc/Manifest
+++ b/dev-perl/HTML-HTMLDoc/Manifest
@@ -1,3 +1,5 @@
 DIST HTML-HTMLDoc-0.10.tar.gz 15293 BLAKE2B 6a25b7aa56ac3c72ba70b87f4fea6d9b9838ab15fc3e97f3f11a875a80e877b3e79ba7e5267fbfdd054bb181d652d80f8cdc55a0978b8b8f9844bcaf2769314e SHA512 b401d04025dcd27c2f242d4b05819e28159ae19a9fbe5d8922bb615afec17705cf264a147e11c150d100706086d23775c8dab05025fd7fa35a3da75251fed2e5
+DIST HTML-HTMLDoc-0.21.tar.gz 23483 BLAKE2B eb6721ccce415ec1a217f25f2815daa9777af94bd44874a5fedf4be51b95b3e9809e94eea89b877aac6553bf113dc8dab8ed624dabd8b0f70f8a1a78c004a9ed SHA512 3e7b7ac4f4390242bab4c94439ebb37bf46e2aa2aef8670fbf165795dd0ac138d067411b6adfddd183ff8a7ab6e2e245df422d8b10ca7d9c9f1b49ce3abba131
 EBUILD HTML-HTMLDoc-0.100.0-r1.ebuild 397 BLAKE2B ed5a8af97076f8bb2c53d3b7ba6f19f0ef5266d861c564649a6d584fe41f6b52c410e7f25ed6c30feb4171efd985c673a48f50353923242691d138e71857213e SHA512 6bad3608253f086ad381fa312e6f4c18a24d69c7590e1f6eae413a15352acc689d851881606bd06f981b72dfdcac38454ede939003c38a7cbbc565aa2d1b8f40
+EBUILD HTML-HTMLDoc-0.210.0.ebuild 530 BLAKE2B 0d2e373e020e395402bf7af1ab685ddbd8d962e4d4cf96a0e4de9532c01648e0ae6c8505011c63e61523a40cea07f956de86e9c8b2ae2b05fb8ea6670fef58bb SHA512 98bb7ca77dc5c98dd492c5b528262096bd4d7afc0619b9b848fad18d802bc125470000b0f3ace4f8ea8f0f10a02d5633f84402303c7bf468229650e0b2221dad
 MISC metadata.xml 461 BLAKE2B 329cddc278b1424d36a9f9ad70dca3c75efa570d173ece0a04f31e4aa4e160252370a5268d57629444f636b4ee2c87b55068a94a3a5c652fc3d721c07c1ef65d SHA512 04ebf2414faafbdf1eb708fede6c8fadc49a4c2af64391d15e78f8971a91c5ecb76d634cca60af4d795d3378e9d86755d56c04e0f53870fba22774665d156d9b
diff --git a/dev-perl/HTML-Highlight/HTML-Highlight-0.200.0.ebuild b/dev-perl/HTML-Highlight/HTML-Highlight-0.200.0-r1.ebuild
index e3ab2a8fdde1..342d57ffaa25 100644
--- a/dev-perl/HTML-Highlight/HTML-Highlight-0.200.0.ebuild
+++ b/dev-perl/HTML-Highlight/HTML-Highlight-0.200.0-r1.ebuild
@@ -1,17 +1,15 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-MODULE_AUTHOR="TRIPIE"
-MODULE_VERSION=0.20
+DIST_AUTHOR="TRIPIE"
+DIST_VERSION=0.20
 inherit perl-module
 
 DESCRIPTION="A module to highlight words or patterns in HTML documents"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-SRC_TEST="do"
 PATCHES=( "${FILESDIR}"/fix-pod.patch )
diff --git a/dev-perl/HTML-Highlight/Manifest b/dev-perl/HTML-Highlight/Manifest
index cc7f94a8e7ca..3a9b1d3e8b93 100644
--- a/dev-perl/HTML-Highlight/Manifest
+++ b/dev-perl/HTML-Highlight/Manifest
@@ -1,4 +1,4 @@
 AUX fix-pod.patch 542 BLAKE2B fd62d52bd83cb5c1b350762b201a92ddeeac6ae8eca35cbdfb17d35eddfefcdba6d378c6ab23e96842e9a42118296ec11fcc59938d969063b0110a38d6fe6fbc SHA512 d6a83c923932f66ff295642f31018ca3fa07333266c9562f6e5b031a8bcdcfb8724f7ec283064b911a29e56861ba5dea49315ae7a0d2d6513ce2c87c383aeb8b
 DIST HTML-Highlight-0.20.tar.gz 5353 BLAKE2B 4bfcb6744cd2d81d4552d0f41fd71992f966f9848c663d0c3abe15e0186e740e96a9d80281540f17b3a11da684e30733527b4fd6844a9f14f442fc3d70f5f8f1 SHA512 077d40078126ef79fdfa205b06c6557ef680255c5b67b9c8dc7eccdd387a4242ace13771827b129f9fa16cfdb3ec70a39a6460ac769276bd7f39e5d1f964d9b2
-EBUILD HTML-Highlight-0.200.0.ebuild 348 BLAKE2B afc7c68b8e6254322a0ceaf8cb8268157a2f4dd94013aa8d61a81b559d061b7618ae1924d07858409903f701bda7cef3494c219b748a40cb5df5195327fca6fe SHA512 47370e5c9af3b266643972e93fc43314ea7984cfd00798b781be53b6d0b93d3bf152e2ee40aa3ed3d8105428cbd032ca7ce3a0bc20ff5a7cf1aab89d80b45096
+EBUILD HTML-Highlight-0.200.0-r1.ebuild 319 BLAKE2B 43195c3686e34d9e67eee21fc103bd51c6a32bcaf161ce518e5d405b1e1420796c63796be7b676d55e935e2d7ac55b50da7da08755306433d9322e9771382892 SHA512 9f56c7f8f999a81a88abe7bc80bee287347382d4027e24e8a75518b93556cd3adff01fc1061432f9adfda912d595f94dabfa3c68d15981875b71ba52fecb8f83
 MISC metadata.xml 472 BLAKE2B c57aae8884fa781776e4808f8a6eb2faa633682a0ca6f414da45da96b680ace371e7e420040af6b9fa6e03c89d052f6ebdb9a7c51c9abedc6357df7a8b4293ef SHA512 8310195c74a3b041de41545ac9e44199d571990080ef12f30c44a8147e3e371d5c4c0a857724ddaa30fa8bf0a6a61a3a17e3914e9461bb487ea009f98e945e96
diff --git a/dev-perl/HTML-Mason/HTML-Mason-1.590.0.ebuild b/dev-perl/HTML-Mason/HTML-Mason-1.590.0.ebuild
new file mode 100644
index 000000000000..ffd6451eccea
--- /dev/null
+++ b/dev-perl/HTML-Mason/HTML-Mason-1.590.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=DROLSKY
+DIST_VERSION=1.59
+inherit depend.apache perl-module
+
+DESCRIPTION="A HTML development and delivery Perl Module"
+HOMEPAGE="http://www.masonhq.com/ https://metacpan.org/release/HTML-Mason"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="modperl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!modperl? ( >=dev-perl/CGI-2.460.0 )
+	modperl? (
+		www-apache/libapreq2
+		>=www-apache/mod_perl-2
+	)
+	>=dev-perl/Cache-Cache-1
+	>=dev-perl/Class-Container-0.70.0
+	>=dev-perl/Exception-Class-1.150.0
+	virtual/perl-File-Spec
+	dev-perl/HTML-Parser
+	>=dev-perl/Log-Any-0.80.0
+	>=dev-perl/Params-Validate-0.70.0
+	virtual/perl-Scalar-List-Utils
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-Test-Simple-0.880.0
+		dev-perl/Test-Deep
+	)
+"
+
+want_apache2 modperl
+
+mydoc="CREDITS UPGRADE"
+myconf="--noprompts"
+
+pkg_setup() {
+	depend.apache_pkg_setup modperl
+	perl_set_version
+}
+
+src_prepare() {
+	# Note about new modperl use flag
+	if use !modperl ; then
+		ewarn "HTML-Mason will only install with modperl support"
+		ewarn "if the use flag modperl is enabled."
+	fi
+	# rendhalver - needed to set an env var for the build script so it finds our apache.
+	export APACHE="${APACHE_BIN}"
+	perl-module_src_prepare
+}
+
+src_install() {
+	perl-module_src_install
+	mv "${ED}"/usr/bin/convert* "${ED}"/usr/share/doc/${PF} || die
+}
diff --git a/dev-perl/HTML-Mason/Manifest b/dev-perl/HTML-Mason/Manifest
index 4dc866ed9b0e..63a5bd4e9921 100644
--- a/dev-perl/HTML-Mason/Manifest
+++ b/dev-perl/HTML-Mason/Manifest
@@ -1,4 +1,6 @@
 AUX HTML-Mason-1.560.0-no-dot-inc.patch 802 BLAKE2B 49194d66a45804bf60e459cb12b9f0b793420854706b1c04601ef9e992d1e7ca80056b252687fcaab37b3030b238678412df4c2e1a67d5582b69ec8a3f073be8 SHA512 c3de6da1cf6f5a777833c9ea4b68e1dd3c920c766b8661eba4d0ef430604d102abc68bef0d2cfbf11bfaef776c101c1bf19de80f4a05091d9105620601b1b245
 DIST HTML-Mason-1.56.tar.gz 314167 BLAKE2B 7e449bc566f406f2f6c93459f573327be933bbf50eeb1c712e9d109133448cdf568cfbefbdd28fa403d9ed340334afb5c9d1dd5a1800c624b23634cd54949520 SHA512 3492a37b8289209a2215b42be71db242ca150f4364d8422e46ca4762f2cdbddf96a56f44a3462d1f1eb23ef3bbe1cb36b8322106f4050404b988c6d90a05911c
+DIST HTML-Mason-1.59.tar.gz 323661 BLAKE2B e9061cf4349874572c912faa04e849cdba15b7219f33488af3555f58ee0d9b77e851cf20ecddfcb55ebb6ec1e3525dea986fdd444b6445a8f39b8508cd261b68 SHA512 3a8053d976345c7bd1d04aab659e3b4dd541264ece806e6d3bda605b6ecb16887ecce9a310bf27890aab40a129c81ba2dbad60c2edd80681a53d159becb3eda1
 EBUILD HTML-Mason-1.560.0.ebuild 1517 BLAKE2B 8a25e894e241d72d4492280f4abb2aeb35bf401a2b47c8e546d2cef92a05d5b8a27314f2d8154a59cd409371cd7e221cf010654364d0d6b742d20631e2532cab SHA512 64dac585607f29e526b8237df015457d04f390805c8663c56f25f872e27fc926a1aa3b96da5d4d58bf5cd8d7cbeb603c41d7bd446ded95abf43db61f83ba270a
+EBUILD HTML-Mason-1.590.0.ebuild 1454 BLAKE2B acf5d7f267689cd3296212387d993c4dbbe8afafd61602f6667d226fb737a46cae4f5b6b12fa85aab27bc4ecb768fc7b02035c25160d2489eccec3f103f5e67b SHA512 507c0ca19b2ddfc58f692ea1b6256de552507dbb6ed8469aba93992f4272b7cc33e2614f00d91d08da226b630a9dfc9cb3f725af8f7e0302177698057d4e6976
 MISC metadata.xml 3212 BLAKE2B 87a54f90f83a9b5ecea1153e148dad7c497fd20b7c2385a34af5ab5ee418510153bac3e415ea2e172028cc156f7bb46545477638ca3ba34bee04b41e4f0262d7 SHA512 a24c5efe8884f82d4a925fdba27dbe710709c6a3347bde64313f9ce8e88e8439a96e2703050a2ca24e8cfab20e7fae36a1dda3b82f9cc3596d888ec85920f77f
diff --git a/dev-perl/HTML-Object/HTML-Object-2.30.ebuild b/dev-perl/HTML-Object/HTML-Object-2.30.ebuild
new file mode 100644
index 000000000000..27aa64c383da
--- /dev/null
+++ b/dev-perl/HTML-Object/HTML-Object-2.30.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit perl-module
+
+MY_P=libhtmlobject-perl-${PV}
+
+DESCRIPTION="A HTML development and delivery Perl Module"
+SRC_URI="mirror://sourceforge/htmlobject/${MY_P}.tar.gz"
+HOMEPAGE="http://htmlobject.sourceforge.net"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="examples"
+
+RDEPEND="dev-perl/Data-FormValidator
+	dev-perl/Date-Manip"
+BDEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_test() {
+	TZ=UTC perl-module_src_test
+}
+
+src_install() {
+	perl-module_src_install
+	if use examples; then
+		docompress -x usr/share/doc/${PF}/examples/
+		insinto usr/share/doc/${PF}
+		doins -r examples/
+	fi
+}
diff --git a/dev-perl/HTML-Object/Manifest b/dev-perl/HTML-Object/Manifest
index 17edf777f236..06289e7d8bfc 100644
--- a/dev-perl/HTML-Object/Manifest
+++ b/dev-perl/HTML-Object/Manifest
@@ -1,3 +1,5 @@
 DIST libhtmlobject-perl-2.29.tar.gz 185373 BLAKE2B ae75158d3425079074a88ee37c316540b278012a45f9f00dc8ca6bd8dabd030fa1092ed94e74e083adfbdd5dd16068d30585366476b7054470021c998ec0831c SHA512 d8028d5f54010732d06afdbae472fb44271af749634d7e5a0e86582f831428d6d902e06a8f20169ea7387f7761ad6abff168086b274b01e5efa1f0bf90583e72
+DIST libhtmlobject-perl-2.30.tar.gz 202607 BLAKE2B b25722e47cab9c3415a5aa086c5c855a51d6c3a0ba2b4d81fd2918c0cce4388ca0697abfd2e7e00c1a6b8f87212b0409ca344f4ab9c86f512ecc0d79d2227ad2 SHA512 c0b1cc93810f8cf31d7c2bd9935893cc0534530715bbad0343f620a9bf24ed79c4d1abe2ce7dd4b524f35db1e4dedec98a3441ca0b045e1492296c73b85e3513
 EBUILD HTML-Object-2.29-r2.ebuild 714 BLAKE2B bfd04c0571235480f04b2fd6208f1eb0942aa192105c4b71bde0d2c83f6c9fc9fa9de1c3a316d833a76513c69c4f7e7577fefbe4789ba563107ff6ddee9f0a03 SHA512 888ed844ade50e47b718c222a1303fa535266d75ef63c9ffec7a1808c4f3df43375f55af5d9d671eb3d16e180a79c1afee96ac3ce178e419eabf4d42af27e4e3
+EBUILD HTML-Object-2.30.ebuild 702 BLAKE2B 999276ca4f1120a15f5813223b7ca36dce868203e52e2a228bea3781bfc0cd8c067e73cad78bd69e8a6d555afabf834a257bb37a290c40185d379bb8d20a57d4 SHA512 fb856db035bec8a1fcc162f9e44107a91f19ef185c2ff47b9a063bc0b2b3bc9680378ba4bd2969807ea1c84558c7a3acc51668eb18805c89a3339e87d3f4706d
 MISC metadata.xml 331 BLAKE2B ff36c034460544effca3e9c89494fb79647ff7bda5fc93a2ff016f4c28f81e8600d6c63d26fd228fd79e570168121d6b9844b5d04bc9bc203bf0397532cbda63 SHA512 8452ca93c9bb094be75c9c8abc52ce5e4161ba91de9dc69e85a7807da0a56860d3e908345d5e2f45363255087c22febb8ea97565afe2ff6012ffac51180d5835
diff --git a/dev-perl/HTML-Packer/HTML-Packer-2.100.0.ebuild b/dev-perl/HTML-Packer/HTML-Packer-2.100.0.ebuild
new file mode 100644
index 000000000000..8b15202e36bf
--- /dev/null
+++ b/dev-perl/HTML-Packer/HTML-Packer-2.100.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=LEEJO
+DIST_VERSION=2.10
+inherit perl-module
+
+DESCRIPTION="Another HTML code cleaner"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-perl/CSS-Packer-2.10.0
+	virtual/perl-Digest-SHA
+	>=dev-perl/JavaScript-Packer-2.10.0
+	>=dev-perl/Regexp-RegGrp-1.1.1_rc
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
+
+src_test() {
+	perl_rm_files t/pod.t
+	perl-module_src_test
+}
diff --git a/dev-perl/HTML-Packer/Manifest b/dev-perl/HTML-Packer/Manifest
index be1287134c0f..1cef04aea63b 100644
--- a/dev-perl/HTML-Packer/Manifest
+++ b/dev-perl/HTML-Packer/Manifest
@@ -1,3 +1,5 @@
 DIST HTML-Packer-2.06.tar.gz 11616 BLAKE2B ad37fd5ef6b5f73e47f203dd04823b9602d1a68a8f70e333fde531f091e2dbc826e3eae40a9f85edec34d6708a93df24ea2c27cefa38eeaeb03d15c3f87ecb2e SHA512 337cbf2206bcd85af693d04ab2bc4961b3b8780206d51709a5db849d7bdc8601b1f994096b1e6cbb77c798a2cc8b4737f5bcc208e06f062f9ca6296a31a79f5a
+DIST HTML-Packer-2.10.tar.gz 13728 BLAKE2B abdfd532e2ad9793f5741d52e550b5a217884ab65f1e0d1573e4ffab650c899b66713474fd6e36636ff17e1d74b27686998732491d7f5b58423c8c9fc3078f15 SHA512 8335deaeef7933b85f671d3ca47492cf618cbe98828d244bf5be981c4ba3d0fcbd4de1a66e2980d5e2a0f6935d4533e58c85d4d9c3ca3201b8b8fac905418d2f
+EBUILD HTML-Packer-2.100.0.ebuild 573 BLAKE2B 26302b4ee5981aa5d65575cc2cc49d67fd1b2f2bd9934e6290dd225d09dd6f6a11e499f552111a7a007212f03327cc414eb833cffba2f33cec77f7f6472ad729 SHA512 9cad1baddf4817ee8f4a90372606e8d2608f1291b7be214f4e9d362bee264e84cda1f977b24f01de69d2286f3056dbc598a0a71761bb9f6d93a7b3b59494e44d
 EBUILD HTML-Packer-2.60.0.ebuild 546 BLAKE2B d97c56bab51527495cf55495103fa474e507aa852e1af7bf1f8e8e16f5a3a32c2fbf62bb7f7f7f647e2df619234b1956794316894fe2dc084c8f21dd5072f243 SHA512 fba82d68de9bcfb31f126ef198298dc931c8dc688a70d965b0bd511d953b942d53dce03c0371e4055cb5e547f943a109f296ad0ab217266f381cd8c01c2e001d
 MISC metadata.xml 466 BLAKE2B e4b1aee3fa4933ae454732db1e70dcdd188f7814ade17d6a57272a4750adbc3d6244f9e8f39c99d8fb556b73370eafe42ee3d5032f72ad05e50b59309ed06ef5 SHA512 7200b7dc2450308009f65a5c21de2e12c46ff8c4680b188bf5962ffe1fb56a68c119788eb5315506e9036decaf69f39b0d79c3dfcfb5ab8c2b8131ce2e8c0f8e
diff --git a/dev-perl/HTML-Parser/HTML-Parser-3.760.0.ebuild b/dev-perl/HTML-Parser/HTML-Parser-3.760.0.ebuild
new file mode 100644
index 000000000000..ebdadde47593
--- /dev/null
+++ b/dev-perl/HTML-Parser/HTML-Parser-3.760.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=OALDERS
+DIST_VERSION=3.76
+inherit perl-module
+
+DESCRIPTION="Parse HTML documents"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Exporter
+	dev-perl/HTML-Tagset
+	dev-perl/HTTP-Message
+	virtual/perl-IO
+	dev-perl/URI
+	virtual/perl-XSLoader
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-Test-Simple
+	)
+"
+
+mydoc="ANNOUNCEMENT"
diff --git a/dev-perl/HTML-Parser/Manifest b/dev-perl/HTML-Parser/Manifest
index e6d643a430d1..f0fa0902a192 100644
--- a/dev-perl/HTML-Parser/Manifest
+++ b/dev-perl/HTML-Parser/Manifest
@@ -1,3 +1,5 @@
 DIST HTML-Parser-3.72.tar.gz 90680 BLAKE2B aed1c788b4039f82e9968aa8d2ef0067262c9e986dc24ccc5e570bcaa8dfe46c48fe0f795c84df6747cf3b63f338154c7272eb0dd579d0e2bab833fbc05b88b4 SHA512 9fded69219791af085018ffbe6737e74e370c543af52aa221aec174daf52d1b8d3cdd07f025176c0212ae572a924555262f2eefc73781f82cdb7d9cff58ae716
+DIST HTML-Parser-3.76.tar.gz 120473 BLAKE2B 541aa72674d452a4b9e3d5773abe9b78674560d790071cd8ee19cb90e58cbad48c88f628d9d27056839612f9dc9dcdc7fb2cc719474928e843d344c11bf7bd6f SHA512 50f9dc01997afdef33b58b48bfabd596b09cc11086773dcb4707086b7d7f54d2234d508e11a0b17e5d62849bf6acbc16aa8cd53080329ad3dacdbbe877c2c88b
 EBUILD HTML-Parser-3.720.0.ebuild 718 BLAKE2B 1e2045c4d24d6f113ce6013168104fc1904d830e5f3f1b78d363c26bd39ad6016020bed18dbfb891f1075d5939546fb03cc1308567e281b4a494958bd5451b6b SHA512 ce2ae08b5839c0f3ffee22594d856687be10c0a9ddb49becc8a430e683b0561412b8f3e1f1788754660883dc1843c927a0c8bc0299d1e3c7271c109a9a5faabc
+EBUILD HTML-Parser-3.760.0.ebuild 765 BLAKE2B 95fbd29759e5508b6d6d29d18ffe0e71de9b26e5f70e4c945ee35d6b52a9216d04140a82bdd7a082551139c2dc7f196258ee6a890c3a78b6f2ff5ceff59edef6 SHA512 7b1747401722ef3f031b12c1531b3ea8bc9134062c0602e49f59e5bd9c0a318cf963c794ab9c95e8359d5c2a27ac89db8fccd8ee7913848bebd61bc080c7f37d
 MISC metadata.xml 765 BLAKE2B 95bb8cf9ddbd12a47914cdd78641d929e66d81f101cc1e8a06ee5227ccd7403d268c779580b612e219b72f22714b04a127b3561d9e420a46a94db3a69d4c45e6 SHA512 e8bc92e65b8d41011856abd50a8f37a0a76c5bcc18272a3dcf480ca33cf07232b5c0296d6048b8ea792703c8ca3d656aab7901da23b5f5e0c3867d16d8bab5ea
diff --git a/dev-perl/HTML-Scrubber/HTML-Scrubber-0.190.0.ebuild b/dev-perl/HTML-Scrubber/HTML-Scrubber-0.190.0.ebuild
new file mode 100644
index 000000000000..5ac1ffb9472e
--- /dev/null
+++ b/dev-perl/HTML-Scrubber/HTML-Scrubber-0.190.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=NIGELM
+DIST_VERSION=0.19
+inherit perl-module
+
+DESCRIPTION="Perl extension for scrubbing/sanitizing html"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-perl/HTML-Parser-3.470.0
+	>=virtual/perl-Scalar-List-Utils-1.330.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-File-Temp
+		dev-perl/Test-Differences
+		dev-perl/Test-Memory-Cycle
+		>=virtual/perl-Test-Simple-0.880.0
+	)
+"
diff --git a/dev-perl/HTML-Scrubber/Manifest b/dev-perl/HTML-Scrubber/Manifest
index 0b0f5c41a461..939a0d2703e6 100644
--- a/dev-perl/HTML-Scrubber/Manifest
+++ b/dev-perl/HTML-Scrubber/Manifest
@@ -1,3 +1,5 @@
 DIST HTML-Scrubber-0.17.tar.gz 37140 BLAKE2B e7c68b6a93f0efb7f63f431f14c4cdf6de3c0b95b6d95b9e5ee09161ee2e0515d7ab8e148df6293b3b2f1c4644e54e465c96372ef42b8682c4f95fb4b78bc57a SHA512 d6e04374d4da390d22cc4d51bfe2910078effc30d6d2ddc36dbc1b94ada12333c2f9c7acb1f444f777f9e268aed90ba8ea15c4c74a8b5ab955fe97ef04469ba7
+DIST HTML-Scrubber-0.19.tar.gz 36418 BLAKE2B 78ca4b5b6ab6b15a41d7d2e260bdf3ee4823cfff0633527b11843a468a6105a5922fbbd82a524b1c98c6f1c3ccd84dc0c070f5cdb634a8b1fdb2f3cc3f576e92 SHA512 6894c58315f38e81d645b999cca180b1e86a64e8ae913df5891a6293c9c4950d99f1d1c5a03b7d584aff381afc49c16fe2e06541203c8dea881479cc981ee262
 EBUILD HTML-Scrubber-0.170.0.ebuild 464 BLAKE2B c20297e966467c896399823dcaecef255b6c7f2eeffb62f7327e907b2ba7411470ced187fe424318e1be68d146a2ccd5fa99e66559aa9d5dda9ae2c75b011554 SHA512 f0bd8ca21c29d16ae55675a05d5b96c838b4966c0f31101e25631feb8fcdb015662654b054ee6dbf593ecc8d0553ab7b4e82bbc4b58a65178b12a0610c17a91a
+EBUILD HTML-Scrubber-0.190.0.ebuild 612 BLAKE2B b78f4a4fb365d0daea71ad2ab0a2d31cf69ee2101fe616d41bd7605c775a372ce6ae48d9d468ae3f4a13323c030cdb928f20db63eb7ecea5cfe8cd1c0fa412b5 SHA512 60c2bccedbbe7ad7e41172ad7b57ceb472d3028e688f5c7ad26f4c41215dbcfaf6630bc5b2a2231a270cbddceb26a4b4412d6299ff015515b3a26e4de4a0a01c
 MISC metadata.xml 398 BLAKE2B 5c68bd59c5937621592fefcd0b64d705719f8ffbc04f33b931e0e59b25daa452c1f43396ebb0b3881ffc357936382de2edfaca960b4ede0b2c4e1b604721653a SHA512 02bc1e16dc235554a1a12385ab28521e228e11299e55d2ceb71a9cb91f281d9169e5a977692d174073a27d1e2eb94529e3fcf41d3bbf45159921e2a0f09a4e6d
diff --git a/dev-perl/HTML-TableContentParser/HTML-TableContentParser-0.304.0.ebuild b/dev-perl/HTML-TableContentParser/HTML-TableContentParser-0.304.0.ebuild
new file mode 100644
index 000000000000..9794639b9ca8
--- /dev/null
+++ b/dev-perl/HTML-TableContentParser/HTML-TableContentParser-0.304.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=WYANT
+DIST_VERSION=0.304
+inherit perl-module
+
+DESCRIPTION="Do interesting things with the contents of tables"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	virtual/perl-Carp
+	dev-perl/HTML-Parser
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/HTML-TableContentParser/Manifest b/dev-perl/HTML-TableContentParser/Manifest
index 71f5c599d232..90681d6ef6a3 100644
--- a/dev-perl/HTML-TableContentParser/Manifest
+++ b/dev-perl/HTML-TableContentParser/Manifest
@@ -1,4 +1,6 @@
 AUX 0.13-test.patch 2076 BLAKE2B 4b3e46ada5bc7e3a9c7f6b105bbf804083abcd4d3c1873ee894468bf2ac49aa089b78583c061c83a34d37149a165efc85db0a40ea5b537e1455763a58abc5cad SHA512 39037bc38e5bd95f710dbfe005b05f2a355fa075b3f6de3681e6fc812e18850f9ab727ec9012761c6167b35302462223f4d2543dce6135ba63320b0751600bf9
 DIST HTML-TableContentParser-0.13.tar.gz 4664 BLAKE2B 062dc7ac6a78ec75f7d306649710ef470c6b6f750f651cc976d9f44fa40fbf247a89e0847ed8a991cecd929f3ea328bbee69c2cb29627f6d4fb0e23d3a3ab5c5 SHA512 0707a0059a7d885052615ee7badecc8915d5f8c67fd8683a226e23a0690f1872519475c32f51f299333c3208c20ea15380624fd0ebd1dc0b11457febfb3db585
+DIST HTML-TableContentParser-0.304.tar.gz 18437 BLAKE2B 404ba11f9174cd3db019ede6078fca246722ff9ce1d2108cd689cfa3f79aebb178853143faa45022e5785daae5e79d1f21ad519099508c5554828d54da84e369 SHA512 f5b8aee24f777a7e8d6b4a88ac6b88927b6ec51a6b14ff2f48a33248702349f2f3a446bda3679b7c510cf6c9390b6a635721c696be3b49165dc9ca89116b2202
 EBUILD HTML-TableContentParser-0.130.0.ebuild 377 BLAKE2B b1b2a33a0751dc88124ce78bc75c603fcf91de3c21bbbdc74bc209d8a4d1db7cef3f19866fe893b74c7a44ad080923759065a17afbb53ac55e4132ffe9a0885b SHA512 c318fb523b0a654ea8ab89dcb2e9c36bba77365843f6d3b1479397dd9f3e0ec136a36483a3cdb26e2625919ce39fac273d0e674d336d101705e8fe2c41811b9f
+EBUILD HTML-TableContentParser-0.304.0.ebuild 385 BLAKE2B 1d5c3df3dd2fa61b6b6f2e61fc0398428209df3ae1eea2b369813d9ca1b0bc5619ad1894e91d841cbe8a6f3a36fed844c4a52614e91032d9be9d59150387e1a5 SHA512 57de9f08782c0122e6359227578143b1d7b7a486e90d59ca63a8e679c98da9852c238e084d797cc8b29469cc2b6a4084b03e5754989aa07902a40bf9dc7dafd5
 MISC metadata.xml 534 BLAKE2B 8407660decf17098cda6bae4fbd878ee6454f09ac54ba47c51fbf853ecee0ad7bd37dda922c771629fe59393bfb76f859b9419372e75b2c9cbe1f46fd47e2424 SHA512 8afdcb73c8dc04924721658d39ec4d853f3a96501d8e5a0998270890ce33db877328bb4520839ed5a354a72793d26e8f944127bd48fa28ba68e290f52f827c99
diff --git a/dev-perl/HTML-TableParser/HTML-TableParser-0.430.0.ebuild b/dev-perl/HTML-TableParser/HTML-TableParser-0.430.0.ebuild
new file mode 100644
index 000000000000..17fd9d66464c
--- /dev/null
+++ b/dev-perl/HTML-TableParser/HTML-TableParser-0.430.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=DJERIUS
+DIST_VERSION=0.43
+inherit perl-module
+
+DESCRIPTION="Extract data from an HTML table"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-perl/HTML-Parser-3.260.0
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
+	test? (
+		>=virtual/perl-CPAN-Meta-2.120.900
+		>=virtual/perl-Test-Simple-0.320.0
+	)
+"
diff --git a/dev-perl/HTML-TableParser/Manifest b/dev-perl/HTML-TableParser/Manifest
index 39633edff376..854a577c99e6 100644
--- a/dev-perl/HTML-TableParser/Manifest
+++ b/dev-perl/HTML-TableParser/Manifest
@@ -1,3 +1,5 @@
 DIST HTML-TableParser-0.42.tar.gz 73638 BLAKE2B d422069322eada6e72a6742b32418b3c99dda824ebe98c10211b0cf0c4bf7133c6c7fe990148969c8e18cb01c2f2792ebc13ebfc04f8b5032ab48c4febfa6992 SHA512 dddde421a186ebd354c06201fdaa1379378b83acfc86fb0ed9a7959a993dd403c6d40d9aa36e143d1236c9d21ec56c851d82867783e4954f0eeba75ea8400d3d
+DIST HTML-TableParser-0.43.tar.gz 66079 BLAKE2B 5309e8b09fdff9b85b8612e4122a5732b2b85bf8e9382ba8656605d0b7faf4bc88e267226e3c7c4565637e370fa9a8526354d38e4296fa7d359004614275a91c SHA512 1f4fa5d5d91c830b6b0e53f6353af4a6016c08aeb572a9ab9d22f21d694b62cace6e745f6af3f96160b885ac2cd788331f0beb0a8777964fb80ff561c227dbf8
 EBUILD HTML-TableParser-0.420.0.ebuild 494 BLAKE2B d84ed4bdeeda30c26e06a35789f118c64ce2c0031cc9780cb9a39439bdf1cc4a55d8d3aad02ac8eb68b2755997f0a50de6572916671ce1e3b11f4d05cd8d513d SHA512 6882a6ac9b4fdb9aff29208b58732bb3ec300386f9895026e404321e9217e21ea98af7e8818ea7b5bdcc63572199686e7eda66dfc7382cd665c0f28b9d8ae44b
+EBUILD HTML-TableParser-0.430.0.ebuild 510 BLAKE2B d37a60798a6cecf4e3068d904a11c9057421894925c869b9286e3b39ae5f799c433e4922b2c908ab117cbbd6e638fe1f5c727a7557cc6acbf0dcd493a862adf0 SHA512 a1fd76ceb3a95550b2f3e70f71d521bb07c3112537481075ef58fe6fbf65d47679ae90abad970a8403c021665a6a3161d973273efc8b685de0610f90bc7d2a73
 MISC metadata.xml 475 BLAKE2B 200be53db320cb5d919d966b1f4b8a8c58f33927baab43151f1f719df36958ed9f8c4d9568b2153e09753b6838d93f9337933e64dd7c007c1f8b5150dacf4551 SHA512 121f33a9da412a987f2473b9e311dc0e5ba2bcf4e1ff51c84183a015221c3bca600f7424f6bf6c714d5033c1b2b2f8615bdf147e9a1a3e3fad7f5629eb8c6328
diff --git a/dev-perl/HTML-TagFilter/HTML-TagFilter-1.30.0.ebuild b/dev-perl/HTML-TagFilter/HTML-TagFilter-1.30.0-r1.ebuild
index 731bc5bd494b..5b129552008b 100644
--- a/dev-perl/HTML-TagFilter/HTML-TagFilter-1.30.0.ebuild
+++ b/dev-perl/HTML-TagFilter/HTML-TagFilter-1.30.0-r1.ebuild
@@ -1,23 +1,22 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-MODULE_VERSION=1.03
-MODULE_AUTHOR="WROSS"
+DIST_VERSION=1.03
+DIST_AUTHOR="WROSS"
 inherit perl-module
 
 DESCRIPTION="A fine-grained html-filter, xss-blocker and mailto-obfuscator"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	dev-perl/HTML-Parser
 	dev-perl/URI
 "
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/${P}-no-dot-inc.patch" )
+BDEPEND="${RDEPEND}
+"
 
-SRC_TEST="do"
+PATCHES=( "${FILESDIR}/${P}-no-dot-inc.patch" )
diff --git a/dev-perl/HTML-TagFilter/Manifest b/dev-perl/HTML-TagFilter/Manifest
index 83b3e75bf1ed..52709d7500b8 100644
--- a/dev-perl/HTML-TagFilter/Manifest
+++ b/dev-perl/HTML-TagFilter/Manifest
@@ -1,4 +1,4 @@
 AUX HTML-TagFilter-1.30.0-no-dot-inc.patch 1068 BLAKE2B 9ec149484e2431cf8301cb5dcfb8ecc79d17a64116780b345e1bb9676371a98a43d2f8bd253b4b5c56424255065427f8fabde459a5564d70db8400530c35b057 SHA512 c9812b6e852759bce4331a72ef09b75c2f5bf38ab7b6f79db1f41589c64cfd76b855f8dfbf27bf0b500986e7c377c15f541885f45c6d3cc3c536a0a740881099
 DIST HTML-TagFilter-1.03.tar.gz 15977 BLAKE2B 2ec6bc31acb67e676c00d435dfd3cf3e80d428afaf9e6b6ccffa3417a8be1beb3aad6e54468b2fcc7fc32808af633ae7be295ed02c35bc1bdccaffc5809d3721 SHA512 f8bed6d245420e1af1ab1fc09379263020527065dcae3b82a2273e3be62acbdf81b7439b9324962fa2ebc865c9db1077f600e8107c2892d702d1d8bf1d800ccd
-EBUILD HTML-TagFilter-1.30.0.ebuild 428 BLAKE2B 7f5950a8266816887e48e779e4249e311e6ebfd12483b74aa8e8e68a2b46282e38253cc774ca44c363ec1530ad3b131acf6208d488472fc8f79a5a39e8497fca SHA512 fa64ba9140ffb793ca7320b4d4643f1355943c68354fd680148ae2b8b06586d83e8d602d48797de600ecf15e75bab2014a411a4fdae2bd13737ebf1e0661304c
+EBUILD HTML-TagFilter-1.30.0-r1.ebuild 401 BLAKE2B 4c674cf1a6d61b1b21df4f847c7825e404ea5bf2f0e38913b9cad50a271d3746a79ff775f0c5043e924b20a98e690a83165da9af408a2c8f1483880f19c26635 SHA512 c30dc4ce2bb87cece2e46deb462dc480764a71531782c52d3fbcee742163fbd5b284c875d645a4c21a3afb8271f1e7cf2080ca146d4ed86ae72ccde41e3fba1c
 MISC metadata.xml 541 BLAKE2B 3971a6db5ec2bfd8f1099975ec8894e0f24f5a6d04cbe899276f280d2e6e67fd34dc6db5e2f33bdb0eb31333ba4cd077beb01f6e69b019dc7b69c30f0279bfed SHA512 02c2006aee0dfeefa611fad6105b57bda4c611db3bfe4ae9e91fb878bc59b4824bf5f05b9030e56863475c71debe3b49e1a0adbd682569be90f609a800f8bec5
diff --git a/dev-perl/HTML-Tagset/HTML-Tagset-3.200.0-r1.ebuild b/dev-perl/HTML-Tagset/HTML-Tagset-3.200.0-r2.ebuild
index d89dee6137bd..5225a1b33576 100644
--- a/dev-perl/HTML-Tagset/HTML-Tagset-3.200.0-r1.ebuild
+++ b/dev-perl/HTML-Tagset/HTML-Tagset-3.200.0-r2.ebuild
@@ -1,16 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-MODULE_AUTHOR=PETDANCE
-MODULE_VERSION=3.20
+DIST_AUTHOR=PETDANCE
+DIST_VERSION=3.20
 inherit perl-module
 
 DESCRIPTION="Data tables useful in parsing HTML"
 
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/HTML-Tagset/Manifest b/dev-perl/HTML-Tagset/Manifest
index 7a677fc15cbe..78e5c7917b61 100644
--- a/dev-perl/HTML-Tagset/Manifest
+++ b/dev-perl/HTML-Tagset/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-Tagset-3.20.tar.gz 8150 BLAKE2B d74358e6c5eb1d1b9fa78e40a80ffc0e98ccedcaa743e99eda18ed82d2c1244700ccb0e9db6bba7dca71b1e1fceb04e157b556e52cc00d245ecbd3dd2d68a063 SHA512 b53c099a96b493c3d03c51fcf3d58dd3b830069583f2d07477175ea234c43e91a0b380c82a71126f971faf2768e832af34967d08d899db7653d65613d6530072
-EBUILD HTML-Tagset-3.200.0-r1.ebuild 465 BLAKE2B a4d102c51bdc52b1506d3b908f63e6879dca7f6491d1adc69ffa83fd9d2ad521cfef5b27152e8de344062fc9dfc7fe8228eed078a357ee0e113fa188f68ffa14 SHA512 7d2712d31fbaf26245aa3c573eaf1002d95f7514efdd3bb756e7a221a2886f40525d7fc7a018ce318a842bef73d81c471101456c07a3d4936fe8267020e2981e
+EBUILD HTML-Tagset-3.200.0-r2.ebuild 438 BLAKE2B 4ff1a3a7094a37c6995445174855afffd743e44d573baf3052693916336610499363ba8e17a333d8c56c87c203e97ec995d7e971a5030ef0e19527c063705113 SHA512 921b039b22bff021e0a165c63b027a53189c0407334c78fc396e3974093b49e557d6e6ea34f7aced95da1d6748130155ae00111facfe511d1c1e8b0f96c00801
 MISC metadata.xml 394 BLAKE2B 37fc53e97d199a6975fcf389953b08a3c5689551c8ec2ba01e823eedf60ce630899548c315a97e30230c1036ce1a7f74232c23124ee98c5e423a57f3c612969f SHA512 66fc5b74653e2086b40c3f5ed8379edc305d3c4941ed1c3e34d109eeacab8d5fc2097fb67f9bf3e0fa53bb96fdd42c16e816355b67175417e4db6d02899675e8
diff --git a/dev-perl/HTML-Template-Pro/HTML-Template-Pro-0.951.0.ebuild b/dev-perl/HTML-Template-Pro/HTML-Template-Pro-0.951.0-r1.ebuild
index 1995f094bc71..56830181cd39 100644
--- a/dev-perl/HTML-Template-Pro/HTML-Template-Pro-0.951.0.ebuild
+++ b/dev-perl/HTML-Template-Pro/HTML-Template-Pro-0.951.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-MODULE_AUTHOR=VIY
-MODULE_VERSION=0.9510
+EAPI=7
+DIST_AUTHOR=VIY
+DIST_VERSION=0.9510
 inherit perl-module
 
 DESCRIPTION='Perl/XS module to use HTML Templates from CGI scripts'
@@ -17,10 +17,8 @@ RDEPEND="
 	virtual/perl-File-Spec
 	>=dev-perl/JSON-2.0.0
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	dev-libs/libpcre
 	test? ( virtual/perl-Test-Simple )
 "
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/HTML-Template-Pro/Manifest b/dev-perl/HTML-Template-Pro/Manifest
index 8da7f76c9ae5..24edb05b3402 100644
--- a/dev-perl/HTML-Template-Pro/Manifest
+++ b/dev-perl/HTML-Template-Pro/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-Template-Pro-0.9510.tar.gz 171562 BLAKE2B 976e5938a4f9a1079028ecaf7b7aa365eb62b78ce016b654093ba8d2b92788966bb6d3eedf42255163be531af96650b0a6b0d263e7f911a7fbd0dfddd77aa25f SHA512 f2530720487e41e05873f450e8070ee350b1ff0f11c7319e23b6e76c8261844337f97236c4fcb468dc328011e5337e395a64dd48aa352046782cb25c780cc60f
-EBUILD HTML-Template-Pro-0.951.0.ebuild 536 BLAKE2B fc06cf895c113b59ddb140137d8be0638d805d33daa2cc8ae2c622844f2c8d29fdb21995e7b7a1542d2545e9cee18458ddedad40e0f6397c687d90ceac533d42 SHA512 c76d34324c5c853da8cc73df9c668d9b0873f678804d90f59fc38877522c605e6a11315fe240fc12ae86effb8a01dbfb486434314f18827fefc8511cfc9b686d
+EBUILD HTML-Template-Pro-0.951.0-r1.ebuild 509 BLAKE2B 17ea2d99deb324c46a6b9cb4fafdb69b471162ea394bd6a4ce9e1fbd196585bd25b7fe1d01c5ea29b8b99c3cf15fdb322e938e6a3735c76a52f1f0862801bc4f SHA512 9e46d6cf16ac2ce20078382b924b6ba652bec6686b8448c5f1793683a09d5d31aa1bd57e329c4a2ffcd04cb0b32efbe78d80bfda66e5a146cd0fc66b226fbc3f
 MISC metadata.xml 516 BLAKE2B 670ffbc0897bdc71f601c34b90a01ef4ea615d38398a9253cd7623fb698962297f3ee01af8f4a37e8117ae467ac3aa31ee522ebcaed0cf452666bf896f98f028 SHA512 57d2a722e0a540ccb77c89dfe72e10ab9cec620ae9fcfdcc2fc90237bf253755c2f5897ba070f3c9a04eee758e182a141ce0cde2c23913e93099da76c2875ff6
diff --git a/dev-perl/HTML-TokeParser-Simple/HTML-TokeParser-Simple-3.160.0-r1.ebuild b/dev-perl/HTML-TokeParser-Simple/HTML-TokeParser-Simple-3.160.0-r2.ebuild
index ef3b45104cc6..857ebf4db276 100644
--- a/dev-perl/HTML-TokeParser-Simple/HTML-TokeParser-Simple-3.160.0-r1.ebuild
+++ b/dev-perl/HTML-TokeParser-Simple/HTML-TokeParser-Simple-3.160.0-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-MODULE_AUTHOR=OVID
-MODULE_VERSION=3.16
+DIST_AUTHOR=OVID
+DIST_VERSION=3.16
 inherit perl-module
 
 DESCRIPTION="Easy to use HTML::TokeParser interface"
@@ -14,9 +14,8 @@ KEYWORDS="amd64 ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-perl/HTML-Parser-3.25"
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	dev-perl/Module-Build
 	virtual/perl-Test-Simple
-	dev-perl/Sub-Override"
-
-SRC_TEST="do"
+	dev-perl/Sub-Override
+"
diff --git a/dev-perl/HTML-TokeParser-Simple/Manifest b/dev-perl/HTML-TokeParser-Simple/Manifest
index 690a07754a4f..0d8286a71449 100644
--- a/dev-perl/HTML-TokeParser-Simple/Manifest
+++ b/dev-perl/HTML-TokeParser-Simple/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-TokeParser-Simple-3.16.tar.gz 19952 BLAKE2B 216d64ce0f2b5c9c9d7668020fda2f672c172bc1887864327d07ba04a955cbbfa4278680cf25533fc5f3e6ef24efb2be650915cb8a7eec90aac6efd086aa2644 SHA512 d13487cc86af7c7e90aa5b9006b989faedd6a8e06279aaf6a0f13bad613a1672b3fa280bf8f369236033104d3c092e62efa177595cc5e5c74cb966e0b12a205a
-EBUILD HTML-TokeParser-Simple-3.160.0-r1.ebuild 461 BLAKE2B e6adf5afeb7857411c7f48fc29c3f569f9235c67597198f195963942a893e1dfb3fedec8172efe3630e41421dbcce2675686ac572b22372142242477938240bf SHA512 70ceaa16c9a10f7a62f055abbcce88659e6fe387e55538155e1636a0562d0d844d56f49576d2eeaf19df23afcca0b6b6e805ab85478ee11c4fde77319f63139f
+EBUILD HTML-TokeParser-Simple-3.160.0-r2.ebuild 441 BLAKE2B 7cbee97c4c121167c2f89d80580d826d41c62446eef7b335680456b9ba3440005749ab8106d78db6fd121305accb089ef7e8b8e4751e33af6025a29a833c8901 SHA512 4ac44817f2627342517654d645c36817b71622c914a352301793f424876947f9c7a24eb197cc23d6ff33546f2ecc63b962a239f7238406aabc481cefb540c33e
 MISC metadata.xml 1116 BLAKE2B 0e4cdbcc5aabf121392d86cacfd4548634ee119fb573f42e6557cf2e902fc774adb801f87c44d1c1b466d282efcb8a033dcfa1aa7767a7d9bc9150d89e82ead5 SHA512 187ac5a97558d3b40ffd594e344212616b4524961f19f047a15626e0b36ca2305b3172f799902f61cb13c6266f635acea380291b1e0d965fe8e45c1f1af2c5ea
diff --git a/dev-perl/HTML-Tree/HTML-Tree-5.60.0.ebuild b/dev-perl/HTML-Tree/HTML-Tree-5.60.0.ebuild
deleted file mode 100644
index 7773d1903b34..000000000000
--- a/dev-perl/HTML-Tree/HTML-Tree-5.60.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=KENTNL
-DIST_VERSION=5.06
-inherit perl-module
-
-DESCRIPTION="A library to manage HTML-Tree in PERL"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	virtual/perl-Exporter
-	>=dev-perl/HTML-Tagset-3.20.0
-	>=dev-perl/HTML-Parser-3.460.0
-	virtual/perl-Scalar-List-Utils
-"
-#	dev-perl/HTML-Format
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.280.800
-	test? (
-		virtual/perl-Encode
-		dev-perl/Test-Fatal
-		dev-perl/Test-LeakTrace
-		virtual/perl-Test-Simple
-		dev-perl/URI
-	)
-"
diff --git a/dev-perl/HTML-Tree/Manifest b/dev-perl/HTML-Tree/Manifest
index 304afb691824..845b5ff80917 100644
--- a/dev-perl/HTML-Tree/Manifest
+++ b/dev-perl/HTML-Tree/Manifest
@@ -1,5 +1,3 @@
-DIST HTML-Tree-5.06.tar.gz 150067 BLAKE2B d3ff01f25ab7958ecf6b3125439a99a070c2b70c6f786ebd0e8501a77b25a8673b32308855c1d09bac81bb7c901767261c2274d1c4abe41357887d719c4171f2 SHA512 17590504fcb5cc9d68e76a4a63a5ec526b650d8c371777edb0d182599258b928cdae19e676a2815283434ed44605e3e2858db54c305a1fbbb226ce30e580336d
 DIST HTML-Tree-5.07.tar.gz 150477 BLAKE2B ff1cee33e144e8b27b71e26c3fdf4e07b70642533167b8a59feb17729c34c58066f7a5a742de43c879f0101a2adc1302aa84583b536f0e2fa4097f7d240d444e SHA512 a1faaf547d7db323388d5f6b289ab96887de5a80add55aefd380e4b540948514550a86785bdccf0776dfff38085b6bd3e98228f96231264217adcfc2f132c5de
-EBUILD HTML-Tree-5.60.0.ebuild 807 BLAKE2B b7b6fdd2a4df37da9399cc989a9471a6cf736e4b286c29747eaa5ba293fd9345796ba70f9d94acfe3eeae0674581ede426cb99b4141c3bb75dafb1647746afff SHA512 2d6304a1e88beac3a457d4aaf74424af1372d84e36635c011bef679ebbc96c03b35dbd9db47e70250573eaec74b2000d1e2c3e493a00a0cbf537d7351db46008
 EBUILD HTML-Tree-5.70.0.ebuild 821 BLAKE2B 4167dd0065ab28daba13bcb93a8f8d78caf93b3c2e9d05b8a537f4e216ae217dca73e3b323c2f9feef3f0abb4d3ebefdf20970c92a6778aa5089f6da343977e4 SHA512 5e43f2fe2dfac697a4655389a5eeb8e113eb4254c34eaa04f5061e025643144e11295cd35205a72fe44d57b65a12b002385c437a3f736a2c08d67959df921638
 MISC metadata.xml 701 BLAKE2B f1cd74ba7f7340edbcefcb43c9b1b78830b3606f7e81aa579412a18495f89329907b0758c346348ee65b2eeddb17653398d9a31b5f0f8a14548531a2cdda8431 SHA512 94ec1a09f4a5d8940cb65f2fbb540129907dcfa02bf53b57a455c1f0af93d9931f717c71389f60850a89fe10cbb85a7931cf7be7d43ce601ae52e34aff8464e3
diff --git a/dev-perl/HTTP-Body/HTTP-Body-1.220.0.ebuild b/dev-perl/HTTP-Body/HTTP-Body-1.220.0-r1.ebuild
index e79962b2bb12..fa04f9105932 100644
--- a/dev-perl/HTTP-Body/HTTP-Body-1.220.0.ebuild
+++ b/dev-perl/HTTP-Body/HTTP-Body-1.220.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-MODULE_AUTHOR=GETTY
-MODULE_VERSION=1.22
+DIST_AUTHOR=GETTY
+DIST_VERSION=1.22
 inherit perl-module
 
 DESCRIPTION="HTTP Body Parser"
@@ -24,7 +24,7 @@ RDEPEND="
 	dev-perl/HTTP-Message
 	>=virtual/perl-IO-1.140.0
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? (
 		virtual/perl-Encode
@@ -35,11 +35,11 @@ DEPEND="${RDEPEND}
 		>=virtual/perl-Test-Simple-0.860.0
 	)
 "
+
 PERL_RM_FILES=(
 	t/02pod.t
 	t/03podcoverage.t
 	t/04critic.t
 )
-PATCHES=( "${FILESDIR}/${PN}-1.190.0-CVE-2013-4407.patch" )
 
-SRC_TEST=do
+PATCHES=( "${FILESDIR}/${PN}-1.190.0-CVE-2013-4407.patch" )
diff --git a/dev-perl/HTTP-Body/Manifest b/dev-perl/HTTP-Body/Manifest
index 8915f6530b54..8517c3745081 100644
--- a/dev-perl/HTTP-Body/Manifest
+++ b/dev-perl/HTTP-Body/Manifest
@@ -1,4 +1,4 @@
 AUX HTTP-Body-1.190.0-CVE-2013-4407.patch 1288 BLAKE2B 776bf905aae20f57c89b443bd19860d2165d9df9061470dd2e789a4554a9950488127a42dc096a4e22d6866b2219ac7dc6b847c0ec551c947c09c6a1b8651b3f SHA512 9e2988eb26b54588d314c9ea7511dfcb1c4d91cac60fda7db5f3c41ebf72d6b16cb1e3983817d63ea28b413f82489c3e69f332daab0ff049349ec97b4498bfae
 DIST HTTP-Body-1.22.tar.gz 26163 BLAKE2B c6b2cf67fd9964fe253251dd91a67b11563c3cb157ad670733254acb3d44fcede97dcfb84d09ed52bc9f8cc60275838abd8f110aa01aed3bb18400bcc108b255 SHA512 62665989d76699a3c3747d8f4e23d2009488bc229220bcf6fc07fc425e6ac5118f6ea48c75af681c2f29e9ed644d7a7979368cc36df77aca0544786b523c9cfe
-EBUILD HTTP-Body-1.220.0.ebuild 902 BLAKE2B 545a53a0c16f84794f5ab966560880b2b4ae0a3a1c00060a370f22701fc716f6bee597b110f16b788c8a5ce4e7a3131e347b194edba1ca0639126c251f6c4f0b SHA512 9af33c5b2e1a6312f5f703c91536030805ba816ce5a8df8d07b7762c48ba5316dfc62bf41cae867eec8a77a3fe09a6891d55f241f5b6b43790bd7bdc47d6cc06
+EBUILD HTTP-Body-1.220.0-r1.ebuild 888 BLAKE2B 7f5afd7a530621d035629e401febab336f2634837b9df6075243311ee54d719efb8d681b876c9542e2da70ea866ef24091b0c6e5f66a243686b3e7050f891dcb SHA512 83491a717dfcb4ddd466cc1ca2df48e22c586d47eeb66b25b30b05db0f46987113a3412301383066a94d81cc557cb98a996050bf3f6764a86808984ae7f1aa1e
 MISC metadata.xml 736 BLAKE2B c5cc316719b0ae7cc9705f52b543df8f15a7e9518ec950d525ed38acfaed9becacebfaa3bc3e011fcec6a1a06792a8bcde56d24f1e922b03f35d714d6f94154f SHA512 3bc205adb892305068cfd7fd3c78ab4cf65628155277dc64951b07352ccf70c43ed22454ff3ea722f90e212306886d7ae3c89d12a3ae9e8e14f35d9674533450
diff --git a/dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-3.310.0.ebuild b/dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-3.310.0.ebuild
new file mode 100644
index 000000000000..c689d11f9587
--- /dev/null
+++ b/dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-3.310.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=OALDERS
+DIST_VERSION=3.31
+inherit perl-module
+
+DESCRIPTION="Determine Web browser, version, and platform from an HTTP user agent string"
+
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-JSON-PP
+		dev-perl/Path-Tiny
+		dev-perl/Test-FailWarnings
+		virtual/perl-Test-Simple
+		dev-perl/Test-Most
+		dev-perl/Test-NoWarnings
+		dev-perl/Hash-Merge
+	)
+"
+
+src_test() {
+	perl_rm_files t/release-*.t
+	perl-module_src_test
+}
diff --git a/dev-perl/HTTP-BrowserDetect/Manifest b/dev-perl/HTTP-BrowserDetect/Manifest
index 1f4be370f1e0..eae1d973fce5 100644
--- a/dev-perl/HTTP-BrowserDetect/Manifest
+++ b/dev-perl/HTTP-BrowserDetect/Manifest
@@ -1,3 +1,5 @@
 DIST HTTP-BrowserDetect-3.14.tar.gz 95445 BLAKE2B 08a90c6e1154f7a7e1c55af2c056e67ba906d187f3ac8b4e82f1039446462ea9a60f1f875e5f26a2229275436c0deb5acbf090f893aef51f7971ae8e0e547c62 SHA512 cf05af60dbda462df81a9d38d5738826b820534c5fde52f41a290f6d3253783154a2e460042117be32e86dd95f7f1e0e6055b4ca549cb7972cd3c156200c09df
+DIST HTTP-BrowserDetect-3.31.tar.gz 121365 BLAKE2B 454f702905b269cf579bf6d192542cb8e4d63430b7107c78b505db65973c759f79f78053cc45e14b8f7c152f4c53fd18b728f04c0a5d8e86393b1c2bcc4c6b9f SHA512 9ea830b244be7b5d0707118f27a212c520a2117679fab75192881c04d244cc50ae71ee6de2d2be7c456c2a0d5f2bfd0c9bf473893a86ba5b13db89a7d4943e8b
 EBUILD HTTP-BrowserDetect-3.140.0.ebuild 663 BLAKE2B c1ffd7489a32e5da4a38c96b23d4b34cc961e91ef95f15cde0b60b9cd5fe9c443504f35fcda68ab6d87e68aed45065b32e6c1fbc26c19bbbcb18e30dbb2cbd0f SHA512 da3c8f4e87a24d965888dac27736f940b6b85ca72e0fcc1993169c9957b38ec9fe4081109148470b433cdf76998fd98c91949ad3aec9726e42e0942d425d4b9b
+EBUILD HTTP-BrowserDetect-3.310.0.ebuild 661 BLAKE2B 3c5eafe0f3b80328ad23a89109f34b04e80a3ad5c1efef2a13e128324d64c683f0ef9ae4e6a9a327b8e70278d99323d3a869b58aeb16314cf907b19fd58402ca SHA512 aa45945efb7af186ce31be360739424eb2b4ca8ddb72f2c9f833ec139f10ad5bc7d875231b42cb5ec3741f927177cbf0f45b4eedff87f586313c4387b50f0691
 MISC metadata.xml 408 BLAKE2B eb4647a1dce96723b6208274e3bf32a802fe2965b76b3784a4e1bb414ceedc64b78249d07c347ade36d5ab0c6d3701b26e7430be293b55839e59d10f56556a12 SHA512 39a7d6f17021b4ae4005592694496a84f8320f8d8afd4ba5404d5ccf6ae57e8541443358b109fc703bd22befb2da051cdfd3c1da899ac3b7d9da75940af68900
diff --git a/dev-perl/HTTP-CookieJar/HTTP-CookieJar-0.10.0.ebuild b/dev-perl/HTTP-CookieJar/HTTP-CookieJar-0.10.0.ebuild
new file mode 100644
index 000000000000..99be876a9552
--- /dev/null
+++ b/dev-perl/HTTP-CookieJar/HTTP-CookieJar-0.10.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=DAGOLDEN
+DIST_VERSION=0.010
+inherit perl-module
+
+DESCRIPTION="A minimalist HTTP user agent cookie jar"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test minimal"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!minimal? ( dev-perl/Mozilla-PublicSuffix )
+	virtual/perl-Carp
+	dev-perl/HTTP-Date
+	>=virtual/perl-Time-Local-1.190.100
+	virtual/perl-parent
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.170.0
+	test? (
+		!minimal? (
+			>=virtual/perl-CPAN-Meta-2.120.900
+			dev-perl/HTTP-Message
+
+		)
+		virtual/perl-File-Spec
+		dev-perl/Test-Deep
+		dev-perl/Test-Requires
+		>=virtual/perl-Test-Simple-0.960.0
+		dev-perl/URI
+	)
+"
+
+# https://github.com/dagolden/HTTP-CookieJar/issues/11
+PERL_RM_FILES=( t/examples.t )
diff --git a/dev-perl/HTTP-CookieJar/Manifest b/dev-perl/HTTP-CookieJar/Manifest
index b5e3f7bbd512..9164df873ad1 100644
--- a/dev-perl/HTTP-CookieJar/Manifest
+++ b/dev-perl/HTTP-CookieJar/Manifest
@@ -1,3 +1,5 @@
 DIST HTTP-CookieJar-0.008.tar.gz 28754 BLAKE2B 7e0b55506cb6c48fa8eb608224e7848c150addf64a39fa8c6abca5396152695b835cc872efff862e6045ca246bb2a9fb2a23830711d8c5d349de1a340546e4c1 SHA512 6e85c22084ba2959b385f4cd706b2b937fcdb68f219ee03ccdd69dd2a01ff34b72bf7f442e414e3da43199fc43624b781af0c7599f856dc580a5d0a7742c6aff
+DIST HTTP-CookieJar-0.010.tar.gz 27883 BLAKE2B 3f0bf8fcff066955d1350a420a02fb8388238addc9877fee36e6073d04d4382cb34889b0fc851c13da10c020647be64248399fd35309c0346f6995178b651c19 SHA512 5e7d6222b9128441c506f1554de327af9695cb07bb6db9a772386752a6815b7e8ff1d02185429f9cd25a11085860867d42f6e209175c68cbeb9daa6547d83eac
+EBUILD HTTP-CookieJar-0.10.0.ebuild 831 BLAKE2B 4a73ade9a0b0958ddebe1ee53d2fb9e9364e9e06fce0774d3e6002aa6dbaaf8bf9758edb9b379eb2a45739fb4013dcd8f40264f48ff193edd17345252ccd45cf SHA512 76e289cf04766ce28a48185f93eb3622f128ea1daa23f66559debc679c292e314882ff7ff8ad6a98c34643f55a5eabaab28b55bf063a3f296d1daa93018442e0
 EBUILD HTTP-CookieJar-0.8.0.ebuild 743 BLAKE2B 65a7fe8c6a74580a39fb4007dd5564c57c58c1c6319494a062aab6a63865cbe2078e992f77be6888ace886297e2df71701414d56972dc5688f158c6c57c1a613 SHA512 39c3b9b6d380f9820c1974f925b55819c2ca6767b9fa64a8dc7d2a31db6bdc44d7136ff7352db2e7cb8e3b8e27e57e310430798d4827f9efdf22847416c42aeb
 MISC metadata.xml 467 BLAKE2B eafe14012e597907e6840c492181e1313eb43fe128cddba34ecfc29f4bcf9dfb589bb62675fe27e3383db0dea7cced98cdbd8cfbe6ed7c2ff5b33fd386dbf883 SHA512 73bf0b14bd1f4eb0492dadf17878242af046c10cad9bc304814fdd1163cf3c341262ebbd60e212344efd77f12a9e993e0058704c4bf3459a2a4c7553d4cbc66d
diff --git a/dev-perl/Hash-FieldHash/Hash-FieldHash-0.150.0-r1.ebuild b/dev-perl/Hash-FieldHash/Hash-FieldHash-0.150.0-r1.ebuild
index 4255ab7a48f6..6d4de64ae89a 100644
--- a/dev-perl/Hash-FieldHash/Hash-FieldHash-0.150.0-r1.ebuild
+++ b/dev-perl/Hash-FieldHash/Hash-FieldHash-0.150.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="Lightweight field hash for inside-out objects"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Hash-FieldHash/Hash-FieldHash-0.150.0.ebuild b/dev-perl/Hash-FieldHash/Hash-FieldHash-0.150.0.ebuild
deleted file mode 100644
index cd527deb5be7..000000000000
--- a/dev-perl/Hash-FieldHash/Hash-FieldHash-0.150.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=GFUJI
-DIST_VERSION=0.15
-DIST_EXAMPLES=( "example/*" "benchmark" )
-inherit perl-module
-
-DESCRIPTION="Lightweight field hash for inside-out objects"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=virtual/perl-XSLoader-0.20.0
-	>=virtual/perl-parent-0.221.0
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-Devel-PPPort-3.190.0
-	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
-	>=virtual/perl-ExtUtils-ParseXS-2.210.0
-	>=dev-perl/Module-Build-0.400.500
-	test? (
-		>=dev-perl/Test-LeakTrace-0.70.0
-		>=virtual/perl-Test-Simple-0.620.0
-	)
-"
-
-src_prepare() {
-	# https://github.com/gfx/p5-Hash-FieldHash/issues/4
-	sed -i -e 's/use builder::MyBuilder;/use lib q[.]; use builder::MyBuilder;/' Build.PL \
-		|| die "Can't patch Build.PL for 5.26 dot-in-inc"
-
-	perl-module_src_prepare
-}
diff --git a/dev-perl/Hash-FieldHash/Manifest b/dev-perl/Hash-FieldHash/Manifest
index 399adda94555..dd5db2bd8cdd 100644
--- a/dev-perl/Hash-FieldHash/Manifest
+++ b/dev-perl/Hash-FieldHash/Manifest
@@ -1,5 +1,4 @@
 AUX Hash-FieldHash-0.15-no-dot-inc.patch 570 BLAKE2B 8ec8f96dc5e4dba0ecec50c6eefbbb11e884f06f0ca91c9da8b569a60473fa3a0d8edbd751bbdf64bcaa8b9d5987c309de94abfdaab513a9db90852afe57cb5b SHA512 d030f593a80a57883672609daced83d2e3f3aa97b76972159ad6078db16dcbb435a7fc2436e2cf3dc169c0941975c0587d89f053d2793fa4ffef3704ab03772f
 DIST Hash-FieldHash-0.15.tar.gz 29082 BLAKE2B 5b8426f3d44e1ba0d10bc24e473b8162189ddad3b378f0863903eae844fe26cff378c73602c4b49085bd0c9e42d5549013111182bd5a09c4f14e523b1c6c7254 SHA512 2f42b0e7efdba03b99c9646882afc47130de1989777eb1ceaf8031769a3a11ebdaa841abedea8288b770aa27c44108846d0765f531a35d707e44a8c1f0f8036e
-EBUILD Hash-FieldHash-0.150.0-r1.ebuild 1108 BLAKE2B 0689e86189081d4c7b1c0cb6d7a07105d1aaee7d3b3ba2ad10bf4bbe31015eb8a29644779452694e75987f5a7a1cf4958463e64cc819b8d402bf9650d52d368c SHA512 ce549d65981950be3c5ce2c5226f36daf33ff5742c2a0ce4e167e2223ae2f4c8053bd22069ad7c4f5c878ebac82a64e23628739caa9af4ebe34e7e67b0003642
-EBUILD Hash-FieldHash-0.150.0.ebuild 1031 BLAKE2B fcd2fc42e73b121f6bdae5300db1e9e08d42300699832750bd833373fcc425eba16b10f802c501a17ec449572cbc07aa3ac56108c431dec3bdb8712549da22e5 SHA512 ad4107105104c5bd8fd809519d1a99ff209e4f58fe04f9d713c760bb0c2a559f9383993da05770634f21342dc08d21474723f23d7c2842d15586c6dbb718e997
+EBUILD Hash-FieldHash-0.150.0-r1.ebuild 1105 BLAKE2B a06f2737e01978d7a581a0b69362511423deef6b949af197fad7a269c92bbe04db2413c625498d42caf1e2a14e2b5d57c8345f57bacd102bfa41210b81b62d60 SHA512 e14c5bbd0e977bb240ef8660b0424742ce6fa46a0eaa2a6909151ffe8829fe4622d84b31013bf47fb58a36e1790827f9dbdfb5a4af00252ff85f05abbce792b8
 MISC metadata.xml 400 BLAKE2B 5a93cc38f97d3203f7e32191e8ebc7fc30aaa92272fec85e579f1ed857cba352463ebb8b8d3677c13e4bd592d7fd1776ba5d56e9cf4c0e82604a1eb9d9cbc871 SHA512 01f782c54b4bf4e453848b4e30f21cd4cd08da3ed15bc0f94f52018e5a958c52e2c47d0f845f2719cf79e38678e9966a45859d3b6cf6f80edee1081ea369d30c
diff --git a/dev-perl/Hash-Merge/Hash-Merge-0.302.0.ebuild b/dev-perl/Hash-Merge/Hash-Merge-0.302.0.ebuild
new file mode 100644
index 000000000000..c33bbcc4bf64
--- /dev/null
+++ b/dev-perl/Hash-Merge/Hash-Merge-0.302.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=HERMES
+DIST_VERSION=0.302
+inherit perl-module
+
+DESCRIPTION="Merges arbitrarily deep hashes into a single hash"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-perl/Clone-Choose-0.8.0
+	virtual/perl-Scalar-List-Utils
+"
+BDEPEND="${RDEPEND}
+	test? (
+		>=virtual/perl-Test-Simple-0.900.0
+		>=dev-perl/Clone-0.100.0
+		dev-perl/Clone-PP
+		virtual/perl-Storable
+	)
+"
diff --git a/dev-perl/Hash-Merge/Manifest b/dev-perl/Hash-Merge/Manifest
index 49f193a5a681..195720fdc2de 100644
--- a/dev-perl/Hash-Merge/Manifest
+++ b/dev-perl/Hash-Merge/Manifest
@@ -1,3 +1,5 @@
 DIST Hash-Merge-0.200.tar.gz 10339 BLAKE2B fd9107148f815c3eb86fc4fffd75eaf1a939e5cfea79f00e373e5f03985cb654ae7c8a9d5cde74bf7fd6bf5866995c9c62c2724b01fd0dcc9e73891efbd18524 SHA512 b04f5229f70630d5a1552dcff83743d4c053bfd8b7b294fb03b21f2e7c12b6540a39e6c93fe016960686e1e9107dc0507d15406247da827fb608bc273e53eeec
+DIST Hash-Merge-0.302.tar.gz 14151 BLAKE2B 04dc202b8ca48cfbd3446f2b1172cd5b5f39b4d19afdda5c2793a1c028a1501bf861aebdf51537b23c4644530c31a0e74fe4f10ba5ebff7d952df38a8cd11df7 SHA512 ac07e1154541b5d9a7fc2f126927a7d86d49ebb2ec4f5439c4f21178d0986d78f2f8f17ab5e6b692cfe8dec63a5c36afbe07b16492a983e13b33247c0789bc47
 EBUILD Hash-Merge-0.200.0.ebuild 367 BLAKE2B 37c6ec8caf4041b5db6e9d78dc395af6ca2e1fcfa3c94616cdd8bbf24eefe64e588bf40b3b4a64d61b4bd842fd789f68cadf3aa589f7b19d542bff37a7d35f72 SHA512 9cbac5a96185c6bbbfd9acec8c9cf6d9e4659a9d55fc1086cffb8f3002c7386f82716ad3be5d82f0c2e197a30f5b6fa94f50dbcd24737abe7f398bc9f5674921
+EBUILD Hash-Merge-0.302.0.ebuild 521 BLAKE2B 0a7d9c0873793f5b6dd7cf57a941b0ca7b8e004ca4d30fdcf785b6adbafd66ace96cd8401e7bbf7c10256c23879cf084572f5e7af58dee4cd7c23526776e8257 SHA512 b57767ae21a5dc39c703ef693062213737f2a9ec9d75f4066362065d1f362c2b8f55e03696245bef99c658170aec8d437bdd1e74165e12151451d1a3ee4addae
 MISC metadata.xml 392 BLAKE2B 2ef942afae800b73aaf0c86100b5f377a476cbe3f463a7aea1222fa9595fa637621d60239a05d17d39313e2e1070bdf7fd3df4e036e66d8de2fe194b08713fad SHA512 9dd968dc56b4203ba2aa012e0d5743341c60f5c837552369ae657ce4eff9fea485db7bc5410c2d4b61eb9ddfb060e05665281dbc1bfe43e3a2d4ddc34ff3bbc9
diff --git a/dev-perl/Hash-MoreUtils/Hash-MoreUtils-0.60.0.ebuild b/dev-perl/Hash-MoreUtils/Hash-MoreUtils-0.60.0.ebuild
new file mode 100644
index 000000000000..aa4a6d507731
--- /dev/null
+++ b/dev-perl/Hash-MoreUtils/Hash-MoreUtils-0.60.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=REHSACK
+DIST_VERSION=0.06
+
+inherit perl-module
+
+DESCRIPTION="Provide the stuff missing in Hash::Util"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+BDEPEND="${RDEPEND}
+	test? ( >=virtual/perl-Test-Simple-0.900.0 )
+"
diff --git a/dev-perl/Hash-MoreUtils/Manifest b/dev-perl/Hash-MoreUtils/Manifest
index d32af3c3ac2c..5424363e2152 100644
--- a/dev-perl/Hash-MoreUtils/Manifest
+++ b/dev-perl/Hash-MoreUtils/Manifest
@@ -1,3 +1,5 @@
 DIST Hash-MoreUtils-0.05.tar.gz 5809 BLAKE2B d8b5c6aa531556d0f17b8debc2fd82ff8115e3a70cc3618e14ea1df9bf025e8474263307b1fda193d38e47241c7f5da64d1ff4671940d4518bdda95c09872ecc SHA512 7e53dfda0336198b5981be772a0aeb3aa1fdbfa5885bf866032bcd168a73ceb03f92db6de92874d5812f062ab9c03e1fed27732f60a7004944da568c3cb04845
+DIST Hash-MoreUtils-0.06.tar.gz 9208 BLAKE2B f3138710a68ff6db682b8e2b15729b37729b10656c53cb20d7f770fb0a0824d331c934159cf7acfcd2e9bf79d60acdc117bf727eb311f33c596d686ff12bc5f7 SHA512 a824e6132a25f265308691c6bfa077ad78e7db079a9292c3e2d728675b6b60d9b162d2d1ca965c6295f62616bed4d9b9c177c0eacc5f4f8afbd112bc1f3aa6c9
 EBUILD Hash-MoreUtils-0.50.0.ebuild 409 BLAKE2B 4957561c077dc18f03708546585d5a7adbae4e80f747ae610b6c57d0d147e54fdb10d1779d23c87eab03c92fd0ffc610efe06b9c50ea3fccc8bbf1d5d82f3c98 SHA512 b83645aab89b5b5e5d6927ead0746fc69de3a52308a0de3e017cffacd27a98fe6e961db2336eab11c54962774d032c92182fdbd89076079761f3c0751bffc4ee
+EBUILD Hash-MoreUtils-0.60.0.ebuild 379 BLAKE2B b8414a03187989df936086abfa375bc3fad958f1e3b4860875f025437c785a78240ae79659697b2e3df9f53f94c3b91894e84e07646ace36cc8945a687e7426c SHA512 8764a0bcf6cf3ddd6637dee866ec290c13333353b1c49635841bdb7fb455cbbe3f8232ff3162b194446180ab14052a069b90e18f5834445ed960ab32e066b0d0
 MISC metadata.xml 400 BLAKE2B 379ba270c0191ff4a9a66a63b017e10abdec8205d79fe63f598050048c65c520be08263b06dea6e33330946587c376630250198d8132baef3ad3a2fa3fc22d50 SHA512 ed21f6b972e97e066a599650cd29de4975c8626590c4ee66f5374440e498b1a3e905153e4bba09fde9c9a0d33599ebb28deac23f0bf4a7416ab65f383ee6acf4
diff --git a/dev-perl/Hash-MultiValue/Hash-MultiValue-0.160.0.ebuild b/dev-perl/Hash-MultiValue/Hash-MultiValue-0.160.0-r1.ebuild
index 4b3e2adc069a..a9e3ea6d6eac 100644
--- a/dev-perl/Hash-MultiValue/Hash-MultiValue-0.160.0.ebuild
+++ b/dev-perl/Hash-MultiValue/Hash-MultiValue-0.160.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-MODULE_AUTHOR=ARISTOTLE
-MODULE_VERSION=0.16
+DIST_AUTHOR=ARISTOTLE
+DIST_VERSION=0.16
 inherit perl-module
 
 DESCRIPTION="Store multiple values per key"
@@ -15,9 +15,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND=""
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? ( virtual/perl-Test-Simple )
 "
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/Hash-MultiValue/Manifest b/dev-perl/Hash-MultiValue/Manifest
index c59a68826b37..846e50f9b7f0 100644
--- a/dev-perl/Hash-MultiValue/Manifest
+++ b/dev-perl/Hash-MultiValue/Manifest
@@ -1,3 +1,3 @@
 DIST Hash-MultiValue-0.16.tar.gz 19841 BLAKE2B c1801d91d54e7b8d89f70ac14d8bc49321788bd7a17fa03dbb141a1b536ca20086b360b9339da30c3ecb1586282c53002a8cca48de5c1be9364638dd66d3634c SHA512 a6e1cab00ff24492bc84343b83a1282ad0eaded6633e7c511389dfb1d21cd8987dc2f1ad9ab69df69f36b651d68c70df3160666ff9ee584dbb1b6ab7095b78ac
-EBUILD Hash-MultiValue-0.160.0.ebuild 447 BLAKE2B 2e57063ba911f8c41757b4b57b46cab03bbf3d9b815a82a205c57fa8e2aa0684da96f5185e1aeb0827a534cc5ad8296eacf0e2c751c61b5bcab4db42c040c673 SHA512 bc0b87f09e1f70ad0d48ccddd08df845bc2843c8dcb81835bfe3aaa3b03711c01a73642b1937a207399b184dc8c364344bb3a6f7b873b68941e31b423924c163
+EBUILD Hash-MultiValue-0.160.0-r1.ebuild 420 BLAKE2B 535f40d722455a030edc0444148c1d10a7cffa821fb9087418ae301d7c37bcfa91e93de8c4cba5ba4347258768840fac7fe7d069590dc3cfbf547a340a38b1fc SHA512 0490e4d5d60704063b5ef4ea587f83ffb0c529adba96eab50e13bc9ea12421b8308172062435e4b6d5d34c70935527e0c70fb009441528f61772b4908f61504a
 MISC metadata.xml 402 BLAKE2B dc57b2c0857efbb94c6836db54255e29744fa77ecb1b8d345ad0b34b71c9980855639d46291e06dc3c8fe9a6edeea9b685443a04da13f1188e94fb6c9804b727 SHA512 8dca30c14f2b3a90df2fffd7c29014ff032f0c5e7b744c0b0282579c2c22b89d646637c58b78171e0567152685c49886aa01c63e332328cb1aa67111dbc31225
diff --git a/dev-perl/IO-Interactive/IO-Interactive-1.22.0.ebuild b/dev-perl/IO-Interactive/IO-Interactive-1.22.0.ebuild
index 3acb6f7352a1..30537a8f237f 100644
--- a/dev-perl/IO-Interactive/IO-Interactive-1.22.0.ebuild
+++ b/dev-perl/IO-Interactive/IO-Interactive-1.22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Utilities for interactive I/O"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~riscv x86"
+KEYWORDS="amd64 ppc ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/IO-Interactive/Manifest b/dev-perl/IO-Interactive/Manifest
index a9d0b10da583..8205e68f9ae0 100644
--- a/dev-perl/IO-Interactive/Manifest
+++ b/dev-perl/IO-Interactive/Manifest
@@ -1,3 +1,3 @@
 DIST IO-Interactive-1.022.tar.gz 11791 BLAKE2B c001a709531a48d4f4756712caab14ec8b9f2f21478f545fd4f858b3619fc625d75ff9bf744e4c3223a4b9ba39f2b97bb0e38b9eab8297d7d76e5aa0d88b7647 SHA512 159bd97912a848e20df3ac9f3f7b3063788c7bbe2eafd35c6cc9b798027c6e7c12d2488385936c87669877928707603729bc34b2d7b8c108534fa8fd42082074
-EBUILD IO-Interactive-1.22.0.ebuild 557 BLAKE2B 5ea9e0d7494c05881284b320e654317677a6480b668b7f778dd1d832453ac677134f94d84760894a9a82780233627484523c3f17efbba0a2fed06e3807777f4d SHA512 378ecd17c1033ddc661ab9b826428caf0302910260414f577c638558b7f2784ae6def18007f68c378208dbc91ec583fd87d407a840cee55244d67a36c26eaaed
+EBUILD IO-Interactive-1.22.0.ebuild 556 BLAKE2B 12287b73f38528bb427b3649c8d3e03b71b512e7482c57ead80bd432bc57e5a83330d188f0466f8cdc49dd8fb2ab51fa706a5d1f8895662877c32429215ca50d SHA512 32272d0ca33dacd21063bd4689e26409a747f4e1ff643d2a7611d4faa7f4f73c13befe5f999868a8546332dca32c69e4eeff08fc6d1603816327f1d5d87685c4
 MISC metadata.xml 388 BLAKE2B dc1672a835764e0e69828043196dfa51abde9432114a289c88e38985b112a03e36fe86b6076b8c21ce5799138035326870c166b9eafd382131c422d1014dd4df SHA512 c3bb9b7804e6dd2c6e958f8e0744959a28cdc632068b7e1d9e039602fc0f98a4397457500c3d90abd4522b482b66d758f6e569640d41235a9b16f43fd73c8dfb
diff --git a/dev-perl/IO-String/IO-String-1.80.0-r1.ebuild b/dev-perl/IO-String/IO-String-1.80.0-r1.ebuild
index 53b86616d5ef..72c5eb9e6ff0 100644
--- a/dev-perl/IO-String/IO-String-1.80.0-r1.ebuild
+++ b/dev-perl/IO-String/IO-String-1.80.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="IO::File interface for in-core strings"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/IO-String/Manifest b/dev-perl/IO-String/Manifest
index a8f180817229..3b003f7ee372 100644
--- a/dev-perl/IO-String/Manifest
+++ b/dev-perl/IO-String/Manifest
@@ -1,3 +1,3 @@
 DIST IO-String-1.08.tar.gz 7480 BLAKE2B c2634f6ef60895d6bd924958943b48151b7f3362e708adbd7d2856f2a22c9a6172bb632a2f0d085162dc58fd526d1e69fdc4cd81917e99cb045402ea91158ca5 SHA512 0aae1711a2bad2a239d90ca7ceb685938e509dbefb05d6c6717796a04ce1956006f67a7a203eaa9d9718b77b5cea9b7d493091b88d9542068f0829aae3a37376
-EBUILD IO-String-1.80.0-r1.ebuild 446 BLAKE2B 80b014ef64f5b64b98a1fa469196ea604f89deba39f4da9a7181ecfefe1e7cd6836758f5c759e11dba4524f45e2d7066b18bbbb27865e0f31dab9ad1d68c5468 SHA512 c65f244348d8dbd2cf237504a0a35f866a83d7737fb779a4792cc238f8dcdc04e3bcbd63f0697a9b63d94731d295bd1b62901b611286508d21fe9a69e5fc22f9
+EBUILD IO-String-1.80.0-r1.ebuild 453 BLAKE2B 33bb00b955db9646719ccb0a19574818f294629c3accd13cd77f8b35ab298dcc10a12dac8de00e4e449dcff18e2d302bfe0ceb5ee83f4206946d5c09efeb94a1 SHA512 2bb10367b072d76158e009a598a6f672214f0e310fa0ecd21a64bdb56410488be6b22c1ecf8a8607a4e30b21904640f8d83d7b342810ababc982eb1822fa9a8a
 MISC metadata.xml 390 BLAKE2B 070073fce48f135d78c6088e33c5ac8ed6076dafb1e5c21deedd439d0517857e8896d61e4c47201e1646f46b06f6cdfcfa0da6824c2d460987bfafa82fc6a58f SHA512 2c497005fa0cbc1a0e1318fd960be34af7e1be5dc07ac31da5d4fcf434721e2e1f71e136b6a404235f4e79a3255bf533ce945528b5d613a02cb8cca0500cbc43
diff --git a/dev-perl/Inline-Python/Inline-Python-0.560.0-r1.ebuild b/dev-perl/Inline-Python/Inline-Python-0.560.0-r1.ebuild
index 852d12601a41..13f4bff80381 100644
--- a/dev-perl/Inline-Python/Inline-Python-0.560.0-r1.ebuild
+++ b/dev-perl/Inline-Python/Inline-Python-0.560.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 python3_8 )
+PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
 # Feel free to add more targets after testing.
 
 DIST_AUTHOR=NINE
diff --git a/dev-perl/Inline-Python/Manifest b/dev-perl/Inline-Python/Manifest
index 232854ebc660..b3702a1614d4 100644
--- a/dev-perl/Inline-Python/Manifest
+++ b/dev-perl/Inline-Python/Manifest
@@ -1,4 +1,4 @@
 AUX Inline-Python-0.460.0-insanepython.patch 652 BLAKE2B 86734b5c86d7cb5affabb76f950ae6086581a0c5d1eda278cdd27047a49a57b3f2ce1a520e745b040179c945ba2f2cd7dc896e9a321702a05c7d935782196dd2 SHA512 f9fc8e8a287801f331ac92bdbd80f665648f9fee8dc43383fe563c6ca8e0aa4d01e06b09a25408b7908e5394cb4bf496e76441c6ee5dbf0fdb7c65dc4222bac1
 DIST Inline-Python-0.56.tar.gz 58224 BLAKE2B e422c46cfaaaf77a0a683ccf2818db62e5f2c726b9ede71f446bd2bb4fe66ba8ab8d99b30ce26168bf47cc23f06afc5b9839a403cd6b52781aa288a29cbedea3 SHA512 d5fffec8a377ec10c8b21ed9324e2de5a77d10304fc2a89196df89984e55869e3e4e0ef970f1aa4651068b8a6d834fa8eb18d70a052c646ddd98ef338f772e7d
-EBUILD Inline-Python-0.560.0-r1.ebuild 849 BLAKE2B 4ef62f31490b6e1ab35b32bbf1be96e2aaf32074573990b954501a78cfe75be20c10c424537ffb959014df172cecb9beecd5a022c6643cd474ca56f44c52312d SHA512 37d613fe5777af78806fefc361c4d507a2e3ca7cd5157d7b0c93836dc605f2c328b4948f666dd3a5504f8c5d85efe210c6ee026661af6578a666709806b4ebb4
+EBUILD Inline-Python-0.560.0-r1.ebuild 859 BLAKE2B 0c7c4de6215b0458055a9e8fa688df9bc8639a3c2bca755c85f70b946bd61c732de513f11ce387d8e1181b9d500f94121e33f3cd39d2f0b950b505630a5e67d2 SHA512 421441a9d5884998d6afcfc46d76e55045a1d46b9dd30bd9047d167a5c2f3ac1ec67084420f6cd1eb6b806f769dead3f245ed0a3165e1f31af84fdd38dc8e796
 MISC metadata.xml 683 BLAKE2B 07299e0bfb8310004e589f3255875189c1ac2d8caebee63fb5229aa8acb83968215c8d80bf8ed89ecbb01d7672d6100795133b580536fc8490c00e89240d0812 SHA512 03b3a3f8697b678e054251de5bea03f3344c063b1ae93e6f674e30375062ac9d125af3c428d4f0869d333ded2831617af14b7908ba55c01638534970329ea17d
diff --git a/dev-perl/JSON-Parse/JSON-Parse-0.550.0.ebuild b/dev-perl/JSON-Parse/JSON-Parse-0.550.0.ebuild
index ecc535febf7d..d0617ec62233 100644
--- a/dev-perl/JSON-Parse/JSON-Parse-0.550.0.ebuild
+++ b/dev-perl/JSON-Parse/JSON-Parse-0.550.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="Read JSON into a Perl Variable"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/JSON-Parse/Manifest b/dev-perl/JSON-Parse/Manifest
index b8ae24986f0d..d33e49020413 100644
--- a/dev-perl/JSON-Parse/Manifest
+++ b/dev-perl/JSON-Parse/Manifest
@@ -1,3 +1,3 @@
 DIST JSON-Parse-0.55.tar.gz 77591 BLAKE2B 76389224c1993973a6b8ee60fa5e1c0bc032f5a370831193d4c54e0bc7b443155cf3b8dc9034d51c8683ec5da65ae5c3c090e1664c4ac0a7f08b95cbd94c2249 SHA512 adb4bbf61e7aa73098bbfb03c1b3eaac6f56905cb05b7baa3a3a9047f47a24ba9dadd0dc7fd34aeaeca2a393bc577c3b85345c5ca740d2e9553c0554c39bd36c
-EBUILD JSON-Parse-0.550.0.ebuild 483 BLAKE2B 609fcf3aed6c0ffb8978e58662f008e870dfeb24bf3ccd46d5b78764b3e09ab6143c8d8b4dae663b86834bd6e319aab26d4dc6a4d95c1b0a080fd4709693b351 SHA512 7b056b0afef510661beab4fac058e808e618bd60d3476b22d7223a4a272e32d23ae75e98ff515f43cf73fbd504039a78ee42e333feb458ffa6fc041965a668c3
+EBUILD JSON-Parse-0.550.0.ebuild 480 BLAKE2B acf394e781728bfc765431fa442000249d22c01a8a1239fed74005b8d8b32a2d69b857e80cc4317d91f30ba37ad57255e03e5960cd2f94947f82704745d2df5b SHA512 63a8fcf62b58f7861381e6a8349053c50b92bb7b2c7e068c8d648bff73001733febee60c7473cbb22beb30cc179527702d9203bc677c6538180b1fd4770eedf4
 MISC metadata.xml 453 BLAKE2B 44f97a2e244ad56df26f1ea7b47dc199622647338fa91865b99afaffb67fd502c34ab26bfcc4f9d24ada378553e3f80e0c8557b3d316b7b69a14e43af0c339fe SHA512 d1e4b31d3245b4e2a0f478c38121f50d30f06960679c7b5b2261303f346c9d45667696c9d415fdba826407e6d596d7d63d4a65a4b9bc863f0bda3b1275b4a22f
diff --git a/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.428.0.ebuild b/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.428.0.ebuild
index 2987b546b493..186ee28b463c 100644
--- a/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.428.0.ebuild
+++ b/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.428.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Compiled List::MoreUtils functions"
 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"
+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="test"
 RESTRICT="!test? ( test )"
 # See XS.pm/LICENSE
diff --git a/dev-perl/List-MoreUtils-XS/Manifest b/dev-perl/List-MoreUtils-XS/Manifest
index c13b37cc8970..498a894eb323 100644
--- a/dev-perl/List-MoreUtils-XS/Manifest
+++ b/dev-perl/List-MoreUtils-XS/Manifest
@@ -3,5 +3,5 @@ DIST List-MoreUtils-XS-0.426.tar.gz 159015 BLAKE2B 4317affaaf3325493ac4896fef653
 DIST List-MoreUtils-XS-0.428.tar.gz 159642 BLAKE2B e3f41c4baf14ba54bce0424e818baa603f11804e83e96a9afd61b0f80d3c207f0a45cec8ff61059b70a79abc631d0e074c6654ce6d99e4ad834b40ded21aacb2 SHA512 a608568e3c4a2e160e4f9afa26640be5b97ec83e301a6b81849e37951698b9423c0a969d7e8797a49b4fb6c5123780630a3726c64713922b90b21b947682c3dd
 EBUILD List-MoreUtils-XS-0.418.0.ebuild 801 BLAKE2B 7cbc060eb8a463bc4dd4d7cf2d3d0fc3cc2e5c834d121d95da844ee150ab270cbf39c53881211384504ecaa2eb4dab46bf86c9382326b0141fb10a64aa4fe890 SHA512 81dc69d00852822e81fd096cd615be37bbc668dfe4718df6ec00a91a0d4e27b9b3d8913e9baa25b27425a3570485ccd15a4aad9430d96d91f07b6d93e707e7e9
 EBUILD List-MoreUtils-XS-0.426.0.ebuild 772 BLAKE2B 39206b9ffe7e34145da5e061783b26ecede8a8a52faa37ad7fe3c48886c22f5775b9e90b37f6396cb87cd8689eb7253f36f893eb4e87099eee197880deabdd43 SHA512 ce80e096c9f75f1e4cf011167f6aed6244b4c937bf1e3c613023f961689193b818a8291f8d47bfaa56bbc32ef2c326d3b69e00fb1cc8128d618528213ee30c0b
-EBUILD List-MoreUtils-XS-0.428.0.ebuild 852 BLAKE2B 5e622e5cd2932c275b9c83da9b6030262624a1f7179e208ff978a7395f94a33ffd1696e287014113bebd9ee656f55cf8068df4027ea2dde1bf95b6042fbb09d0 SHA512 141cca70fdd16d51fe312ed982f44725828e8bf172d1796e390877702a6b185fa50d5f0b46175e42dad2ecf7c120f5d02639e330ecd277ad14351505248f5b35
+EBUILD List-MoreUtils-XS-0.428.0.ebuild 851 BLAKE2B 70c7cbbbedd99c7d21758ac70037e463abd897bfbe9e4f2441b654ad52eaf0206a8faafd8109735df95fc9a4bba1f2caca45bceef07978ad8efe94fa160d5f15 SHA512 fc7182fe8bbff16f124794af7186c1ce7224f17e610000b60274876328a9174983c386f99a9f241270abdc7a0f21af6b982601558c861377b217796873750026
 MISC metadata.xml 407 BLAKE2B 0b3bce00c44e63c18c7c9f6ae43700a3aecbd359286e430c0d7939783f763cf42bd7f7649414d0606becdf0c715a26d07de5d669c23068b441350772341d0a7f SHA512 be227e311e8d434fd0d3b55a335946bcb3c319956eac4fa94a829c682496abdd8ced4c8325b5cb3ec67c8ac60fc557ce4933ff8eb6aab3f2475ddd8a5bafba7c
diff --git a/dev-perl/List-MoreUtils/List-MoreUtils-0.428.0.ebuild b/dev-perl/List-MoreUtils/List-MoreUtils-0.428.0.ebuild
index 2c6d36808b76..6ec3163a7fa7 100644
--- a/dev-perl/List-MoreUtils/List-MoreUtils-0.428.0.ebuild
+++ b/dev-perl/List-MoreUtils/List-MoreUtils-0.428.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Provide the missing functionality from List::Util"
 
 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 ~x86-solaris"
+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 ~x86-solaris"
 IUSE="test +xs"
 RESTRICT="!test? ( test )"
 # See MoreUtils.pm/LICENSE
diff --git a/dev-perl/List-MoreUtils/Manifest b/dev-perl/List-MoreUtils/Manifest
index c0523a1bad45..165159064cf1 100644
--- a/dev-perl/List-MoreUtils/Manifest
+++ b/dev-perl/List-MoreUtils/Manifest
@@ -6,5 +6,5 @@ DIST List-MoreUtils-0.428.tar.gz 146030 BLAKE2B 8a2accf028ab4c3c9f48f0cdb1762402
 EBUILD List-MoreUtils-0.418.0.ebuild 707 BLAKE2B 76ba3c9771a5d25ebdcae10b1ab9b5b1031fbbd8f15b18fd4d7de68cbe158e55e9ae04708abb139f6d93f225870ac7785f6f4dc702617158adfa17fc6c494fd8 SHA512 43791bc0ff5b6e1cdfce318de0ca7f0b4a5ea774ecbdf53f7642f1fc51744168c48c5ecfdd5ec0a9c900e3914ee8208003ddf84f6cad6f99e216cd994160ab98
 EBUILD List-MoreUtils-0.419.0.ebuild 714 BLAKE2B 290f515549c6f09018da61735a947e57610c58c6ddc7dc33188e5c49c8f4cf06e7ed414b498fdbd4e5819378d037ac180ac4c0bbb22dbe4a5d369fbad77f16f4 SHA512 b2f427d5aa7f3ef6acc7c1a6e2fb5169a32bce559372fb0a8eb60465ff48cf88848677941a634e2d06ba30c74a1013512a461a9baebe09a80f22c9870fba69a4
 EBUILD List-MoreUtils-0.426.0.ebuild 852 BLAKE2B 26336cef6430a82b4c8081bd637bf6db5e0e5699ac4a7e197ed4844c04d0c2010c910e4acf0b6086678678d544ddef658bf837fb13ca632c2be362a934dd7808 SHA512 884c21ba10df37173d44018a3b9970fd89ae735fa14a4ac8e6e95ab2d2c6e5af58af86147113811e58cf6ec6f77aa3dda76ab3141ae9708e1be79cb10e0d377b
-EBUILD List-MoreUtils-0.428.0.ebuild 896 BLAKE2B c28c7084c4b3cbd04014627d201e4efa504e5f20b58f6b424f299dbec3e6968d10706ccc58b47685b49e1dcf88f8c362a203e88b9d2b8ef67659f44055a812fd SHA512 b5088b3862ce7124e7838c66b4ebc4c6e7916db8865f1a3c4231b9a43e8c8fb3da1ead81e4b8d6c5643f885fb4d54f4d886ff0cec24c7091c496ed8b6b3a59fa
+EBUILD List-MoreUtils-0.428.0.ebuild 888 BLAKE2B 762cedfcdc09fb624a3d766a0eaaf5900351c9990218b6421f8a82b04954de5660035bc9bf0a96b83696c6b45ce9275ca0bffbe49f6fd436bfd309d3d74e424a SHA512 cc1990b49291f20bbe1c1c6f2de284b7cabcd6cfb41a7a3643d933ef435e06dfbb6c1d458fd1f76cbe365abd6d0fb6862658328303c3b0d5e08b13fc4d74fd0e
 MISC metadata.xml 565 BLAKE2B 1d9445527a6329e96a6d38f590f02fa98710bbf649ec5709533b5212402b7beaa4fb9211fe93814de01054a4bdf7c89ea52e8e0f6ee625ffd50f367b2c6286aa SHA512 b4fc48156533446dd91d18f6aac2dd58a61f3e3911357930b3710241f8b3e29a7a9143b02bf348e25c15e5cb323c66dbaf6b3555d64b5b333bc7281bded865be
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index bf7a589a2fdd..6d4e63612ce0 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/PerlIO-utf8_strict/Manifest b/dev-perl/PerlIO-utf8_strict/Manifest
index 0785bcc91217..bd25975442b4 100644
--- a/dev-perl/PerlIO-utf8_strict/Manifest
+++ b/dev-perl/PerlIO-utf8_strict/Manifest
@@ -1,3 +1,3 @@
 DIST PerlIO-utf8_strict-0.007.tar.gz 67922 BLAKE2B 4d13dc6e6b4cdf7a4bf3cd51ca1e054d82cab4094894f4cee7503201cc11f80ab27951417778f7e179aee03b75b4bbb30e839a498c83d5afd3881db64973d324 SHA512 0d39be9bcbab4cea087f59c67dc1af6773b6258c5e836590ff58cc18bf3392ba6e95c55a0c7ce94236e0be7053802b4b1d6010130355e1a973a3698aaf49af0f
-EBUILD PerlIO-utf8_strict-0.7.0.ebuild 850 BLAKE2B f4c92a01dcefac6c6fe9442f154799f27822c7751501b478fff68d7062111f76c107d378d7640da7d6ff7aa82c0ecb52f1328cb3fbc50debb004771ee40dae03 SHA512 a29a648b8922396f690f2d65d9ccfcf9cd3fde1970c564307fe6ce39a96d64c795e8d3924bd8adf24de8cacd6cdc7e822295dafb0c98808555350d67f56d9f11
+EBUILD PerlIO-utf8_strict-0.7.0.ebuild 848 BLAKE2B f94e5fdd9339f3af05bf1c7c9fa4c4f78504812c00b04280fed4e99bc8334e0d5b9af7cc8724f7710bfdf7e66ea1aec6501a8956c19d7db16a9648858008cb58 SHA512 4994c92440cfe76740ecd9f9a90bf35a6c171e08e52a55dc5410cb5314a073b7dec23d6f82d174b17c61b3b853df93b734545e9e800a7f684a54ab57385a1037
 MISC metadata.xml 408 BLAKE2B 7c975db4716a114a97f21cfaebc54334634ae0d8f6c8d58bd19edc8853a74583c4f16d0f3729f380bf9cf6cb1d0a668f9484ef58418370e977151877a79c5860 SHA512 bc9d04bc551d13a2712b9e57613d9e423a1649e3cda65436178079dc13cbdadf183f4aea41963d023744d60d638900944ddb60752f054a728d6868594d2f4c55
diff --git a/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.7.0.ebuild b/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.7.0.ebuild
index 06e5d353535b..509d6300fbe1 100644
--- a/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.7.0.ebuild
+++ b/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.7.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION="Fast and correct UTF-8 IO"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 # r: strict, warnings -> perl
diff --git a/dev-perl/PortageXS/Manifest b/dev-perl/PortageXS/Manifest
deleted file mode 100644
index a6bcbf2577e1..000000000000
--- a/dev-perl/PortageXS/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX 0.02.12/PortageXS-0.02.12-prefix.patch 8739 BLAKE2B fd7617b4e68c15948abce7d7fe54af7c0aa89bb23059b3af8929cd23870dda0338f0598990837075b08eb596c31ee392d6f967edaac550ec062756a757c901bb SHA512 8c1626cd107963c287ed0f24e7508ec28effbdcf3cde4695c9c294c7924f9c987593ff73b5719bb59b8e4cf6f7e790209d2aee97038fba7080f3ccd296074197
-AUX PortageXS-0.02.10-portage_path_fix.patch 4165 BLAKE2B 9a648a0f08ebd69d214b2728194235472132debdc2a3e78916f196d2c1f95e6d9a8d0f66b697045e559e542fb5505b74acf4140ad971c871a22e89d0ec8b4a12 SHA512 4e99f0db05dae2ca0b08c1750ba7f3218eacdf2e6cf4a01c08de53f4f7c81cf261a902b8fc5429a8349effeb2f1c2f6e3a0a8bee07257c48cf6fc7010f971695
-AUX PortageXS-0.02.10-prefix.patch 6463 BLAKE2B a18061842464c7c0544ec0f949b282498ddd0bc43e0eaa2309c7127528381d171a0a2925c325bc71cc76bb8433ec34b87857ab92bae52c5386e8f423b2fe31d1 SHA512 1225da7ef7911f8a3ada93f2d23ffd23e78bec735152403b809db75cda99fc576bc34fbbcd8487af16b3fadd946bc4c48497db9a4e9f9bf27705b91793d5ea37
-DIST PortageXS-0.02.10.tar.gz 28890 BLAKE2B 66686516b975ff0da641c75dec63c3c6afe9d5bf7762ffb1f4a81c31550e601601f6190fdb992fce0a6e694bed46d4c95f599cf7a20bf0c069493a1e07dec499 SHA512 8f5a6cf8fa415e13401fd7901c81fef42e0cee81b7a9c1f276cce9582c705ac7e2004ec213033fce065f965445342ed0140d8b752d2e857dd40c620ed4af6b1b
-DIST PortageXS-0.2.12.tar.gz 41772 BLAKE2B 81583e73189908cd3b1588e74d5b291d1955995ff1d283682c245264feac7ed9eef4cfcd2ef4497c229f3d007ebd0a8b275d7c7c0e64ea3059dda3bc01eb66d7 SHA512 e833c8dab25ed6fcfad999e4b0bb803d69523ff57fbcd86ea0c29c671889a66c81f0081d6242039788a73d090e3245776d12a8286114b77f72d39514dfe425bf
-EBUILD PortageXS-0.02.10-r4.ebuild 1414 BLAKE2B 9b2ec45db7b54c6e69ab85aa168eaa53732df15c12423178076f0f1f2d8dbaf2bf4578858db40b78a0f16ebc87f539c08592435d343f143cab415e4f67f5fcff SHA512 3a942091c95da27b72d204fe5233b808fa1e382b0c209f001268fe9a95a9e84f42ddc14efaca111337cdaf85e18db518191fff7124d2917f66ad5dcb57f4a4b4
-EBUILD PortageXS-0.2.10-r5.ebuild 1508 BLAKE2B a94825ae899418d3209d32fc9def3153cdcf2009ea219e9dc0212c63b664ea75447d11a65aec13c2f770d9a249b32f4eb27262baa25e576d2de88f5c76f432f0 SHA512 fe502d5c04f0ca80a93e9cec04bb5137f5a7f74e4242a84d79784a491329c70006e55cd4fba14e709e04cd480bd3e3103bb7353e3c9a345e46eb8b5d3c1db3cb
-EBUILD PortageXS-0.2.12-r1.ebuild 1467 BLAKE2B 4c0c87429e300f0e9badf387dec9fd393b02be3d57d5bb2385528f807bc77fba1a697237fde041c9b54235688b6c97d9863af3047a3f4797da7f883f28ed1fcb SHA512 4bdae9346c197835b8f4ca4b0fa27d0d13da552aaa87a9fc892379180a9b9ceae3167e6b8360c8b8815b83e8654f4452101bcf0cb61ca72c817b82b4808e3e8c
-MISC metadata.xml 664 BLAKE2B 13c9057323ee7e4ecf4f2c438eab7d0ec90874083e14345ac81bdb0062f8f0fb61722a2beae0e054381fe482618f7c28c5e6dd1cc31b83e4c136bf6282265a6c SHA512 7c9589797fd90606f29f56ef2844748515d75d158e4cde711943825619c96a56a4bd77d4e540670a782d6da04de58be0acf01b5d13d64723814fb2f8efd2578f
diff --git a/dev-perl/PortageXS/PortageXS-0.02.10-r4.ebuild b/dev-perl/PortageXS/PortageXS-0.02.10-r4.ebuild
deleted file mode 100644
index 7525eca6f514..000000000000
--- a/dev-perl/PortageXS/PortageXS-0.02.10-r4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module epatch prefix
-
-DESCRIPTION="Portage abstraction layer for perl"
-HOMEPAGE="http://download.mpsna.de/opensource/PortageXS/"
-SRC_URI="http://download.mpsna.de/opensource/PortageXS/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="minimal"
-SRC_TEST="do"
-
-DEPEND="virtual/perl-Term-ANSIColor
-	dev-perl/Shell-EnvImporter
-	!minimal? ( dev-perl/IO-Socket-SSL
-		    virtual/perl-Sys-Syslog )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.02.10-portage_path_fix.patch
-	epatch "${FILESDIR}"/${PN}-0.02.10-prefix.patch
-
-	eprefixify \
-		lib/PortageXS/Core.pm \
-		lib/PortageXS.pm \
-		usr/bin/portagexs_client \
-		usr/sbin/portagexsd
-
-	if use minimal ; then
-		rm -r "${S}"/usr || die
-		rm -r "${S}"/etc/init.d || die
-		rm -r "${S}"/etc/pxs/certs || die
-		rm "${S}"/etc/pxs/portagexsd.conf || die
-		rm -r "${S}"/lib/PortageXS/examples || die
-	fi
-}
-
-pkg_preinst() {
-	if use !minimal ; then
-		cp -r "${S}"/usr "${D}${EPREFIX}" || die
-	fi
-	cp -r "${S}"/etc "${D}${EPREFIX}" || die
-}
-
-pkg_postinst() {
-	if [ -d "${EPREFIX}"/etc/portagexs ]; then
-		elog "${EPREFIX}/etc/portagexs has been moved to ${EPREFIX}/etc/pxs for convenience.  It is safe"
-		elog "to delete old ${EPREFIX}/etc/portagexs directories."
-	fi
-}
diff --git a/dev-perl/PortageXS/PortageXS-0.2.10-r5.ebuild b/dev-perl/PortageXS/PortageXS-0.2.10-r5.ebuild
deleted file mode 100644
index 137c3757d252..000000000000
--- a/dev-perl/PortageXS/PortageXS-0.2.10-r5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MODULE_VERSION=0.02.10
-inherit perl-module epatch prefix
-
-DESCRIPTION="Portage abstraction layer for perl"
-HOMEPAGE="http://download.mpsna.de/opensource/PortageXS/"
-SRC_URI="http://download.mpsna.de/opensource/PortageXS/${PN}-${MODULE_VERSION}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="minimal"
-SRC_TEST="do"
-
-DEPEND="
-	virtual/perl-Term-ANSIColor
-	dev-perl/Shell-EnvImporter
-	!minimal? (
-		dev-perl/IO-Socket-SSL
-		virtual/perl-Sys-Syslog
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.02.10-portage_path_fix.patch
-	epatch "${FILESDIR}"/${PN}-0.02.10-prefix.patch
-
-	eprefixify \
-		lib/PortageXS/Core.pm \
-		lib/PortageXS.pm \
-		usr/bin/portagexs_client \
-		usr/sbin/portagexsd
-
-	if use minimal ; then
-		rm -r "${S}"/usr || die
-		rm -r "${S}"/etc/init.d || die
-		rm -r "${S}"/etc/pxs/certs || die
-		rm "${S}"/etc/pxs/portagexsd.conf || die
-		rm -r "${S}"/lib/PortageXS/examples || die
-	fi
-}
-
-src_install() {
-	perl-module_src_install
-	if use !minimal ; then
-		cp -r "${S}"/usr "${D}${EPREFIX}" || die
-	fi
-	cp -r "${S}"/etc "${D}${EPREFIX}" || die
-}
-
-pkg_postinst() {
-	if [ -d "${EPREFIX}"/etc/portagexs ]; then
-		elog "${EPREFIX}/etc/portagexs has been moved to ${EPREFIX}/etc/pxs for convenience.  It is safe"
-		elog "to delete old ${EPREFIX}/etc/portagexs directories."
-	fi
-}
diff --git a/dev-perl/PortageXS/PortageXS-0.2.12-r1.ebuild b/dev-perl/PortageXS/PortageXS-0.2.12-r1.ebuild
deleted file mode 100644
index 798620b905f3..000000000000
--- a/dev-perl/PortageXS/PortageXS-0.2.12-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=KENTNL
-MODULE_VERSION=0.2.12
-inherit perl-module epatch prefix
-
-DESCRIPTION="Portage abstraction layer for perl"
-HOMEPAGE="http://search.cpan.org/~kentnl/PortageXS"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="minimal"
-
-DEPEND="
-	dev-perl/Module-Build
-	virtual/perl-Term-ANSIColor
-	dev-perl/Shell-EnvImporter
-	!minimal? (
-		dev-perl/IO-Socket-SSL
-		virtual/perl-Sys-Syslog
-	)
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/0.02.12/${PN}-0.02.12-prefix.patch
-
-	eprefixify \
-		lib/PortageXS/examples/getParamFromFile.pl \
-		lib/PortageXS/Core.pm \
-		lib/PortageXS.pm \
-		usr/bin/portagexs_client \
-		usr/sbin/portagexsd \
-		t/01_Core.t
-
-	if use minimal ; then
-		rm -r "${S}"/usr || die
-		rm -r "${S}"/etc/init.d || die
-		rm -r "${S}"/etc/pxs/certs || die
-		rm "${S}"/etc/pxs/portagexsd.conf || die
-		rm -r "${S}"/lib/PortageXS/examples || die
-	fi
-}
-
-src_install() {
-	perl-module_src_install
-	if use !minimal ; then
-		cp -r "${S}"/usr "${D}${EPREFIX}" || die
-	fi
-	cp -r "${S}"/etc "${D}${EPREFIX}" || die
-}
-
-pkg_postinst() {
-	if [ -d "${EPREFIX}"/etc/portagexs ]; then
-		elog "${EPREFIX}/etc/portagexs has been moved to ${EPREFIX}/etc/pxs for convenience.  It is safe"
-		elog "to delete old ${EPREFIX}/etc/portagexs directories."
-	fi
-}
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/PortageXS/files/0.02.12/PortageXS-0.02.12-prefix.patch b/dev-perl/PortageXS/files/0.02.12/PortageXS-0.02.12-prefix.patch
deleted file mode 100644
index df1881118c9a..000000000000
--- a/dev-perl/PortageXS/files/0.02.12/PortageXS-0.02.12-prefix.patch
+++ /dev/null
@@ -1,198 +0,0 @@
- lib/PortageXS.pm                           | 16 ++++++++--------
- lib/PortageXS/Core.pm                      |  8 ++++----
- lib/PortageXS/examples/getParamFromFile.pl |  2 +-
- t/01_Core.t                                | 12 ++++++------
- usr/bin/portagexs_client                   |  8 ++++----
- usr/sbin/portagexsd                        | 12 ++++++------
- 6 files changed, 29 insertions(+), 29 deletions(-)
-
-diff --git a/lib/PortageXS.pm b/lib/PortageXS.pm
-index db57a25..6cec46e 100644
---- a/lib/PortageXS.pm
-+++ b/lib/PortageXS.pm
-@@ -71,8 +71,8 @@ sub new {
- 	$pxs->{'VERSION'}			= $PortageXS::VERSION;
- 
- 	$pxs->{'PORTDIR'}			= $pxs->getPortdir();
--	$pxs->{'PKG_DB_DIR'}			= '/var/db/pkg/';
--	$pxs->{'PATH_TO_WORLDFILE'}		= '/var/lib/portage/world';
-+	$pxs->{'PKG_DB_DIR'}			= '@GENTOO_PORTAGE_EPREFIX@/var/db/pkg/';
-+	$pxs->{'PATH_TO_WORLDFILE'}		= '@GENTOO_PORTAGE_EPREFIX@/var/lib/portage/world';
- 	$pxs->{'IS_INITIALIZED'}		= 1;
- 
- 	$pxs->{'EXCLUDE_DIRS'}{'.'}		= 1;
-@@ -85,17 +85,17 @@ sub new {
- 	$pxs->{'EXCLUDE_DIRS'}{'CVS'}		= 1;
- 	$pxs->{'EXCLUDE_DIRS'}{'.cache'}	= 1;
- 
--	$pxs->{'PORTAGEXS_ETC_DIR'}		= '/etc/pxs/';
--	$pxs->{'ETC_DIR'}			= '/etc/';
-+	$pxs->{'PORTAGEXS_ETC_DIR'}		= '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/';
-+	$pxs->{'ETC_DIR'}			= '@GENTOO_PORTAGE_EPREFIX@/etc/';
- 
- 	$pxs->{'MAKE_PROFILE_PATHS'} = [
--		'/etc/make.profile',
--		'/etc/portage/make.profile'
-+		'@GENTOO_PORTAGE_EPREFIX@/etc/make.profile',
-+		'@GENTOO_PORTAGE_EPREFIX@/etc/portage/make.profile'
- 	];
- 
- 	$pxs->{'MAKE_CONF_PATHS'} = [
--		'/etc/make.conf',
--		'/etc/portage/make.conf'
-+		'@GENTOO_PORTAGE_EPREFIX@/etc/make.conf',
-+		'@GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf'
- 	];
- 
- 	for my $path ( @{ $pxs->{'MAKE_PROFILE_PATHS'} } ) {
-diff --git a/lib/PortageXS/Core.pm b/lib/PortageXS/Core.pm
-index 5d51023..3dd0b84 100644
---- a/lib/PortageXS/Core.pm
-+++ b/lib/PortageXS/Core.pm
-@@ -122,7 +122,7 @@ sub getPortageMakeParam {
- 	my $self		= shift;
- 	my $param		= shift;
- 	my @files		= ();
--	my @etcfiles		= qw(/usr/share/portage/config/make.globals /etc/make.conf);
-+	my @etcfiles		= qw(@GENTOO_PORTAGE_EPREFIX@/usr/share/portage/config/make.globals @GENTOO_PORTAGE_EPREFIX@/etc/make.conf);
- 	my $v			= '';
- 	my $parent		= '';
- 	my $curPath;
-@@ -166,7 +166,7 @@ sub getPortageMakeParam {
- 
- 	# - Defaults >
- 	if ($param eq 'PORTDIR' && !$v) {
--		$v='/usr/portage';
-+		$v='@GENTOO_PORTAGE_EPREFIX@/usr/portage';
- 	}
- 
- 	return $v;
-@@ -193,7 +193,7 @@ sub getPortdir {
- 		return $self->{'PORTDIR'};
- 	}
- 	else {
--		$self->{'PORTDIR'}=$self->getParamFromFile($self->getFileContents('/usr/share/portage/config/make.globals').$self->getFileContents('/etc/portage/make.conf'),'PORTDIR','lastseen');
-+		$self->{'PORTDIR'}=$self->getParamFromFile($self->getFileContents('@GENTOO_PORTAGE_EPREFIX@/usr/share/portage/config/make.globals').$self->getFileContents('@GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf'),'PORTDIR','lastseen');
- 		return $self->{'PORTDIR'};
- 	}
- }
-@@ -210,7 +210,7 @@ sub getPortdirOverlay {
- 	my $self	= shift;
- 	my $forcereload	= shift;
- 
--	return split(/ /,$self->getParamFromFile($self->getFileContents('/usr/share/portage/config/make.globals').$self->getFileContents('/etc/make.conf'),'PORTDIR_OVERLAY','lastseen'));
-+	return split(/ /,$self->getParamFromFile($self->getFileContents('@GENTOO_PORTAGE_EPREFIX@/usr/share/portage/config/make.globals').$self->getFileContents('@GENTOO_PORTAGE_EPREFIX@/etc/make.conf'),'PORTDIR_OVERLAY','lastseen'));
- }
- 
- # Description:
-diff --git a/lib/PortageXS/examples/getParamFromFile.pl b/lib/PortageXS/examples/getParamFromFile.pl
-index 416b1be..9ea88bb 100755
---- a/lib/PortageXS/examples/getParamFromFile.pl
-+++ b/lib/PortageXS/examples/getParamFromFile.pl
-@@ -8,4 +8,4 @@ use PortageXS;
- 
- my $pxs=PortageXS->new();
- print "CFLAGS are set to: ";
--print join(' ',$pxs->getParamFromFile($pxs->getFileContents('/etc/make.globals').$pxs->getFileContents('/etc/make.conf'),'CFLAGS','lastseen'))."\n";
-+print join(' ',$pxs->getParamFromFile($pxs->getFileContents('@GENTOO_PORTAGE_EPREFIX@/etc/make.globals').$pxs->getFileContents('@GENTOO_PORTAGE_EPREFIX@/etc/make.conf'),'CFLAGS','lastseen'))."\n";
-diff --git a/t/01_Core.t b/t/01_Core.t
-index d01dc31..6daba99 100644
---- a/t/01_Core.t
-+++ b/t/01_Core.t
-@@ -14,8 +14,8 @@ ok(-d $pxs->getPortdir(),'getPortdir: '.$pxs->getPortdir());
- 
- # - getFileContents >
- {
--	my $content = $pxs->getFileContents('/etc/portage/make.conf');
--	ok($content ne '','getFileContents of /etc/portage/make.conf');
-+	my $content = $pxs->getFileContents('@GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf');
-+	ok($content ne '','getFileContents of @GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf');
- }
- 
- # - searchInstalledPackage >
-@@ -26,8 +26,8 @@ ok(-d $pxs->getPortdir(),'getPortdir: '.$pxs->getPortdir());
- 
- # - getParamFromFile >
- {
--	my $param = $pxs->getParamFromFile($pxs->getFileContents('/etc/portage/make.conf'),'CFLAGS','lastseen');
--	ok($param ne '','getParamFromFile /etc/portage/make.conf - CFLAGS: '.$param);
-+	my $param = $pxs->getParamFromFile($pxs->getFileContents('@GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf'),'CFLAGS','lastseen');
-+	ok($param ne '','getParamFromFile @GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf - CFLAGS: '.$param);
- }
- 
- # - getUseSettingsOfInstalledPackage >
-@@ -65,8 +65,8 @@ ok(-d $pxs->getPortdir(),'getPortdir: '.$pxs->getPortdir());
- 
- # - fileBelongsToPackage >
- {
--	my @packages = $pxs->fileBelongsToPackage('/etc/gentoo-release');
--	ok($#packages==0,'fileBelongsToPackage - /etc/gentoo-release: '.$packages[0]);
-+	my @packages = $pxs->fileBelongsToPackage('@GENTOO_PORTAGE_EPREFIX@/etc/gentoo-release');
-+	ok($#packages==0,'fileBelongsToPackage - @GENTOO_PORTAGE_EPREFIX@/etc/gentoo-release: '.$packages[0]);
- }
- ok(!$pxs->fileBelongsToPackage('/this/path/most/likely/does/not/exist'),'fileBelongsToPackage bogus test');
- 
-diff --git a/usr/bin/portagexs_client b/usr/bin/portagexs_client
-index 598d05a..688cb97 100755
---- a/usr/bin/portagexs_client
-+++ b/usr/bin/portagexs_client
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl
- 
- # -----------------------------------------------------------------------------
- #
-@@ -54,9 +54,9 @@ if(!($sock = IO::Socket::SSL->new( PeerAddr => $remote_addr,
- 				SSL_use_cert => 1,
- 				SSL_verify_mode => 0x01,
- 				SSL_passwd_cb => sub { return "" },
--				SSL_key_file => '/etc/pxs/certs/client-key.pem',
--				SSL_cert_file => '/etc/pxs/certs/client-cert.pem',
--				SSL_ca_file => '/etc/pxs/certs/my-ca.pem'
-+				SSL_key_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/client-key.pem',
-+				SSL_cert_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/client-cert.pem',
-+				SSL_ca_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/my-ca.pem'
- 				 ))) {
- 	$pxs->print_err("unable to create socket: ".&IO::Socket::SSL::errstr."\n");
- 	$pxs->print_err("Server down?\n");
-diff --git a/usr/sbin/portagexsd b/usr/sbin/portagexsd
-index 638f662..e93bdfa 100755
---- a/usr/sbin/portagexsd
-+++ b/usr/sbin/portagexsd
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -t
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl -t
- 
- # -----------------------------------------------------------------------------
- #
-@@ -50,7 +50,7 @@ else {
- sub main {
- 	# - Parse config >
- 	my %config	= ();
--	$config{'cfgfiledata'} = $pxs->getFileContents("/etc/pxs/portagexsd.conf");
-+	$config{'cfgfiledata'} = $pxs->getFileContents("@GENTOO_PORTAGE_EPREFIX@/etc/pxs/portagexsd.conf");
- 	$config{'Port'} = $pxs->getParamFromFile($config{'cfgfiledata'},"Port","lastseen");
- 	$config{'SSLpasswd'} = $pxs->getParamFromFile($config{'cfgfiledata'},"SSLpasswd","lastseen");
- 	$config{'PidFile'} = $pxs->getParamFromFile($config{'cfgfiledata'},"PidFile","lastseen");
-@@ -60,7 +60,7 @@ sub main {
- 	$config{'cfgfiledata'} = undef;
- 
- 	if (!$config{'I_AM_ROOT_AND_I_KNOW_WHAT_I_AM_DOING'}) {
--		syslog("info", 'Not starting server as it seems that you did not have a look at the configs yet! (/etc/pxs/portagexsd.conf)');
-+		syslog("info", 'Not starting server as it seems that you did not have a look at the configs yet! (@GENTOO_PORTAGE_EPREFIX@/etc/pxs/portagexsd.conf)');
- 		exit(0);
- 	}
- 
-@@ -70,9 +70,9 @@ sub main {
- 				Reuse     => 1,
- 				SSL_verify_mode => 0x01,
- 				SSL_passwd_cb => sub {return $config{'SSLpasswd'}},
--				SSL_key_file => '/etc/pxs/certs/server-key.pem',
--				SSL_cert_file => '/etc/pxs/certs/server-cert.pem',
--				SSL_ca_file => '/etc/pxs/certs/my-ca.pem'
-+				SSL_key_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/server-key.pem',
-+				SSL_cert_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/server-cert.pem',
-+				SSL_ca_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/my-ca.pem'
- 			)) ) {
- 		syslog("info", "Unable to create socket: ", &IO::Socket::SSL::errstr);
- 		exit(0);
diff --git a/dev-perl/PortageXS/files/PortageXS-0.02.10-portage_path_fix.patch b/dev-perl/PortageXS/files/PortageXS-0.02.10-portage_path_fix.patch
deleted file mode 100644
index a9968cd7e79e..000000000000
--- a/dev-perl/PortageXS/files/PortageXS-0.02.10-portage_path_fix.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -ur PortageXS-0.02.10.orig/lib/PortageXS/Core.pm PortageXS-0.02.10/lib/PortageXS/Core.pm
---- PortageXS-0.02.10.orig/lib/PortageXS/Core.pm	2013-01-03 09:32:10.477597366 +0100
-+++ PortageXS-0.02.10/lib/PortageXS/Core.pm	2013-01-03 09:32:12.707534858 +0100
-@@ -94,7 +94,7 @@
- 	my $self		= shift;
- 	my $param		= shift;
- 	my @files		= ();
--	my @etcfiles		= qw(/etc/make.globals /etc/make.conf);
-+	my @etcfiles		= qw(/usr/share/portage/config/make.globals /etc/portage/make.conf);
- 	my @profilefiles	= ();
- 	my $v			= '';
- 	my $parent		= '';
-@@ -166,7 +166,7 @@
- 		return $self->{'PORTDIR'};
- 	}
- 	else {
--		$self->{'PORTDIR'}=$self->getParamFromFile($self->getFileContents('/etc/make.globals').$self->getFileContents('/etc/make.conf'),'PORTDIR','lastseen');
-+		$self->{'PORTDIR'}=$self->getParamFromFile($self->getFileContents('/usr/share/portage/config/make.globals').$self->getFileContents('/etc/portage/make.conf'),'PORTDIR','lastseen');
- 		return $self->{'PORTDIR'};
- 	}
- }
-@@ -183,7 +183,7 @@
- 	my $self	= shift;
- 	my $forcereload	= shift;
- 	
--	return split(/ /,$self->getParamFromFile($self->getFileContents('/etc/make.globals').$self->getFileContents('/etc/make.conf'),'PORTDIR_OVERLAY','lastseen'));
-+	return split(/ /,$self->getParamFromFile($self->getFileContents('/usr/share/portage/config/make.globals').$self->getFileContents('/etc/portage/make.conf'),'PORTDIR_OVERLAY','lastseen'));
- }
- 
- # Description:
-diff -ur PortageXS-0.02.10.orig/lib/PortageXS/examples/getParamFromFile.pl PortageXS-0.02.10/lib/PortageXS/examples/getParamFromFile.pl
---- PortageXS-0.02.10.orig/lib/PortageXS/examples/getParamFromFile.pl	2013-01-03 09:32:10.477597366 +0100
-+++ PortageXS-0.02.10/lib/PortageXS/examples/getParamFromFile.pl	2013-01-03 09:32:12.707534858 +0100
-@@ -8,4 +8,5 @@
- 
- my $pxs=PortageXS->new();
- print "CFLAGS are set to: ";
--print join(' ',$pxs->getParamFromFile($pxs->getFileContents('/etc/make.globals').$pxs->getFileContents('/etc/make.conf'),'CFLAGS','lastseen'))."\n";
-+print join(' 
-+',$pxs->getParamFromFile($pxs->getFileContents('/usr/share/portage/config/make.globals').$pxs->getFileContents('/etc/portage/make.conf'),'CFLAGS','lastseen'))."\n";
-diff -ur PortageXS-0.02.10.orig/lib/PortageXS.pm PortageXS-0.02.10/lib/PortageXS.pm
---- PortageXS-0.02.10.orig/lib/PortageXS.pm	2013-01-03 09:32:10.478597338 +0100
-+++ PortageXS-0.02.10/lib/PortageXS.pm	2013-01-03 09:32:29.710057966 +0100
-@@ -77,7 +77,7 @@
- 	
- 	$self->{'PORTAGEXS_ETC_DIR'}		= '/etc/pxs/';
- 	$self->{'ETC_DIR'}			= '/etc/';
--	$self->{'MAKE_PROFILE_PATH'}		= '/etc/make.profile';
-+	$self->{'MAKE_PROFILE_PATH'}		= '/etc/portage/make.profile';
- 	
- 	# - init colors >
- 	$self->{'COLORS'}{'YELLOW'}		= color('bold yellow');
-@@ -89,7 +89,7 @@
- 	$self->{'COLORS'}{'BLUE'}		= color('bold blue');
- 	$self->{'COLORS'}{'RESET'}		= color('reset');
- 	
--	if (lc($self->getParamFromFile($self->getFileContents('/etc/make.conf'),'NOCOLOR','lastseen')) eq 'true') {
-+	if (lc($self->getParamFromFile($self->getFileContents('/etc/portage/make.conf'),'NOCOLOR','lastseen')) eq 'true') {
- 		$self->{'COLORS'}{'YELLOW'}		= '';
- 		$self->{'COLORS'}{'GREEN'}		= '';
- 		$self->{'COLORS'}{'LIGHTGREEN'}		= '';
-diff -ur PortageXS-0.02.10.orig/t/01_Core.t PortageXS-0.02.10/t/01_Core.t
---- PortageXS-0.02.10.orig/t/01_Core.t	2013-01-03 09:32:10.476597394 +0100
-+++ PortageXS-0.02.10/t/01_Core.t	2013-01-03 09:32:12.707534858 +0100
-@@ -14,8 +14,8 @@
- 
- # - getFileContents >
- {
--	my $content = $pxs->getFileContents('/etc/make.conf');
--	ok($content ne '','getFileContents of /etc/make.conf');
-+	my $content = $pxs->getFileContents('/etc/portage/make.conf');
-+	ok($content ne '','getFileContents of /etc/portage/make.conf');
- }
- 
- # - searchInstalledPackage >
-@@ -26,8 +26,8 @@
- 
- # - getParamFromFile >
- {
--	my $param = $pxs->getParamFromFile($pxs->getFileContents('/etc/make.conf'),'CFLAGS','lastseen');
--	ok($param ne '','getParamFromFile /etc/make.conf - CFLAGS: '.$param);
-+	my $param = $pxs->getParamFromFile($pxs->getFileContents('/etc/portage/make.conf'),'CFLAGS','lastseen');
-+	ok($param ne '','getParamFromFile /etc/portage/make.conf - CFLAGS: '.$param);
- }
- 
- # - getUseSettingsOfInstalledPackage >
diff --git a/dev-perl/PortageXS/files/PortageXS-0.02.10-prefix.patch b/dev-perl/PortageXS/files/PortageXS-0.02.10-prefix.patch
deleted file mode 100644
index 755bb13bb503..000000000000
--- a/dev-perl/PortageXS/files/PortageXS-0.02.10-prefix.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -ur PortageXS-0.02.09.orig/lib/PortageXS/Core.pm PortageXS-0.02.09/lib/PortageXS/Core.pm
---- PortageXS-0.02.09.orig/lib/PortageXS/Core.pm	2008-12-01 21:30:50 +0100
-+++ PortageXS-0.02.09/lib/PortageXS/Core.pm	2009-03-18 20:56:20 +0100
-@@ -94,7 +94,7 @@
- 	my $self		= shift;
- 	my $param		= shift;
- 	my @files		= ();
--	my @etcfiles		= qw(/usr/share/portage/config/make.globals /etc/portage/make.conf);
-+	my @etcfiles		= qw(@GENTOO_PORTAGE_EPREFIX@/usr/share/portage/config/make.globals @GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf);
- 	my @profilefiles	= ();
- 	my $v			= '';
- 	my $parent		= '';
-@@ -139,7 +139,7 @@
- 	
- 	# - Defaults >
- 	if ($param eq 'PORTDIR' && !$v) {
--		$v='/usr/portage';
-+		$v='@GENTOO_PORTAGE_EPREFIX@/usr/portage';
- 	}
- 	
- 	return $v;
-@@ -166,7 +166,7 @@
- 		return $self->{'PORTDIR'};
- 	}
- 	else {
--		$self->{'PORTDIR'}=$self->getParamFromFile($self->getFileContents('/usr/share/portage/config/make.globals').$self->getFileContents('/etc/portage/make.conf'),'PORTDIR','lastseen');
-+		$self->{'PORTDIR'}=$self->getParamFromFile($self->getFileContents('@GENTOO_PORTAGE_EPREFIX@/usr/share/portage/config/make.globals').$self->getFileContents('@GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf'),'PORTDIR','lastseen');
- 		return $self->{'PORTDIR'};
- 	}
- }
-@@ -183,7 +183,7 @@
- 	my $self	= shift;
- 	my $forcereload	= shift;
- 	
--	return split(/ /,$self->getParamFromFile($self->getFileContents('/usr/share/portage/config/make.globals').$self->getFileContents('/etc/portage/make.conf'),'PORTDIR_OVERLAY','lastseen'));
-+	return split(/ /,$self->getParamFromFile($self->getFileContents('@GENTOO_PORTAGE_EPREFIX@/usr/share/portage/config/make.globals').$self->getFileContents('@GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf'),'PORTDIR_OVERLAY','lastseen'));
- }
- 
- # Description:
-diff -ur PortageXS-0.02.09.orig/lib/PortageXS.pm PortageXS-0.02.09/lib/PortageXS.pm
---- PortageXS-0.02.09.orig/lib/PortageXS.pm	2008-12-01 21:30:50 +0100
-+++ PortageXS-0.02.09/lib/PortageXS.pm	2009-03-18 20:52:29 +0100
-@@ -61,8 +61,8 @@
- 	$self->{'VERSION'}			= $VERSION;
- 	
- 	$self->{'PORTDIR'}			= $self->getPortdir();
--	$self->{'PKG_DB_DIR'}			= '/var/db/pkg/';
--	$self->{'PATH_TO_WORLDFILE'}		= '/var/lib/portage/world';
-+	$self->{'PKG_DB_DIR'}			= '@GENTOO_PORTAGE_EPREFIX@/var/db/pkg/';
-+	$self->{'PATH_TO_WORLDFILE'}		= '@GENTOO_PORTAGE_EPREFIX@/var/lib/portage/world';
- 	$self->{'IS_INITIALIZED'}		= 1;
- 	
- 	$self->{'EXCLUDE_DIRS'}{'.'}		= 1;
-@@ -75,9 +75,9 @@
- 	$self->{'EXCLUDE_DIRS'}{'CVS'}		= 1;
- 	$self->{'EXCLUDE_DIRS'}{'.cache'}	= 1;
- 	
--	$self->{'PORTAGEXS_ETC_DIR'}		= '/etc/pxs/';
--	$self->{'ETC_DIR'}			= '/etc/';
--	$self->{'MAKE_PROFILE_PATH'}		= '/etc/portage/make.profile';
-+	$self->{'PORTAGEXS_ETC_DIR'}		= '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/';
-+	$self->{'ETC_DIR'}			= '@GENTOO_PORTAGE_EPREFIX@/etc/';
-+	$self->{'MAKE_PROFILE_PATH'}		= '@GENTOO_PORTAGE_EPREFIX@/etc/portage/make.profile';
- 	
- 	# - init colors >
- 	$self->{'COLORS'}{'YELLOW'}		= color('bold yellow');
-@@ -89,7 +89,7 @@
- 	$self->{'COLORS'}{'BLUE'}		= color('bold blue');
- 	$self->{'COLORS'}{'RESET'}		= color('reset');
- 	
--	if (lc($self->getParamFromFile($self->getFileContents('/etc/portage/make.conf'),'NOCOLOR','lastseen')) eq 'true') {
-+	if (lc($self->getParamFromFile($self->getFileContents('@GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf'),'NOCOLOR','lastseen')) eq 'true') {
- 		$self->{'COLORS'}{'YELLOW'}		= '';
- 		$self->{'COLORS'}{'GREEN'}		= '';
- 		$self->{'COLORS'}{'LIGHTGREEN'}		= '';
-diff -ur PortageXS-0.02.09.orig/usr/bin/portagexs_client PortageXS-0.02.09/usr/bin/portagexs_client
---- PortageXS-0.02.09.orig/usr/bin/portagexs_client	2008-12-01 21:30:50 +0100
-+++ PortageXS-0.02.09/usr/bin/portagexs_client	2009-03-18 20:52:29 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl
- 
- # -----------------------------------------------------------------------------
- #
-@@ -54,9 +54,9 @@
- 				SSL_use_cert => 1,
- 				SSL_verify_mode => 0x01,
- 				SSL_passwd_cb => sub { return "" },
--				SSL_key_file => '/etc/pxs/certs/client-key.pem',
--				SSL_cert_file => '/etc/pxs/certs/client-cert.pem',
--				SSL_ca_file => '/etc/pxs/certs/my-ca.pem'
-+				SSL_key_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/client-key.pem',
-+				SSL_cert_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/client-cert.pem',
-+				SSL_ca_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/my-ca.pem'
- 				 ))) {
- 	$pxs->print_err("unable to create socket: ".&IO::Socket::SSL::errstr."\n");
- 	$pxs->print_err("Server down?\n");
-diff -ur PortageXS-0.02.09.orig/usr/sbin/portagexsd PortageXS-0.02.09/usr/sbin/portagexsd
---- PortageXS-0.02.09.orig/usr/sbin/portagexsd	2008-12-01 21:30:50 +0100
-+++ PortageXS-0.02.09/usr/sbin/portagexsd	2009-03-18 20:52:29 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -t
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl -t
- 
- # -----------------------------------------------------------------------------
- #
-@@ -50,7 +50,7 @@
- sub main {
- 	# - Parse config >
- 	my %config	= ();
--	$config{'cfgfiledata'} = $pxs->getFileContents("/etc/pxs/portagexsd.conf");
-+	$config{'cfgfiledata'} = $pxs->getFileContents("@GENTOO_PORTAGE_EPREFIX@/etc/pxs/portagexsd.conf");
- 	$config{'Port'} = $pxs->getParamFromFile($config{'cfgfiledata'},"Port","lastseen");
- 	$config{'SSLpasswd'} = $pxs->getParamFromFile($config{'cfgfiledata'},"SSLpasswd","lastseen");
- 	$config{'PidFile'} = $pxs->getParamFromFile($config{'cfgfiledata'},"PidFile","lastseen");
-@@ -60,7 +60,7 @@
- 	$config{'cfgfiledata'} = undef;
- 	
- 	if (!$config{'I_AM_ROOT_AND_I_KNOW_WHAT_I_AM_DOING'}) {
--		syslog("info", 'Not starting server as it seems that you did not have a look at the configs yet! (/etc/pxs/portagexsd.conf)');
-+		syslog("info", 'Not starting server as it seems that you did not have a look at the configs yet! (@GENTOO_PORTAGE_EPREFIX@/etc/pxs/portagexsd.conf)');
- 		exit(0);
- 	}
- 	
-@@ -70,9 +71,9 @@
- 				Reuse     => 1,
- 				SSL_verify_mode => 0x01,
- 				SSL_passwd_cb => sub {return $config{'SSLpasswd'}},
--				SSL_key_file => '/etc/pxs/certs/server-key.pem',
--				SSL_cert_file => '/etc/pxs/certs/server-cert.pem',
--				SSL_ca_file => '/etc/pxs/certs/my-ca.pem'
-+				SSL_key_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/server-key.pem',
-+				SSL_cert_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/server-cert.pem',
-+				SSL_ca_file => '@GENTOO_PORTAGE_EPREFIX@/etc/pxs/certs/my-ca.pem'
- 			)) ) {
- 		syslog("info", "Unable to create socket: ", &IO::Socket::SSL::errstr);
- 		exit(0);
diff --git a/dev-perl/PortageXS/metadata.xml b/dev-perl/PortageXS/metadata.xml
deleted file mode 100644
index 799ea06246fc..000000000000
--- a/dev-perl/PortageXS/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>perl@gentoo.org</email>
-		<name>Gentoo Perl Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="cpan">PortageXS</remote-id>
-		<remote-id type="cpan">PortageXS::Core</remote-id>
-		<remote-id type="cpan">PortageXS::System</remote-id>
-		<remote-id type="cpan">PortageXS::UI::Console</remote-id>
-		<remote-id type="cpan">PortageXS::UI::Spinner</remote-id>
-		<remote-id type="cpan">PortageXS::Useflags</remote-id>
-		<remote-id type="cpan">PortageXS::Version</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-perl/Sane/Manifest b/dev-perl/Sane/Manifest
deleted file mode 100644
index dc86f27993d8..000000000000
--- a/dev-perl/Sane/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Sane-0.05.tar.gz 39417 BLAKE2B a19873adca3254a693c353433ba3d584311f3f39b4ace8ef26c1a42c968597b115b85e15a8b05b9c89194bc94e2363e2f1af153d81d5cad1d12217849f12510b SHA512 03e67ffbc5d89b3e2b9c7d4c0221c1dadfd4f2ea0c33c761f599e1ea953dbbae24d5d78780d8a3e660550105550901b37a4ec67a3ccaf7c56a1b713e1fc69473
-EBUILD Sane-0.50.0-r1.ebuild 498 BLAKE2B dd95ae07006d84d5e9a1c66113b855d0c72f9f42c63c8cee7c94ac329b4fc76b89be267f7f73a782cd19929994e486040e87939a89593720264efc7b0f49b046 SHA512 233fd57fd23827c32dc9dd1554ca333a6eae21b2008af911e4d96f0cf7effbdeeb3b870648fcc7857ff5bea758d8de17850b3cb53b9d475d62a2ac2fa3173db8
-MISC metadata.xml 497 BLAKE2B 8cb29f93bb509041d66cb7c98c7a2adebd2b75bb771fcbf7bbb68a3442254249eab47ae681e7959e1192b9af0b179b36128c6c673270d7e4c86bc72d516713cf SHA512 fd32f728ec83f3a5f66c2b3d4f59bd8616f4e1e431c4406a389fbf114a44ec6ce1790f5462ec5e0dfd4af82261c525cbf4058153753eca3bea8ec1d18233b78b
diff --git a/dev-perl/Sane/Sane-0.50.0-r1.ebuild b/dev-perl/Sane/Sane-0.50.0-r1.ebuild
deleted file mode 100644
index 7e8ef9d930af..000000000000
--- a/dev-perl/Sane/Sane-0.50.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=RATCLIFFE
-MODULE_VERSION=0.05
-inherit perl-module
-
-DESCRIPTION="The Sane module allows you to access SANE-compatible scanners in a Perl"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=media-gfx/sane-backends-1.0.19"
-DEPEND="${RDEPEND}
-	dev-perl/ExtUtils-Depends
-	dev-perl/ExtUtils-PkgConfig
-	test? ( dev-perl/Test-Pod )"
-
-SRC_TEST="do"
diff --git a/dev-perl/Sane/metadata.xml b/dev-perl/Sane/metadata.xml
deleted file mode 100644
index 17301e03e2c9..000000000000
--- a/dev-perl/Sane/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>perl@gentoo.org</email>
-    <name>Gentoo Perl Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="cpan">Sane</remote-id>
-    <remote-id type="cpan-module">Sane</remote-id>
-    <remote-id type="cpan-module">Sane::Device</remote-id>
-    <remote-id type="cpan-module">Sane::Status</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-perl/Search-Xapian/Manifest b/dev-perl/Search-Xapian/Manifest
index f081d7863d8b..11b9caeb3ed0 100644
--- a/dev-perl/Search-Xapian/Manifest
+++ b/dev-perl/Search-Xapian/Manifest
@@ -3,5 +3,5 @@ DIST Search-Xapian-1.2.25.2.tar.gz 72424 BLAKE2B b959e1f111def3660f17669e49dfa9b
 DIST Search-Xapian-1.2.25.4.tar.gz 75336 BLAKE2B 06e3fe3871f00c173f4c24303b33eb046867dda1274535c1d22b98027804df19b3dc6b80d6213c2090e05362c508d0e41b55cdc165ccedd8a45bfff19d4fe07b SHA512 14d34641583fb3cce3e7cd4b16e5001be9c7808d07e4942b4842196f36906649053d1ff522a5a1b82200ecd714c55afaf7bd653bf7df9a462db91d05cd12cb01
 EBUILD Search-Xapian-1.2.25.0.ebuild 873 BLAKE2B bc226da3bf9c941a86880b6b6a3735cc511725c2de3a7227541f972c93e68289d1b06c9337540da890d4f591e6299af0d4ee165aa4307d034173f21105a703e6 SHA512 22b85448a5981ed6a176428695194da8b2b8bb9e6ade50eebcd7368ee2f974f89b1db72e862894e4ae8f3e33878be8de94c46926e21bcb841697d0a77c431d53
 EBUILD Search-Xapian-1.2.25.2.ebuild 878 BLAKE2B 1de43b9f1c282a8112afc609bf8f6e2203b0a173edcaea8b7088451a07af494aefa2af975b358a2c30a9e5a319aa88b4f3f30a959315f1683219142455f6cac9 SHA512 24bcbbc2e297e5b22d07a6b3b85362097b1bd5ed51db5e3e5cd7de3e60477b87f3e887ae11d4b068178712963e08c615184f56c9c100c5717291403680530af4
-EBUILD Search-Xapian-1.2.25.4.ebuild 878 BLAKE2B d4a44b3c3cb8f4a4c5c0ee47c3ad610e25eb7f7ca3e84956f28e6c80fbb1e5bcdb6f9607fdda2f75167447bb13a3a49b78717da1cefaf02a79c0b5e82dc9bd9b SHA512 4fb234ad27eaff0d2c6698700475df0e470a7140081f646d0819edb9687a0c0c5be6cbce7e25ea3bc182abc7f30ffe2b3f62150219e9533e95cb5a1874b809de
+EBUILD Search-Xapian-1.2.25.4.ebuild 877 BLAKE2B eafc6679fd20d22ffeebe3f5193fdc0a31f14b087b53038b7dd70865f3e6b076cc63a40c59ea0e9ae1a59b992732d0940b27702b42ba9e5946aa91ad03633bea SHA512 c9e326bdda7e3b24e7453ac6e0194791de37f9122fbc095bf10695cd6d820f02ac9e085075458085e139634caa737104963f994d01cc877411d3407797132e24
 MISC metadata.xml 3929 BLAKE2B 9b11bf5990a09722eb6a8352791c5df25f6b99c4c877dd381549b875519a5d923c1d55153603a1983941473103d7960b6de4368c99d078a7241302b1e7104594 SHA512 37f1f94a3f429144f0e7e9d801e763d18de8def1b0a066e4acadd168cc9f291103c456b29726b995777554235ebf62f2af20c18db155a13ac9f15955cd6ff077
diff --git a/dev-perl/Search-Xapian/Search-Xapian-1.2.25.4.ebuild b/dev-perl/Search-Xapian/Search-Xapian-1.2.25.4.ebuild
index a2cdfad546c9..a7dd5a44c26d 100644
--- a/dev-perl/Search-Xapian/Search-Xapian-1.2.25.4.ebuild
+++ b/dev-perl/Search-Xapian/Search-Xapian-1.2.25.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ DESCRIPTION="Perl XS frontend to the Xapian C++ search library"
 
 LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Set-Object/Manifest b/dev-perl/Set-Object/Manifest
index b9b10fcad1e2..ca753245b856 100644
--- a/dev-perl/Set-Object/Manifest
+++ b/dev-perl/Set-Object/Manifest
@@ -1,4 +1,6 @@
 AUX Set-Object-1.38-no-changes-pod.patch 948 BLAKE2B 34eefbc5e164e646982bb5926331996026273a9e858dfb7d4fd35da96a9b1b7450ba8d739a20f1f82fb4cdc4330828ada97555572f08603c2fb585e6c4e0e62c SHA512 3fe3d2a8ed4fbca0cca4d37cb8a5e4f9ea833174fb4b85f1a6b49d5c0ab7e9d9fd5cdae21a65c43a33baa3bb62c2fdba7120474c176a24882c5b93ab4313153c
 DIST Set-Object-1.38.tar.gz 80719 BLAKE2B ff7a42a2fd1f368d58bbc73bf10ea3579c952b49a826e47ac9e7ea3c64a792117fd55b2f52979c51ec8964f2abd9c0f5c2f05211e0c7a407e7f37e91ab3486f7 SHA512 fa0411f543fe1837d7c07a07a99d3b8a3735162fb7b665060870cec8edd40ab39eed74791ce2aa96b9ca04a8e773d810ba979508b03f8d4698e8d844f62bee1a
+DIST Set-Object-1.41.tar.gz 82292 BLAKE2B 84f54851704d0695a59838cdf0b75d010eb8600496842c206ebee9df2f2221401d39df7d1fb35a086fb427b23fc2fcb1debf9e8795bdb7d0c8fb3c62fe7d2112 SHA512 e7e701439c32acaa79c579d373d51db1ed908c2fdd48943910e53fb99578017d06fb3925a3d68c13318267f2940789fc8c775004c2f8a3a06d0b8f03c685fc33
 EBUILD Set-Object-1.380.0.ebuild 659 BLAKE2B 59a3dd684fd6194328130bbf6402342133fd48771c4f59ae1feef27c0923283e8dff344592fe20268c982785b5e49591389ecc7954b900fe2b0d9b045ca1b8f7 SHA512 f0bb47841425bf804204bb8d808a5f4d60287de86a1a6d4a362a45b7f7bbf2393adc9302fd61583e50ef57a32f4aa6c9c83d29344a0f3a3bae436a6c2f158787
+EBUILD Set-Object-1.410.0.ebuild 617 BLAKE2B 037e95209557abdfe19201f3afa5c287a6438af142315af5264a328b490626bc9a74c33a44ffb4a65a9f053de97d87d49a92688f9cb5fb5f4193b04cee339b3c SHA512 e7a7025b0fb63f029793362decf473870668283ae16571d43d23c1e900a0ac69979c7cb1ba067f3675d467c747de87a572d11fc8548faec06b2fb83ecbdb85f9
 MISC metadata.xml 591 BLAKE2B 290b35c34d36e140473335465675bf100a15cbd05e362075987899fc87ed7708cfa2fd1107a7840f75d85fdbc95af0477f18e63a4b28ac91a0f5479d57b4053f SHA512 097eb18b763d48e54584bc8d03e305105e7af1329976be0a20c9244605bfb40bb941963fe2178ca28da7d8a8a1e7f3f5716df6c63345f9e9188d8e119b6f11ea
diff --git a/dev-perl/Set-Object/Set-Object-1.410.0.ebuild b/dev-perl/Set-Object/Set-Object-1.410.0.ebuild
new file mode 100644
index 000000000000..d1b08b287dd6
--- /dev/null
+++ b/dev-perl/Set-Object/Set-Object-1.410.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=RURBAN
+DIST_VERSION=1.41
+inherit perl-module
+
+DESCRIPTION="set of objects and strings"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	virtual/perl-Scalar-List-Utils
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
+
+PERL_RM_FILES=(
+	"t/misc/kwalitee.t"
+	"t/misc/meta.t"
+	"t/misc/manifest.t"
+	"t/misc/perl_minimum_version.t"
+	"t/misc/pod.t"
+	"t/misc/pod_coverage.t"
+)
diff --git a/dev-perl/String-Util/Manifest b/dev-perl/String-Util/Manifest
index 47527fef25c2..83e8e324e3b5 100644
--- a/dev-perl/String-Util/Manifest
+++ b/dev-perl/String-Util/Manifest
@@ -1,3 +1,3 @@
 DIST String-Util-1.31.tar.gz 23401 BLAKE2B 0a2b3e2157e2ded38a6a8ef1d139a5dad91bf000170644891574fcaff6813c9ed4886d0aad8322c29173302f3f9c107709bc245af6a46660c21f5b6e8836eaef SHA512 75283ea5b8dbf9933c94c96da71ace8380cb74c9848c35c4c5377ae00aeddd0851fbee8f3506ee4110e9f278b725aa0376d261424bd78eec6f6e32e2f3fc8f9b
-EBUILD String-Util-1.310.0.ebuild 500 BLAKE2B 8a1c25120fb2cf0a029cf4695245bebdfbe62fb4fdbabf90385bd7055e1ad9dac4049db1136caf7f1b87c97c4430f106e613acba331b2f0168f6b99aba05c9f2 SHA512 2cf52ea5c0f04b378358cb6fb35fcac7ba663ca4088ce29cda36f3e07dbbcdbccfbd42fa5f169aa0bd366abbebde489151d3a736e5e020cd5888e0df94c370bb
+EBUILD String-Util-1.310.0.ebuild 497 BLAKE2B 89dfeb7b1654256af4c09dc44f00bff3ef1ff366dfa34c683e3f29077028e92a4428343df5ef1bcc071addd56679b077b8287a90ab1d51d25c391e304185f574 SHA512 aadbaf29f91caf48c67af15c95a725e8e41f96b944d5e0b86b64856112a0dc4ecd08b24472d4dcec1daea48d6135a173e34ce7ffd63722852ddf37bc7319d537
 MISC metadata.xml 394 BLAKE2B 9a0f2f851152156cc1bdca90c310ba1e2e293efbeab4bba65bdf69057f18c4abe8c2a4df0d20905a89d08e5669db173d61c4931378121fe19b4a7ec876e70f34 SHA512 0de4f744a7cbd22b7549972001e4f594b66cf05a2d3b77b8a6be9d596301eac9cfaebbb4eb3ca38f9400a570b689a952f46bc8a26458a30f12a69c4d46b2ac41
diff --git a/dev-perl/String-Util/String-Util-1.310.0.ebuild b/dev-perl/String-Util/String-Util-1.310.0.ebuild
index 624249493aea..8b1ecdabe63a 100644
--- a/dev-perl/String-Util/String-Util-1.310.0.ebuild
+++ b/dev-perl/String-Util/String-Util-1.310.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="String processing utility functions"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Template-GD/Manifest b/dev-perl/Template-GD/Manifest
index af0afb71dff0..1451cd3a4554 100644
--- a/dev-perl/Template-GD/Manifest
+++ b/dev-perl/Template-GD/Manifest
@@ -1,3 +1,3 @@
 DIST Template-GD-2.66.tar.gz 12827 BLAKE2B f69506abfd9533c1aea95eff90c15f269373cf3d967d0d6c22851fb57563ded061cc39d1ffa933ebb992c5e0d7c863a9e61febe5b693b41cbbb9eda407dfb433 SHA512 676b9a2345dbdf65b276a2cf2e50033d91ad958fc579d4bd02516baf9994cb1ca64edbedd320da0eb58738783054f8a58e358bc1da5c128bea98d4f031b0c84c
-EBUILD Template-GD-2.660.0-r1.ebuild 503 BLAKE2B 75105a403912271ff3f105ab1f4bca0b6c1f393939532604f82474d75b112f2d95f98e6f5b838b057e9c42b4b5a5fd39a4bc810e4b7a8951be2b53262f03c752 SHA512 cb70719497491068248c3b26ea80502f95a0a51460e67bbc9c75f63c033711b0269807405e93f8ee3c3ba2801935fa7a4f92baed3c435ff46f6821da5f85c761
+EBUILD Template-GD-2.660.0-r2.ebuild 506 BLAKE2B 9d66978c4342b04d8ac6153a73e922d5478e3f64b2281f2c921ea57a061ab252e0a8e426cb2c3ffb4bf949ff414ac35c72813fc12e6f9dfac1a8a874d7630704 SHA512 1581bf3724a6d1d4af2df37050b310fe745df7db2c900d2eec90cf102e3f10a4e6e4cef5702d4aae80ca660278cfaa10d6c92ee1041446e9a740f9d4c8474ae5
 MISC metadata.xml 1678 BLAKE2B 042a95db74d0b940890ee0ec2bd14d27416a74ea0f5fea3416f25597e7c6727667f0e37e7dd24b527395871a98b40a0873614d5e59f1faa17878c1dbad17abd3 SHA512 acf0ace53079ece9c44ff1f956a3d3f7ec533a6c22ec5ff6c06798d181216d43c6a1ea64c093ef857ea99bf5d1399fa29612f5cba2500c2c99bba695d6eb310d
diff --git a/dev-perl/Template-GD/Template-GD-2.660.0-r1.ebuild b/dev-perl/Template-GD/Template-GD-2.660.0-r2.ebuild
index eb06ad545ba9..32993ed15f52 100644
--- a/dev-perl/Template-GD/Template-GD-2.660.0-r1.ebuild
+++ b/dev-perl/Template-GD/Template-GD-2.660.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,6 +20,6 @@ RDEPEND="dev-perl/GD
 	dev-perl/GD-Graph3d
 	>=dev-perl/Template-Toolkit-2.15-r1"
 DEPEND="${RDEPEND}
-	test? ( dev-perl/GD[png] )"
+	test? ( dev-perl/GD[png(+)] )"
 
 SRC_TEST="do"
diff --git a/dev-perl/Term-ReadLine-Gnu/Manifest b/dev-perl/Term-ReadLine-Gnu/Manifest
index cfd9e27ba4e0..c4f9d773a5f3 100644
--- a/dev-perl/Term-ReadLine-Gnu/Manifest
+++ b/dev-perl/Term-ReadLine-Gnu/Manifest
@@ -1,5 +1,5 @@
 DIST Term-ReadLine-Gnu-1.36.tar.gz 128336 BLAKE2B 03791d1e486bec605c65b88a4549a023b2ca51c8fa96f36dd05d573516a7c776e6a827446a2b0d3907120262cec3dbbba4a770a3e0bd5e3ee27091ae70fb4778 SHA512 be576c45808744b9e6ae703ba170fc19f8cc4a63e6c8d74486159ff44c6763815bded11c7a414a491553e82041da2e4c5f197785e91a461118b4efa7fde240e9
 DIST Term-ReadLine-Gnu-1.42.tar.gz 197745 BLAKE2B 9b824310d81257f097ea9fd7848bf1f49cacb1e5d903d953771704a0ea5882da6a0fd0a293046345b8dd64ccc3d132cbd1db572912e593015b9e2d9f2f740115 SHA512 8f62cb14432f9364b1a3cea708d3d648bc7df2bb7fed2b3ec7af389fa183bfbe1bec3020b184b19a267217d47a3547f52a20d75f17c13ba89684759084f24471
-EBUILD Term-ReadLine-Gnu-1.360.0.ebuild 444 BLAKE2B 97c02974c8ab3808b40999c341b5578d4d962414c7d71599ac95ac52747bc903a10e3a8cafe5a10c3bd4be62bef1a23fa27eee1a48eda385ea11b5d6da376cac SHA512 613c1559c690bd97d78696ea2f69892cbe547900145feb4a28570ab6652a7785b5812670384fbecbbf44dfdbe8a6eeb3a7a99c161776c1253bded531858ae8ca
-EBUILD Term-ReadLine-Gnu-1.420.0.ebuild 494 BLAKE2B 8c1384ffcf87dc0f35a727384f61d123dc46c5769237e3f4ad01256bb1872f904a5526428d95bc94148485a991f63176289ce327b6b550a5fe23e65b18ef1f85 SHA512 68e717765e609e90cff44c669197e78e8aa756c540b625b7d6eb9f417dae749fbde026a8b40fb5ff19c9c35d8f8ccdccadd7948493f25bce70873c5ded39f5cd
+EBUILD Term-ReadLine-Gnu-1.360.0-r1.ebuild 468 BLAKE2B 0520c9c808f7bd698a79cf728964d3f7d5cdcea6204012509d2bd2ad144911b995b9d41d1c341e1ad0586e989943474aea3fda49f16e4b13f6e4c5bb3616066f SHA512 74b6ed60f40533ea733cd08156f4ba456e2463f6308572d898f2ec56de6aae8855cba02c8cd45e61cf04b493ae3fe602a5a1514cc8d734cc77fcb754a3bf20a5
+EBUILD Term-ReadLine-Gnu-1.420.0-r1.ebuild 784 BLAKE2B b6c9e5f47d2e7dbd8c99bfd147c0b1c1a845b4e58a25bc11e29c92d638c5c266f0234589337f29c3c03428350f8141573e677c93960f147d607f5eaff9c62a22 SHA512 04f006a2db1c73dc2b5006e02e4b6abdfe34c3a9873a8557e8d1b222aa5b11043e4543b7ce8a621255ea606a22f9d89a51c1ea0681e14ccbf714030f0f9fc023
 MISC metadata.xml 618 BLAKE2B 1869201a091b8ca507f4c5f14172bec36d6a1afce36a8fb2c40fbfcefb22e5b30dabd389b7197876f4ac4f4149e360e7a2ff6d338ff462f7f23dac3bed617cb5 SHA512 e55aac406591e036f205537227ab63093284c062fbb7b2f82904dbdc592a4329bdbd98ff0de17bb1c3e2a18593246acd8bfc55a9480396a46e2d1335bb9445dc
diff --git a/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.360.0.ebuild b/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.360.0-r1.ebuild
index f4c04f5412e3..474a964cf34a 100644
--- a/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.360.0.ebuild
+++ b/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.360.0-r1.ebuild
@@ -14,7 +14,10 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND=">=sys-libs/readline-6.2:0="
+RDEPEND="
+	>=sys-libs/readline-6.2:0=
+	sys-libs/ncurses:0=
+"
 DEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 "
diff --git a/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.420.0.ebuild b/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.420.0-r1.ebuild
index 66ff4fa82958..e2e3785ea442 100644
--- a/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.420.0.ebuild
+++ b/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.420.0-r1.ebuild
@@ -14,7 +14,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND=">=sys-libs/readline-6.2:0="
+RDEPEND="
+	>=sys-libs/readline-6.2:0=
+	sys-libs/ncurses:0=
+"
 DEPEND="
 	${RDEPEND}
 "
@@ -22,3 +25,12 @@ BDEPEND="
 	${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 "
+
+src_prepare() {
+	default
+	# search_termlib() selects termcap when sys-libs/libtermcap-compat is installed
+	# despite the absence of libtermcap.so symlink
+	sed -i -e \
+		"s/search_termlib()/search_lib('-ltinfo') || search_lib('-lncurses')/" \
+		Makefile.PL || die
+}
diff --git a/dev-perl/Test-Compile/Manifest b/dev-perl/Test-Compile/Manifest
index 3602d6be0b4b..e4a876bbfd52 100644
--- a/dev-perl/Test-Compile/Manifest
+++ b/dev-perl/Test-Compile/Manifest
@@ -1,3 +1,3 @@
 DIST Test-Compile-v2.4.1.tar.gz 18425 BLAKE2B 604626b07772241f0ab306b06de70223a25673fe944e66c1c031dfe0e55610f7ce1cc0222bfc839331b2f10bd63168100b9e07b1013dc8ca96d03bd53848d3dd SHA512 e6878fa16544be75581144d125f547a799cc79210b925b86f07ad236395026bdc197c22af1820e893f5887e53933f0ba827377ae133752f63076cb436b624aee
-EBUILD Test-Compile-2.4.1.ebuild 821 BLAKE2B 62e4228c3881e3119220c22fae544a5aabfb3997bf2476ba9c47cdd2a224ee570f6dddf910e690dad099f4863b7b9eb0ef4ddc07b6833481397a1a983da1f026 SHA512 2de00f7f79ea0ae37640cec4a455553da42f1c38bbb5f999058224ff5a1e5914dfcc2b79bf17a5f0b149ba0979cc66b312f0a9f7ca80239157a954a977848aca
+EBUILD Test-Compile-2.4.1.ebuild 817 BLAKE2B dac73ecef37b46ba6c9063a85131d3e85de449f0101b528b01022ea464a6e77213858e83e65887e73d3878a2e4c78fe4dd6ab2599fdf9b49f5085ef0a328d11c SHA512 723cd97c65465e13f13a97585fb7be9f1af4f2691215081214ec3bfacb9b833e0232a717b30a91743f61a1b7a6de62026e340df327b5c622ac4a2d9a24fbc132
 MISC metadata.xml 466 BLAKE2B d130f7563653c0c2ece62d8550ab310763c769b34bf3629df95c6a74fcdf62d6522c4643525119057fc6fd29af904a26f5711f8d991980fb62a766b7ac43ed8c SHA512 a5ebc2d397ea684f950030e00f144fff6832b9adcd5b84a8f743622b0629c6c4cf96f2c6da58b850650b770906f48eba4ef032fb10d51de3c5e6a28c85547e10
diff --git a/dev-perl/Test-Compile/Test-Compile-2.4.1.ebuild b/dev-perl/Test-Compile/Test-Compile-2.4.1.ebuild
index 0ccd47f6d386..33904272b421 100644
--- a/dev-perl/Test-Compile/Test-Compile-2.4.1.ebuild
+++ b/dev-perl/Test-Compile/Test-Compile-2.4.1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Check whether Perl files compile correctly"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ppc sparc x86"
 IUSE="minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Test-File/Manifest b/dev-perl/Test-File/Manifest
index 5ec03c08c6db..cf2237f18fde 100644
--- a/dev-perl/Test-File/Manifest
+++ b/dev-perl/Test-File/Manifest
@@ -1,3 +1,3 @@
 DIST Test-File-1.443.tar.gz 27065 BLAKE2B 0f1568dbb27aa2aaffd13cc1d8327260e4bfa03fea01a80a810c0c10fdb1a18b3ba6fb5c50212d8956fa14dd0114438dfc7c3523495a20f8f35fdd13734a87c5 SHA512 9ad66b3a9dc1c3752a4ec22934db9139ac010ac3237a3de018d4ec4a65ac047f0152ab9e7979a2615412c1af02a1f2dfa0dbfdf5eba5358628b1b443232c45b2
-EBUILD Test-File-1.443.0.ebuild 705 BLAKE2B 4c90d4f24bc0e3153115c09340322efdf6d90a16967afb9427e2fc40ab4e937413fd50eb24818f677ed7af74a1f2996ff844bfb1ec474693443ef00463004b71 SHA512 adfb473c7eaa340aec2a0bead568a2811433ad394c365150d57da255bc88495401e933247fe53a08bde77c7617b53ced0bbf6b3d3aa050e214e64fb6e813b9c9
+EBUILD Test-File-1.443.0.ebuild 704 BLAKE2B 5ab3c6b1afacb4b566cd475dd5a97bee56a31171d7bd3edb9a8bf141fb4bc9aa3906bf5eef6d2ad0aec631927dd9790093c02587a598b8c7e5e0d01258064544 SHA512 563f96f9a55edf8acda2bc4dba08e6b50843121924f1f253b2a6fb294c6075080f583cf089d989213c975ce084cae18112a60bc91c76d44fb6868bb2273226b1
 MISC metadata.xml 390 BLAKE2B 515dde783fa52220e00b4f58cc9dde38d80b6eed484bfb0bdcdf89f7daa62246f76dbc7bee8610b067f743af4ce9698ccc75c7d85546ca1f6f7f96d97378085a SHA512 93e9377cbec8728c2ff3c879a306c89e52db8af41443138c8f68fa4100a2965af2b97afab9426f4f64ddba7d88e52a123dec6976a253f7b47257172bf3140677
diff --git a/dev-perl/Test-File/Test-File-1.443.0.ebuild b/dev-perl/Test-File/Test-File-1.443.0.ebuild
index 44ac55105e18..ed0c6e7a076a 100644
--- a/dev-perl/Test-File/Test-File-1.443.0.ebuild
+++ b/dev-perl/Test-File/Test-File-1.443.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Test file attributes"
 
 SLOT="0"
-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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Test-Fork/Manifest b/dev-perl/Test-Fork/Manifest
index f96f68ac61d1..855c6edd810f 100644
--- a/dev-perl/Test-Fork/Manifest
+++ b/dev-perl/Test-Fork/Manifest
@@ -1,3 +1,3 @@
 DIST Test-Fork-0.02.tar.gz 4368 BLAKE2B 4e26f2203587a2ca66fede0c864d7f232c58fd0e172a26fdad537af95871784838acc4cc3c8c6485773ea9504778632d0b5e3b7790bb972528698ea7e2d35a7d SHA512 854f92eabc786735dfbc3c7d0ad29e4e65ee8c99bac1bebab79876c064dec60cbdfd7ef1f5a04d7a5f5dc73b633e903d4d68c4caedd5890914707b829bca46fa
-EBUILD Test-Fork-0.20.0.ebuild 340 BLAKE2B 0abd8350e066183da7a07b19f7fae4105acf3a0e4e9bdfa7fa3bcc251823e31e0d8ff7b87c4d121f4d6f56bcd0000273baa9f0edb5ac2a39a9d4a138280a273b SHA512 ba0b8161c42b16b9b2c6f7308f8e57423d187a32c7762533694616e131e1082a0c4676ff0e2d31bbc4ab6b0b0f0371ff665da5bc6a6f901b60df628243fc5769
+EBUILD Test-Fork-0.20.0.ebuild 358 BLAKE2B 3553fe868c4872748cb95cce92c57ca89c944bd0ff69cef3bb0af352d589864cbb5dbd5032639405e18694ee13fbf84ea7183471b6f1bdc0d5e434bbb7b4c8b6 SHA512 7f10cc0ee15350c7b4cf9e76c2d648e7343e190ba8a9706e93da0bf0941f70bcb9f7f4198857137f8d0576d79255739f76c73081254d8872d59164faa3154a09
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/dev-perl/Test-Fork/Test-Fork-0.20.0.ebuild b/dev-perl/Test-Fork/Test-Fork-0.20.0.ebuild
index 212d72844ee1..745225864f57 100644
--- a/dev-perl/Test-Fork/Test-Fork-0.20.0.ebuild
+++ b/dev-perl/Test-Fork/Test-Fork-0.20.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="test code which forks"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Test-Warnings/Manifest b/dev-perl/Test-Warnings/Manifest
index 82d8d421d00e..0082374fc84b 100644
--- a/dev-perl/Test-Warnings/Manifest
+++ b/dev-perl/Test-Warnings/Manifest
@@ -1,3 +1,3 @@
 DIST Test-Warnings-0.026.tar.gz 38058 BLAKE2B 0f53fdcda8557f96bc731ce8b5de93af95ca9bb2b8795c21072be22e128ffe6aecc98c09cb9810f4ff61d2c3fd6cbfb784d7c7fe62b683ee67c51bcd59bec62d SHA512 510e182299173fa01482cde642fe5d84a77ea2f3b1761c7d8bf855caed963f276134357b4d7662bb3fbf09621ac6e11451fe19bf0ba2cf96bc841c280a624cd4
-EBUILD Test-Warnings-0.26.0.ebuild 1033 BLAKE2B 118c567bab0bf90ab50661cdbb52d5db041b2bad55304dd9beb0cc214b02c9d6b70e1ab82e6cac51c1049abc57af210c5733ffaed340e09bf17943ec9f3d8fa1 SHA512 9f08103ef1e8fb9e3db5477fbafb8a7df41e09c42684c2b30bfd277295205bce92ee7df4d125c570ed499c7101bfbcfd1becf5458f385c1b0310195fa24a9d7f
+EBUILD Test-Warnings-0.26.0.ebuild 1032 BLAKE2B 383c24623685302972e81892208be8bfe397124d51d0c7543737357e478c0c9be9922b1267f9b755d4b99c5644c0ebbe112ccfbe07b055c28872f24be6c7de13 SHA512 5b56bac4cf7eb8cd588969f151cec7b73f3f7bcd3097e8cfcfac304623baeaafb1aae55aa914ae0e9cd0840fd992a6299500cef67c92a99c2776f04f28b23d1f
 MISC metadata.xml 479 BLAKE2B 101d3d1f8818cecb1230ac1b67b2ffd945dc65cc3bdc8c89d2caeca04d276b8dead20cbb0451803206799a8f75f17ce86e4c48515089554812c98ef8b93ba101 SHA512 d905a513ef9186d0f8842f206642ca9529f84ff4bef5eed91d4bf63340080b7f8454324259de254516038fc07b3e4468f17e7ef2f9ea978c4b4546c9cce4fbd8
diff --git a/dev-perl/Test-Warnings/Test-Warnings-0.26.0.ebuild b/dev-perl/Test-Warnings/Test-Warnings-0.26.0.ebuild
index 5ae1e46765a3..85597a38ad45 100644
--- a/dev-perl/Test-Warnings/Test-Warnings-0.26.0.ebuild
+++ b/dev-perl/Test-Warnings/Test-Warnings-0.26.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION='Test for warnings and the lack of them'
 
 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"
+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="test suggested"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Test-utf8/Manifest b/dev-perl/Test-utf8/Manifest
index 896ef3f2b73a..3a7327e1cdf1 100644
--- a/dev-perl/Test-utf8/Manifest
+++ b/dev-perl/Test-utf8/Manifest
@@ -1,3 +1,3 @@
 DIST Test-utf8-1.01.tar.gz 33308 BLAKE2B f6681d50e55e56e29cc9db7b724e5545f916b822cb510a066a4adf2da83a671ac499ea119cad56446c4ba4a3a0257a51f39ad8267efc893d9983c81fb50fc894 SHA512 07dcd5ed98a63f7d96bb0fc629b168773d02bb4c93c5bc44ec60738fc29669794547dfde5913f9de682cd583cf85f4d82b6151398aaebcfec9278525447b9c4e
-EBUILD Test-utf8-1.10.0.ebuild 580 BLAKE2B d3da7198e5023c7af8bb5089b790fe43048d61b39628973c7b67ebfc9fde88dea3426da51b52869fcedab5e176dd3ff02848792688f56a3c7ad6f726d1597a06 SHA512 bcd8aaacc4a4ccd0658e82a73f6b49b28e906bfbf8e24e19e8c077ebc78d295d181ae6c2d5ec9e721088fe11b7a4bf5185380acb26a5bab301c9c4c13bf85e2b
+EBUILD Test-utf8-1.10.0.ebuild 579 BLAKE2B 55f575179822857f534031ef9cf05a4560e2b10f4ea803c047ae36f20b8810df1b7b71dd9f8454a88b0791124e168a4194f610c000337fcc213359b28cda4b1c SHA512 abe9b42f3ced0b40f89fe9c4bee57ab0c27d5df31dfc5e3527f7c5f444c3de18bbd8fc3de6c22d2fc9625eb917ab4ac019d65cb987702e950cdb0986954933cc
 MISC metadata.xml 390 BLAKE2B c83ef0105dbc22593183aa9647f03a3005a894f7e3756d2b158280beada2f693ba91f7deee4ae7f1c7f4cd9db3c0eb5ee314d64330dd15a1ef7560a10f97ff2e SHA512 8766197bebb4765d647745c4e1db2e3f02a7a3a5bbd337387e7f8e5ff8b83b4bde724c3b521787e18979f6b0a708e7f7b1655e3ef60f4b74e892bb8de8b3ec5a
diff --git a/dev-perl/Test-utf8/Test-utf8-1.10.0.ebuild b/dev-perl/Test-utf8/Test-utf8-1.10.0.ebuild
index ab6d14ed2c25..f0de03b1e6a9 100644
--- a/dev-perl/Test-utf8/Test-utf8-1.10.0.ebuild
+++ b/dev-perl/Test-utf8/Test-utf8-1.10.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Handy utf8 tests"
 
 SLOT="0"
-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"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Tk/Manifest b/dev-perl/Tk/Manifest
index 85d49bd7fa4e..dc7bcd61304a 100644
--- a/dev-perl/Tk/Manifest
+++ b/dev-perl/Tk/Manifest
@@ -5,5 +5,5 @@ DIST Tk-804.034.tar.gz 6937691 BLAKE2B ee676f82bc805ecb193c2fe999c3d451281a16a4b
 DIST Tk-804.036.tar.gz 7024993 BLAKE2B 0ec47bc7f24af7ea5cf3fb539b2636e978a22707d591cea0a5c1ba9182a70afcf749a9fbc03fd2bf7e969ddb1a57572bd6e1b7b68210ad38b1804c877cb771ee SHA512 7d8b82127a5fdbb2f0387f541af8844a09f1230f377b92d511ecb12e81bfd5ef56d4fe925cac064a798a96a003bb8465b6df37cff18a960f3631bb3a214cd812
 EBUILD Tk-804.33.0.ebuild 1443 BLAKE2B f71521dffd03a23e126f5e200f69c5aba9a7dc6cbfe005e38320aee405be972cf004e2dc3cdb301470abcb422757a53a90c87a0151225007100f0d9a26aa8b23 SHA512 fbbd3e9ac68f6ae98a35350173918dca50d3f3759c920957d2debc68db73032713be935c189b4362b766f7327b17ad9eee8fd32ac39d9b5f2e37b43fc10c91ed
 EBUILD Tk-804.34.0.ebuild 1827 BLAKE2B 277e2ef72c9cce580cd1be5600cd815eeb4fe342d7c441adcb066a94fe3a488e7e9f8fad843948f755befa17dcaa66b275400297597eb080adade65f03d54475 SHA512 61bf0804f993fd7ba082fd47c2498a70b491e444f0a2c2c44e846082ab9d84f76068319375ad81e885ab93d2b7438f9c049a25e141f2c3e0c25957fc8811ad5c
-EBUILD Tk-804.36.0.ebuild 1830 BLAKE2B 6cf19b313d4a9d90402f5f49bdeb740fa191ea239c7f74a0fe9b63fe0198c8e71c1c6d2aee5ffa0ca9b737dc8069a40998e66293b2366d6f972ec33093df0582 SHA512 5b8ad8993c5615b9a5cd73189cd5906be8a655f6a77c308c3598545e1074a82d66675b41b88d92ffcd2f163538800fb61338276f31dd691ca3bf3157f947c11b
+EBUILD Tk-804.36.0.ebuild 1823 BLAKE2B 13877d0ed2000e65ebea998c9d0aa4c94a2658c68b19efdd6e6ad1d4b74e25a6ca76d8bed5850b5d78f249438f5208f07166c8c3e1958a11ee39545dd83429cd SHA512 40e584ab9eee31482b014663951ebaf89047b884862b89eed174eea24ca361db4145555afdae0caf4be8a9f600939367b7b69cfa6aa733b7f07b2e6ad8ba1865
 MISC metadata.xml 7605 BLAKE2B ce28a121fb707f71f6c4566086bb03e5f1b092ff1143cd73fd63d1b098de0757859514f7d03015451b0385af06de4df56bab939485625d07370e51b20d1b35e1 SHA512 cdde0fac0e4a3ef20a35635f5cf5b05340acd7ae205f5435800c1beb710cc2cac87ca2d4efb0c7175ac04dd5cf27cce08b6e85e12b45bd98623069afbd646b42
diff --git a/dev-perl/Tk/Tk-804.36.0.ebuild b/dev-perl/Tk/Tk-804.36.0.ebuild
index dad56628ee87..553881d55d1c 100644
--- a/dev-perl/Tk/Tk-804.36.0.ebuild
+++ b/dev-perl/Tk/Tk-804.36.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A Perl Module for Tk"
 
 LICENSE+=" tcltk BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-perl/Type-Tiny-XS/Manifest b/dev-perl/Type-Tiny-XS/Manifest
index e67f2e5817fc..720b89bf3713 100644
--- a/dev-perl/Type-Tiny-XS/Manifest
+++ b/dev-perl/Type-Tiny-XS/Manifest
@@ -1,3 +1,5 @@
 DIST Type-Tiny-XS-0.012.tar.gz 77259 BLAKE2B 6443598a77bcb3d630ff048d649f46659ffd8ecffb968b597d64a245d19dafaea3217c7a63c2bedba551f6d21ff1dbb02c005461dff282955838ca1c4dc75785 SHA512 488925d913872f1f5bf73d8b165b1e04bd8f86bda44d594819120760f79c877d4b1be9f2924712ceabaead8822710bd8851f8ff5bb79f91b07fa253ce9ef7a33
+DIST Type-Tiny-XS-0.022.tar.gz 81002 BLAKE2B c2d2feb551ddb4dd4cf558732692a8026923cc0da184d19b9263bb86a948dea8a7ba521598cedb00a26989ef2bf14340f975ce57bfff09997cb16d55f4bc88ab SHA512 6774980289ceaa7aa8517681cb2d4638a0020b4eb584d6e281d22edcfff829131f2472a4982c1d044e8aa96baf71381bed78d02a096507c7bba3ca137e63dbbc
 EBUILD Type-Tiny-XS-0.12.0.ebuild 608 BLAKE2B 41331be014ca0818e7f6d51443cd9049cc8d090d8234630373e33be9cec4b46a2caec643f3cde839eb17f117c52c079f47db139c763dc6c9c81d70abd1a5bbad SHA512 9dc3b85b915b8894a0689024a893e7c41b5292448ad7619c053ed67b54e2deb86f8eac366defc970cd2a5b3b6cfd667147a9b92d11a98d64abf7b049606cce84
+EBUILD Type-Tiny-XS-0.22.0.ebuild 612 BLAKE2B 7d319e1ce17c6ac871d1cf31b0a993bbe1e9a4686124a425bef9ebd4518226a682fb6428a3afe8540ba4100ff803893b4610396099e69040cd8ca4019f0b551c SHA512 140e1898867431d72895b4f0b16a6d18f637416d238f606993f51b29aadff0895b61a660be6dd8bd6272a90c2689fad2ec54b5d2872bb0f35774301e0d3e16b5
 MISC metadata.xml 450 BLAKE2B b5851e50574255cf3e6d9c25181c511c14770acf1ac669ecf24d6bc8fde7e7926b2621f0f47d01bf2dcfc0bbef01e400725d28bae1a4200e049d7a122187b8c1 SHA512 0f3d348a16193d537d1e693556b5400a9ef9001e435b638beae8a87c4c23ec416cd1310a6fc56378dc0565a9e133a57343260bc5d445097b932868bb92510ac5
diff --git a/dev-perl/Type-Tiny-XS/Type-Tiny-XS-0.22.0.ebuild b/dev-perl/Type-Tiny-XS/Type-Tiny-XS-0.22.0.ebuild
new file mode 100644
index 000000000000..43f5105c5a9a
--- /dev/null
+++ b/dev-perl/Type-Tiny-XS/Type-Tiny-XS-0.22.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=TOBYINK
+DIST_VERSION=0.022
+inherit perl-module
+
+DESCRIPTION="provides an XS boost for some of Type::Tiny's built-in type constraints"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="test minimal"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!minimal? ( dev-perl/Type-Tiny )
+"
+BDEPEND="
+	${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.170.0
+	test? (
+		>=virtual/perl-Test-Simple-0.920.0
+	)
+"
diff --git a/dev-perl/Type-Tiny/Manifest b/dev-perl/Type-Tiny/Manifest
index 1162d13ad33a..e0f847a28788 100644
--- a/dev-perl/Type-Tiny/Manifest
+++ b/dev-perl/Type-Tiny/Manifest
@@ -1,3 +1,5 @@
 DIST Type-Tiny-1.002001.tar.gz 264950 BLAKE2B 2e5e1303834c6fb3b95855533c219a5a448e711b307532851e24fb9850fd60505ae8bf7a17d5d6630d065004f3bd8e11e7b58f9abad11048058ceb324375779d SHA512 e499c4f113e5a327294012daac9f0cd60a42a6c40b9d0c9c523a229f574a7dd0f672f209d0596d25edcbc39b79cd2ea65791b6a5146345e75fdd1d84ee1cd161
+DIST Type-Tiny-1.012003.tar.gz 464004 BLAKE2B 2fc4f2c9e4be295742309edbc074cd23e9d1a02f7a385808a40f8e7c0885a4b29cee63947b9b008d70d1e66529185ffad56bc7ff4dcf3f617b61ea454733a491 SHA512 d7bd3c416e20a5a951606d05a2fb396a4058cb6f165b401c7662af3d21f416c26ac0df70eaa6d483db3fe2d78e8fb4f02cf5cf71ebc353a744e3195e77f6ea42
+EBUILD Type-Tiny-1.12.3.ebuild 1001 BLAKE2B 25120696814b74e7f0ccfc04e5619bf266173544fc1bb27657a717fd34acb06633c6d790790cc1508c57c4368f1439253b6625f9dbcf726659dd4219bb48039d SHA512 8550b17ba684a30985441789c1678ab35d7ec79b3abd1eedb5e4d8ba4c041ea2a85f1a4ec792d38e4396cdef8cf42faecd326e4677bc5ab20c5828b7a9d55041
 EBUILD Type-Tiny-1.2.1.ebuild 998 BLAKE2B c811a58e56f5487a162b2728ee3021030568d7e628e5e7a9ad4e0321af467b2ecf7ac13944f256c3700809eb117edd08b81afc42c69e7499416b0b3386c3eaae SHA512 e78fa80d855805e2ae4b24753ba9526a2f885d41344ad25bb7afe31b838cded08ef4fe4c91afed91a30fae911563b0c1d0e111bc5f758f1c9daceb523eb998af
 MISC metadata.xml 2672 BLAKE2B d826f6a8e063abb1929df72b1d6d6614858b0b1f8af40796bf0680f21797843bcb0fe3f7c48576126727552dd25738b94cc8f6e52f284634155678875cc4028b SHA512 882cc76f5a8dc488bb254674ecd1a0c7753dbdf7201e5d4f78029d1e1024148bec60b87eff517f36243ba83464c40e9611c9889923f7e9b87883cb05a1bbf66c
diff --git a/dev-perl/Type-Tiny/Type-Tiny-1.12.3.ebuild b/dev-perl/Type-Tiny/Type-Tiny-1.12.3.ebuild
new file mode 100644
index 000000000000..34dbab8a2888
--- /dev/null
+++ b/dev-perl/Type-Tiny/Type-Tiny-1.12.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=TOBYINK
+DIST_VERSION=1.012003
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="tiny, yet Moo(se)-compatible type constraint"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="test minimal"
+RESTRICT="!test? ( test )"
+
+# Test rdep for Test::TypeTiny
+RDEPEND="
+	!<dev-perl/Kavorka-0.13.0
+	!<dev-perl/Types-ReadOnly-0.1.0
+	>=dev-perl/Exporter-Tiny-1.0.0
+	>=virtual/perl-Test-Simple-1.1.10
+	!minimal? (
+		>=dev-perl/Devel-LexAlias-0.50.0
+		dev-perl/Devel-StackTrace
+		>=dev-perl/Ref-Util-XS-0.100.0
+		>=dev-perl/Regexp-Util-0.3.0
+		virtual/perl-Scalar-List-Utils
+		dev-perl/Type-Tie
+		>=dev-perl/Type-Tiny-XS-0.16.0
+	)
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.170.0
+	>=virtual/perl-CPAN-Meta-Requirements-2.0.0
+	test? (
+		dev-perl/Test-Warnings
+	)
+"
diff --git a/dev-perl/UNIVERSAL-require/Manifest b/dev-perl/UNIVERSAL-require/Manifest
index 31eec3da9bcf..1d5928b033cc 100644
--- a/dev-perl/UNIVERSAL-require/Manifest
+++ b/dev-perl/UNIVERSAL-require/Manifest
@@ -1,3 +1,3 @@
 DIST UNIVERSAL-require-0.18.tar.gz 5885 BLAKE2B aef7f3e50978ddd4fac08eae9f41b2b7c49297a2175a19b40a813296980cdd2a699c678b13eb4f37b60e21db81097d3726bbb025cd1eac6452fb21a33e6ae7f6 SHA512 4e1dbb62f850a2f3da3301e37862d03ad89106e9fd55ac8161ae56eff936948f87b9215c734c103d8031e1b712847bff86de43329f65f00e7e34ee83bb66c22d
-EBUILD UNIVERSAL-require-0.180.0.ebuild 521 BLAKE2B 0272e2048dddde9002d7b3bcc2993163867d0a24e42dbafad610f77d7f94cad77f4d82359cbf6d153bc60666c1e39def240290abe6b203542f0a83fac8c2b4d9 SHA512 5df5612ab5dfe7ed6d04b294238d0dfcd0134ea7094e95aa9cc0d3c83035e37af3609a19bf259245ce4fc8ab0387c398ce8288f7f6d335967b524cfe7323267c
+EBUILD UNIVERSAL-require-0.180.0.ebuild 520 BLAKE2B 66351ea45a79e1f65fa7be8681c212772d53f08353fb70a491a9e8a8d114db78cca31cb0a76da6d292ceff51737bd13c0c85eeb3f087fa7c4ee0d6b5077c50a5 SHA512 f62cffe43e4ce63f9af8056e2fcc7b54513374669000241ed465dc1288a77bad5375320cb485e9e1cdfd52ddb2ad8d0d5ae3fb0bcc66f0997bcc26ce68b989a6
 MISC metadata.xml 462 BLAKE2B f80c2cb0b82bcaa4c74fe93dc6e91bea4533a73b413f897fa7ad50ba74af9b6be40f4d257c6482187d6932bb71e7bb23971cedeb216550b6c508a25b9453e6e4 SHA512 648f7218d6c5e82054e01156f7e041f605ce8ba1d20f82b0110a3ea28ac507e95e82da440177a241506bd3d6b5a37a475375d413c67fb646c7c15fee958145f6
diff --git a/dev-perl/UNIVERSAL-require/UNIVERSAL-require-0.180.0.ebuild b/dev-perl/UNIVERSAL-require/UNIVERSAL-require-0.180.0.ebuild
index 931da363d3d9..c467808e7937 100644
--- a/dev-perl/UNIVERSAL-require/UNIVERSAL-require-0.180.0.ebuild
+++ b/dev-perl/UNIVERSAL-require/UNIVERSAL-require-0.180.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="UNIVERSAL::require - require() modules from a variable"
 
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/URI-Fetch/Manifest b/dev-perl/URI-Fetch/Manifest
index 13ce78c74186..60342acec5ee 100644
--- a/dev-perl/URI-Fetch/Manifest
+++ b/dev-perl/URI-Fetch/Manifest
@@ -1,3 +1,4 @@
+AUX URI-Fetch-0.130.0-min-perl.patch 296 BLAKE2B f1b4bcc7a876aaeae46207d43f32d9ec042fe3dbe2f7a8eb0216b2329480442f7a21b0b6335803fc8ecfbe7f838e2452310edcefdc92b98f33d2587566ec4e9d SHA512 956f9db8c68e7cb8c0f828e175b1399a40aa967d65a4fef747ec7ff4f3202d31b7c8f9830c1e8e371df51747b447ebcec75a97f1b4eb5c4135e810a6d0261be2
 DIST URI-Fetch-0.13.tar.gz 16669 BLAKE2B fe99ed7f4a57d90060b5ab2b534096c6df667f1189647aa26de70202f2712e3c2be85b15306b1fd23aece22e8ddab33f0d52228bae4fba3a0bacf943b64477b9 SHA512 8df3e15bf49a7038b2a7c0d2d175bd69ed7fd6ba83bf13e65c18a46e356465bf57e1d725a6c940830dac3c3f3af294c56bb4685ede5181904b7c9a14260145e4
-EBUILD URI-Fetch-0.130.0.ebuild 564 BLAKE2B c7c223fab11cbb419d6b240df853cab4854c17c6daa6bc09919c9b55a8f2aadf2ee7b8ad481f4bed52513c4879799c443f9f14689014a06207e58ea7c495a80a SHA512 a861694faf804a7492932b31e31d99b8e59d52bbbb41ed3a22dadb4ea9487b45ca412a38079d8428ab89e4498bfc42864a34f5a3e36dd4345b448eaa94b5a48c
+EBUILD URI-Fetch-0.130.0.ebuild 612 BLAKE2B 00fd2ac35e63d2beaa870cf5f1d096e4dca3bc90f535facd207a267cfe43f8f45528cb97f70f4101aed50817ca4489e8f5c254ca64664e5b3ae9ab98615a42f2 SHA512 d136dd0a23780511ea1efb523a401ef9c84c6c95ebfb3bace821b3fde253098237de4f79b17f5135328bfd6b046e8bad86a93686309fd8c990d0ca08ebffcfab
 MISC metadata.xml 457 BLAKE2B a1eda74ac934922d8ff0cfe2db1110c48127a18d7fbdb35c8579d010bd1289b9f722109c5c06e5845e443fd359e05f495646d1889408d5db0f6af92b943819e9 SHA512 395f973d9b80af5735ac498b4cfd180545651be1e6e91bafd155f5c393096aa940076085680882f333927b1ea634e15d12368e6e16fafdbd5253041a4891347b
diff --git a/dev-perl/URI-Fetch/URI-Fetch-0.130.0.ebuild b/dev-perl/URI-Fetch/URI-Fetch-0.130.0.ebuild
index 532f71df28f9..02383629c002 100644
--- a/dev-perl/URI-Fetch/URI-Fetch-0.130.0.ebuild
+++ b/dev-perl/URI-Fetch/URI-Fetch-0.130.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,3 +29,7 @@ DEPEND="${RDEPEND}
 		>=dev-perl/Test-RequiresInternet-0.50.0
 	)
 "
+
+PATCHES=(
+	"${FILESDIR}"/${P}-min-perl.patch
+)
diff --git a/dev-perl/URI-Fetch/files/URI-Fetch-0.130.0-min-perl.patch b/dev-perl/URI-Fetch/files/URI-Fetch-0.130.0-min-perl.patch
new file mode 100644
index 000000000000..3108055dd543
--- /dev/null
+++ b/dev-perl/URI-Fetch/files/URI-Fetch-0.130.0-min-perl.patch
@@ -0,0 +1,12 @@
+https://github.com/neilb/URI-Fetch/commit/20eba82783a5c08adc88ff1cdc7ee9433d63ae4f.patch
+https://bugs.gentoo.org/794676
+--- a/lib/URI/Fetch.pm
++++ b/lib/URI/Fetch.pm
+@@ -1,6 +1,6 @@
+ package URI::Fetch;
+ $URI::Fetch::VERSION = '0.13';
+-use 5.008_001;
++use 5.008001;
+ use strict;
+ use warnings;
+ 
diff --git a/dev-perl/gtk2-spell/Manifest b/dev-perl/gtk2-spell/Manifest
deleted file mode 100644
index 6c5cf8c2834b..000000000000
--- a/dev-perl/gtk2-spell/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Gtk2-Spell-1.04.tar.gz 17512 BLAKE2B bcbebd399609c289f04b76d466a1414ba0cf3d654dced50799b4300853a73556e4a0c2d7cb769bcd3084ba00e850c494b0ba8f345ad558e443a1808023b93008 SHA512 b0f71158e56efe561e9999066e896c92b90e9b046e6193fe0b96b4b8fbd4d10d9fc906b9313b4c5c5fbc93cdd33b710eea3170a9677bcdea46fa22032d19b960
-EBUILD gtk2-spell-1.40.0-r2.ebuild 676 BLAKE2B 36c911ed9f0ebab6623764cd48994320507401db4740fcea4477da91e38c9653aabb75ac549ab48da56634302945f647a438560c2a12c3730228a821b41da558 SHA512 2c932f717ba99050d654dbfe476a2a5dec0bf1db1b44e881e0e11f2f050d0a619592e27e7d9359c8d5f5158fb41824a016da9ef22822e60dae3cc8842fcff5ea
-MISC metadata.xml 392 BLAKE2B 34246fcc86a79ef40a96f50dba81e6a56883237b89ca80b2399eb726b80abe5fbcb045a4099955424e49adaa78708c14750e3f1527689e83f5b351b3fab4a40a SHA512 7998a8bc4adf67707626dcd9a388c12da013c787b2856c69a3178bd0472778b4cccb4d5df1d23d85413931feddc43b21febc6746d1e59abf84a8e19aed5d22b5
diff --git a/dev-perl/gtk2-spell/gtk2-spell-1.40.0-r2.ebuild b/dev-perl/gtk2-spell/gtk2-spell-1.40.0-r2.ebuild
deleted file mode 100644
index f22825e510af..000000000000
--- a/dev-perl/gtk2-spell/gtk2-spell-1.40.0-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_NAME=Gtk2-Spell
-DIST_AUTHOR=TSCH
-DIST_VERSION=1.04
-inherit perl-module virtualx
-
-DESCRIPTION="Bindings for GtkSpell with Gtk2.x"
-HOMEPAGE="http://gtk2-perl.sf.net/ https://metacpan.org/release/Gtk2-Spell"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~hppa ~ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	x11-libs/gtk+:2
-	>=app-text/gtkspell-2:2
-	>=dev-perl/glib-perl-1.240.0
-	>=dev-perl/Gtk2-1.012
-"
-DEPEND="${RDEPEND}
-	dev-perl/ExtUtils-Depends
-	dev-perl/ExtUtils-PkgConfig
-	virtual/pkgconfig
-"
-src_test() {
-	virtx perl-module_src_test
-}
author	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
commit	d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree	4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /dev-perl
parent	e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)