gentoo resync : 03.11.2021

209 files changed, 412 insertions, 3744 deletions

diff --git a/dev-perl/DBI-Shell/Manifest b/dev-perl/DBI-Shell/Manifest
index 9df193841014..ddc2d1f8b90d 100644
--- a/dev-perl/DBI-Shell/Manifest
+++ b/dev-perl/DBI-Shell/Manifest
@@ -1,7 +1,3 @@
-AUX DBI-Shell-11.950.0-local-scalar.patch 690 BLAKE2B 9c335d431c36c290a8de8b2dae1b8cf042f9500ad1604350b065964df838f2a695af1112dcaaec5b408bc126c5bc70a4cbd92e3d63179925f37281863997f1d9 SHA512 cea9657bcdf674cb1a30aaa28d4f7bea173bedbb07dd14b60866cd423f403f3946323d2831eeac6c9dc7387f15a4ce0b49e43d20b855ca177a172f5f44494057
-AUX DBI-Shell-11.950.0-nochrdir.patch 684 BLAKE2B 5172afa840872076088ac9ce367ea5cc5aaf8c0169e9948e0645a58dceeabf8b79c7957155cd99d0670fc53d5314e0ca98ad80f2e65a386a9c765d6deb59937b SHA512 95092f59cec232be5e8bab7973cd99040e25eaf77212f1673cf67f93458417b4b11f596d113f0a53385608e920d0e007a580e62733b65e72ea3a28677fb4eed8
-AUX DBI-Shell-11.950.0-perl526.patch 1291 BLAKE2B 34a23fa7e9bc4071a07ae227cfacc60fa6c332c9fd3e9d04c2888d8f8a8b501087b3c9cd11fbea268562e029d11e984ac47c09783eb2cc89f64e6f46f30bd251 SHA512 aa8bd8a9a149052da8aef526cf8b992bdfa5ca150028d68387de8a83cb1648da9a9e32f78fa136c66f32c3cd460bd0164b2cbcb3b60b6faa5d9b87c5784b789b
-AUX DBI-Shell-11.950.0-sprintf-warn.patch 732 BLAKE2B 4866aa33b1cc810201ad88ffe3f04a120ebe31e08076ace85f81418f5c2720e97a70ca6b1140d3ca8f343ddbe313ffbf3989614a475aae43568d3e9a85976083 SHA512 2808715da12581e22fceb71057fa5080188af8e5a6b1c4375b0a050973477d66f2a91f1ff473d7f3b5da19f73d06e02bd5221aa908d7d2e948ca6ca1cb1d21a2
 DIST DBI-Shell-11.97.tar.gz 57123 BLAKE2B 0c4d459dda185b6fb2ea292912da4624e1a4ed33aa4487eabf5c6c5be6571c1e8d32b29b703749fe562ebbd60aa389f62d5e3461863c5777490345451bf8cad8 SHA512 74bf7244691b8dee967bae4076b59b912d66ac08f48f8468531d003db6d85d43d836116f8314961602a002b58fc9f6d3bea88076e1d7e2783d430137dec68f4b
 EBUILD DBI-Shell-11.970.0.ebuild 823 BLAKE2B 3044528d43019ce7ae43c9e911817b2ae20366587bd5be11ff53399fe0a14c34988b4f6f1373f19b363980fc6f070589c7bde4011f3f6ff0c28db95cf69551f4 SHA512 cf80a94a1568cf484fe30513cc1fddb98d433c6e89d321c0da18de1e6af41043e488a485f2fdfaa751f75bb32f2d8e4a3ffeb0921bcd32d8eda3d44c5a8ef1d8
 MISC metadata.xml 1567 BLAKE2B 73490e98e228004b9ec03b3a8d6749d4d2c73c9dd2a1dcfa507940a24e73b461b22f76818117af06e420538257912873392a60d85858a4360c0cadda1f20737b SHA512 1e1c25d23c0e24a36df92197bc395f5c32d8952c95d5a659895e97cf01fb58c1c88c761c0897e855d02d53497c526c3b3d8bbcf06a8db658a91a36dfb80a53d2
diff --git a/dev-perl/DBI-Shell/files/DBI-Shell-11.950.0-local-scalar.patch b/dev-perl/DBI-Shell/files/DBI-Shell-11.950.0-local-scalar.patch
deleted file mode 100644
index 1d305f542d9e..000000000000
--- a/dev-perl/DBI-Shell/files/DBI-Shell-11.950.0-local-scalar.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ef8efc5b80c9395c01f23e5acd28bb3ee7810b54 Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentnl@gentoo.org>
-Date: Sun, 8 Oct 2017 13:08:20 +1300
-Subject: Fix useless localization of scalar assignment
-
-Bug: https://rt.cpan.org/Ticket/Display.html?id=73873
----
- lib/DBI/Format.pm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/DBI/Format.pm b/lib/DBI/Format.pm
-index 49cd7dd..bc985f9 100755
---- a/lib/DBI/Format.pm
-+++ b/lib/DBI/Format.pm
-@@ -374,7 +374,7 @@ sub header {
- 
- sub row {
-     my($self, $rowref) = @_;
--		local( $^W = 0 );
-+		local ($^W) = 0;
-     my @row = @$rowref;
- 	my $fh = $self->{'fh'};
- 	print $fh (join($self->{sep}, @row), "\n");
--- 
-2.14.1
-
diff --git a/dev-perl/DBI-Shell/files/DBI-Shell-11.950.0-nochrdir.patch b/dev-perl/DBI-Shell/files/DBI-Shell-11.950.0-nochrdir.patch
deleted file mode 100644
index b79649da4f5c..000000000000
--- a/dev-perl/DBI-Shell/files/DBI-Shell-11.950.0-nochrdir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9fb29d16514530245965b932040bb4fc37ffa9bf Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentnl@gentoo.org>
-Date: Sun, 8 Oct 2017 13:11:29 +1300
-Subject: Fix no_chrdir warning
-
-Bug: https://rt.cpan.org/Ticket/Display.html?id=123215
----
- lib/DBI/Shell/FindSqlFile.pm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/DBI/Shell/FindSqlFile.pm b/lib/DBI/Shell/FindSqlFile.pm
-index e604290..2b56ccc 100644
---- a/lib/DBI/Shell/FindSqlFile.pm
-+++ b/lib/DBI/Shell/FindSqlFile.pm
-@@ -62,7 +62,7 @@ sub look_for_file {
- 	File::Find::find(
- 		{
- 			  wanted 	=> \&wanted
--			, no_chrdir 	=> 1
-+			, no_chdir 	=> 1
- 			, bydepth	=> 0
- 		}, 
- 		@search_path);
--- 
-2.14.1
-
diff --git a/dev-perl/DBI-Shell/files/DBI-Shell-11.950.0-perl526.patch b/dev-perl/DBI-Shell/files/DBI-Shell-11.950.0-perl526.patch
deleted file mode 100644
index cd8258480d70..000000000000
--- a/dev-perl/DBI-Shell/files/DBI-Shell-11.950.0-perl526.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 792cf15cb387e58cec1ef3c6d538689d02ab44c3 Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentnl@gentoo.org>
-Date: Sun, 8 Oct 2017 12:46:17 +1300
-Subject: Fix '.' removal from @INC in Perl 5.26
-
-Configuration files were always assumed to be explicit paths given
-by outsiders, not random entries in @INC
-
-Bug: https://bugs.gentoo.org/615592
-Bug: https://rt.cpan.org/Ticket/Display.html?id=121136
----
- lib/DBI/Shell.pm | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/lib/DBI/Shell.pm b/lib/DBI/Shell.pm
-index 03dd958..7869f0f 100755
---- a/lib/DBI/Shell.pm
-+++ b/lib/DBI/Shell.pm
-@@ -133,6 +133,7 @@ use Text::Abbrev ();
- use Term::ReadLine;
- use Getopt::Long 2.17;	# upgrade from CPAN if needed: http://www.perl.com/CPAN
- use IO::File;
-+use File::Spec ();
- 
- use DBI 1.00 qw(:sql_types :utils);
- use DBI::Format;
-@@ -544,7 +545,8 @@ sub configuration {
-     $sh->{config_file} = $ENV{DBISH_CONFIG} || "$homedir/.dbish_config";
- 	my $config;
-     if ($sh->{config_file} && -f $sh->{config_file}) {
--		$config = require $sh->{config_file};
-+		my $full = File::Spec->rel2abs( $sh->{config_file} );
-+		$config = require $full;
- 		# allow for custom configuration options.
- 		if (exists $config->{'options'} ) {
- 			$sh->install_options( $config->{'options'} );
--- 
-2.14.1
-
diff --git a/dev-perl/DBI-Shell/files/DBI-Shell-11.950.0-sprintf-warn.patch b/dev-perl/DBI-Shell/files/DBI-Shell-11.950.0-sprintf-warn.patch
deleted file mode 100644
index 46943c1266ba..000000000000
--- a/dev-perl/DBI-Shell/files/DBI-Shell-11.950.0-sprintf-warn.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f44b8ba9d8cf954c76a967cbfb5d4182f109f8cf Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentnl@gentoo.org>
-Date: Sun, 8 Oct 2017 13:30:36 +1300
-Subject: Silence warnings about reduntant sprintf args
-
-Bug: https://rt.cpan.org/Ticket/Display.html?id=123216
----
- lib/DBI/Format/SQLMinus.pm | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/DBI/Format/SQLMinus.pm b/lib/DBI/Format/SQLMinus.pm
-index c3a9ba2..7b240c9 100755
---- a/lib/DBI/Format/SQLMinus.pm
-+++ b/lib/DBI/Format/SQLMinus.pm
-@@ -155,6 +155,7 @@ sub header {
- 
- 				if ( exists $cf->{format} and defined $cf->{format} ) {
- 					$format_names = $cf->{format};
-+					no warnings 'redundant';
- 					$width = length sprintf( $format_names, " " );
- 				}
- 
--- 
-2.14.1
-
diff --git a/dev-perl/Dist-Zilla-Plugin-NextVersion-Semantic/Manifest b/dev-perl/Dist-Zilla-Plugin-NextVersion-Semantic/Manifest
index bd49602ebf8e..083ddee14966 100644
--- a/dev-perl/Dist-Zilla-Plugin-NextVersion-Semantic/Manifest
+++ b/dev-perl/Dist-Zilla-Plugin-NextVersion-Semantic/Manifest
@@ -1,4 +1,3 @@
-AUX Dist-Zilla-Plugin-NextVersion-Semantic-0.2.5-no-V-in-test.patch 1218 BLAKE2B 2a3033fb1fe091724a30cbe8d148eff774e3aa12efd09f91cf2cffca0aef0e67f330e6fa391ec3042cddf173c13063331df757ed7cc17ece8e0990a81f23ffb4 SHA512 f8bc8cef1dd685596cf8f8a149eaf872e604cf2159f433de490c5c764a406883fd40705511a9f2b5403e72abad6b37509ed6c24c0763d4f04a3adce69c75bb60
 DIST Dist-Zilla-Plugin-NextVersion-Semantic-0.2.6.tar.gz 25247 BLAKE2B 37d0a2a859149af94b44b5bc18c2d611e4c3497fa81064f36118cafe62a17ee7346b3b61f0d4810025eb83c3323e652929c8cfbb8797afed049327d6c78513f4 SHA512 59bcd4154e6ca4f9800d5fb1805d4bf5014f9055dd89ae85443abc2ef042a6a833c90f8c985b004ec77124100bba9be5c8929e8496444ee77405c384fd1ab913
 EBUILD Dist-Zilla-Plugin-NextVersion-Semantic-0.2.6.ebuild 602 BLAKE2B c4fe0701bbc2fb2c5ac4e4ceacd0b6a91f4ed46fee945370fe6f28c07e3e95cdcc2e6e0b73117b9c14bb38115d8ff21f93cd81632005b8826bdd48685cac8212 SHA512 f23c32f032ccd2f107ed888904d772dee7d32730f41d129792b46aa637f1171af7eb448e54bf6db7f984e107b0ccf5df9574bbff5a62c2134b4d753fc7ff4940
 MISC metadata.xml 745 BLAKE2B f37842432286eefa70c5288e49f870f202f9240321a77a67f9a4ceaad7b07965f4612dbd6e789b7a1f3c489a834fc5fc79e328baba3fd7cbc2bb9f8cebc932ca SHA512 68aa262a3894342c954bfaf53c2e3eb3c29ace63a5fead49d5606120bb97cd625e50a3f5654f6915619306952ee16c48ad650c2dfb6b3215354b317b04f6b4d0
diff --git a/dev-perl/Dist-Zilla-Plugin-NextVersion-Semantic/files/Dist-Zilla-Plugin-NextVersion-Semantic-0.2.5-no-V-in-test.patch b/dev-perl/Dist-Zilla-Plugin-NextVersion-Semantic/files/Dist-Zilla-Plugin-NextVersion-Semantic-0.2.5-no-V-in-test.patch
deleted file mode 100644
index ab09936f2832..000000000000
--- a/dev-perl/Dist-Zilla-Plugin-NextVersion-Semantic/files/Dist-Zilla-Plugin-NextVersion-Semantic-0.2.5-no-V-in-test.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From e38c5bfa847361ab251ce533fdd6e8993afbd2f3 Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentnl@gentoo.org>
-Date: Sat, 19 Sep 2020 22:13:21 +1200
-Subject: t/basic.t: Don't become broken when MAKEOPTS includes V=1
-
-Some people set MAKEOPTS to include V=1, in order to coax autotools
-based makefiles into being more verbose.
-
-But when that ENV var is used to direct perl ebuilds for Dzil things,
-well, it unintentionally uses "1" as the *next version*, and so breaks
-all code that isn't expecting that to happen.
-
-Given its not the job of tests to tell people their system is weird, it
-just makes the scope "normal" ( that is, defaulting V to be unset
-internally )
-
-Bug: https://bugs.gentoo.org/737308
-Bug: https://github.com/yanick/Dist-Zilla-Plugin-NextVersion-Semantic/pull/6
----
- t/basic.t | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/t/basic.t b/t/basic.t
-index 22d04fe..b2942c8 100644
---- a/t/basic.t
-+++ b/t/basic.t
-@@ -6,6 +6,10 @@ use Test::Exception;
- 
- use Test::DZil;
- 
-+# V=1 is common in MAKEOPTS for gnu autotools
-+# to set "verbose mode"
-+delete $ENV{V} if exists $ENV{V};
-+
- my $changes = make_changes(<<'END_CHANGES');
-     - got included in an awesome test suite
- END_CHANGES
--- 
-2.28.0
-
diff --git a/dev-perl/ExtUtils-CppGuess/Manifest b/dev-perl/ExtUtils-CppGuess/Manifest
index fd58292c8de3..05347bc8a0ff 100644
--- a/dev-perl/ExtUtils-CppGuess/Manifest
+++ b/dev-perl/ExtUtils-CppGuess/Manifest
@@ -1,4 +1,3 @@
-AUX ExtUtils-CppGuess-0.110.0-no-dot-inc.patch 1311 BLAKE2B b440f31822cff738807914df48aa74fdc3775d5eaaea1dcbde4a94217d4d98b2402b44914f463f733bd37460b07c8b1bb99f4d3d06a951d8e57517cbc4d67e4f SHA512 b75865b0f95137389d86ac2b277ae843d8f65075784df73a2de4408ccb9614809b9055798a3ead088fcb17884b1306f4238f817f13b012ea7a913a26e6b8e191
 DIST ExtUtils-CppGuess-0.21.tar.gz 14067 BLAKE2B 35dab476a73c532f2635ebee871dfd4cba593c1e09ed4f9fc18826edb9208208fdcc26a884d3c6ec95db18ceafc83fb8bca1c5c8f6a8caf337795ddde80be6d2 SHA512 e48e4815ac9db4e8bb91de101f1d22aed95c770cf6fa2ea5e38094643fe96bc9fe69b0e5a76ba8aa53a653753f93526edab8b1604d864bb2b3a50223617f84d9
 DIST ExtUtils-CppGuess-0.23.tar.gz 15311 BLAKE2B 6e0db2d1c419893cc68050a047e957d42b57780fbf0d26ec05831990e3af45decb4693b68ce426ac9eaa578077e9c9c951a01adea197386c9be70faeb9d22977 SHA512 f984f653cffd6288851af3e353532f369d229a8b903f8e0ba7c1a5e9d8bd1b63c3415403b45bf1e8c32dc5c330ed26d1351e37929bd22af271ac295adce737f9
 EBUILD ExtUtils-CppGuess-0.210.0.ebuild 1001 BLAKE2B 85de3afe94ece1e558c02b75ff35be17639a17a67ec82351697b4ab65f8126731ae1599a7e03493c809fcf458c6107278653caf15ef1a38b2b90cacb2993dfc5 SHA512 2659f8f9c70c080fc9cb317be133320ade1bcbfeab26acb937aba4b63a52c4ec9fed8356559fa4445857871d76e1df1c6161dd7c08c14f0f66aecd94a286a346
diff --git a/dev-perl/ExtUtils-CppGuess/files/ExtUtils-CppGuess-0.110.0-no-dot-inc.patch b/dev-perl/ExtUtils-CppGuess/files/ExtUtils-CppGuess-0.110.0-no-dot-inc.patch
deleted file mode 100644
index 0bca84c1aad7..000000000000
--- a/dev-perl/ExtUtils-CppGuess/files/ExtUtils-CppGuess-0.110.0-no-dot-inc.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 2c89bb54f233776fb8760a264286f9e0932f62c6 Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentnl@gentoo.org>
-Date: Sat, 21 Oct 2017 13:15:43 +1300
-Subject: Fix tests on 5.26 without '.' in @INC
-
-Bug: https://rt.cpan.org/Ticket/Display.html?id=120848
-Bug: https://bugs.gentoo.org/615842
-Bug: https://github.com/tsee/extutils-cppguess/pull/15
----
- t/010_module_build.t | 3 ++-
- t/011_makemaker.t    | 3 ++-
- t/lib/TestUtils.pm   | 3 ++-
- 3 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/t/010_module_build.t b/t/010_module_build.t
-index 93b5f44..ef004d3 100644
---- a/t/010_module_build.t
-+++ b/t/010_module_build.t
-@@ -2,7 +2,8 @@
- 
- use strict;
- use Test::More tests => 1;
--use t::lib::TestUtils;
-+use lib 't/lib';
-+use TestUtils;
- 
- my $separator = ( '=' x 40 . "\n" );
- 
-diff --git a/t/011_makemaker.t b/t/011_makemaker.t
-index 237636a..5986395 100644
---- a/t/011_makemaker.t
-+++ b/t/011_makemaker.t
-@@ -2,7 +2,8 @@
- 
- use strict;
- use Test::More tests => 1;
--use t::lib::TestUtils;
-+use lib 't/lib';
-+use TestUtils;
- 
- my $separator = ( '=' x 40 . "\n" );
- 
-diff --git a/t/lib/TestUtils.pm b/t/lib/TestUtils.pm
-index c71572b..b3480c4 100644
---- a/t/lib/TestUtils.pm
-+++ b/t/lib/TestUtils.pm
-@@ -1,4 +1,5 @@
--package t::lib::TestUtils;
-+package # hide
-+  TestUtils;
- 
- use strict;
- 
--- 
-2.14.2
-
diff --git a/dev-perl/File-NFSLock/Manifest b/dev-perl/File-NFSLock/Manifest
index bfa9a2ad37b4..2407f74896d7 100644
--- a/dev-perl/File-NFSLock/Manifest
+++ b/dev-perl/File-NFSLock/Manifest
@@ -1,4 +1,3 @@
-AUX File-NFSLock-1.27-no-dot-inc.patch 915 BLAKE2B d9457492dbbb7f96467b62c2269876a9df2de224afebcb886df8c6c0bd51239070b401ab7132597f53f0901e9c165357134282f3b9bfafebd537b849fc6f1934 SHA512 430296f1616706e1cb3b2e996a10080c95d76672ec3a7a9826c59cefc6624de2cde83a42fdcea9ec3f5ae84af380708282d35e3cabc1715a3b4a6c9f240a8e78
 DIST File-NFSLock-1.29.tar.gz 21743 BLAKE2B aece987567f95de22c6454c3a05d2dd2deaf1a6958eebdf7f2ba908b7c26a5894137635e4cfbd6d3b488ca5c37bfa55f50a0a66a9ef84d922d5a8a3ce8d01c36 SHA512 23ca8d6bff0b988eb7369a89c0ac2eb9fca4cc8472b996a93cd71241e76017c5a9db34e648038ec223cf0a3c843af26fc92740890e69e4db371c747c90835cc2
 EBUILD File-NFSLock-1.290.0.ebuild 324 BLAKE2B 9f226e40d8ca6019282c13d966b7cd856bb86fddfc9a992567f660eeb7a60cac956cc9953007b6103c6d964f1697a6ac3d36b5f3d3d2a12fdfcab0f5b2bbb977 SHA512 cf2211919dfbe5685a17041b24f42f7ca191cd5eb484b94774a01bf2f8996665f0cf45618863425b7d5cb407bac3a2e29260a8c63120d7e90ee57e44d39ae05b
 MISC metadata.xml 397 BLAKE2B a2c77afb83b124d62453d6affde57841860170eaea94e0e423ba96d5ded80b8b70b6c7841fb97a28e4a25511e478dcc625c04cbc23b941cf55e2b200477d1d59 SHA512 8075a163996f5411f1cb9716a402f96394631435f8e4579dfc1e21ec0b7f047fa093356381e877e28d864e79aa80c6e5f827183818457bee6226c51a2e0261af
diff --git a/dev-perl/File-NFSLock/files/File-NFSLock-1.27-no-dot-inc.patch b/dev-perl/File-NFSLock/files/File-NFSLock-1.27-no-dot-inc.patch
deleted file mode 100644
index 9b67d24d10d6..000000000000
--- a/dev-perl/File-NFSLock/files/File-NFSLock-1.27-no-dot-inc.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 08deb6590eecd9d92a38edf1b22d615175e1d8d3 Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentfredric@gmail.com>
-Date: Mon, 26 Jun 2017 19:43:14 +1200
-Subject: [PATCH] Fix for '.' removal from Perl 5.26 @INC
-
----
- File-NFSLock.spec.PL | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/File-NFSLock.spec.PL b/File-NFSLock.spec.PL
-index fdf9fdf..f5586c1 100644
---- a/File-NFSLock.spec.PL
-+++ b/File-NFSLock.spec.PL
-@@ -18,7 +18,7 @@ sub WriteMakefile {
-   } elsif (my $version_from = $props{VERSION_FROM}) {
-     $@ = "";
-     $version = eval qq{
--      do "$version_from";
-+      do "./$version_from";
-       \$$name\::VERSION || die "$version_from: Missing VERSION";
-     };
-     die $@ if $@;
-@@ -29,7 +29,7 @@ sub WriteMakefile {
-     die "Makefile.PL: Could not determine version!";
-   }
- }
--do "Makefile.PL";
-+do "./Makefile.PL";
- if ($name) {
-   $name =~ s/::/-/g;
- } else {
--- 
-2.13.1
-
diff --git a/dev-perl/Getopt-GUI-Long/Getopt-GUI-Long-0.930.0-r2.ebuild b/dev-perl/Getopt-GUI-Long/Getopt-GUI-Long-0.930.0-r3.ebuild
index 1a39061a421e..e0a59e3b4c44 100644
--- a/dev-perl/Getopt-GUI-Long/Getopt-GUI-Long-0.930.0-r2.ebuild
+++ b/dev-perl/Getopt-GUI-Long/Getopt-GUI-Long-0.930.0-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=HARDAKER
 DIST_VERSION=0.93
@@ -12,10 +12,11 @@ DESCRIPTION="Auto-GUI extending Getopt::Long"
 
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
 
-RDEPEND="virtual/perl-File-Temp
-	virtual/perl-Getopt-Long"
+RDEPEND="
+	virtual/perl-File-Temp
+	virtual/perl-Getopt-Long
+"
 
 src_test() {
 	local MODULES=(
diff --git a/dev-perl/Getopt-GUI-Long/Manifest b/dev-perl/Getopt-GUI-Long/Manifest
index 1559c2e87919..18ebe71326d2 100644
--- a/dev-perl/Getopt-GUI-Long/Manifest
+++ b/dev-perl/Getopt-GUI-Long/Manifest
@@ -1,3 +1,3 @@
 DIST Getopt-GUI-Long-0.93.tar.gz 14086 BLAKE2B 88e0d7cb4f81fa47fe396883fe47bdf157e41000e414dc21093a4b15b143af1d8cc1a67f6f1dcefd679074d88fcb8b783023e352ec7ef3f10f82da3e1b505f49 SHA512 ae0880eb339ce607abe2ca16ccc5176c844531ef6dd0b09afe91f2e3501c73f4383e8f90136e46748b6c93fdd65b7c4936addf496261a2a25c0011cc555961f5
-EBUILD Getopt-GUI-Long-0.930.0-r2.ebuild 812 BLAKE2B ef5828ab4c04f6ad2dadfdb147d555171f77f3e247485709a29339bee24bf2599c70da9b81238794ecb91427b35f4e9f1f798ca588bf5f55b118a5168796ef92 SHA512 9f91ed55937f78d4c9abfec0c561fb2395016d94ac1602d24c77e31cb502409ef511de74be7fb232b18a71c95b18de9916e87575cc7eec330a499015dfb1118a
+EBUILD Getopt-GUI-Long-0.930.0-r3.ebuild 804 BLAKE2B e7d31f6d20d95e5718450670a815d7141c1809bb4bb667c1925f34b434dcb118e5c0a0cdb53168d77eca5048e23958b7130e631511c8d56d35df7502df656ba0 SHA512 17b1e853641aa90076a9412790db88fe2e10998b4a2cc5fcb3dd4d4eec6b7b956062a5a5ab1526d63df4cd3eab5e96206beb61f70094ae81684e0e557e1925b9
 MISC metadata.xml 384 BLAKE2B 2c933aa7136617f964ed0352a39993891be4dc038ff421667b2682dc6d9c718d394d24ed2d916e10c5f0ecb765fd5c666b6f07d175a45a08b2873f538821e68f SHA512 7426ff532ac4601be00b391188057203c2dfb91fdfe3bde98572c805db8bbb658cfe8e7f1ec0e91a14d594efc371b583e098863a4db7d737ccac7693a8a74fb7
diff --git a/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.103.0.ebuild b/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.103.0.ebuild
deleted file mode 100644
index 911112db7287..000000000000
--- a/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.103.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=RJBS
-DIST_VERSION=0.103
-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
-"
-DEPEND="${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 5df56f0f7d76..0cf9f6b2e7c4 100644
--- a/dev-perl/Getopt-Long-Descriptive/Manifest
+++ b/dev-perl/Getopt-Long-Descriptive/Manifest
@@ -1,5 +1,3 @@
-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 980 BLAKE2B d2470780803512a71965664d322ad0fc5ad87c04f9452a9cfcb34594a600c44d57b8c82757c95febf953af5bec30559e54390003d24cbd1386b9870e3af88a50 SHA512 9dd77600ef47cc459d22505306b579d4bfd4e4af37ae9be7baaea20c2cc6b15980e5ba628ae3d1d79e57b7cb78f72d4ba6c66779a42b255e6abbc4aa73e0f45c
 MISC metadata.xml 577 BLAKE2B 13ae7688abebd23effd207bb10f63478bf79eec911dd03153b286df7d5b3d168434e8f9fd743af8b9c11057b0d7bdcdc2826dc5c1769008dee7b4673991a152f SHA512 8e6adb3b78dc2583657fc09b394c691999facec2e8410c90d601a609c0b292e460f05134581ad564bf4e427387ed152cd021cb6b9a9526e2f9dce7d2a1cd0ed1
diff --git a/dev-perl/Getopt-Tabular/Getopt-Tabular-0.300.0-r1.ebuild b/dev-perl/Getopt-Tabular/Getopt-Tabular-0.300.0-r2.ebuild
index 4d4d8421af98..55ebee007854 100644
--- a/dev-perl/Getopt-Tabular/Getopt-Tabular-0.300.0-r1.ebuild
+++ b/dev-perl/Getopt-Tabular/Getopt-Tabular-0.300.0-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=GWARD
-DIST_VERSION="0.3"
+DIST_VERSION=0.3
 DIST_EXAMPLES=("demo")
 inherit perl-module
 
@@ -12,4 +12,3 @@ DESCRIPTION="Table-driven argument parsing with help text"
 
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
diff --git a/dev-perl/Getopt-Tabular/Manifest b/dev-perl/Getopt-Tabular/Manifest
index f1c38c167301..f830b1d18bd8 100644
--- a/dev-perl/Getopt-Tabular/Manifest
+++ b/dev-perl/Getopt-Tabular/Manifest
@@ -1,3 +1,3 @@
 DIST Getopt-Tabular-0.3.tar.gz 26453 BLAKE2B b2fdb97f43a7b3028f970ecca2c134c6490561126dee038a57291a74798a0c854b8ea2daa784898eaed377e54c399ab1922672159c16c4957fa6044fd3728cfb SHA512 a289d4861538ae542f7549364573cadd740538f73862d89dd49eaf6bed6f787ba2848246add171aed6aef4d7d36411d00bef70b76885aa948ce0e7fc8801652b
-EBUILD Getopt-Tabular-0.300.0-r1.ebuild 302 BLAKE2B 7e5a4ee2dcf7e63f15a8a3b997b933ec167665769fa8426fa5c268059c3b127eaecb26d502f9f99b26f3c6f6c50d2d56dd3fdeb02c075810b75552d00e2107a9 SHA512 099775178246bbf3bb30142ee6c6b5b845819d0066e257d4daed50712965992176379644b66ac53fad08e1dec944c4ea8f124c5a52536b1ff6b575d1072111b0
+EBUILD Getopt-Tabular-0.300.0-r2.ebuild 289 BLAKE2B baf2c7662761022f16a5babd47939c8f0d01acf8490e7c259b4d896d3ac13bb1045e33d2af2e42180e761b391a1d7405e7a6d321a61827e1ccc8036ddd74a1dd SHA512 656d2e31961aad2324073d9ec89828cfb79556855a948539e9720842e47dbf66ed95ef754ecff5eec5597457d495e0cc64ad5008485eb3a96ea57d7f5aa0e96b
 MISC metadata.xml 401 BLAKE2B bf7f8b427dfe7110d996f9a6d44096865de5719b0bfcec5aa3e71d5c88d4b2080ad5ad3e366023ababc29aeae420d8ce43b5bf5b0d3cbac8c74da8063d87b50e SHA512 d61cd45e4932634d5522d0ef868925a0adcf055e2e2ea7ae0850a0ebe7cb2fae640113e9f7d3bfcbed90bda91582b00f36098a3ae2e4a7a789b986addc855d30
diff --git a/dev-perl/Git-Wrapper/Git-Wrapper-0.47.0-r1.ebuild b/dev-perl/Git-Wrapper/Git-Wrapper-0.47.0-r1.ebuild
deleted file mode 100644
index 0835ab9bb5d0..000000000000
--- a/dev-perl/Git-Wrapper/Git-Wrapper-0.47.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=GENEHACK
-DIST_VERSION=0.047
-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
-"
-DEPEND="${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 b95619d884a1..3421973798b3 100644
--- a/dev-perl/Git-Wrapper/Manifest
+++ b/dev-perl/Git-Wrapper/Manifest
@@ -1,5 +1,3 @@
-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 934 BLAKE2B 1859d899e1b49ff2320c98829dbf4f989baab98594e1c591975e314a5f3dad8736173c711fb35bf41b0ab6d04ad4164f31ed050541fcbf1d3fcf590dab178015 SHA512 6f5b9f6e3c3b81f726bc0cf9111fdb5123e5de6e93ac6135561d18dcd0554f1e91e7e89e58c18795aa2103ac42548a7fc2773c1ccb540d2f39b7e6934f07342e
 MISC metadata.xml 747 BLAKE2B af23cb63abc92a17f2ade7a73d774dc908ddefe4595cf057f60b5eb9b916f9617eb60158372b4a5918a9fd7d81e5abf41925e4033327385840b65d3899037ae5 SHA512 b7a24b4cb30299c32cd02ae718e3354602e4f63b1c04589e773ffc77fd7ec87161decffc8e44da0e2bf4abd400d3d5771375f6c04090e6bcb62a942bd5e56049
diff --git a/dev-perl/Glib-Object-Introspection/Glib-Object-Introspection-0.43.0.ebuild b/dev-perl/Glib-Object-Introspection/Glib-Object-Introspection-0.43.0.ebuild
deleted file mode 100644
index 855524ebd8fd..000000000000
--- a/dev-perl/Glib-Object-Introspection/Glib-Object-Introspection-0.43.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=XAOC
-DIST_VERSION=0.043
-inherit perl-module xdg-utils
-
-DESCRIPTION="Dynamically create Perl language bindings"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-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="
-	>=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 4efe8b52f58c..003203a77991 100644
--- a/dev-perl/Glib-Object-Introspection/Manifest
+++ b/dev-perl/Glib-Object-Introspection/Manifest
@@ -1,5 +1,3 @@
-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 593 BLAKE2B 58d385296ee089891091c0d9d2067a14d605198473da6851e9630a0a0b8fe2c16c47cf36c45da8d89e4a6b1e1e103b323ed11bcfe18b1c5940e929b0d744d476 SHA512 183f6b4644b49016d9e51e860b5c26f1b13a2d1635f497e71f1f9ed4ce60e2c509d6410f4a2cdaaf56babe1380da2e59c539d13c8b415224a6628bf78af1fde0
 MISC metadata.xml 412 BLAKE2B d21ff75abddb2f7e5ece1a2a3bf1d55dae89449dd1148c60f3a32ddfffdfcbbba56807074163f154247401d938c8afddb7e434c94a5957e0e70e92f806317fc8 SHA512 442bcc47771a161868faa68dc16b4bda36c6e68a5391cee94d59821ef1648d7d485a82e3d97fb439d5f3fc373ce83a218ace37c37259fb143f96a9392804c83a
diff --git a/dev-perl/GnuPG-Interface/GnuPG-Interface-0.520.0-r3.ebuild b/dev-perl/GnuPG-Interface/GnuPG-Interface-0.520.0-r3.ebuild
deleted file mode 100644
index df5dd4a3d810..000000000000
--- a/dev-perl/GnuPG-Interface/GnuPG-Interface-0.520.0-r3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 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
-	"${FILESDIR}/${P}"-0030-gpg-2.2.6.patch
-	"${FILESDIR}/${P}"-0031-gpg-2.2.8.patch
-)
-
-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
-}
-
-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 66a913043cfa..cbb6b48a0774 100644
--- a/dev-perl/GnuPG-Interface/Manifest
+++ b/dev-perl/GnuPG-Interface/Manifest
@@ -1,26 +1,3 @@
-AUX GnuPG-Interface-0.520.0-0001-fix-spelling-error-settting-should-be-setting.patch 1104 BLAKE2B 6275517463eec5caa865338109c151cc8c351200cfe8666a9652e7733855a29d668c22a800820caad79dc6ef9d1c6ac0569ec8cec6826f77f60029d30360d14c SHA512 154fe07541bdfa36be9ce72fee8ce1edb8fbfce73d3006b888ec141a3e5efb9eacc3cb91956606ef56b67a5fde8c19da5d92f38d02acb77d7681e1219d6c513c
-AUX GnuPG-Interface-0.520.0-0002-Generalize-the-test-suite.patch 4552 BLAKE2B 89ec43b57ed6ecdcd4b78f7b84cbbded575e8cce0785d86960bb8b1f092c53ab54cc533e757dc47501de8fa8c2db73ae42a9f705e3821b57ff1110ad6ef1f34f SHA512 8310f8b4a7e1092273fb0444e65871d5aed2eb87107fcb416f7e5c82146379c3d77ff511209ae01efeb475d62cc2e8682ece15b4a826d15a0e450871fdff50b8
-AUX GnuPG-Interface-0.520.0-0003-subkey-validity-of-an-key-when-we-have-established-n.patch 1217 BLAKE2B 5d96a0fb84d7d12ef58caf8e6b3a5363f96ed71300d37ebed5ad057f46b705456da3922f96eb58efe79864cfa0ef5b560e53a7f71c29d36b4602071f0b5bfcb9 SHA512 7cddb8e065e3380a5bf9aeb82af620bdf9c4062a9e315afb871574af6140369ce9c1e9b0ac0c8463c6158694ad78d65e328acce62a3336bce8705f3ffc393cb6
-AUX GnuPG-Interface-0.520.0-0004-ensure-that-test-covers-all-signatures.patch 1438 BLAKE2B 44ff3ea149993b7c296a91fe801e9fdc2a8f19617a7c11f2ab83c7de71e37bc26d5ed434a54c1301c74b59bfd66ea19e50ea1880b93d9b74bb2afa6bd48b2c2b SHA512 dcb3f587834d3d22ab745a6796cbb924efbc5d9985947e3884f8f4fdb47a911385d400b4a2b72ef83daed3ba572fbf3d6d4944cf63c308ae4bc64cf369191111
-AUX GnuPG-Interface-0.520.0-0005-add-gpg_is_modern-to-test-suite.patch 1522 BLAKE2B 883cbe443329b48ca91f3af2765024b22d889b9e3e49817bc9d4e883594743073314dde2145bfd6de3e234130f9c230b533c62a00897e398e4c73c93f15a41a2 SHA512 170d5231f98234614c5e8c1afb09b2fc4ff26bb8e5b280a8b91a0b886e4199c6c993af41b63db7041cc6f8b2fc676461720e64289818966f3980bcf4af75625c
-AUX GnuPG-Interface-0.520.0-0006-Modern-GnuPG-2.1-reports-more-detail-about-secret-ke.patch 5276 BLAKE2B 07621e4fc1f12da4dbed3b537412215ba5121a8ea4b2f5f85ddbb6869228db7744c5fcd884ece126be2d56547983413ee4dd63c81149c4882514bd9d8e400dd8 SHA512 7c1a588028378e2691e951a5572465c877b6ef4fb86b27aa4e3aef3aa75a49e1e53b52c78ba88b00cfb243aa10bf75aef88784d22deb7925d0cdc98687ee8804
-AUX GnuPG-Interface-0.520.0-0007-test-suite-match-plaintext-output-across-versions-of.patch 3286 BLAKE2B f1452611f761f6fd06b91e49a47016820633284d8cdddccbabb3d19f4e91e8b9264bd879d1177e64cca7755b9faa6550ac24908dcdaf2b54335e7f7fb22bf08f SHA512 eb6d4efd476d1d7582c66b90fdef21badc8d0eecd24ce642cac7f5d0e3e491c78cbc0ee49bf886ce571f2718c2aa725d6c07a7ca0cd6e5483624df6984cf8f27
-AUX GnuPG-Interface-0.520.0-0008-fix-test_default_key_passphrase-when-passphrase-come.patch 1125 BLAKE2B 12144ec6aca0407c3cd5f07ef8f4f8a2837157a9c2af082331af3f7b9f6fe18b3be461b5fd75577b3c5e1d54ef5a31301ebe56f09dc79b3899fbbcd0efc04d6c SHA512 e4f5b69a1ac61a7d39d97cb716f07cef5b612b01b64005b6f0f0974fb19b386a6e817c66fb49762c99b66917e551ab96e34a48cf25bb59b8f06844773adcd44b
-AUX GnuPG-Interface-0.520.0-0009-clean-up-trailing-whitespace.patch 3683 BLAKE2B c433dc5c563ee0472ab6d3c1c00db3326345a06aa244df5afa8be7d4e732bd8de624c8fb0b3db4b1a11d53cdd86f28b02ad970323ec743189fd015b107be6154 SHA512 f911f3d830e30d6e3e684abb7c3e90c801715a68bc2ccd02fc75a15f4c9ec9095260a56a021645cc82bc7f6381fee1f0b5e404cdd6c7be93d1cf293adaaabfbf
-AUX GnuPG-Interface-0.520.0-0010-fix-capitalization-of-GnuPG.patch 1094 BLAKE2B 5588031372f4d8d932527a96fce63cdd3a563ca937794c44b9eb124ecf3f64d64490adf2030a5ceb035cba9a2ab8f0a3576ef6890a6a6c39372234a66f490497 SHA512 5ecadeb592b73843756a7fb7e8d002e0931832f1120399072decf7586ebec6ec39c6eb33811de58849d7a986a0e87dd0a5b3c6bb0eb9328365d75e6a8eaf02be
-AUX GnuPG-Interface-0.520.0-0011-ommand_args-should-be-command_args.patch 670 BLAKE2B 3ec3023e125c2c71ec94eec02b6a103bd7f5bcd64c77d6a7b23b6a81b01e99f776b3d970e2d43806eb53fc3e63de2594703e7602acc4ac77306e9ab3f7beca2f SHA512 cd9af9b1df71f4bbbee8e97de41933c93e908626cb766c88636f9df5a4307360b302eeabe1d999da10b81237f38da673fbd9dd34417df27b3fc4a9e1fd98e73f
-AUX GnuPG-Interface-0.520.0-0012-use-fingerprints-as-inputs-during-tests-to-demonstra.patch 9909 BLAKE2B 3b416e430a693f8160b75bcb9b11d807fa9a658ef3737a177392cf9e8819131758d2e6c0b6adde4e75ee7e2205ca6cf74df1e953e6fe00274ec613b1a3417c12 SHA512 8a1dc1d4df2f1ab575256845439be416323cc4448812c28c9a3209404cfc1fbabecdf65701e9fdf9c9530c964114d8f91eae42200a4b7dae8ecb78b77c22611f
-AUX GnuPG-Interface-0.520.0-0013-move-key-files-to-generic-names.patch 1247 BLAKE2B 756fd2b7a3a07838975e6401e637e080c7cf1197197de7c76c256bc899c061f19fc7f139d9190065f50672c6e23bf601aa91c0a98ef2c8b8a226623a97009c31 SHA512 8d4a890788ce13923b0bb74c1262c8e41c2d7b4143153e3434df06640afaa7380e39b57f0ea5607e79b57cb28fb7ac8c432da7d712f3e17cb64501a58d92240f
-AUX GnuPG-Interface-0.520.0-0014-fix-spelling-s-convience-convenience.patch 2165 BLAKE2B d7d62bbb66c629c327606b9b3b138f45a04de31e81cc2373f384315cb60832598d90e37428e00e2ed659173c0a463d3a4016d085120d8ce17042cd98b808231f SHA512 57f685199115f3d2bafe6c8b088f526fcce60e838891d4f7ba74b648653f4e4f3f730c5b6e9f9143a6bf3812e2f4eb9c2871c60bce9f1db9c872831341b0a401
-AUX GnuPG-Interface-0.520.0-0015-added-new-secret-key-with-different-passphrase.patch 5950 BLAKE2B 407c7b0dc9f74a657429eb877d9731c75e5fdc7aed0b291530ef63e357cd0d07e3ee6060bc8b96908c0ff46feb14f15547100f3a1c333c45930b1e2b67e8f42a SHA512 675bfea548b7f0dcff6f6b371e9e673e9c6cf8eb3cd29483519473d7b0519358416cb3946cb14958317f1ff661248a019c3e1b51abf3f2b85b6c645e45b045b5
-AUX GnuPG-Interface-0.520.0-0016-Test-use-of-gpg-without-explicit-passphrase-agent-pi.patch 11278 BLAKE2B 581b7addc6c2aebff575d66db69bf827df749f73f98be6e14863dcfec6800eb53fd857d29c7794516f5fb905f0439d920b7352d6f54eb29ebf413949b70d5f45 SHA512 ce27eee7d1b89a8c005c34f81862f3516866aeea23fb254288917d93da4ceec46a7eabc65b2f4c05f3e33e816301934ad83e3e51a8b742e1ac781fd5fe81b609
-AUX GnuPG-Interface-0.520.0-0017-Kill-any-GnuPG-agent-before-and-after-the-test-suite.patch 1535 BLAKE2B ac7e1f395a5ce8afe1611156f65aa305ddb1f1ecb26cfc7176c81c411d92c6a71b6a3781f950c4c54b422c6205cef94fce2f45f8bc6545ddeece34af774b5ef7 SHA512 d1f5e3258543fad32cc317bd5b34ffda279fec39d533b0390ed941fee1f780b37dda767670e7ae8f6c68bcf206c089122cf46fc5f8c24e889b032132a1f85eb1
-AUX GnuPG-Interface-0.520.0-0018-Use-a-short-temporary-homedir-during-the-test-suite.patch 4096 BLAKE2B 12d9bcd4931c9d8d5c3608beadbfb08bf144794cc13ac724bc2b21ab654facdec98e6293c42bf5c12e5867abd9af77b9c665ef903c91739484a40495bf069fcd SHA512 98d6b4d976013741c614265c8b9d35458461fb4407cbe10f8600c55522128a68a2976157e3165ca99aed733d2c5dee6164fa048a7671bdb9d37612a438327242
-AUX GnuPG-Interface-0.520.0-0019-Make-things-work-with-gpg1-assuming-plain-gpg-is-mod.patch 2237 BLAKE2B f152aa512f9fbc240d1862d5439928276fb4fdc73d716fcb4941504d7bc9fcf3facde6c06d2d52a7ca0628d3aa72e65248a1bb0237afe1e6c0585608f3c44b12 SHA512 a59ac575d410b5feb14a8a2165f526a1a7fbdf4575bc7e0d8d690a4d952fb312defb1390ae0186ec65b52737643ff560d5d48e8920bfe1cdcd1702016755035e
-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
 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 1022 BLAKE2B 3d7acfd349b0a6b725b2f85023ab1b0586aea6859730b0992bab48addb4de670c833730042e5737b125eb53a98eb174a7ddc4121bd5e6263bc8cc705c53e0a26 SHA512 a9552b01a73de345b2d659e827e50386692c77d29d0b405d1cd985a5ffef20aaae898fcbd9fd9857bd5d563a06a293f6ad26ae4136a7cc6cacd5d9e9d06a14af
 MISC metadata.xml 1210 BLAKE2B f51743b57e5bb8b7f5335e9da2b92e0e0aab4a7ebde4a99d1c03a2c2e3de5105284d126ab128682bfdeeb284ec32fa9753599eacff1bc40146f2304d188d612a SHA512 faed617bfbb64f58bf4c9c0d4b032b39427fed287f02ebfff5e7bc249d440fa48fd4729a2e6334d87c99c2922897b87bcb7ed6bcbb4bf1d0bbf359773b50c5fd
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0001-fix-spelling-error-settting-should-be-setting.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0001-fix-spelling-error-settting-should-be-setting.patch
deleted file mode 100644
index fcec61009070..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0001-fix-spelling-error-settting-should-be-setting.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 13 Sep 2016 07:26:00 +0200
-Subject: fix spelling error ("settting" should be "setting")
-
----
- README                 | 2 +-
- lib/GnuPG/Interface.pm | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/README b/README
-index fcb982a..f457577 100644
---- a/README
-+++ b/README
-@@ -6,7 +6,7 @@ SYNOPSIS
-       use IO::Handle;
-       use GnuPG::Interface;
-   
--      # settting up the situation
-+      # setting up the situation
-       my $gnupg = GnuPG::Interface->new();
-       $gnupg->options->hash_init( armor   => 1,
-                                   homedir => '/home/foobar' );
-diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm
-index f952f3e..83a4b1a 100644
---- a/lib/GnuPG/Interface.pm
-+++ b/lib/GnuPG/Interface.pm
-@@ -834,7 +834,7 @@ GnuPG::Interface - Perl interface to GnuPG
-   use IO::Handle;
-   use GnuPG::Interface;
-   
--  # settting up the situation
-+  # setting up the situation
-   my $gnupg = GnuPG::Interface->new();
-   $gnupg->options->hash_init( armor   => 1,
- 			      homedir => '/home/foobar' );
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0002-Generalize-the-test-suite.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0002-Generalize-the-test-suite.patch
deleted file mode 100644
index d0d3e6ccdf9d..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0002-Generalize-the-test-suite.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 13 Sep 2016 10:38:12 -0400
-Subject: Generalize the test suite
-
-The test suite currently assumes it knows something about the internal
-state of GnuPG's homedir.
-
-It's safer and less brittle to rely explicitly on the public interface
-that GnuPG has committed to, such as --import-keys and --list-keys,
-rather than assuming that certain files are in certain places in the
-GnuPG homedir.
-
-It's also better to create a fresh homedir and allow GnuPG to populate
-it during the test suite, cleaning it up at the end, rather than hope
-that GnuPG will leave a pre-existing homedir untouched.
-
-With this change, many more of the tests pass when /usr/bin/gpg is
-provided by GnuPG 2.1.
----
- t/000_setup.t              | 28 ++++++++++++++++++++++++++++
- t/MyTestSpecific.pm        |  2 +-
- t/zzz_cleanup.t            | 17 +++++++++++++++++
- test/fake-pinentry.pl      | 28 ++++++++++++++++++++++++++++
- test/{options => gpg.conf} |  0
- test/secret-keys/1.0.test  |  4 ++--
- 6 files changed, 76 insertions(+), 3 deletions(-)
- create mode 100644 t/000_setup.t
- create mode 100644 t/zzz_cleanup.t
- create mode 100755 test/fake-pinentry.pl
- rename test/{options => gpg.conf} (100%)
-
-diff --git a/t/000_setup.t b/t/000_setup.t
-new file mode 100644
-index 0000000..7f7f7b0
---- /dev/null
-+++ b/t/000_setup.t
-@@ -0,0 +1,28 @@
-+#!/usr/bin/perl -w
-+
-+use strict;
-+use English qw( -no_match_vars );
-+
-+use lib './t';
-+use MyTest;
-+use MyTestSpecific;
-+use Cwd;
-+use File::Path qw (make_path);
-+use File::Copy;
-+
-+TEST
-+{
-+    make_path('test/gnupghome', { mode => 0700 });
-+    my $agentconf = IO::File->new( "> test/gnupghome/gpg-agent.conf" );
-+    $agentconf->write("pinentry-program " . getcwd() . "/test/fake-pinentry.pl\n");
-+    $agentconf->close();
-+    copy('test/gpg.conf', 'test/gnupghome/gpg.conf');
-+    reset_handles();
-+
-+    my $pid = $gnupg->import_keys(command_args => [ 'test/pubring.gpg', 'test/secring.gpg' ],
-+                                  options => [ 'batch'],
-+                                  handles => $handles);
-+    waitpid $pid, 0;
-+
-+    return $CHILD_ERROR == 0;
-+};
-diff --git a/t/MyTestSpecific.pm b/t/MyTestSpecific.pm
-index 053b749..1af98ae 100644
---- a/t/MyTestSpecific.pm
-+++ b/t/MyTestSpecific.pm
-@@ -40,7 +40,7 @@ use vars qw( @ISA           @EXPORT
- 
- $gnupg = GnuPG::Interface->new( passphrase => 'test' );
- 
--$gnupg->options->hash_init( homedir              => 'test',
-+$gnupg->options->hash_init( homedir              => 'test/gnupghome',
-                             armor                => 1,
-                             meta_interactive     => 0,
-                             meta_signing_key_id  => '0xF950DA9C',
-diff --git a/t/zzz_cleanup.t b/t/zzz_cleanup.t
-new file mode 100644
-index 0000000..5c03a72
---- /dev/null
-+++ b/t/zzz_cleanup.t
-@@ -0,0 +1,17 @@
-+#!/usr/bin/perl -w
-+
-+use strict;
-+use English qw( -no_match_vars );
-+
-+use lib './t';
-+use MyTest;
-+use MyTestSpecific;
-+use File::Path qw (remove_tree);
-+
-+# this is actually no test, just cleanup.
-+TEST
-+{
-+    my $err = [];
-+    remove_tree('test/gnupghome', {error => \$err});
-+    return ! @$err;
-+};
-diff --git a/test/fake-pinentry.pl b/test/fake-pinentry.pl
-new file mode 100755
-index 0000000..12d3611
---- /dev/null
-+++ b/test/fake-pinentry.pl
-@@ -0,0 +1,28 @@
-+#!/usr/bin/perl -w
-+# Use this for your test suites when a perl interpreter is available.
-+#
-+# The encrypted keys in your test suite that you expect to work must
-+# be locked with a passphrase of "test"
-+#
-+# Author: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-+#
-+# License: This trivial work is hereby explicitly placed into the
-+# public domain.  Anyone may reuse it, modify it, redistribute it for
-+# any purpose.
-+
-+use strict;
-+use warnings;
-+
-+# turn off buffering
-+$| = 1;
-+
-+print "OK This is only for test suites, and should never be used in production\n";
-+while (<STDIN>) {
-+  chomp;
-+  next if (/^$/);
-+  next if (/^#/);
-+  print ("D test\n") if (/^getpin/i);
-+  print "OK\n";
-+  exit if (/^bye/i);
-+}
-+1;
-diff --git a/test/options b/test/gpg.conf
-similarity index 100%
-rename from test/options
-rename to test/gpg.conf
-diff --git a/test/secret-keys/1.0.test b/test/secret-keys/1.0.test
-index 5999484..129d472 100644
---- a/test/secret-keys/1.0.test
-+++ b/test/secret-keys/1.0.test
-@@ -1,5 +1,5 @@
--test/secring.gpg
------------------
-+test/gnupghome/secring.gpg
-+--------------------------
- sec   1024D/F950DA9C 2000-02-06
- uid                  GnuPG test key (for testing purposes only)
- uid                  Foo Bar (1)
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0003-subkey-validity-of-an-key-when-we-have-established-n.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0003-subkey-validity-of-an-key-when-we-have-established-n.patch
deleted file mode 100644
index 23fbf97fee2c..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0003-subkey-validity-of-an-key-when-we-have-established-n.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 13 Sep 2016 11:35:31 -0400
-Subject: subkey validity of an key when we have established no trust anchors
-
-This apparently isn't tested by deep comparisons, though, so it was
-never caught.
----
- t/get_public_keys.t | 2 +-
- t/get_secret_keys.t | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/t/get_public_keys.t b/t/get_public_keys.t
-index 53db021..73e320b 100644
---- a/t/get_public_keys.t
-+++ b/t/get_public_keys.t
-@@ -175,7 +175,7 @@ TEST
-     ];
- 
-     my $subkey = GnuPG::SubKey->new
--      ( validity                 => 'u',
-+      ( validity                 => '-',
-         length                   => 768,
-         algo_num                 => 16,
-         hex_id                   => 'ADB99D9C2E854A6B',
-diff --git a/t/get_secret_keys.t b/t/get_secret_keys.t
-index 3a1d99f..7bba083 100644
---- a/t/get_secret_keys.t
-+++ b/t/get_secret_keys.t
-@@ -48,7 +48,7 @@ TEST
- 
- 
-     my $subkey = GnuPG::SubKey->new
--      ( validity                 => 'u',
-+      ( validity                 => '-',
-         length                   => 768,
-         algo_num                 => 16,
-         hex_id                   => 'ADB99D9C2E854A6B',
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0004-ensure-that-test-covers-all-signatures.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0004-ensure-that-test-covers-all-signatures.patch
deleted file mode 100644
index 1743b7d9177c..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0004-ensure-that-test-covers-all-signatures.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 13 Sep 2016 11:39:04 -0400
-Subject: ensure that test covers all signatures
-
-The earlier test wasn't reporting on one of the known self-sigs for
-the test key for some reason.
-
-This change ensures that all known signatures are present.
----
- t/get_public_keys.t | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/t/get_public_keys.t b/t/get_public_keys.t
-index 73e320b..9e96f7d 100644
---- a/t/get_public_keys.t
-+++ b/t/get_public_keys.t
-@@ -83,7 +83,17 @@ TEST
-                             date_string => '2000-02-06',
-                             hex_id => '53AE596EF950DA9C',
-                             sig_class => 0x13,
--                            validity => '!'));
-+                            validity => '!'),
-+      GnuPG::Signature->new(
-+                            date => 1177086329,
-+                            algo_num => 17,
-+                            is_exportable => 1,
-+                            user_id_string => 'GnuPG test key (for testing purposes only)',
-+                            date_string => '2007-04-20',
-+                            hex_id => '53AE596EF950DA9C',
-+                            sig_class => 0x13,
-+                            validity => '!'),
-+                          );
- 
-     my $uid1 = GnuPG::UserId->new( as_string =>  'Foo Bar (1)',
-                                    validity => '-');
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0005-add-gpg_is_modern-to-test-suite.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0005-add-gpg_is_modern-to-test-suite.patch
deleted file mode 100644
index 0016fa755c0c..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0005-add-gpg_is_modern-to-test-suite.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 13 Sep 2016 14:31:38 -0400
-Subject: add $gpg_is_modern to test suite
-
-MyTestSpecific.pm now produces a new variable indicating whether it
-the version of GnuPG we run against is from the "Modern" line of GnuPG
-development (2.1 or later).  This will be useful when comparing output
-that we can't expect from earlier versions.
----
- t/MyTestSpecific.pm | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/t/MyTestSpecific.pm b/t/MyTestSpecific.pm
-index 1af98ae..a309698 100644
---- a/t/MyTestSpecific.pm
-+++ b/t/MyTestSpecific.pm
-@@ -29,17 +29,20 @@ use GnuPG::Handles;
- use vars qw( @ISA           @EXPORT
-              $stdin         $stdout           $stderr
-              $gpg_program   $handles          $gnupg
--             %texts
-+             %texts         $gpg_is_modern
-            );
- 
- @ISA    = qw( Exporter );
- @EXPORT = qw( stdin                  stdout          stderr
-               gnupg_program handles  reset_handles
--              texts                  file_match
-+              texts                  file_match      gpg_is_modern
-             );
- 
- $gnupg = GnuPG::Interface->new( passphrase => 'test' );
- 
-+my @version = split('\.', $gnupg->version());
-+$gpg_is_modern = ($version[0] > 2 || ($version[0] == 2 && $version[1] >= 1));
-+
- $gnupg->options->hash_init( homedir              => 'test/gnupghome',
-                             armor                => 1,
-                             meta_interactive     => 0,
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0006-Modern-GnuPG-2.1-reports-more-detail-about-secret-ke.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0006-Modern-GnuPG-2.1-reports-more-detail-about-secret-ke.patch
deleted file mode 100644
index bea8bfc68dfa..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0006-Modern-GnuPG-2.1-reports-more-detail-about-secret-ke.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 13 Sep 2016 14:12:40 -0400
-Subject: Modern GnuPG (2.1) reports more detail about secret keys
-
-the GnuPG "modern" suite (version 2.1 or later) reports more detail
-about secret keys than previous versions did.  In particular, it
-reports stored ownertrust, public key data, and designated revokers
-for secret keys.  Older versions only reported those attributes for
-public keys.
-
-This patch adjusts the test suite to ensure that our handmade key
-matches the produced key when /usr/bin/gpg is supplied by the modern
-suite.
----
- t/get_secret_keys.t | 66 +++++++++++++++++++++++++++++++++++++++++++----------
- 1 file changed, 54 insertions(+), 12 deletions(-)
-
-diff --git a/t/get_secret_keys.t b/t/get_secret_keys.t
-index 7bba083..c798cce 100644
---- a/t/get_secret_keys.t
-+++ b/t/get_secret_keys.t
-@@ -23,16 +23,34 @@ TEST
-     return 0 unless @returned_keys == 1;
- 
-     $given_key = shift @returned_keys;
--
--    $handmade_key = GnuPG::PrimaryKey->new
--      ( length                 => 1024,
-+    my $pubkey_data = [
-+     Math::BigInt->from_hex('0x'.
-+      '88FCAAA5BCDCD52084D46143F44ED1715A339794641158DE03AA2092AFD3174E3DCA2CB7DF2DDC6FEDF7C3620F5A8BDAD06713E6153F8748DD76CB97305F30CBA8F8801DB47FAC11EED725F55672CB9BDAD629178A677CBB089B3E8AE0D9A9AD7741697A35F2868C62D25670994A92D810480173DC24263EEA0F103A43C0B64B'),
-+     Math::BigInt->from_hex('0x'.
-+      '8F2A3842C70FF17660CBB78C78FC93F534AB9A17'),
-+     Math::BigInt->from_hex('0x'.
-+      '83E348C2AA65F56DE84E8FDCE6DA7B0991B1C75EC8CA446FA85869A43350907BFF36BE512385E8E7E095578BB2138C04E318495873218286DE2B8C86F36EA670135434967AC798EBA28581F709F0C6B696EB512D3E561E381A06E4B5239BCC655015F9A926C74E4B859B26EAD604F208A556511A76A40EDCD9C38E6BD82CCCB4'),
-+     Math::BigInt->from_hex('0x'.
-+      '80DE04C85E30C9D62C13F90CFF927A84A5A59D0900B3533D4D6193FEF8C5DAEF9FF8A7D5F76B244FBC17644F50D524E0B19CD3A4B5FC2D78DAECA3FE58FA1C1A64E6C7B96C4EE618173543163A72EF954DFD593E84342699096E9CA76578AC1DE3D893BCCD0BF470CEF625FAF816A0F503EF75C18C6173E35C8675AF919E5704')
-+    ];
-+
-+
-+    my $args = {
-+        length                 => 1024,
-         algo_num               => 17,
-         hex_id                 => '53AE596EF950DA9C',
-         creation_date          => 949813093,
-         creation_date_string   => '2000-02-06',
--        owner_trust            => '', # secret keys do not report ownertrust?
-+        owner_trust            => '-',
-         usage_flags            => 'scaESCA',
--      );
-+        pubkey_data            => $pubkey_data,
-+    };
-+    if (!$gpg_is_modern) {
-+      # older versions don't report ownertrust or pubkey_data for secret keys:
-+      delete $args->{pubkey_data};
-+      $args->{owner_trust} = '';
-+    }
-+    $handmade_key = GnuPG::PrimaryKey->new($args);
- 
-     $handmade_key->fingerprint
-       ( GnuPG::Fingerprint->new( as_hex_string =>
-@@ -42,20 +60,42 @@ TEST
- 
-     $handmade_key->push_user_ids(
-       GnuPG::UserId->new( as_string => 'GnuPG test key (for testing purposes only)',
--                          validity => ''), # secret keys do not report uid validity?
-+                          validity => $args->{owner_trust}),
-       GnuPG::UserId->new( as_string => 'Foo Bar (1)',
--                          validity => '')); # secret keys do not report uid validity?
--
--
--    my $subkey = GnuPG::SubKey->new
--      ( validity                 => '-',
-+                          validity => $args->{owner_trust}));
-+
-+    my $revoker = GnuPG::Revoker->new
-+      ( algo_num       => 17,
-+        class          => 0x80,
-+        fingerprint    => GnuPG::Fingerprint->new( as_hex_string =>
-+                                                   '4F863BBBA8166F0A340F600356FFD10A260C4FA3'),
-+        );
-+
-+    my $subkey_pub_data = [
-+     Math::BigInt->from_hex('0x'.
-+      '8831982DADC4C5D05CBB01D9EAF612131DDC9C24CEA7246557679423FB0BA42F74D10D8E7F5564F6A4FB8837F8DC4A46571C19B122E6DF4B443D15197A6A22688863D0685FADB6E402316DAA9B560D1F915475364580A67E6DF0A727778A5CF3'),
-+     Math::BigInt->from_hex('0x'.
-+      '6'),
-+     Math::BigInt->from_hex('0x'.
-+      '2F3850FF130C6AC9AA0962720E86539626FAA9B67B33A74DFC0DE843FF3E90E43E2F379EE0182D914FA539CCCF5C83A20DB3A7C45E365B8A2A092E799A3DFF4AD8274EB977BAAF5B1AFB2ACB8D6F92454F01682F555565E73E56793C46EF7C3E')
-+    ];
-+
-+    my $sub_args = {
-+        validity                 => '-',
-         length                   => 768,
-         algo_num                 => 16,
-         hex_id                   => 'ADB99D9C2E854A6B',
-         creation_date            => 949813119,
-         creation_date_string     => '2000-02-06',
-         usage_flags              => 'e',
--      );
-+        pubkey_data              => $subkey_pub_data,
-+      };
-+
-+    if (!$gpg_is_modern) {
-+      # older versions do not report pubkey data for secret keys
-+      delete $sub_args->{pubkey_data};
-+    }
-+    my $subkey = GnuPG::SubKey->new($sub_args);
- 
-     $subkey->fingerprint
-       ( GnuPG::Fingerprint->new( as_hex_string =>
-@@ -64,6 +104,8 @@ TEST
-       );
- 
-     $handmade_key->push_subkeys( $subkey );
-+    # older versions do not report designated revokers for secret keys
-+    $handmade_key->push_revokers( $revoker ) if ($gpg_is_modern);
- 
-     $handmade_key->compare( $given_key );
- };
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0007-test-suite-match-plaintext-output-across-versions-of.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0007-test-suite-match-plaintext-output-across-versions-of.patch
deleted file mode 100644
index 85c1a46adae5..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0007-test-suite-match-plaintext-output-across-versions-of.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 13 Sep 2016 14:46:13 -0400
-Subject: test suite: match plaintext output across versions of GnuPG
-
-The human-readable version of --list-keys is *not* expected to be
-static over time or as the user's environment changes (e.g. LANG or
-LC_MESSAGES), so expecting it to be machine-parseable is probably a
-mistake.
-
-That said, some users might want to pull textual information about
-specific keys to display directly to the user, so it's not a terrible
-idea to have it in the test suite.
-
-Modern GnuPG (2.1 or later) changes the default structure of the
-human-readable output in a few significant ways:
-
- * it writes the path to the keyring as an absolute path, even if
-   $GNUPGHOME is set to a non-absolute path.
-
- * it shows the calculated user id validity by default (see
-   show-uid-validity in gpg's --list-options).  (note that this is a
-   translated string, so that "unknown" (in the default C locale)
-   becomes "inconnue" when LANG or LC_MESSAGES is set to fr_CH.UTF-8,
-   for example.
-
- * it writes the key algorithm names differently (e.g. rsa2048 instead
-   of 2048R)
-
- * it does not display the key ID at all by default
-
- * it displays the full fingerprint in compact form by default
-
-This changeset fixes the test suite so that it can do a rough
-verification of the human-readable text output by list_secret_keys in
-the C locale in modern versions of GnuPG, while leaving it working for
-older GnuPG suites.
----
- t/list_secret_keys.t           | 15 +++++++++++++--
- test/secret-keys/1.modern.test |  8 ++++++++
- 2 files changed, 21 insertions(+), 2 deletions(-)
- create mode 100644 test/secret-keys/1.modern.test
-
-diff --git a/t/list_secret_keys.t b/t/list_secret_keys.t
-index 1fe9b7e..51e3651 100644
---- a/t/list_secret_keys.t
-+++ b/t/list_secret_keys.t
-@@ -16,13 +16,22 @@ TEST
- {
-     reset_handles();
- 
-+    $ENV{LC_MESSAGES} = 'C';
-     my $pid = $gnupg->list_secret_keys( handles => $handles );
-     close $stdin;
- 
-     $outfile = 'test/secret-keys/1.out';
-     my $out = IO::File->new( "> $outfile" )
-       or die "cannot open $outfile for writing: $ERRNO";
--    $out->print( <$stdout> );
-+    while (<$stdout>) {
-+      if ($gpg_is_modern && /^\/.*\/test\/gnupghome\/pubring.kbx$/) {
-+        $out->print("test/gnupghome/pubring.kbx\n");
-+      } elsif ($gpg_is_modern && /^--*$/) {
-+        $out->print("--------------------------\n");
-+      } else {
-+        $out->print( $_ );
-+      }
-+    }
-     close $stdout;
-     $out->close();
-     waitpid $pid, 0;
-@@ -33,7 +42,9 @@ TEST
- 
- TEST
- {
--    my @files_to_test = ( 'test/secret-keys/1.0.test' );
-+    my $suffix = '0';
-+    $suffix = 'modern' if ($gpg_is_modern);
-+    my @files_to_test = ( 'test/secret-keys/1.'.$suffix.'.test' );
- 
-     return file_match( $outfile, @files_to_test );
- };
-diff --git a/test/secret-keys/1.modern.test b/test/secret-keys/1.modern.test
-new file mode 100644
-index 0000000..3e46407
---- /dev/null
-+++ b/test/secret-keys/1.modern.test
-@@ -0,0 +1,8 @@
-+test/gnupghome/pubring.kbx
-+--------------------------
-+sec   dsa1024 2000-02-06 [SCA]
-+      93AFC4B1B0288A104996B44253AE596EF950DA9C
-+uid           [ unknown] GnuPG test key (for testing purposes only)
-+uid           [ unknown] Foo Bar (1)
-+ssb   elg768 2000-02-06 [E]
-+
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0008-fix-test_default_key_passphrase-when-passphrase-come.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0008-fix-test_default_key_passphrase-when-passphrase-come.patch
deleted file mode 100644
index 5ae938325ff1..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0008-fix-test_default_key_passphrase-when-passphrase-come.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 13 Sep 2016 15:22:27 -0400
-Subject: fix test_default_key_passphrase when passphrase comes from agent
-
-In the modern GnuPG suite, where the passphrase is always managed by
-the agent, gpg itself doesn't emit the GOOD_PASSPHRASE status.
-Instead, if signing is successful it emits plain old SIG_CREATED.
-
-There are probably even better ways to test whether a given key is
-unlocked in this case, but this is a straightforward baseline fix that
-should get this part of the test suite to pass with all available
-versions of GnuPG.
----
- lib/GnuPG/Interface.pm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm
-index 83a4b1a..1f1e6d5 100644
---- a/lib/GnuPG/Interface.pm
-+++ b/lib/GnuPG/Interface.pm
-@@ -808,7 +808,7 @@ sub test_default_key_passphrase() {
- 
-     # all we realy want to check is the status fh
-     while (<$status>) {
--        if (/^\[GNUPG:\]\s*GOOD_PASSPHRASE/) {
-+        if (/^\[GNUPG:\]\s*(GOOD_PASSPHRASE|SIG_CREATED)/) {
-             waitpid $pid, 0;
-             return 1;
-         }
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0009-clean-up-trailing-whitespace.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0009-clean-up-trailing-whitespace.patch
deleted file mode 100644
index f408c6568b0f..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0009-clean-up-trailing-whitespace.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 11 Oct 2016 19:52:13 -0400
-Subject: clean up trailing whitespace
-
----
- lib/GnuPG/Fingerprint.pm |  2 +-
- lib/GnuPG/Handles.pm     |  2 +-
- lib/GnuPG/Interface.pm   | 16 ++++++++--------
- 3 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/lib/GnuPG/Fingerprint.pm b/lib/GnuPG/Fingerprint.pm
-index fcb1028..81c38a7 100644
---- a/lib/GnuPG/Fingerprint.pm
-+++ b/lib/GnuPG/Fingerprint.pm
-@@ -20,7 +20,7 @@ with qw(GnuPG::HashInit);
- 
- has as_hex_string => (
-     isa => 'Any',
--    is  => 'rw',        
-+    is  => 'rw',
- );
- 
- sub compare {
-diff --git a/lib/GnuPG/Handles.pm b/lib/GnuPG/Handles.pm
-index b30ca57..3eee0e3 100644
---- a/lib/GnuPG/Handles.pm
-+++ b/lib/GnuPG/Handles.pm
-@@ -73,7 +73,7 @@ GnuPG::Handles - GnuPG handles bundle
-     = ( IO::Handle->new(), IO::Handle->new(), IO::Handle->new(),
-         IO::Handle->new(), IO::Handle->new(), IO::Handle->new(),
-       );
-- 
-+
-   my $handles = GnuPG::Handles->new
-     ( stdin      => $stdin,
-       stdout     => $stdout,
-diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm
-index 1f1e6d5..19e8070 100644
---- a/lib/GnuPG/Interface.pm
-+++ b/lib/GnuPG/Interface.pm
-@@ -833,7 +833,7 @@ GnuPG::Interface - Perl interface to GnuPG
-   # A simple example
-   use IO::Handle;
-   use GnuPG::Interface;
--  
-+
-   # setting up the situation
-   my $gnupg = GnuPG::Interface->new();
-   $gnupg->options->hash_init( armor   => 1,
-@@ -852,7 +852,7 @@ GnuPG::Interface - Perl interface to GnuPG
-   # Now we'll go about encrypting with the options already set
-   my @plaintext = ( 'foobar' );
-   my $pid = $gnupg->encrypt( handles => $handles );
--  
-+
-   # Now we write to the input of GnuPG
-   print $input @plaintext;
-   close $input;
-@@ -1144,7 +1144,7 @@ The following setup can be done before any of the following examples:
- 
-   my $handles = GnuPG::Handles->new( stdin    => $input,
-                                      stdout   => $output );
--   
-+
-   # this sets up the communication
-   # Note that the recipients were specified earlier
-   # in the 'options' data member of the $gnupg object.
-@@ -1220,7 +1220,7 @@ The following setup can be done before any of the following examples:
-   # a file written to disk
-   # Make sure you "use IO::File" if you use this module!
-   my $cipher_file = IO::File->new( 'encrypted.gpg' );
--   
-+
-   # this sets up the communication
-   my $pid = $gnupg->decrypt( handles => $handles );
- 
-@@ -1252,7 +1252,7 @@ The following setup can be done before any of the following examples:
-   # This time we'll just let GnuPG print to our own output
-   # and read from our input, because no input is needed!
-   my $handles = GnuPG::Handles->new();
--  
-+
-   my @ids = ( 'ftobin', '0xABCD1234' );
- 
-   # this time we need to specify something for
-@@ -1260,7 +1260,7 @@ The following setup can be done before any of the following examples:
-   # search ids as arguments
-   my $pid = $gnupg->list_public_keys( handles      => $handles,
-                                       command_args => [ @ids ] );
--  
-+
-    waitpid $pid, 0;
- 
- =head2 Creating GnuPG::PublicKey Objects
-@@ -1280,7 +1280,7 @@ The following setup can be done before any of the following examples:
-       command_args => [ qw( test/key.1.asc ) ],
-       handles      => $handles,
-     );
--    
-+
-     my @out = <$handles->stdout()>;
-     waitpid $pid, 0;
- 
-@@ -1357,7 +1357,7 @@ under the same terms as Perl itself.
- 
- =head1 AUTHOR
- 
--GnuPg::Interface is currently maintained by Jesse Vincent <jesse@cpan.org>.  
-+GnuPg::Interface is currently maintained by Jesse Vincent <jesse@cpan.org>.
- 
- Frank J. Tobin, ftobin@cpan.org was the original author of the package.
- 
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0010-fix-capitalization-of-GnuPG.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0010-fix-capitalization-of-GnuPG.patch
deleted file mode 100644
index f55d4b15942c..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0010-fix-capitalization-of-GnuPG.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 11 Oct 2016 19:52:58 -0400
-Subject: fix capitalization of GnuPG
-
----
- README                 | 2 +-
- lib/GnuPG/Interface.pm | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/README b/README
-index f457577..aa7c984 100644
---- a/README
-+++ b/README
-@@ -427,7 +427,7 @@ LICENSE
-     under the same terms as Perl itself.
- 
- AUTHOR
--    GnuPg::Interface is currently maintained by Jesse Vincent
-+    GnuPG::Interface is currently maintained by Jesse Vincent
-     <jesse@cpan.org>.
- 
-     Frank J. Tobin, ftobin@cpan.org was the original author of the package.
-diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm
-index 19e8070..cf7138f 100644
---- a/lib/GnuPG/Interface.pm
-+++ b/lib/GnuPG/Interface.pm
-@@ -1357,7 +1357,7 @@ under the same terms as Perl itself.
- 
- =head1 AUTHOR
- 
--GnuPg::Interface is currently maintained by Jesse Vincent <jesse@cpan.org>.
-+GnuPG::Interface is currently maintained by Jesse Vincent <jesse@cpan.org>.
- 
- Frank J. Tobin, ftobin@cpan.org was the original author of the package.
- 
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0011-ommand_args-should-be-command_args.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0011-ommand_args-should-be-command_args.patch
deleted file mode 100644
index a9ab737aa04a..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0011-ommand_args-should-be-command_args.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 11 Oct 2016 19:57:10 -0400
-Subject: ommand_args should be command_args
-
----
- t/list_public_keys.t | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/t/list_public_keys.t b/t/list_public_keys.t
-index 7e563c1..a36a78b 100644
---- a/t/list_public_keys.t
-+++ b/t/list_public_keys.t
-@@ -38,7 +38,7 @@ TEST
-     reset_handles();
- 
-     my $pid = $gnupg->list_public_keys( handles     => $handles,
--                                        ommand_args => '0xF950DA9C'
-+                                        command_args => '0xF950DA9C'
-                                       );
-     close $stdin;
- 
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0012-use-fingerprints-as-inputs-during-tests-to-demonstra.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0012-use-fingerprints-as-inputs-during-tests-to-demonstra.patch
deleted file mode 100644
index 9694e0854ce8..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0012-use-fingerprints-as-inputs-during-tests-to-demonstra.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 11 Oct 2016 20:05:16 -0400
-Subject: use fingerprints as inputs during tests to demonstrate explicit usage
-
----
- README                 | 6 +++---
- lib/GnuPG/Interface.pm | 6 +++---
- lib/GnuPG/Options.pm   | 2 +-
- t/MyTestSpecific.pm    | 2 +-
- t/encrypt.t            | 6 +++---
- t/export_keys.t        | 4 ++--
- t/get_public_keys.t    | 2 +-
- t/get_secret_keys.t    | 2 +-
- t/list_public_keys.t   | 4 ++--
- t/list_secret_keys.t   | 4 ++--
- t/list_sigs.t          | 4 ++--
- t/sign_and_encrypt.t   | 2 +-
- 12 files changed, 22 insertions(+), 22 deletions(-)
-
-diff --git a/README b/README
-index aa7c984..ed94ede 100644
---- a/README
-+++ b/README
-@@ -228,7 +228,7 @@ EXAMPLES
- 
-       $gnupg->options->hash_init( armor    => 1,
-                                   recipients => [ 'ftobin@uiuc.edu',
--                                                  '0xABCD1234' ],
-+                                                  '0xABCD1234ABCD1234ABCD1234ABCD1234ABCD1234' ],
-                                   meta_interactive => 0 ,
-                                 );
- 
-@@ -347,7 +347,7 @@ EXAMPLES
-       # and read from our input, because no input is needed!
-       my $handles = GnuPG::Handles->new();
-   
--      my @ids = ( 'ftobin', '0xABCD1234' );
-+      my @ids = ( 'ftobin', '0xABCD1234ABCD1234ABCD1234ABCD1234ABCD1234' );
- 
-       # this time we need to specify something for
-       # command_args because --list-public-keys takes
-@@ -358,7 +358,7 @@ EXAMPLES
-        waitpid $pid, 0;
- 
-   Creating GnuPG::PublicKey Objects
--      my @ids = [ 'ftobin', '0xABCD1234' ];
-+      my @ids = [ 'ftobin', '0xABCD1234ABCD1234ABCD1234ABCD1234ABCD1234' ];
- 
-       my @keys = $gnupg->get_public_keys( @ids );
- 
-diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm
-index cf7138f..6eaef7d 100644
---- a/lib/GnuPG/Interface.pm
-+++ b/lib/GnuPG/Interface.pm
-@@ -1130,7 +1130,7 @@ The following setup can be done before any of the following examples:
- 
-   $gnupg->options->hash_init( armor    => 1,
-                               recipients => [ 'ftobin@uiuc.edu',
--                                              '0xABCD1234' ],
-+                                              '0xABCD1234ABCD1234ABCD1234ABCD1234ABCD1234' ],
-                               meta_interactive => 0 ,
-                             );
- 
-@@ -1253,7 +1253,7 @@ The following setup can be done before any of the following examples:
-   # and read from our input, because no input is needed!
-   my $handles = GnuPG::Handles->new();
- 
--  my @ids = ( 'ftobin', '0xABCD1234' );
-+  my @ids = ( 'ftobin', '0xABCD1234ABCD1234ABCD1234ABCD1234ABCD1234' );
- 
-   # this time we need to specify something for
-   # command_args because --list-public-keys takes
-@@ -1265,7 +1265,7 @@ The following setup can be done before any of the following examples:
- 
- =head2 Creating GnuPG::PublicKey Objects
- 
--  my @ids = [ 'ftobin', '0xABCD1234' ];
-+  my @ids = [ 'ftobin', '0xABCD1234ABCD1234ABCD1234ABCD1234ABCD1234' ];
- 
-   my @keys = $gnupg->get_public_keys( @ids );
- 
-diff --git a/lib/GnuPG/Options.pm b/lib/GnuPG/Options.pm
-index 86261a0..7788662 100644
---- a/lib/GnuPG/Options.pm
-+++ b/lib/GnuPG/Options.pm
-@@ -198,7 +198,7 @@ GnuPG::Options - GnuPG options embodiment
- 
-   # assuming $gnupg is a GnuPG::Interface object
-   $gnupg->options->armor( 1 );
--  $gnupg->options->push_recipients( 'ftobin', '0xABCD1234' );
-+  $gnupg->options->push_recipients( 'ftobin', '0xABCD1234ABCD1234ABCD1234ABCD1234ABCD1234' );
- 
- =head1 DESCRIPTION
- 
-diff --git a/t/MyTestSpecific.pm b/t/MyTestSpecific.pm
-index a309698..c8764cc 100644
---- a/t/MyTestSpecific.pm
-+++ b/t/MyTestSpecific.pm
-@@ -46,7 +46,7 @@ $gpg_is_modern = ($version[0] > 2 || ($version[0] == 2 && $version[1] >= 1));
- $gnupg->options->hash_init( homedir              => 'test/gnupghome',
-                             armor                => 1,
-                             meta_interactive     => 0,
--                            meta_signing_key_id  => '0xF950DA9C',
-+                            meta_signing_key_id  => '0x93AFC4B1B0288A104996B44253AE596EF950DA9C',
-                             always_trust         => 1,
-                           );
- 
-diff --git a/t/encrypt.t b/t/encrypt.t
-index 3183ac4..e6bdc08 100644
---- a/t/encrypt.t
-+++ b/t/encrypt.t
-@@ -27,7 +27,7 @@ TEST
- 
-     $gnupg->options->clear_recipients();
-     $gnupg->options->clear_meta_recipients_keys();
--    $gnupg->options->push_recipients( '0x2E854A6B' );
-+    $gnupg->options->push_recipients( '0x7466B7E98C4CCB64C2CE738BADB99D9C2E854A6B' );
- 
-     my $pid = $gnupg->encrypt( handles => $handles );
- 
-@@ -43,7 +43,7 @@ TEST
- {
-     reset_handles();
- 
--    my @keys = $gnupg->get_public_keys( '0xF950DA9C' );
-+    my @keys = $gnupg->get_public_keys( '0x93AFC4B1B0288A104996B44253AE596EF950DA9C' );
-     $gnupg->options->clear_recipients();
-     $gnupg->options->clear_meta_recipients_keys();
-     $gnupg->options->push_meta_recipients_keys( @keys );
-@@ -64,7 +64,7 @@ TEST
- 
-     $gnupg->options->clear_recipients();
-     $gnupg->options->clear_meta_recipients_keys();
--    $gnupg->options->push_recipients( '0x2E854A6B' );
-+    $gnupg->options->push_recipients( '0x7466B7E98C4CCB64C2CE738BADB99D9C2E854A6B' );
- 
-     $handles->stdin( $texts{plain}->fh() );
-     $handles->options( 'stdin' )->{direct} = 1;
-diff --git a/t/export_keys.t b/t/export_keys.t
-index cf5c82b..5add064 100644
---- a/t/export_keys.t
-+++ b/t/export_keys.t
-@@ -15,7 +15,7 @@ TEST
-     reset_handles();
- 
-     my $pid = $gnupg->export_keys( handles      => $handles,
--                                   command_args => '0xF950DA9C' );
-+                                   command_args => '0x93AFC4B1B0288A104996B44253AE596EF950DA9C' );
-     close $stdin;
-     waitpid $pid, 0;
- 
-@@ -31,7 +31,7 @@ TEST
-     $handles->options( 'stdout' )->{direct} = 1;
- 
-     my $pid = $gnupg->export_keys( handles            => $handles,
--                                   command_args => '0xF950DA9C' );
-+                                   command_args => '0x93AFC4B1B0288A104996B44253AE596EF950DA9C' );
-     waitpid $pid, 0;
-     return $CHILD_ERROR == 0;
- };
-diff --git a/t/get_public_keys.t b/t/get_public_keys.t
-index 9e96f7d..7893625 100644
---- a/t/get_public_keys.t
-+++ b/t/get_public_keys.t
-@@ -19,7 +19,7 @@ TEST
- {
-     reset_handles();
- 
--    my @returned_keys = $gnupg->get_public_keys_with_sigs( '0xF950DA9C' );
-+    my @returned_keys = $gnupg->get_public_keys_with_sigs( '0x93AFC4B1B0288A104996B44253AE596EF950DA9C' );
- 
-     return 0 unless @returned_keys == 1;
- 
-diff --git a/t/get_secret_keys.t b/t/get_secret_keys.t
-index c798cce..a7f1348 100644
---- a/t/get_secret_keys.t
-+++ b/t/get_secret_keys.t
-@@ -18,7 +18,7 @@ TEST
- {
-     reset_handles();
- 
--    my @returned_keys = $gnupg->get_secret_keys( '0xF950DA9C' );
-+    my @returned_keys = $gnupg->get_secret_keys( '0x93AFC4B1B0288A104996B44253AE596EF950DA9C' );
- 
-     return 0 unless @returned_keys == 1;
- 
-diff --git a/t/list_public_keys.t b/t/list_public_keys.t
-index a36a78b..622b092 100644
---- a/t/list_public_keys.t
-+++ b/t/list_public_keys.t
-@@ -38,7 +38,7 @@ TEST
-     reset_handles();
- 
-     my $pid = $gnupg->list_public_keys( handles     => $handles,
--                                        command_args => '0xF950DA9C'
-+                                        command_args => '0x93AFC4B1B0288A104996B44253AE596EF950DA9C'
-                                       );
-     close $stdin;
- 
-@@ -64,7 +64,7 @@ TEST
-     $handles->options( 'stdout' )->{direct} = 1;
- 
-     my $pid = $gnupg->list_public_keys( handles      => $handles,
--                                        command_args => '0xF950DA9C',
-+                                        command_args => '0x93AFC4B1B0288A104996B44253AE596EF950DA9C',
-                                       );
- 
-     waitpid $pid, 0;
-diff --git a/t/list_secret_keys.t b/t/list_secret_keys.t
-index 51e3651..7040c38 100644
---- a/t/list_secret_keys.t
-+++ b/t/list_secret_keys.t
-@@ -55,7 +55,7 @@ TEST
-     reset_handles();
- 
-     my $pid = $gnupg->list_secret_keys( handles      => $handles,
--                                        command_args => '0xF950DA9C' );
-+                                        command_args => '0x93AFC4B1B0288A104996B44253AE596EF950DA9C' );
-     close $stdin;
- 
-     $outfile = 'test/secret-keys/2.out';
-@@ -80,7 +80,7 @@ TEST
-     $handles->options( 'stdout' )->{direct} = 1;
- 
-     my $pid = $gnupg->list_secret_keys( handles      => $handles,
--                                        command_args => '0xF950DA9C' );
-+                                        command_args => '0x93AFC4B1B0288A104996B44253AE596EF950DA9C' );
- 
-     waitpid $pid, 0;
- 
-diff --git a/t/list_sigs.t b/t/list_sigs.t
-index 16cfa6a..1301fb2 100644
---- a/t/list_sigs.t
-+++ b/t/list_sigs.t
-@@ -36,7 +36,7 @@ TEST
-     reset_handles();
- 
-     my $pid = $gnupg->list_sigs( handles      => $handles,
--                                 command_args => '0xF950DA9C',
-+                                 command_args => '0x93AFC4B1B0288A104996B44253AE596EF950DA9C',
-                                );
-     close $stdin;
- 
-@@ -60,7 +60,7 @@ TEST
-     $handles->options( 'stdout' )->{direct} = 1;
- 
-     my $pid = $gnupg->list_sigs( handles      => $handles,
--                                 command_args => '0xF950DA9C',
-+                                 command_args => '0x93AFC4B1B0288A104996B44253AE596EF950DA9C',
-                                );
- 
-     waitpid $pid, 0;
-diff --git a/t/sign_and_encrypt.t b/t/sign_and_encrypt.t
-index 5dc1c08..df0fc75 100644
---- a/t/sign_and_encrypt.t
-+++ b/t/sign_and_encrypt.t
-@@ -14,7 +14,7 @@ TEST
- {
-     reset_handles();
- 
--    $gnupg->options->push_recipients( '0x2E854A6B' );
-+    $gnupg->options->push_recipients( '0x7466B7E98C4CCB64C2CE738BADB99D9C2E854A6B' );
-     my $pid = $gnupg->sign_and_encrypt( handles => $handles );
- 
-     print $stdin @{ $texts{plain}->data() };
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0013-move-key-files-to-generic-names.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0013-move-key-files-to-generic-names.patch
deleted file mode 100644
index 489e685b7b8c..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0013-move-key-files-to-generic-names.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 11 Oct 2016 20:17:49 -0400
-Subject: move key files to generic names
-
----
- t/000_setup.t                         |   2 +-
- test/{pubring.gpg => public_keys.pgp} | Bin
- test/{secring.gpg => secret_keys.pgp} | Bin
- 3 files changed, 1 insertion(+), 1 deletion(-)
- rename test/{pubring.gpg => public_keys.pgp} (100%)
- rename test/{secring.gpg => secret_keys.pgp} (100%)
-
-diff --git a/t/000_setup.t b/t/000_setup.t
-index 7f7f7b0..a8e3042 100644
---- a/t/000_setup.t
-+++ b/t/000_setup.t
-@@ -19,7 +19,7 @@ TEST
-     copy('test/gpg.conf', 'test/gnupghome/gpg.conf');
-     reset_handles();
- 
--    my $pid = $gnupg->import_keys(command_args => [ 'test/pubring.gpg', 'test/secring.gpg' ],
-+    my $pid = $gnupg->import_keys(command_args => [ 'test/public_keys.pgp', 'test/secret_keys.pgp' ],
-                                   options => [ 'batch'],
-                                   handles => $handles);
-     waitpid $pid, 0;
-diff --git a/test/pubring.gpg b/test/public_keys.pgp
-similarity index 100%
-rename from test/pubring.gpg
-rename to test/public_keys.pgp
-diff --git a/test/secring.gpg b/test/secret_keys.pgp
-similarity index 100%
-rename from test/secring.gpg
-rename to test/secret_keys.pgp
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0014-fix-spelling-s-convience-convenience.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0014-fix-spelling-s-convience-convenience.patch
deleted file mode 100644
index ee809b61d754..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0014-fix-spelling-s-convience-convenience.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 11 Oct 2016 20:25:48 -0400
-Subject: fix spelling: s/convience/convenience/
-
----
- README                 | 4 ++--
- lib/GnuPG/Interface.pm | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/README b/README
-index ed94ede..a05ef9b 100644
---- a/README
-+++ b/README
-@@ -143,7 +143,7 @@ OBJECT METHODS
-         does not come into play. If the passphrase data member handle of the
-         handles object is not defined, but the the passphrase data member
-         handle of GnuPG::Interface object is, GnuPG::Interface will handle
--        passing this information into GnuPG for the user as a convience.
-+        passing this information into GnuPG for the user as a convenience.
-         Note that this will result in GnuPG::Interface storing the
-         passphrase in memory, instead of having it simply 'pass-through' to
-         GnuPG via a handle.
-@@ -271,7 +271,7 @@ EXAMPLES
-                                        );
- 
-       # indicate our pasphrase through the
--      # convience method
-+      # convenience method
-       $gnupg->passphrase( $passphrase );
- 
-       # this sets up the communication
-diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm
-index 6eaef7d..29205f0 100644
---- a/lib/GnuPG/Interface.pm
-+++ b/lib/GnuPG/Interface.pm
-@@ -1008,7 +1008,7 @@ and so this information is not generated and does not come into play.
- If the B<passphrase> data member handle of the B<handles> object
- is not defined, but the the B<passphrase> data member handle of GnuPG::Interface
- object is, GnuPG::Interface will handle passing this information into GnuPG
--for the user as a convience.  Note that this will result in
-+for the user as a convenience.  Note that this will result in
- GnuPG::Interface storing the passphrase in memory, instead of having
- it simply 'pass-through' to GnuPG via a handle.
- 
-@@ -1175,7 +1175,7 @@ The following setup can be done before any of the following examples:
- 				   );
- 
-   # indicate our pasphrase through the
--  # convience method
-+  # convenience method
-   $gnupg->passphrase( $passphrase );
- 
-   # this sets up the communication
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0015-added-new-secret-key-with-different-passphrase.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0015-added-new-secret-key-with-different-passphrase.patch
deleted file mode 100644
index fcf20c1b9d1c..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0015-added-new-secret-key-with-different-passphrase.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 11 Oct 2016 20:59:43 -0400
-Subject: added new secret key with different passphrase
-
-Adding a new secret key with a different passphrase should allow us to
-differentiate between passing the passphrase explicitly and relying on
-the agent + pinentry.
----
- t/000_setup.t                  |  2 +-
- test/new_secret.pgp            | 58 ++++++++++++++++++++++++++++++++++++++++++
- test/secret-keys/1.0.test      |  4 +++
- test/secret-keys/1.modern.test |  5 ++++
- 4 files changed, 68 insertions(+), 1 deletion(-)
- create mode 100644 test/new_secret.pgp
-
-diff --git a/t/000_setup.t b/t/000_setup.t
-index a8e3042..b183241 100644
---- a/t/000_setup.t
-+++ b/t/000_setup.t
-@@ -19,7 +19,7 @@ TEST
-     copy('test/gpg.conf', 'test/gnupghome/gpg.conf');
-     reset_handles();
- 
--    my $pid = $gnupg->import_keys(command_args => [ 'test/public_keys.pgp', 'test/secret_keys.pgp' ],
-+    my $pid = $gnupg->import_keys(command_args => [ 'test/public_keys.pgp', 'test/secret_keys.pgp', 'test/new_secret.pgp' ],
-                                   options => [ 'batch'],
-                                   handles => $handles);
-     waitpid $pid, 0;
-diff --git a/test/new_secret.pgp b/test/new_secret.pgp
-new file mode 100644
-index 0000000..5feb72c
---- /dev/null
-+++ b/test/new_secret.pgp
-@@ -0,0 +1,58 @@
-+-----BEGIN PGP PRIVATE KEY BLOCK-----
-+
-+lQPGBFf9iNIBCACZGF36JFTAggUJK85gweUquqh0kvVQICUtyiHXFXBBPzCK+RWL
-+oc5yeOfILHH7FfOztwPH1oJ7SWQtOgpuoiMHPtF7ne+MYevMf9jTYb/xCT0yZID5
-+/ieoHwUQQPiowxGewOww23RLQ1Cf46nqGBUD+fsWwT2Eq6ojLp/H72h+2lQ1ZCWd
-+Q/9MSQQgDo5tWptokFGmLBKCS59pYMBaLbKSj7lFa/ekPm9zhcdmmLrLHCS9rIUP
-+VKlWAg02MVmMB4fYm9nbtuwYHWvbDFYzpVr2WNlRZlPy0Y46ahxFbFwhtmOJAgT1
-+tgaQtDXo3kXRXngYZstDfe61Hqmc44j1vJ4VABEBAAH+BwMCnvb4v9vnhhzmdZdJ
-+EzK3ikXYQp3PcOMDlRE5qtBmXhOJXH2tdEmXjegjWGA501eeoks0VnpBba2m4B36
-+Z37fjpOEi4QOuTn6emVwijJZgmmTAC7JHNzAW+IsiRvk/2907UZCwa/1UQpC0bik
-+pHTZx+yKp33vGbkbCkKgHFQoHcS9D1by0WOkaLSlcE9CUCKb5LCe2Q1KDwZGrg60
-+4WUvg9eM2eatixAyOJEoRONlXDcQnUhSnG5+TUPNhVVWIaM/tPAgYmBG5oCSJ/N0
-+ls8cXoOVup/itBHo2Bfn+nyh0OAWdgdVmB0rPYUCLJV0FiQx5tB59OHmA3Naokj5
-+rvumyklCg314NnkEXrbPq7kKbX0X8UPoXdzAmalb4++OhgzEwd3NkWxvFSxKkQAt
-+XAU5i9XNHJXLwATAMlEaXMBmfcpjyIx4WpBUSmYMTjh0Nu5ee+kGvMY9fUxOKbet
-+IS9agFSMwVNRsX91+pKtBCQc7Je5tIrLhC8Hbvotn0GA8iFgu6LBqkrUO9Rh30Xs
-+vzz3oXm7WgHbL30m9h+rJ2dmPZOwmW/0zRUec/7alizx0T4sLx7T0qUPUxeEjkeU
-+JWtqfrcXEc3xIR9r5S2xqsUSKx6h1UhHMeMtQaDBgeH/Syq7a2gnkNoY84xxojGj
-+lGkis5PF3xFpYqvjY0thyPFNxQguRlqktN8gNB+V1dShbCpNI9bDzv4pzvogEiM0
-+EM/xvJSCkARCe6nqOugWV8j5f3+9tuyREqcidHq+PR+USoNYdUWQO14kPY6e62wO
-+lC5B4G7TDQtigCfOyEOiPXYC/qnC8sPVR2u5bCYm2YJT7L+rYRLSN+628qz7BwH3
-+9XtpnRtBFWpjI5qjn4uMM42e3k5UVB/r4GyrLXhEuO8D81TVzRQhjiqLweguk73h
-+VDjEd0yachHbtCxHbnVQRzo6SW50ZXJmYWNlIFRlc3Qga2V5IDx0ZXN0QGV4YW1w
-+bGUub3JnPokBNwQTAQgAIQUCV/2I0gIbAwULCQgHAgYVCAkKCwIEFgIDAQIeAQIX
-+gAAKCRAbkTzptnR93EZkB/9groVsVMBJtGP1GSFMg2Q9loyijXT2P6hCbUTS4YMz
-+O4jQPB8UQ39XIhyWo7hVGsXeA777+7VTto7q0CG9Ph7FTGKK8W2AnzTUKNdXAC6h
-+qIc+ymvlm71GxhkKFR0vDbFg6CLJ/MX/x1Bd0TKh4RZtgOqX6A7Pzw/AI7f2YJcJ
-+BKPT+/q/F/Wp1r+mxZ5pxUvYm643GVzdnbtuoqgBLng/3n1zjIz+oIz6RGBjzHni
-+3TUTKe//ewn1lIdTxPdUZA9G4vTE5dCnM4MHTxQSXA+aUexuONswQhiANtfVCW8c
-+sf9MQpkQ/Vqv9hfeYwH4pJ8IPK1No9F0a0fvnq2JaX4gnQPGBFf9iNIBCADEQ6HK
-+s5tWN2Ph/3A6D0A2nSc6m1Mh/AXhdptka0aPhhVgspCmQ1lJP/Kdf6AnlCi6u1G7
-+QXvGX8OtbKNosLi91nIqvNwckUOvXrLcAk/epkmidopOuHUZhE+1UaLKs7UssBOe
-+TQTtADdl2786E3qbtaNrjDTvbNesU1DEZjNoBWfKYHZYv2wCF170Lwzp7NJhAueO
-+bTwfUO8EusST6d1NYB0zFxbBi60/hJHCfcAuaSn00jFQ+kj8m7jXCgcyB+1+25d2
-+gpPbs19S4pi9f7eQflhglm0wB13C6yl+YgwVZQxU/fU70jgSYhkXNPx5bEN3WGkg
-+4hnP53hrsI4p3se1ABEBAAH+BwMCAppvwSTp9Y/mu317D14a9k6m/zC2LrzPx6dl
-+P3GtDJUCs1CVH/wXsUxLY4hAgS188xPhNLuIWuXwQ7qX7E8kanxgPqeK7NTAPKxH
-+CEqJPevFRBtftHq3zqZZF9CHXulDO3KkWxIHANMclq+zcUotrc4GXIxeYjewXv9p
-+tzKEjlt27Q00VvwRM7JVxBlC3xJvKXf6zyRoUt2/Clq+CFkb2s+dAzCI52o7tlB9
-+El84sTIlJr0+b6+GcwrKonS8HcGUECfYmSiIiNmxlkJ/4OabDlDYlzvmCYv2pMjc
-+Bif70Dowb8TBD/iTFLPY2lkhqBFi3Bcqc51MVecaQk3rRbVyOqhvGaRE084/LmkN
-+gkE6vQKRSbzRmYwyKC/QUKOW5qbl5Jf3lrjVeM5tEnvJeRCfZEokKjIZul4nX4dK
-+zxH+l+sCUA+RnEeGB2y1yhnPkP4dYHEb8iMLINqXQd18FpBFSs9yv9tFWJhdblUK
-+SiS8DXmuoZI2Mk8yMZ0j0bi8mu9eh52dqYgBGD7TgjP5vpYU/zbtpNgMP0Zvne1X
-+gig6NKK1+3VAZaiOvYUUHZERJGp/eggTtF66cD/0EHJjoZ/0pAciEvWYUyXWVBdj
-+eVWBZE/RVOwrTMBVtrxQsPJ3sfeGlLt21IZYKathTZ/dn5PSlU+i4f9VyC/hHd8S
-+xouQU3nB//ihbrR65YH5E53e8+jPaRtFvLbcqmY8YftV0y/5BZwduZoxcOtxD3A0
-+J/2GVpUhs3WngCksdUAEbrEXzKKSOC7b4KDw2sTIT5xHra4CBK5L5N85ny8tG7A6
-+wmTt+6PHo51gx/W/0jiMB3rEiGoTZ86uWLaGv5SgqLP49euCIEXNKK9srFK3o7QE
-+04upH9zOXR8ytvPOLy/K5zT6YH2eyNs19sWfjAfP/bxhnrDYajsZ2WKZiQEfBBgB
-+CAAJBQJX/YjSAhsMAAoJEBuRPOm2dH3c+6kH+wWoEqTlPdPLZcTN8I5a6HHD0Ul8
-+7xt3OtiRFoMD2M+zgLvImaj8AULap4w/0G+J+7PCUER8JhcePSzLbizfpTczbDP2
-+E1LhEM8IBE6GT8yL8VB9AL1xW+hXIi5sWW/f900deOhoh7ikrP7KxT0c8zQjaaqV
-+n6bio93CvZ3yBqMO20apwWDyiSoBpXVjLrW00BdL8i9Rsf6v5UwIIy9o7pfjK5zo
-+mAZM2dKzlp9z4q5P6yE4aXI0bHz+XvG7hdpkHmjG5A+EQCnN2qoDNIA4QiRhH8TQ
-+aTaj4AlCiCAV2hEelPYve5QKccAsfC//qr+FMF+0bhZa05X2afxLYtku0Ms=
-+=ftgB
-+-----END PGP PRIVATE KEY BLOCK-----
-diff --git a/test/secret-keys/1.0.test b/test/secret-keys/1.0.test
-index 129d472..f8239a9 100644
---- a/test/secret-keys/1.0.test
-+++ b/test/secret-keys/1.0.test
-@@ -5,3 +5,7 @@ uid                  GnuPG test key (for testing purposes only)
- uid                  Foo Bar (1)
- ssb    768g/2E854A6B 2000-02-06
- 
-+sec   2048R/B6747DDC 2016-10-12
-+uid                  GnuPG::Interface Test key <test@example.org>
-+ssb   2048R/AE441D0F 2016-10-12
-+
-diff --git a/test/secret-keys/1.modern.test b/test/secret-keys/1.modern.test
-index 3e46407..42b27a1 100644
---- a/test/secret-keys/1.modern.test
-+++ b/test/secret-keys/1.modern.test
-@@ -6,3 +6,8 @@ uid           [ unknown] GnuPG test key (for testing purposes only)
- uid           [ unknown] Foo Bar (1)
- ssb   elg768 2000-02-06 [E]
- 
-+sec   rsa2048 2016-10-12 [SC]
-+      278F850AA702911F1318F0A61B913CE9B6747DDC
-+uid           [ unknown] GnuPG::Interface Test key <test@example.org>
-+ssb   rsa2048 2016-10-12 [E]
-+
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0016-Test-use-of-gpg-without-explicit-passphrase-agent-pi.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0016-Test-use-of-gpg-without-explicit-passphrase-agent-pi.patch
deleted file mode 100644
index 21e6294efaed..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0016-Test-use-of-gpg-without-explicit-passphrase-agent-pi.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 11 Oct 2016 21:29:22 -0400
-Subject: Test use of gpg without explicit passphrase (agent+pinentry)
-
-The modern GnuPG suite encourages the use of gpg-agent to control
-access to secret key material.  In this use case, we avoid setting an
-explicit passphrase in code, and rely on either a correctly-configured
-and primed gpg-agent or a dedicated pinentry program to supply the
-passphrase.
-
-This additional test verifies that the passphrase can be handled by
-the agent.  Note that the passphrase for this additional test key is
-*not* the default passphrase, so this test should fail in the event
-that gpg can't use the agent and the pinentry for this task.
-
-Unfortunately, this all assumes that we're using GnuPG "Modern".  I've
-noted concerns about writing forward- and backward-compatible bindings
-for GnuPG here:
-https://lists.gnupg.org/pipermail/gnupg-devel/2016-October/031800.html
----
- README                 | 41 +++++++++++++++++++++++++++--------------
- lib/GnuPG/Interface.pm | 26 +++++++++++++++++++++++++-
- t/MyTestSpecific.pm    | 10 ++++++++--
- t/decrypt.t            | 27 +++++++++++++++++++++++++++
- test/encrypted.2.gpg   | 12 ++++++++++++
- test/fake-pinentry.pl  |  2 +-
- test/plain.2.txt       |  1 +
- 7 files changed, 101 insertions(+), 18 deletions(-)
- create mode 100644 test/encrypted.2.gpg
- create mode 100644 test/plain.2.txt
-
-diff --git a/README b/README
-index a05ef9b..be06ef3 100644
---- a/README
-+++ b/README
-@@ -5,7 +5,7 @@ SYNOPSIS
-       # A simple example
-       use IO::Handle;
-       use GnuPG::Interface;
--  
-+
-       # setting up the situation
-       my $gnupg = GnuPG::Interface->new();
-       $gnupg->options->hash_init( armor   => 1,
-@@ -24,7 +24,7 @@ SYNOPSIS
-       # Now we'll go about encrypting with the options already set
-       my @plaintext = ( 'foobar' );
-       my $pid = $gnupg->encrypt( handles => $handles );
--  
-+
-       # Now we write to the input of GnuPG
-       print $input @plaintext;
-       close $input;
-@@ -140,13 +140,26 @@ OBJECT METHODS
-         standard error, standard output, or standard error. If the status or
-         logger handle is not defined, this channel of communication is never
-         established with GnuPG, and so this information is not generated and
--        does not come into play. If the passphrase data member handle of the
--        handles object is not defined, but the the passphrase data member
--        handle of GnuPG::Interface object is, GnuPG::Interface will handle
--        passing this information into GnuPG for the user as a convenience.
--        Note that this will result in GnuPG::Interface storing the
--        passphrase in memory, instead of having it simply 'pass-through' to
--        GnuPG via a handle.
-+        does not come into play.
-+
-+        If the passphrase data member handle of the handles object is not
-+        defined, but the the passphrase data member handle of
-+        GnuPG::Interface object is, GnuPG::Interface will handle passing
-+        this information into GnuPG for the user as a convenience. Note that
-+        this will result in GnuPG::Interface storing the passphrase in
-+        memory, instead of having it simply 'pass-through' to GnuPG via a
-+        handle.
-+
-+        If neither the passphrase data member of the GnuPG::Interface nor
-+        the passphrase data member of the handles object is defined, then
-+        GnuPG::Interface assumes that access and control over the secret key
-+        will be handled by the running gpg-agent process. This represents
-+        the simplest mode of operation with the GnuPG "modern" suite
-+        (version 2.1 and later). It is also the preferred mode for tools
-+        intended to be user-facing, since the user will be prompted directly
-+        by gpg-agent for use of the secret key material. Note that for
-+        programmatic use, this mode requires the gpg-agent and pinentry to
-+        already be correctly configured.
- 
-   Other Methods
-     get_public_keys( @search_strings )
-@@ -241,7 +254,7 @@ EXAMPLES
- 
-       my $handles = GnuPG::Handles->new( stdin    => $input,
-                                          stdout   => $output );
--   
-+
-       # this sets up the communication
-       # Note that the recipients were specified earlier
-       # in the 'options' data member of the $gnupg object.
-@@ -315,7 +328,7 @@ EXAMPLES
-       # a file written to disk
-       # Make sure you "use IO::File" if you use this module!
-       my $cipher_file = IO::File->new( 'encrypted.gpg' );
--   
-+
-       # this sets up the communication
-       my $pid = $gnupg->decrypt( handles => $handles );
- 
-@@ -346,7 +359,7 @@ EXAMPLES
-       # This time we'll just let GnuPG print to our own output
-       # and read from our input, because no input is needed!
-       my $handles = GnuPG::Handles->new();
--  
-+
-       my @ids = ( 'ftobin', '0xABCD1234ABCD1234ABCD1234ABCD1234ABCD1234' );
- 
-       # this time we need to specify something for
-@@ -354,7 +367,7 @@ EXAMPLES
-       # search ids as arguments
-       my $pid = $gnupg->list_public_keys( handles      => $handles,
-                                           command_args => [ @ids ] );
--  
-+
-        waitpid $pid, 0;
- 
-   Creating GnuPG::PublicKey Objects
-@@ -372,7 +385,7 @@ EXAMPLES
-           command_args => [ qw( test/key.1.asc ) ],
-           handles      => $handles,
-         );
--    
-+
-         my @out = <$handles->stdout()>;
-         waitpid $pid, 0;
- 
-diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm
-index 29205f0..5d8b0ec 100644
---- a/lib/GnuPG/Interface.pm
-+++ b/lib/GnuPG/Interface.pm
-@@ -106,6 +106,14 @@ sub fork_attach_exec( $% ) {
-     my ( $self, %args ) = @_;
- 
-     my $handles = $args{handles} or croak 'no GnuPG::Handles passed';
-+    my $use_loopback_pinentry = 0;
-+
-+    # WARNING: this assumes that we're using the "modern" GnuPG suite
-+    # -- version 2.1.x or later.  It's not clear to me how we can
-+    # safely and efficiently avoid this assumption (see
-+    # https://lists.gnupg.org/pipermail/gnupg-devel/2016-October/031800.html)
-+    $use_loopback_pinentry = 1
-+      if ($handles->passphrase());
- 
-     # deprecation support
-     $args{commands} ||= $args{gnupg_commands};
-@@ -293,8 +301,12 @@ sub fork_attach_exec( $% ) {
-             $self->options->$option($fileno);
-         }
- 
-+        my @args = $self->options->get_args();
-+        push @args, '--pinentry-mode', 'loopback'
-+          if $use_loopback_pinentry;
-+
-         my @command = (
--            $self->call(), $self->options->get_args(),
-+            $self->call(), @args,
-             @commands,     @command_args
-         );
- 
-@@ -1005,6 +1017,7 @@ and standard error will be tied to the running program's standard error,
- standard output, or standard error.  If the B<status> or B<logger> handle
- is not defined, this channel of communication is never established with GnuPG,
- and so this information is not generated and does not come into play.
-+
- If the B<passphrase> data member handle of the B<handles> object
- is not defined, but the the B<passphrase> data member handle of GnuPG::Interface
- object is, GnuPG::Interface will handle passing this information into GnuPG
-@@ -1012,6 +1025,17 @@ for the user as a convenience.  Note that this will result in
- GnuPG::Interface storing the passphrase in memory, instead of having
- it simply 'pass-through' to GnuPG via a handle.
- 
-+If neither the B<passphrase> data member of the GnuPG::Interface nor
-+the B<passphrase> data member of the B<handles> object is defined,
-+then GnuPG::Interface assumes that access and control over the secret
-+key will be handled by the running gpg-agent process.  This represents
-+the simplest mode of operation with the GnuPG "modern" suite (version
-+2.1 and later).  It is also the preferred mode for tools intended to
-+be user-facing, since the user will be prompted directly by gpg-agent
-+for use of the secret key material.  Note that for programmatic use,
-+this mode requires the gpg-agent and pinentry to already be correctly
-+configured.
-+
- =back
- 
- =head2 Other Methods
-diff --git a/t/MyTestSpecific.pm b/t/MyTestSpecific.pm
-index c8764cc..e513c25 100644
---- a/t/MyTestSpecific.pm
-+++ b/t/MyTestSpecific.pm
-@@ -55,9 +55,15 @@ struct( Text => { fn => "\$", fh => "\$", data => "\$" } );
- $texts{plain} = Text->new();
- $texts{plain}->fn( 'test/plain.1.txt' );
- 
-+$texts{alt_plain} = Text->new();
-+$texts{alt_plain}->fn( 'test/plain.2.txt' );
-+
- $texts{encrypted} = Text->new();
- $texts{encrypted}->fn( 'test/encrypted.1.gpg' );
- 
-+$texts{alt_encrypted} = Text->new();
-+$texts{alt_encrypted}->fn( 'test/encrypted.2.gpg' );
-+
- $texts{signed} = Text->new();
- $texts{signed}->fn( 'test/signed.1.asc' );
- 
-@@ -68,7 +74,7 @@ $texts{temp} = Text->new();
- $texts{temp}->fn( 'test/temp' );
- 
- 
--foreach my $name ( qw( plain encrypted signed key ) )
-+foreach my $name ( qw( plain alt_plain encrypted alt_encrypted signed key ) )
- {
-     my $entry = $texts{$name};
-     my $filename = $entry->fn();
-@@ -90,7 +96,7 @@ sub reset_handles
-         stderr  => $stderr
-       );
- 
--    foreach my $name ( qw( plain encrypted signed key ) )
-+    foreach my $name ( qw( plain alt_plain encrypted alt_encrypted signed key ) )
-     {
-         my $entry = $texts{$name};
-         my $filename = $entry->fn();
-diff --git a/t/decrypt.t b/t/decrypt.t
-index b2639ed..ee41448 100644
---- a/t/decrypt.t
-+++ b/t/decrypt.t
-@@ -58,3 +58,30 @@ TEST
- {
-     return compare( $texts{plain}->fn(), $texts{temp}->fn() ) == 0;
- };
-+
-+
-+# test without default_passphrase (that is, by using the agent)
-+TEST
-+{
-+    reset_handles();
-+
-+    $handles->stdin( $texts{alt_encrypted}->fh() );
-+    $handles->options( 'stdin' )->{direct} = 1;
-+
-+    $handles->stdout( $texts{temp}->fh() );
-+    $handles->options( 'stdout' )->{direct} = 1;
-+
-+    $gnupg->clear_passphrase();
-+
-+    my $pid = $gnupg->decrypt( handles => $handles );
-+
-+    waitpid $pid, 0;
-+
-+    return $CHILD_ERROR == 0;
-+};
-+
-+
-+TEST
-+{
-+    return compare( $texts{alt_plain}->fn(), $texts{temp}->fn() ) == 0;
-+};
-diff --git a/test/encrypted.2.gpg b/test/encrypted.2.gpg
-new file mode 100644
-index 0000000..105cbb3
---- /dev/null
-+++ b/test/encrypted.2.gpg
-@@ -0,0 +1,12 @@
-+-----BEGIN PGP MESSAGE-----
-+
-+hQEMAw3NS2KuRB0PAQgAuCMQO6blPRIJZib+kDa51gac+BYPl8caXYTLqIHtiz2/
-+YRVqePJON4lNAqT6qUksIzQHtejFO6tb1SLqgX9Ti+fKAMLrQw9VGOYaJFoRrTJs
-++X33S4GHVVikRTu0dydAsekbfPSc2nRmTFUlSEV3psgAmg9xy8KA6cZroK9Xfcuh
-+xW7KLE0hLP+2NZ7zNmJMdu6LDGzvlQsnm1UeElXK8XdMGf8kA3R+GgeeOnR/oEQc
-+Uep77k/fLc+UV4fp9Dk1OBeg3Ko/irSaefk4mU7F4HmS8jIERHRvXBTiur1Zx8Nx
-+9U3fcQuc+P9+JC89iS4PJPF1Hr0MlezAghZYJrhOrtJIAe5Uaft5KMGRfy0VQnAs
-+MHqGnGtzzVWK6GK83ibgG4tTfPEHHIgNFsJf3rM4cWklUmCS9TeeDJJZfhnRA6+/
-+X82e6OI7QNbO
-+=DlGE
-+-----END PGP MESSAGE-----
-diff --git a/test/fake-pinentry.pl b/test/fake-pinentry.pl
-index 12d3611..40b8b08 100755
---- a/test/fake-pinentry.pl
-+++ b/test/fake-pinentry.pl
-@@ -21,7 +21,7 @@ while (<STDIN>) {
-   chomp;
-   next if (/^$/);
-   next if (/^#/);
--  print ("D test\n") if (/^getpin/i);
-+  print ("D supercalifragilisticexpialidocious\n") if (/^getpin/i);
-   print "OK\n";
-   exit if (/^bye/i);
- }
-diff --git a/test/plain.2.txt b/test/plain.2.txt
-new file mode 100644
-index 0000000..da5a1d5
---- /dev/null
-+++ b/test/plain.2.txt
-@@ -0,0 +1 @@
-+test message
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0017-Kill-any-GnuPG-agent-before-and-after-the-test-suite.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0017-Kill-any-GnuPG-agent-before-and-after-the-test-suite.patch
deleted file mode 100644
index 2f20f1455397..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0017-Kill-any-GnuPG-agent-before-and-after-the-test-suite.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Thu, 25 May 2017 16:07:45 -0400
-Subject: Kill any GnuPG agent before and after the test suite.
-
-This helps to ensure that the test suite daemon is started fresh at
-every test suite run.  And it also avoids leaving a daemon running
-after the test suite, assuming the test suite manages to reach the
-end.
-
-This is considered a reasonable practice by upstream.
----
- t/000_setup.t   | 3 +++
- t/zzz_cleanup.t | 2 ++
- 2 files changed, 5 insertions(+)
-
-diff --git a/t/000_setup.t b/t/000_setup.t
-index b183241..4dc4329 100644
---- a/t/000_setup.t
-+++ b/t/000_setup.t
-@@ -17,6 +17,9 @@ TEST
-     $agentconf->write("pinentry-program " . getcwd() . "/test/fake-pinentry.pl\n");
-     $agentconf->close();
-     copy('test/gpg.conf', 'test/gnupghome/gpg.conf');
-+    # reset the state of any long-lived gpg-agent, ignoring errors:
-+    system('gpgconf', '--homedir=test/gnupghome', '--quiet', '--kill', 'gpg-agent');
-+
-     reset_handles();
- 
-     my $pid = $gnupg->import_keys(command_args => [ 'test/public_keys.pgp', 'test/secret_keys.pgp', 'test/new_secret.pgp' ],
-diff --git a/t/zzz_cleanup.t b/t/zzz_cleanup.t
-index 5c03a72..eea3a48 100644
---- a/t/zzz_cleanup.t
-+++ b/t/zzz_cleanup.t
-@@ -12,6 +12,8 @@ use File::Path qw (remove_tree);
- TEST
- {
-     my $err = [];
-+    # kill off any long-lived gpg-agent, ignoring errors:
-+    system('gpgconf', '--homedir=test/gnupghome', '--quiet', '--kill', 'gpg-agent');
-     remove_tree('test/gnupghome', {error => \$err});
-     return ! @$err;
- };
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0018-Use-a-short-temporary-homedir-during-the-test-suite.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0018-Use-a-short-temporary-homedir-during-the-test-suite.patch
deleted file mode 100644
index 457a5e74d532..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0018-Use-a-short-temporary-homedir-during-the-test-suite.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Fri, 26 May 2017 09:51:40 -0400
-Subject: Use a short temporary homedir during the test suite
-
-This avoids problems with the length of the path to the homedir as
-compared to the size limits of sockaddr_un.sun_path, particularly on
-systems where /run/user/$(id -u) is not present or available (such as
-many minimalist build environments).
----
- t/000_setup.t        |  9 +++++----
- t/MyTestSpecific.pm  | 18 +++++++++++++++++-
- t/list_secret_keys.t |  3 ++-
- t/zzz_cleanup.t      |  6 ++++--
- 4 files changed, 28 insertions(+), 8 deletions(-)
-
-diff --git a/t/000_setup.t b/t/000_setup.t
-index 4dc4329..82d7005 100644
---- a/t/000_setup.t
-+++ b/t/000_setup.t
-@@ -12,13 +12,14 @@ use File::Copy;
- 
- TEST
- {
--    make_path('test/gnupghome', { mode => 0700 });
--    my $agentconf = IO::File->new( "> test/gnupghome/gpg-agent.conf" );
-+    my $homedir = $gnupg->options->homedir();
-+    make_path($homedir, { mode => 0700 });
-+    my $agentconf = IO::File->new( "> " . $homedir . "/gpg-agent.conf" );
-     $agentconf->write("pinentry-program " . getcwd() . "/test/fake-pinentry.pl\n");
-     $agentconf->close();
--    copy('test/gpg.conf', 'test/gnupghome/gpg.conf');
-+    copy('test/gpg.conf', $homedir . '/gpg.conf');
-     # reset the state of any long-lived gpg-agent, ignoring errors:
--    system('gpgconf', '--homedir=test/gnupghome', '--quiet', '--kill', 'gpg-agent');
-+    system('gpgconf', '--homedir', $homedir, '--quiet', '--kill', 'gpg-agent');
- 
-     reset_handles();
- 
-diff --git a/t/MyTestSpecific.pm b/t/MyTestSpecific.pm
-index e513c25..809d55c 100644
---- a/t/MyTestSpecific.pm
-+++ b/t/MyTestSpecific.pm
-@@ -22,6 +22,7 @@ use IO::Seekable;
- use File::Compare;
- use Exporter;
- use Class::Struct;
-+use File::Temp qw (tempdir);
- 
- use GnuPG::Interface;
- use GnuPG::Handles;
-@@ -40,10 +41,25 @@ use vars qw( @ISA           @EXPORT
- 
- $gnupg = GnuPG::Interface->new( passphrase => 'test' );
- 
-+
-+my $homedir;
-+if (-f "test/gnupghome") {
-+  my $record = IO::File->new( "< test/gnupghome" );
-+  $homedir = <$record>;
-+  $record->close();
-+} else {
-+  $homedir = tempdir( DIR => '/tmp');
-+  my $record = IO::File->new( "> test/gnupghome" );
-+  $record->write($homedir);
-+  $record->close();
-+}
-+
- my @version = split('\.', $gnupg->version());
- $gpg_is_modern = ($version[0] > 2 || ($version[0] == 2 && $version[1] >= 1));
- 
--$gnupg->options->hash_init( homedir              => 'test/gnupghome',
-+
-+
-+$gnupg->options->hash_init( homedir              => $homedir,
-                             armor                => 1,
-                             meta_interactive     => 0,
-                             meta_signing_key_id  => '0x93AFC4B1B0288A104996B44253AE596EF950DA9C',
-diff --git a/t/list_secret_keys.t b/t/list_secret_keys.t
-index 7040c38..d1e3f30 100644
---- a/t/list_secret_keys.t
-+++ b/t/list_secret_keys.t
-@@ -23,8 +23,9 @@ TEST
-     $outfile = 'test/secret-keys/1.out';
-     my $out = IO::File->new( "> $outfile" )
-       or die "cannot open $outfile for writing: $ERRNO";
-+    my $modern_pubring_line = $gnupg->options->homedir() . "/pubring.kbx\n";
-     while (<$stdout>) {
--      if ($gpg_is_modern && /^\/.*\/test\/gnupghome\/pubring.kbx$/) {
-+      if ($gpg_is_modern && ($_ eq $modern_pubring_line)) {
-         $out->print("test/gnupghome/pubring.kbx\n");
-       } elsif ($gpg_is_modern && /^--*$/) {
-         $out->print("--------------------------\n");
-diff --git a/t/zzz_cleanup.t b/t/zzz_cleanup.t
-index eea3a48..c3ec16f 100644
---- a/t/zzz_cleanup.t
-+++ b/t/zzz_cleanup.t
-@@ -11,9 +11,11 @@ use File::Path qw (remove_tree);
- # this is actually no test, just cleanup.
- TEST
- {
-+    my $homedir = $gnupg->options->homedir();
-     my $err = [];
-     # kill off any long-lived gpg-agent, ignoring errors:
--    system('gpgconf', '--homedir=test/gnupghome', '--quiet', '--kill', 'gpg-agent');
--    remove_tree('test/gnupghome', {error => \$err});
-+    system('gpgconf', '--homedir', $homedir, '--quiet', '--kill', 'gpg-agent');
-+    remove_tree($homedir, {error => \$err});
-+    unlink('test/gnupghome');
-     return ! @$err;
- };
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0019-Make-things-work-with-gpg1-assuming-plain-gpg-is-mod.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0019-Make-things-work-with-gpg1-assuming-plain-gpg-is-mod.patch
deleted file mode 100644
index ae6143190de3..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0019-Make-things-work-with-gpg1-assuming-plain-gpg-is-mod.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Fri, 26 May 2017 18:15:24 -0400
-Subject: Make things work with gpg1 (assuming plain 'gpg' is modern)
-
- * avoid sending --pinentry-mode=loopback if gpg is invoked as gpg1
- * fix up t/list_secret_keys to account for the varied output
- * t/decrypt.t still fails two agent-only tests, but presumably folks
-   who use gpg1 are not expecting to use the agent.
----
- lib/GnuPG/Interface.pm | 5 ++++-
- t/list_secret_keys.t   | 9 +++++----
- 2 files changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm
-index 5d8b0ec..f80ead5 100644
---- a/lib/GnuPG/Interface.pm
-+++ b/lib/GnuPG/Interface.pm
-@@ -112,8 +112,11 @@ sub fork_attach_exec( $% ) {
-     # -- version 2.1.x or later.  It's not clear to me how we can
-     # safely and efficiently avoid this assumption (see
-     # https://lists.gnupg.org/pipermail/gnupg-devel/2016-October/031800.html)
-+    #
-+    # as a (brittle and incomplete) cleanup, we will avoid trying to
-+    # send pinentry-loopback if the program is invoked as "gpg1"
-     $use_loopback_pinentry = 1
--      if ($handles->passphrase());
-+      if ($handles->passphrase() && ! ($self->call =~ m/gpg1$/));
- 
-     # deprecation support
-     $args{commands} ||= $args{gnupg_commands};
-diff --git a/t/list_secret_keys.t b/t/list_secret_keys.t
-index d1e3f30..8e3c911 100644
---- a/t/list_secret_keys.t
-+++ b/t/list_secret_keys.t
-@@ -23,11 +23,12 @@ TEST
-     $outfile = 'test/secret-keys/1.out';
-     my $out = IO::File->new( "> $outfile" )
-       or die "cannot open $outfile for writing: $ERRNO";
--    my $modern_pubring_line = $gnupg->options->homedir() . "/pubring.kbx\n";
-+    my $seckey_file = $gpg_is_modern ? 'pubring.kbx' : 'secring.gpg';
-+    my $pubring_line = $gnupg->options->homedir() . '/' . $seckey_file . "\n";
-     while (<$stdout>) {
--      if ($gpg_is_modern && ($_ eq $modern_pubring_line)) {
--        $out->print("test/gnupghome/pubring.kbx\n");
--      } elsif ($gpg_is_modern && /^--*$/) {
-+      if ($_ eq $pubring_line) {
-+        $out->print('test/gnupghome/'.$seckey_file."\n");
-+      } elsif (/^--*$/) {
-         $out->print("--------------------------\n");
-       } else {
-         $out->print( $_ );
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0030-gpg-2.2.6.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0030-gpg-2.2.6.patch
deleted file mode 100644
index 1268beeb0a21..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0030-gpg-2.2.6.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 7c85ac40660861e7507c43d043323c3f1b83921b Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni@debian.org>
-Date: Wed, 20 Jun 2018 21:57:50 +0300
-Subject: [PATCH] Fix test suite for GnuPG >= 2.2.6 compatibility
-
-GnuPG 2.2.6 (commit 1a5d95e7319e7e6f) started marking signatures
-with an expired key with '?', as seen with for instance
-
- GNUPGHOME=./test/gnupghome/ gpg --list-sigs 0xF950DA9C
-
-Adapt the test suite accordingly.
-
-See https://dev.gnupg.org/rG1a5d95e7319e7e6f0dd11064a26cbbc371b05214
-
-Bug-Debian: https://bugs.debian.org/900051
----
- t/get_public_keys.t | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/t/get_public_keys.t b/t/get_public_keys.t
-index 7893625..ede080a 100644
---- a/t/get_public_keys.t
-+++ b/t/get_public_keys.t
-@@ -13,8 +13,12 @@ use MyTestSpecific;
- use GnuPG::PrimaryKey;
- use GnuPG::SubKey;
- 
-+use version;
-+
- my ( $given_key, $handmade_key );
- 
-+my $gnupg_version = version->parse($gnupg->version);
-+
- TEST
- {
-     reset_handles();
-@@ -74,7 +78,7 @@ TEST
-                             date_string => '2000-03-16',
-                             hex_id => '56FFD10A260C4FA3',
-                             sig_class => 0x10,
--                            validity => '!'),
-+                            validity => $gnupg_version < version->parse('2.2.6') ? '!' : '?'),
-       GnuPG::Signature->new(
-                             date => 949813093,
-                             algo_num => 17,
-@@ -115,7 +119,7 @@ TEST
-                             date_string => '2000-03-16',
-                             hex_id => '56FFD10A260C4FA3',
-                             sig_class => 0x10,
--                            validity => '!'),
-+                            validity => $gnupg_version < version->parse('2.2.6') ? '!' : '?'),
-       GnuPG::Signature->new(
-                             date => 953179891,
-                             algo_num => 17,
diff --git a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0031-gpg-2.2.8.patch b/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0031-gpg-2.2.8.patch
deleted file mode 100644
index 6c025007eef5..000000000000
--- a/dev-perl/GnuPG-Interface/files/GnuPG-Interface-0.520.0-0031-gpg-2.2.8.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From b356e7fda15e39e037da1888a24000a96fc85c90 Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni@debian.org>
-Date: Sun, 24 Jun 2018 16:19:25 +0300
-Subject: [PATCH] Fix test suite for GnuPG >= 2.2.8 compatibility
-
-GnuPG 2.2.8 onwards issues a hard failure when decrypting
-messages not using the MDC mode.
-
-Bug-Debian: https://bugs.debian.org/900051
----
- t/decrypt.t | 19 +++++++++++++++++--
- 1 file changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/t/decrypt.t b/t/decrypt.t
-index ee41448..2d6740c 100644
---- a/t/decrypt.t
-+++ b/t/decrypt.t
-@@ -6,6 +6,7 @@
- use strict;
- use English qw( -no_match_vars );
- use File::Compare;
-+use version;
- 
- use lib './t';
- use MyTest;
-@@ -13,6 +14,8 @@ use MyTestSpecific;
- 
- my $compare;
- 
-+my $gnupg_version = version->parse($gnupg->version);
-+
- TEST
- {
-     reset_handles();
-@@ -26,7 +29,13 @@ TEST
-     close $stdout;
-     waitpid $pid, 0;
- 
--    return $CHILD_ERROR == 0;;
-+    if ($gnupg_version < version->parse('2.2.8')) {
-+        return $CHILD_ERROR == 0;;
-+    } else {
-+        local $/ = undef;
-+        my $errstr = <$stderr>;
-+        return (($CHILD_ERROR >> 8 == 2) and ($errstr =~ /ignore-mdc-error/));
-+    }
- };
- 
- 
-@@ -50,7 +59,13 @@ TEST
- 
-     waitpid $pid, 0;
- 
--    return $CHILD_ERROR == 0;
-+    if ($gnupg_version < version->parse('2.2.8')) {
-+        return $CHILD_ERROR == 0;
-+    } else {
-+        local $/ = undef;
-+        my $errstr = <$stderr>;
-+        return (($CHILD_ERROR >> 8 == 2) and ($errstr =~ /ignore-mdc-error/));
-+    }
- };
- 
- 
diff --git a/dev-perl/Google-Ads-AdWords-Client/Google-Ads-AdWords-Client-4.18.0.ebuild b/dev-perl/Google-Ads-AdWords-Client/Google-Ads-AdWords-Client-4.18.0.ebuild
deleted file mode 100644
index 1cd709e3b612..000000000000
--- a/dev-perl/Google-Ads-AdWords-Client/Google-Ads-AdWords-Client-4.18.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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 )"
-PATCHES=(
-	"${FILESDIR}/4.14.0-no-dot-in-inc.patch"
-	"${FILESDIR}/4.14.0-unescaped-lbracket.patch"
-)
-RDEPEND="
-	dev-perl/Class-Load
-	>=dev-perl/Class-Std-Fast-0.0.5
-	dev-perl/Crypt-OpenSSL-RSA
-	dev-perl/File-HomeDir
-	virtual/perl-File-Spec
-	dev-perl/IO-Socket-SSL
-	dev-perl/JSON-Parse
-	dev-perl/LWP-Protocol-https
-	dev-perl/libwww-perl
-	dev-perl/Log-Log4perl
-	>=dev-perl/SOAP-WSDL-2.00.10
-	virtual/perl-Scalar-List-Utils
-	dev-perl/Template-Toolkit
-	dev-perl/URI
-	dev-perl/XML-Simple
-	dev-perl/XML-XPath
-	examples? (
-		virtual/perl-Digest-SHA
-		virtual/perl-File-Temp
-		dev-perl/HTTP-Server-Simple
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.400.0
-	test? (
-		dev-perl/Config-Properties
-		dev-perl/Data-Uniqid
-		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 eb6b16812933..ecd95ef5e523 100644
--- a/dev-perl/Google-Ads-AdWords-Client/Manifest
+++ b/dev-perl/Google-Ads-AdWords-Client/Manifest
@@ -1,7 +1,3 @@
-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 4425 BLAKE2B e622ea7310457ef089a65d52746b929c403d93f0e740669c2a5b8af70d582a542c561998f315117a8dd08c72359443ab2ae36523456290867ef5d00580a923c4 SHA512 03af5a73b54159a9e25e4f1fa3d8804dc6aa97232a3bb7e9fbd6b1458ef04deeb2f79baf630c7151d9fc73943b83b7ad7849799e31a5a308bf01f3b23ffafc9f
diff --git a/dev-perl/Google-Ads-AdWords-Client/files/4.14.0-no-dot-in-inc.patch b/dev-perl/Google-Ads-AdWords-Client/files/4.14.0-no-dot-in-inc.patch
deleted file mode 100644
index 218cb69b1483..000000000000
--- a/dev-perl/Google-Ads-AdWords-Client/files/4.14.0-no-dot-in-inc.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From a67324b5622088422b0b0c1a403c594312452d16 Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentfredric@gmail.com>
-Date: Sun, 4 Jun 2017 07:35:25 +1200
-Subject: [PATCH 1/3] t/001_require.t: Force a relative path load for require
- test
-
-require_ok("Foo") is implemented in terms of  require "Foo"
-
-This means:
-
-require "Foo.pm"
-
-Only loads "Foo.pm" from "." if:
-
-- '.' is in @INC ( Not true by default in Perl >5.25.11 )
-- Foo.pm is not installed in Perl5lib ( dangerous assumption )
-
-This forces require to side-step @INC traversal by using an explicit
-prefix of "./", which is special-cased in require.
-
-This fixes RT#120674
-
-Bug: https://rt.cpan.org/Ticket/Display.html?id=120674
----
- t/001_require.t | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/t/001_require.t b/t/001_require.t
-index fe0d205..d70b2d2 100755
---- a/t/001_require.t
-+++ b/t/001_require.t
-@@ -24,7 +24,7 @@ use File::Spec;
- use Test::More qw(no_plan);
- 
- # Set up @INC at runtime with an absolute path.
--my $lib_path = File::Spec->catdir(dirname($0), "..", "lib");
-+my $lib_path = File::Spec->rel2abs(File::Spec->catdir(dirname($0), "..", "lib"));
- push(@INC, $lib_path);
- 
- require_ok 'Google::Ads::AdWords::Client';
-@@ -38,6 +38,6 @@ sub test_require {
-     local $SIG{__WARN__} = sub {
-       warn @_ unless $_[0] =~ /redefine/;
-     };
--    require_ok($file_name);
-+    require_ok("./$file_name");
-   }
- }
--- 
-2.12.2
-
-From 76f5a421585b8c85b7e39b91adb0b257d1d83665 Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentfredric@gmail.com>
-Date: Sun, 4 Jun 2017 07:40:01 +1200
-Subject: [PATCH 2/3] t/020_GenerateOfflineCredentials.t: Force relative path
- for script
-
-require "some/path.pl" previously fell into worknig due to '.' being
-in @INC, as this still invokes @INC traversal
-
-This change simply forces a "./" so that Perl uses direct access via
-a special-cased path instead of relying on @INC traversal, which becomes
-unsafe to depend on since Perl 5.25.11
----
- t/020_GenerateOfflineCredentials.t | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/t/020_GenerateOfflineCredentials.t b/t/020_GenerateOfflineCredentials.t
-index 0dcde9d..dfa8b50 100755
---- a/t/020_GenerateOfflineCredentials.t
-+++ b/t/020_GenerateOfflineCredentials.t
-@@ -51,7 +51,7 @@ my $stdout;
- open(STDOUT, ">", \$stdout);
- 
- # Calling the offline credentials code
--require qw(examples/oauth/generate_offline_credentials.pl);
-+require qw(./examples/oauth/generate_offline_credentials.pl);
- ok(generate_offline_credentials($client));
- 
- # Checking the auth mock was correctly called
--- 
-2.12.2
-
diff --git a/dev-perl/Google-Ads-AdWords-Client/files/4.14.0-unescaped-lbracket.patch b/dev-perl/Google-Ads-AdWords-Client/files/4.14.0-unescaped-lbracket.patch
deleted file mode 100644
index 4e7a4546f9cd..000000000000
--- a/dev-perl/Google-Ads-AdWords-Client/files/4.14.0-unescaped-lbracket.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From a7e92591ac0415fbb7119e4ad7572f910e4fdb8f Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentfredric@gmail.com>
-Date: Sun, 4 Jun 2017 07:43:59 +1200
-Subject: [PATCH 3/3] Fix unescaped "{" error in tests t/022* and t/024*
-
-Perl 5.26 makes use of literal unescaped { in a regex illegal,
-and this leads to test failures.
-
-This change simply quotes the offending characters to make tests pass.
-
-This closes RT#118509
-
-Bug: https://rt.cpan.org/Ticket/Display.html?id=118509
----
- t/022_ReportUtils.t     | 2 +-
- t/024_BatchJobHandler.t | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/t/022_ReportUtils.t b/t/022_ReportUtils.t
-index 4f5f326..d0e2000 100755
---- a/t/022_ReportUtils.t
-+++ b/t/022_ReportUtils.t
-@@ -57,7 +57,7 @@ my $report_as_string = $report_handler->get_as_string();
- ok(!$report_as_string, "report as string");
- ok($report_as_string->isa("Google::Ads::Common::ReportDownloadError"),
-   "check report handler->report_as_string return type");
--ok($report_as_string =~ /ReportDownloadError\s{[^}]+}/,
-+ok($report_as_string =~ /ReportDownloadError\s\{[^}]+}/,
-   "check ReportDownloadError STRINGIFY");
- 
- my ($fh, $filename) = tempfile();
-diff --git a/t/024_BatchJobHandler.t b/t/024_BatchJobHandler.t
-index 15983ae..4b86703 100755
---- a/t/024_BatchJobHandler.t
-+++ b/t/024_BatchJobHandler.t
-@@ -133,6 +133,6 @@ my $batch_job_handler_error =
-     description => "test"
-   });
- ok(!$batch_job_handler_error, "BOOLIFY on error false");
--ok($batch_job_handler_error =~ /BatchJobHandlerError\s{[^}]+}/,
-+ok($batch_job_handler_error =~ /BatchJobHandlerError\s\{[^}]+}/,
-   "check BatchJobHandlerError STRINGIFY");
- 
--- 
-2.12.2
-
diff --git a/dev-perl/Graph/Graph-0.970.400.ebuild b/dev-perl/Graph/Graph-0.970.400.ebuild
deleted file mode 100644
index cbb0d545f633..000000000000
--- a/dev-perl/Graph/Graph-0.970.400.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_AUTHOR=JHI
-DIST_VERSION=0.9704
-inherit perl-module
-
-DESCRIPTION="Data structure and ops for directed graphs"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86"
-IUSE=""
-
-RDEPEND="
-	virtual/perl-Scalar-List-Utils
-	>=virtual/perl-Storable-2.05
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
diff --git a/dev-perl/Graph/Graph-0.972.500.ebuild b/dev-perl/Graph/Graph-0.972.500.ebuild
new file mode 100644
index 000000000000..ebed880c1886
--- /dev/null
+++ b/dev-perl/Graph/Graph-0.972.500.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ETJ
+DIST_VERSION=0.9725
+inherit perl-module
+
+DESCRIPTION="Data structure and ops for directed graphs"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+	>=dev-perl/Heap-0.800.0
+	>=virtual/perl-Scalar-List-Utils-1.450.0
+	virtual/perl-Safe
+	>=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 cf542ccef879..ebc3a2098250 100644
--- a/dev-perl/Graph/Manifest
+++ b/dev-perl/Graph/Manifest
@@ -1,5 +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
+DIST Graph-0.9725.tar.gz 147502 BLAKE2B ab63a75653848ed6297f687cf8431f9e871f9b0473448008ad10d0f8e9d122bddc469069d4eefff1d0d03ba38facca5cc41048afea5f654b155812786e21d86c SHA512 51638c45dd7b21a87e3d6771f06dd5fae1e71da7dea4d337de2e540de4ab625a53e349799ee4c0cc77108fff4c47027d33f501edafb52daaef699f82edd5c3d3
 EBUILD Graph-0.972.100.ebuild 595 BLAKE2B 15a8512ead05ec6678ff7bc85c19510bf31c98fd9ab872458d50cd834914011ff9ade17d085373acbf3d8a982f9434cbfb6b74058e3316ecdadd6f9f79ca2dc8 SHA512 0064531e56c55461c046ae7043129cbcacfb43cbb344b89d262875960b6a930758a2c8b0172329e2f7cef87cb04e6a8dbf87ccd1c513b4587e2c1318b2b3c8d1
+EBUILD Graph-0.972.500.ebuild 579 BLAKE2B fea8834767c1c8ed03ae95c5d1839d78c34edbf8629b87364afcafad1003b585d8a7c6db0ab04ee6b9f5bb2bf719f186dfaa28ca987616c007599cbb28524ef8 SHA512 1a54008caaeb7e9be13845afdf97e9b82f6dd15af5e9b901a7eb9d045e0a46ee4ae0fd7e1f7cbd4c36217dc3983dc9c92169680be3f6b0fd68fc99687cfe7942
 MISC metadata.xml 1716 BLAKE2B 80fc06d14d83d6ca190e2f065238212aed49a5554bcfce868ac5a6f9c7a8ad0c6983d12e241d567c6c898e1cb0187d5daf2cca965cd751a23adb653c0e1b79a9 SHA512 937c53860947919a0912099e1641c38fee8426a694969e9deb6f210d2016d97ba4e9e778abb5bc1b1c7527cea4a4c6a85a7879e131db5056aa28562b3054e3e9
diff --git a/dev-perl/GraphViz/GraphViz-2.240.0.ebuild b/dev-perl/GraphViz/GraphViz-2.240.0-r1.ebuild
index 17208e3eb2d9..48d363417357 100644
--- a/dev-perl/GraphViz/GraphViz-2.240.0.ebuild
+++ b/dev-perl/GraphViz/GraphViz-2.240.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_A_EXT=tgz
 DIST_AUTHOR=RSAVAGE
@@ -13,8 +13,6 @@ DESCRIPTION="Interface to AT&T's GraphViz"
 
 SLOT="0"
 KEYWORDS="amd64 ~arm x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	media-gfx/graphviz
@@ -28,7 +26,7 @@ RDEPEND="
 	>=dev-perl/XML-Twig-3.520.0
 	>=dev-perl/XML-XPath-1.130.0
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	dev-perl/File-Which
 	test? (
diff --git a/dev-perl/GraphViz/Manifest b/dev-perl/GraphViz/Manifest
index da9030a9cd26..3a0d572fca69 100644
--- a/dev-perl/GraphViz/Manifest
+++ b/dev-perl/GraphViz/Manifest
@@ -1,3 +1,3 @@
 DIST GraphViz-2.24.tgz 95475 BLAKE2B 919d088d29b88eb523a72f7e853b4e600408eb12bf1d1a27f9742469c08ed229de6292b42a734a665d6718f085c658a1a399ef3f31f825d07bb447a88c26a269 SHA512 b37d1303c243a306443d5adf35d597f4e259cedaa7956d80bdb47cba811ce94e63da6b42a23d192fa9da628d999f1c023911f3f956a575aeabe673f77f3f01d9
-EBUILD GraphViz-2.240.0.ebuild 755 BLAKE2B fb51387b9cf0937869b932692121402526a1f36c806dee5d8ad23433f2b809c01bb21bd4e15dd78b57ffc68a7743b41b652c44c5bc897567e993dfbd79814e69 SHA512 465036ac8ca41785322c3e81b67b0963a3d2a0e923cfbea5607baa29d4706dc183a85583596e1dc5ddd9e825a42e5ca5c997c1d8f47e63ea21ee369338dc2ce6
+EBUILD GraphViz-2.240.0-r1.ebuild 717 BLAKE2B 980769024d81f2f7e729a4b5d1b17b723ec55c812966438deed4d051cabd5e02745d490a843dc5aba1449b69cf9afad4e93284a0f05e0cf1f7509024d61107a9 SHA512 ad764a17dff6671865563e7e247c6b23de63735831cc317e2c908719b7243db93e52ec76281f6899beabee7152b706258697ce91b741ff7c2f957ae8ac0438f3
 MISC metadata.xml 977 BLAKE2B c51e485bfc59e92eb874456587e2f30751a8c37ba597a1ba2ad501ae7167816dcf75c8eafc95d1f03c83442df1f7c7ba25a479fd85af8e1e6e556eb8499ba30e SHA512 f20add8eedb400a96f8dd5ff7a66c8776c565273b38f6b5c1f970f8f1cb6a07a0f7702a76924669c08dc849a367a3c81507877928abde251370f02c154d3f56b
diff --git a/dev-perl/Graphics-ColorNames-WWW/Graphics-ColorNames-WWW-1.130.0.ebuild b/dev-perl/Graphics-ColorNames-WWW/Graphics-ColorNames-WWW-1.130.0.ebuild
deleted file mode 100644
index 2168a48e97f0..000000000000
--- a/dev-perl/Graphics-ColorNames-WWW/Graphics-ColorNames-WWW-1.130.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=CFAERBER
-MODULE_VERSION=1.13
-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"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-	test? (
-		virtual/perl-Test-Simple
-		dev-perl/Test-NoWarnings
-	)
-"
-
-SRC_TEST="do"
-
-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 33bdc30cc8f8..4a5e1eeb0153 100644
--- a/dev-perl/Graphics-ColorNames-WWW/Manifest
+++ b/dev-perl/Graphics-ColorNames-WWW/Manifest
@@ -1,5 +1,3 @@
-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 552 BLAKE2B 83cf8b456519e6b8c55a7ca3fca89e48b35489bdc6e9a19a5814518b5aa0f334cb08e0e700165d6260e37cc2d237fcf142a4095f999465642b4bf9a2ccbcabba SHA512 91db3a2ebb51a82f4b5c8662168415b31570a260e0380afdc96c1f2d529447ec9249c2f81398fb47e5f2702b687f68086c783310caa758641435c10085b2e0df
 MISC metadata.xml 671 BLAKE2B 13253eef582b26a26aee08f48a6986fd253bcdcfb527b5ec4a5dbb7d231104d1187123b407813ede964e5bffd0c7cd07db1079bb48071896786adab3eb012f72 SHA512 96962cd74bf8f338efc9e18180be243c3f7d98500f2df2a40af36b9da28ca3bc7466b06eba2ebf2823e7c857b86d42f82bc5d15bc46b45768b21a09d1228dc41
diff --git a/dev-perl/Graphics-ColorNames/Graphics-ColorNames-2.110.0-r1.ebuild b/dev-perl/Graphics-ColorNames/Graphics-ColorNames-2.110.0-r1.ebuild
deleted file mode 100644
index dfbc38dfa98a..000000000000
--- a/dev-perl/Graphics-ColorNames/Graphics-ColorNames-2.110.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=RRWO
-MODULE_VERSION=2.11
-inherit perl-module
-
-DESCRIPTION="Defines RGB values for common color names"
-
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="recommended"
-
-COMMON_DEPEND="
-	virtual/perl-File-Spec
-	virtual/perl-IO
-	>=virtual/perl-Module-Load-0.10
-	virtual/perl-Module-Loaded
-	recommended? (
-		>=dev-perl/Color-Library-0.02
-		dev-perl/Tie-Sub
-		>=dev-perl/Pod-Readme-0.09
-	)
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-perl/Test-Exception
-	virtual/perl-Test-Simple
-	dev-perl/Module-Build
-"
-RDEPEND="
-	${COMMON_DEPEND}
-"
-SRC_TEST="do"
-
-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 9925457a74f8..2006df8ab81f 100644
--- a/dev-perl/Graphics-ColorNames/Manifest
+++ b/dev-perl/Graphics-ColorNames/Manifest
@@ -1,5 +1,3 @@
-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 695 BLAKE2B 7e52ea8157a1e0d8823e2231927ca60710182b3b00a02f45c637b5c537254f786748468226c48526beaa1fdcf1de44e65f329fe92c36c1bc34632b28b08e0d59 SHA512 878e02dca276e3b953ef980d92187a4f1b3c315085de01a62798b4d12682158c39ffd967dcc7d42405f688d1613944aee4f767614458711f665a7565aff9621c
-MISC metadata.xml 796 BLAKE2B 52aa2ab16bfd75e04f0f9cb8e9de12340b929612ef9d9e9bec4fb0baf2373d5fe2c3f9a09a4b32dd2a4be9dbbaaff41bf797fd0994cd58538ea02bb91bffb79a SHA512 f5df8945960696a574a48cce98ff6a6b488013aabb62e09ee57daeeedd6806b0687fc7f4a17d3a5e7de78768dbd72103afce1528462a2a82469fc1a9fccef331
+MISC metadata.xml 707 BLAKE2B 4d2b639b85827e1a6792268963ae68d0e366c03ee6fd600d5855d3ffe55c2d90d81f8b9f65888aade70f818aa09e8f00f75e023bcfda6894be57d0454babfb82 SHA512 cdd2ece7e8c42c0f1dc0a38115544d3e86c85c89f16b72abf153ecefe924f0c51cbbb04ba113d7bc53e99e875234f3f180bb351ba45f0ba4fe6d833752acf198
diff --git a/dev-perl/Graphics-ColorNames/metadata.xml b/dev-perl/Graphics-ColorNames/metadata.xml
index 8cc75e152ea9..5aef43ff2c4a 100644
--- a/dev-perl/Graphics-ColorNames/metadata.xml
+++ b/dev-perl/Graphics-ColorNames/metadata.xml
@@ -5,9 +5,6 @@
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
   </maintainer>
-  <use>
-    <flag name="recommended">Install recommended support modules</flag>
-  </use>
   <upstream>
     <remote-id type="cpan">Graphics-ColorNames</remote-id>
     <remote-id type="cpan-module">Graphics::ColorNames</remote-id>
diff --git a/dev-perl/Growl-GNTP/Growl-GNTP-0.210.0-r1.ebuild b/dev-perl/Growl-GNTP/Growl-GNTP-0.210.0-r2.ebuild
index 516737c38aa5..a8616eeb881d 100644
--- a/dev-perl/Growl-GNTP/Growl-GNTP-0.210.0-r1.ebuild
+++ b/dev-perl/Growl-GNTP/Growl-GNTP-0.210.0-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=MATTN
 DIST_VERSION=0.21
@@ -11,7 +11,6 @@ inherit perl-module
 DESCRIPTION="Perl implementation of GNTP Protocol (Client Part)"
 SLOT="0"
 KEYWORDS="~amd64 x86"
-IUSE="examples"
 
 RDEPEND="
 	examples? ( virtual/perl-Encode )
@@ -21,8 +20,9 @@ RDEPEND="
 	>=virtual/perl-Digest-SHA-5.450.0
 	virtual/perl-IO
 "
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-Tiny-0.35.0"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-Tiny-0.35.0
+"
 
 src_test() {
 	my_test_control=${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}
diff --git a/dev-perl/Growl-GNTP/Manifest b/dev-perl/Growl-GNTP/Manifest
index d0e0ed7bdae2..65568af01e33 100644
--- a/dev-perl/Growl-GNTP/Manifest
+++ b/dev-perl/Growl-GNTP/Manifest
@@ -1,3 +1,3 @@
 DIST Growl-GNTP-0.21.tar.gz 15128 BLAKE2B a7af3f9d79800976c0761d8261ad038dab7b76a6753bedfe5da542001467a4cbbaa24b8eb887a303e8086cdcfb32c2e346846416b8d9bb9446bf4b473969d1d3 SHA512 1c7d8ec81bac5e3bd6e7540be92cfb0ab27c5952a898397dce6eb1e81324cff2b926c55f2bfcae0ad6d3d3043ab898acea970a5283e7fb5faf9a58ebacbfc11f
-EBUILD Growl-GNTP-0.210.0-r1.ebuild 788 BLAKE2B 40e7bd90ed6182a9652a84cff04cdc2cb91532ab09cd2db2a93383c6f3c39a0717c8cc2070db862f71abab3c6c2aa312fc5ed0a4aaf2abe7eb0477a71d876c8f SHA512 6b993a80d9e4055e104688820ff15a8b0309d72498f955dea9865990806c0affc6fdf12efbe1e3b315101046ed25504d7cf5b678c8021547ffeeb17bc5b35ec5
+EBUILD Growl-GNTP-0.210.0-r2.ebuild 771 BLAKE2B 51a4c764f1ea505cab0d4ed2a21bd5e2e821383ddb074eef601290e38cd3b3979761647705b0cda77b01f46596d8f5b04594019957d4b008b7cbc3c4227f6563 SHA512 5909048af54a76a7cafec41fc01dc03a75df556d668e011f2de657162668f7530b35ce413170753a0156b6e3254469e17b2d96f8476ae58d8282629dd49d6131
 MISC metadata.xml 381 BLAKE2B 7a9a713275bffbb3411149c8cda189b91e983d649b47f358d700d60a5a5ae346129543363aeb6a6d6936e29b735d13d72bf58330b98ffc20876791305258f30a SHA512 455c8cc0f2f54fea1624bdf382e8a79055a2a56f2c62a4e0a3ce068dc5a938d072d3a082989aff665c6cf058c0a710afede9c0a942dceb13cc6c54bdaf454c41
diff --git a/dev-perl/Gtk2-Ex-PrintDialog/Gtk2-Ex-PrintDialog-0.30.0-r2.ebuild b/dev-perl/Gtk2-Ex-PrintDialog/Gtk2-Ex-PrintDialog-0.30.0-r3.ebuild
index 46150b59bfd9..176289a452eb 100644
--- a/dev-perl/Gtk2-Ex-PrintDialog/Gtk2-Ex-PrintDialog-0.30.0-r2.ebuild
+++ b/dev-perl/Gtk2-Ex-PrintDialog/Gtk2-Ex-PrintDialog-0.30.0-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=GBROWN
 DIST_VERSION=0.03
@@ -13,7 +13,10 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="cups"
 
-RDEPEND="cups? ( dev-perl/Net-CUPS )
+RDEPEND="
+	cups? ( dev-perl/Net-CUPS )
 	dev-perl/Gtk2
-	>=dev-perl/Locale-gettext-1.04"
-DEPEND="${RDEPEND}"
+	>=dev-perl/Locale-gettext-1.40.0
+"
+BDEPEND="${RDEPEND}
+"
diff --git a/dev-perl/Gtk2-Ex-PrintDialog/Manifest b/dev-perl/Gtk2-Ex-PrintDialog/Manifest
index 0881ccb549d9..cb95de1b684d 100644
--- a/dev-perl/Gtk2-Ex-PrintDialog/Manifest
+++ b/dev-perl/Gtk2-Ex-PrintDialog/Manifest
@@ -1,3 +1,3 @@
 DIST Gtk2-Ex-PrintDialog-0.03.tar.gz 6150 BLAKE2B 7518e86959041b62c6622f9bc787caa488490d2c6f9babe703c808fe5d9a247232bb602e300c4e87e02269e25a210617c26473e502aa0ab37228dee827f8bbba SHA512 b63d0f062e1556c4a5402850725ece4e727f7e9eb168bf3be1403a9b4db425cee762a1b1ca3bdff55d554b343deadd35f27f908d198979b64012f5d59c2a5d88
-EBUILD Gtk2-Ex-PrintDialog-0.30.0-r2.ebuild 414 BLAKE2B 4c742dcad653aca3425d10a8150927129c7126be598a38c26e497e122d5914b2af30fd5328900ea72f3e52ef48b97a9bcd49b201be53b87e543f59fa5ef19265 SHA512 3f241069ec612f38f8e95854f62994408014d632160cdc892164bfeee024de488dae1d9b05e95cd6aec72cd0c45cf43e9a243d54ee34d20cb02cfe9f9743dcd4
+EBUILD Gtk2-Ex-PrintDialog-0.30.0-r3.ebuild 418 BLAKE2B 60ce37189e2075539385af17daa3d852975540bfa8985de6dc14e3192020369a2c6d89addf510eae8d0cd406de53164fd7beeb586e01e9b21cc471a6da6e3f06 SHA512 6cdce87612efc8f4682f4e84113a42b437eb1bfa655cea1ecb19ce20c308d6e75d7d8fd3cc2d3709db903dd2d78f7d36e554eece215529145a5c4210a1e39277
 MISC metadata.xml 714 BLAKE2B c931a016f14e9b70ea1e9efd558c59f06baeb6624f4ac82b986c5f1399097676fb8098511e810885946b7d690c240a99418863db4317a1f2adc9658c061855c0 SHA512 02b96a6b27a16014433c6518cba38d782e39425f7da1926e484ebef2626892bf1f688415f6312bc6923c6f069662c1617eeaeaafac4161882da25486b1b5d83d
diff --git a/dev-perl/Gtk2-Ex-Simple-List/Gtk2-Ex-Simple-List-0.500.0-r2.ebuild b/dev-perl/Gtk2-Ex-Simple-List/Gtk2-Ex-Simple-List-0.500.0-r3.ebuild
index 3f94a3b06350..e2c539d50239 100644
--- a/dev-perl/Gtk2-Ex-Simple-List/Gtk2-Ex-Simple-List-0.500.0-r2.ebuild
+++ b/dev-perl/Gtk2-Ex-Simple-List/Gtk2-Ex-Simple-List-0.500.0-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=RMCFARLA
 DIST_VERSION=0.50
@@ -14,13 +14,13 @@ DESCRIPTION="A simple interface to Gtk2's complex MVC list widget"
 LICENSE="|| ( LGPL-2.1 LGPL-3 )" # LGPL-2.1+
 SLOT="0"
 KEYWORDS="amd64 ~ia64 sparc x86"
-IUSE=""
 
 RDEPEND="
 	>=dev-perl/Gtk2-1.60.0
 	>=dev-perl/glib-perl-1.62.0
 "
-DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}
+"
 
 src_test() {
 	virtx perl-module_src_test
diff --git a/dev-perl/Gtk2-Ex-Simple-List/Manifest b/dev-perl/Gtk2-Ex-Simple-List/Manifest
index 2c84bf9c6231..4b83900dcbfb 100644
--- a/dev-perl/Gtk2-Ex-Simple-List/Manifest
+++ b/dev-perl/Gtk2-Ex-Simple-List/Manifest
@@ -1,3 +1,3 @@
 DIST Gtk2-Ex-Simple-List-0.50.tar.gz 13769 BLAKE2B 0d435acaf034ce2653d3e797178852f1af95f29890ce9e65022b7b354371e868b52f4318fffb9edaa03abf3c95726bc5b991ad35fb1732c6d67288d368caed6d SHA512 df57509eb386aff41630b7da2d9b810b1e9308dec407dbe792a4282f2d7331cb3639755af8232bf6312e0537784dab5f1d035c919909a53e584173ce24aa6a09
-EBUILD Gtk2-Ex-Simple-List-0.500.0-r2.ebuild 535 BLAKE2B 3c5016c1b9534918b4a402575a1c6b9b124457b7e207b4f74efa44738eebc998800d13ee8b5ca091a2ee5f5fd2cab1ee97989e2c102d5a6acfd36ea4c5d6dcd5 SHA512 d2dc463fc2848d13eef57013815d45c32639a081e1c85631e6fd344db9181a94a4e7ebbcecb8e6250c4e1c4355594eec7454c039ebeec58bc2be3473f0ec359b
+EBUILD Gtk2-Ex-Simple-List-0.500.0-r3.ebuild 526 BLAKE2B 4d50379a517825aab3b50d3fb764a21699be24d32095d0d51926da501df9c98e8133b42d3deb8aa94605e38708cd584cffea831744a652902473f31f84b9b355 SHA512 dfb11f666235c0db6c0567a5781537e263c78d0cc62478ecdf423603e4e932da0f4f8e46af6ffe2f4577259e1e03a20f88e6942514e933194bc1eb3882c279e6
 MISC metadata.xml 633 BLAKE2B a80534b56d5ba1ca134204941d4a91f84fa7e5b780284defe55091209f14044e6ff5f34f9999f9345ef9ca5d4f069c42b639484bf62145c145b723df9e2d8e16 SHA512 5f796bcffee6bd74630ba5dd6579ecd0b654cfd1c478324b76e1976d4f5ddb5184d266f28edd7a2d65aa0aa19c6eadf03aa26048b8b5c4e6bd712ed0961efafb
diff --git a/dev-perl/Gtk2-ImageView/Gtk2-ImageView-0.50.0-r2.ebuild b/dev-perl/Gtk2-ImageView/Gtk2-ImageView-0.50.0-r3.ebuild
index 3676feae9235..b8c71d4b7b85 100644
--- a/dev-perl/Gtk2-ImageView/Gtk2-ImageView-0.50.0-r2.ebuild
+++ b/dev-perl/Gtk2-ImageView/Gtk2-ImageView-0.50.0-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=RATCLIFFE
 DIST_VERSION=0.05
@@ -13,14 +13,16 @@ DESCRIPTION="Perl binding for the GtkImageView image viewer widget"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-RDEPEND="dev-perl/Gtk2
-	>=media-gfx/gtkimageview-1.6.3"
-DEPEND="${RDEPEND}
+RDEPEND="
+	dev-perl/Gtk2
+	>=media-gfx/gtkimageview-1.6.3
+"
+BDEPEND="${RDEPEND}
 	dev-perl/glib-perl
-	>=dev-perl/ExtUtils-Depends-0.300
-	>=dev-perl/ExtUtils-PkgConfig-1.030"
+	>=dev-perl/ExtUtils-Depends-0.300.0
+	>=dev-perl/ExtUtils-PkgConfig-1.30.0
+"
 
 src_test() {
 	perl_rm_files t/pod.t
diff --git a/dev-perl/Gtk2-ImageView/Manifest b/dev-perl/Gtk2-ImageView/Manifest
index 26ddbb7091a8..0fbb7fe43c8e 100644
--- a/dev-perl/Gtk2-ImageView/Manifest
+++ b/dev-perl/Gtk2-ImageView/Manifest
@@ -1,3 +1,3 @@
 DIST Gtk2-ImageView-0.05.tar.gz 43632 BLAKE2B 73bce06c090b6d6338526190bc30c0ef6123f533fe4bc884ec0802afc58f59451cf505ecd13501f4cc6d5aef6470d2965de81dc2b55bdf193517c93e15c330e8 SHA512 ff8804e73655e9b3fad9e26860698726669063b5103732e589b5c93398a3a76ba79a55f41ce129fe59761a44cf3b317a15207f888432ec603cbdfbdd4ee5cd88
-EBUILD Gtk2-ImageView-0.50.0-r2.ebuild 574 BLAKE2B d9d665867ed21e5980b0c7ba943ab93883128b80f74208473d5e3adad691ea3f8a2993ed67210f3102e44c027ab7a23d59524f5872d98c1c4900a6825dba61f4 SHA512 accce539d18c8edfc7b90aa32408bde282b8dd72f254928d7c9aced67ebce02e95d8b76bd1f0ba3e6d58dee933bdd6723ec113323ebadc041fd3b0711cbe9684
+EBUILD Gtk2-ImageView-0.50.0-r3.ebuild 574 BLAKE2B 2e2417466960f6069db1ada7199aabc88b257c112dd985b1ddb7de9082b12bf06db32f3ae11fad035302c023c6814df38c952c74d0bb3c947ce7a6dcaba97ba5 SHA512 843d9234cbeeabd219cd58643dc171e8ffc9cae057e0ed76381dcffd4b8ddc94d81f5d2429e1f93663c70fe8526fead64e4589d335eacdf66ba551b7b974ef12
 MISC metadata.xml 401 BLAKE2B 9da994c2d3554ffc4935c5b3f48cd1b006632927e031d59f159d3fcb052c6078f6d2241e2977717d4b4d942d2c55cef7616bb0202faaf4ff9faa816c3e126688 SHA512 714849b67b8bd912d03f3c91d132a67f7b9c8a93b0a64933b706436ba0b218e8d27432a14ba0e2cbff8892f3c51dc1a5eec90df0200b7a6c3328fe1189f126a6
diff --git a/dev-perl/Gtk2-Notify/Gtk2-Notify-0.50.0.ebuild b/dev-perl/Gtk2-Notify/Gtk2-Notify-0.50.0-r1.ebuild
index 8d02168dae49..a04edfd70747 100644
--- a/dev-perl/Gtk2-Notify/Gtk2-Notify-0.50.0.ebuild
+++ b/dev-perl/Gtk2-Notify/Gtk2-Notify-0.50.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=FLORA
 DIST_VERSION=0.05
@@ -12,15 +12,13 @@ DESCRIPTION="A perl interface to the notification library"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-perl/glib-perl
 	dev-perl/Gtk2
 	>=x11-libs/libnotify-0.7
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	dev-perl/ExtUtils-Depends
 	dev-perl/ExtUtils-PkgConfig
 	test? ( dev-perl/Test-Exception )
diff --git a/dev-perl/Gtk2-Notify/Manifest b/dev-perl/Gtk2-Notify/Manifest
index 6de3bd32e92b..4d456279ac05 100644
--- a/dev-perl/Gtk2-Notify/Manifest
+++ b/dev-perl/Gtk2-Notify/Manifest
@@ -1,4 +1,4 @@
 AUX Gtk2-Notify-0.05-libnotify.patch 2813 BLAKE2B 07889ae9de77d0febce4419d961e98c93e1a9e55543328d95f03cd76e4363376f624aded5033c50cc767273c85a076bfeaf05f4f9fa92587df5d5a6e3a62430a SHA512 7737e1233a49117ea325001a2e6537151d29736307955f26e040ea56472d5505833022f7060d1d4a2a483bd468dd71d6f3f4222663ab4366416cd2bbafea9137
 DIST Gtk2-Notify-0.05.tar.gz 60883 BLAKE2B 0910ade464356bb8070c5c68f1135396c5a55170673ed5a81634f2441ff55dea71507de3f5edfc2b6f12711140cc3d7764d8803b3d0c3a3a3a4440ae571f57ef SHA512 e6242c21f6a3345d990830798744c8dd3abf648c0110d395197fc74b185b68189f9fc90e0fc14717cc09505d67fbaf8f45c1b3fae65c873275537e55c9e35434
-EBUILD Gtk2-Notify-0.50.0.ebuild 908 BLAKE2B e3a1c2e742df0008ab66ea4b652be593c7e8afbd008ee48fc9418f8461532cca215822742ba1911391bc2b7d1b2690de5f784db1eb79c455ee73bc8c07963ca6 SHA512 32814c07a6d5265d043f159037bfa289a067fc2092e8c67a34ba9b68bbfbcad1a5f485a4c8d58fd2df6343e07f2106e7c7a4ab21d71bfdd4de870711b357f35f
+EBUILD Gtk2-Notify-0.50.0-r1.ebuild 870 BLAKE2B 938677647031f90fda45792374c5066be6f86bc2d2206735166516eae3917dfa35b0584fa07db25c39cf001594f1388926437b2d77c0d571fcd129a991cc7e65 SHA512 8025178f6e97816f1593b529e8faae5bc45dde4bea1db96369fd8346e0cf6b642e333980aa3752bd570efa6445e2d79fdd55171b5976fe324f981e0e1769027a
 MISC metadata.xml 395 BLAKE2B 5e016e3d0145b424bc987831c91cfcf5fa2c9c8378efa9b594b73b9340713714fe43b9ec19ed93638f159bda40ad8d764d76a92f062ebce787e2838afbb6cecc SHA512 5a9c5c4d616f85f67a734af6f9ed7171580d3b64ec71cf79db92a8bb02a89206dae068142ffe28bf59c940a3eaa718e1ecaf2a7ca2b914046e63203e7fea5251
diff --git a/dev-perl/Gtk2-SourceView2/Gtk2-SourceView2-0.100.0-r1.ebuild b/dev-perl/Gtk2-SourceView2/Gtk2-SourceView2-0.100.0-r1.ebuild
deleted file mode 100644
index 2042b5ad212a..000000000000
--- a/dev-perl/Gtk2-SourceView2/Gtk2-SourceView2-0.100.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=POTYL
-DIST_VERSION=0.10
-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 c455f06a2bb0..04eeeb810fbd 100644
--- a/dev-perl/Gtk2-SourceView2/Manifest
+++ b/dev-perl/Gtk2-SourceView2/Manifest
@@ -1,5 +1,3 @@
-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 404 BLAKE2B ee5e3463804856d29969d34093d87f9362b42cee14884d1b70632c9a4b7567791bbbaf45d530fc4c3cda98563c7fc5c898585aaf462aa6a5795f44b7a5d1b62b SHA512 2f7733ac5c7132a60db63969a558dbf208ab63ec8d051c6603845e97e53606d3a58d89551b5d3eecd5d80007be1db095e1b5e90576597f2070466dcf03484a3d
diff --git a/dev-perl/Gtk2-Unique/Gtk2-Unique-0.50.0-r2.ebuild b/dev-perl/Gtk2-Unique/Gtk2-Unique-0.50.0-r2.ebuild
deleted file mode 100644
index 169854287052..000000000000
--- a/dev-perl/Gtk2-Unique/Gtk2-Unique-0.50.0-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=POTYL
-DIST_VERSION=0.05
-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}
-	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 ef1e6d4e80bc..31b584803659 100644
--- a/dev-perl/Gtk2-Unique/Manifest
+++ b/dev-perl/Gtk2-Unique/Manifest
@@ -1,6 +1,4 @@
 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 573 BLAKE2B 4da2d97d2e41f83aa10816b966fc0041543b6d43fc73586cf89b20e890d5d0f7af37d732f2c0f52a628c677158067727ef86bbde7bfc9bbd9ae946086571d8bf SHA512 e505198cff4ac77cc7be08dc20ee9c96791808f9234422725e03f93f21b856c5eee268bc2f936a8eae71fa1df6fd3cb500567e389277d41370249b832d7035f4
 MISC metadata.xml 395 BLAKE2B 6c3c40ec5fe97a73a2d0f479ecbfc7059eec8d6fe5e8a837696268859fe0aff2d7fccab8afae141fa3445d029c368a1e23231c0370c4869a67bc9ae36c42190a SHA512 134f628449acf1f18cb26168cc6478086f1a1c3d0946988d17cb1bcdc14b12d067922c10bba80f54b5b981be6ae2593a7e7932ff027f3fac61c4e99a883fc071
diff --git a/dev-perl/Gtk3-ImageView/Gtk3-ImageView-10.0.0.ebuild b/dev-perl/Gtk3-ImageView/Gtk3-ImageView-10.0.0.ebuild
index b9b1a3df6014..59131c332d43 100644
--- a/dev-perl/Gtk3-ImageView/Gtk3-ImageView-10.0.0.ebuild
+++ b/dev-perl/Gtk3-ImageView/Gtk3-ImageView-10.0.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module virtualx
 DESCRIPTION="Image viewer widget for Gtk3"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="
 	dev-perl/Cairo
diff --git a/dev-perl/Gtk3-ImageView/Manifest b/dev-perl/Gtk3-ImageView/Manifest
index 4e60a9dda474..c607fda06a26 100644
--- a/dev-perl/Gtk3-ImageView/Manifest
+++ b/dev-perl/Gtk3-ImageView/Manifest
@@ -1,5 +1,5 @@
 DIST Gtk3-ImageView-10.tar.gz 28165 BLAKE2B 429490c02e34bbe669b209459fd90937a4148e643b6b4e26bd643cd930f728a400b4d179c7e072a72fced7b06fc9a7f16deb87d33b42b296f07f5dce14abdfb1 SHA512 2548c33c49c27bb4a69d5512c7dfaca096a39ef6d08fa1deb83a045e6c5b7ad075eb8b23b33fb794024c9b9e7fd979a5c31bff075a7ed5412a4a5a4f53824f5a
 DIST Gtk3-ImageView-9.tar.gz 16083 BLAKE2B f64723d2ee468c7ab423292bba8d995a62554877567fdfdd272e527920e037147783fcb9cea99ba1688f09303ee321abaee0e334a67db46bda6b0ed7e1ff9415 SHA512 1a52c53a03b6f9dd6abc69dbb03a8dd80df77e266eb972cb2438bd25d49765b203a70e2dfee1ae3cfdd27b4d987f9573eef3e47968c80550771dd3edbcf831cc
-EBUILD Gtk3-ImageView-10.0.0.ebuild 694 BLAKE2B 7a9e3ac2dc936524867c0d046a8be34a336e86365e6d3874f22a66d076678ebffbbebc2e079769bafb3af3b44f1fa2361c977afae5cd9716635161a280500cc8 SHA512 7adc62eeaae38106f4b0855d1195d74b42c8a923f07bb2182b27a10fcf7b399f41fbe8b33de945f43c414b570891918c34285a1f17a2c79cf57e0b79f3720a96
+EBUILD Gtk3-ImageView-10.0.0.ebuild 693 BLAKE2B 2f54394a6acd831f71d7099166824d61e4538cd9052d9522fcc4eec4b0cac121619b5fefce3990a553e03eb2e467d834c35bfd3acda641d46130cb9cf2f27f30 SHA512 41c7cb008c0a73cf85f795e5956a12e7caa204c40c97bc07f7e744b46e77a8e7e0e3759835a236f5a26885c806fc29609a534b917945e82664d6c5893fad5cb9
 EBUILD Gtk3-ImageView-9.0.0.ebuild 691 BLAKE2B 81ea41684762dddf26d7bb212119a45c9adec9dc30aa8885304117acd1d28bf7d3387351285cadc030b374a3e2786bc9df3ea27e604cf2b99469771c8564631b SHA512 021d0dd86d5125bea046f6bef25bbfbf493e8945691516b38ba963b1af9c0ff9adfb9b04180069114d29e3d1e5a4b7f6dcb0039b7889a05f84ab8b2853449e5c
 MISC metadata.xml 1018 BLAKE2B 3b984f34f2b493db7ab1fd89b6edbac39936461826a43de10c6cde112a9e1be83eebd9f6184fe2c39763ecca1c050d44211641049028e8bc5aa7cb00cf3ac1e0 SHA512 eddb5b455c5561f7ccc1f84053c6830af833cde842af7422d0b4907765d3a771a892613c64ab6bb09ee49da53c8c989f4046bc172ccc70a4a3cf9164e337474c
diff --git a/dev-perl/Gtk3-SimpleList/Gtk3-SimpleList-0.170.0.ebuild b/dev-perl/Gtk3-SimpleList/Gtk3-SimpleList-0.170.0.ebuild
deleted file mode 100644
index 6822290deb78..000000000000
--- a/dev-perl/Gtk3-SimpleList/Gtk3-SimpleList-0.170.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=TVIGNAUD
-DIST_VERSION=0.17
-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
-"
-DEPEND="${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 fc32dc84de29..a14ae994e397 100644
--- a/dev-perl/Gtk3-SimpleList/Manifest
+++ b/dev-perl/Gtk3-SimpleList/Manifest
@@ -1,5 +1,3 @@
-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 473 BLAKE2B 387c3993880c0296703cd019fa2acd754047387886922fce08610ce79ea2f43412d5c3884ea56ade84cdfeea8727452bbef850cdaafefe8a1ee66a897f098f71 SHA512 c5d93123474535e6abd0889d8dc8a749d11e98e9ddd80e5d8b45424ac93a4574c47cf75e2afdbf53882e158a938b9d9abfe8ba00faa317a21590b915317893f0
 MISC metadata.xml 548 BLAKE2B 5c7143c634f643b8818bea559a3164536eed637c8cd5002debc91cd01d7b1dc7884069b77e946f838fa86b102f16186442f08960b078fbb9fdd2cfb8e9f485ac SHA512 78a4d18d222656286183126c300b4c989927bbf611f8db63e9f14447dcb07ad5c298fafbcc433f499d5ff7a07eb87c7f1cc3bbb4874ca4f588144c1f6ab0adc7
diff --git a/dev-perl/Gtk3/Gtk3-0.34.0.ebuild b/dev-perl/Gtk3/Gtk3-0.34.0.ebuild
deleted file mode 100644
index c9e2ad0132c0..000000000000
--- a/dev-perl/Gtk3/Gtk3-0.34.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DIST_AUTHOR=XAOC
-DIST_VERSION=0.034
-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}
-	>=virtual/perl-ExtUtils-MakeMaker-6.30
-	test? (
-		>=virtual/perl-Test-Simple-0.960.0
-	)
-"
-
-PATCHES=(
-	# Fixed in next version, bug #683046
-	"${FILESDIR}"/${P}-gdk-pixbuf-test.patch
-)
-
-src_test() {
-	virtx perl-module_src_test
-}
diff --git a/dev-perl/Gtk3/Manifest b/dev-perl/Gtk3/Manifest
index 14d136d038dd..52337fde040a 100644
--- a/dev-perl/Gtk3/Manifest
+++ b/dev-perl/Gtk3/Manifest
@@ -1,6 +1,3 @@
-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 675 BLAKE2B f5a71b78b3dffb2d2734726bcd4248f09603722abcca939e60ede007c95368255096a4e47439c4da99d212a8dbe30b8e501cd5626a8130d1913ac1f617475a5f SHA512 cde095b6e37331412bf6d92ebb938d999d1cc986325d0747dd99fa68a174c68a854b20b366ad0f2be9f355e8ec71aabc8ea8823158b7a302f2dd36a6b34e1b77
 MISC metadata.xml 447 BLAKE2B e86451eb327d582b41d7f9bf2c0f07a4d3d043bf55b6b022c8e7164f200988f5afcd13bb6ddd696977e1c8d319e2fa1dc8bacc89fe1b1f7906fdfce18b004a32 SHA512 60e6df94c123f033be340a2ddcfdccfe49ef1dbadbc6027d783f12eba2cbc75e909fe6baeddbba891e86e873906f0ab531c5122757f83038a70c43dcf1293414
diff --git a/dev-perl/Gtk3/files/Gtk3-0.34.0-gdk-pixbuf-test.patch b/dev-perl/Gtk3/files/Gtk3-0.34.0-gdk-pixbuf-test.patch
deleted file mode 100644
index 48a725f1437a..000000000000
--- a/dev-perl/Gtk3/files/Gtk3-0.34.0-gdk-pixbuf-test.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 88bc49e7a21da0131b10546aa07ebdf98d18a37e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Torsten=20Sch=C3=B6nfeld?= <kaffeetisch@gmx.de>
-Date: Sun, 6 Jan 2019 15:18:02 +0100
-Subject: [PATCH] Load GdkPixdata introspection data if gdk-pixbuf >= 2.38.0
-
-In gdk-pixbuf 2.38.0, the GdkPixdata introspection data was split out into its
-own file.
-
-Based on a patch by gregor herrmann <gregoa@debian.org>.
-
-https://rt.cpan.org/Ticket/Display.html?id=127071
----
- lib/Gtk3.pm                      | 14 ++++++++++++++
- perl-Gtk3.doap => perl-gtk3.doap |  0
- 2 files changed, 14 insertions(+)
- rename perl-Gtk3.doap => perl-gtk3.doap (100%)
-
-diff --git a/lib/Gtk3.pm b/lib/Gtk3.pm
-index 6a65487..f90af7e 100644
---- a/lib/Gtk3.pm
-+++ b/lib/Gtk3.pm
-@@ -60,6 +60,7 @@ and Perl packages:
-   Gtk-3.0       | Gtk3
-   Gdk-3.0       | Gtk3::Gdk
-   GdkPixbuf-2.0 | Gtk3::Gdk
-+  GdkPixdata-2.0| Gtk3::Gdk
-   Pango-1.0     | Pango
- 
- =cut
-@@ -84,6 +85,10 @@ my $_GDK_PIXBUF_BASENAME = 'GdkPixbuf';
- my $_GDK_PIXBUF_VERSION = '2.0';
- my $_GDK_PIXBUF_PACKAGE = 'Gtk3::Gdk';
- 
-+my $_GDK_PIXDATA_BASENAME = 'GdkPixdata';
-+my $_GDK_PIXDATA_VERSION = '2.0';
-+my $_GDK_PIXDATA_PACKAGE = 'Gtk3::Gdk';
-+
- my $_PANGO_BASENAME = 'Pango';
- my $_PANGO_VERSION = '1.0';
- my $_PANGO_PACKAGE = 'Pango';
-@@ -471,6 +476,15 @@ sub import {
-     package => $_GDK_PIXBUF_PACKAGE,
-     flatten_array_ref_return_for => \@_GDK_PIXBUF_FLATTEN_ARRAY_REF_RETURN_FOR);
- 
-+  # In gdk-pixbuf 2.38.0, the GdkPixdata introspection information was split
-+  # out into its own file.
-+  if (Gtk3::Gdk::Pixbuf::CHECK_VERSION (2, 38, 0)) {
-+    Glib::Object::Introspection->setup (
-+      basename => $_GDK_PIXDATA_BASENAME,
-+      version => $_GDK_PIXDATA_VERSION,
-+      package => $_GDK_PIXDATA_PACKAGE);
-+  }
-+
-   Glib::Object::Introspection->setup (
-     basename => $_PANGO_BASENAME,
-     version => $_PANGO_VERSION,
-diff --git a/perl-Gtk3.doap b/perl-gtk3.doap
-similarity index 100%
-rename from perl-Gtk3.doap
-rename to perl-gtk3.doap
--- 
-2.18.1
-
diff --git a/dev-perl/HTML-Clean/HTML-Clean-0.800.0-r2.ebuild b/dev-perl/HTML-Clean/HTML-Clean-0.800.0-r2.ebuild
deleted file mode 100644
index a39cb5e26b28..000000000000
--- a/dev-perl/HTML-Clean/HTML-Clean-0.800.0-r2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=LINDNER
-DIST_VERSION=0.8
-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"
-DEPEND="${RDEPEND}"
diff --git a/dev-perl/HTML-Clean/Manifest b/dev-perl/HTML-Clean/Manifest
index 2601822af1fe..d536ae4bbb89 100644
--- a/dev-perl/HTML-Clean/Manifest
+++ b/dev-perl/HTML-Clean/Manifest
@@ -1,5 +1,3 @@
-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 372 BLAKE2B bf470cfa4967dfd320d62fe3066b9a02903f660543b5aaa8f4044359a491dff6bbebcbd5d9564c7c58cf02ac7b8e474b66a8750096c6d3b5eea693ad0ef3efe3 SHA512 0dadd92157a90d6adc2827276ef9737de9f59eedb5f828d0b383b3c0530fe2bab8274a47d8a82a0d9d83b9ee39e4398c931c3bc93fef2e7f17e7473b54aaec97
 MISC metadata.xml 393 BLAKE2B 5aaf5dd6b1e769e4a14fff5072aa86d5e8da3fccb49923864d012885db8856de809ef6dc8036dfebcaa9f81625ea2fa97f2e207ae0ef6b745f5fbda2860c8820 SHA512 1b1fc645060d5750240914ff6ad3f9edbe74e8bb92353393579cbe6e8acc16d1382944f2602beb073ed6fc35a597dcb2423ace80feae00f55755bae40be72a2b
diff --git a/dev-perl/HTML-FillInForm/HTML-FillInForm-2.220.0.ebuild b/dev-perl/HTML-FillInForm/HTML-FillInForm-2.220.0.ebuild
new file mode 100644
index 000000000000..0790bf4aab70
--- /dev/null
+++ b/dev-perl/HTML-FillInForm/HTML-FillInForm-2.220.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=OALDERS
+DIST_VERSION=2.22
+inherit perl-module
+
+DESCRIPTION="Populates HTML Forms with data"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+RDEPEND="
+	dev-perl/HTML-Parser
+	virtual/perl-Carp
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/CGI
+	)
+"
+# the dep specs are rather incomplete
diff --git a/dev-perl/HTML-FillInForm/Manifest b/dev-perl/HTML-FillInForm/Manifest
index ac76c4420be8..0626904fde9c 100644
--- a/dev-perl/HTML-FillInForm/Manifest
+++ b/dev-perl/HTML-FillInForm/Manifest
@@ -1,3 +1,5 @@
 DIST HTML-FillInForm-2.21.tar.gz 17823 BLAKE2B 482b53f3f7fa84d2948dc2ec00406d77946d9332197974628604dcc5626ba05e294dfc0a6db15873ff6433b7e8c4d7dc1727d8820a297de2eb91021eb59d9923 SHA512 05a755635478a797c4711e812a7fbd0428e61b4a4dbb3f8b62ed929122bb4b138aa3d86f2d99ace01d9e7f9486663e64b2c50490d0084c861cbdf8c25645be96
+DIST HTML-FillInForm-2.22.tar.gz 38303 BLAKE2B 043a32a826e5413e68eb50c2b28fd5789f7de6126f2b54533cc8c52790240daca322f4a864db7469a60fc89027d3f0c26cd271700a3507b0c2107dab2f8cbb28 SHA512 ed8c29edd00572fc910487f095c530a4cf5e1e320cab82b171b96e8e490691ef154cb4911c48ffb2d5c726886ec9aca404590e3afd44ca320ad49977822c7db9
 EBUILD HTML-FillInForm-2.210.0-r1.ebuild 469 BLAKE2B 7d2df329e6f75181c5f3b6515304da35919fa9bc05fd0db1d79f79d26b56087dcf942998ebfbd4efef5d86c0697860796abe781952468077d711fd4812264a18 SHA512 5d68edb9c2783088c0e7fa83bbc1d9e92ab40afab76037e437bb2f4b0aa565c9737db21ec394aa3a04c4ad1e32542424a518f2e3c81d277d5bbee7702fe24709
+EBUILD HTML-FillInForm-2.220.0.ebuild 434 BLAKE2B 8a3abebb19a46932e67e640b543c1fe2c4220f1b637a55abcddc1dbf8d9e6b908c35369fedd9860ddf67fdbf35ad396b0e360338f5acea46801da8e372c4c0b3 SHA512 e3de1476b464c0be53457f73a7675a30541d08cd058e55653ccb2c9890e0f6efd0aa354451af9dae03b2a59bb5c2a847eee1a54281d9c37ceec184cb45081fed
 MISC metadata.xml 403 BLAKE2B 1135f6c46d1342f2d08b20a8bfd14d86812311f09cde3d77b809f1fddde79f21c0050e88cbe03a79ca7c2779301e2531ad451cbcf0033ceb70ec46c6a6dae653 SHA512 6918172ea7f187a8567b3324b127f4a1272e6c667a60f27c602c7643b5d0b372bbcc1cd479ae4fe890336501519ecf7ea40b4a6cc46b718a47d982dff9df3d27
diff --git a/dev-perl/HTML-Form/HTML-Form-6.30.0-r2.ebuild b/dev-perl/HTML-Form/HTML-Form-6.30.0-r2.ebuild
deleted file mode 100644
index 72eb719635cc..000000000000
--- a/dev-perl/HTML-Form/HTML-Form-6.30.0-r2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=GAAS
-DIST_VERSION=6.03
-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=""
-
-RDEPEND="
-	!<dev-perl/libwww-perl-6
-	>=dev-perl/HTTP-Message-6.30.0
-	>=dev-perl/URI-1.10
-	dev-perl/HTML-Parser
-	>=virtual/perl-Encode-2
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-perl/HTML-Form/Manifest b/dev-perl/HTML-Form/Manifest
index df64c14d18c3..36b376401bc4 100644
--- a/dev-perl/HTML-Form/Manifest
+++ b/dev-perl/HTML-Form/Manifest
@@ -1,5 +1,3 @@
-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 741 BLAKE2B 017a1ea912c684fc4c1979ed804ecc14c21def7497631293375b18652374a775c4f465f49b7b714b7f08917cb9888f4fdd296cf90144bf24b963fcea228d3ff7 SHA512 47162945e1086ec295f50708bca1e88f5ea5d25d9a028bcbff8eecf8c018075d78a94eb046f97589eef9bbdc5eceabc6840e819101e7622302122e5b95dcead1
 MISC metadata.xml 910 BLAKE2B a277da54f0a6a2e4629a295faac361c87917500f0db8e24c546c498726fa0b5c29b3aa0dce0f3399d7dcfe3ee85d61ea3ce467ee27707e04ca163abc39cb8eb4 SHA512 b44ba377e71c25aced045d0d5f22b861af5665363ed0032de098db52f8c9cbd45b06e9b4ea61099ae8f32f6cb6d1eddc43ef8111924dda6fd36c641027beda2c
diff --git a/dev-perl/HTML-FormatText-WithLinks-AndTables/HTML-FormatText-WithLinks-AndTables-0.70.0-r1.ebuild b/dev-perl/HTML-FormatText-WithLinks-AndTables/HTML-FormatText-WithLinks-AndTables-0.70.0-r2.ebuild
index a7c7daaf4080..b2214081c702 100644
--- a/dev-perl/HTML-FormatText-WithLinks-AndTables/HTML-FormatText-WithLinks-AndTables-0.70.0-r1.ebuild
+++ b/dev-perl/HTML-FormatText-WithLinks-AndTables/HTML-FormatText-WithLinks-AndTables-0.70.0-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=DALEEVANS
 DIST_VERSION=0.07
@@ -11,20 +11,19 @@ DESCRIPTION="Converts HTML to text with tables intact"
 
 SLOT="0"
 KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-PATCHES=( "${FILESDIR}/README-INC.patch" )
 RDEPEND="
 	dev-perl/HTML-Formatter
 	dev-perl/HTML-FormatText-WithLinks
 	dev-perl/HTML-Tree
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? ( virtual/perl-Test-Simple )
 "
 
+PATCHES=( "${FILESDIR}/README-INC.patch" )
+
 src_test() {
 	perl_rm_files t/author-*.t t/pod.t t/boilerplate.t
 	perl-module_src_test
diff --git a/dev-perl/HTML-FormatText-WithLinks-AndTables/Manifest b/dev-perl/HTML-FormatText-WithLinks-AndTables/Manifest
index 7b01b3cf14d9..80bb56fb6f4e 100644
--- a/dev-perl/HTML-FormatText-WithLinks-AndTables/Manifest
+++ b/dev-perl/HTML-FormatText-WithLinks-AndTables/Manifest
@@ -1,4 +1,4 @@
 AUX README-INC.patch 177 BLAKE2B 7554fabc8f41881530112f9a5de682e50f4cdd2e17154901914d61508604636250868f02fe389bc9a37b71d737280428fa985ec61d1fa97511d9ce5d40077134 SHA512 717e0b01f59e18e3656d1cd72b2482af753b57fda2f76cced6ae864d1b9126367886219ea4b8a3820b89b19ecca46021bc1a56c07626789dd3a73159384f3dc1
 DIST HTML-FormatText-WithLinks-AndTables-0.07.tar.gz 11934 BLAKE2B f9c8e087f643d0a19a246e6e72afd4b38babe69f3f030eda9ba2ef853d9a7d373ed2ea517aff0c74cfa4aa72e8e6f252bec4d6a114ad80e642f2c0efb770546e SHA512 3deea4406f7f9dd55d22d60c169d3889be7ef802a43507fb8b608c45ecdff52f743c9cb3a4703f1e44cdcf033c4c64b4c993192fe1a39efc9eae78c6fb66ff3e
-EBUILD HTML-FormatText-WithLinks-AndTables-0.70.0-r1.ebuild 612 BLAKE2B ea50c92e84ecb795e7bf76b8c858ebd12ffcca12ba5ac85228a407cadaf46025a25fbc47f089d121700ab2772baf796dcbc89de6278a3f065fae746c55a34fd3 SHA512 42f7ef1e7146527663a31506234001b8ec3f1df696a351f9426b4c9fec2a9626f2af29eb9a6feb4562110ce0b5cf082bd248ae08df076924e99a4748e3a127e8
+EBUILD HTML-FormatText-WithLinks-AndTables-0.70.0-r2.ebuild 575 BLAKE2B b21cedba6ceb1ce0a2b3509bfb5325fa480b179c06bfa820fb26a8048247935eedacb5578c4d967016d02c437e56c136842ef7efb27c843a25aba67a151a88d9 SHA512 3aa851a9a622da00972ba9de72da2f5ef094d665058862cdd2925ec189f26013741847f53e131cf64d84a804377e9c3119603a19959bed0c3cc471714c35ac17
 MISC metadata.xml 601 BLAKE2B 655176fd82c32c885068a7952680a345a5ca773df3e411e32d50a2b38e8b164d7e7fd97c1c81d7a6ee49902de15fd8dca47c9355a5e0520fd52e5c4cfe0567f2 SHA512 82f74329b15e9ba03ba64615ba76bc20e1f4cc845873fcaa04dfee422e43b2eb90c2decbf9bc28cee3bf0b2f5f84ca93f664bf1bb08c389d3182f5155608866b
diff --git a/dev-perl/HTML-Formatter/HTML-Formatter-2.160.0.ebuild b/dev-perl/HTML-Formatter/HTML-Formatter-2.160.0-r1.ebuild
index 1f488832565c..ca54881a5d71 100644
--- a/dev-perl/HTML-Formatter/HTML-Formatter-2.160.0.ebuild
+++ b/dev-perl/HTML-Formatter/HTML-Formatter-2.160.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=NIGELM
 DIST_VERSION=2.16
@@ -11,8 +11,6 @@ DESCRIPTION="Base class for HTML Formatters"
 
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	virtual/perl-Carp
@@ -23,7 +21,7 @@ RDEPEND="
 	virtual/perl-IO
 	virtual/perl-parent
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? (
 		dev-perl/File-Slurper
@@ -32,6 +30,7 @@ DEPEND="${RDEPEND}
 		dev-perl/Test-Warnings
 	)
 "
+
 src_test() {
 	perl_rm_files t/author-* t/release-*
 	perl-module_src_test
diff --git a/dev-perl/HTML-Formatter/Manifest b/dev-perl/HTML-Formatter/Manifest
index bed3bd13ee4f..f177c691cdd2 100644
--- a/dev-perl/HTML-Formatter/Manifest
+++ b/dev-perl/HTML-Formatter/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-Formatter-2.16.tar.gz 54362 BLAKE2B 13a15ab4fd5e332595f5dde47f193aa32e965c1a59bb6024a0018f7b0fe29283ded991f826a68ea8244d9a695c253c7bd91bd16e097015ab6013fcf763eea14b SHA512 feb09ed5eefa36f1368f051aa077a8123b5c22a50feea10c09f3b7f826c78ac45868a3fde4f96a340bc922a9512afc9c4b02ca6d97d6e538e517e7f3797bd47c
-EBUILD HTML-Formatter-2.160.0.ebuild 698 BLAKE2B 01d789caac6105f848d17cf47c7128140076c88b3ba569a87c1f30157c35555fcb11a4a82f112d8ef744dc143da69951ef04e765c07f234e30f7cbcd9d786dc1 SHA512 c6e8a4139b0291a1312c1bfae25ed9656aa2fcdb841a1c363607cee30427ed9953964fb96ee16382fce110d7b9a0da8c2086731e822fa487a37bf440f47063ef
+EBUILD HTML-Formatter-2.160.0-r1.ebuild 661 BLAKE2B 410fc96cb5443c42b446653c3513a0c30e3a4dde9ba0bbfda3be526629c964f324cf6af94b534434314b39f1afa293eb7721468ebe0da0bf9cc6292bf570a1ef SHA512 2f29deb95f9c9814f909acc330678d00f79d480d73d6d04744167f23bc579fee968f06466798f3268e28e3ca39db80054269c4843ca57897eaf50f8c8c53fdcb
 MISC metadata.xml 654 BLAKE2B d184b9be4058992c483ea98458529e21d938502408d5edb669fffbc2afcdde0fa35079940525bccda6d4179989f0d87f45bc244b06b652f6e96a5b7ebe23bd7d SHA512 671c4e5525e7a0e33d290a061419d137b5e3237127d626bc241080b21e0b49bef78461b8eda2b21cb1ee9c41c3452008e7c68beb3becfccad5f45e299908b492
diff --git a/dev-perl/HTML-FromText/HTML-FromText-2.70.0.ebuild b/dev-perl/HTML-FromText/HTML-FromText-2.70.0-r1.ebuild
index 2d50225b8e78..cf425b234ee5 100644
--- a/dev-perl/HTML-FromText/HTML-FromText-2.70.0.ebuild
+++ b/dev-perl/HTML-FromText/HTML-FromText-2.70.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=RJBS
 DIST_VERSION=2.07
@@ -11,13 +11,7 @@ DESCRIPTION="Convert plain text to HTML"
 
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-# Email::Find::addrspec -> Email-Find 0.09
-# HTML::Entities -> HTML-Parser
-# Scalar::Util -> Scalar-List-Utils
-# test: File::Find -> perl
 RDEPEND="
 	virtual/perl-Carp
 	>=dev-perl/Email-Find-0.90.0
@@ -26,7 +20,7 @@ RDEPEND="
 	>=virtual/perl-Scalar-List-Utils-1.120.0
 	>=virtual/perl-Text-Tabs+Wrap-98.112.800
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
 	test? (
 		virtual/perl-File-Spec
diff --git a/dev-perl/HTML-FromText/Manifest b/dev-perl/HTML-FromText/Manifest
index b59cb74b588b..8a36c2b473e5 100644
--- a/dev-perl/HTML-FromText/Manifest
+++ b/dev-perl/HTML-FromText/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-FromText-2.07.tar.gz 23596 BLAKE2B a76f39aff15e4fe622ca3773e36f1c7cf7a8542dd3f084fd392438d569e4bf1a326d3c1b93b3b0de4aab37ae20529d4f2612255927c5b4c26af5a99784b985ac SHA512 4aacb6be9d1c860c1e758201be40a9c966cb43f1593714e65964bce4bf5d72c86028290ec584321365de36909b6e44e8851f5c2a417b6e38da984ec9c5c30112
-EBUILD HTML-FromText-2.70.0.ebuild 902 BLAKE2B b14beec0de4bce83001fcada7efe372eb4df7b709b818ad28f5e994f7d5e453620296d74050396c972c5f3dcef6dfcedf132e937d4a7eec5757893591796509d SHA512 7d6b7b4d0b559cabf883000500ce9f4b19cb502a42ac9bf40f9a05b8275cb77df24f1b43b1bad53c5109fcc598ff36b8f896cabf8661ad6e6d255cbb5c2f9f80
+EBUILD HTML-FromText-2.70.0-r1.ebuild 726 BLAKE2B 5f9b6dd3b040256f9273629a470b8d3a24fcdcd06b391327d70da59664c131e18a14d02d051b47e4c391d8e53ce3bdda6cbe7182d3d0898c2b4f67f82bbb57cf SHA512 6427023681d8eafd6dc6e1a731805f6fc08b7e09bca73db82c9a7cd74e7a704d3f1dcb51194039ef7a5daab7173c778811b643f0146d8e596982718950bf0e7a
 MISC metadata.xml 399 BLAKE2B 9cc75a14df9f59fa0ef679ce6e08081f4482c72b9861e79146c18a4ec3b5f1f8ac9f3807b2d93db46bfd62926a45e73baf8102216c31c7983bd5928e6c8b6f13 SHA512 24649df557debb77653b252324abff44be0f79aad7cee4d475c7a0ec70623a0f160454f6acffd24f237393c6db9260ee528fc4550ff06a34694d55c09e37ca00
diff --git a/dev-perl/HTML-Gumbo/HTML-Gumbo-0.180.0.ebuild b/dev-perl/HTML-Gumbo/HTML-Gumbo-0.180.0-r1.ebuild
index ca37d1a2e961..ca9bd50a45a8 100644
--- a/dev-perl/HTML-Gumbo/HTML-Gumbo-0.180.0.ebuild
+++ b/dev-perl/HTML-Gumbo/HTML-Gumbo-0.180.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=RUZ
 DIST_VERSION=0.18
@@ -11,14 +11,12 @@ DESCRIPTION="HTML5 parser based on gumbo C library"
 
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
->=dev-perl/Alien-LibGumbo-0.30.0
-virtual/perl-XSLoader
+	>=dev-perl/Alien-LibGumbo-0.30.0
+	virtual/perl-XSLoader
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	>=dev-perl/Module-Build-0.420.0
 	virtual/perl-ExtUtils-CBuilder
 	test? ( >=virtual/perl-Test-Simple-0.880.0 )
diff --git a/dev-perl/HTML-Gumbo/Manifest b/dev-perl/HTML-Gumbo/Manifest
index adb0bb8788cd..e22029d7e64f 100644
--- a/dev-perl/HTML-Gumbo/Manifest
+++ b/dev-perl/HTML-Gumbo/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-Gumbo-0.18.tar.gz 17716 BLAKE2B ba32a0205b89e733a582dd5c4f3607b9ec69030bdff72f0df9ad7a4ca6e251177c1b351a2c85b97baa2cabe82d401b17c7b7e61bdb715763bf891f1f20bcc5a7 SHA512 d2845368bbda81de41f5d4c15c08b5720c388c72cbbfb9062999abdf1d800af4bb24e92df5d41470d611e50b460512630121fa6a8984e76df8eed3f20d149a10
-EBUILD HTML-Gumbo-0.180.0.ebuild 487 BLAKE2B b36a6b5eafc077bee4cfbc685a8b38e22c207786cc048091549fe829dc6f79a6a2e3cc66ce4a91b9a041930a642ecc302099af09db58d2bde04ca7c10a13595e SHA512 aca6c9b5b34071aaf3e9aa6e44112f062189301d1c43cd57a14247e402fb600aef3a422671668b40636ead208761b74d1c77685d10ccafbeca4cd9663dcd5d66
+EBUILD HTML-Gumbo-0.180.0-r1.ebuild 451 BLAKE2B a922f8a9dda78160208c59fdd83c5bbfa4bf7161666e652332c8db5082b22ec469e07366c628bb18ad0c017ff80f06f8eb4a46bcfa1e6ce786d0d5589d23876c SHA512 b5f30b6916f830c240775321ac2c6b73a244d8e10cb436b19c92e5ec7c3ff1ce535ecff0c1289dd7550e75019239f53be340041b9cd151199a907e982c150c77
 MISC metadata.xml 513 BLAKE2B eb90d81f86446698f4e68ee30b43cb893dfcebb474faf61b91549e83a640d4f96a52789fcf3df27a2cde483e20892830d7695d342e9849d1d4c7c6078f9a5263 SHA512 e534daf0a7ba316234bb99bd74167ec68dceb5118dcabb320cade7d4306c16061d39ae8320e934f1cc57ca441dd9a98c5bab45e5ce854fc4f3ae08f10ee17f3e
diff --git a/dev-perl/HTML-HTMLDoc/HTML-HTMLDoc-0.100.0-r1.ebuild b/dev-perl/HTML-HTMLDoc/HTML-HTMLDoc-0.100.0-r1.ebuild
deleted file mode 100644
index 2ce4de92a22f..000000000000
--- a/dev-perl/HTML-HTMLDoc/HTML-HTMLDoc-0.100.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=MFRANKL
-MODULE_VERSION=0.10
-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=""
-
-RDEPEND="app-text/htmldoc"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/HTML-HTMLDoc/Manifest b/dev-perl/HTML-HTMLDoc/Manifest
index bb77f37f64f9..d998137b3f53 100644
--- a/dev-perl/HTML-HTMLDoc/Manifest
+++ b/dev-perl/HTML-HTMLDoc/Manifest
@@ -1,5 +1,3 @@
-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 527 BLAKE2B 750c1987f2421680f23d1e0867bb815e80645c8e95ef7fc79ecaa9d16af364400c607bd9e232638ab2af0602ef7e15c42ccf39b76d40672ba3e36e965c6af19d SHA512 d86295744fe12b525a5a632021d8ece2cf9f61665c29f44c58af76cb6a7b6f97472b30863b5bf42a3c99a15d086ad9eaa763ed6f857ca6133e7693bae8ee0ed9
 MISC metadata.xml 462 BLAKE2B d84a17725c69a3bef4dc2cfbddc2dc7a4904c228e7e81bd630929b027f6f6f86fd88c4dd7fbc618718ed090e536049642784b91de94c7f3d400ad03fb48f2c7c SHA512 b5555b8126a1da759621809fc234f528aa22839fd181c3d84924f6bbd0eb0bbbc4a47265a72a94f4d29e6ea8d8b3cde10f54adbc261360efe32daef771e741bd
diff --git a/dev-perl/HTML-LinkExtractor/HTML-LinkExtractor-0.130.0-r2.ebuild b/dev-perl/HTML-LinkExtractor/HTML-LinkExtractor-0.130.0-r3.ebuild
index 614491fa2c3e..8ad5637f8801 100644
--- a/dev-perl/HTML-LinkExtractor/HTML-LinkExtractor-0.130.0-r2.ebuild
+++ b/dev-perl/HTML-LinkExtractor/HTML-LinkExtractor-0.130.0-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=PODMASTER
 DIST_VERSION=0.13
@@ -11,8 +11,10 @@ DESCRIPTION="A bare-bone HTML parser, similar to HTML::Parser"
 
 SLOT="0"
 KEYWORDS="amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE=""
 
-DEPEND="dev-perl/HTML-Parser"
-RDEPEND="${DEPEND}
-	dev-perl/URI"
+RDEPEND="
+	dev-perl/HTML-Parser
+	dev-perl/URI
+"
+BDEPEND="${RDEPEND}
+"
diff --git a/dev-perl/HTML-LinkExtractor/Manifest b/dev-perl/HTML-LinkExtractor/Manifest
index 8b1488b8c438..8b12409b9f03 100644
--- a/dev-perl/HTML-LinkExtractor/Manifest
+++ b/dev-perl/HTML-LinkExtractor/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-LinkExtractor-0.13.tar.gz 15709 BLAKE2B ae71490840d30a70f7845744cd1a14d5b0d50757d847ffe2c49e6954bda472081c90cdd15b4710219179b171474bad7ff3b7812fc34bbbae59dd694c9fb6526c SHA512 30d3f0688c6b13bd81b85ee9f1bb6987871d2718e051179fd2fc0c2d15190478f4c78a1a71b074ae444b45c1b7fb1ef05675645132fef1b4b892016b69a24fc3
-EBUILD HTML-LinkExtractor-0.130.0-r2.ebuild 366 BLAKE2B 472904373071b2b4360538ef18fbe7175eebc1233fc3b5446c46ee05de8f9c0f2141deabb42f8d4cb0c43d553a04a9c66439575f50e539fffa903c47ae54e5a3 SHA512 904932fb4555f250ccac64ad23bb38fc9516c80fe4d40e0bc1f5f5b9ddf78a74db312234fab5a01300bafd6e44e14a6891c605ab5b1089322aa6a03f7209ffed
+EBUILD HTML-LinkExtractor-0.130.0-r3.ebuild 361 BLAKE2B e318992fa68cfb2cb9de06c6cf8a2ccde8d3871a3033622b04ca1fefafd9e6c70c30f58ef14a41a06e8b0a82262ce6391d50b60059bb569100b44486a9547687 SHA512 5a718b5e14860d64234d586e401f23f946ae509310dc3742caf1b34c99eb1e8fb319b82f59a31cc2ff2108f660e687b5a2acc41d9ea6595b9b3a1df17273582c
 MISC metadata.xml 409 BLAKE2B 2a2404a976670b769b6a6935844553c9a7fcf3d3ef486944a53f399e2a0e1afc9064d41ca0dfa82491c5a2fe8ed3f30697d032cc67d3d28e3e8e8d639db76be1 SHA512 d95cf2ef811a3458277fad2e01a8d59b715e5a30c607e3ad9e9c2aebdf130f66ea852d441aa8d6094eace1c69999b5979bb74c522a61f3b699b2bfcc6fac6c43
diff --git a/dev-perl/HTML-Mason/HTML-Mason-1.560.0.ebuild b/dev-perl/HTML-Mason/HTML-Mason-1.560.0.ebuild
deleted file mode 100644
index bf8924ab4873..000000000000
--- a/dev-perl/HTML-Mason/HTML-Mason-1.560.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=DROLSKY
-MODULE_VERSION=1.56
-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
-	)
-"
-PATCHES=( "${FILESDIR}/${P}-no-dot-inc.patch" )
-
-want_apache2 modperl
-
-SRC_TEST="do"
-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 1ed0140de220..050f88adebe8 100644
--- a/dev-perl/HTML-Mason/Manifest
+++ b/dev-perl/HTML-Mason/Manifest
@@ -1,6 +1,4 @@
 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 1451 BLAKE2B 89296e1c911385d36dfb12b95e9a7fc1e0fd9a8d774b1040bf994e0f5b586720335cd97534e4aaf78fb8ec4d914ca459892a984d93e8a7ef1ee6098b5a2f5a2b SHA512 0e58409a57ad9c24494801dc5c8dbd82a69620cd98f97a136380faad00e48edabcb68bd7d16566261e6303d31586abe94e99c59ce33a8fa29298e302a1fa0437
 MISC metadata.xml 3213 BLAKE2B 64da9a0c02fcb71564cc921b2cd728eb7467fc55bad8f560e0a20ea7802b4018403f5d99630629bac4117ec09f2600e14ba7bc782ce77a3ccfd3b016230f2211 SHA512 4c19cd56f454aafb4e4bb85990e453a3bbffbf2f745a41a7f3c00566d8dead840fcb315ee92ac0567f2e7ca6f45eb05fd97d563a8f80097d6c80ac1612d5f5c5
diff --git a/dev-perl/HTML-Object/HTML-Object-2.29-r2.ebuild b/dev-perl/HTML-Object/HTML-Object-2.29-r2.ebuild
deleted file mode 100644
index c0c3de3f584c..000000000000
--- a/dev-perl/HTML-Object/HTML-Object-2.29-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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"
-DEPEND="${RDEPEND}"
-SRC_TEST="do"
-
-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 e796be2b225e..c0e5ef15678c 100644
--- a/dev-perl/HTML-Object/Manifest
+++ b/dev-perl/HTML-Object/Manifest
@@ -1,5 +1,3 @@
-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 698 BLAKE2B b0743a8df55cefb83b9cb7d93a08932a45e649743781ff1ea52468489ab8b5d11eec4ef8c6dc0823528dac93f0df9bf379983ad26b9982daa82f06befd02cffd SHA512 dc28812647ca5e0c17a2db0a3ecd7ee219bdfe98af6fb7be611037426c8ba43b78d749bc5a0a79741b8ca581fab84a1982da0961013182f7ca3516630b675df6
 MISC metadata.xml 332 BLAKE2B fad97c482117e3cd3f5be15e459b50e517ad3d6c2c806aa7b4a23da94f5c2ed22578bff5805122d4b4b4d9f4c2d6e69d357abc17ffd6a1b84eda7cacd66bf055 SHA512 2cdb0050ad7d5acfd0cebb112a2b4c152d83d1d176e81c8f7c131710f351b5e192f8366ae583de5d5ffb9576921789064f5405d2ff179b42a855012922051d06
diff --git a/dev-perl/HTML-Packer/HTML-Packer-2.60.0.ebuild b/dev-perl/HTML-Packer/HTML-Packer-2.60.0.ebuild
deleted file mode 100644
index 5295e6845b89..000000000000
--- a/dev-perl/HTML-Packer/HTML-Packer-2.60.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=LEEJO
-DIST_VERSION=2.06
-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
-	>=dev-perl/JavaScript-Packer-2.10.0
-	>=dev-perl/Regexp-RegGrp-1.1.1_rc
-"
-DEPEND="${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 610563dea1f6..80c5d8b80c7b 100644
--- a/dev-perl/HTML-Packer/Manifest
+++ b/dev-perl/HTML-Packer/Manifest
@@ -1,5 +1,3 @@
-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 467 BLAKE2B 0c8e13af85301fae5924e4829ed4f46fd3ebe9cb90ae9d4e705f9ecae9bd096fe273d75770ea145282e50648953f237b1cdf764bb8b2e19d9c9fa2f269b81f6b SHA512 48706d05848ca05ce653735ebdeaa1b5ca9950e913c691e3f860ac02eaf5452fbb4f0ab65ed5a8f014a3b902512ff7910fbfa287c3011fbaadf386bcdeb498e8
diff --git a/dev-perl/HTML-Parser/HTML-Parser-3.720.0.ebuild b/dev-perl/HTML-Parser/HTML-Parser-3.720.0.ebuild
deleted file mode 100644
index 67e4aab578d2..000000000000
--- a/dev-perl/HTML-Parser/HTML-Parser-3.720.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=GAAS
-DIST_VERSION=3.72
-inherit perl-module
-
-DESCRIPTION="Parse <HEAD> section of 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="
-	>=dev-perl/HTML-Tagset-3.03
-	virtual/perl-XSLoader
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
-
-mydoc="ANNOUNCEMENT"
-
-src_test() {
-	perl_rm_files t/pod.t
-	perl-module_src_test
-}
diff --git a/dev-perl/HTML-Parser/Manifest b/dev-perl/HTML-Parser/Manifest
index 2baa0b433d05..cc9c16b43f20 100644
--- a/dev-perl/HTML-Parser/Manifest
+++ b/dev-perl/HTML-Parser/Manifest
@@ -1,5 +1,3 @@
-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 757 BLAKE2B 67cded65e5f49e938abdd51c43787cee645ed3e60c9086c68e3e18e7cabe1a24a668567a620ccac529cc62716ede5282bcd910cd26f57c5ee3bffb57aeb18d0e SHA512 d15e34ddca1b71f1f309eea9ad871d71ab0c4a826e0115584040d94b6ba6fee07c95a1c3d4829dd0198894878077585f67389606740ccad1a307c511802605fc
 MISC metadata.xml 766 BLAKE2B 80f8dbcbfb210da3d1114034e235a19b10cbc546715ed2f4f61f3a0f81353ed571470e1916f6109860d751da4c4c85766cf4a2edbb006f6c251276d00cef13c7 SHA512 a51a525cf2e8167f13276e67ae524c22bd86def5794ac3397fa95fe100fde22c67cf7c96ef64f4d85f56acaf75ab5654b29c54eabb8735ae40bb25f762fa932c
diff --git a/dev-perl/HTML-Quoted/HTML-Quoted-0.40.0.ebuild b/dev-perl/HTML-Quoted/HTML-Quoted-0.40.0-r1.ebuild
index 79dd4f858e18..1dd693582739 100644
--- a/dev-perl/HTML-Quoted/HTML-Quoted-0.40.0.ebuild
+++ b/dev-perl/HTML-Quoted/HTML-Quoted-0.40.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=TSIBLEY
 DIST_VERSION=0.04
@@ -11,12 +11,11 @@ DESCRIPTION="Extract structure of quoted HTML mail message"
 
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	>=dev-perl/HTML-Parser-3.0.0
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
 "
 
diff --git a/dev-perl/HTML-Quoted/Manifest b/dev-perl/HTML-Quoted/Manifest
index feca81365141..916c8be8c5e4 100644
--- a/dev-perl/HTML-Quoted/Manifest
+++ b/dev-perl/HTML-Quoted/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-Quoted-0.04.tar.gz 23106 BLAKE2B def9d638e29d96fe2f9e6555d919e11de7ad23622185da83cb066d349a60eb8bdfe4c1f39315c058551a2f565e68f0abe771d006fcf3678d1743b37c94c55041 SHA512 a13fb07d683741ec32679780d7183c849c534fb79e2b5f5613f9142e2b877938712d8bf20bb1e540ad5f4532cd7f2fcbf42bc3be5e931d7a4a2ae12bd0af0cc0
-EBUILD HTML-Quoted-0.40.0.ebuild 573 BLAKE2B 0a4a55c38d2c79f67d8baf46ab89e8f32976dd9a656c7651bed11be7348afec271efc7156321e60b5d0b5036ffa0446dcfa307db025061f5161d47e49976b51b SHA512 ee4e792b05472fa7c7915ac71fb23c1f37a41e7ae09008def18124a9a8691f810721e2c7c18d45dc1875748d8dd0b6044a26e822223c081d15e2c57145236bd5
+EBUILD HTML-Quoted-0.40.0-r1.ebuild 563 BLAKE2B 9b6d1d811a57eec1c389ee2efc33461297642acc52ddf498a5646d1a2a6d25fb0360c0d3c84706a7954069dba16016d6151d7bbf439460cb66b74a8a7ffc64d7 SHA512 03ada25b041cc4db4af0db474588218fc4098ac6ca2336f7d237efe1c17ef0235aff0027e61f9dcf82b85d3a1ebfd6d6d928410cc2f098f9566fa5b9be274105
 MISC metadata.xml 462 BLAKE2B b6c9af4bf67a5f11b06c507a3429735909706aafb9edce624564f0a4f5e7de99962c56cb8846e4964553a696f21a35c07fbe740b2ec5ff3c9dc6048735ef6aff SHA512 a8c8e89bdcd01e171b20ca729780e9cf40c485b7459725df31c82382dd0bad6ebc02db91e0cc80afb8f1f0ccf68c28c80fdacecc58085de3b6ebea98313fa7d4
diff --git a/dev-perl/HTML-RewriteAttributes/HTML-RewriteAttributes-0.50.0-r1.ebuild b/dev-perl/HTML-RewriteAttributes/HTML-RewriteAttributes-0.50.0-r2.ebuild
index c3485c7d9168..c6785d438467 100644
--- a/dev-perl/HTML-RewriteAttributes/HTML-RewriteAttributes-0.50.0-r1.ebuild
+++ b/dev-perl/HTML-RewriteAttributes/HTML-RewriteAttributes-0.50.0-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=TSIBLEY
 DIST_VERSION=0.05
@@ -11,12 +11,14 @@ DESCRIPTION="Perl module for concise attribute rewriting"
 
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-IUSE=""
 
-RDEPEND="dev-perl/URI
+RDEPEND="
+	dev-perl/URI
 	dev-perl/HTML-Tagset
-	dev-perl/HTML-Parser"
-DEPEND="${RDEPEND}"
+	dev-perl/HTML-Parser
+"
+BDEPEND="${RDEPEND}
+"
 
 src_prepare() {
 	sed -i -e 's/use inc::Module::Install;/use lib q[.];\nuse inc::Module::Install;/' Makefile.PL ||
diff --git a/dev-perl/HTML-RewriteAttributes/Manifest b/dev-perl/HTML-RewriteAttributes/Manifest
index 7003514cf52f..fdfa1d2dd9b7 100644
--- a/dev-perl/HTML-RewriteAttributes/Manifest
+++ b/dev-perl/HTML-RewriteAttributes/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-RewriteAttributes-0.05.tar.gz 27696 BLAKE2B 630ae0bcc4b085bdcea716fed4c270eed1d00bda0ffab7379cb8558e8ed6dfb7525a3f18f2b7033f9dd13fddecef38e9fc2b9ef35b8c4a7324d146e0262507b5 SHA512 6a654dd2767010781f7fd145110dda4ebe71ed82aa6fea5932fa301b23f885d928c7dc0cea562ab5c5cd4f0881dadd590c4a4ae052285fcd261ac4ee9d25eb70
-EBUILD HTML-RewriteAttributes-0.50.0-r1.ebuild 555 BLAKE2B 09c0a5b6a2035fdc078d6f942a567920b1296a668b28f530941c04fc24cb9173bb0b03582f78f29d6ba6ea3a5b0f21d044a94680712818e5f7956d04d7589f19 SHA512 250054422ac558842495eda3ff7c2a128843dc3576f12cc1c004d83e5bcc8e26513ad9b85902a9f2aa2834eb075a75ca6bf09efdccea126f312223be2747d7c4
+EBUILD HTML-RewriteAttributes-0.50.0-r2.ebuild 549 BLAKE2B 17f12c12847914978ebbc6c02bacf50b64cf5e003eb8f1f98fd67cd156fef1ae8569a59c12d920a9ad4efd2ecbdaedb49efa6edf12f0e2406838b860d303947d SHA512 3ce0ecc6fdad9a66400d277bdfe50565d556eebfecb536dded8743da63da40e5af0da1591f75199ec147c133e93536d35954cf9e56f5f9ad0f181783d2f98284
 MISC metadata.xml 575 BLAKE2B 408700fb6200bd3fd037ff692ac3557dd5cc6b023abd981718edbbdbb298d5c6a4f98fc46c91acaf01b6f43457b096579351e49e344240ac3f70f02e320522fc SHA512 e6793c61d7a5cb14ec6b3e554284e61cbff70cd69b7a21484a9c308597d30a28310588f959495f6c4ff1971aecf8df08ffbb27b2fe77ecfc145ea4345ac7bdb5
diff --git a/dev-perl/HTML-Scrubber/HTML-Scrubber-0.170.0.ebuild b/dev-perl/HTML-Scrubber/HTML-Scrubber-0.170.0.ebuild
deleted file mode 100644
index db27ca811015..000000000000
--- a/dev-perl/HTML-Scrubber/HTML-Scrubber-0.170.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=NIGELM
-DIST_VERSION=0.17
-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"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		dev-perl/Test-Differences
-		dev-perl/Test-Memory-Cycle
-	)"
diff --git a/dev-perl/HTML-Scrubber/Manifest b/dev-perl/HTML-Scrubber/Manifest
index 90b431119808..fc833dd25fa4 100644
--- a/dev-perl/HTML-Scrubber/Manifest
+++ b/dev-perl/HTML-Scrubber/Manifest
@@ -1,5 +1,3 @@
-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 608 BLAKE2B 06319d403b240278c9548894fdeb89df9d82a2f2a2dc0be9313447bad03c361248cb4a8db6c33674b34ef996884e4b5a785b37aa2e62213352504a9367ad5203 SHA512 f05515937b643d576298bf0104a8563a9863ab7aee3c8fa49dc8027894655997d389a1144ab40d49285bb92696d43c0b4284e4a56d1a08a72fa3b7204218d485
 MISC metadata.xml 399 BLAKE2B 2b0003b8e0b614f67ae68877f4491b8e0db57584d2417470437d68e72ab76c93d2e6d05774696d79b36282b664a9a8aaa06541c1c62aed0c13852cfc99ca6220 SHA512 b3e135a88464c1b49864c75ea82f7db84ff0013fa397866e8695f843c95e7a7a669fe21bb26bec3b0460e9abc42d8325bd2d6dc1fc8b17f73b860d9e8bd8dbee
diff --git a/dev-perl/HTML-SimpleParse/HTML-SimpleParse-0.120.0-r2.ebuild b/dev-perl/HTML-SimpleParse/HTML-SimpleParse-0.120.0-r3.ebuild
index 127876e201c4..5050c8e5f098 100644
--- a/dev-perl/HTML-SimpleParse/HTML-SimpleParse-0.120.0-r2.ebuild
+++ b/dev-perl/HTML-SimpleParse/HTML-SimpleParse-0.120.0-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=KWILLIAMS
 DIST_VERSION=0.12
@@ -11,8 +11,8 @@ DESCRIPTION="A bare-bones HTML parser, similar to HTML::Parser"
 
 SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE=""
 
 RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.28"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.280.0
+"
diff --git a/dev-perl/HTML-SimpleParse/Manifest b/dev-perl/HTML-SimpleParse/Manifest
index 1c7dc8a86c52..458ce92eb498 100644
--- a/dev-perl/HTML-SimpleParse/Manifest
+++ b/dev-perl/HTML-SimpleParse/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-SimpleParse-0.12.tar.gz 8486 BLAKE2B 44c0d508c25aa2959311157b5ab4619861bf9ae6885d2df120518b1fc61d3a547cc06d93af013764f4f3e33c8cc60c7c2a70d074921e9968923e052ead2027a5 SHA512 923927ba1053e34974bf95bb17156639df41b779cc01eb790aebc7ed89143b91fb2d2498763884e236c4220a71a41c34020a078afcff149c1a29d83dcabf67d4
-EBUILD HTML-SimpleParse-0.120.0-r2.ebuild 368 BLAKE2B 198b990403984589609d0d4319b36ab1f7857d60945bf514fab4bdaee262757c6f74cf6cb072dbce23bcd074d6229e00997b2c12fe28cd8a55a9f7675cdfcf23 SHA512 fa1a87434b765a93102b42e9f3f7826c82da0a68d5fbbe82e19717693ecaa7c93ee641a1931ce0ceeae869ac0818b7fcfacaf811d6fbe78e1dedd3390f70631c
+EBUILD HTML-SimpleParse-0.120.0-r3.ebuild 365 BLAKE2B 29b2ad362674d304f8ba735c38c26bcb69741d22307d27e1b1c87b51c069c76d831bd3c14d941a29919984aef0f27ac813c174bcccd5c2586e0e16a67239ba3b SHA512 79f07bc0b21427d8cfd1b91586810cc8364a82be1b9e47ad0d2775dbe8e6666123bfd17a54ca8f717c540874e3cfe29448ae96d4462b99c9af50de48ca005cb8
 MISC metadata.xml 405 BLAKE2B 7b193dc470eae92cf291534a74a848e37df1cc4ad2db8cb1f97ce76b990517ca0c95d026a8da601ce179f623d3fed80e97c9d7ceb3cd8a4b95d0bff7a49cd728 SHA512 2e9474eb335bcf3d4ff6a540419eb491beab22c935b958aecc19e323918616e8beace8617d0fc34490d228cae3390b59023458430669e86e72b1272cf6408487
diff --git a/dev-perl/HTML-Strip/HTML-Strip-2.100.0.ebuild b/dev-perl/HTML-Strip/HTML-Strip-2.100.0-r1.ebuild
index 97554f2b5186..73a9cdbca23c 100644
--- a/dev-perl/HTML-Strip/HTML-Strip-2.100.0.ebuild
+++ b/dev-perl/HTML-Strip/HTML-Strip-2.100.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=KILINRAX
 DIST_VERSION=2.10
@@ -11,19 +11,18 @@ DESCRIPTION="Extension for stripping HTML markup from text"
 
 SLOT="0"
 KEYWORDS="amd64 ~ia64 ~ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	virtual/perl-Carp
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? (
 		dev-perl/Test-Exception
 		virtual/perl-Test-Simple
 	)
 "
+
 src_test() {
 	perl_rm_files t/400_kwalitee.t t/410_pod.t t/420_pod_coverage.t
 	perl-module_src_test
diff --git a/dev-perl/HTML-Strip/Manifest b/dev-perl/HTML-Strip/Manifest
index be2e86c40d4f..2b7ecd0ebe92 100644
--- a/dev-perl/HTML-Strip/Manifest
+++ b/dev-perl/HTML-Strip/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-Strip-2.10.tar.gz 15333 BLAKE2B 3cb0b3d8a07c403fc9bd242d458ace0e698d7f7e8a071e0531ace502d721f7821aa629ffebbb1dc793357bf438a083d4b379bdfa95a14884be23ff21cd09d3cf SHA512 e5a5c7817e519542e39e3d27e6c113082188665f2f19c795d96aa841f8c35f3515880f1f0eab3a30d69377433311bb3164a8528c057fe331f28f29f8a18c9e05
-EBUILD HTML-Strip-2.100.0.ebuild 579 BLAKE2B 23642bf072a4527411f7361ac77e79e3d56c2b982c1b1eb308ae70357ba99564b13e7a8282f7226765eea498718d72f37a43e7f907d3f640c6fbe1561313d1de SHA512 a12a04f302270475d13a3a30402ab4e29de9b1d8d0af3b66abc2b17d7080bce616a1002c41fa5c1c54d08e1d7c2fb8042cb45ba4f75e01736cdb5aa9f852951b
+EBUILD HTML-Strip-2.100.0-r1.ebuild 542 BLAKE2B 453571c2d18346bd4c8c127367231683c339e47b5977bab9efd29fddfa9a16b55ff240eed29030dcf09e846de3494c87dcb8210bf329dfbd1790dcd66d382ecb SHA512 7e9399041e25292c4d0ae47624915fea8b0d2cf02ab1c85fe336e1fc3aec11f2821482c07526efb8457cee1405a51687b6b32b50f9a3cb7b0922af90fa070b3e
 MISC metadata.xml 393 BLAKE2B 291dcc2ec14ac9cc77c458803077530d2a651a45354de410da29d422b6214e636ab3a85d05de8ebf7350a85d3113f5f79c7efa6c8d146821e09e1f40010a5546 SHA512 9ef290b7d393a962dd7379f759e8f9ab19d8fdeaa7fab997aa8168271572196c9113a9b4ea286da30b266e8237a1e6cd31b2c8adab77badb2d8aec4f7e4f0fa1
diff --git a/dev-perl/HTML-StripScripts-Parser/HTML-StripScripts-Parser-1.30.0.ebuild b/dev-perl/HTML-StripScripts-Parser/HTML-StripScripts-Parser-1.30.0-r1.ebuild
index 8ef3b367ecc9..30f763cdf32e 100644
--- a/dev-perl/HTML-StripScripts-Parser/HTML-StripScripts-Parser-1.30.0.ebuild
+++ b/dev-perl/HTML-StripScripts-Parser/HTML-StripScripts-Parser-1.30.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_VERSION=1.03
 DIST_AUTHOR=DRTECH
@@ -11,14 +11,12 @@ DESCRIPTION="XSS filter using HTML::Parser"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-perl/HTML-Parser-3.560.0
 	>=dev-perl/HTML-StripScripts-1.50.0
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? ( virtual/perl-Test-Simple )
 "
diff --git a/dev-perl/HTML-StripScripts-Parser/Manifest b/dev-perl/HTML-StripScripts-Parser/Manifest
index 69c14b6135d3..0f235bce5786 100644
--- a/dev-perl/HTML-StripScripts-Parser/Manifest
+++ b/dev-perl/HTML-StripScripts-Parser/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-StripScripts-Parser-1.03.tar.gz 9524 BLAKE2B 7a3f9b7edcddd604f1e23d746ac80187c60bfc74f1c36d7b84e9a59eb4f3aefe9e0df1f1c136c1c9ce2b54f7163afc3103dc43fa17868d434c8dd93eb1a4e399 SHA512 3bc766ff738623191b23c5212751cad32b76160bf5e3dcdfad5e161288c906deb1357fc092a962da87525b7364ba924de9ef68b94966c003ee7cb23e8035dc15
-EBUILD HTML-StripScripts-Parser-1.30.0.ebuild 459 BLAKE2B f89e49af65ee4f5be5449c17dd0f02846513788d06d2dab117660ed1fd5f9d7d470fae7c5bd0c52d4415b0c23d4d5efb92d18c8c4575d4aac5655ea9ab68a132 SHA512 343b6969d79fa1f6dedb50aaaea4d94455e0f997c87ec3294f48903cbe50d7a2a30de12baaa269f0e81c0a5de4804fc9bebc60e18b57d00c180292775b04a0e1
+EBUILD HTML-StripScripts-Parser-1.30.0-r1.ebuild 421 BLAKE2B ff220e088a87eb3fd3c8ef5110c4876b4d28ef5342a5ac50bd3f64f700686495112a9533bcc2d1954997d5586ec641e61ccf0e6b32dc6d6ba0e1288d3b7830d9 SHA512 5bfdb929c01e499ec34db8ab7b3854dcfdc451cdbc693fd21decbf1fd0ebfa53f6885948d4cd65b3dfeab746bafb882b13d32bd69d4e0750a9c4559cb520050c
 MISC metadata.xml 422 BLAKE2B d5fcbbca7a0c16e8acb37a642998010dd68215cf76ae557a1c22df63c2ec7372e7f30d055e64639b55b23204c50000563cf070b90ecb05ea05f4fd6a267ff631 SHA512 0c137cc9de19cef00c031605c1f24e90a0ab046c568a7b65f3dc579b33f2e5a7fd91e4dffc23677b9c7e58c8017abc816f14067e643d455468ba8c23b632cb16
diff --git a/dev-perl/HTML-StripScripts/HTML-StripScripts-1.60.0.ebuild b/dev-perl/HTML-StripScripts/HTML-StripScripts-1.60.0-r1.ebuild
index a4f6b0ceb367..3bfa3ac67531 100644
--- a/dev-perl/HTML-StripScripts/HTML-StripScripts-1.60.0.ebuild
+++ b/dev-perl/HTML-StripScripts/HTML-StripScripts-1.60.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_VERSION=1.06
 DIST_AUTHOR=DRTECH
@@ -11,12 +11,3 @@ DESCRIPTION="Strip scripting constructs out of HTML"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test-Simple )
-"
diff --git a/dev-perl/HTML-StripScripts/Manifest b/dev-perl/HTML-StripScripts/Manifest
index 53563eecd7d2..f02f2c1e332c 100644
--- a/dev-perl/HTML-StripScripts/Manifest
+++ b/dev-perl/HTML-StripScripts/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-StripScripts-1.06.tar.gz 44745 BLAKE2B f239466e7d328113979b3676812aab4371d69e5a8d783a4cacec14ee2cee86058bef2e201105030315b7387a2e6a861d303c491066fb1750a469c5b45083005b SHA512 5d358997816653e32dba8916ac95967da345ec8c018ba7d21ef3bebca9bdda3131917b596dd25f51a3c63f85df7babfeab6133b46a7e15a0cd0409c055e2c589
-EBUILD HTML-StripScripts-1.60.0.ebuild 399 BLAKE2B 452f541cdce6acd4a87c7143972e5744f3aecdb04b35899c68ace419ed63583c50192fc79264306a6297a0fd210101b313d7b4c384d1623d18e4d5c47d95fb8d SHA512 092dbf7d2ddd06891206adfe44117755bd111a70042e29fa7ed47f134f8e795321bf61d5e5175e254b00281aabf096138f395b06321bb0202e6f4c5ba0feb592
+EBUILD HTML-StripScripts-1.60.0-r1.ebuild 257 BLAKE2B 8d3784fa94fff4209de1c973552b16a368e6212a6efd1a997ee06ff435995a6d8212f4e0ab677ba5ecb00579c027f8c09d1ef1d2b486de13c7cddce82dc68fc7 SHA512 3c9befc3c76cf2183e1346a131a84dd935463ebd26d38b801ca61efdfc289fb2396a68d908bd8464846a3c1ffd43c87de2916c2894126ce16e0ccb27e03c5e40
 MISC metadata.xml 407 BLAKE2B 56d695875dbba54b148f005761054962bdeceddde21390f3b0f668fb999365988358970ceec87742ae841b08106994e0662a0ae2a8f84333b3e5c1f92dc30a44 SHA512 6430c003f964db620c4f9b2716b006411ee991c76e287d7b8174e33ca1e0a4043e80fcb44c1916fb30c2e1035318cb132c4f3bcf4e2be40b2fcfa46fbf71f662
diff --git a/dev-perl/HTML-Table/HTML-Table-2.08a-r1.ebuild b/dev-perl/HTML-Table/HTML-Table-2.08a-r2.ebuild
index 8100d4c3b593..5eccfcd9aca0 100644
--- a/dev-perl/HTML-Table/HTML-Table-2.08a-r1.ebuild
+++ b/dev-perl/HTML-Table/HTML-Table-2.08a-r2.ebuild
@@ -1,16 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-MODULE_AUTHOR=AJPEACOCK
+DIST_AUTHOR=AJPEACOCK
 inherit perl-module
 
 DESCRIPTION="produces HTML tables"
 
-LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
 KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 sparc x86"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/HTML-Table/Manifest b/dev-perl/HTML-Table/Manifest
index 9afb85384994..884dfd695926 100644
--- a/dev-perl/HTML-Table/Manifest
+++ b/dev-perl/HTML-Table/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-Table-2.08a.tar.gz 23934 BLAKE2B cf08002baafc2c83929b46ad1d6695b5bd42b18e6e413da16e1804f9885a9d60507afe04fab7403f0948aab01385cfb891892023a04edec12482feb32acddf46 SHA512 fe2e0a9777a45cc7b720b33694fd9aec6626a27720dedf57238c4166163ae6d35fd8f61a4321e6951c589269c28a3ba2677bdd1f849446bfadb2c90e6d052a36
-EBUILD HTML-Table-2.08a-r1.ebuild 306 BLAKE2B 6138f53d9b18754f69e2a1da8a2e8295837c64493731b6027097ebe4edbb30fbc59bdc4ef7d571e239860b84e30465d13f180c479442931816c52df377b27419 SHA512 cf18d9579689b1ec02b1dd25cb0712cc563ec9e328dd243f7b2d252185cbde7e0b9ab1d9e79289c82dae5f8547a6e596bde6e64368f093156ce5566662448133
+EBUILD HTML-Table-2.08a-r2.ebuild 246 BLAKE2B effc4b1b61fd3db3edbbf4040bccbcd10d2e2e16216cd6126e7e4ae360bb34599b1a94d58ef05fa9e8ba9fcc3f9a5b2b50916dfa1fa9fe8d63bbcc22901e6ea5 SHA512 8cfda21496c52594796a1ad2e0adc35362dbcc587ea4f176d53ff25cdc61d3d52280a85649b4d6b5cc35c063577728c02268ccd569eea0bacbba3b45c760cf14
 MISC metadata.xml 393 BLAKE2B 70a4d8b52cd807b31c515aa9b7f97d734698b17625b3b7de7cffca2dd38c94bbd03e68beeb78f1268ef0c9244e5c5c60e627f9d719049136223bf22b15c30557 SHA512 5e71160ef44d20e18f2012acc9a17d60d50ea00be1a17c7958b8fd981903e12788419b9e99537a697e26ed62d25eb173a0bf1ccb9180d667ae8f41e2efad5f15
diff --git a/dev-perl/HTML-TableContentParser/HTML-TableContentParser-0.130.0.ebuild b/dev-perl/HTML-TableContentParser/HTML-TableContentParser-0.130.0.ebuild
deleted file mode 100644
index 642f69822aaa..000000000000
--- a/dev-perl/HTML-TableContentParser/HTML-TableContentParser-0.130.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=SDRABBLE
-MODULE_VERSION=0.13
-inherit perl-module
-
-DESCRIPTION="Parse the content of tables in HTML"
-
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-RDEPEND="dev-perl/HTML-Parser"
-DEPEND="${RDEPEND}"
-
-SRC_TEST=do
-PATCHES=( "${FILESDIR}"/0.13-test.patch )
diff --git a/dev-perl/HTML-TableContentParser/HTML-TableContentParser-0.305.0.ebuild b/dev-perl/HTML-TableContentParser/HTML-TableContentParser-0.305.0.ebuild
new file mode 100644
index 000000000000..f717feaa1540
--- /dev/null
+++ b/dev-perl/HTML-TableContentParser/HTML-TableContentParser-0.305.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=WYANT
+DIST_VERSION=0.305
+inherit perl-module
+
+DESCRIPTION="Do interesting things with the contents of tables"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+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 881500cb5b7b..8425cc2b18c3 100644
--- a/dev-perl/HTML-TableContentParser/Manifest
+++ b/dev-perl/HTML-TableContentParser/Manifest
@@ -1,6 +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
+DIST HTML-TableContentParser-0.305.tar.gz 18931 BLAKE2B 616bfbb1809af1f0434fe3fb61082e635ba2cb62c1d14c47d059eb2c2dada80fa74ba577f85e9961036bf68f179ccc036410e2f3d67f497babbd3fe713bb6f2b SHA512 beee3b16e61b32e39bd7fdacbf993f18c1b11b6e0ba9704584243a629d72abed0012ee14518cd8c2490cb08a4c1323ee9b49ac2a764f37fa26c632a1d0ec2450
 EBUILD HTML-TableContentParser-0.304.0.ebuild 384 BLAKE2B 1cab7f626ee25f51b5f680c63e0dc34defba6d201315f58dedc86d579561b09fd89bb4a2aabc27753d31067e11f15ef2a1a71664382becbfee8ca19f3bf7b6b7 SHA512 f83be083b19e5197bda0fc74b961375a749f18de4f38093d9233992fffd969018a23870748fd413805434a114578306a1c8f7ddf72285a37d7c9be0125f163c4
+EBUILD HTML-TableContentParser-0.305.0.ebuild 377 BLAKE2B 32ec756b2b6847fb1dc898bbcf78a619d238280f06116aa0a7397727963c11a887cc326f94ac15e74da8f047816e8a4d26f236933d491110e5da5f719c0fcc44 SHA512 95e3ac2204cc4813b91c356224dd23ace9e66f82f4fe4e3c2165758f1134a70c4ab946bf769c6b4d88a8a979b8ac2c013c199d223cbbae89fdd949309327c2db
 MISC metadata.xml 535 BLAKE2B 13cdd17014d47497260675c128c0c7fc0ecbbbcef8743ea831d7df5d2db66556318dbf9c69a8bc674a017d6f2f1054cff9e4228447c9a853d2c6064cfb6ed65e SHA512 e21705171dee0812f3213417c721cb0ced4a0e8e0773c447dcff7f791096a4b883ec6ce273c68444980dc109c1f68a3b7aaf8d17dc61402ae57417ee86a150d1
diff --git a/dev-perl/HTML-TableExtract/HTML-TableExtract-2.150.0.ebuild b/dev-perl/HTML-TableExtract/HTML-TableExtract-2.150.0-r1.ebuild
index f5cca70f2a48..c4b1b8a6f23f 100644
--- a/dev-perl/HTML-TableExtract/HTML-TableExtract-2.150.0.ebuild
+++ b/dev-perl/HTML-TableExtract/HTML-TableExtract-2.150.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=MSISK
 DIST_VERSION=2.15
@@ -11,17 +11,17 @@ DESCRIPTION="The Perl Table-Extract Module"
 
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm64 ppc ppc64 x86 ~x86-linux"
-IUSE=""
 
 RDEPEND="
 	>=dev-perl/HTML-Element-Extended-1.160.0
 	dev-perl/HTML-Parser
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 "
 
 mydoc="TODO"
+
 src_test() {
 	# https://rt.cpan.org/Ticket/Display.html?id=121920
 	perl_rm_files t/30_tree.t t/01_pod.t t/02_pod_coverage.t
diff --git a/dev-perl/HTML-TableExtract/Manifest b/dev-perl/HTML-TableExtract/Manifest
index b6b7e0ea8931..3fa5df260694 100644
--- a/dev-perl/HTML-TableExtract/Manifest
+++ b/dev-perl/HTML-TableExtract/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-TableExtract-2.15.tar.gz 36481 BLAKE2B 37562bcd8dc559b4a6dede3c3242e80726374e059841963d36c7ae83130444cadc9c080316bf5a830b12d7c6d9a01b2f27f75621afa0e0c063bf069be84e8ff8 SHA512 54fe445bd4bfc55d244ba6ba9888ea556b1a93b384be1f935ae3e93dc6d9e07167fa0fa07365d7fbc89e0a4924a40ea10fdc63d2ebf55f8d5f0d2ed90848a607
-EBUILD HTML-TableExtract-2.150.0.ebuild 581 BLAKE2B a49464257b693b84ddc3ae2540d2da98b468f4b2c826000eee77f87a05259922afad960afc860da0d7192ba7d57a633f12415387195b9756fb34e83e596923b4 SHA512 27068ebd0ec31ebb399ebd34fb0ad03982c1cf3644777df2adafc585a682470f4a7e088145b2a3eabb950185141b9223a1cfb95eac77f9d4c85e3374869b353d
+EBUILD HTML-TableExtract-2.150.0-r1.ebuild 575 BLAKE2B 017612d25b1a14e52929b4cab06b7ed068ff8cece76540cfa452d45716337ae12dc0935c2c978a294289d6274554739f1d28eaee6ba390c850ada3b783d096c4 SHA512 fb5b3ce6214889fb0722319fdc0f05f83033370ac99a214a0563fb2b8b91ebd49a726790543d9aff7ccb5ac61cf05adda53660fb4776f191f6619ea0f78a617c
 MISC metadata.xml 631 BLAKE2B 4544a38d4491ef354fcd63bcf67a4637de4530ce349205ed8d862f636fed4e2eeffdccfe2a513d4ccaad9a9327a9aadd9c414876c261a6cb0382e727346634d6 SHA512 73ad1a7440b00eca33ba693979fda0ba230047c221f317417483a08b1d8986fd20ff92da416792b6a4d6328976470e1904b09e15d8b5113e5d2c3825d4064b0c
diff --git a/dev-perl/HTML-TableParser/HTML-TableParser-0.420.0.ebuild b/dev-perl/HTML-TableParser/HTML-TableParser-0.420.0.ebuild
deleted file mode 100644
index 328fd43b5041..000000000000
--- a/dev-perl/HTML-TableParser/HTML-TableParser-0.420.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=DJERIUS
-DIST_VERSION=0.42
-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
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
-	virtual/perl-CPAN-Meta
-	test? (
-		>=virtual/perl-Test-Simple-0.320.0
-	)
-"
diff --git a/dev-perl/HTML-TableParser/Manifest b/dev-perl/HTML-TableParser/Manifest
index 31706266bf0c..d941ae5c78b2 100644
--- a/dev-perl/HTML-TableParser/Manifest
+++ b/dev-perl/HTML-TableParser/Manifest
@@ -1,5 +1,3 @@
-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 508 BLAKE2B 504be2182aba8491f7ade95e37875b1ea283cd67f9806082ea8fc2afbe616db1b77c2044aa1fcb1c063acf81a0a2b60773d9642c1f671be08e88e01bf7bcad04 SHA512 8e8dafa3bb1ac7eb2e90f79c51bdb9f241efaa8bf3e15d3c9471bbb70c2bca764e7f7d5a76e715183c5cb3d0b47ff22e89284dbdb8114456b5d5215a00018ca7
 MISC metadata.xml 476 BLAKE2B 5c03da9dd21d5b093c059b438103fe16aa34ec07226c19c157525ad7b74ac885b2b86fbdad00bba073cafb57a276bb28ba3796c888b7c462909f149ca0df85f8 SHA512 599bd2fed0f4f25132859c20bb1e3a03c35c6d8e6dbd59d0f5b621fde8f410155c9e796f059f9b951f99da62a134a2b39d9c86fe27f3d880b0ce330d85b1b3d9
diff --git a/dev-perl/HTML-Template-Expr/HTML-Template-Expr-0.70.0-r1.ebuild b/dev-perl/HTML-Template-Expr/HTML-Template-Expr-0.70.0-r1.ebuild
deleted file mode 100644
index 4cc96417be10..000000000000
--- a/dev-perl/HTML-Template-Expr/HTML-Template-Expr-0.70.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=SAMTREGAR
-MODULE_VERSION=0.07
-inherit perl-module
-
-DESCRIPTION="HTML::Template extension adding expression support"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-perl/HTML-Template-2.8
-	dev-perl/Parse-RecDescent"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/HTML-Template-Expr/HTML-Template-Expr-0.70.0-r2.ebuild b/dev-perl/HTML-Template-Expr/HTML-Template-Expr-0.70.0-r2.ebuild
new file mode 100644
index 000000000000..efa6dc81724a
--- /dev/null
+++ b/dev-perl/HTML-Template-Expr/HTML-Template-Expr-0.70.0-r2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=SAMTREGAR
+DIST_VERSION=0.07
+inherit perl-module
+
+DESCRIPTION="HTML::Template extension adding expression support"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	>=dev-perl/HTML-Template-2.800.0
+	dev-perl/Parse-RecDescent
+"
+BDEPEND="${RDEPEND}
+"
diff --git a/dev-perl/HTML-Template-Expr/Manifest b/dev-perl/HTML-Template-Expr/Manifest
index e8f135617457..8d88736a0b12 100644
--- a/dev-perl/HTML-Template-Expr/Manifest
+++ b/dev-perl/HTML-Template-Expr/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-Template-Expr-0.07.tar.gz 19540 BLAKE2B d3c9e44e4b10a4bd97bb59ea35cec459f31f49d487420e346cc3aee40ffe6bcf0a675d74e6821e81f3d2486c04f52a0ba17f942f6cbfa37b7be466df92fedcdd SHA512 965e684a19160d0ca78be94736583a1402666b422432655104ead87c4b9bac4486b97ffbf21ed1f21006feed3ebf25a8dc9e8d6a1e9e1919c6a6f2bcc49dd85c
-EBUILD HTML-Template-Expr-0.70.0-r1.ebuild 387 BLAKE2B c465bce1a609a5da1367ce9bfcf6718c1ad200ef29ef969311eba5c40f1ccfe7e46061dc4ffe599787cead5c00d15a7e94b4bbb9ef25b3ac78590c0e4c5a6a30 SHA512 a8b5f0bcde9c71da74d816661bba89cbea586dc788493eb7a72d032cb01659e3f544fc0902d41e4f4ea3723ddd509bc0c5f9d6398530cf5bd75e4a7743821fed
+EBUILD HTML-Template-Expr-0.70.0-r2.ebuild 366 BLAKE2B 3796d45ad9917bd90005e19f98267ad66ca57e0eff27700ef5772c921349e5c5a48b04d63c36f254d2c3a302ca4dfce8da5fd665a93db6d9ed26001150298004 SHA512 f935f0b8baf4d8c43faf5c8bdb51357866356e62cb3e1211f0654c406ac31612d393f7a2452d98a6ad655ebb8cd0a649e6efa75566afe61ea07294d4c8d2d280
 MISC metadata.xml 410 BLAKE2B 4ab116c7178d0847ee603b56562ea2a6e17ff7a68e5dabfd3d17ecf85d4309322b0fb8756727ed68ff81f5283b7acdbc42cbc5257ff2816da355b609c325158b SHA512 eb17f90795dcd35f1ce39884c34e76fb5aded01c18a5ca545bb3e3367d4562f112175ea5c42c0670e57a74cf63522fab26be854d61a7730d89f7e2e8c4ed58f8
diff --git a/dev-perl/HTML-Template/HTML-Template-2.970.0.ebuild b/dev-perl/HTML-Template/HTML-Template-2.970.0-r1.ebuild
index 852ebfe53564..f4a4e3e6c232 100644
--- a/dev-perl/HTML-Template/HTML-Template-2.970.0.ebuild
+++ b/dev-perl/HTML-Template/HTML-Template-2.970.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=SAMTREGAR
 DIST_VERSION=2.97
@@ -12,8 +12,6 @@ DESCRIPTION="A Perl module to use HTML Templates"
 
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ~ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	virtual/perl-Carp
@@ -21,7 +19,7 @@ RDEPEND="
 	>=virtual/perl-File-Spec-0.820.0
 	virtual/perl-Scalar-List-Utils
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? (
 		dev-perl/CGI
@@ -29,6 +27,7 @@ DEPEND="${RDEPEND}
 		virtual/perl-Test-Simple
 	)
 "
+
 src_test() {
 	perl_rm_files t/author-*.t
 	perl-module_src_test
diff --git a/dev-perl/HTML-Template/Manifest b/dev-perl/HTML-Template/Manifest
index 3c438ee0debe..8366e5e53fbc 100644
--- a/dev-perl/HTML-Template/Manifest
+++ b/dev-perl/HTML-Template/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-Template-2.97.tar.gz 88236 BLAKE2B 266b6d7988e04f4e2c0392c364245944cffbc5816d6038020dd1d9d56d5ebfbf6ce26d286ae6e09b17725faefc3409cadb4c562a5125fb753d59992895d98ded SHA512 e1cb68db24db1692c0fb3838739798e5716340e3e78260ee95614af5bf29ee100cc86bbd15a2dda3bb98c7f2ecdf0e3ff8ca7775171a44d9ed347d7f9c850783
-EBUILD HTML-Template-2.970.0.ebuild 706 BLAKE2B 5b539598aeb6aee352375b1134e13b70f405a5fc08fcbeed433004523509f5e8777fdfc579d07f95786cb8543cd6ce7281cb653b7eae7e892077dc2ea9494412 SHA512 8893bb021d31988dc674666083cfc1120f0d00f6ab5717cdc4224db853a879b5b09ef71a9cfd155c2fdc4434fccaf5fddb131479d49b43e60001f5968c142480
+EBUILD HTML-Template-2.970.0-r1.ebuild 669 BLAKE2B edfdeccf8213e7e067b50252a17d000e8c5c0ea6ed08eb38fd47104aa649535cddf1d15e79af68486977ad3becab38897256e17df1cd2753589f2b6cefea5b5b SHA512 efa4d976d4b5cc16b37a83d3bb5047f4db9fd272d2e7af1ef8e751ed6cb2c0af34811f9d57e74b9f3a4a14ef456b5d0ccaf07201ce4265bd00acc43013a03c33
 MISC metadata.xml 1084 BLAKE2B 36072b0cb89900805959824befdeb1790cc92e50c06db354fb09f5ffd8fde88dcd85659802a46aff0bd8ebecdf22c32faa8a71ca49fc6b73aaf2cf597e8c8220 SHA512 284ab385d4b93bded1afbc4535c5838c5bf740376dca62eb54e747dfeebd5b65b1275afcf365f301bd07f1794a7a98bd45334b13a7652f33371d78716c3c0ca9
diff --git a/dev-perl/HTML-Tree/HTML-Tree-5.70.0.ebuild b/dev-perl/HTML-Tree/HTML-Tree-5.70.0-r1.ebuild
index 3edd78285834..b260098ec75c 100644
--- a/dev-perl/HTML-Tree/HTML-Tree-5.70.0.ebuild
+++ b/dev-perl/HTML-Tree/HTML-Tree-5.70.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=KENTNL
 DIST_VERSION=5.07
@@ -11,8 +11,6 @@ DESCRIPTION="A library to manage HTML-Tree in PERL"
 
 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"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	virtual/perl-Carp
@@ -22,7 +20,7 @@ RDEPEND="
 	virtual/perl-Scalar-List-Utils
 "
 #	dev-perl/HTML-Format
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	>=dev-perl/Module-Build-0.280.800
 	test? (
 		virtual/perl-Encode
diff --git a/dev-perl/HTML-Tree/Manifest b/dev-perl/HTML-Tree/Manifest
index 631fb8c30691..0e7cf6166276 100644
--- a/dev-perl/HTML-Tree/Manifest
+++ b/dev-perl/HTML-Tree/Manifest
@@ -1,3 +1,3 @@
 DIST HTML-Tree-5.07.tar.gz 150477 BLAKE2B ff1cee33e144e8b27b71e26c3fdf4e07b70642533167b8a59feb17729c34c58066f7a5a742de43c879f0101a2adc1302aa84583b536f0e2fa4097f7d240d444e SHA512 a1faaf547d7db323388d5f6b289ab96887de5a80add55aefd380e4b540948514550a86785bdccf0776dfff38085b6bd3e98228f96231264217adcfc2f132c5de
-EBUILD HTML-Tree-5.70.0.ebuild 820 BLAKE2B d6e11c1ae30c7cb37adb35d93ae4694d283d86042873efbf7c86e87cc9d0a86e771e27503d1662be46b514a534a8dbc580ea7f92ef17d1540a1cff6e19770c8e SHA512 3ed40c8a193f961c0e4ac1b975cbeae57ac1deffdad6b03c1bcfbfe42da5ac1cc7b9b98633f14b12c9e74e5b0d5a9c85624a58a8bd4005f8afe1025e08a9921b
+EBUILD HTML-Tree-5.70.0-r1.ebuild 782 BLAKE2B 8bddce0aaff8b787f392773b0ea3736ef14cf216d89613e60b0d06b9bce0a650b70b6c541f1e843fd6b1ba77c80561aa9c57889825bba670ce598928e4ca1be3 SHA512 f85db5584d1d53bb60424993ceb6387564b965bb37c459bfd884fd24b0eead10ced9973c5d9822a7f199dde9ba0078e547a6f3330f2a3ec662d0442bc4d83c04
 MISC metadata.xml 702 BLAKE2B 98efc20c2116006dfade0ec668042f4a78f4f11aeb3309fd9e2bfcc95202871c06cb43fb6f9c2d1e247ca117ecb787d1e6c7da1376fc84ede8dbc822ad909031 SHA512 79010169b3782e344aa0e7989ca8dc33a3ff90d84f8cbd092c1ed6ccfcdcd670ac8f25b6ecdea7e7ee55634fed2158eac9ab98d236dd736e55849aded3e94151
diff --git a/dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-3.140.0.ebuild b/dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-3.350.0.ebuild
index a9a648487707..39c1cb43bfec 100644
--- a/dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-3.140.0.ebuild
+++ b/dev-perl/HTTP-BrowserDetect/HTTP-BrowserDetect-3.350.0.ebuild
@@ -1,32 +1,33 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=OALDERS
-DIST_VERSION=3.14
+DIST_VERSION=3.35
 inherit perl-module
 
 DESCRIPTION="Determine Web browser, version, and platform from an HTTP user agent string"
 
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ppc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86"
 
 RDEPEND=""
-DEPEND="
-	>=dev-perl/Module-Build-0.280.0
+BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? (
-		virtual/perl-JSON-PP
+		virtual/perl-File-Spec
+		dev-perl/Hash-Merge
+		>=virtual/perl-JSON-PP-4.40.0
+		>=virtual/perl-Scalar-List-Utils-1.490.0
 		dev-perl/Path-Tiny
-		dev-perl/Test-FailWarnings
-		virtual/perl-Test-Simple
-		dev-perl/Test-Most
+		dev-perl/Test-Differences
+		>=virtual/perl-Test-Simple-0.960.0
 		dev-perl/Test-NoWarnings
+		dev-perl/Test-Warnings
 	)
 "
+
 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 7696915cf430..bffa38348156 100644
--- a/dev-perl/HTTP-BrowserDetect/Manifest
+++ b/dev-perl/HTTP-BrowserDetect/Manifest
@@ -1,5 +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
+DIST HTTP-BrowserDetect-3.35.tar.gz 122366 BLAKE2B 997962c232419cdbf3ca8a1675e50cbb18190e6f5013156a2da9de47ab939dec81c086a300cca62bd6854a5e9f439ec79a20c5f7fb35ef66f26d57cf68fea928 SHA512 adf2239bffcafc9ae250307173cc3900fca55a4b8860aaefab93090853e5a307902d15cdee459d28c444c4c096f511d1e3f65df51e2f77cee045cbe4a5fc9963
 EBUILD HTTP-BrowserDetect-3.310.0.ebuild 664 BLAKE2B b101d097b772cd857e10085eafd94e8e05906bfb24c5d427f031cc58f0cee5f16af64a20434c726dc960463bb39a99c0dcc2191807588b7907b858e9be6469ac SHA512 b6bf2d714ee37dbcdf531a645945f002e3ea95b31d0ce3a366966845152e7f37cd5f38ea2dc2814d415c40152cefdb86f01fa5f430c0f469041798467863de32
+EBUILD HTTP-BrowserDetect-3.350.0.ebuild 718 BLAKE2B 5b8e860614d00316618aa1a879d4731660e4cedb4f2da3e958036a20ad37b0f31e89e1a06bd9b9d4ac61b5c8d25cbdeac880c4184a5520e4d36bd3cffe0399ea SHA512 7511041ee4d67e4112f087bafd51f63482f8a3304ab0ab697b1c043abac0a309ad5f1d775900af6dd74cdf450c1379476ac11850030f5f1b6da34b75451a6dc6
 MISC metadata.xml 409 BLAKE2B bda1e92d5004df838bb2ad091ae6d2018f183585c3f1ffefc7352a17585ab4a5dab5527c30f258623b4b0a8d7fda031fb5dd6744e0f3d9e24f1e2c87f64ec6b3 SHA512 35ce77d7fb39f33dd8fdfab6e2f9d2e1c8a7e50d9952a2e8df18521fa043cb333aeff72bf4329d985e0465947e88dce05c3def0ae3e52ca57d52b91f1f601d16
diff --git a/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0.ebuild b/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0-r1.ebuild
index 64f3bc62d1f5..e725afec1564 100644
--- a/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0.ebuild
+++ b/dev-perl/HTTP-Cache-Transparent/HTTP-Cache-Transparent-1.400.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=MATTIASH
 DIST_VERSION=1.4
@@ -12,17 +12,18 @@ DESCRIPTION="Cache the result of http get-requests persistently"
 
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-RDEPEND="dev-perl/libwww-perl
+RDEPEND="
+	dev-perl/libwww-perl
 	virtual/perl-Digest-MD5
-	virtual/perl-Storable"
-DEPEND="${RDEPEND}
+	virtual/perl-Storable
+"
+BDEPEND="${RDEPEND}
 	test? (
 		dev-perl/Test-RequiresInternet
 		virtual/perl-Test-Simple
-	)"
+	)
+"
 
 src_test() {
 	perl_rm_files t/pod.t t/pod-coverage.t
diff --git a/dev-perl/HTTP-Cache-Transparent/Manifest b/dev-perl/HTTP-Cache-Transparent/Manifest
index 917c23d25d23..242fee13960a 100644
--- a/dev-perl/HTTP-Cache-Transparent/Manifest
+++ b/dev-perl/HTTP-Cache-Transparent/Manifest
@@ -1,3 +1,3 @@
 DIST HTTP-Cache-Transparent-1.4.tar.gz 10289 BLAKE2B ccbd8a232cb5ff9ef8354d9613a98546efe4e6bacd5c77b9e36affd3ee8e04dd1f5ffae979e9737cf03f3cdb077158683ca7a310cdb06ac019c661595d7a4b18 SHA512 bd48290de4aeffe64cc4748d2f4b054abef539770dd8679f88fd24d9478819c31d7201918335404ea5ed0251d4c4f7d19926ccdeb6b4da2cecf251d2618589a4
-EBUILD HTTP-Cache-Transparent-1.400.0.ebuild 636 BLAKE2B 96a209668afed946e055d6189bdb8f82f3705f81d30d2d54797fde0975a6f3c98fade752b94a30931c1bdc7db97688d8ac5d9d1e02612607e72178dc37c77477 SHA512 2522d926cf6692309c291f23a71fe820119a4b6267c152b65d30535e742c9b13d3dd19b47f9ca964c2854d03192ac56a30ce8e3383707b1591ee344e48671ff2
+EBUILD HTTP-Cache-Transparent-1.400.0-r1.ebuild 602 BLAKE2B 5844564b6049106d8edb7c7595e00303b3a36d42464a76ab49f1e872569236decc821bd60a3561c0516985f2c2e1b3bdf8aa1c1541214fdb304a243844308149 SHA512 fbd659e0eff8792702d41bad009d958996f761619cfcf3dd1a962a5b15534f32fb4bce0a1f190afeaa39a736ac16b8b8ad868155c6a47bea9bcb5e1c9b82f879
 MISC metadata.xml 418 BLAKE2B eca216ff35c08d6d7e0908dc9b42aed104d16542e399f0f55d14dff39751d5f90ae6057ebc3617942165686eaede5bc8e47b7cd269ab6d0ea1abdc7233c5c29f SHA512 0b7046cdddc54ef135ce71eb2e05759c47a866ba1d1c7d557b2bb569b64b2da17fc4e2b29381c319f3e0b3dd5ce72f13f4e564dd67dd932005b242d77bb24e05
diff --git a/dev-perl/HTTP-CookieJar/HTTP-CookieJar-0.8.0.ebuild b/dev-perl/HTTP-CookieJar/HTTP-CookieJar-0.12.0.ebuild
index ec1518bb120b..a7b630431d11 100644
--- a/dev-perl/HTTP-CookieJar/HTTP-CookieJar-0.8.0.ebuild
+++ b/dev-perl/HTTP-CookieJar/HTTP-CookieJar-0.12.0.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=DAGOLDEN
-DIST_VERSION=0.008
+DIST_VERSION=0.012
 inherit perl-module
 
 DESCRIPTION="A minimalist HTTP user agent cookie jar"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test minimal"
-RESTRICT="!test? ( test )"
+IUSE="minimal"
 
 RDEPEND="
 	!minimal? ( dev-perl/Mozilla-PublicSuffix )
@@ -20,7 +19,7 @@ RDEPEND="
 	>=virtual/perl-Time-Local-1.190.100
 	virtual/perl-parent
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	>=virtual/perl-ExtUtils-MakeMaker-6.170.0
 	test? (
 		!minimal? (
diff --git a/dev-perl/HTTP-CookieJar/Manifest b/dev-perl/HTTP-CookieJar/Manifest
index 20e2e930345d..ca92d0c17f8e 100644
--- a/dev-perl/HTTP-CookieJar/Manifest
+++ b/dev-perl/HTTP-CookieJar/Manifest
@@ -1,5 +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
+DIST HTTP-CookieJar-0.012.tar.gz 28223 BLAKE2B 67284519bf19271896625ec577121171d6bb559a7c011f2a8f1e92be537077d1ec5bbd5f4ad043e44c754d5b2a3f2b617e37a87bfef3026533fd442fd9275613 SHA512 3b4b0cd2228d53dfa9c1a75cf108f9b2a328c3bf054f0c7d8308bc0a71375340684b165ab05cb7868cdbeb232e4ceb4b465177a43c7573863e9274f8aa4034af
 EBUILD HTTP-CookieJar-0.10.0.ebuild 831 BLAKE2B 4a73ade9a0b0958ddebe1ee53d2fb9e9364e9e06fce0774d3e6002aa6dbaaf8bf9758edb9b379eb2a45739fb4013dcd8f40264f48ff193edd17345252ccd45cf SHA512 76e289cf04766ce28a48185f93eb3622f128ea1daa23f66559debc679c292e314882ff7ff8ad6a98c34643f55a5eabaab28b55bf063a3f296d1daa93018442e0
-EBUILD HTTP-CookieJar-0.8.0.ebuild 743 BLAKE2B 65a7fe8c6a74580a39fb4007dd5564c57c58c1c6319494a062aab6a63865cbe2078e992f77be6888ace886297e2df71701414d56972dc5688f158c6c57c1a613 SHA512 39c3b9b6d380f9820c1974f925b55819c2ca6767b9fa64a8dc7d2a31db6bdc44d7136ff7352db2e7cb8e3b8e27e57e310430798d4827f9efdf22847416c42aeb
+EBUILD HTTP-CookieJar-0.12.0.ebuild 712 BLAKE2B a6922c9ba5b767b63c32a3daf09749b26efc0e5dc5536bba4d6dabebf81c0bfc4e232047294a33609431b3337e162b5358d93d6d402b7e3da364486f5b552479 SHA512 108055a1a3f715949031c7169dbdafd1a8adee1ad3e308fd2ed368c6fcc512e5d06c6771432dbb024700d1e1d08bd4718ff7ce8e104501ff8818fd467d32906f
 MISC metadata.xml 468 BLAKE2B b2e2c0b06433b5ea89a63c1a64627e081229cd1f108a1bb335b4f7013935aac05772bfc396be234bc30c9bdf3f99b65c5f8a5583318f08f67e456cf8b404696e SHA512 b012ddf554fff7a6da7391ee3472c87246c0a23bdf63d5e949118168f0ca782a3fe5704802a4cd20b455973e4ddbb528699725c30b0862b321eaef9e8b0a41c8
diff --git a/dev-perl/HTTP-Cookies/HTTP-Cookies-6.40.0.ebuild b/dev-perl/HTTP-Cookies/HTTP-Cookies-6.40.0.ebuild
deleted file mode 100644
index a90f99537465..000000000000
--- a/dev-perl/HTTP-Cookies/HTTP-Cookies-6.40.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=OALDERS
-DIST_VERSION=6.04
-inherit perl-module
-
-DESCRIPTION="Storage of cookies"
-
-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"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!<dev-perl/libwww-perl-6
-	virtual/perl-Carp
-	>=dev-perl/HTTP-Date-6.0.0
-	virtual/perl-Time-Local
-	>=dev-perl/HTTP-Message-6.0.0
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-Test
-		virtual/perl-Test-Simple
-		dev-perl/URI
-	)
-"
diff --git a/dev-perl/HTTP-Cookies/Manifest b/dev-perl/HTTP-Cookies/Manifest
index 7d36dd6ff5bd..2192393908cc 100644
--- a/dev-perl/HTTP-Cookies/Manifest
+++ b/dev-perl/HTTP-Cookies/Manifest
@@ -1,5 +1,3 @@
-DIST HTTP-Cookies-6.04.tar.gz 39502 BLAKE2B a6a5de4a992ee246dd0e04594fe47ce635248d7fb004acdd4eb926a84c27a7b69f0b8d5a522460287f1786f3d3f9d8bfd23c933ab7650e8cfaffaf392eecb94e SHA512 e8b24b96e6630f1238e828edfbf7074fb9186a391fd1d129fb65a82748a4cf7d71669fa658c31957560a6faac3e638c8dc7aa3182acaa6fd14f0d56f3968f5e4
 DIST HTTP-Cookies-6.10.tar.gz 42448 BLAKE2B ce261bde7071f34811827099322a0c7282c4f2287ce4baca258d8237dc82ffa5502acbe9ca2a4b76ebe6d8bd0c1facdad5448f1f377390e46c2f4564550bf57e SHA512 c24a986e524ebf5d8b13b4580c3ee6aed018e79c203fd62208bfe970744482832fe9c41bb3195a596af1e11058053ed7615a09a26fbcef4433e270f0f5d38658
 EBUILD HTTP-Cookies-6.100.0.ebuild 719 BLAKE2B ce9c047a5d39a232b9fbb15820bf8075c602cea4b3b399706d97373a60e6b07a581122e79a74b851368c47b34e8efbb4083fc7d0f40738b2ae4f62014f83a436 SHA512 ae249509c74b73aea495cd107e3e432e397c3d05e8a8baa284bdad822900c3359dbc463f73d0aa1039a761e1e0d722719f37463073906fa8c3f285019782b7b8
-EBUILD HTTP-Cookies-6.40.0.ebuild 718 BLAKE2B 220362b746587ae543c10a9f97e33f9042e0047a3c7fe65723701b6d4bbbeb6f7c9c68193b57fd2bfe85f2b67fff36e1728cc20bb6bd45601195958cbd062691 SHA512 d116eaec72e5d0e002d63ef52cf1ab09258a98c8be1cfcb32615ebff4c534bf7e180d91fb1a82ee4afe3ff5ccf032204c2803b54ae71dd631de122aa52be0910
 MISC metadata.xml 538 BLAKE2B 00d8bd5654ccf373c841f1aba00b24f8daea430563678c11d05240da7a490c0fb5143b4a3d2b7084f175d2463ded0ec439131f169b81e177fb893eb94e0a93af SHA512 db97715e85fbc77d77e1e467ff045b5de7fb77b47d3d00ac507068358eb9a1d2da35ce1591f0696d081fbe1ab27a29a11f93c80c58e518fb410cb07cfb9fd67a
diff --git a/dev-perl/HTTP-DAV/HTTP-DAV-0.480.0.ebuild b/dev-perl/HTTP-DAV/HTTP-DAV-0.480.0.ebuild
deleted file mode 100644
index 111c7c54b13e..000000000000
--- a/dev-perl/HTTP-DAV/HTTP-DAV-0.480.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=COSIMO
-MODULE_VERSION=0.48
-inherit perl-module
-
-DESCRIPTION="A WebDAV client library for Perl5"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="
-	dev-perl/libwww-perl
-	dev-perl/URI
-	dev-perl/XML-DOM
-"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/HTTP-DAV/Manifest b/dev-perl/HTTP-DAV/Manifest
index aca78044cf11..6949120d06d5 100644
--- a/dev-perl/HTTP-DAV/Manifest
+++ b/dev-perl/HTTP-DAV/Manifest
@@ -1,5 +1,3 @@
-DIST HTTP-DAV-0.48.tar.gz 105090 BLAKE2B e0a88e186ae26d3240783aeed91b3da786b1ad21e31f9293c361147c540bd513cfd1f570b9dabc77301c5310ca65128c1574cc342bd5512fcf7e6340c97eabf2 SHA512 2edf92791660b1996eb22b9ea68bd4e417c497afeebb56cb0a2ecf0cf72ea54b6fb8efd4d69dae1dcb946517f917593932a8040bd0ef5cfc83f7fdfd1fe3ccf8
 DIST HTTP-DAV-0.49.tar.gz 107841 BLAKE2B 202a37766a949441417e6e88de02dcb238f811408f16cc86ebb5187f0cd0c8b780e322b3704dbc115225232c1d815cbe9d5fdb8ac7755e222c7eac5357ea0a81 SHA512 01a097f47d95090fd0fd08a44b440d0ed4f2f04e0bedc41f8e2abedf1879e7cfcae6cf5cf7a415ac89dc610cf0cacf4f75078586bbf6a818f8c6dd36ccb451f6
-EBUILD HTTP-DAV-0.480.0.ebuild 372 BLAKE2B 4cb11d906a11e262f2c695a2b1540f018e69e13299917110ba91d0da4455f86a88aae3692fefb85c0ebca3876463d2c496b1c58399bf10274548b8d44ae2556b SHA512 dfafb88a030a4f8ad85e4d187ca1da707c37d37e59a4951f86cd90d420bc91ead8c24356dbf668032849f02df08d77016333aabe718c7893c7d2c68c8561d6a3
 EBUILD HTTP-DAV-0.490.0.ebuild 435 BLAKE2B 2796ef0d74a14e500498c375e3003f364c4737dd85a36b998ee64ae9fe8d87897f4e1f0383b559899f91acaf2b9bf1848317cc3875c7e90875872dd95289033a SHA512 3d14a8e1f2c3d71b57331acd1d9f91c00b787f21e861cfa5c88583a82ed5fb352633a490d1d379d880c0dca76795f27282ef525ba57d8c2adb257a317c18d577
 MISC metadata.xml 911 BLAKE2B 6702010d6814956b0c6749f56f37d6d0252d2ed6ef45117d89f80eeda2ba8cc6623b84bb7d3b082e2ea7c83169a080b8fad47b5fc84ec675cb303ee867f0e371 SHA512 f5970d806f19eeee3ae089e701e2a7f6284e590161a761347770874dfe30ddd70165b0d5b7903abfc3e28602a7d5bb94a8c94fcb5cd1613a3b525e895b701af7
diff --git a/dev-perl/HTTP-Daemon/HTTP-Daemon-6.60.0.ebuild b/dev-perl/HTTP-Daemon/HTTP-Daemon-6.60.0.ebuild
deleted file mode 100644
index 36e0fc57d1b0..000000000000
--- a/dev-perl/HTTP-Daemon/HTTP-Daemon-6.60.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=OALDERS
-DIST_VERSION=6.06
-inherit perl-module
-
-DESCRIPTION="Base class for simple HTTP servers"
-
-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="
-	!<dev-perl/libwww-perl-6
-	virtual/perl-Carp
-	>=dev-perl/HTTP-Date-6.0.0
-	>=dev-perl/HTTP-Message-6.0.0
-	virtual/perl-IO-Socket-IP
-	>=dev-perl/LWP-MediaTypes-6.0.0
-	virtual/perl-Socket
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	>=dev-perl/Module-Build-Tiny-0.34.0
-	test? (
-		virtual/perl-File-Spec
-		virtual/perl-Module-Metadata
-		virtual/perl-Test-Simple
-		dev-perl/Test-Needs
-		dev-perl/URI
-	)
-"
diff --git a/dev-perl/HTTP-Daemon/Manifest b/dev-perl/HTTP-Daemon/Manifest
index 5a3f518baacd..a0f80036ec3e 100644
--- a/dev-perl/HTTP-Daemon/Manifest
+++ b/dev-perl/HTTP-Daemon/Manifest
@@ -1,5 +1,3 @@
-DIST HTTP-Daemon-6.06.tar.gz 45576 BLAKE2B 3f5a5eaf8fd89422cad916cbe384ac45989147510d171d9496937e732fe83c8c5a5514d03c468415358a575326aa86fc78d8a135b8c7602560923511268fca67 SHA512 8e6dcf4451aaa6bd5f38508a087e5bb9b7f5105e8e243d09bdd3f4be3d7009222b3d9f8e494f049b48f0caebf36f239b8bbc7b8edc805f7d32b1bbeb38431732
 DIST HTTP-Daemon-6.12.tar.gz 47117 BLAKE2B 54b494ff3976af427c899b2db6f7b4dad27fbf441e4b821c5185537f6661e5e10cd6a52f2faf07ef5843dbbfe86b8c8c86abe478663553d16e9b1b4a19dd791d SHA512 83a8b868162dfa1be66d4267e99af1111d28122c793e89d905243c175617c22ceb66f88b6ea54c29e7b131c26668776ab24cf671c4cc6c1c8810505e0f072596
 EBUILD HTTP-Daemon-6.120.0.ebuild 952 BLAKE2B 90711d533c21ab5249ae7229ac9df359fd3e2fb9f4210f9f037b8ecba43f8b256a46b0c59ef419afdba4260bb03dd9259824142664b9acbc6fe83f4617bc5406 SHA512 dd21be4508923bfaa781ffd931b3fc3d4515f7696d69bc07d3613834661bb0340d0fa3cd3924b6f2efc0c8991e42be2e105256b0497e2d42d5934d6ba447f18f
-EBUILD HTTP-Daemon-6.60.0.ebuild 897 BLAKE2B 8bcb7960c7e8a138a6d13cb91a08fa7897ba4c34f099565ee591265450828c09a207b009b0b7d816ad7cc3d16c85a523ccadacd540be53e8883b6b3a6966dfcf SHA512 d8b1e4765d2a545a53c8f931be914617d447b2e4ff3b14d6d925032c77db5cc17d8c73a241677e00c12b95ec88afaa6e11d481c987bd76dfe3fe8adf47d82e9e
 MISC metadata.xml 452 BLAKE2B 1b10326b32fb64392656299369c668b30d9ab252d92dbd7a6a3c07253af72d1be090cc3d90c629d19e7e3236995a4963316068137d56969a5b1fd3150e138824 SHA512 e4ec899dd68c1111d6fe25a701fc727fd65dd260d9f0ab6074360a5ae1e93cccd5dd8ff18af8434001845181707aea4a43fae4cf83c36399400d5664dacdef23
diff --git a/dev-perl/HTTP-Date/HTTP-Date-6.20.0-r1.ebuild b/dev-perl/HTTP-Date/HTTP-Date-6.20.0-r1.ebuild
deleted file mode 100644
index 4fe24de8401d..000000000000
--- a/dev-perl/HTTP-Date/HTTP-Date-6.20.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=GAAS
-MODULE_VERSION=6.02
-inherit perl-module
-
-DESCRIPTION="Date conversion for HTTP date formats"
-
-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=""
-
-RDEPEND="
-	!<dev-perl/libwww-perl-6
-	virtual/perl-Time-Local
-"
-DEPEND="${RDEPEND}"
-
-SRC_TEST=do
diff --git a/dev-perl/HTTP-Date/Manifest b/dev-perl/HTTP-Date/Manifest
index 2dd99849db80..a25e1a7761f1 100644
--- a/dev-perl/HTTP-Date/Manifest
+++ b/dev-perl/HTTP-Date/Manifest
@@ -1,5 +1,3 @@
-DIST HTTP-Date-6.02.tar.gz 7319 BLAKE2B c56c349c612d88b90324ec2379beadcd0238e448f83fb2bed7f758dc4fb3d234d4f4cf203c86f3260692ae7db1e1deaf22152c6d7fa9d34a2c835425d0d06d32 SHA512 056d2ff01482922a644757f04cb924d60fa15b86873fdea02e65c78c8af2bbf3f184495852b579eb4fc86bc44f8a5a52f785ab800cc554431ed3e2767e858232
 DIST HTTP-Date-6.05.tar.gz 29673 BLAKE2B 680af1a4ea45160c15a5d086275b5157a091c7816bf5def67c413690c97756946e24d436c50d664e2f8809cd4ac8054e24466d2ef4127b4b09bc681d6b19a404 SHA512 08a427a860161cd0d7a34a4fa3eb6bf6439c2504478a308ff560de0e6620c20df46f004cfcb719e3d19e35fdb650728d6983ffce1423f4d9da06f91d85c7b927
-EBUILD HTTP-Date-6.20.0-r1.ebuild 546 BLAKE2B fa4a1217d43a75679887bbb2071fb3ad04aedc6d02adbaf9ab2f5662f28fdc29379d189d90ea89d49201abe8584faa744db811fbe4ecb3a97a0184dedcdbb705 SHA512 2ad1cc782b4469e711c893b5de98437c3ca3938de445fddbf98e31a2e06f275be13fbc4e61179e11b10e4b9637b33346f85a59bf95b21a51ed4a6db410830803
 EBUILD HTTP-Date-6.50.0.ebuild 611 BLAKE2B 6b39afbcce757a842bb783ed82787c3f4501949667a625a611e89afe8c3752e8d0a1376cd2a53ed6c6a1482ae839ec3aec3698b6fc4cab531f9fb404a5f40960 SHA512 bf404763b8936fa1074828d3ce2215d4b48455489024cab4a0dccae057b2d974b25077c7a837aa8a80e358c932e648542c6febf62e24677dcef0adfb64eeb7d1
 MISC metadata.xml 379 BLAKE2B 2c0f0627932dee277c0ad0564dcbd8a0819a3a846d6f024d92a5971f2f226f377900cd984fea97ddfb917de2a17f3666b9ed20a902b7d3ba19329e9ae38dde26 SHA512 cde3ed4300f0f1d3d9e0350671655ac8b55c270accf79faa9688b4ce1713874fda2846a9f91d527f73b467f9a03020c08453b27e836fe0f68b9998a0639eb74b
diff --git a/dev-perl/HTTP-Entity-Parser/HTTP-Entity-Parser-0.200.0.ebuild b/dev-perl/HTTP-Entity-Parser/HTTP-Entity-Parser-0.200.0.ebuild
deleted file mode 100644
index 6c3d42870e60..000000000000
--- a/dev-perl/HTTP-Entity-Parser/HTTP-Entity-Parser-0.200.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=KAZEBURO
-DIST_VERSION=0.20
-DIST_EXAMPLES=( "eg/*" )
-inherit perl-module
-
-DESCRIPTION="PSGI compliant HTTP Entity Parser"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE="test +xs"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Encode
-	virtual/perl-File-Temp
-	dev-perl/HTTP-MultiPartParser
-	dev-perl/Hash-MultiValue
-	>=dev-perl/JSON-MaybeXS-1.3.7
-	virtual/perl-Module-Load
-	dev-perl/Stream-Buffered
-	>=dev-perl/WWW-Form-UrlEncoded-0.230.0
-	xs? ( >=dev-perl/WWW-Form-UrlEncoded-XS-0.230.0 )
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-Tiny-0.35.0
-	test? (
-		virtual/perl-File-Spec
-		>=dev-perl/HTTP-Message-6
-		>=virtual/perl-Test-Simple-0.980.0
-	)
-"
diff --git a/dev-perl/HTTP-Entity-Parser/Manifest b/dev-perl/HTTP-Entity-Parser/Manifest
index efabb63d058e..6006b39b398c 100644
--- a/dev-perl/HTTP-Entity-Parser/Manifest
+++ b/dev-perl/HTTP-Entity-Parser/Manifest
@@ -1,5 +1,3 @@
-DIST HTTP-Entity-Parser-0.20.tar.gz 23662 BLAKE2B d003bf695e32084b524a9e56327b5485ef2d8d4f608d55c776b960372165e2139cddd8a8db609c59f40ef84c979eb42c3af010fc36f3bd52945a6a88417396fc SHA512 c80d9058b8682c51a0fe3669249cc219142e674959237d8ae6bd435afafc16c92a38328329e9b09a25af8a79fec5bf01050145d3c63dd81b15ad9d75946fdfc6
 DIST HTTP-Entity-Parser-0.25.tar.gz 24307 BLAKE2B 6c8e7d6dfef9c023ea9e6270d12c0790711a03bfe783ae7be0550b83859d03ad94515981f3b87887d2174ca45b1d3cbbee427064f1377f28e0a7d09c2942de2c SHA512 760bff3ddd818ecb8eeeaee86c2d2bd895820b4011c306135b2d6eb3c2519322b3bd4e20098c9458c2fec7dd944384dcd33bfdd5b2d368a28270ac14e8dab54b
-EBUILD HTTP-Entity-Parser-0.200.0.ebuild 797 BLAKE2B 1b5a485bd48788be00f5649a545dfd5a5c059f256a9bceb330f3335fc10073031e5aed6d3f7b4d9d3881bbeda75f4135add18cb26ef7a4183ca38ea9b8e35b87 SHA512 75e6cd0a2cf322a13ecf3a9ce41536c3361043565fb76a9b55024ab2a875b5a0f2d8ece882eda07d39f93d877e121310f7f26a839224c4c3509952e5acb69599
 EBUILD HTTP-Entity-Parser-0.250.0-r1.ebuild 766 BLAKE2B 1fb0f16ebddb7b899739d7687c7da5e919de4a68d6f8253a9a174b68b9b93a5e8a264acedfa037c4dbea50e3eb3400a9974940a2309a708f39ddf03f9300354a SHA512 67b36bdaab97bed1042d88c8ee668de44d6da1f63c4499dade725782b645876527a9e883ef6e03be5310cd6dc28c3b9ccfd121d4a59cbc3b6297ae43ea76e02d
 MISC metadata.xml 815 BLAKE2B ae4e50ff437df8014acbbd1ec2b8d888953647423c030ca6fff757edc51a47b95d60d3da9d3aeac3b5b165180a22f8fab093dcb0bb6c44b21c17d660eea25790 SHA512 4e649faa0bc9dc7c207dfc501760bf6d4530910bc0fcc8e7f30d2be768c51ac6d390021124a3abca5c939bf1026ab22f994fcfae1d72fa26061edbb76e7102dd
diff --git a/dev-perl/HTTP-Headers-Fast/HTTP-Headers-Fast-0.220.0.ebuild b/dev-perl/HTTP-Headers-Fast/HTTP-Headers-Fast-0.220.0-r1.ebuild
index e740d7a622fa..48fb2a111ccd 100644
--- a/dev-perl/HTTP-Headers-Fast/HTTP-Headers-Fast-0.220.0.ebuild
+++ b/dev-perl/HTTP-Headers-Fast/HTTP-Headers-Fast-0.220.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=TOKUHIROM
 DIST_VERSION=0.22
@@ -11,13 +11,11 @@ DESCRIPTION="Faster implementation of HTTP::Headers"
 
 SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-perl/HTTP-Date
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	>=dev-perl/Module-Build-Tiny-0.35.0
 	test? (
 		>=virtual/perl-Test-Simple-0.980.0
diff --git a/dev-perl/HTTP-Headers-Fast/Manifest b/dev-perl/HTTP-Headers-Fast/Manifest
index 2242fc25233d..9dcea3dbba5c 100644
--- a/dev-perl/HTTP-Headers-Fast/Manifest
+++ b/dev-perl/HTTP-Headers-Fast/Manifest
@@ -1,3 +1,3 @@
 DIST HTTP-Headers-Fast-0.22.tar.gz 19730 BLAKE2B f221f2090a4b203a690c54fef1d376e430db486b80f521ae6286179db7ac279e68f7901c611ca7dc3b60eb64419fcdcd5cab9bb7b0ec159bbb1aa73e480bad19 SHA512 60435c11b5846c1a6256227c7edb00fd444c76346797424f186f971c5bebec93b1c84be805e0a4589c92b8c571d0c3e0332436b21ad099677a31544305d819b2
-EBUILD HTTP-Headers-Fast-0.220.0.ebuild 491 BLAKE2B 33a4f5270af01b18a4c0431dbfdd6a8f469c25fc7350fb9afb7dcce094d805e31520cc44a6671900c4d25c4a26ee202464a08dbba506c2fe7e24adbaa375d6c1 SHA512 a05ff0009de355084574cd52d3728acf22c0d0098fa8031605bdc4f6a8387991ba06d1d6175bcc212f96e21f9f231fabeeef963bf0acdcbb37b779874b2650c8
+EBUILD HTTP-Headers-Fast-0.220.0-r1.ebuild 453 BLAKE2B cb0867bf0f111806513c8c02e9ecda83b5aab3f2688e6b9761c57f8499b8e7041c0735956badbe426d20b27003b83209de4cd084a9bd40581cd02f824a541043 SHA512 bedc4cbc53760a6937b3c021ba7cad38cb36b145a86f0ac1e9aee632f709e6d1c9d9fecfec8a676d71c5f3e1bb8f08f5e832c027269e4610b2ca21f4d049c9b1
 MISC metadata.xml 408 BLAKE2B 00247e0528f7d8f149d7809039856db0cde7b55180b50811e1fe6af831001a6db9ef830fb5be441f85decb8faa7b0173b7eda859356c2739bbba0d5e1f05be04 SHA512 f51d3f74fc120b6dcbba4edf2b006bc91666e5c4b22ec2b6ed210b5ac624de41279e575a40ff6f56aebd310f60180220322171c0565152b6e2f921b9b01f3470
diff --git a/dev-perl/HTTP-Message/HTTP-Message-6.330.0.ebuild b/dev-perl/HTTP-Message/HTTP-Message-6.330.0.ebuild
new file mode 100644
index 000000000000..5e9c8a6009b2
--- /dev/null
+++ b/dev-perl/HTTP-Message/HTTP-Message-6.330.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=OALDERS
+DIST_VERSION=6.33
+inherit perl-module
+
+DESCRIPTION="Base class for Request/Response"
+
+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="
+	!<dev-perl/libwww-perl-6
+	virtual/perl-Carp
+	virtual/perl-Compress-Raw-Zlib
+	>=virtual/perl-Encode-3.10.0
+	>=dev-perl/Encode-Locale-1.0.0
+	>=virtual/perl-Exporter-5.570.0
+	virtual/perl-File-Spec
+	>=dev-perl/HTTP-Date-6.0.0
+	>=virtual/perl-IO-Compress-2.21.0
+	dev-perl/IO-HTML
+	>=dev-perl/LWP-MediaTypes-6.0.0
+	>=virtual/perl-MIME-Base64-2.100.0
+	>=dev-perl/URI-1.100.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		>=virtual/perl-Test-Simple-0.880.0
+		virtual/perl-Time-Local
+		dev-perl/Try-Tiny
+		dev-perl/URI
+	)
+"
diff --git a/dev-perl/HTTP-Message/Manifest b/dev-perl/HTTP-Message/Manifest
index 9a619be709bc..6f0aa1c11cd7 100644
--- a/dev-perl/HTTP-Message/Manifest
+++ b/dev-perl/HTTP-Message/Manifest
@@ -1,3 +1,5 @@
 DIST HTTP-Message-6.32.tar.gz 88711 BLAKE2B 765d6ee3053c91448cd3023d87cf3bee23f107ebb10f2ccb77f064b7704c92a81f3268612e23266bb3e28a7e2810238be4da9475e93304a04dab4752ef57e789 SHA512 359a0d51e65d721d8167dea05d7aa9853d07eb4a4093735cf5f45814117070400cce93d60b08dcf92cfe0fbc98e7455e7facaecbfcaff44cc0e619fb621b3288
+DIST HTTP-Message-6.33.tar.gz 89245 BLAKE2B 4a200c634c261ca7c5721bb786277712b15f1dc662543136aa8c8508be149ee520cd192afa0290756e6c1db94f6361348f0357099d3a529ad14dadda777bd5fc SHA512 8c27560796cc28f7db8e5c54a8fec0d21e5bb4d775d1d0d9fa791a7f5b51e523ce4e854facee82211d989f1cacc6f69af53dba23f4558ef0c947add6b35f8314
 EBUILD HTTP-Message-6.320.0.ebuild 1081 BLAKE2B f38d71071530731976faf35cfc33ace0545f8cfbbf12d6f2ce490a3d777b86054deaf927dec29b108f97d5cdc96e20a622cdaaa41d1a733fc8d4b7ab8545713b SHA512 8fe992ed0c36beaffcb4c6b64efcda04e5c1ae638ce6681736c2cb6cd8c88776fa987577aaa95ed3b2bc4f9719652d82ce33ec0b0ed32a9b3774f88899481969
+EBUILD HTTP-Message-6.330.0.ebuild 1054 BLAKE2B 67cfd74aac6df54d9a426f6d8323f5775dc106afe477a5ac2e41375f58f3e3f097e6364c39648d62704da4e5e4eb8c98952e75b86f401b1b4bbe6f8144bce7c1 SHA512 ffa1833b48b0e623d9a2091592c77fb9b49aac4a136a985377cc0b63404877ec23c00c58da3e1df4c73ad5af033f09c73adc38f12b0bd5a5736a951f19c62fe9
 MISC metadata.xml 932 BLAKE2B 438b88bc3420819cac276c499213c2492ba5826789e8ec46969956a90d00555a1caf65a99f60c2a91a9e8a029e8c06b21dd021644a31d7ba74cf58f838869867 SHA512 9870c1629ea3e3865f4bee3743a4c560f924b238c0c23d4cbb58b9dd388be79afe9567ae89e5f62ce407d372ec5c7caae9ac9626980f5806919a713bc9f3557c
diff --git a/dev-perl/HTTP-MultiPartParser/HTTP-MultiPartParser-0.20.0.ebuild b/dev-perl/HTTP-MultiPartParser/HTTP-MultiPartParser-0.20.0-r1.ebuild
index d537072c5e0b..a4cc3c78f0c5 100644
--- a/dev-perl/HTTP-MultiPartParser/HTTP-MultiPartParser-0.20.0.ebuild
+++ b/dev-perl/HTTP-MultiPartParser/HTTP-MultiPartParser-0.20.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=CHANSEN
 DIST_VERSION=0.02
@@ -11,14 +11,12 @@ inherit perl-module
 DESCRIPTION="Low Level MultiPart MIME HTTP parser"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	virtual/perl-Carp
 	virtual/perl-Scalar-List-Utils
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
 	test? (
 		dev-perl/Test-Deep
diff --git a/dev-perl/HTTP-MultiPartParser/Manifest b/dev-perl/HTTP-MultiPartParser/Manifest
index fef7725590fb..3a57037704eb 100644
--- a/dev-perl/HTTP-MultiPartParser/Manifest
+++ b/dev-perl/HTTP-MultiPartParser/Manifest
@@ -1,3 +1,3 @@
 DIST HTTP-MultiPartParser-0.02.tar.gz 30258 BLAKE2B 6583c0c5db6137390e1f69bcea3d6a3b58e5293e093da10c7b19d3eaf4a2ea606e8de151260ff8316f747296a183f0d232298e387cd9a3d9245b571b5afda1de SHA512 72a9e92821dae04be63f12b3bbcd22dfbc11ff72ff31b48f2e2bd8fe3095c9cb7992f31deeb1284d7f9986cbcd854f8a21c2110c1d04bd4c3b66307c9d86945d
-EBUILD HTTP-MultiPartParser-0.20.0.ebuild 542 BLAKE2B 0a9051ac28e4da0f99ab174555d53d08824f526d5d25b55c80d2f2911f9b9b3547d95bda233f419ef025a75458d50c00287ab76a3d77655a4029f921b762046a SHA512 8e9e668a521e016497a99400d66a97934abef077e7307f534b05747a4a737a8dbd9ad5e156b9348775b93096724155afdc1bb74d90c9336e909ab088c1ddf6a3
+EBUILD HTTP-MultiPartParser-0.20.0-r1.ebuild 504 BLAKE2B f8292d6a8080506b3fe14ba96b45f2b95e86beb7f565ff98852aee10794676f55990a41332e1dafa0f28a7b03a3d0ec4ff679a3cb3f7734f87d4fecc158055c6 SHA512 d61cc0afc6e454401b149807f3131bdd338af13e2e2dd3ea1496c9e8d8eaadaddb6c1b8efc45572412215f28485d11efbe5a211f8ed6eb225198b3aefb9ae96b
 MISC metadata.xml 413 BLAKE2B 4c12c47a1dae024cd2b82c28708a125ee2293b04d5a08b978679bf456c058173c2d164b3ae46b2eb9b1910b7dbbd12dc78c7435a80f0368ef70327b8a0db4450 SHA512 85482be5499fa6d75d1c779d815d088c09b9bddf201ced94fcbb0de2aa1252556e957e93dd226e73bc3bad0b987ce12a9644717583efed961ceb984de1d3e51d
diff --git a/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.10.0-r1.ebuild b/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.10.0-r2.ebuild
index 84c0de40592d..fa9e661da9ad 100644
--- a/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.10.0-r1.ebuild
+++ b/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.10.0-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=GAAS
 DIST_VERSION=6.01
@@ -11,10 +11,10 @@ DESCRIPTION="HTTP content negotiation"
 
 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=""
 
 RDEPEND="
 	!<dev-perl/libwww-perl-6
 	>=dev-perl/HTTP-Message-6.0.0
 "
-DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}
+"
diff --git a/dev-perl/HTTP-Negotiate/Manifest b/dev-perl/HTTP-Negotiate/Manifest
index a851aa4ae719..53fb73e85987 100644
--- a/dev-perl/HTTP-Negotiate/Manifest
+++ b/dev-perl/HTTP-Negotiate/Manifest
@@ -1,3 +1,3 @@
 DIST HTTP-Negotiate-6.01.tar.gz 8596 BLAKE2B 157e6470dabf0eda068aba69e3e53fe28a9a38634df6ae77fc8354e6e190629ee90f81e1cdacd0018d0ca5183183db6960ebeac5d2d536d800a7dadc23775dcd SHA512 2651010f0d989fb255d37a0e4585de4779edcccd59fcad7d7f5ccc7d2c2ec420060324beebc880664d6c0d29193ce62f2d21cb6332bbfa0a3adacfa632876617
-EBUILD HTTP-Negotiate-6.10.0-r1.ebuild 510 BLAKE2B 2dcd764e3b91b3c3afcc0e15115754ee38e122d2ae6286f1e0081eeb3c441b9d6b6999a04ddb52e6186002bb9eb9714b1bde29d158b88b2c5920b1ee3cd50552 SHA512 9966fbccf90fe9e37ab32173aea1efbbb61f86cb86c9b7142fcc141cb680877fcbfecb7d417116aff2dc1e92238135047474dc53093216aa951032bbc2118a2d
+EBUILD HTTP-Negotiate-6.10.0-r2.ebuild 504 BLAKE2B 219b09932af329902bc9bc211e2fa11b61b01581fb311ae2e8538b08b22b571fa5ebd54ff868ddcc058e258ac09387489b4c0c5e854352f3dbe03b8f7406869e SHA512 5adec55e0c7a7522bd11e1170342579e92e42077e470984518c55f5b3f4c5771cdb5568d905775f0c112b2886a9316b3f072da4ac1f9374aea393aedb85d2005
 MISC metadata.xml 389 BLAKE2B 751657c56f96d0fcfb68954260f9dc7c6d91b5562649d2f82ead4031f18004c36d0af134fddfd31d3573ce9fbcf262f857692b0ab42bfea1f6c8dd96f0d729a1 SHA512 3a01968fcfc18b3b032ad4db8f81dfaa09c45dd3bf14ea3ea0294f048ef042504b2ec4ebd4dfb76ce14b24f26ad5a6ca69b2bd556cb7fd31f5b79e99e3af06b1
diff --git a/dev-perl/HTTP-Request-AsCGI/HTTP-Request-AsCGI-1.200.0.ebuild b/dev-perl/HTTP-Request-AsCGI/HTTP-Request-AsCGI-1.200.0-r1.ebuild
index 1a5072fe2e05..f2a289880530 100644
--- a/dev-perl/HTTP-Request-AsCGI/HTTP-Request-AsCGI-1.200.0.ebuild
+++ b/dev-perl/HTTP-Request-AsCGI/HTTP-Request-AsCGI-1.200.0-r1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=FLORA
 DIST_VERSION=1.2
+DIST_EXAMPLES=("examples/*")
 inherit perl-module
 
 DESCRIPTION="Set up a CGI environment from an HTTP::Request"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE="examples"
 
 RDEPEND="
 	virtual/perl-Carp
@@ -19,18 +19,11 @@ RDEPEND="
 	virtual/perl-IO
 	dev-perl/URI
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 "
+
 src_test() {
 	perl_rm_files "t/release-pod-syntax.t" "t/release-pod-coverage.t"
 	perl-module_src_test
 }
-src_install() {
-	perl-module_src_install
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		docinto examples
-		dodoc -r examples
-	fi
-}
diff --git a/dev-perl/HTTP-Request-AsCGI/Manifest b/dev-perl/HTTP-Request-AsCGI/Manifest
index 7ee49340d63d..8d554c205183 100644
--- a/dev-perl/HTTP-Request-AsCGI/Manifest
+++ b/dev-perl/HTTP-Request-AsCGI/Manifest
@@ -1,3 +1,3 @@
 DIST HTTP-Request-AsCGI-1.2.tar.gz 14173 BLAKE2B 9dcaa7ecd233a6b50eb54ab6da32b6ef45c20974eec682641050093b58d3221ed7b3de503da7907711cb70b1268b3c0d18f1f17e7db4150e853e81e6fc60a049 SHA512 5ea9fe149c7c938af5a089fafe4585f50ea98cd6bab0e06f6de5c8b89c2b749c2cf759fdd8aa70a2d65e34971d030342924c2eafd72b9290da3831eadcc29e89
-EBUILD HTTP-Request-AsCGI-1.200.0.ebuild 739 BLAKE2B cd51ba4c7e0078caea8277953b2aebf60a0adfc250a78eb77e8e19da5f0fa16f769b7e1c9bda647d41aebd10aea9638e04070a62eae19cff9010468038ef4d08 SHA512 35cb08dbbec77ae73fbbd92267e7dca7f0c3780ec364b8e50866798df31ada6d959225aed3701e2c6b2b09a84086a73db2ac2bc217f19c24cb07f2b498638de0
+EBUILD HTTP-Request-AsCGI-1.200.0-r1.ebuild 599 BLAKE2B f1f873f0896d5078849678db5e5929c4e30518519d060c0bd9cb8d0dbaa397791fe157606b93287e08b16c7cb9de98e0a5f863cb61b2c3849e28cdc6ac5babe4 SHA512 76823823b75e08903e9812797d2ef821f876100994bedf0f064aa37fe86a67fcba6db63c42aaf2feb0bcf55aa9d84f9cbb253e4d3dfe39d3401d8acfd9d9744e
 MISC metadata.xml 410 BLAKE2B 934e5938692d8cb953e59e6daaedb36a68ad60dbf48935f75a512014a75f2584e661b52db15c36055a639cdbff7c9890742f99a73a991ddacde6f2c9ca1ddea9 SHA512 ec9d623fb68f5f220a974313b312c04eefd84ba45a3cf1aff3ccba5e332926acc861987fbdcf154ebaeac296f099c2c2691f03f0423bace89ad176b73d1f5543
diff --git a/dev-perl/HTTP-Server-Simple-Mason/HTTP-Server-Simple-Mason-0.140.0-r1.ebuild b/dev-perl/HTTP-Server-Simple-Mason/HTTP-Server-Simple-Mason-0.140.0-r2.ebuild
index c37add1045aa..6b610a98030d 100644
--- a/dev-perl/HTTP-Server-Simple-Mason/HTTP-Server-Simple-Mason-0.140.0-r1.ebuild
+++ b/dev-perl/HTTP-Server-Simple-Mason/HTTP-Server-Simple-Mason-0.140.0-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=JESSE
 DIST_VERSION=0.14
@@ -11,7 +11,6 @@ DESCRIPTION="An abstract baseclass for a standalone mason server"
 
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE=""
 
 RDEPEND="
 	dev-perl/Hook-LexWrap
@@ -20,16 +19,18 @@ RDEPEND="
 	>=dev-perl/HTML-Mason-1.250.0
 	>=dev-perl/HTTP-Server-Simple-0.40.0
 "
-DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
 
 # Parallel failures,
 # https://bugs.gentoo.org/623112
 DIST_TEST="do"
+
 src_prepare() {
 	sed -i -e 's/use inc::Module::Install/use lib q[.]; use inc::Module::Install/' Makefile.PL ||
 		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
 	perl-module_src_prepare
 }
+
 src_test() {
 	perl_rm_files t/02pod.t t/03podcoverage.t
 	perl-module_src_test
diff --git a/dev-perl/HTTP-Server-Simple-Mason/Manifest b/dev-perl/HTTP-Server-Simple-Mason/Manifest
index 4ddc67d05c7f..9fadb998dd28 100644
--- a/dev-perl/HTTP-Server-Simple-Mason/Manifest
+++ b/dev-perl/HTTP-Server-Simple-Mason/Manifest
@@ -1,3 +1,3 @@
 DIST HTTP-Server-Simple-Mason-0.14.tar.gz 21389 BLAKE2B 451d8aadf3a4cca03fe6e73a89ee10fc32444895793d4717b9b1fd93d0eb47e9108e6e9ab188eb4e0e3d9c1d3b7ee43cd4562ce47daf1b977ffc922205ab5aed SHA512 0a1a087affac10568059c7b09d2242a9289b38807deb4a876a2ce2326d42eb44be79b01f001580e4b62bc38bf23c7336a71496a59822cd20a2da250b1c54c930
-EBUILD HTTP-Server-Simple-Mason-0.140.0-r1.ebuild 784 BLAKE2B 38f9d034fdc082684a91ff43f7d39e71cfd20b694f65eee57ddc7ba8b8f8b07dabed0fe4dd74d71a04278c031068e0f968d25610068d2d87629d26cd0a2fd7d1 SHA512 82d73e5f6dd4721ffd4d29fe205ac752899260bb6bcd1251d6728db7c422fc0afd268fb306f200c950dd764d81cfa76ee005dfb6a076d21f35de75ad0ef4a597
+EBUILD HTTP-Server-Simple-Mason-0.140.0-r2.ebuild 776 BLAKE2B f5320780d81c5ae345585a3f8bdb6fca0c9d15ca3de2525c5eec1044df95a75eace689a932e9d5ff011eb413cc4e75011bafaae1720e6979a68c74d7ccb401f6 SHA512 2eeefed6dc4c400064cac19347bc6b148b32e0a3dec7fa9933268626ce446f7ac635e8ed7d63bc2b81787d3de8b36b0c59c6ca19d195f80223756a13c96cfc83
 MISC metadata.xml 423 BLAKE2B 834774088d581931ddea766729cd79a520765292a60a1221daa54bc372107a0b212128f3a4beb9975f04be0441c9c24adcbae66d6f600ce0261dec545ac02fcb SHA512 d47ac69b7b3f46773b0acf5abd09ad09ed07c4d93a2b18d4d048d8c36a9ac156eefbfb3424b8d962156d64079b46db5695df57f897c2d293bf918713a106b1b6
diff --git a/dev-perl/HTTP-Server-Simple-PSGI/HTTP-Server-Simple-PSGI-0.160.0.ebuild b/dev-perl/HTTP-Server-Simple-PSGI/HTTP-Server-Simple-PSGI-0.160.0-r1.ebuild
index 364ffcee4fc5..0ab25ca17ca8 100644
--- a/dev-perl/HTTP-Server-Simple-PSGI/HTTP-Server-Simple-PSGI-0.160.0.ebuild
+++ b/dev-perl/HTTP-Server-Simple-PSGI/HTTP-Server-Simple-PSGI-0.160.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=MIYAGAWA
 DIST_VERSION=0.16
@@ -10,14 +10,14 @@ inherit perl-module
 DESCRIPTION="PSGI handler for HTTP::Server::Simple"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE=""
 
 RDEPEND="
 	>=dev-perl/HTTP-Server-Simple-0.420.0
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
 "
+
 src_test() {
 	perl_rm_files "t/release-pod-syntax.t"
 	perl-module_src_test
diff --git a/dev-perl/HTTP-Server-Simple-PSGI/Manifest b/dev-perl/HTTP-Server-Simple-PSGI/Manifest
index a841d2df8804..d51b29d9a40f 100644
--- a/dev-perl/HTTP-Server-Simple-PSGI/Manifest
+++ b/dev-perl/HTTP-Server-Simple-PSGI/Manifest
@@ -1,3 +1,3 @@
 DIST HTTP-Server-Simple-PSGI-0.16.tar.gz 11813 BLAKE2B 4d6cfb04e723b4414c5e79c53cbcf51ca196f2d039dafa584200b84f60c5ee2e7f1e9d9ef21dc4e665fd7f81a1a45f4290578288ba91f335300b4320ea9cb1de SHA512 514a61a7d349f02a18b44bd2ef3adbfd457cc61b6ec4eea2e74f1d8f4ffd095b42338552ddf7e9ab2b3ffa79e5c826099665e87c9ca5b08566975101e37b0177
-EBUILD HTTP-Server-Simple-PSGI-0.160.0.ebuild 485 BLAKE2B 3670caec1cc1bf7e66ed33e1c6ab06fc47168812870ec4546fa887ba211c3dcf7370235f8b97d1182215a919bc3e6a5ab8f8c27fe17b75b30a7bff603c2eb3af SHA512 d9b4d9cfa31d9cc44eb7095ccc90146838f506c405ca1d1711b118acf6d9707236e1ffabb2560114133cac8d904469256636735c64d9b871a3e98c1bf69e30ff
+EBUILD HTTP-Server-Simple-PSGI-0.160.0-r1.ebuild 479 BLAKE2B 735e655afb6f4dd64bf0e94c243e057d8964bd669903972c1385669f54667ea7cafedf1badbd0fbaad46264dfed0a1587a555556809d074706deb9d52582a2f9 SHA512 ed3a4067b20fc243233c14fa0a5c6d91d8f8a7b2913152101c336f06d4cc4d1f8a02f59a132cd0db3f6d1286baf3e79344e389af746580d6278350d106500526
 MISC metadata.xml 421 BLAKE2B 19a76ea78d9ffe24eef84820134f4d66b9f7d2a9d701c64a4816a4c8ac1dd51c7fce526ccb68d0968776b4e0666909dd99c4d715c7f46d5754e4dfb005cf5f6d SHA512 e97db69e48a737be062b329baee2236bc55b2a25a02fec0ee08e380f6b0617161c5388f8f0307ccae123a727881d793d1eed869ea3f168a65b8d3b2203afaf66
diff --git a/dev-perl/HTTP-Server-Simple/HTTP-Server-Simple-0.520.0.ebuild b/dev-perl/HTTP-Server-Simple/HTTP-Server-Simple-0.520.0-r1.ebuild
index eefbf5b210e7..abf560fe9847 100644
--- a/dev-perl/HTTP-Server-Simple/HTTP-Server-Simple-0.520.0.ebuild
+++ b/dev-perl/HTTP-Server-Simple/HTTP-Server-Simple-0.520.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=BPS
 DIST_VERSION=0.52
@@ -11,14 +11,12 @@ DESCRIPTION="Lightweight HTTP Server"
 
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~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 )"
 
 RDEPEND="
 	dev-perl/CGI
 	>=virtual/perl-Socket-1.940.0
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? ( virtual/perl-Test-Simple )
 "
diff --git a/dev-perl/HTTP-Server-Simple/Manifest b/dev-perl/HTTP-Server-Simple/Manifest
index 85c6b8fdd3d3..5f2563353639 100644
--- a/dev-perl/HTTP-Server-Simple/Manifest
+++ b/dev-perl/HTTP-Server-Simple/Manifest
@@ -1,3 +1,3 @@
 DIST HTTP-Server-Simple-0.52.tar.gz 36722 BLAKE2B 353cad8e72810703e8c4a07953d9f7b273900c54ec65e49ce34e7b2e611439544e8cc3e0bc717b0f0cc0f9b710200cb42dd913c12a5509687facdcd3fb5c4ecf SHA512 57c0aa4ceb7e0f430f577e24c275d96d54ceb15ddf6e53710067f57dac50e8a57661399d0093edf28c1ff7b6ed313471cded48f5792349191b8d60d8d7cde2d1
-EBUILD HTTP-Server-Simple-0.520.0.ebuild 643 BLAKE2B 21c38d5d12ddb0ff1d1afd3025ea0159cf1509abb8f06171b996af45ec7fd9d9e0a116bc45ed6e4a2c6709bcc03bf8b1edbeedc4c4ce3087065dff44d02cc62c SHA512 6fdf0fbac544965698572990db30ec9997681c75569ec8a2987daca2b7e79ca570cc68b795b85b4e31780d098316b0820e1d7b734deab844a06fd391d5764dce
+EBUILD HTTP-Server-Simple-0.520.0-r1.ebuild 605 BLAKE2B 770c37480043d57798f23d749f7b27c8fcc7e6fdf5efbd8666f00c3073ebc4bbe288b06acc34bf65ec73f0beaafcab4cc17eb109d38092b11a5d8f0533e3b074 SHA512 cc4eba9525733a61e4703b6d42de7e00850d00a5deabd3ee67b358352bb3f15a92992582fcf00baf8ab68997fba0ade69210578f7f008e5932ced3184a3abed7
 MISC metadata.xml 567 BLAKE2B 2407c6e22e0b268bcc16176d1a3c804047c1185b28664c5b0a1a1e6ef6ec568f74729ddfd2a8a3298f9b76d8c21d192d29cb1d9969224bc206d64603dd66169e SHA512 93ec9ef864b59803e25746b04fac2c952a2be86cc5c23af6909be376d1d87d4f56f45349261d16c6d3b8622ec228abf3e3b97b4f8ba1dbc30e633f7c1eaaf181
diff --git a/dev-perl/Hash-Merge-Simple/Hash-Merge-Simple-0.51.0.ebuild b/dev-perl/Hash-Merge-Simple/Hash-Merge-Simple-0.51.0-r1.ebuild
index 57b5c3db4c90..22b8187389f9 100644
--- a/dev-perl/Hash-Merge-Simple/Hash-Merge-Simple-0.51.0.ebuild
+++ b/dev-perl/Hash-Merge-Simple/Hash-Merge-Simple-0.51.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=ROKR
 DIST_VERSION=0.051
@@ -10,8 +10,6 @@ inherit perl-module
 DESCRIPTION="Recursively merge two or more hashes, simply"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-perl/Clone
diff --git a/dev-perl/Hash-Merge-Simple/Manifest b/dev-perl/Hash-Merge-Simple/Manifest
index 9cdb8be1cfd5..12530145e08e 100644
--- a/dev-perl/Hash-Merge-Simple/Manifest
+++ b/dev-perl/Hash-Merge-Simple/Manifest
@@ -1,3 +1,3 @@
 DIST Hash-Merge-Simple-0.051.tar.gz 4181 BLAKE2B e5f742f1fd7bfdc0d88784cd99b86ff5d846c274b1861f84331060f12141232903d06d7efb724b2932252ac5ac8cd6fc85d6af2dbb10ba79e5e0a257c4698e76 SHA512 8db850144593632ce8ac8a560dac6670814a9ce3d1091d6aa42ab0eadca4b350671103b1de906d562aeaa0934fd58bd4e557821c5bcd730a10849f8505f65c4c
-EBUILD Hash-Merge-Simple-0.51.0.ebuild 449 BLAKE2B 157437eae3aed900afc6c6f7ce71e4c758bf22062e604d0778f9dc040a5e21766da71d46f7ab2f2e03b7e9f13d26afe243e52558471cf8b832319775f0631eb3 SHA512 e4797ccddf1c07cbe77c787bfd20a02b5a4e808908dbbab4bafc080a75ea1e28e294c44f09128b2cd7a3bb4c11f14f571fa7cc51721115bfbd917807343c2168
+EBUILD Hash-Merge-Simple-0.51.0-r1.ebuild 410 BLAKE2B 41c84c397ff4934c1e58a1856abdf4a14b4c1efd641f75f2d5c2f3fada2b8b72f13ab5420792b00c528b37eb2029afccdbb5814fb86bd127ef37ed963be4cd5d SHA512 fca2cbd4ebd808117040a38bbbf7124de12f89b79ac52b6e01bb90c2bfa07f8a9487c56888714846d857940cda074ad324ef0f72062d95bbe6e69e5db15f5874
 MISC metadata.xml 408 BLAKE2B bb6d6c2b7c5fadf39a2f671454eedc89370e6ad72666c77130a3284cd75b3ddc11f15d32d9af8512e339d376e5b541b07d09c00233d9935c22e3b2728b7a56c0 SHA512 3c6becae6b0d5d7693208d7d70db5e3d3a6ecd2446e9e2b3b304c47f6bf3a7281db81531d3dbed5e19ed1c9ed9af4c908ff40f701c4c6c4ea15a594471e2c177
diff --git a/dev-perl/Hash-Merge/Hash-Merge-0.200.0.ebuild b/dev-perl/Hash-Merge/Hash-Merge-0.200.0.ebuild
deleted file mode 100644
index b9a9e48ae5e5..000000000000
--- a/dev-perl/Hash-Merge/Hash-Merge-0.200.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=REHSACK
-MODULE_VERSION=0.200
-inherit perl-module
-
-DESCRIPTION="Merges arbitrarily deep hashes into a single hash"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~ppc-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-perl/Clone"
-DEPEND="${RDEPEND}"
-
-SRC_TEST=do
diff --git a/dev-perl/Hash-Merge/Manifest b/dev-perl/Hash-Merge/Manifest
index 841b77f5d020..afd75cd3ecf1 100644
--- a/dev-perl/Hash-Merge/Manifest
+++ b/dev-perl/Hash-Merge/Manifest
@@ -1,5 +1,3 @@
-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 534 BLAKE2B 123834d6033ebde99e6111b96e8f57fb1a0a10dfd94b59bdcdf895bb1d3caf849fc1690fe4fc42345f689cea00f71abe7922d00b6e336ed805b23cff7d6188ed SHA512 1b50b246fe059910c7dd0a371548a1085fceb16561790200b043060c4eeda7d691d5e600d7af53a25876bc25f91fca9299b3a9e990e72b95c2677f72151ba3c5
 MISC metadata.xml 393 BLAKE2B 7a15cd09aa44ebdaa0b83652b0d14ac8fe9667ecf49b7023341a00b18e51745ef0349d54acca43a4551a9206b4d74c1b3907c05107b90e0bae24c085b6f23d4d SHA512 345258483808141a5e98f78a98a64c0d14aab8227d3b5a38346fcd181d3443f545584ca66502412177d09e46233b05cbf38ba9646e4175d3551f142d5524ab3c
diff --git a/dev-perl/Hash-MoreUtils/Hash-MoreUtils-0.50.0.ebuild b/dev-perl/Hash-MoreUtils/Hash-MoreUtils-0.50.0.ebuild
deleted file mode 100644
index ccbfb3fb5202..000000000000
--- a/dev-perl/Hash-MoreUtils/Hash-MoreUtils-0.50.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=REHSACK
-DIST_VERSION=0.05
-
-inherit perl-module
-
-DESCRIPTION="Provide the stuff missing in Hash::Util"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.420.0
-	test? ( >=virtual/perl-Test-Simple-0.900.0 )
-"
diff --git a/dev-perl/Hash-MoreUtils/Manifest b/dev-perl/Hash-MoreUtils/Manifest
index 826692b6b695..e845cf7927fe 100644
--- a/dev-perl/Hash-MoreUtils/Manifest
+++ b/dev-perl/Hash-MoreUtils/Manifest
@@ -1,5 +1,3 @@
-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 377 BLAKE2B 5e3a9254c05494eefd9e459ca586db0de212d9df00a45b2034b60b87538f648e17fef4391ec111aac91804315cb9636b92535b3c5de32408ea7c6db2177abc32 SHA512 85af68779413e521a6e9393821ccbfe9d3ad216e84aff14c62e42da40b9bb7d15da0b77495979d47c9e81071771f0b20d390db15a66aa51f902ec4ccda9d1a64
 MISC metadata.xml 401 BLAKE2B cece1236e5f7576ba33978f3c0f167dea79b66ae7835f81a15b6797f9824344fab0998db6b6c977f7a146ee0a8e10c3cb033abe0c41be990502283d4fba7a822 SHA512 23c19fe1dadccb03ffbff4723292f823088e91a270b5d43c8cde0aacf67e9c989c1bb0202b119bf45ce79a84d3af054175262f82283a8388b9a1483b2ce1fd20
diff --git a/dev-perl/Hash-NoRef/Hash-NoRef-0.30.0-r2.ebuild b/dev-perl/Hash-NoRef/Hash-NoRef-0.30.0-r3.ebuild
index ec0e1fcb7a2a..d36c27593196 100644
--- a/dev-perl/Hash-NoRef/Hash-NoRef-0.30.0-r2.ebuild
+++ b/dev-perl/Hash-NoRef/Hash-NoRef-0.30.0-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=GMPASSOS
 DIST_VERSION=0.03
@@ -11,4 +11,3 @@ DESCRIPTION="Hash to store values without increasing reference count (weak refer
 
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
diff --git a/dev-perl/Hash-NoRef/Manifest b/dev-perl/Hash-NoRef/Manifest
index 6fe746422383..42371894155f 100644
--- a/dev-perl/Hash-NoRef/Manifest
+++ b/dev-perl/Hash-NoRef/Manifest
@@ -1,3 +1,3 @@
 DIST Hash-NoRef-0.03.tar.gz 3312 BLAKE2B 0088261680a7fc902460b63cd3086327619be64ab2615a7e0952fb64b050bc9a25416a9c41b6fd84ff442c9091ca72fb3878038bc894a107aaf2f77c89e45f1e SHA512 da24051a4a274fb96174b6102c73f1ad27e763f4930d7ca4a53bbdb94313c07592374bf8bfb0dff32e3d1c27f441941010fed55f46edbe75267fe076b7b2df3c
-EBUILD Hash-NoRef-0.30.0-r2.ebuild 303 BLAKE2B 1cf085f1056735f82e3621964b49cff36550f63e647fb0e84ad82aad19be2de45575509e0e478e1e83e3a86b2455a14c5fe50be6efbb5dea4b624fcc5126bad8 SHA512 b341aefc24d3b32770e3bfa76b7092fabffcecf2cfd6faab974f21727e3b187542e2fd0efbf35cc143038823839c65b9345583118181e773eead2706640dd679
+EBUILD Hash-NoRef-0.30.0-r3.ebuild 292 BLAKE2B 2073abccbe1e1155b02ea0e95a3420227ce3eaa6906dd0300fe8aa2879558c999b5dc9345ee0864ab91484061972caeed0f513fc33e4169f503232f5efb183ac SHA512 16557d2221a3ac296c3f93a93ce1060781d49360b1b0bc083e2c0ebfb31c9f72b7170cd303cf8213d70409a0ec7ff205f9a706361f5c8e7f4b92949e557c2d5e
 MISC metadata.xml 393 BLAKE2B f0ff001015e039d00a37ab0e317c9238872bf6e959df17c77f088e76891688bdd5da2ac4e9ade34afc12465a59813b3e25b41f215ed2a20175a5344d217f6781 SHA512 e632ccad91d49d9e746dc24e8145db3fd200d921b6b8e130c5d6cd10fd567c3b54573b9e1d9a17a189a76447f037da50581cf43a447f8cdb03c86ce5753991a5
diff --git a/dev-perl/Heap/Heap-0.800.0-r2.ebuild b/dev-perl/Heap/Heap-0.800.0-r3.ebuild
index 55ea9c1823b2..3cc9b1a59e8a 100644
--- a/dev-perl/Heap/Heap-0.800.0-r2.ebuild
+++ b/dev-perl/Heap/Heap-0.800.0-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=JMM
 DIST_VERSION=0.80
@@ -11,4 +11,3 @@ DESCRIPTION="Perl extensions for keeping data partially sorted"
 
 SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE=""
diff --git a/dev-perl/Heap/Manifest b/dev-perl/Heap/Manifest
index 5af585b83d06..b15308035a4a 100644
--- a/dev-perl/Heap/Manifest
+++ b/dev-perl/Heap/Manifest
@@ -1,3 +1,3 @@
 DIST Heap-0.80.tar.gz 15673 BLAKE2B 56cb650db89478d60f52917240d2b6b8cdf75052e6a10448ee3a0347170654cbdd55d213a39226a3f39a735e0c0508125ad7c2838f4080c1021c46087e04988f SHA512 133e2668a90de8cea13302464188415fa30e4a0a85fb51af7409ff2e3466e33a6daf172b2466f046c5275db6ab19bb573e8b2d14acf616b110bdd60869865690
-EBUILD Heap-0.800.0-r2.ebuild 300 BLAKE2B 82b6aedaaa09d3887134764f1425469c24c882baa4c4c8419af2ec2574d0fc7d819cf2bf4b7339b15c32898d4d5abb1262b215c0321fcd121f7671ae3481a911 SHA512 4651f10a3add41b531c7db8d2342882797599ef9d785eaf86de462865b10c3557ab8cb4d9df3e1e7a0e2d439baedb58cdcfd836fbaf681271fa5b09ecfe24eeb
+EBUILD Heap-0.800.0-r3.ebuild 292 BLAKE2B c59bdec6278cf1569c6afebc331715ab95b434ed1f7e1e3d66160299fbad603be1b2092ba23cf162ed706ef15626c64ffe0ef18e7c6ea626f9bb0582388e9f0f SHA512 60b135949d7c3927da1a6cc4f1076428237fbae96f719c9b1a8012acf584db684f03bb2e10ea3e7545c54c5c6ad8ae9839cdb3a46bcd496f0222e2e9ecf0f80f
 MISC metadata.xml 1000 BLAKE2B 7473ea9800a618c08a47143b77ae3dada92a8fea82cc8d20d994f4ad073eaa9cdf5612501e5ba78b3b7fd9e25ac122ee3b5ae7325333a47b3f2079935d27ca27 SHA512 57d572188d0a1cdf6cda164a991617cf41f498792550cb4fde483f05edb80ab360e996bc6ca1e9f135bbf9ff3176c4678915542ce9e90363d484c7007c9451f5
diff --git a/dev-perl/Hook-LexWrap/Hook-LexWrap-0.260.0.ebuild b/dev-perl/Hook-LexWrap/Hook-LexWrap-0.260.0-r1.ebuild
index d62b31db07bb..0cb3a4655bd2 100644
--- a/dev-perl/Hook-LexWrap/Hook-LexWrap-0.260.0.ebuild
+++ b/dev-perl/Hook-LexWrap/Hook-LexWrap-0.260.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_AUTHOR=ETHER
 DIST_VERSION=0.26
@@ -12,13 +12,11 @@ DESCRIPTION="Lexically scoped subroutine wrappers"
 
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	virtual/perl-Carp
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? (
 		virtual/perl-File-Spec
diff --git a/dev-perl/Hook-LexWrap/Manifest b/dev-perl/Hook-LexWrap/Manifest
index b0551aab7f12..850b11fb9e48 100644
--- a/dev-perl/Hook-LexWrap/Manifest
+++ b/dev-perl/Hook-LexWrap/Manifest
@@ -1,3 +1,3 @@
 DIST Hook-LexWrap-0.26.tar.gz 29479 BLAKE2B 63c4128655342b752cb50347769674f40edaf633ea47b0dbb1f3fadc4bf9e1342bd810aab891f23e8d2c5918e4b4ebf2bae92f29910d6834da499e8e2a7c94e2 SHA512 f7771d4fb8379f43fa5b864e345f4526603914c3c486c637ea07fb9e2d41569bf40948a9039fab7d10c683fb85e16a8653876613903d34cc6801fcc9e92aa58b
-EBUILD Hook-LexWrap-0.260.0.ebuild 624 BLAKE2B 92efb78705aaaa094cfa207588dda653e4ac8cc7f0864782944a3e9c86226a767d7c55cc986403f9c51516a8991590cc8cdea884d9f79d64c8ab14e11656b5e0 SHA512 d820d3cf9b311e7d8dbffb04d1e730946a244d031cfc2fa2baa6ee70647cfa4206c9ee5c477158af6d97dee6c72ab2ad99b91f0c4ab8227a97328cc474a70ad7
+EBUILD Hook-LexWrap-0.260.0-r1.ebuild 586 BLAKE2B 7e6cea240fb8c6e572fa4bb8d8fbf4205b2ce3733dc714ce9d0f3cbfe0f0fca780e18bab3857fcb7ee8dbcc3f581aac653a08f6226a668dc5732b5f16f9f4e21 SHA512 39f150edaa4fa3147aa9670311a7e0a1dacc771055a138b4b97095107732a40311ac5e88af267547cdb304a047f13ad4a2a9c4e164c85161dc265173089e2ae8
 MISC metadata.xml 397 BLAKE2B 611fe28ea8485545e944da97ee3d95d7f9a5dfaf87a37d191573ed18c2eb2c6c8853bbc5eded97886ce287eaf27d3a4049d303e654da4fec39c172a3fc3cd4a3 SHA512 5ca859421d7dacef7994dc6eb9025d59ba9bc49d9ef7fc8dd85bd70ca41d36736dea8c5d6a4dfb6f611758c385890f06dc5c6247847fcc6d419121722060bcfb
diff --git a/dev-perl/Image-Info/Image-Info-1.410.0.ebuild b/dev-perl/Image-Info/Image-Info-1.410.0.ebuild
deleted file mode 100644
index 85b28f753294..000000000000
--- a/dev-perl/Image-Info/Image-Info-1.410.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=SREZIC
-DIST_VERSION=1.41
-DIST_EXAMPLES=("exifdump" "imgdump")
-inherit perl-module
-
-DESCRIPTION="The Perl Image-Info Module"
-
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND=">=dev-perl/IO-stringy-1.01
-	dev-perl/XML-LibXML
-	dev-perl/XML-Simple"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	perl_rm_files "t/pod_cov.t" "t/pod.t"
-	perl-module_src_test
-}
diff --git a/dev-perl/Image-Info/Manifest b/dev-perl/Image-Info/Manifest
index 4961ea3ae64b..6d8303621d72 100644
--- a/dev-perl/Image-Info/Manifest
+++ b/dev-perl/Image-Info/Manifest
@@ -1,5 +1,3 @@
-DIST Image-Info-1.41.tar.gz 265977 BLAKE2B 1b9390567c9d9f4f924dee8a2fd134fde7eee7a730bc8c30250b978287a90c99c97f6b86ad9f94568857d81185f4beb3a3023f0e9ce7215fe156f43781c7ef5b SHA512 7e3cb103efa004ce728b6e594f5b7518fa5be14a814e6f06d4a3e85563d7896fd283855cfe9e091c22b3728f6126501463f7326d704c0188ad696206f9318824
 DIST Image-Info-1.42.tar.gz 321727 BLAKE2B f0d79ea7c4087ab32332a8a6e252e1f358e0ef0d20d73e8fb501724fe51b91d2965dbfd7396ebd8a4c569653efdadb953d77434a73b07686fa82d7b4b5d19070 SHA512 7b17c3510328e062f93f1882c93a4ed24afb6f636d23e9ff1f478e452c9e1cc532c06b639991446442f200696afc63ddde1259afbe4362c3179b515046286133
-EBUILD Image-Info-1.410.0.ebuild 489 BLAKE2B 0791c5480bb2fe14f5c878ea15286ae342130a5b72c289111edf55ab786f5566fc88c88bbcedaff9cb8071d1ebe1da9b04d34c92a7344649ad87d77be0eb3242 SHA512 754ee5e30eaedb4a73fc56613c38267f842d9a17955f6e4bdefe5572d732a8771e979b948e9a4d4a05c8e82e2e3133004a8f9c363d53da82c98b168f3ec58774
 EBUILD Image-Info-1.420.0.ebuild 457 BLAKE2B 414257f62bb5fa6e2a114730bf165509ae8e1fcedac4e0468009e0461e81c495109e5c23deb462f30af81f81d9d7b64280d472d8ab9e4964a0b3f3f57c75b710 SHA512 820d2260ca81c0c1cdf3d027afbc9da513613b87c15be906f84aa0e03ac652ddbe5f8eefe861397ec5bec1477de56141e5633c7531586e9efdf658653fe0cf0a
 MISC metadata.xml 1797 BLAKE2B 9b8c363a3167ed925d998d06f95f1afebc61446ce37d63d8f3b197878b50ad555b5a75f020a96ab2a94029603d688228b1d1f3b839ddbef67f7d8e0e42781241 SHA512 15903df8ec47c3f4a4666f5a22555e50cfa35a077779a75658ba2e22d99d022632113f737785b1d1670adf05dee308510894194da69cb34514abc7c8fbd305f3
diff --git a/dev-perl/Image-Sane/Image-Sane-0.140.0.ebuild b/dev-perl/Image-Sane/Image-Sane-0.140.0.ebuild
deleted file mode 100644
index 504d7c094b0d..000000000000
--- a/dev-perl/Image-Sane/Image-Sane-0.140.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_VERSION=0.14
-DIST_AUTHOR=RATCLIFFE
-DIST_EXAMPLES=( "examples/*" )
-inherit perl-module
-
-DESCRIPTION="Access SANE-compatible scanners from Perl"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-perl/Exception-Class
-	dev-perl/Readonly
-	>=media-gfx/sane-backends-1.0.19"
-DEPEND="${RDEPEND}
-	dev-perl/ExtUtils-Depends
-	dev-perl/ExtUtils-PkgConfig
-	test? (
-		dev-perl/Test-Requires
-		dev-perl/Try-Tiny
-	)
-"
-PERL_RM_FILES=( t/{90_MANIFEST,91_critic,pod}.t )
diff --git a/dev-perl/Image-Sane/Manifest b/dev-perl/Image-Sane/Manifest
index 1e4835540a98..4e39fe3aec89 100644
--- a/dev-perl/Image-Sane/Manifest
+++ b/dev-perl/Image-Sane/Manifest
@@ -1,5 +1,3 @@
-DIST Image-Sane-0.14.tar.gz 47158 BLAKE2B a9dfd5f31f0ab66c3e4608e2126ddf019d9a3090dca45a8dc20d41393f3957d6c6e5eca025c0a1e58ab959ac3e22c491a0a0ed0c0295210138f84529383fcda6 SHA512 d08be5f0d18f367178b7d76d50abe12faaba48525374c782f6a91fdb44d314b1943617bab9f6e7b2bbbf4c95dcc221bfbd92cdf7c80783916aad24daf5b04bea
 DIST Image-Sane-5.tar.gz 47781 BLAKE2B 7d2457a89c061f7f160ddd8321feab4611548e10158fe77bd64406fd1d1bc534d67664be59ff73d872b264d9baa947847ea3ebe47057f700d3b05ec8e9ea36b6 SHA512 b2c9aec6d6ff598284df495c15cb33c9126364b2551d421580c0f2085a1b102bc5758f81f4f857bf6e098eab0a1945d39b8996d22ece23475296362b1f6a640b
-EBUILD Image-Sane-0.140.0.ebuild 606 BLAKE2B 6c15d313120686af0d4f1d7e01a40a0e35490b6ed5cad91e1681bdf079f95219657174aff50240e21ef486d9a5049c884354c9d7b5bff15e8f2336d748a23a91 SHA512 7e176448d57fa36f455c48a2598514d5f5600b7cfdb9e42ec1a944a06d02380824ea5ab60b845d5628454ac03a0fbb3cbc7789f92d532188157dd7a508e4d6d0
 EBUILD Image-Sane-5.0.0.ebuild 627 BLAKE2B ea4b02accfdbef28ed188236f0eaa36a45e67bcfdb25e706fd80da2cbe9e012c0f86c863cddf11ad8d33d0b58df47869ca3271ed6ae88b8873bc23de47d83cb0 SHA512 c0b1d045ba344fb5e0071cca84a08377b83a5b4ff90c9eaf000024d1ac220e217cd47c9c0346b546c3050a89693cad273521a172574297c4643046e1ed376246
 MISC metadata.xml 459 BLAKE2B 5d7752999d62f001fc83a77298fc05c5a16813b2a9dbc80b96d4caf5dc59b8e4bec863e19e2e22dc8fbca5b1acbd04765359d8fe10e73ccf7d9375801d5d9140 SHA512 c90eed832febe1b246219cfc9e5cc2bb57de96e3e1401f751501d4ee31d0bd806c5e3f0c03449cfda61a7bb17cfe8ced317d648fe978ebefca1f0ab4a49e4705
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index c4c294c626e2..57061ef6ff7b 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Params-Validate/Manifest b/dev-perl/Params-Validate/Manifest
index c8002d7eecb8..259e2829ff89 100644
--- a/dev-perl/Params-Validate/Manifest
+++ b/dev-perl/Params-Validate/Manifest
@@ -1,5 +1,5 @@
 DIST Params-Validate-1.29.tar.gz 137609 BLAKE2B 46c62649a7bfc1d2a97f2c038d3ee288163c81b6019e1276ded18ad0560514ed3e0a6377fdfd1103bdc05df28af5d2355ca97c96ea5352d963d03049ced78925 SHA512 afa887d1ce60d38b82cbf3ad88fb892f473e0fa45db528b68e66bbb800058af453180cc96afddae56a2cdad8ec531a587e7aac36b6869c489caa6dd36a57a385
 DIST Params-Validate-1.30.tar.gz 207327 BLAKE2B d30700b1fdb8de83b3082144a96e2243471fb0bf4c3932853995698e0950252809d974f471c078613413559f138402982f2b4646bbee4e680135d06871e15fbb SHA512 ca6b54a55dc003be6933ad5a9353abf96f2decfc681354fabc974e9666b89b3afe8394cd0a13ec91a5f84c825cbc0b4697a4977bf773feabfefab57006c9f20e
 EBUILD Params-Validate-1.290.0.ebuild 923 BLAKE2B 7fb1e9dd43dc9b0b8b39efa10bb335e803f736ad296a1a0ef59a04146f49b9ef81fc7296f9d2e07584c64d7ef888fbfc45ab0b2df454e546639b663afc570df3 SHA512 d759bbb58a1d9af5717933aa849af58785ab11be3037cd1c8142496db35e121d2502810120f4cd2be7cbf7b4316da59e1450bc704c047fe27ad08671648f8f3d
-EBUILD Params-Validate-1.300.0.ebuild 895 BLAKE2B 3250b113eb0e80838d50870c744dc9f551147be76e79dcd921178ea8b9d2dda40731f53230e09293050956df6e358724a14472faa30f25382194cf70f4a22656 SHA512 f581ccdb90b9a8cac14d0a46235396e32c46179b16fba9f151628f456843d41e7373b197a653328a93b18719709d3a71092d3e191f98e100e35a6ca797bf1116
+EBUILD Params-Validate-1.300.0.ebuild 892 BLAKE2B accca6dd35a00677fd9279743dbdcc60f1e3f0aac02b7ae8e54953d8ba7707b6d205c90f41e4814debb0333572ec5d73eb8ed9a3b5f706e95e7fe1227de33d4e SHA512 8913c731795e683a68edd6dcccb5b346ed17b53568fd4d9a7d679b0a1c4007837b8ac17eb0074d691e9ec92de66d0e88c2c1ef0aa9b9420d63a7eddf6c7e9d89
 MISC metadata.xml 611 BLAKE2B 134bf814c1c820d305b9b0b48e5537f4ae95d7bd5c71883b4794352729a57b7497f664c3c8c79fc570af5302d8eccc144f0864b742cd533cff552c18c7c1ee44 SHA512 4c12bfa5430613b179c107188a7e220ab5527338e21b53afcf4ac3dbc041d27bb91f64db5dd530110fd35c9bf313abd9fd1062fb04624592c1532ea114e43eb0
diff --git a/dev-perl/Params-Validate/Params-Validate-1.300.0.ebuild b/dev-perl/Params-Validate/Params-Validate-1.300.0.ebuild
index f3ced4ff8aed..0d28548f85ec 100644
--- a/dev-perl/Params-Validate/Params-Validate-1.300.0.ebuild
+++ b/dev-perl/Params-Validate/Params-Validate-1.300.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Flexible system for validation of method/function call parameters"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~x86-solaris"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/SDL/Manifest b/dev-perl/SDL/Manifest
index 507804ca492e..da8289a301f5 100644
--- a/dev-perl/SDL/Manifest
+++ b/dev-perl/SDL/Manifest
@@ -2,5 +2,5 @@ AUX SDL-2.546-pointer.patch 671 BLAKE2B 188280d823e6cffea2e7d33ede63ecb172a8a272
 DIST SDL-2.546.tar.gz 2487053 BLAKE2B c0856c844fd94338f7fe9cd1a20f7e7889cf73ac0c4018bca55b4fc630555b344cebe5158db5fb369ae6cbdaa5471a6681aadd71b788bee044fb367b0b12f9aa SHA512 7f7015c90a277b91951a2357bcdf7c3f2f930270d211657c903240ed4529f408c200337ca79e4971eb3912da28ebf1e950053ce4d763c2599c701444c618c71a
 DIST SDL-2.548.tar.gz 2487708 BLAKE2B 1d17c5ffc8d966fd06b282632de1f504548df9c67754788e5dcbe2144057aa9d463a88e01b33b0f265a821cfb24847bafc1cb1215cdd6282cc29ff3aacea6c3c SHA512 bafc49dddb7e592861f822920915c73bf0c5eea3a6c567623b48a2332c7644caf1451e457545e6666adea5e314b23bcd85a3f3a52c770abfd498c0e4c0feae85
 EBUILD SDL-2.546.ebuild 978 BLAKE2B 260b56b970984c3131c72f44dc79beb2de2d24f7cf8f1110c16953afcf6a34e952ca849d5672a04bf4bfa35210df5d4e85f4341c1683025d958bcdd22929626a SHA512 cf5f5f8398f34f842311fe3e70eb2f5a2e760c368c42a95c9b2d843720c4bead6fbfc59015721273cc58b0b842e4b2d81563c68c0318c003c5d964c6620e7e37
-EBUILD SDL-2.548.0.ebuild 1029 BLAKE2B b259ba8b9b387b68dd2ecc9a2804557abdba78ea767ea8cd1dcae5f5dbb62df821b30365f5c3d76f27ac5ecf25b3ac3e33bff2b5e4730eb4f868198e8df4c76a SHA512 cd09a7c84bd37d559db140cd981d44df63de19f4eafe2abdd4f4a296cb2f57b48fe1048aaebec4fd2cccba61f4e65fcfc89eb23e666e7ef75f0a6122ae3ecf08
+EBUILD SDL-2.548.0.ebuild 1028 BLAKE2B 40caf4ee840e1640fb05194847fd79db11f50d697f0d4b4215e14482842e8978781ec3c3da43a71d84b055a00ac9cffcb5389e64c7ee411dfeb684ca18c81ae7 SHA512 3d21ed158528c13c8eebca1612464defbc16aa9b6ca65be8bead1fe8b4b1b6bb364713628cc0e6688fc1b69fb981c6af85d6cce7656129993eabff088603dd7f
 MISC metadata.xml 5480 BLAKE2B 85c0374b2a8164223dad73037282a6bbd885f1fd841b0099aa37e12db5c5dadf5126d53352483fa112936e5057ffccd927422aca617f24cd0840e98806c0b82d SHA512 6940b411e173bb673ebdadefd7ddb0b7b6edfb950022400fc2f483027749180ef6026867acfd9906a5d48ec44702e540b43c23f87c11824215fbd1046d6a92ee
diff --git a/dev-perl/SDL/SDL-2.548.0.ebuild b/dev-perl/SDL/SDL-2.548.0.ebuild
index 1fc59835856f..78d87f151b2a 100644
--- a/dev-perl/SDL/SDL-2.548.0.ebuild
+++ b/dev-perl/SDL/SDL-2.548.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://sdl.perl.org/ http://search.cpan.org/dist/SDL/ https://github.c
 
 LICENSE="GPL-2 OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa x86"
 
 RDEPEND="
 	>=dev-perl/Alien-SDL-1.446
diff --git a/dev-perl/Specio/Manifest b/dev-perl/Specio/Manifest
index 28c50ac87250..3dd26b4e70ab 100644
--- a/dev-perl/Specio/Manifest
+++ b/dev-perl/Specio/Manifest
@@ -1,5 +1,5 @@
 DIST Specio-0.42.tar.gz 101641 BLAKE2B 9c527cd1b306d1a8394ad5b6757153aa00edcf111a444b3792cf088aec0a00597c655f59971eef7a8a6a7689e9b683ca78789b7adf1c9d19a0b6861cd4b90733 SHA512 7a9ff3e96cf3957d7857cd5f6af5efd9e35fc4c888fcd8177041e34a2388f54269e7a3da84ec60961fb61307beb882ebf54e19ae4346876e06197b1ff57891a0
 DIST Specio-0.47.tar.gz 108288 BLAKE2B 187ecd5ff0db27faeec03bd9cda6500d8e38d60d4c31aedc50d29fe3666fec68343c04294008941d92618622fc27b88623a8e18b29a63812ccddf79174bdc10f SHA512 68cdcf22818b27c38ce92b497adae81f27605aa385e9156d51d5e8e63da121d6bf26b7339a7ee3c9408cc6e3731702b008bc4b2e3c8eab67728f959f03682f44
 EBUILD Specio-0.420.0.ebuild 1013 BLAKE2B 35dd74a3f2c6d1dc04f434f761c30afccd842b2b1eafc9300461bb9b080e50125915f2291b1258c5c15a72d142d03a42839f37efc3e350d57993cde6f1444771 SHA512 bce97616294757c560a95d91d247c5aa4d2f1f4201dd484762be7929bc3b880aa53d493a238287883c8671e1f8f43b9499bf54dd552bfb43a2244360543607f1
-EBUILD Specio-0.470.0.ebuild 925 BLAKE2B 76f3352b9ccf22eac9a2fcdf5c585f5cc6ab13eb37de51e6cb6371186c428b495b6d24a7fc2c5cf1fbf557a829089609f070b2726e196d3fdb5f3e72a4bbd051 SHA512 665e64f13083c60ad3f609f094906a810e1e6099ee3d681afba340af4ed1aafb587ce8b18e1bda669d5d076e3ac9e26817d2042afe83cbe7eb9a22975bd389bc
+EBUILD Specio-0.470.0.ebuild 931 BLAKE2B 02a0ffef0e1991c7047e50fb07222a407a75a3c29e17377c0c0d6751d4b4cf62d886722a0abfe6bdbd5961c1382417211c641c00fad506af16e9780203d397d8 SHA512 e31c93bd362bc95b2efa044549e49b49062d49e226c8f0753e7f72dd498a715a6b58d8142c77ab103c316f178ae878bea82387b491aaa96dd1d84d4b0cb3449c
 MISC metadata.xml 3182 BLAKE2B 7a2dcca648d380fb70b0ec0c9a88904b7eab40f946bfe6628623a648d48c31da42eb03248c68b95a581657aa6f1cf581df906f2f85aa1114492562a8f47595d7 SHA512 a7c0321adc9ab021d9b3b9095923aca9d1714c1421969e04f7e911861fba3b1b6af95894ed9aa9fb2184eb8488483037355347a0a0926c80bb18e9de707a3c19
diff --git a/dev-perl/Specio/Specio-0.470.0.ebuild b/dev-perl/Specio/Specio-0.470.0.ebuild
index ee421b054c76..80ca50cb25ad 100644
--- a/dev-perl/Specio/Specio-0.470.0.ebuild
+++ b/dev-perl/Specio/Specio-0.470.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Type constraints and coercions for Perl"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/dev-perl/Statistics-ChiSquare/Manifest b/dev-perl/Statistics-ChiSquare/Manifest
index 191ae22bb849..5c7c67b83fe3 100644
--- a/dev-perl/Statistics-ChiSquare/Manifest
+++ b/dev-perl/Statistics-ChiSquare/Manifest
@@ -1,3 +1,3 @@
 DIST Statistics-ChiSquare-1.0000.tar.gz 28821 BLAKE2B e6895291293682850b51c23f7ec15b3abf02836977f17293d152f7ef1efbe6a946c4c767fcac90cb6b006b8031dc6c164d1d797977082938d565fe2b62ae318e SHA512 6523c0e44b53835796c5b3f41cb6281413b79c596601a1971b8cb6fc7b2c76fc53ca60642bc96897083d6504ffc0e5ed35b475df4e9264231a5d602d90b3dd35
-EBUILD Statistics-ChiSquare-1.0.0.ebuild 254 BLAKE2B 1aff64ce2d1da6d34ea54f865f9f5205d73ebbe405780b12ef126f801e8deeacbf8487f783de97153da2e797b1b22d9a7e7d5180a1db4e9ab953502b51913ea7 SHA512 6d7b605c44cac2e086edaff6a045731e2af1170caad6b0811ad15dc0737645af206fa4448e0c285612f174082a897f7f9f232d6a13bc77d545b1b7e839a14dcf
+EBUILD Statistics-ChiSquare-1.0.0.ebuild 260 BLAKE2B 1fc52dbd5b714d38771940458ce82d39e7f6dee7a19b42222a199c10f0d0add802de178384a1bcd8504378da3e7134cf025fd6e20873c1eb11ff816f28ddbe57 SHA512 31ee6860a4461dbf7eda6af4f01b6dbe4e8adc9c72287066658190a0c1dd2f734f182c8f03ba1e3da1542de6a78e0dae8e1ac4fa4596c99443ffdfde03be633a
 MISC metadata.xml 258 BLAKE2B 27875c94f7bc66379335a8c7aa58972855f92cf88390cc368e1fe86ef5af4f370e66725b314e99486428cdd9330b341a6821ed5d3eb19af1950326f252b3eb18 SHA512 496cdc360ed68aacbf268bcd9d904ec27e855e4f70a4c76f4fd99b29d8abc5a41f598144dfa550c8982b6cc57e900aad69a97e32ad363af83e06b50afcb54080
diff --git a/dev-perl/Statistics-ChiSquare/Statistics-ChiSquare-1.0.0.ebuild b/dev-perl/Statistics-ChiSquare/Statistics-ChiSquare-1.0.0.ebuild
index a925d7d5e2aa..5104f8fdbb80 100644
--- a/dev-perl/Statistics-ChiSquare/Statistics-ChiSquare-1.0.0.ebuild
+++ b/dev-perl/Statistics-ChiSquare/Statistics-ChiSquare-1.0.0.ebuild
@@ -9,4 +9,4 @@ inherit perl-module
 
 DESCRIPTION="How well-distributed is your data?"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc"
+KEYWORDS="~amd64 ~hppa ~sparc"
diff --git a/dev-perl/Unicode-Map8/Manifest b/dev-perl/Unicode-Map8/Manifest
index 066025149c01..c2db5d31a569 100644
--- a/dev-perl/Unicode-Map8/Manifest
+++ b/dev-perl/Unicode-Map8/Manifest
@@ -1,4 +1,4 @@
 DIST Unicode-Map8-0.13.tar.gz 99250 BLAKE2B 675e39d091c41c2e92e279ada53c2b18283aa5416efc931eba67534af02fab196151e55757ebc689fc26840d290fa54ed91a77c588f8534d5ebe2ed0379ce42e SHA512 1e8db5bb1e10f13da4eb2c5de36d38e1cad5eeed2aba7e6bfcfb36cde727d557902ac476f64d28937ff2a53992c67f027d1a42edb005292d1c2ec89d05e18f2a
-EBUILD Unicode-Map8-0.130.0-r2.ebuild 372 BLAKE2B 09f2bd94b716e5391c7f53a1765f623d3f3561882ddf9d87017b4c3030c10b151051d8939ea3922f121396426705073f61b274eca76252a2cbb9eeca8efd8666 SHA512 ea4617c98c3608cd2f7f9c31661643b12b0aef4268a9fbbc2eb6e4853374c3781917981330cac362feb711a2bad025045a4f2819f0a9ddbc1a1f7cc2d27279c0
+EBUILD Unicode-Map8-0.130.0-r2.ebuild 371 BLAKE2B 8a9e9a0ce00088e9da02fcd062571c6ff60a77681cd8b08ebbe5e7420e6404fd848772d2ef0d65f90ba51698331b42ae310d122aa7573b3aa5edabbfcc637808 SHA512 4a429aa57c2a834de4d57fb3c1080f1e740a44532bdc72c5ad6eb4a8c2a79656e769135f10e05de8794051119e633094aed8292252f3671e417ac84347ec1d2b
 EBUILD Unicode-Map8-0.130.0.ebuild 389 BLAKE2B ca73d79cc1f10e9a1027a0174ffd96ab36b8ad570be38e64d9d922601872a7d9c2405814370064b840633df146a57e2ef00a4eff5d9f77bc41a4a8502ad03de6 SHA512 f61fd306df79a515527a3150543727a8cd7dfc93344f1640784efe50d736721d118ada46d0fcf516ced3059c3297b78bc393da9b5f0c9d47313379c4d165d0ca
 MISC metadata.xml 397 BLAKE2B 35a70d53e492b84efb60b06ea34af4ab513049c619b8e05aaba51a5754a96f90f2dcbe48fb0cab15eb8598c46c4bf2df0d28534042b718cbc194953f529d588e SHA512 e820b1784470ae364ea6bdbbaf29aea3f95bbb12a62c082412086218e5955847d39c206ac1244df8c68774cc0c450c833c14d7cf2b6f212393d40bbf2708b785
diff --git a/dev-perl/Unicode-Map8/Unicode-Map8-0.130.0-r2.ebuild b/dev-perl/Unicode-Map8/Unicode-Map8-0.130.0-r2.ebuild
index 43b9a0468b76..2d39f6a2c027 100644
--- a/dev-perl/Unicode-Map8/Unicode-Map8-0.130.0-r2.ebuild
+++ b/dev-perl/Unicode-Map8/Unicode-Map8-0.130.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Convert between most 8bit encodings"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-perl/Unicode-String-2.60.0
diff --git a/dev-perl/WebService-MusicBrainz/Manifest b/dev-perl/WebService-MusicBrainz/Manifest
index ca9dc9be23ab..8d3ca96d0100 100644
--- a/dev-perl/WebService-MusicBrainz/Manifest
+++ b/dev-perl/WebService-MusicBrainz/Manifest
@@ -1,6 +1,4 @@
 AUX 1.0.2-no-network-testing.patch 1965 BLAKE2B 29ff98e11459421b6820b5423a3430b36e4d0587809eb8bf41932cb2e871857ff518fa39ea9d9880109c7f6c9b20659d46004e9e4a5bd1a7ecd3bce8acdf85a7 SHA512 7e359eefe4836a49dd19e7f3685a22450bf6fe319190fdfb3a6a63b24af2c12c930fb4e9856c68e9a34663f0c9853cb556c7598a2033fa77c97e90d7c4d85a96
-DIST WebService-MusicBrainz-1.0.4.tar.gz 9937 BLAKE2B f57dc8edf4649bd1ee69d105cb6a1e885f695065f319e2537e1aa24a44560d19b2a947b98c2ad4fde0a965b93b3b3a9a562e6f6f6139d5694599e246735556d0 SHA512 91442fe4696a4f9ac1434cc9dc8d3a16d2e3a8ccd3434f5e4ac642ffba0d56db6583175283c0a1a75365cdc65dbb4516bfa6182be568de16767fba3676f2368b
 DIST WebService-MusicBrainz-1.0.5.tar.gz 10029 BLAKE2B 52e9e09f4b0c68fb26391cbfca2ba092fece7ebd1ead2b09a243718da1876209a4c12e723fdaf5ea8a3c796ec65b10481aeddba6297ef40812f61fca935f743e SHA512 b1dfa497b460fb56702905518d3f2de0f5af0f4003be9ce983954673b0abc8a67215a77079a2989fca2c0228409788ff3f767302659003f544e6bbd56ab6df24
-EBUILD WebService-MusicBrainz-1.0.4.ebuild 437 BLAKE2B a64d4f352dc1eeea5483717d82b2bd570ed7ad26b66087fc76245b94146d364c3a27ebcde41f0d38dac040fb3a747e497491b9dc0ca5113a99521e5c62ec9b79 SHA512 997531cdaf3b4f396b46674e0e684f9fe1524091bc34adbab74f896fb11e7caeda94dbb6acdbfa2036f43c61142302a2061092d6913fc0ee7eec0f8fac04a7b2
-EBUILD WebService-MusicBrainz-1.0.5.ebuild 416 BLAKE2B e9a2983da24d9f9c8bd2114174a3fa1fdf1bb05c364779987d75355e1e6e31a90e5b9914324e76f5add4cf9509b81f048f8392f839b0d8ffe9d674a3446c94e1 SHA512 c682e8d83c610e1e9242dcf8a3af1a2a3c222aaf2da2ad4700cb3de7e9db0f484eb54d065b079feb093f47eddee6e3a0a571a1291dda72b7f5a77e3e8c46bccb
+EBUILD WebService-MusicBrainz-1.0.5.ebuild 412 BLAKE2B 2d57a1a5525622a08206083fda7702ddcab6c75c601d9d56302c2177fd36b2d3a659189bfcdef7dc92735375ccad7d15be1b173fef13fb3aa36d4e3cae932689 SHA512 758f96e0f7fc14bb48b6c2a3089f77c02a18525b80a84be3920cfe44523c52d53214a281df4fc7a0553311c2ae9fcff1c849828a2090e002b715d69e154ec646
 MISC metadata.xml 616 BLAKE2B c011d9576426a66f0b04bb9dcb5bd838a356c8252c50e21d58959d395df335324ec54653fa258ff44fb86dd2cbfc2e4b456231a0a3ebc128baf4c4479fbe29b6 SHA512 47658875ff2da5ac0c27bfe60a7cdd583e0c04631a80058f8a40a3712235e693bd7946a9c08da6690ce3d2d903b8ab5e39e28ab3f259b506c6ee6381abf3fded
diff --git a/dev-perl/WebService-MusicBrainz/WebService-MusicBrainz-1.0.4.ebuild b/dev-perl/WebService-MusicBrainz/WebService-MusicBrainz-1.0.4.ebuild
deleted file mode 100644
index 7d1b87b678c6..000000000000
--- a/dev-perl/WebService-MusicBrainz/WebService-MusicBrainz-1.0.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=BFAIST
-DIST_VERSION=1.0.4
-inherit perl-module
-
-DESCRIPTION="Web service API to MusicBrainz database"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~riscv x86"
-IUSE=""
-PATCHES=( "${FILESDIR}/1.0.2-no-network-testing.patch" )
-RDEPEND="
-	>=dev-perl/Mojolicious-7.130.0
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.420.0
-"
diff --git a/dev-perl/WebService-MusicBrainz/WebService-MusicBrainz-1.0.5.ebuild b/dev-perl/WebService-MusicBrainz/WebService-MusicBrainz-1.0.5.ebuild
index a135c22b3bdd..25e96ecfb98a 100644
--- a/dev-perl/WebService-MusicBrainz/WebService-MusicBrainz-1.0.5.ebuild
+++ b/dev-perl/WebService-MusicBrainz/WebService-MusicBrainz-1.0.5.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 DESCRIPTION="Web service API to MusicBrainz database"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 PATCHES=( "${FILESDIR}/1.0.2-no-network-testing.patch" )
 
 RDEPEND="
diff --git a/dev-perl/XString/Manifest b/dev-perl/XString/Manifest
index 13e219e463c2..54a0ce5b418b 100644
--- a/dev-perl/XString/Manifest
+++ b/dev-perl/XString/Manifest
@@ -1,3 +1,3 @@
 DIST XString-0.005.tar.gz 134507 BLAKE2B f660122cb4363dff1912aa69907e003eef7da497ce95e3a377d7dacbde0887049167a98ea82927341337ba3a85e6f048c65018d979e71e6484f594a97f21e352 SHA512 4a6055e9e59169b77e04e8b890944b3a7bc4ff9844ad6b2557f7181f7b1c8576a7aab7ebee351044cbac8f3bff2d37dea2af4bc7ff775fbc3a398c9785c53aaf
-EBUILD XString-0.5.0.ebuild 300 BLAKE2B 72206610124dba2ec24d405d1ff29f0799851235feff345d95abe4580f4601c415466c525f3a4ca579e0e57846f4df16960ad655c4d4f40e9943cb5489432a26 SHA512 248c1762a10a5da057ab4dac784e84535b20a653fec18443d98465c2d2cd59c282160fb81b0d6429a2d8c9567f9525af3d0b52634b5f65b0a4256a595cac3fcc
+EBUILD XString-0.5.0.ebuild 306 BLAKE2B 07bb5a14db11d27fc987c459026cc6e554e68a39f2a5d97b012dbe07169c5fbc5cf8a4b017684d1cea8071b9fbb34828c1452cf64b85343f269541267d7655a8 SHA512 5cb7873693f719cce32f08f4af1f588b1cced4073f1c091d173d1e42fd1815f70d0662b306051a7f5ff2a494fd60692a00e980a63f824f5916bd610e2df36c1a
 MISC metadata.xml 258 BLAKE2B 27875c94f7bc66379335a8c7aa58972855f92cf88390cc368e1fe86ef5af4f370e66725b314e99486428cdd9330b341a6821ed5d3eb19af1950326f252b3eb18 SHA512 496cdc360ed68aacbf268bcd9d904ec27e855e4f70a4c76f4fd99b29d8abc5a41f598144dfa550c8982b6cc57e900aad69a97e32ad363af83e06b50afcb54080
diff --git a/dev-perl/XString/XString-0.5.0.ebuild b/dev-perl/XString/XString-0.5.0.ebuild
index 81b1debc57d8..491a746ec76e 100644
--- a/dev-perl/XString/XString-0.5.0.ebuild
+++ b/dev-perl/XString/XString-0.5.0.ebuild
@@ -9,4 +9,4 @@ inherit perl-module
 
 DESCRIPTION="Isolated String helpers from B"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-perl/glib-perl/Manifest b/dev-perl/glib-perl/Manifest
index aa981647e9f7..c868b7b46b1c 100644
--- a/dev-perl/glib-perl/Manifest
+++ b/dev-perl/glib-perl/Manifest
@@ -1,5 +1,3 @@
-DIST Glib-1.3291.tar.gz 301944 BLAKE2B 75ecded774ec2654a464594693315003c9805efcb444c4b3cd1f495afffc011a294217c3f8e91c0870707a56b6a8fa1f04a694088b0ada939703fe7e73f8c312 SHA512 5c596e29c3e2ef72908668ddf1f260cf217b64d73732e90ef0fdef007f98b29efcd0620f01e0a39b5f2a0b368d4a05926543c9db0593bfa5a027e86af95fddba
 DIST Glib-1.3293.tar.gz 302831 BLAKE2B f2554db363d4966e90f34439c2b014a30ec1fd13add587ac4d72558c2601796e53d8b89de052daea2d5e2a900d2b7928b9005fb9e197e167767b2fe1ff4c4dbf SHA512 139033e207ba9b12eb8701ea9e6e363f6d36e68320cb1a8b4d5943722fe80330594e42fd6d8061794d97dbdb06fdcdd48efea480a254a1e8981ea70e933346d4
-EBUILD glib-perl-1.329.100.ebuild 866 BLAKE2B e5b89cbe33299336797010991196a91966bf773661559836c63440406acf89e6e29c7edbc33b35c8d6042291496cfb77bb073d4ca8f365975b74ac471e260169 SHA512 678a6a631e53444e462fd334b16f009d883576a5174e8ea1eceac0063c1315174aca13e009254f716d5cb97489903c768dc4d077300e781ce26dc30764ac9b21
 EBUILD glib-perl-1.329.300.ebuild 889 BLAKE2B a5a7eeb4755640d92f1aa409a1726284eae6bfc29fdea5dddbb98349f2fcfadbee9e96d5b12c9782d8d51069ccd3f1eb763e27bd2d804ee7963e9e29da63a1cb SHA512 acd9d90d62f009cae93d02c61aa891fb9fe54eea8fbfd17ae1bb982c2fd32934707d53be5f62e5f09e3d7610f3d60b1b85fe1546465245bc9d9d11ac0135debd
 MISC metadata.xml 1366 BLAKE2B 22fe9a69112a56332288747a0fb9dba65038e2962b691447b9ba4aa25451791355dcd189f6c88099ddab3935e0a1b2a2d199398b9bbf49dee4653cb0bb9931bf SHA512 db6b4c9fb4bf0ccbf6e04d9a1d4a2e8b5fe4b321d57e8282deb6c3bc2185fe5335e09ffe8b92312c89f388e2d335774074a3f281ed924e75a734ea6a0eef2015
diff --git a/dev-perl/glib-perl/glib-perl-1.329.100.ebuild b/dev-perl/glib-perl/glib-perl-1.329.100.ebuild
deleted file mode 100644
index 889f84a3666a..000000000000
--- a/dev-perl/glib-perl/glib-perl-1.329.100.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_NAME=Glib
-DIST_AUTHOR=XAOC
-DIST_VERSION=1.3291
-inherit perl-module
-
-DESCRIPTION="Glib - Perl wrappers for the GLib utility and Object libraries"
-HOMEPAGE="http://gtk2-perl.sf.net/ https://metacpan.org/release/Glib"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2
-"
-# Log::Agent optional by Storable but has caused unexplained segv's
-# from build/doc.pl : https://bugs.gentoo.org/529080
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	>=dev-perl/ExtUtils-Depends-0.300.0
-	>=dev-perl/ExtUtils-PkgConfig-1.0.0
-	virtual/pkgconfig
-	dev-perl/Log-Agent
-"
diff --git a/dev-perl/gnome2-wnck/Manifest b/dev-perl/gnome2-wnck/Manifest
index 49864973bfd5..57578139df76 100644
--- a/dev-perl/gnome2-wnck/Manifest
+++ b/dev-perl/gnome2-wnck/Manifest
@@ -1,5 +1,3 @@
-DIST Gnome2-Wnck-0.16.tar.gz 24865 BLAKE2B 05012a21a3eb0531ecbaaa51db880783b9bb2d58a0eea2d43a5bb9c6b12d71dfac1f62dce7f45cf0c96194b313b3cfddcfec6d609d897b43e91c6796565625bf SHA512 d8ed39cd19ccaeb5995d97b392d1cc97fe0c9bb66781efb70d6160f50a212e263be3bb89c33ca1ff0ed3da3c55fd9968fa4026abcf8593996760831164acd00a
 DIST Gnome2-Wnck-0.18.tar.gz 27130 BLAKE2B 18ad7853a421ef11e57de10226af672470f2ea34c936ea7b3a5a6224ca089edce07afbe5fc228796fd18475027ab34908bf151bfb51acbda3690ce71c4039636 SHA512 acf1b4213070a7696426e04246ed01f2ce2ae2b196a62e3e69feab782b590a495a482b8dee866d788eebe8cc5eae81db9171d72fb9ddd7509707090380a09a89
-EBUILD gnome2-wnck-0.160.0-r2.ebuild 672 BLAKE2B 324c04772fd448c995298d425e2d634d916d75992361b6a32b48e1bcde43acec6af04fda7aa88305ae47c05c35e0fd0748b26ce61be842a1fcb23a416b31f6ac SHA512 9618f27fe6c9830b1c2d60407f4c11021b23f734b073d5525efaf701ca7814559332f29ac25123584790cef23ff3e7f8c53826ec5227ccac3f7e5d2c2de5cc3b
 EBUILD gnome2-wnck-0.180.0.ebuild 670 BLAKE2B c592fcbfaa76c9d6e48dd8ef1d68e380b218412236857aa7baf8e0d3ffa763df942ec1ce7e10377d1c07e11ad5078bd09ba738404a91b0ab86aad6ef41c00a75 SHA512 6ba569a357e516ec8b07e59cc985e0812d1b45be7cd3ee1165f65f49805b9df91a8fc90b3f18bfcd4435f5a1b4179a714980a2797c60705e2270c5176cc894d4
 MISC metadata.xml 451 BLAKE2B f6790c1052278fc010a85a0d21f1f3b1f0f0f0edaeef2ca3cace61c01435ab4d352b9158a8a2955833db3022129d37c961558a689ca2c4bafc1b2ab876addf5c SHA512 c23b6959b8f30ce7a73ac8352d6a343d6177f093868dc045bfdb54de5f9848210cee94494e323776a08da8c1dcbb90913334bdb23394934404c56e3149cef3f9
diff --git a/dev-perl/gnome2-wnck/gnome2-wnck-0.160.0-r2.ebuild b/dev-perl/gnome2-wnck/gnome2-wnck-0.160.0-r2.ebuild
deleted file mode 100644
index 41c37097ad0d..000000000000
--- a/dev-perl/gnome2-wnck/gnome2-wnck-0.160.0-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_NAME=Gnome2-Wnck
-DIST_AUTHOR=TSCH
-DIST_VERSION=0.16
-
-inherit perl-module virtualx
-
-DESCRIPTION="Perl interface to the Window Navigator Construction Kit"
-HOMEPAGE="http://gtk2-perl.sourceforge.net/ https://metacpan.org/release/Gnome2-Wnck"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-perl/glib-perl-1.180.0
-	>=dev-perl/Gtk2-1.42.0
-	>=x11-libs/libwnck-2.20:1"
-DEPEND="${RDEPEND}
-	>=dev-perl/ExtUtils-PkgConfig-1.03
-	>=dev-perl/ExtUtils-Depends-0.2"
-
-src_test() {
-	perl_rm_files t/WnckWorkspace.t
-	virtx perl-module_src_test
-}
diff --git a/dev-perl/gtk2-gladexml/Manifest b/dev-perl/gtk2-gladexml/Manifest
index b66527fbdf24..186b75dd0f43 100644
--- a/dev-perl/gtk2-gladexml/Manifest
+++ b/dev-perl/gtk2-gladexml/Manifest
@@ -1,5 +1,3 @@
-DIST Gtk2-GladeXML-1.007.tar.gz 38496 BLAKE2B 2a9dbd9fec4dcc40edb311a64d013de726e567bd7dd4218ed169479e2ee20fed1f8ae41cd413aff77917033fa8e25d5a87c29deb9152d00631a07564a869b525 SHA512 e40b859e76f99c5c9497e0c123679c916b3f5615aaeb208f56a9a4758a2a8a5d5078d4bf7b441ffc6080162a04bb146739457bbd71e4a443a2d092ddbb1ed94f
 DIST Gtk2-GladeXML-1.008.tar.gz 39653 BLAKE2B 0441417b50c531e2df2871b7b04a719a1e866799512a26cbf2040faf00757c12eb1d9deff8936ee9cd528b7bab2a59e64521dbe5d26e587a4d57f4fd144738c7 SHA512 bb95bf1ca2d8da6007338d5d1630620405fed4fba84670f3b5e8115aff80a4f5cd367d4b0bb2958fbbb8d8815002b0a7bb2ee9de3550e56ba9782a531f70ab6a
-EBUILD gtk2-gladexml-1.7.0-r2.ebuild 678 BLAKE2B 3298a05aa7eb1dba94b40679dd01b0da93186ae4b197d414e8932d78a9ff2696ab8c598f738fe7c5fb0b259aad4a559bb88cc1878eac9a9e515beede42db7dd3 SHA512 41bedc793a00fa0d6c167d14f2264d1fb82dddfb731deb5db6a7afdcb41f4adfe10faa80e7b7155246ab45492ea88f28293622f831c0392ac8fb2e8296a9c5e9
 EBUILD gtk2-gladexml-1.8.0.ebuild 671 BLAKE2B c4e8201adf6a85cc092ee431d01e174cac7602505eb5257327648fb886335c02f5cc17661fcfe8980b0295543a434698c5eaa614e1bbc1503766599fc9bd9aa0 SHA512 5e6600299e2c857aa1598203576b1862acb99c5c5ab61a69318961f9381bf019b795e44128d878e03446824e311db3fb5a8b485efba5a289ab3e3a099fdfe590
 MISC metadata.xml 399 BLAKE2B 908ba1f925c9f20a63749fbb16842d891cdeae2097b4ad911e4d172f69673c43797ba2ead3894a0f5ff06bb870efe8239f05373fecc497c66482efba1badcf40 SHA512 16f2a21cba5bdfa287c6539ef84702598eb4b3a8ad0921cecf247045f9a8fbe9f0a948c5d696ec1769cf8b4c7edcf116c8e03204c5209ed0bb48411280402a34
diff --git a/dev-perl/gtk2-gladexml/gtk2-gladexml-1.7.0-r2.ebuild b/dev-perl/gtk2-gladexml/gtk2-gladexml-1.7.0-r2.ebuild
deleted file mode 100644
index f8ed6783f33e..000000000000
--- a/dev-perl/gtk2-gladexml/gtk2-gladexml-1.7.0-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_NAME=Gtk2-GladeXML
-DIST_AUTHOR=TSCH
-DIST_VERSION=1.007
-DIST_EXAMPLES=("examples/*")
-inherit perl-module virtualx
-
-DESCRIPTION="Create user interfaces directly from Glade XML files"
-HOMEPAGE="http://gtk2-perl.sf.net/ https://metacpan.org/release/Gtk2-GladeXML"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 ppc64 x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	gnome-base/libglade:2.0
-	>=dev-perl/glib-perl-1.020
-	>=dev-perl/Gtk2-1.012"
-DEPEND="${RDEPEND}
-	>=dev-perl/ExtUtils-Depends-0.300
-	dev-perl/ExtUtils-PkgConfig"
-
-src_test() {
-	virtx perl-module_src_test
-}
diff --git a/dev-perl/gtk2-trayicon/Manifest b/dev-perl/gtk2-trayicon/Manifest
index 393ebd05d2a3..c20a7da07b94 100644
--- a/dev-perl/gtk2-trayicon/Manifest
+++ b/dev-perl/gtk2-trayicon/Manifest
@@ -1,3 +1,5 @@
 DIST Gtk2-TrayIcon-0.06.tar.gz 9576 BLAKE2B 77f4af73593747b22e53f6052ca55f75bcbd88e470c11d9f489db3e6c9fc2f7553d54aea8f66d0e7ce1b0217c9fab9cbe100f75e48b189b68380a0866169e136 SHA512 a74e6e3fa974d11e1bd9b07cb3ce4547d9239cfee6b46e1fb07a2b57c673154802a1f784f5f5f5b0c50baa357320483f6afadec222683e7e08d49ab0f11557e5
+DIST Gtk2-TrayIcon-0.07.tar.gz 10566 BLAKE2B e5086a3e727b7a5bac42d7a74c41b79441aecb8476b7a9f0e4dd21c7ddc40aa8cbfa14584cd524f6ea2bd3ec2cfc57035577525181933f7047098b16548650ce SHA512 4f2a156ef2f5556d731feb2b11b4d8b9bd43f79605ab0e9ed82a7b9e5b116db1cac782ddf787b794ba9df1c4d35c4c313df035dc1caf023ac54e6a90cc6c511a
 EBUILD gtk2-trayicon-0.60.0-r2.ebuild 698 BLAKE2B 924fca8d5f057fb67cc10c6705bb41b4fd97d74fa64a4eda2fac467ef9f12a7938f8fe139c7856a40a087d618969703487c3a199021916a086bee180867fc9ee SHA512 542d62392a9f97fbda9fb81faba542640acbcae579381f1c7b44bdc8f9d64c4630b572662be28fae872c5c92ed540086c54824669556a7077d39516e4acbefdf
+EBUILD gtk2-trayicon-0.70.0.ebuild 749 BLAKE2B 1fdf59a1d5537daa2fed41ad0dc7a1b6c4979797ef15c4cfdb03573fd42738795aa4f954ced6a1fb5e1282b3f8f8ca4c8339f5e488718d7ef114ae38fbf005bd SHA512 b68194adbc95db71db8d3ecd574ece37ca1647fcd4190753398b89928bc094778ca532475458f802e87bde9bb327fd831b232aececc9ad2d7bcf5e1ee856dba0
 MISC metadata.xml 399 BLAKE2B ee3ad3f88c0ed3ad1ab6da1bc5b6914ebfc389688e6105ee5f10adc4d3c68a972ffacf75c686a6526940d307099a286c43f4e40b6b9c87c0fdff6496f4bd1f47 SHA512 1a06027efe227f2893e14e15e5e0d700d370fd2f1d931153a6423e5295402dbfc2edc05dd4382158bc0bd1005445006ef446c2f9adc70c121fba79a962e92f55
diff --git a/dev-perl/gtk2-trayicon/gtk2-trayicon-0.70.0.ebuild b/dev-perl/gtk2-trayicon/gtk2-trayicon-0.70.0.ebuild
new file mode 100644
index 000000000000..2f68b6e739ff
--- /dev/null
+++ b/dev-perl/gtk2-trayicon/gtk2-trayicon-0.70.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=XAOC
+DIST_VERSION=0.07
+DIST_NAME=Gtk2-TrayIcon
+DIST_EXAMPLES=("examples/*")
+inherit perl-module virtualx
+
+DESCRIPTION="Perl wrappers for the egg cup Gtk2::TrayIcon utilities"
+HOMEPAGE="http://gtk2-perl.sf.net/ https://metacpan.org/release/Gtk2-TrayIcon"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+	>=dev-perl/glib-perl-1.12.0
+	>=dev-perl/Gtk2-1.12.0
+	gnome-base/libglade:2.0
+	x11-libs/gtk+:2
+"
+DEPEND="
+	gnome-base/libglade:2.0
+	x11-libs/gtk+:2
+"
+BDEPEND="${RDEPEND}
+	dev-perl/ExtUtils-Depends
+	dev-perl/ExtUtils-PkgConfig
+	virtual/pkgconfig
+"
+
+src_test() {
+	virtx perl-module_src_test
+}
diff --git a/dev-perl/gtk2-traymanager/Manifest b/dev-perl/gtk2-traymanager/Manifest
index 074bd8219004..e21c4347624a 100644
--- a/dev-perl/gtk2-traymanager/Manifest
+++ b/dev-perl/gtk2-traymanager/Manifest
@@ -1,3 +1,3 @@
 DIST Gtk2-TrayManager-0.05.tar.gz 10853 BLAKE2B 7df391d38d2d0107c9263f61e1d1161e40c2257964e92bbf355fd0e0144a00a129edd047da8e25a182ae50fb1ec2d9dce3d0ff0e1e0ad6b529b64c62aaaf3d8a SHA512 1f5e70f86f6c46aede939ed1c2412afbc3abb96176c13a953fdaad8110d9a0403d18f27eebe57eeb7d9d9d25c5ddeb7c74f5be9d89ee51a6a156eb9010025f48
-EBUILD gtk2-traymanager-0.50.0-r2.ebuild 664 BLAKE2B 8b965730bb6084485719ccc81894073a6ec3ef2ea6675b3a5944b6cf14eb41ba9e97a84e825530a67eb91c4b9d13159f8246b6ff5ec159500758b7ba437b69b5 SHA512 fc325752e931dcf5a1ea17e51146ec2127e7289e1c48f10541e0c3a3d1ba6a04810db9b4bf8a09f5b6f989c1da2c8cc3d34216613bd61e3ad0be75dcd127b571
+EBUILD gtk2-traymanager-0.50.0-r3.ebuild 661 BLAKE2B 55faa7acbcf3e2b40ce19e32114e008f1aea941aed82bf9550d9f4be86a4acae69a4a9e9c8734a237c7201362cea141df1654fca31c972992df92b348a00e38e SHA512 65b8d1ab5d26f08695ece27da96dd6c02bdd0ee871700fcc4d737ae65fe48001020954f86d1a5180b0ec9110e235b412eb6382d67b3141d95d6c324041e4bef7
 MISC metadata.xml 405 BLAKE2B 228f238be456b9e87106a755ba1a663e0ea1d171c4d557e8473c2e87aed04f9c62315ef5013e08f8eb7df21b7167ca0c20584b162377f210ef7e486e78cc695c SHA512 a2e91bd3df0ed46e7713f8c3f3ca95cc638b79256fd75375ae26928112bad4ecebefc51affedb74974eef60818abe451bb20668d617b5cf50f6c6b802350a861
diff --git a/dev-perl/gtk2-traymanager/gtk2-traymanager-0.50.0-r2.ebuild b/dev-perl/gtk2-traymanager/gtk2-traymanager-0.50.0-r3.ebuild
index 03dacf5e2d7d..d6e5b648fc12 100644
--- a/dev-perl/gtk2-traymanager/gtk2-traymanager-0.50.0-r2.ebuild
+++ b/dev-perl/gtk2-traymanager/gtk2-traymanager-0.50.0-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DIST_NAME=Gtk2-TrayManager
 DIST_AUTHOR=BORUP
@@ -15,16 +15,18 @@ HOMEPAGE="http://gtk2-perl.sf.net/ https://metacpan.org/release/Gtk2-TrayManager
 SLOT="0"
 LICENSE="LGPL-2"
 KEYWORDS="amd64 ~ia64 x86"
-IUSE=""
 
-RDEPEND="x11-libs/gtk+:2
+RDEPEND="
+	x11-libs/gtk+:2
 	>=dev-perl/glib-perl-1.012
-	>=dev-perl/Gtk2-1.012"
-DEPEND="${RDEPEND}
+	>=dev-perl/Gtk2-1.012
+"
+BDEPEND="${RDEPEND}
 	dev-perl/ExtUtils-Depends
 	dev-perl/ExtUtils-PkgConfig
 	dev-util/glib-utils
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 src_test() {
 	virtx perl-module_src_test