gentoo resync : 21.08.2021

48 files changed, 373 insertions, 113 deletions

diff --git a/dev-perl/AtExit/AtExit-2.30.0-r1.ebuild b/dev-perl/AtExit/AtExit-2.30.0-r2.ebuild
index 0e554dfd7e56..abd8be34c07e 100644
--- a/dev-perl/AtExit/AtExit-2.30.0-r1.ebuild
+++ b/dev-perl/AtExit/AtExit-2.30.0-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DIST_AUTHOR=NEILB
 DIST_VERSION=2.03
@@ -16,13 +16,11 @@ LICENSE="Artistic"
 
 SLOT="0"
 KEYWORDS="amd64 ~ia64 ppc sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	virtual/perl-Exporter
 "
-BEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? (
 		dev-perl/Capture-Tiny
diff --git a/dev-perl/AtExit/Manifest b/dev-perl/AtExit/Manifest
index 9569fa4efd27..097c7673f934 100644
--- a/dev-perl/AtExit/Manifest
+++ b/dev-perl/AtExit/Manifest
@@ -1,3 +1,3 @@
 DIST AtExit-2.03.tar.gz 11263 BLAKE2B 0ae54e3eded9bda74e314f1c5b6c7d9013b479671950f0fc390568f7f6b8a715dd2c59b30ae131669fa1be8565c9f088ea9763ff765314b11eb4ee55f98a7979 SHA512 ce522b44ad5c2360c8e7f7f49257fe50f0079bd2070ddaa33916b2484ef8e6f6430df045e5693356c37651aa96ef6a7e7694a04ecbc91817d12d032681105b60
-EBUILD AtExit-2.30.0-r1.ebuild 612 BLAKE2B 8673a525c76eafb6d0bacd7b188ff770b20c4e7237ffe43e3469bfbda119f95f175c1fec698451753c01c26b0d17691eb43e6a225a9505ae9a92e7120664d2b8 SHA512 68022a4f69e88d382c225d1837cc5a84257a6a673af0742a2573eb60b7a0102d84292b94eaf853bfc49f3eb3b3d5a3c347009be487bcd9e390859c5bd118aa0f
+EBUILD AtExit-2.30.0-r2.ebuild 574 BLAKE2B 7f4d727f35f415b26a53d56d2bc92670f2d4ad5d47796d5739094d79270adfb51f6d31d3d1817638a8136c539b64dbafec22230bf61c677a87b7dad8e3ee67e6 SHA512 9c45e3833ec7771aabb708c3d478ef06daadb0d93e55eeed6b11c6fcf66e529ef83543fbb8b0bbd5b316b650640c254040e3c50799e2d0188b32e39f6e08ffa5
 MISC metadata.xml 383 BLAKE2B 1db1252e3d0773771b653a0f45974f9110831bbc34ea22619b77436cee4a1a6963938029f9279481d0bb35636df97f95799a0cb238803313aa2d5991d99b6c9a SHA512 fd7e5188a35b31d2f96c87b24ded46c3d0a304fc837320b5103bf96344e09ac0fc033d667569b47e312784cba26ab44e4949b6d1c1de79b50700773541da3228
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index be77de7d8db6..c39729934c92 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/PPIx-QuoteLike/Manifest b/dev-perl/PPIx-QuoteLike/Manifest
index 4e32e2e6706f..0c112083e4ad 100644
--- a/dev-perl/PPIx-QuoteLike/Manifest
+++ b/dev-perl/PPIx-QuoteLike/Manifest
@@ -1,3 +1,3 @@
 DIST PPIx-QuoteLike-0.017.tar.gz 71431 BLAKE2B a7ff0062dc5d9a1656365fc48633fe100dca75c7ed7990c68f2c2b88d9e54ad054f8a9438e636fc4e4dd22e3a39bc8d2531eb1bc0a371b31812068dda939f3b7 SHA512 ec51e4ee529e18305a5255d9d0d04a5868963481157c31ffbb92e3492c4153117b54b14c1c75b1792fdeb91d68c2a0596b7ace829a25b27a53dc4ec785d48bca
-EBUILD PPIx-QuoteLike-0.17.0.ebuild 638 BLAKE2B d60774755526d71c8e7d1ec28c5813aec161cd2bdf0359ae5813c889d68e369e449d2cf80ea4b363823d1f262915488a03d87379946ebf09de89e7d96dd1000a SHA512 8fd0d891d1b5bc9c99df96c650f7fa54aa1f1fd11e8a65e6a2227651798cc75fdc0ad4cc9c5780a1b9ad82fc9a84ad7c8ad66be04c2c551c37136eb13a553784
+EBUILD PPIx-QuoteLike-0.17.0.ebuild 637 BLAKE2B 9c08be5185ed6c84d94a070cf6b46c47325bbbed20924fdd48a8531a3d4fba4ec4d51cc7e121cc42ea1dba75597d399bd3db6cd43286fd3bbbd4a8447bae4054 SHA512 f1f7f20590f10e9b10c5025f5da1a245a69fb25bd5ad123f9bc1cba602cd284f25c582e42b4a9500a1ae0383f5a1383ae7ba45484cc7e5c5680d82442ea8ea4f
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/dev-perl/PPIx-QuoteLike/PPIx-QuoteLike-0.17.0.ebuild b/dev-perl/PPIx-QuoteLike/PPIx-QuoteLike-0.17.0.ebuild
index cebf5eaef151..261a19eb5691 100644
--- a/dev-perl/PPIx-QuoteLike/PPIx-QuoteLike-0.17.0.ebuild
+++ b/dev-perl/PPIx-QuoteLike/PPIx-QuoteLike-0.17.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Parse Perl string literals and string-literal-like things"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 x86"
 IUSE="test examples"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Perl-Critic/Manifest b/dev-perl/Perl-Critic/Manifest
index 5baa58cd567a..440d81f57cee 100644
--- a/dev-perl/Perl-Critic/Manifest
+++ b/dev-perl/Perl-Critic/Manifest
@@ -2,5 +2,5 @@ AUX 50Perl-Critic-gentoo.el 435 BLAKE2B 67cd9711566c4f06785a1060202638c7501648a5
 DIST Perl-Critic-1.130.tar.gz 647052 BLAKE2B 2b0905636486531dd8de50af6e490701f1785851744b78a5164539797e6d2549b46c9daef05d3061b53f82005ffc1fa47b7e2dccec613f9a5490c597d61072f4 SHA512 b443ddbb5905a61835061f49d7f10e2e71579e5df96778eb183c3d1e9987342e1536db61196b32e66a192c92916eafd9ebb7b713b0be71ce89c1f93155e89828
 DIST Perl-Critic-1.140.tar.gz 650449 BLAKE2B 648e3605278fbcd9c62437b1c3d587353541db3146829ed2d4aee5d0e240e13d692358146fd860150d1bae79d359ade93b53451a095a36f9c05f49cb0fd93d5c SHA512 46afc8260d2b500edbb29836be993f065270ed9ffa6aa00611a980b294025b794286bc820afeabb94b7d1cdd9bfb4e715e44e466fb0340cb9d938e031b54a6f0
 EBUILD Perl-Critic-1.130.0-r1.ebuild 2069 BLAKE2B 99a024565408fd0b7b077461eb36ed679192daca943930c812fc72ab002aaabb4325801439aab9c7db7697827fcf765bfafb2f5b68425c5e71db99133afb5457 SHA512 7f75de127aa1df7c18dc20565f77db29c6fa9cd64ccdd3052d91504142ef79b8c621953d632226e5402b7214b5411f104122d36d114352a1635c348ecb3bdf85
-EBUILD Perl-Critic-1.140.0-r1.ebuild 1966 BLAKE2B 468951a67f8c603629f73b1fd8f8f79bf6726c0d9c494b1be2e12ffe8fdb216bdea02f308458c452d4ec47669d10b9b26c1973aa712eb413fd9e07d394b83ce6 SHA512 90522b3f3fe9d25abc6e6443e8d92d1685e2aadb5629a37ac7d6de75cb2f5e28f2b6f723e1673e6e57d8471dbdcd47c3a3b77063e781929b1229cef37edcae09
+EBUILD Perl-Critic-1.140.0-r1.ebuild 1965 BLAKE2B 2bdb56af548cdb005a79da7eae74f2114719075287660d621049dd0a4fac130c3637f881b34ba5fb7dcc1edf671308ae13da391926cb742acde51f5fe645acf6 SHA512 fcff48a0e2ba43bf74520ec9277a573a596cf75fa66d9424fbb4ecff2662548b8ed449bd0522c69841d8e102082368c9d500d90fab896978d16fe02dd4b2dd4d
 MISC metadata.xml 20125 BLAKE2B 102686a85bf6f17bd0687bd5b05a4701c7b782c93f6b4fe7d3f4b181360067778c28911c85fa101e8cfc4e44174410b7b75bc0138a9b0e20a6ec38b2b956bb42 SHA512 e98d510b1a6d7e95b6558fbabb7857a2b5133958d790c87d51716be4214b60b091360de6e4e81b71aad14d4f94dcf7c3529087d32f052add0736c2fe4f89372f
diff --git a/dev-perl/Perl-Critic/Perl-Critic-1.140.0-r1.ebuild b/dev-perl/Perl-Critic/Perl-Critic-1.140.0-r1.ebuild
index 4e6c6a05a47d..758c0459692b 100644
--- a/dev-perl/Perl-Critic/Perl-Critic-1.140.0-r1.ebuild
+++ b/dev-perl/Perl-Critic/Perl-Critic-1.140.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module elisp-common
 DESCRIPTION="Critique Perl source code for best-practices"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 x86"
 IUSE="minimal examples emacs"
 
 SITEFILE="50${PN}-gentoo.el"
diff --git a/dev-perl/Test-Deep-JSON/Manifest b/dev-perl/Test-Deep-JSON/Manifest
index ab6ba851697a..f04517a22887 100644
--- a/dev-perl/Test-Deep-JSON/Manifest
+++ b/dev-perl/Test-Deep-JSON/Manifest
@@ -1,3 +1,5 @@
 DIST Test-Deep-JSON-0.04.tar.gz 10148 BLAKE2B bd8f6f5cfa396634befc392cd18f53262906bea5f55ffa249c60368ab2ea40fc6fcade5de2699050623c561c26a55d6aa0aac1bc77be8591d6aa4448df3400d8 SHA512 fcab5b04ca20d875a16e954d1e808655dc44c93b2200e1891f08765eba0864ac31e979e6e4193f553bf9d1e28bb4130a6ebcb585abc8698620a7e222fcc122e0
+DIST Test-Deep-JSON-0.05.tar.gz 10250 BLAKE2B 1b714ba7e3afdbede15e1667bd0f6916fec9fb83668bab1bf14076f5a2f1842f90a0c7983e3ce65f562086175a41efda93dca3aa74e1be3ae30f912b8d664729 SHA512 d2fc5d753445c16f38983ef7d0948eb85a5846299a2b7df5b288cc9585e2f658725e5ede6fb21a4e4f69ab1c500fa88f93273460dbc4fc7a7cc0ee1e20a33201
 EBUILD Test-Deep-JSON-0.40.0.ebuild 507 BLAKE2B d3c8d0c3253fd0da105f9e3346ecf3396400122bc1831514493fe246a32a21be62c432221b79122e3854f69d92bb1119a9c98e8de1651112421d4b2d0484b8a3 SHA512 1ce5d318850015effd58344f638468b53632656aca2b30b89da9146f91d791809d1b4f63ce4af86fa33e534af7dddfdc949f9c4c8e58246e563586fac3c1e870
+EBUILD Test-Deep-JSON-0.50.0.ebuild 477 BLAKE2B 242ecd781ac276a1bdef7414213f090b478abb0ba628b86c58fb901934e26e8ae06d9d35ef6ab8b75a8ca3322ca84b05e64a7b3cc63af1cd0135c6753344f5b9 SHA512 68e4529fe36615f58f1525156251c87de56357397c2af278ff3d36d848d3d8d66f5b8d2ed55cf3427ccf00f2b0409f1b97065eb1fc2d6fcc046bd1791d1f3d8f
 MISC metadata.xml 401 BLAKE2B d06d06512c830ed2e25d68aeba9787c34408b723d09d65295237c6da8c505a0d82405ffeffa7c28ce76b2e2d4fcde66eec765f40d012e93002518fa3daed788d SHA512 938588b4bf3a38366eddcb27d902928ec53a00d04ad1c41fd1bbf203d0a0bdabbadb199c1ea6da4f16c53046f1c086299b75148af108adc90a60c7a15794844e
diff --git a/dev-perl/Test-Deep-JSON/Test-Deep-JSON-0.50.0.ebuild b/dev-perl/Test-Deep-JSON/Test-Deep-JSON-0.50.0.ebuild
new file mode 100644
index 000000000000..d7280dd3a591
--- /dev/null
+++ b/dev-perl/Test-Deep-JSON/Test-Deep-JSON-0.50.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=MOTEMEN
+DIST_VERSION=0.05
+inherit perl-module
+
+DESCRIPTION="Compare JSON with Test::Deep"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-perl/Exporter-Lite
+	dev-perl/JSON-MaybeXS
+	dev-perl/Test-Deep
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
+	>=dev-perl/Module-Build-Tiny-0.35.0
+	test? (
+		>=virtual/perl-Test-Simple-1.1.10
+	)
+"
diff --git a/dev-perl/Test-Dependencies/Manifest b/dev-perl/Test-Dependencies/Manifest
index 3353ce8b332b..1f43dd4524eb 100644
--- a/dev-perl/Test-Dependencies/Manifest
+++ b/dev-perl/Test-Dependencies/Manifest
@@ -1,5 +1,7 @@
 AUX Test-Dependencies-0.230.0-backcompat-test-more.patch 1978 BLAKE2B df3ab1a45a96f85c5aca19d17c30a8ba70020a7b0e175cf857e8cec3a9d5b89cc57ac55875eb0793d0120830562cae221b4acb5dbfea3da3f83046375e4226bf SHA512 e86a7765b63701bf43aaac894661b8c21139592597e9f6b0fac2c3888de48d0df24f4c65f95bf8104cccb7ea73801613ea3a53630478f3f1156b6405db145aa8
 AUX Test-Dependencies-0.230.0-no-heavy.patch 7958 BLAKE2B 0465926b0c48198c13a0b01960f23c916e55dc2a5ccd7851634bddd632860105870f064ecfa62d5db9dc84829cd84d99e0fc0f6c1d0d3c40fd8cb09d3145f369 SHA512 cef9d9a6254b675de527d5a2bd7ab4f2371b39dc88b3110dac9c12b7a7f73a2649059358382be6851b82e815004050aed617f4ad45b4501552dad152d2dec6d8
 DIST Test-Dependencies-0.23.tar.gz 16324 BLAKE2B 2d148062b3f4a1967ed73c42a9aba424bb6f9e605fee96aeddea2ad85eed00fdc76454f0a379ace2437ead27553efbcff1f812f2155ac0b5b4d127b143c700e6 SHA512 cfbf3c337e8a26d1f4803d788a67399e7d87b611d4d9c4b3c942893212d9f7b614f45c03dacd19f081a25010f11e5e24ffe704196fc92cfd9466dd1ad84d48c3
+DIST Test-Dependencies-0.30.tar.gz 15780 BLAKE2B 2cc3bbbf2d2ac920b730c07530c9d82742706503b8da795e4be698e700da3d10c17db21b23d0aa3d0ed0e70403fec24bebddda0434d15c0f13cf586b24bccd38 SHA512 c48770357dacd3b81deb41cbe26134bce72edd33b556cb40c7f5abdf14de21a4973f181e74fba9247c83cac356ecaca71d3c7af9b34cdaaa6946fc188cae3fad
 EBUILD Test-Dependencies-0.230.0.ebuild 847 BLAKE2B aa21d0127e2211ec3abd804ec5ad1d1d3c34025a04423fd492e77610373eb3c37b5776284cd41d0d00d31c862b147422c61bd67e22e775374c502fd43b44d93a SHA512 dcc9cc7113abc91892b50ec1faf3133cd140cf8f998b022387c160c58cfb3bef1baa36200b340ec8ade3ce3ee50e7a14aa05c448a0b3308952ace8e6b8d9dda9
+EBUILD Test-Dependencies-0.300.0.ebuild 602 BLAKE2B 803e459934116f63b67ccae87c90e403e4f1bf4a9d84f10d7b5a352ea3e791e21fb1901032490bb40de0d62b17c65ff718a84b3862f1deed2cd66ea522dfc3ff SHA512 72af1a9a0789aabc0a7593bcbb74ac3c8364fe88ba3db3122256694567be756a2226cb67350165ebffc06bb3614b08be26cfed2be97aac927ab8a9ad12a7d948
 MISC metadata.xml 550 BLAKE2B 15f0ee5b003ba08b1fddd0d89fc8cd4b620a0c8e1c882be0dfd575f5228c21b1285daf288b161345edb051f6e310d88e9c6466f7d6023d4e300dd6b8badf4ffb SHA512 2af44a435265ff7ee3730a548148069771bf5bb9d7a193efb29232c7b2e7685e4c5cebb849519515d01d3191e108f8c58358c0a1a159b84b0f15eef418b8835a
diff --git a/dev-perl/Test-Dependencies/Test-Dependencies-0.300.0.ebuild b/dev-perl/Test-Dependencies/Test-Dependencies-0.300.0.ebuild
new file mode 100644
index 000000000000..f7cc8af81045
--- /dev/null
+++ b/dev-perl/Test-Dependencies/Test-Dependencies-0.300.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=EHUELS
+DIST_VERSION=0.30
+inherit perl-module
+
+DESCRIPTION="Ensure that your dependency listing is complete"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	virtual/perl-CPAN-Meta
+	dev-perl/File-Find-Rule-Perl
+	>=virtual/perl-Module-CoreList-5.202.6.200
+	dev-perl/Pod-Strip
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-CPAN-Meta-Requirements-2.120.620
+	virtual/perl-ExtUtils-MakeMaker
+	virtual/perl-Module-Metadata
+	test? (
+		>=virtual/perl-Test-Simple-1.300.0
+		dev-perl/Test-Needs
+	)
+"
diff --git a/dev-perl/Test-Differences/Manifest b/dev-perl/Test-Differences/Manifest
index 16fe96972028..af7421858fc4 100644
--- a/dev-perl/Test-Differences/Manifest
+++ b/dev-perl/Test-Differences/Manifest
@@ -1,3 +1,5 @@
 DIST Test-Differences-0.64.tar.gz 12577 BLAKE2B 8167ea94514c8680f407713677828dee56f56fed3627597e43decc4342d063518a3b3762692595183dece1b3f6641f33caa82fb4f7a541fabd7e7256efe4ab4e SHA512 118a4b8e3f61f64d6676c82913bb605a843a408f3fc5d960b40cc86f10423380a203b2a5604e15ba8d4e0cff96af88b551fba1c7aa2ada3c0ef408a27ee5f069
+DIST Test-Differences-0.68.tar.gz 14518 BLAKE2B ca4be9098d0a1062ed748711bd932e057a4a35e9ffa042ae4c7e6fa993f132a0da93f4aa932f0b6858e32f9e1cdc380a8c4d9531709c9321017eef6781cfe5d7 SHA512 17e5e54d9a67fefdccb383be860ea594ec15563b66a7d93652a93799deeceaf92a4d48d01bfd4d2276c5f1520916d1def654ba53759c7461737e1f9afa754e31
 EBUILD Test-Differences-0.640.0.ebuild 758 BLAKE2B 9a3bb50d1522ed24d479a149e3df484e3b07bd5d0d62bb15ec609a4c92871719f0db7cd0281452909538ed0b165f6634d2f7f5806927f4e0904eb04e2a59d990 SHA512 8a87c3070db97b3e8deb2c76b02deac5ee503e3ec177b37953c36334c9d9ad73a3b212299e8752260abefe39ac765e05f71132b8cb642ae1aff80e92e91d1b74
+EBUILD Test-Differences-0.680.0.ebuild 691 BLAKE2B c8e37fce13282aa72c80612472de4939d4a8fc5330397305890bd4affe7df29103ff1a73f2e97f31b590b8c732ee4102fe34c699337fb3f64e5b47daace75ba2 SHA512 d48533ff99a7fbde68a6f3104005f36575321f7ff7a49ae4ee1b2282da5a3c0da5fe0d979a825ab604b6473aba4d84fdf5fa659fad09716bfa52551408dcf52a
 MISC metadata.xml 404 BLAKE2B 0c49069162cadf91f069dffc7402f904801ee55c0fccb19f4f0a0a03ef82a3cac070464adf0cc704483e703115fc122f96904e917923a5767ffa246c4e993962 SHA512 3867a794ae70efc4dbabb8d40c0f0e69127dead110a196dec49a9834c9df9e5ec56f92decab5f7833ddb1a240790874933b0fb6ff491e6fb83d0c63845a94a83
diff --git a/dev-perl/Test-Differences/Test-Differences-0.680.0.ebuild b/dev-perl/Test-Differences/Test-Differences-0.680.0.ebuild
new file mode 100644
index 000000000000..79b3a69e3de3
--- /dev/null
+++ b/dev-perl/Test-Differences/Test-Differences-0.680.0.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=DCANTRELL
+DIST_VERSION=0.68
+inherit perl-module
+
+DESCRIPTION="Test strings and data structures and show differences if not ok"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-perl/Capture-Tiny-0.240.0
+	>=virtual/perl-Data-Dumper-2.126.0
+	>=dev-perl/Text-Diff-1.430.0
+	>=virtual/perl-Test-Simple-0.880.0
+"
+BDEPEND="${RDEPEND}
+"
+
+PERL_RM_FILES=(
+	"t/boilerplate.t"
+	"t/pod-coverage.t"
+	"t/pod.t"
+)
diff --git a/dev-perl/Test-DistManifest/Manifest b/dev-perl/Test-DistManifest/Manifest
index 247c79c8f247..49f3522145d3 100644
--- a/dev-perl/Test-DistManifest/Manifest
+++ b/dev-perl/Test-DistManifest/Manifest
@@ -1,3 +1,3 @@
 DIST Test-DistManifest-1.014.tar.gz 35599 BLAKE2B 886ba7b68e7ddaf0546db52dbb59627eaf700fa8fb42acfebd5334c72f1c202379b14df829f340a526f8321ea2674bfcb7b1b13d1e5e3ec2c7d13089832721a0 SHA512 571d4771c0ca51578df38adbc000e8063e44e56d89217d1dacf3347b6f2f5c18597a67d999b00f51926725198991891d87cab6b6df31ddfca91b051bee7f7140
-EBUILD Test-DistManifest-1.14.0.ebuild 596 BLAKE2B 3f322b061d4fc638c281bfe8f71a5e0b2c20f73f0a54fa657d50649c43491623f9d65dc0204916c63e0920db9c4961ac9434ee281137ad66ca5a47daf316937d SHA512 f410f12a401908a4643b4ba4fc0ca4595ae54ad4caf33f14e8afe9260a609494efa2052fafd0ea0f2888514ea277a2ea7450c8c6fce7f80d00ad07955fea966e
+EBUILD Test-DistManifest-1.14.0-r1.ebuild 539 BLAKE2B d8b814cc655db95ddce37feb2a66b0060a42480b133aa741f1384cb9b86a84e9e116087d769f8d75d95346161f425e4820f4c9ab8c59952c69938ba5e7e596d9 SHA512 49dcb24834806b6bc1861afc64c64b08f466a4f8cb85d88bf96cb8a040d88eb612c879c9327f1858f1d8021b01c529368f59fd68f6702dc56ea663a6158da70d
 MISC metadata.xml 394 BLAKE2B fa5a53566fbbb52819f5289e596fd4fa7cc9347976f8f92e7ae9a7a47dd54e91d0354dcb18cc055303409e08e7b9d0a91f1167818c1e8fc8542446abbb81e947 SHA512 8de0bdaa5c90dfce2f28b69d1b725afb6554c18e837a68ee5d8b15b9cc3f88eb0cbdfdd8f0d046f0132812e2e82f965754c230458734338aad323c083ce3457f
diff --git a/dev-perl/Test-DistManifest/Test-DistManifest-1.14.0.ebuild b/dev-perl/Test-DistManifest/Test-DistManifest-1.14.0-r1.ebuild
index baa75c3a8ee6..a3471e33523b 100644
--- a/dev-perl/Test-DistManifest/Test-DistManifest-1.14.0.ebuild
+++ b/dev-perl/Test-DistManifest/Test-DistManifest-1.14.0-r1.ebuild
@@ -1,18 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-MODULE_AUTHOR=ETHER
-MODULE_VERSION=1.014
+DIST_AUTHOR=ETHER
+DIST_VERSION=1.014
 inherit perl-module
 
 DESCRIPTION="Author test that validates a package MANIFEST"
 
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	virtual/perl-ExtUtils-Manifest
@@ -20,12 +18,10 @@ RDEPEND="
 	>=dev-perl/Module-Manifest-0.70.0
 	virtual/perl-Test-Simple
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	>=dev-perl/Module-Build-Tiny-0.39.0
 	test? (
 		virtual/perl-ExtUtils-MakeMaker
 		virtual/perl-if
 	)
 "
-
-SRC_TEST="do"
diff --git a/dev-perl/Test-Distribution/Manifest b/dev-perl/Test-Distribution/Manifest
index 67839fbbb467..1c3d0966a050 100644
--- a/dev-perl/Test-Distribution/Manifest
+++ b/dev-perl/Test-Distribution/Manifest
@@ -1,3 +1,3 @@
 DIST Test-Distribution-2.00.tar.gz 11326 BLAKE2B 0ef42150a1dc9e07220b3b3a4badc2a00b9ccbf55d383794ad4fbf17ce1378112f9de04eca669e16e298eb5a22609dc58b214da9f15f80fd7478c11a985a9d28 SHA512 74ad4bb228d6727f1c966e2b3311914de15ef6d191717b6c9e7fa7ab9286de737aefc889c1c3f1d587582f234e0da55e980cd7eabb7edce4bd13ff79f4333638
-EBUILD Test-Distribution-2.0.0-r1.ebuild 540 BLAKE2B 81d3c63564ce5aab1c514b6441770430320a81b0617c7d34fae74c8f16b05be3983711dc099510ae93eb406b13abab34ce8e7a0564692edf8887b1c78620dd15 SHA512 14e915d02566d63d87f8b1b662803dfe4fb727d914e98d515d380cd6f56d64f6dc1f702cb8055bf60b2d488e278464fdcf94790400fb105f50f9937f9c903f23
+EBUILD Test-Distribution-2.0.0-r2.ebuild 530 BLAKE2B fe33c7845f6bb0a8d3d656d950bf18c4d3cf46fffe56e7072250de17850496c5eb08272e4acf1b34fd21c522cdd5afb6b9e121e019fd6c96d66ced5bdb03e696 SHA512 013b59c7f206c74e90838308f564d7d6a49ad21b5e905c7cd55b7959f6567d2d41191c313783df3ee19471cc7f63c361ce310d14b2e16f3a352de5f1f93ce578
 MISC metadata.xml 1137 BLAKE2B e9557c8c7b7fe24147a3df842d25b611efdec0fcf9c7b8bb56111f2b3634ea4d864646c9a2afc1f7cc5c8419857b6e6cdb137f65c7c72be81d4f81c45be84822 SHA512 e3103d563a3170f254d35cf3b0d3ae728338fcf219852d333c8edb066fde8fab3e0f324423d6137336047009575dce83b485bda0ad36f18349224f25760e9427
diff --git a/dev-perl/Test-Distribution/Test-Distribution-2.0.0-r1.ebuild b/dev-perl/Test-Distribution/Test-Distribution-2.0.0-r1.ebuild
deleted file mode 100644
index dbf7bad4bed7..000000000000
--- a/dev-perl/Test-Distribution/Test-Distribution-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=SRSHAH
-MODULE_VERSION=2.00
-inherit perl-module
-
-DESCRIPTION="perform tests on all modules of a distribution"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-perl/Pod-Coverage-0.20
-	>=dev-perl/File-Find-Rule-0.30
-	dev-perl/Test-Pod-Coverage
-	>=virtual/perl-Module-CoreList-2.17
-	>=dev-perl/Test-Pod-1.26"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build"
-
-SRC_TEST=do
diff --git a/dev-perl/Test-Distribution/Test-Distribution-2.0.0-r2.ebuild b/dev-perl/Test-Distribution/Test-Distribution-2.0.0-r2.ebuild
new file mode 100644
index 000000000000..95129a58c232
--- /dev/null
+++ b/dev-perl/Test-Distribution/Test-Distribution-2.0.0-r2.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=SRSHAH
+DIST_VERSION=2.00
+inherit perl-module
+
+DESCRIPTION="perform tests on all modules of a distribution"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+RDEPEND="
+	>=dev-perl/Pod-Coverage-0.200.0
+	>=dev-perl/File-Find-Rule-0.300.0
+	dev-perl/Test-Pod-Coverage
+	>=virtual/perl-Module-CoreList-2.170.0
+	>=dev-perl/Test-Pod-1.260.0
+
+"
+BDEPEND="${RDEPEND}
+	dev-perl/Module-Build
+"
diff --git a/dev-perl/Test-EOL/Manifest b/dev-perl/Test-EOL/Manifest
index ecf744507a13..ec05c9da86a5 100644
--- a/dev-perl/Test-EOL/Manifest
+++ b/dev-perl/Test-EOL/Manifest
@@ -1,3 +1,5 @@
 DIST Test-EOL-2.00.tar.gz 29987 BLAKE2B 505eb9a412f0da9a1de7f56cefa2ae076cfcf5adcb056634e5e163c19b1ebfb1fab0de48eb320f0bd0eb9e4638191f1ca943fec336863487ca80e47672c64dc3 SHA512 9f43b88c05915fe722307a313f9149837058e34c8310393e97418f1393f828c2d2f7c6a7537d9ca8caff1b07a19cb2600904319f753b1a76bca09e654637ede2
+DIST Test-EOL-2.02.tar.gz 32739 BLAKE2B f2f041ff282811b2be9e4e41fa2386b6e0a3668bfbde9a87f7c99ca80e99a693fd4e402087ea1dfc160ca921252cf6cc538d05c4155c67537708c0bc43ff7966 SHA512 03f3a60973fde1c0fb9532be957d981bad657fec4db1b77dca865011e1bf39dcbb91a8ee09cc692ab9b372a139371ba66b69c60ae582b687a6ec230fb58a9654
 EBUILD Test-EOL-2.0.0.ebuild 535 BLAKE2B 9a13e5d4772d2a52fe715240e98b31597893aefb58542232cda98f5cf7cc8812bbf74f154299bf8f7e29b581049b929c68a039a750e165c82ca21d7b9c1e7bbb SHA512 d07e05eef1b49c0668727362515fa0bd23eb53b7edee9df1b2deb766efe7522d356c9cc2754e8ba29845038963d568fe5f44059a973281d7a059dc3385c74724
+EBUILD Test-EOL-2.20.0.ebuild 432 BLAKE2B 7360f58e6d420520b7f4ea4e4ba580421ea2071c7cec1195f755f73212ba1fa7ec78eb4bf936761f04cf10acad3e4c04dffa947b21eee071ea1a074f4555f115 SHA512 9a26718ad5f976f68dc0105bc89c841e9add877a46466614cf5d209bb81dd22230beb815a382609b7583661a67c8d48bb6743a6eeb07b1be6bff49319109ca04
 MISC metadata.xml 473 BLAKE2B 4ff9f7c53dc2fec2329b75f29902dc6e1151804713a890fe23010e73344b80b7540b5a4883c5b043dba1c2590b4f3761e46b6c6dd4b4aab5f206dbecdf26c919 SHA512 c186a5f6ec9a875d92bc58b550889cdf08e8da342c6591a95850fcd46f08b193ed5b4b6f25a3a4dcd33775ec08408ad862f09c7f5813baa208619ae2cff53c80
diff --git a/dev-perl/Test-EOL/Test-EOL-2.20.0.ebuild b/dev-perl/Test-EOL/Test-EOL-2.20.0.ebuild
new file mode 100644
index 000000000000..9099d952234f
--- /dev/null
+++ b/dev-perl/Test-EOL/Test-EOL-2.20.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=ETHER
+DIST_VERSION=2.02
+
+inherit perl-module
+
+DESCRIPTION="Check the correct line endings in your project"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	virtual/perl-File-Spec
+	virtual/perl-Test-Simple
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Temp
+	)
+"
diff --git a/dev-perl/Test-Exception/Manifest b/dev-perl/Test-Exception/Manifest
index b02e423d8984..3f06ca55d650 100644
--- a/dev-perl/Test-Exception/Manifest
+++ b/dev-perl/Test-Exception/Manifest
@@ -1,3 +1,3 @@
 DIST Test-Exception-0.43.tar.gz 15204 BLAKE2B 072705a06992fea690e3e71896fba8c916dd153f47cdaff4eb1d4f8730baa3e9589861ffe901208aff48169b8b054ca118cecf5c92c116be9fd61bf4748923a8 SHA512 f5ab65ce7b142ab7a96b0075838826a7f6b975a151a285e00d99db307bea07b359d5ca44eb678ba93d97b2ae37a112f0002ae1c06bb6e5654b80ce8c5473aa20
-EBUILD Test-Exception-0.430.0.ebuild 653 BLAKE2B e71717110da6b1d2342019ef5e57655defbbb3133c83f1f5c2509d32a2260638247420b790377ce33be1c9273e3cd968fead4d62e916adede9db69db3df067d5 SHA512 d53cf8b9e109dce4c04477e4ff51451e508b3af40450ca4ffb936cc5081ff86578b2fa0e638c9d93923425c25affc5c11aff4e0c8fda5a595bad9d4e2eeba937
+EBUILD Test-Exception-0.430.0-r1.ebuild 646 BLAKE2B 0a5d4fab7f5f018eff41502a49c3eda8bb5d578051e55f51fc1da0858b830c5d8a0055ea03a5524e86aa0c93597cdabe22a002efee6f5a23bc03ffa47ea81ba5 SHA512 ac6f57d99bb675e616b25a4be019ee4a70179b8b5c09c2ca25a6db8ce904a4e7c4f90e6d3cb55a96b566e191696874c106a05a6e817903faf60fd92c2518e855
 MISC metadata.xml 400 BLAKE2B a0cfad7338fd59c9ff94063be86dbacc79301f95f0fb4ed0c78baa75b976bd234c08574aa3b99940f73794fe037feb97924df0ab7a2bb1dca76e836ff99ae8b5 SHA512 c0cf344db8299f4f5174267d9b75e23538330143cba4a0c46bc8e8af29f5a0ac33f624dc5f86b7cc8d01b8ff28e58ef5480e13c378230e88d8a65b5393151171
diff --git a/dev-perl/Test-Exception/Test-Exception-0.430.0.ebuild b/dev-perl/Test-Exception/Test-Exception-0.430.0-r1.ebuild
index 797aa969351f..c80cad919aee 100644
--- a/dev-perl/Test-Exception/Test-Exception-0.430.0.ebuild
+++ b/dev-perl/Test-Exception/Test-Exception-0.430.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=EXODIST
 DIST_VERSION=0.43
@@ -11,7 +11,6 @@ DESCRIPTION="Test functions for exception based code"
 
 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="
 	virtual/perl-Carp
@@ -20,6 +19,6 @@ RDEPEND="
 	virtual/perl-Test-Simple
 	>=virtual/perl-Test-Harness-2.30.0
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 "
diff --git a/dev-perl/Test-FailWarnings/Manifest b/dev-perl/Test-FailWarnings/Manifest
index 250576c51bd9..3ff30dcc7b71 100644
--- a/dev-perl/Test-FailWarnings/Manifest
+++ b/dev-perl/Test-FailWarnings/Manifest
@@ -1,3 +1,3 @@
 DIST Test-FailWarnings-0.008.tar.gz 13734 BLAKE2B bf14da69bcfed50d8bd2801f629ffe4f9382e89a9febc334cafa7cc69e72357e4452a21aa1d630f9b7392cbc3ead4f26c3af93d810dbb98e94d2f7993193c855 SHA512 7bffcc18191326095d99ad01be6426f4d9d927f769a156318f9abfea67da6adfecb657bad89390740c9f531fe69c717afa1d250258eed63d127bf10cbbf2bd51
-EBUILD Test-FailWarnings-0.8.0-r1.ebuild 823 BLAKE2B 4b8152d5be67b96cc68eebc1349c6889784d536b7f1dcbe874cefc890833e78dded18775f59737e0abfea60edae12636784ade9981d53e7e1ef0dc3f551b6df7 SHA512 d7dffee8d4e7e2907863a534b67e7ee0c6e4828b1cc801260ffec249e5d3f81d3bb1c9b2522c30ac552229dab85b386c367377ca9cbf9ddd80b15b293b1c1760
+EBUILD Test-FailWarnings-0.8.0-r2.ebuild 785 BLAKE2B 0e168808cd93097bb42efc0e2839d0491b23f530811b59720e2dc54b586548fce9f1823df244c6cdc10254736acc16316ae4449efb0e0632507f88c6336edb68 SHA512 31a7cf6450bd90eae7b9348ea0a78f55aaf3c74ef286b3904187097dc4959642526071c776845abc971a54bfee69dab026d147f5c27f63d7da95ccaa561a20ca
 MISC metadata.xml 406 BLAKE2B 49fbe94f177fca2a050e4750fa41b51826fa42ae88cb6329ec15631b92c9e1d25672b579c6d56870e5e9cef469fcddd74e456b5f66b10b2bdf49745a1088f5d2 SHA512 710f76778cb06039848865d8c0c163dfa2789f626315ab904765647ed304f684254c08cc5bddd1f5608a97b4215db3d511e6aa4dbb3219ec4ba4c215ee2afba4
diff --git a/dev-perl/Test-FailWarnings/Test-FailWarnings-0.8.0-r1.ebuild b/dev-perl/Test-FailWarnings/Test-FailWarnings-0.8.0-r2.ebuild
index 2c673fd99056..38254a409686 100644
--- a/dev-perl/Test-FailWarnings/Test-FailWarnings-0.8.0-r1.ebuild
+++ b/dev-perl/Test-FailWarnings/Test-FailWarnings-0.8.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=DAGOLDEN
 DIST_VERSION=0.008
@@ -11,8 +11,6 @@ DESCRIPTION="Add test failures if warnings are caught"
 
 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 )"
 LICENSE="Apache-2.0"
 
 RDEPEND="
@@ -20,7 +18,7 @@ RDEPEND="
 	virtual/perl-File-Spec
 	>=virtual/perl-Test-Simple-0.860.0
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? (
 		>=dev-perl/Capture-Tiny-0.120.0
diff --git a/dev-perl/Test-Fatal/Manifest b/dev-perl/Test-Fatal/Manifest
index 8851418172a8..acf6bbd838b4 100644
--- a/dev-perl/Test-Fatal/Manifest
+++ b/dev-perl/Test-Fatal/Manifest
@@ -1,3 +1,5 @@
 DIST Test-Fatal-0.014.tar.gz 19685 BLAKE2B 02cfcb6c075bfcdc3ae1213c18132e124126b44d5e923f8ccd09f2df15eda6a1e1bea1c0c41c46ad9439b91a8fdb0db8f7083650b35bf3d69c50b0fe26a1cbaf SHA512 339d9b33231f8c8d93c0f9374a51458d004568a2f3e28471976e954c35d27efd348f68fb56e3cabd11dc47d37e7ce46282eba967c156ba5081811d221c6a7523
+DIST Test-Fatal-0.016.tar.gz 21246 BLAKE2B b6b1ad6407cea9e6b36dcae3ef1136ee7ada43dd6cdd575ddc6882e5c42db7b79f787a2cf3aed538db0fa560d474ef82061fbe27d3ab51f0c9d986fde3148596 SHA512 395d56cfc62fa5888458ec124710b5333f4c7396653e2755a69b08c738ca3d7503e8e413a10c8a55042fba15e90fa5331bb0bf9c59d3677c2ae5e710435120b5
 EBUILD Test-Fatal-0.14.0.ebuild 798 BLAKE2B ed82235d379e62a9497f5e083bcdd3a182733220b47a081d3f91e0da5b388fdd8851ce334ad1a551421e5640794f9b644d046e00fdcbea0a42275b2fc983b317 SHA512 77bd9c32c799015403e31c572a2109fb9480a1ee21ea69afd9085bb5300d54dd6ba59a28669c7302a64ac7d703e33f655d47fc71714da91cc6abcb2672441ca7
+EBUILD Test-Fatal-0.16.0.ebuild 769 BLAKE2B 961dea4641ad796a8a46d08081086e55dbe877e2d0ea85f4b6d4280f249e0144776d91bb9ac015005914646a32ba4181f558d3fd7e1e88beaac7d1d3a25954b3 SHA512 dd7d6bc0f8455cf40e2faa7be3f50279f732a79f9e3f8842b27d016dc4236813cdfc340fe305fab50532e2a2d771499745883aedfc6bcf7d514ac9d71b2cfe01
 MISC metadata.xml 392 BLAKE2B fbfe9106bced1fb9d4c92734d31c87f3ce8227f7a15d3b7cae6063990042aa2448f096580e52a98a01429c85a6bdb47bf3e0bdd9a49fd417ccfba26533f33015 SHA512 6e8ac4ccd30204c7035788dc7a71ac6388312ffd3a6830dd9007bcc8dd5c43b8e5d723ace38550313bfb4e2e09f012aa309941088f7749ae7e18d1495096eac8
diff --git a/dev-perl/Test-Fatal/Test-Fatal-0.16.0.ebuild b/dev-perl/Test-Fatal/Test-Fatal-0.16.0.ebuild
new file mode 100644
index 000000000000..4af58e90ed7b
--- /dev/null
+++ b/dev-perl/Test-Fatal/Test-Fatal-0.16.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RJBS
+DIST_VERSION=0.016
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Incredibly simple helpers for testing code with exceptions"
+
+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"
+
+RDEPEND="
+	virtual/perl-Carp
+	>=virtual/perl-Exporter-5.570.0
+	virtual/perl-Test-Simple
+	>=dev-perl/Try-Tiny-0.70.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-CPAN-Meta-2.120.900
+		virtual/perl-File-Spec
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
diff --git a/dev-perl/Test-File-Contents/Manifest b/dev-perl/Test-File-Contents/Manifest
index 0fb6622c1411..40c9e862f98f 100644
--- a/dev-perl/Test-File-Contents/Manifest
+++ b/dev-perl/Test-File-Contents/Manifest
@@ -1,3 +1,3 @@
 DIST Test-File-Contents-0.23.tar.gz 10095 BLAKE2B 19d93050e7c607f0efcff4e2c5ecb034daa0d803f826218bc8764f268b73bed7427b11781e0468ef46184c85dd3b833e07af4d9c471b6c4aa09a94706cb16321 SHA512 8fe830e755660b32f79a82b84b55702a6dd2bd62136c456325340646fe11e82b5603fb3063fcbad393edaf68cabf84da79103be5ef4a5cb6de84ad8463de46db
-EBUILD Test-File-Contents-0.230.0.ebuild 490 BLAKE2B 380adb3bae06d41f6c88209fbf4392da3db35c9daa47402132076d2cb21ef864f0357c9c8dfd3081d14bdbd0e7645c672224b1cc1709d84ea9b6fe89bae4f228 SHA512 f4f93e5c40a11050a72a8d08373447e7df853e79a75d5173b9310174cd9c0bbf4c2257633a0d2493555ed623141d15097127ff220a043f5dbdd50821560bc7c6
+EBUILD Test-File-Contents-0.230.0-r1.ebuild 452 BLAKE2B 3365b7e0994d88525b7ae8eb20c0428c458eb890519ed4806d93bcc9d4b2befdc9681d16078c6cc6d537888ad8b6c2b4b612517273c0989a37d05fab50dfc3b2 SHA512 7f20e07da938ff06ccdefe80e5db99312567979f2ebec36d9f352fee4b589cbadb8ad6c4998a0514223d70a457e25925d77ce651e8bb4c17d31b83f4274909d6
 MISC metadata.xml 409 BLAKE2B da9c68a8100e7ada08ee09a7ab510ee0653ed876f53d3bfa260738d81ff8c662298d7ba40a9ed8299265553520e263ddd23696bfc6292374a45fb64de9c95b59 SHA512 c86a6942306972f0c1f0846ccbb5a73b8a74357ff29c9697039003c0d45047a45ceeadea3aa6d056f9908e5ee5e5d826f8d68bd7da0b1211c76d64a8c3d49f65
diff --git a/dev-perl/Test-File-Contents/Test-File-Contents-0.230.0.ebuild b/dev-perl/Test-File-Contents/Test-File-Contents-0.230.0-r1.ebuild
index 5006fb550762..9c34b9d2ae28 100644
--- a/dev-perl/Test-File-Contents/Test-File-Contents-0.230.0.ebuild
+++ b/dev-perl/Test-File-Contents/Test-File-Contents-0.230.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=DWHEELER
 DIST_VERSION=0.23
@@ -10,8 +10,6 @@ inherit perl-module
 DESCRIPTION="Test routines for examining the contents of files"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	virtual/perl-Digest-MD5
@@ -19,6 +17,6 @@ RDEPEND="
 	>=virtual/perl-Test-Simple-0.700.0
 	>=dev-perl/Text-Diff-0.350.0
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	>=dev-perl/Module-Build-0.300.0
 "
diff --git a/dev-perl/Test-File-ShareDir/Manifest b/dev-perl/Test-File-ShareDir/Manifest
index 6b1f70b664f3..756065eafe16 100644
--- a/dev-perl/Test-File-ShareDir/Manifest
+++ b/dev-perl/Test-File-ShareDir/Manifest
@@ -1,3 +1,3 @@
 DIST Test-File-ShareDir-1.001002.tar.gz 65466 BLAKE2B d2bd8634b5cd4eb156814e2e456c0ed5749b6ab55feb3fcf674124e71450f05e548657f0bb189d0445912a6171c14bb3ad44a7b338f72dc6609e5030d27596e0 SHA512 858fd7483a63fe4742e48663d64088b811658c9d24dfc730ae1fb5786818949133de98f1cc3a705f67ad97fed1144420a96c22e2cfa663c79953c33f1633f00e
-EBUILD Test-File-ShareDir-1.1.2.ebuild 887 BLAKE2B bfa70d4ae172aece8dadc8b1caab3e1f50de281af9315904b9d90571b94575f265dd2a303f2be6e0981ecbcc8ec01fe1e9e1f55163e098089bebed3eca2cb784 SHA512 de0ec6086d1d2a0faf1fb4f805abe6edc6216dc3ef57dec9ba2a44ebd529967646678da978dbc668dbea6d53c8780da442cf77cea08fd16006631274af686751
+EBUILD Test-File-ShareDir-1.1.2-r1.ebuild 854 BLAKE2B aa6669e3a5ec94c31c765d4ac3870326eba831aa23fe258968f64b1dff1b9216644eeac3f680288617e42a95e8af504568fb990e405830f202a0ffcdaf7a4231 SHA512 0ef97a61c91fe612f1595dd8a5ec1b25de6a41ce942df9190a4bdea6e1bc3ccddfde5c1f82725612405e3be614740e97cbda2fbf6b42daadc66a08d86ce626dd
 MISC metadata.xml 1042 BLAKE2B 3c686a09b96500da4732470866b67a0fb54d2153712de4e0f43414d53f6597467ba5a3e90be6b1f880c1cc0a85010b865041f8fba6e581d44d5f49b572c25d18 SHA512 5dd8c825fb0516d0b4d98d0f365fad8fb758ceca563eead1445e4405d38bcfa26474c9f1187f82c73787ffd31686241b70a9a71ddf1bfa196e70c27e7f78103a
diff --git a/dev-perl/Test-File-ShareDir/Test-File-ShareDir-1.1.2.ebuild b/dev-perl/Test-File-ShareDir/Test-File-ShareDir-1.1.2-r1.ebuild
index 19c4877eda58..ad7eecfc4998 100644
--- a/dev-perl/Test-File-ShareDir/Test-File-ShareDir-1.1.2.ebuild
+++ b/dev-perl/Test-File-ShareDir/Test-File-ShareDir-1.1.2-r1.ebuild
@@ -1,7 +1,8 @@
 # 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=1.001002
 inherit perl-module
@@ -9,22 +10,23 @@ inherit perl-module
 DESCRIPTION="Create a Fake ShareDir for your modules for testing."
 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
+RDEPEND="
+	virtual/perl-Carp
 	dev-perl/Class-Tiny
 	>=virtual/perl-Exporter-5.570.0
 	dev-perl/File-Copy-Recursive
 	>=dev-perl/File-ShareDir-1.0.0
 	>=dev-perl/Path-Tiny-0.18.0
 	dev-perl/Scope-Guard
-	virtual/perl-parent"
-DEPEND="virtual/perl-ExtUtils-MakeMaker
+	virtual/perl-parent
+"
+BDEPEND="virtual/perl-ExtUtils-MakeMaker
 	${RDEPEND}
 	test? (
 		>=virtual/perl-CPAN-Meta-2.120.900
 		virtual/perl-File-Spec
 		dev-perl/Test-Fatal
 		>=virtual/perl-Test-Simple-0.960.0
-	)"
+	)
+"
diff --git a/dev-perl/Test-File/Manifest b/dev-perl/Test-File/Manifest
index cf2237f18fde..038847643f87 100644
--- a/dev-perl/Test-File/Manifest
+++ b/dev-perl/Test-File/Manifest
@@ -1,3 +1,5 @@
 DIST Test-File-1.443.tar.gz 27065 BLAKE2B 0f1568dbb27aa2aaffd13cc1d8327260e4bfa03fea01a80a810c0c10fdb1a18b3ba6fb5c50212d8956fa14dd0114438dfc7c3523495a20f8f35fdd13734a87c5 SHA512 9ad66b3a9dc1c3752a4ec22934db9139ac010ac3237a3de018d4ec4a65ac047f0152ab9e7979a2615412c1af02a1f2dfa0dbfdf5eba5358628b1b443232c45b2
+DIST Test-File-1.448.tar.gz 29914 BLAKE2B 566a4c2047d94c48e9b89fa9fdcdec84de5fbe15ad0f25eaf9f11b2a658b06cd61ef025caaed5f18d805a81f318fd4a995d01756e21ed5a96956b5e84b3da5b6 SHA512 fea5082cedb03de62dd9b4ee1db891439a14367f746f1fdec4056ac251a607cc281d22708517de4e3e64484b47fb6cc5898c30983a6af9db03412c469b4e9009
 EBUILD Test-File-1.443.0.ebuild 704 BLAKE2B 5ab3c6b1afacb4b566cd475dd5a97bee56a31171d7bd3edb9a8bf141fb4bc9aa3906bf5eef6d2ad0aec631927dd9790093c02587a598b8c7e5e0d01258064544 SHA512 563f96f9a55edf8acda2bc4dba08e6b50843121924f1f253b2a6fb294c6075080f583cf089d989213c975ce084cae18112a60bc91c76d44fb6868bb2273226b1
+EBUILD Test-File-1.448.0.ebuild 674 BLAKE2B 6adb7792328e9a68a0daa63c9239b1fc0f591e53562b98ab45cd7988f4af516fcacf30d6436e4c8d79b596ba2400e76043fce3b37f1076dcbf13688deb9ccc9e SHA512 023d95a2a9f52eefbdc27e20f07a1fc31f768cbac44dbae73a178041e2d58933d8cfcde2ea1285ed572b364ba2404c67c752935afe2b74f99e6e64956f338810
 MISC metadata.xml 390 BLAKE2B 515dde783fa52220e00b4f58cc9dde38d80b6eed484bfb0bdcdf89f7daa62246f76dbc7bee8610b067f743af4ce9698ccc75c7d85546ca1f6f7f96d97378085a SHA512 93e9377cbec8728c2ff3c879a306c89e52db8af41443138c8f68fa4100a2965af2b97afab9426f4f64ddba7d88e52a123dec6976a253f7b47257172bf3140677
diff --git a/dev-perl/Test-File/Test-File-1.448.0.ebuild b/dev-perl/Test-File/Test-File-1.448.0.ebuild
new file mode 100644
index 000000000000..f5ace48d38ab
--- /dev/null
+++ b/dev-perl/Test-File/Test-File-1.448.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=BDFOY
+DIST_VERSION=1.448
+inherit perl-module
+
+DESCRIPTION="Test file attributes"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.640.0
+	test? (
+		>=virtual/perl-Test-Simple-0.950.0
+		dev-perl/Test-utf8
+	)
+"
+
+src_prepare() {
+	if use test; then
+		perl_rm_files t/pod.t t/pod_coverage.t t/test_manifest
+		sed -i -e '/Test::Manifest/d' Makefile.PL || die "Can't patch Makefile.PL"
+	fi
+	perl-module_src_prepare
+}
diff --git a/dev-perl/Test-Files/Manifest b/dev-perl/Test-Files/Manifest
index aae60d6278ac..6143a2f13b20 100644
--- a/dev-perl/Test-Files/Manifest
+++ b/dev-perl/Test-Files/Manifest
@@ -1,3 +1,5 @@
 DIST Test-Files-0.14.tar.gz 11520 BLAKE2B 5290b9d52fe303b8ea81c1ce75d9eba233be02bf5e491512e1a55e4fd64b892ece8227fde4c73a0821fb08cf8f26d207696f03c898ce1ec5b01e9ee7adae0dce SHA512 fe456e5e99f734ca356e0595f79e66e899e0a92e14ccf32a7deb04537789546e3b9f1fd091e2e50dffdee51d01ee9096ffc36f3a6792eaa8be85e6ec8ab25782
+DIST Test-Files-0.15.tar.gz 11967 BLAKE2B 4fbfdb4166ed8a644811639f7a8346de8579d353a7f7d69c23b0b17198fe8ac8c67bc62472d704d31f79f2f45f9df98e5f64e7adb6c29c2ec93b6d5578dd2685 SHA512 873ac7565cd3fbd11ed908ec3f5c01a41d76605eb3d1cc752226fd7628cf2be30e1a93c2adf80ea00ccaddceefeec6bf74cbde84cbfae0956f405853015f89b6
 EBUILD Test-Files-0.140.0.ebuild 430 BLAKE2B 682609528493735ecf59dd6696fbbcf2d99656717dcb07910c7c4dbc41572bf77e4e46b5e67f8f0f423045416b6b36eca5e4cc7fb58cae06914ac01d4101a543 SHA512 d41b8abd70adecc26a5e4d3f7b04cf1a29b330e8a2029fe88ad89557e33ad1e196b772567199ff6fd984890f09159f62e95282b113c8ab7d875c8bf8cda789a4
+EBUILD Test-Files-0.150.0.ebuild 419 BLAKE2B 7c08654502fb1c36ee0b0cadc53e7b0d8066c5ab285f8c81ad4190f16f8c744fac38fd8c6e9352e503de29f08534dbbd748110f3facc264fefd2c000afd2e659 SHA512 092c27a67aab3e16aa611d70cc36cbf9b4d19253ce45fd4409a34921f4d1d94ee7813c1b41d4ef88c579af0d1a9c6705bd648da137768fbc512835c4ea356592
 MISC metadata.xml 392 BLAKE2B a88c29570c0fcb23c82cb6731d35c5f332eafc1c4a66f2307714dbe0b546f91b385fcd8a31ce6d144acfd16adcd1081b2cb5bc2ebb48294d911516dd3812a2cd SHA512 52cc20225a6c098eff54a77a05eb791b209758a7acd0a1f659ed3aab78d699a719532d5e0c6d7bddf6be8244e1aa0b500d882c5713288bd7336b6f627723b73f
diff --git a/dev-perl/Test-Files/Test-Files-0.150.0.ebuild b/dev-perl/Test-Files/Test-Files-0.150.0.ebuild
new file mode 100644
index 000000000000..3991724dd182
--- /dev/null
+++ b/dev-perl/Test-Files/Test-Files-0.150.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=JSF
+DIST_VERSION=0.15
+inherit perl-module
+
+DESCRIPTION="A Test::Builder based module to ease testing with files and dirs"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-perl/Algorithm-Diff
+	virtual/perl-Test-Simple
+	dev-perl/Text-Diff
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Test-Inline/Manifest b/dev-perl/Test-Inline/Manifest
index 852bac02ec9b..66b1658ad213 100644
--- a/dev-perl/Test-Inline/Manifest
+++ b/dev-perl/Test-Inline/Manifest
@@ -1,3 +1,5 @@
 DIST Test-Inline-2.213.tar.gz 61649 BLAKE2B 9d192d3ee9e790d4348ab0efb37457776ca1242a012f3bf1beff14bc51a0917206c1aa64d00a465795c438bb0fe44442020432be2063b65e443dcb7b2a262ef9 SHA512 2d5772b515a0c7260c8591a56f640ebb41ce91e32380ae46636f2e85b3c56656fcbf75a1b859e30bb437b9bdcaaf268b943cb1332365173ff413d15f6761b4a4
+DIST Test-Inline-2.214.tar.gz 60403 BLAKE2B 527d25de1d7aa666ecc8b9633d4cead4acaba4c04d168b2cde82e426bdc422f5b181e735dfb02b6774d2f1706bbcc474cc3e7ffe3fc113402f8ed8579fc2d889 SHA512 25c65bb944d09e5cc17cbd4958e629f0e09209759b4bbbb3ac7cc5b22c6218eb77c724131d465c0df7592f803631c061b1fd02c2d238621f782b732b1d7db2fe
 EBUILD Test-Inline-2.213.0-r2.ebuild 1017 BLAKE2B b2d6f7ae1b2f1a8c0c5718ea48aaa1a3af59c14ad23b590730e7983fb3d7e58f008e687f1bbacbd69231bd0214da48b8adef95541bb66af73745a6ecf406baa2 SHA512 4e62be3450601a50424413f66db360ce7e4ad61b00825bca8458c3489a158a4e5e7c99e552b5cadab26e9ccbe62faca25a452b5987b5d9070a04abe04afb09fd
+EBUILD Test-Inline-2.214.0.ebuild 886 BLAKE2B 3252a4404d2c834a531a0acfa2b2b55534359811a6b96dcc4c710f68e1c5f8453e5aaa0b6b62444db917f0671f6098258896a4e531e3373cabcb1b2f870b6b30 SHA512 d496ed5a445649f61b3e38030eeb56aa5542b87c3c327ee9645405d530152d337f23d62d396bd65a92b753ca0706f62facc1edc2b7e021e1dd7422969694b733
 MISC metadata.xml 1028 BLAKE2B 21ead8c4401ade08a210eb39eb106483d2e9861644d9a5d90db4068c21eb0ca66097449f689f79e72257a0d167664a3c9c433e1d5f346f72988445f4708b8084 SHA512 d69443533335a0fc68c18425fb222afa7d75462d4122bfe30e332f12680be63f0611f02c0a77ad40c3aa17366ddc5f122bf8a55aad9395605964c32c53090d94
diff --git a/dev-perl/Test-Inline/Test-Inline-2.214.0.ebuild b/dev-perl/Test-Inline/Test-Inline-2.214.0.ebuild
new file mode 100644
index 000000000000..07413ea50ada
--- /dev/null
+++ b/dev-perl/Test-Inline/Test-Inline-2.214.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=ETHER
+DIST_VERSION=2.214
+inherit perl-module
+
+DESCRIPTION="Inline test suite support for Perl"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="
+	>=dev-perl/Algorithm-Dependency-1.20.0
+	>=dev-perl/Config-Tiny-2.0.0
+	>=dev-perl/File-Find-Rule-0.260.0
+	>=dev-perl/File-Flat-1.0.0
+	>=dev-perl/File-Remove-0.370.0
+	>=virtual/perl-File-Spec-0.800.0
+	>=dev-perl/File-chmod-0.310.0
+	>=virtual/perl-Getopt-Long-2.340.0
+	>=virtual/perl-Scalar-List-Utils-1.190.0
+	>=dev-perl/Params-Util-0.210.0
+	dev-perl/Path-Tiny
+"
+BDEPEND="${RDEPEND}
+	test? (
+		>=dev-perl/Test-ClassAPI-1.20.0
+		>=virtual/perl-Test-Simple-0.420.0
+		>=dev-perl/Test-Script-1.20.0
+	)
+"
+
+# Parallel tests unsupported: https://bugs.gentoo.org/663272
+DIST_TEST="do"
diff --git a/dev-perl/Test-Inter/Manifest b/dev-perl/Test-Inter/Manifest
index 7f2fb4abf124..b7106a8c16a5 100644
--- a/dev-perl/Test-Inter/Manifest
+++ b/dev-perl/Test-Inter/Manifest
@@ -1,5 +1,3 @@
-DIST Test-Inter-1.06.tar.gz 40627 BLAKE2B e3e97d16c46a5703b65cdf1e28baddf70f466b2586a33014661db618b33b59b9eef0850e8c92de4aad6fb6ee88879e02c8a62d3229c529003081bb4271c56217 SHA512 2cbfc901bce010560b64ce18e7d6ade935fb822e2142c897f4f993dff224e5171c0a835a87696fc1bbe31403c46b3ef78789f8653495234cd5d3798e6c19486e
 DIST Test-Inter-1.09.tar.gz 44460 BLAKE2B 6d199d7b00487fae30eb7e0ccb2b9e2a40f686cb15834d6733dcd1c852836c861ad5c2ecad4e85981c19994afc7fcc820689eaaa08458f45824f726273fa0c17 SHA512 b1f556393a445ae2c04fcc958fc3c9ee9091d17aaa9997dfde13098622162ebc27ac0282401abc27131a3b072be3aafeb5cc74af4b3e1ff4149f6c77536ef6c4
-EBUILD Test-Inter-1.60.0.ebuild 704 BLAKE2B 6b4e0e48d303dc61e6609a776a7344d723403ab8181c4b153cb3f7d282fba8d2ba6735acf603e55432732432bb01229e2d0845cf34fd529504c2700e06d34839 SHA512 fd27d9ebdb8447bea093dce100d9f4ca46a8c090671277f5dc14b8ef6a1fbf7ea5805bbaa529e6408e324930adbebf9a2502496bee25085b3a86257c95b548b3
 EBUILD Test-Inter-1.90.0.ebuild 780 BLAKE2B cda2a276602070f95eb0f8f3a8eed1cdc008a39484716e373a60e838bf4cec0195f6a823c3ca9615a710d675a15b81539f94485bf71dea0e14f12fbdbf22bb4a SHA512 5067419d2f10feb0f4f6832aba5133f70375fec14f9cb9ec4d3ad61b88d33f594f3e933c0023ca7ce83dc631dd768671f57676e4050d253475d457d045652901
 MISC metadata.xml 392 BLAKE2B 543e5bd66a132f286e1d9392fc541f5e2c488cbe824e7ce7b899cf44b5bd01de5e9dd43b97e4c3a16d8666d0901084aa2b88aa1a4872e3dc37aa2520bafe9822 SHA512 ae1d3513daae65715252243e57dd1ae3cde76f20fad6631f5e8ca7df03d35ea6eb71b71d39a5911c511f2e93506e58588dcc59f9f52a76e31bbcce3d0643696a
diff --git a/dev-perl/Test-Inter/Test-Inter-1.60.0.ebuild b/dev-perl/Test-Inter/Test-Inter-1.60.0.ebuild
deleted file mode 100644
index 25274aa9de4a..000000000000
--- a/dev-perl/Test-Inter/Test-Inter-1.60.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=SBECK
-DIST_VERSION=1.06
-DIST_EXAMPLES=("examples/*")
-inherit perl-module
-
-DESCRIPTION="Framework for more readable interactive test scripts"
-
-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-IO"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.210.0
-	test? ( virtual/perl-Test-Simple )"
-
-src_test() {
-	perl_rm_files t/pod_coverage.t t/pod.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Test-LeakTrace/Manifest b/dev-perl/Test-LeakTrace/Manifest
index e0d09382b248..ee3fec93ab41 100644
--- a/dev-perl/Test-LeakTrace/Manifest
+++ b/dev-perl/Test-LeakTrace/Manifest
@@ -1,3 +1,5 @@
 DIST Test-LeakTrace-0.16.tar.gz 49435 BLAKE2B b7fcd095f7406083a7dccf21f62de4ec4a1dd8ef72395f90cc9fa4b6fae114800130bea6a9e449835871e356c420bb71cfc1dad090bf50d96f450fe3baf6ecab SHA512 6fa7a5eaae01ca5232f3f297a104553dac5f57e4c6721d7084e5d44b0133206100878c7067b228b1e01b21f7639a97a0ec48ef77198deb0598d94d8861bab049
+DIST Test-LeakTrace-0.17.tar.gz 34126 BLAKE2B f461f440009d45ef4e6f6fbab8501ac2ec9c59d5f76a339ce00200128a7769257dcc7e48bcc1203c0b6bebd6bc1078b02c4ded8ff61b8c28c302b7e701dedb73 SHA512 57ffd8c64ef871427c04419bda239d73e169f3b6ee268e0d4d7a27942c277d4b1f502e82e2e0df415b1050c0aa11944c2c3acb2e9b353855f77c91d1dfcaf00d
 EBUILD Test-LeakTrace-0.160.0.ebuild 604 BLAKE2B 6b9ae00d280a39baf45a299d320b86cf15f9916ace8e7a950d499482af96c720ed55765f3a8f466495bcff4af47a4b6bcd762cbe921907b1650492f0c7cc0c32 SHA512 ac0ef5f64f8fe85537e342327baa5f60aa83dbe2915bde0a4ba3fa8d0dee1a867d5608afe5cf27ccb8776b4b3ebc5b0c13f677bdd7b458b77e057063e8c5abaa
+EBUILD Test-LeakTrace-0.170.0.ebuild 605 BLAKE2B c59dc8bb1201f038e7d11ebad876a0e3e7f4408a25b93e743a5bd6c05a1570c2b7e6741a27102f1cd8247aa6990e172085701072bf0beafd4ef1cd6bfe415c5a SHA512 c19c5f5e8802563b5ee720cd65c32f56026a9973acc1a7da14ec5cf0312111cc6e14d5dfbebbe00736ae13d27662c542a414ab34bace2777c889a69c08c0c755
 MISC metadata.xml 498 BLAKE2B a7b876fa8b4fa6475109b8c325c1887dd758a9ef9c0e16c521df6940f6cf7ff98aa593535b9273a0370ad413e0750a8ab8b6324bb1f6f2cc1e2f910ef20b8051 SHA512 7cd95f62b7a941ef5f765a902dc676ee65d061f2e886a4855c2025c2126993776c2c3451842abda8b2f946916d6d5a856a0f4d984eea4cc48fb30fd79986d434
diff --git a/dev-perl/Test-LeakTrace/Test-LeakTrace-0.170.0.ebuild b/dev-perl/Test-LeakTrace/Test-LeakTrace-0.170.0.ebuild
new file mode 100644
index 000000000000..7015cfcbe447
--- /dev/null
+++ b/dev-perl/Test-LeakTrace/Test-LeakTrace-0.170.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=LEEJO
+DIST_VERSION=0.17
+DIST_EXAMPLES=( "example/*" "benchmark" )
+inherit perl-module
+
+DESCRIPTION="Traces memory leaks"
+
+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"
+
+RDEPEND="
+	>=virtual/perl-Exporter-5.570.0
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( >=virtual/perl-Test-Simple-0.620.0 )
+"
diff --git a/dev-perl/Test-LectroTest/Manifest b/dev-perl/Test-LectroTest/Manifest
index 33385bf02d23..1487111c1121 100644
--- a/dev-perl/Test-LectroTest/Manifest
+++ b/dev-perl/Test-LectroTest/Manifest
@@ -1,3 +1,3 @@
 DIST Test-LectroTest-0.5001.tar.gz 65937 BLAKE2B 44ecf51a980998102d86d605dab3501b7b1a9c096098ab107e0f5cb8a0eca4866c670fd8570438290c37da9cc90c405fc5acf5d14ea8c89e6f02d8bcab265098 SHA512 2c26baa0b4314bcd4effe3f405eac57aa62b0aeb46240100e8df277e5480f9d0967ed185d6a54be83481f69d98314f093b31c0a09888f17c479ffbddcb12479b
-EBUILD Test-LectroTest-0.500.100.ebuild 614 BLAKE2B 742edf7bb2dbc28c907b909c1227ef85fce84ea697845e90b845a1495e8ee1ffa98e5f9eef1c7079598468241f3fa945155ae09bef1837c972b6bdff20415366 SHA512 0460f628d33ff790989079ffab555595138d186ce1d38b9fbd6e485b14828b2e9d6cae5da97de2f1a7f297885018a2763e3426ee56a0d26029e5f84a6183a3bf
+EBUILD Test-LectroTest-0.500.100-r1.ebuild 577 BLAKE2B da5ea36b75b65d1bfb5dc0a07ba35b1358add3fb8bd6e3aace17cc3ef9ab42ead691cfc178dc5cff4592c28fdf0a9bcc5f06c76645b4fcd4a7126d17620ed788 SHA512 7b6f6ca71231c1f573ff55fb47a8dcb1478122bab75f8ea0c30e47a4bbd86ae4147d6efa182ffa28086abf80ae76afbd27350f269b91aeb142b1f7b0acb6c24c
 MISC metadata.xml 950 BLAKE2B b1a12f759a81ee3441fb166462c19e141b78f0c55703f23ed4c2943e74858245732afbbcd9172fcc8ff207fe3abe94802c97a22ce3c433f45e817ed7ce52aa54 SHA512 0eec917468948838b1185bd0411d7bf8e874aa44d0c83751f30838e2a4d43d44333699d96f2878811d2f851df4a35408a720576610943bc9c566075c064e6ab4
diff --git a/dev-perl/Test-LectroTest/Test-LectroTest-0.500.100.ebuild b/dev-perl/Test-LectroTest/Test-LectroTest-0.500.100-r1.ebuild
index ae5933503fe3..6624cccae5f1 100644
--- a/dev-perl/Test-LectroTest/Test-LectroTest-0.500.100.ebuild
+++ b/dev-perl/Test-LectroTest/Test-LectroTest-0.500.100-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=TMOERTEL
 DIST_VERSION=0.5001
@@ -10,8 +10,6 @@ inherit perl-module
 DESCRIPTION="Easy, automatic, specification-based tests"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	virtual/perl-Carp
@@ -19,12 +17,13 @@ RDEPEND="
 	virtual/perl-Exporter
 	virtual/perl-Test-Simple
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
 	test? (
 		virtual/perl-File-Temp
 	)
 "
+
 PERL_RM_FILES=(
 	"t/pod-coverage.t"
 	"t/pod.t"
diff --git a/dev-perl/Test-LongString/Manifest b/dev-perl/Test-LongString/Manifest
index 925c3dbdcc2a..08352b587565 100644
--- a/dev-perl/Test-LongString/Manifest
+++ b/dev-perl/Test-LongString/Manifest
@@ -1,3 +1,3 @@
 DIST Test-LongString-0.17.tar.gz 8928 BLAKE2B 88e006dbab283c85c20f43a4614eecdae58227665d5ebec879d724209f04c9045935aff4460b09351b02868333903c476cb1aafc0c63c286963f7a5bd1901867 SHA512 1c0cd6fea35bb72816451ce0790002c9dfb945390bc85d22d04670dd5af7ebbe795307ad361e2615ce4ab4f02a317a3aa5d297f2165bd3b1f6de40b3240f1352
-EBUILD Test-LongString-0.170.0.ebuild 521 BLAKE2B 70fc501acd02585ac92e13bd999ebc97b672ac66e8a199dfefc76b5a9fac78086097305cd28f3c5fac376027049bd8b8634839ba93addfcc7abb54bae36fd8e8 SHA512 faab29ff9fd8ce649bf25a9fdb580bc8a0bbd5cf3ed76a52e558f06a060937b0d8e3a059e92e4359d742ae658f0f758929bc45c858722c9fb5e1bd1282757913
+EBUILD Test-LongString-0.170.0-r1.ebuild 486 BLAKE2B 16a9264f7f8997c7a0230f6a133cf280aed511b6756b0cfefb60076d8011118cc6ce545cdb150366afe77b8f9a629f43dc451de6cdbf9f6a528e883f9d84877c SHA512 80c502a1eb25ebb4f5fe9a513695fb38c9b79d439cd8e3baf44f6f8d0ecc0a5dce82362c51bf1b3c4458d3693bf8a6c316c3222482a73371d856a8c5c81c570e
 MISC metadata.xml 402 BLAKE2B bfd8b03259f3f56297e1d8b0cd4c700a01a4851bbd669e30dcd315e82d4e7027971ddd5c2244cb2d893cbcbf3a080c2be024cb018c6edf8e383bce1f124a0883 SHA512 5278ded632022f4aeab8a8e9f0c315383744182282970efd729287ebf95f33eb21cba5eeabe4ec61112a8b63c53b431049c8dfff50bd8d0701f2e5b2a03f7eef
diff --git a/dev-perl/Test-LongString/Test-LongString-0.170.0.ebuild b/dev-perl/Test-LongString/Test-LongString-0.170.0-r1.ebuild
index d54541428a3f..1930b0aea781 100644
--- a/dev-perl/Test-LongString/Test-LongString-0.170.0.ebuild
+++ b/dev-perl/Test-LongString/Test-LongString-0.170.0-r1.ebuild
@@ -1,25 +1,22 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-MODULE_AUTHOR=RGARCIA
-MODULE_VERSION=0.17
+DIST_AUTHOR=RGARCIA
+DIST_VERSION=0.17
 inherit perl-module
 
 DESCRIPTION="A library to test long strings"
 
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
 RDEPEND="virtual/perl-Test-Simple"
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 "
 
-SRC_TEST="do parallel"
-
 src_test() {
 	perl_rm_files t/pod-coverage.t t/pod.t
 	perl-module_src_test
diff --git a/dev-perl/Test-Manifest/Manifest b/dev-perl/Test-Manifest/Manifest
index e2570f8685fe..ca52e195881f 100644
--- a/dev-perl/Test-Manifest/Manifest
+++ b/dev-perl/Test-Manifest/Manifest
@@ -1,3 +1,5 @@
 DIST Test-Manifest-2.02.tar.gz 9180 BLAKE2B c8f75c906ff15d2c9d087f9d9d619eb7e05807a89976e587505997adf746f71385e17b33166845e28c86d9488ea6be42be5b6657acec31f172c47dacef634624 SHA512 b22a93b1ff9a0cbbd5a7be0d01d7ec1b925f9f5b0a865b283b68891d411e406c57e7459ea34f575ae40701e91f12474b9cf4ae66512bec73609b1066315586b1
+DIST Test-Manifest-2.022.tar.gz 14664 BLAKE2B 34a3f850886b0d0017911dcde3cdcd40cae2b1cfea859928b7c837d3ead104f1b7501ac9f26114011ac2c70bf008e3137db3c767c5d635a1c7047349601d0e33 SHA512 e72f5c7c23bac5453afddb81c9175a3b07b9a8f935c37d0fe5ed7e0f6861742c2e9596396b9cb84d62bf2229bc9956bad26c47d7eaab6777ec7628927e294209
 EBUILD Test-Manifest-2.20.0.ebuild 701 BLAKE2B 06474ef525a86caa0b6b04f4bd4ea4847f2c6254e0ae4601e859cdd8f77807ccd74e2bb4d1d106ddf4917d3e52df9e0fff5f20add898853b71794dc41150a459 SHA512 8150f51b43ea1750e42ac72d24d64442f6fcbd89552c900b16ac8b77449cb275b1577689a62af942accf69746325ee5f198f9634737113a57b0506792dcb13d9
+EBUILD Test-Manifest-2.22.0.ebuild 731 BLAKE2B cb2c44ba32973e77c6034b407875f02ffa0a2365c81c9cd7cd08b0a4ddf8f2b02f102a9167d2e824392e64f8f58ee1e34022801ba9004b700b0ee02cb18e26fe SHA512 31aed768226fd5bb30b5ab775e0273a7e65eb6b9e3c377898815ebb3c0517732e422e5352cc67ad3c87fb5a332f42e89a1cceddd105fe4be5a09468f70ff5f15
 MISC metadata.xml 398 BLAKE2B e5f4f024c16732d4eb7f7105f96cd775c43eefa30b58addde8a052ea95e3b7f9240c7a23fb7d8deb50bc7fa63ed030d791b6764e03cfe3c3d5ab6280455c9a6e SHA512 bd4e35652808a153b3775ece2d6b77ae07c56931bf010f7ff8baacfaac7adb1c8825c12a9c8d8c8eaef3abc6f8861d43cf9ad0db3d1c0950fea083c653231cac
diff --git a/dev-perl/Test-Manifest/Test-Manifest-2.22.0.ebuild b/dev-perl/Test-Manifest/Test-Manifest-2.22.0.ebuild
new file mode 100644
index 000000000000..f274d3497bb4
--- /dev/null
+++ b/dev-perl/Test-Manifest/Test-Manifest-2.22.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=BDFOY
+DIST_VERSION=2.022
+inherit perl-module
+
+DESCRIPTION="Interact with a t/test_manifest file"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+LICENSE="Artistic-2"
+
+RDEPEND="
+	virtual/perl-File-Spec
+	virtual/perl-Test-Harness
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.640.0
+	test? (
+		virtual/perl-File-Temp
+		>=virtual/perl-Test-Simple-1.0.0
+	)
+"
+
+src_test() {
+	# Ugh, Upstream has tests that depend on tests ...
+	echo 'print qq[1..1\nok 1];' > "${S}/t/99pod.t"
+	echo 'print qq[1..1\nok 1];' > "${S}/t/pod_coverage.t"
+	perl-module_src_test
+}
diff --git a/dev-perl/Test-Memory-Cycle/Manifest b/dev-perl/Test-Memory-Cycle/Manifest
index 7ed7243b065b..5dee75ec9dea 100644
--- a/dev-perl/Test-Memory-Cycle/Manifest
+++ b/dev-perl/Test-Memory-Cycle/Manifest
@@ -1,3 +1,3 @@
 DIST Test-Memory-Cycle-1.06.tar.gz 8928 BLAKE2B ff221bd6ab6b576ec3f534c3dd3a6a6add53840c9985c67a25c690e24b258406101c8f04e7a30e86a0262a214b61b82d11c72ecb10723580ae6e2d41d9626c4e SHA512 d25ffd0439e47e0b57f136489ae200ca24c8434a19473d23f70d0f8a2c8d18a93fe453e9b1b844b5edbd9c788bfe3c83f5413441389dd9b53c780f734afeb804
-EBUILD Test-Memory-Cycle-1.60.0.ebuild 708 BLAKE2B f4c9d615506ce04b144fe7cb37299427276b3cf8509287fa1e7599cb5ccf730747312583081f01d30dfc8b287944775263ddcbf0e61fc1e3d0a0190ee7284317 SHA512 f59b80978c5c08f295cdedcd14fea067854b771c9db149f9159622a3c1e8f194878e67f65086f017adc430b03b294290f2698378acd4b9b4a9dec2a3c50b1653
+EBUILD Test-Memory-Cycle-1.60.0-r1.ebuild 701 BLAKE2B a838d6adc0438314ceb038c4f1ede349b164a6eee6e9b651995d71a609691cca59699f24b81cf725adbc7d69a308c48a6791b4cbe34ef78d5b4ae43bf513b2e5 SHA512 c08b1b9441dde49c58df76ff03ca4002ba3b30fff83033fb7a2925091273706a518be0cd901005a4ad11ccf62c77182b8f65fc2c97108d69a5d2bb7582c395c9
 MISC metadata.xml 407 BLAKE2B 68fbbfb3550eaf710c582d4336b946eafda44967aebab3caaa4cb6a853931e504fe65810c3c9adba8d92c4d37613046cb519881f4f4d1be22cac5fbfc3ef0a1d SHA512 7dba9988701b3b65260db1dbdfb4045cd2395a01cbd24d970555801761d82683911cd833a471e956ebaf0b9bbf9928451e1da063638581cf9d8b8125b0a1bc4c
diff --git a/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.60.0.ebuild b/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.60.0-r1.ebuild
index 618030a63257..fb227040387d 100644
--- a/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.60.0.ebuild
+++ b/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.60.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=PETDANCE
 DIST_VERSION=1.06
@@ -11,7 +11,6 @@ DESCRIPTION="Check for memory leaks and circular memory references"
 
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~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/Devel-Cycle-1.70.0
@@ -19,7 +18,7 @@ RDEPEND="
 	dev-perl/PadWalker
 	>=virtual/perl-Test-Simple-0.620.0
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 "