user/perl-*: Modernise / fix syntax / deps

96 files changed, 134 insertions, 143 deletions

diff --git a/user/perl-algorithm-diff/APKBUILD b/user/perl-algorithm-diff/APKBUILD
index 9c95c3cef..a2a4c455b 100644
--- a/user/perl-algorithm-diff/APKBUILD
+++ b/user/perl-algorithm-diff/APKBUILD
@@ -13,7 +13,6 @@ arch="noarch"
 license="Artistic-1.0-Perl AND GPL-2.0"
 depends="perl"
 makedepends="perl-dev"
-install=""
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-b-hooks-endofscope/APKBUILD b/user/perl-b-hooks-endofscope/APKBUILD
index 63493ead5..1934140e9 100644
--- a/user/perl-b-hooks-endofscope/APKBUILD
+++ b/user/perl-b-hooks-endofscope/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/release/B-Hooks-EndOfScope"
 arch="noarch"
 license="Artistic-1.0-Perl"
 depends="perl-module-implementation perl-sub-exporter-progressive perl-sub-name
-	perl-variable-magic"
+	perl-variable-magic perl"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-cgi/APKBUILD b/user/perl-cgi/APKBUILD
index 61838b4a8..b67b2f6ea 100644
--- a/user/perl-cgi/APKBUILD
+++ b/user/perl-cgi/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/release/CGI"
 arch="noarch"
 license="Artistic-1.0-Perl"
 depends="perl-html-parser"
-makedepends="perl-dev"
 checkdepends="perl-test-deep perl-test-nowarnings perl-test-warn"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-class-load-xs/APKBUILD b/user/perl-class-load-xs/APKBUILD
index 3f1678655..641a41853 100644
--- a/user/perl-class-load-xs/APKBUILD
+++ b/user/perl-class-load-xs/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/release/Class-Load-XS"
 arch="all"
 license="Artistic-2.0"
 depends="perl-class-load"
-makedepends="perl-dev"
 checkdepends="perl-test-fatal perl-test-needs"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-class-load/APKBUILD b/user/perl-class-load/APKBUILD
index e40e1e671..7b59b4b71 100644
--- a/user/perl-class-load/APKBUILD
+++ b/user/perl-class-load/APKBUILD
@@ -13,8 +13,8 @@ arch="noarch"
 license="Artistic-1.0-Perl"
 depends="perl-data-optlist perl-module-implementation perl-module-runtime
 	perl-package-stash perl-try-tiny"
-makedepends="perl-dev"
 checkdepends="perl-test-fatal perl-test-needs"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-class-method-modifiers/APKBUILD b/user/perl-class-method-modifiers/APKBUILD
index 5fe47284a..2eb8f618e 100644
--- a/user/perl-class-method-modifiers/APKBUILD
+++ b/user/perl-class-method-modifiers/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/pod/Class::Method::Modifiers"
 arch="noarch"
 license="Artistic-1.0-Perl AND GPL-2.0"
 depends="perl"
-makedepends="perl-dev"
 checkdepends="perl-test-fatal perl-test-needs perl-test-requires"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-cpan-meta-check/APKBUILD b/user/perl-cpan-meta-check/APKBUILD
index 4c03d00bb..e264a92a0 100644
--- a/user/perl-cpan-meta-check/APKBUILD
+++ b/user/perl-cpan-meta-check/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/release/CPAN-Meta-Check"
 arch="noarch"
 license="Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev"
 checkdepends="perl-test-deep"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-cwd-guard/APKBUILD b/user/perl-cwd-guard/APKBUILD
index fea81f7a8..c04973dd8 100644
--- a/user/perl-cwd-guard/APKBUILD
+++ b/user/perl-cwd-guard/APKBUILD
@@ -12,9 +12,8 @@ url="https://metacpan.org/pod/Cwd::Guard"
 arch="noarch"
 license="Artistic-1.0-Perl AND GPL-2.0"
 depends="perl"
-makedepends="perl-dev perl-module-build"
 checkdepends="perl-test-requires"
-install=""
+makedepends="perl-dev perl-module-build"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-data-dump/APKBUILD b/user/perl-data-dump/APKBUILD
index 72f987266..c9fea4641 100644
--- a/user/perl-data-dump/APKBUILD
+++ b/user/perl-data-dump/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/pod/Data::Dump"
 arch="noarch"
 license="Artistic-1.0-Perl AND GPL-2.0+"
 depends="perl"
-makedepends=""
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-data-optlist/APKBUILD b/user/perl-data-optlist/APKBUILD
index a870222dc..050ac92d8 100644
--- a/user/perl-data-optlist/APKBUILD
+++ b/user/perl-data-optlist/APKBUILD
@@ -1,4 +1,3 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
 pkgname=perl-data-optlist
 _pkgreal=Data-OptList
diff --git a/user/perl-devel-checkcompiler/APKBUILD b/user/perl-devel-checkcompiler/APKBUILD
index 11dd443f6..f621b64b9 100644
--- a/user/perl-devel-checkcompiler/APKBUILD
+++ b/user/perl-devel-checkcompiler/APKBUILD
@@ -13,7 +13,6 @@ arch="noarch"
 license="Artistic-1.0-Perl AND GPL-2.0"
 depends="perl"
 makedepends="perl-dev perl-module-build-tiny"
-install=""
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-devel-globaldestruction/APKBUILD b/user/perl-devel-globaldestruction/APKBUILD
index c426cfcb5..944d7c083 100644
--- a/user/perl-devel-globaldestruction/APKBUILD
+++ b/user/perl-devel-globaldestruction/APKBUILD
@@ -13,7 +13,6 @@ arch="noarch"
 license="Artistic-1.0-Perl AND GPL-2.0"
 depends="perl perl-sub-exporter-progressive"
 makedepends="perl-dev"
-install=""
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-devel-overloadinfo/APKBUILD b/user/perl-devel-overloadinfo/APKBUILD
index 2d2a9bd82..7c397a253 100644
--- a/user/perl-devel-overloadinfo/APKBUILD
+++ b/user/perl-devel-overloadinfo/APKBUILD
@@ -11,9 +11,9 @@ pkgdesc="Introspect overloaded Perl operators"
 url="https://metacpan.org/release/Devel-OverloadInfo"
 arch="noarch"
 license="Artistic-1.0-Perl"
-depends="perl-mro-compat perl-package-stash perl-sub-identify"
-makedepends="perl-dev"
+depends="perl perl-mro-compat perl-package-stash perl-sub-identify"
 checkdepends="perl-test-fatal"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-devel-symdump/APKBUILD b/user/perl-devel-symdump/APKBUILD
index 05b24d680..f290739d6 100644
--- a/user/perl-devel-symdump/APKBUILD
+++ b/user/perl-devel-symdump/APKBUILD
@@ -13,7 +13,6 @@ arch="noarch"
 license="Artistic-1.0-Perl AND GPL-2.0"
 depends="perl"
 makedepends="perl-dev"
-install=""
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-dist-checkconflicts/APKBUILD b/user/perl-dist-checkconflicts/APKBUILD
index 75b3916d5..369e56e99 100644
--- a/user/perl-dist-checkconflicts/APKBUILD
+++ b/user/perl-dist-checkconflicts/APKBUILD
@@ -11,9 +11,9 @@ pkgdesc="Declare version conflicts for Perl distributions"
 url="https://metacpan.org/release/Dist-CheckConflicts"
 arch="noarch"
 license="Artistic-1.0-Perl"
-depends="perl-module-runtime"
-makedepends="perl-dev"
+depends="perl perl-module-runtime"
 checkdepends="perl-test-fatal"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-eval-closure/APKBUILD b/user/perl-eval-closure/APKBUILD
index 42c766666..51ed39484 100644
--- a/user/perl-eval-closure/APKBUILD
+++ b/user/perl-eval-closure/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/release/Eval-Closure"
 arch="noarch"
 license="Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev"
 checkdepends="perl-test-fatal perl-test-requires"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-exception-class/APKBUILD b/user/perl-exception-class/APKBUILD
index b57e8d329..b5cac436a 100644
--- a/user/perl-exception-class/APKBUILD
+++ b/user/perl-exception-class/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Perl module for declaring 'real' exception classes"
 url="https://metacpan.org/release/Exception-Class"
 arch="noarch"
 license="Artistic-1.0-Perl"
-depends="perl-class-data-inheritable perl-devel-stacktrace"
+depends="perl perl-class-data-inheritable perl-devel-stacktrace"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-file-copy-recursive-reduced/APKBUILD b/user/perl-file-copy-recursive-reduced/APKBUILD
index e54ec4d2f..54eec9674 100644
--- a/user/perl-file-copy-recursive-reduced/APKBUILD
+++ b/user/perl-file-copy-recursive-reduced/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/pod/File::Copy::Recursive::Reduced"
 arch="noarch"
 license="Artistic-1.0-Perl AND GPL-2.0"
 depends="perl"
-makedepends="perl-dev"
 checkdepends="perl-capture-tiny perl-path-tiny"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-file-copy-recursive/APKBUILD b/user/perl-file-copy-recursive/APKBUILD
index 1b94cc2fc..393832558 100644
--- a/user/perl-file-copy-recursive/APKBUILD
+++ b/user/perl-file-copy-recursive/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/pod/File::Copy::Recursive"
 arch="noarch"
 license="Artistic-1.0-Perl AND GPL-2.0"
 depends="perl"
-makedepends="perl-dev"
 checkdepends="perl-test-fatal perl-test-warnings perl-path-tiny perl-test-deep perl-test-file"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-file-find-object-rule/APKBUILD b/user/perl-file-find-object-rule/APKBUILD
index be981dbf7..ffd9f176e 100644
--- a/user/perl-file-find-object-rule/APKBUILD
+++ b/user/perl-file-find-object-rule/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Alternative Perl interface to File::Find::Object"
 url="https://metacpan.org/release/File-Find-Object-Rule"
 arch="noarch"
 license="Artistic-1.0-Perl"
-depends="perl-class-xsaccessor perl-file-find-object perl-number-compare
+depends="perl perl-class-xsaccessor perl-file-find-object perl-number-compare
 	perl-text-glob"
 makedepends="perl-dev perl-module-build"
 subpackages="$pkgname-doc"
diff --git a/user/perl-file-find-object/APKBUILD b/user/perl-file-find-object/APKBUILD
index 56377f8b2..3f982a220 100644
--- a/user/perl-file-find-object/APKBUILD
+++ b/user/perl-file-find-object/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Object-oriented File::Find replacement for Perl"
 url="https://metacpan.org/release/File-Find-Object"
 arch="noarch"
 license="Artistic-2.0"
-depends="perl-class-xsaccessor"
+depends="perl perl-class-xsaccessor"
 makedepends="perl-dev perl-module-build"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-file-finder/APKBUILD b/user/perl-file-finder/APKBUILD
index c82f6bb63..1dbfe614e 100644
--- a/user/perl-file-finder/APKBUILD
+++ b/user/perl-file-finder/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Wrap Perl File::Find"
 url="https://metacpan.org/release/File-Finder"
 arch="noarch"
 license="Artistic-1.0-Perl"
-depends="perl-text-glob"
+depends="perl perl-text-glob"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz
diff --git a/user/perl-games-solitaire-verify/APKBUILD b/user/perl-games-solitaire-verify/APKBUILD
index b72c57592..0e9e66150 100644
--- a/user/perl-games-solitaire-verify/APKBUILD
+++ b/user/perl-games-solitaire-verify/APKBUILD
@@ -13,8 +13,8 @@ arch="noarch"
 license="MIT"
 depends="perl-class-xsaccessor perl-dir-manifest perl-exception-class
 	perl-list-moreutils"
-makedepends="perl-dev perl-module-build"
 checkdepends="perl-test-differences perl-path-tiny"
+makedepends="perl-dev perl-module-build"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-getopt-long-descriptive/APKBUILD b/user/perl-getopt-long-descriptive/APKBUILD
index e0bffefdf..b5492009c 100644
--- a/user/perl-getopt-long-descriptive/APKBUILD
+++ b/user/perl-getopt-long-descriptive/APKBUILD
@@ -11,9 +11,9 @@ pkgdesc="Simpler Perl implementation of Getopt::Long"
 url="https://metacpan.org/release/Getopt-Long-Descriptive"
 arch="noarch"
 license="Artistic-1.0-Perl"
-depends="perl-params-validate perl-sub-exporter"
-makedepends="perl-dev"
+depends="perl perl-params-validate perl-sub-exporter"
 checkdepends="perl-cpan-meta-check perl-test-fatal perl-test-warnings"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-inline-c/APKBUILD b/user/perl-inline-c/APKBUILD
index b6fb45555..ed895b5ae 100644
--- a/user/perl-inline-c/APKBUILD
+++ b/user/perl-inline-c/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/pod/Inline::C"
 arch="noarch"
 license="GPL-1.0+ OR Artistic-1.0-Perl"
 depends="perl perl-inline perl-pegex perl-parse-recdescent"
-makedepends="perl-dev perl-file-sharedir-install"
 checkdepends="perl-test-warn perl-yaml-libyaml perl-file-copy-recursive"
+makedepends="perl-dev perl-file-sharedir-install"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-inline/APKBUILD b/user/perl-inline/APKBUILD
index 35da3125f..b599f9b80 100644
--- a/user/perl-inline/APKBUILD
+++ b/user/perl-inline/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/pod/Inline"
 arch="noarch"
 license="GPL-1.0+ OR Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev"
 checkdepends="perl-test-warn"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-list-moreutils-xs/APKBUILD b/user/perl-list-moreutils-xs/APKBUILD
index c1cb2c2e2..786d7c9e6 100644
--- a/user/perl-list-moreutils-xs/APKBUILD
+++ b/user/perl-list-moreutils-xs/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Provide the stuff missing in List::Util in XS"
 url="https://metacpan.org/release/List-MoreUtils-XS"
 arch="all"
 license="Apache-2.0"
-depends=""
+depends="perl"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-list-moreutils/APKBUILD b/user/perl-list-moreutils/APKBUILD
index 044cc6a63..13253c8e8 100644
--- a/user/perl-list-moreutils/APKBUILD
+++ b/user/perl-list-moreutils/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Provide the stuff missing in List::Util"
 url="https://metacpan.org/release/List-MoreUtils"
 arch="noarch"
 license="Apache-2.0"
-depends="perl-exporter-tiny"
+depends="perl perl-exporter-tiny"
 makedepends="perl-dev perl-list-moreutils-xs"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-list-someutils-xs/APKBUILD b/user/perl-list-someutils-xs/APKBUILD
index 57eb8b154..98eb4db65 100644
--- a/user/perl-list-someutils-xs/APKBUILD
+++ b/user/perl-list-someutils-xs/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/release/List-SomeUtils-XS"
 arch="all"
 license="Artistic-2.0"
 depends=""
-makedepends="perl-dev"
 checkdepends="perl-test-leaktrace perl-test-warnings"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-list-someutils/APKBUILD b/user/perl-list-someutils/APKBUILD
index 160554431..90759cf3d 100644
--- a/user/perl-list-someutils/APKBUILD
+++ b/user/perl-list-someutils/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/release/List-SomeUtils"
 arch="noarch"
 license="Artistic-1.0-Perl"
 depends="perl-list-someutils-xs perl-module-implementation"
-makedepends="perl-dev"
 checkdepends="perl-test-leaktrace"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-module-build-xsutil/APKBUILD b/user/perl-module-build-xsutil/APKBUILD
index ffcc9fbd6..108843fe2 100644
--- a/user/perl-module-build-xsutil/APKBUILD
+++ b/user/perl-module-build-xsutil/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/pod/Module::Build::XSUtil"
 arch="noarch"
 license="Artistic-1.0-Perl AND GPL-2.0"
 depends="perl perl-module-build perl-devel-checkcompiler"
-makedepends="perl-dev"
 checkdepends="perl-capture-tiny perl-cwd-guard perl-file-copy-recursive-reduced"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-module-implementation/APKBUILD b/user/perl-module-implementation/APKBUILD
index 9605051f1..ce019078c 100644
--- a/user/perl-module-implementation/APKBUILD
+++ b/user/perl-module-implementation/APKBUILD
@@ -11,9 +11,9 @@ pkgdesc="Loads an underlying implementation of a Perl module"
 url="https://metacpan.org/release/Module-Implementation"
 arch="noarch"
 license="Artistic-2.0"
-depends="perl-module-runtime perl-try-tiny"
-makedepends="perl-dev"
+depends="perl perl-module-runtime perl-try-tiny"
 checkdepends="perl-test-fatal perl-test-requires"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-module-runtime/APKBUILD b/user/perl-module-runtime/APKBUILD
index fc79c7f95..11a19b383 100644
--- a/user/perl-module-runtime/APKBUILD
+++ b/user/perl-module-runtime/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/pod/Module::Runtime"
 arch="noarch"
 license="Artistic-1.0-Perl AND GPL-2.0"
 depends="perl"
-makedepends="perl-dev"
 checkdepends="perl-test-pod perl-test-pod-coverage"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-moo/APKBUILD b/user/perl-moo/APKBUILD
index 06a6c1c9d..400733dec 100644
--- a/user/perl-moo/APKBUILD
+++ b/user/perl-moo/APKBUILD
@@ -13,8 +13,8 @@ arch="noarch"
 license="Artistic-1.0-Perl AND GPL-2.0"
 depends="perl perl-module-runtime perl-devel-globaldestruction perl-class-method-modifiers
          perl-sub-quote perl-role-tiny"
-makedepends="perl-dev"
 checkdepends="perl-test-fatal"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-moose/APKBUILD b/user/perl-moose/APKBUILD
index 86b7e557d..b716f58fc 100644
--- a/user/perl-moose/APKBUILD
+++ b/user/perl-moose/APKBUILD
@@ -5,7 +5,7 @@ _pkgreal=Moose
 _author=ETHER
 _au=${_author%%"${_author#??}"}
 _a=${_author%%"${_author#?}"}
-pkgver=2.2011
+pkgver=2.2012
 pkgrel=0
 pkgdesc="A postmodern object system for Perl 5"
 url="https://metacpan.org/release/Moose"
@@ -17,9 +17,9 @@ depends="perl-class-load perl-class-load-xs perl-data-optlist
 	perl-module-runtime-conflicts perl-mro-compat
 	perl-package-deprecationmanager perl-params-util perl-sub-exporter
 	perl-sub-identify perl-sub-name perl-try-tiny"
-makedepends="perl-dev"
-checkdepends="perl-cpan-meta-check perl-dist-checkconflicts
+checkdepends="perl-cpan-meta-check perl-dist-checkconflicts perl-test-output
 	perl-test-cleannamespaces perl-test-fatal perl-test-requires"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
@@ -38,4 +38,4 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="f94ed23c45a860b9afa8defe7f5067a65fdd9d457d94a85e4ea192640d09ad73bc336a2e54c4c663643ec0efa32872f4b2aa69083e99093e420cecf5430f34a3  Moose-2.2011.tar.gz"
+sha512sums="195079c32ce0110ae5d76bc1753b9e5c9aa8b3132049912d85600b7d29470b3426e10ccac50a24acbadbb8e00b68c99a98ca975a001b12096b02f2fa1c1264f3  Moose-2.2012.tar.gz"
diff --git a/user/perl-moosex-getopt/APKBUILD b/user/perl-moosex-getopt/APKBUILD
index ca0caabf3..d1a835f95 100644
--- a/user/perl-moosex-getopt/APKBUILD
+++ b/user/perl-moosex-getopt/APKBUILD
@@ -12,10 +12,10 @@ url="https://metacpan.org/release/MooseX-Getopt"
 arch="noarch"
 license="Artistic-1.0-Perl"
 depends="perl-getopt-long-descriptive perl-moose perl-moosex-role-parameterised
-	perl-namespace-autoclean perl-try-tiny"
-makedepends="perl-dev perl-module-build-tiny"
+	perl-namespace-autoclean perl-try-tiny perl"
 checkdepends="perl-moosex-strictconstructor perl-path-tiny perl-test-deep
 	perl-test-fatal perl-test-needs perl-test-trap perl-test-warnings"
+makedepends="perl-dev perl-module-build-tiny"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-moosex-role-parameterised/APKBUILD b/user/perl-moosex-role-parameterised/APKBUILD
index 1589d37bb..26946518e 100644
--- a/user/perl-moosex-role-parameterised/APKBUILD
+++ b/user/perl-moosex-role-parameterised/APKBUILD
@@ -11,9 +11,11 @@ pkgdesc="Perl Moose roles with composition parameters"
 url="https://metacpan.org/release/MooseX-Role-Parameterized"
 arch="noarch"
 license="Artistic-1.0-Perl"
-depends="perl-module-runtime perl-moose perl-namespace-autoclean perl-namespace-clean"
+depends="perl perl-module-runtime perl-moose perl-namespace-autoclean
+	perl-namespace-clean"
+checkdepends="perl-cpan-meta-check perl-dist-checkconflicts perl-test-fatal
+	perl-test-requires"
 makedepends="perl-dev perl-module-build-tiny"
-checkdepends="perl-cpan-meta-check perl-dist-checkconflicts perl-test-fatal perl-test-requires"
 provides="perl-moosex-role-parameterized=$pkgver-r$pkgrel"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-moosex-strictconstructor/APKBUILD b/user/perl-moosex-strictconstructor/APKBUILD
index c0778ec92..4aa583aef 100644
--- a/user/perl-moosex-strictconstructor/APKBUILD
+++ b/user/perl-moosex-strictconstructor/APKBUILD
@@ -11,9 +11,9 @@ pkgdesc="Ensure unknown attributes passed to Perl Moose ctors are errors"
 url="https://metacpan.org/release/MooseX-StrictConstructor"
 arch="noarch"
 license="Artistic-2.0"
-depends="perl-moose perl-namespace-autoclean"
-makedepends="perl-dev"
+depends="perl perl-moose perl-namespace-autoclean"
 checkdepends="perl-moo perl-test-fatal perl-test-needs"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-moox-late/APKBUILD b/user/perl-moox-late/APKBUILD
index 7238eacfc..5bae5212a 100644
--- a/user/perl-moox-late/APKBUILD
+++ b/user/perl-moox-late/APKBUILD
@@ -5,15 +5,15 @@ _pkgreal=MooX-late
 _author=TOBYINK
 _au=${_author%%"${_author#??}"}
 _a=${_author%%"${_author#?}"}
-pkgver=0.015
+pkgver=0.016
 pkgrel=0
 pkgdesc="Translate Moose code into Moo"
 url="https://metacpan.org/release/MooX-late"
 arch="noarch"
 license="Artistic-1.0-Perl"
 depends="perl-moo perl-type-tiny"
-makedepends="perl-dev"
 checkdepends="perl-test-fatal perl-test-requires"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
@@ -32,4 +32,4 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="4d685f4e68abe10487a98def8f0e7b0bafbd9928af27e61a5ac410bcafa9833a4aebdc8cd5bdbebd1a6ee53b4b0d5ae9bfa3864cae428b21c926730365fefb6d  MooX-late-0.015.tar.gz"
+sha512sums="d2d53ad531a87e711c78a08e94852b80492cb62120c513ff0a80fb5cffcf8f5eacec227a3dececd03fe47612c3829ff44918c09b7561143c172ef8eff2d49346  MooX-late-0.016.tar.gz"
diff --git a/user/perl-moox/APKBUILD b/user/perl-moox/APKBUILD
index 33605c480..eacc40aba 100644
--- a/user/perl-moox/APKBUILD
+++ b/user/perl-moox/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Perl module for using Moo and MooX:: lazily"
 url="https://metacpan.org/release/MooX"
 arch="noarch"
 license="Artistic-1.0-Perl"
-depends="perl-data-optlist perl-import-into perl-module-runtime perl-moo"
+depends="perl perl-data-optlist perl-import-into perl-module-runtime perl-moo"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-mouse/APKBUILD b/user/perl-mouse/APKBUILD
index 8aea1d200..638aea5bf 100644
--- a/user/perl-mouse/APKBUILD
+++ b/user/perl-mouse/APKBUILD
@@ -12,8 +12,9 @@ url="https://metacpan.org/pod/Mouse"
 arch="all"
 license="Artistic-1.0-Perl AND GPL-2.0"
 depends="perl"
+checkdepends="perl-test-exception perl-test-fatal perl-test-leaktrace
+	perl-test-output perl-test-requires perl-try-tiny"
 makedepends="perl-dev perl-module-build-xsutil"
-checkdepends="perl-test-exception perl-test-fatal perl-test-leaktrace perl-test-output perl-test-requires perl-try-tiny"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-v$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-v$pkgver"
diff --git a/user/perl-namespace-autoclean/APKBUILD b/user/perl-namespace-autoclean/APKBUILD
index ecb87e181..2ef2b5600 100644
--- a/user/perl-namespace-autoclean/APKBUILD
+++ b/user/perl-namespace-autoclean/APKBUILD
@@ -11,9 +11,9 @@ pkgdesc="Keep imports out of your Perl namespace"
 url="https://metacpan.org/release/namespace-autoclean"
 arch="noarch"
 license="Artistic-1.0-Perl"
-depends="perl-b-hooks-endofscope perl-namespace-clean perl-sub-identify"
-makedepends="perl-dev"
+depends="perl perl-b-hooks-endofscope perl-namespace-clean perl-sub-identify"
 checkdepends="perl-moo perl-moose perl-mouse perl-test-requires perl-test-needs"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-namespace-clean/APKBUILD b/user/perl-namespace-clean/APKBUILD
index 822d22d81..f7a4677cf 100644
--- a/user/perl-namespace-clean/APKBUILD
+++ b/user/perl-namespace-clean/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Keep imports and functions out of your Perl namespace"
 url="https://metacpan.org/release/namespace-clean"
 arch="noarch"
 license="Artistic-1.0-Perl"
-depends="perl-b-hooks-endofscope perl-package-stash"
+depends="perl perl-b-hooks-endofscope perl-package-stash"
 makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-number-compare/APKBUILD b/user/perl-number-compare/APKBUILD
index b56b735dc..9ff48e4fa 100644
--- a/user/perl-number-compare/APKBUILD
+++ b/user/perl-number-compare/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/release/Number-Compare"
 arch="noarch"
 license="Artistic-1.0-Perl"
 depends="perl"
-makedepends=""
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-package-deprecationmanager/APKBUILD b/user/perl-package-deprecationmanager/APKBUILD
index 74676a255..bb8a8f8b6 100644
--- a/user/perl-package-deprecationmanager/APKBUILD
+++ b/user/perl-package-deprecationmanager/APKBUILD
@@ -11,9 +11,9 @@ pkgdesc="Manage deprecation warnings for your Perl distribution"
 url="https://metacpan.org/release/Package-DeprecationManager"
 arch="noarch"
 license="Artistic-2.0"
-depends="perl-package-stash perl-params-util perl-sub-install perl-sub-name"
-makedepends=""
+depends="perl perl-package-stash perl-params-util perl-sub-install perl-sub-name"
 checkdepends="perl-test-fatal perl-test-warnings"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-package-stash-xs/APKBUILD b/user/perl-package-stash-xs/APKBUILD
index 2555e5739..f0f96a947 100644
--- a/user/perl-package-stash-xs/APKBUILD
+++ b/user/perl-package-stash-xs/APKBUILD
@@ -11,9 +11,9 @@ pkgdesc="Faster and more correct implementation of Package::Stash"
 url="https://metacpan.org/release/Package-Stash-XS"
 arch="all"
 license="Artistic-1.0-Perl"
-depends=""
-makedepends="perl-dev"
+depends="perl"
 checkdepends="perl-test-fatal perl-test-requires"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-package-stash/APKBUILD b/user/perl-package-stash/APKBUILD
index ab8a0b910..fe596936a 100644
--- a/user/perl-package-stash/APKBUILD
+++ b/user/perl-package-stash/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/release/Package-Stash"
 arch="noarch"
 license="Artistic-1.0-Perl"
 depends="perl-module-implementation perl-package-stash-xs"
-makedepends="perl-dev"
 checkdepends="perl-dist-checkconflicts perl-test-fatal perl-test-requires"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-params-util/APKBUILD b/user/perl-params-util/APKBUILD
index 17fb32693..55899e69d 100644
--- a/user/perl-params-util/APKBUILD
+++ b/user/perl-params-util/APKBUILD
@@ -1,4 +1,3 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
 pkgname=perl-params-util
 _pkgreal=Params-Util
diff --git a/user/perl-params-validate/APKBUILD b/user/perl-params-validate/APKBUILD
index 0cecdda67..902196fd4 100644
--- a/user/perl-params-validate/APKBUILD
+++ b/user/perl-params-validate/APKBUILD
@@ -11,9 +11,9 @@ pkgdesc="Validate Perl method/function parameters"
 url="https://metacpan.org/release/Params-Validate"
 arch="all"
 license="Artistic-2.0"
-depends="perl-module-implementation"
-makedepends="perl-dev perl-module-build"
+depends="perl perl-module-implementation"
 checkdepends="perl-test-fatal perl-test-requires"
+makedepends="perl-dev perl-module-build"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-parse-recdescent/APKBUILD b/user/perl-parse-recdescent/APKBUILD
index 62beda77e..04b1037c1 100644
--- a/user/perl-parse-recdescent/APKBUILD
+++ b/user/perl-parse-recdescent/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/pod/Parse::RecDescent"
 arch="noarch"
 license="Artistic-1.0-Perl AND GPL-2.0"
 depends="perl"
-makedepends="perl-dev"
 checkdepends="perl-test-warn perl-test-pod"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-path-tiny/APKBUILD b/user/perl-path-tiny/APKBUILD
index 6a88deb6c..e0985051a 100644
--- a/user/perl-path-tiny/APKBUILD
+++ b/user/perl-path-tiny/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/pod/Path::Tiny"
 arch="noarch"
 license="Apache-2.0"
 depends="perl"
-makedepends=""
 checkdepends="perl-test-mockrandom"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-pegex/APKBUILD b/user/perl-pegex/APKBUILD
index 9bd8df39d..e8d845a1c 100644
--- a/user/perl-pegex/APKBUILD
+++ b/user/perl-pegex/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/pod/Pegex"
 arch="noarch"
 license="Artistic-1.0-Perl AND GPL-2.0"
 depends="perl"
-makedepends="perl-file-sharedir-install"
 checkdepends="perl-yaml-libyaml"
+makedepends="perl-file-sharedir-install"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-perl-tidy/APKBUILD b/user/perl-perl-tidy/APKBUILD
index 8c9693b05..50fa1b800 100644
--- a/user/perl-perl-tidy/APKBUILD
+++ b/user/perl-perl-tidy/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/release/Perl-Tidy"
 arch="noarch"
 license="GPL-2.0-only"
 depends="perl"
-makedepends=""
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-perlio-utf8_strict/APKBUILD b/user/perl-perlio-utf8_strict/APKBUILD
index 32b32758d..90a01a560 100644
--- a/user/perl-perlio-utf8_strict/APKBUILD
+++ b/user/perl-perlio-utf8_strict/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/release/PerlIO-utf8_strict"
 arch="all"
 license="Artistic-1.0-Perl"
 depends="perl"
-makedepends="perl-dev"
 checkdepends="perl-test-exception"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-pod-coverage/APKBUILD b/user/perl-pod-coverage/APKBUILD
index 7bd736aaa..23b7afc41 100644
--- a/user/perl-pod-coverage/APKBUILD
+++ b/user/perl-pod-coverage/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Checks if the documentation of a module is comprehensive"
 url="https://metacpan.org/pod/Pod::Coverage"
 arch="noarch"
 license="Artistic-1.0-Perl AND GPL-2.0"
-depends="perl-devel-symdump"
-makedepends=""
+depends="perl perl-devel-symdump"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-role-tiny/APKBUILD b/user/perl-role-tiny/APKBUILD
index c4eb90987..e61fa15b1 100644
--- a/user/perl-role-tiny/APKBUILD
+++ b/user/perl-role-tiny/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/pod/Role::Tiny"
 arch="noarch"
 license="Artistic-1.0-Perl AND GPL-2.0"
 depends="perl"
-makedepends=""
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-scope-guard/APKBUILD b/user/perl-scope-guard/APKBUILD
index a7c047af1..884d96003 100644
--- a/user/perl-scope-guard/APKBUILD
+++ b/user/perl-scope-guard/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/release/Scope-Guard"
 arch="noarch"
 license="Artistic-1.0-Perl"
 depends="perl"
-makedepends=""
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
@@ -27,7 +27,6 @@ check() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
diff --git a/user/perl-specio-library-path-tiny/APKBUILD b/user/perl-specio-library-path-tiny/APKBUILD
index e8710d952..793639532 100644
--- a/user/perl-specio-library-path-tiny/APKBUILD
+++ b/user/perl-specio-library-path-tiny/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Path::Tiny types and coercions for Specio"
 url="https://metacpan.org/release/Specio-Library-Path-Tiny"
 arch="noarch"
 license="Apache-2.0"
-depends="perl-file-pushd perl-path-tiny perl-specio"
-makedepends=""
+depends="perl perl-file-pushd perl-path-tiny perl-specio"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-string-shellquote/APKBUILD b/user/perl-string-shellquote/APKBUILD
index 306ec6e07..927ad5427 100644
--- a/user/perl-string-shellquote/APKBUILD
+++ b/user/perl-string-shellquote/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/release/String-ShellQuote"
 arch="noarch"
 license="Artistic-1.0-Perl"
 depends="perl"
-makedepends=""
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-sub-exporter-progressive/APKBUILD b/user/perl-sub-exporter-progressive/APKBUILD
index 6a7d681f6..c8ad23970 100644
--- a/user/perl-sub-exporter-progressive/APKBUILD
+++ b/user/perl-sub-exporter-progressive/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Only use Sub::Exporter if you need it"
 url="https://metacpan.org/pod/Sub::Exporter::Progressive"
 arch="noarch"
 license="Artistic-1.0-Perl AND GPL-2.0"
-depends="perl-sub-exporter"
-makedepends=""
+depends="perl perl-sub-exporter"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-sub-exporter/APKBUILD b/user/perl-sub-exporter/APKBUILD
index 7416bb22e..2af5726b6 100644
--- a/user/perl-sub-exporter/APKBUILD
+++ b/user/perl-sub-exporter/APKBUILD
@@ -1,5 +1,3 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
 pkgname=perl-sub-exporter
 _pkgreal=Sub-Exporter
@@ -13,7 +11,7 @@ url="https://metacpan.org/release/Sub-Exporter"
 arch="noarch"
 license="GPL-1.0+ OR Artistic-1.0-Perl"
 depends="perl-data-optlist perl-sub-install perl-params-util"
-makedepends=""
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-sub-install/APKBUILD b/user/perl-sub-install/APKBUILD
index 543c17783..bb6eac5d7 100644
--- a/user/perl-sub-install/APKBUILD
+++ b/user/perl-sub-install/APKBUILD
@@ -1,4 +1,3 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
 pkgname=perl-sub-install
 _pkgreal=Sub-Install
diff --git a/user/perl-sub-quote/APKBUILD b/user/perl-sub-quote/APKBUILD
index 25fcc7845..427d8b410 100644
--- a/user/perl-sub-quote/APKBUILD
+++ b/user/perl-sub-quote/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/release/Sub-Quote"
 arch="noarch"
 license="Artistic-1.0-Perl AND GPL-2.0"
 depends="perl"
-makedepends=""
 checkdepends="perl-test-fatal"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-task-freecellsolver-testing/APKBUILD b/user/perl-task-freecellsolver-testing/APKBUILD
index 6b9a60751..2e2641814 100644
--- a/user/perl-task-freecellsolver-testing/APKBUILD
+++ b/user/perl-task-freecellsolver-testing/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Perl module for testing the Freecell Solver package"
 url="https://metacpan.org/release/Task-FreecellSolver-Testing"
 arch="noarch"
 license="MIT"
-depends="perl-code-tidyall perl-env-path perl-file-which
+depends="perl perl-code-tidyall perl-env-path perl-file-which
 	perl-games-solitaire-verify perl-inline perl-inline-c
 	perl-list-moreutils perl-moo perl-moox perl-moox-late perl-path-tiny
 	perl-string-shellquote perl-task-test-run-allplugins
diff --git a/user/perl-task-test-run-allplugins/APKBUILD b/user/perl-task-test-run-allplugins/APKBUILD
index 34a6dfa3a..6d584013c 100644
--- a/user/perl-task-test-run-allplugins/APKBUILD
+++ b/user/perl-task-test-run-allplugins/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Install all the Test::Run plugins"
 url="https://metacpan.org/release/Task-Test-Run-AllPlugins"
 arch="noarch"
 license="MIT"
-depends="perl-test-run perl-test-run-cmdline
+depends="perl perl-test-run perl-test-run-cmdline
 	perl-test-run-plugin-alternateinterpreters
 	perl-test-run-plugin-breakonfailure
 	perl-test-run-plugin-colourfileverdicts
diff --git a/user/perl-template-toolkit/APKBUILD b/user/perl-template-toolkit/APKBUILD
index bcc8d0c5e..40c898c4a 100644
--- a/user/perl-template-toolkit/APKBUILD
+++ b/user/perl-template-toolkit/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/release/Template-Toolkit"
 arch="all"
 license="Artistic-1.0-Perl"
 depends="perl-appconfig"
-makedepends="perl-dev"
 checkdepends="perl-cgi perl-test-leaktrace"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-class-most/APKBUILD b/user/perl-test-class-most/APKBUILD
index f9e407693..9ddeb7543 100644
--- a/user/perl-test-class-most/APKBUILD
+++ b/user/perl-test-class-most/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Test Perl classes the easy way"
 url="https://metacpan.org/release/Test-Class-Most"
 arch="noarch"
 license="Artistic-1.0-Perl"
-depends="perl-test-class perl-test-most"
-makedepends=""
+depends="perl perl-test-class perl-test-most"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-class/APKBUILD b/user/perl-test-class/APKBUILD
index fd784beb2..ed59d1bc3 100644
--- a/user/perl-test-class/APKBUILD
+++ b/user/perl-test-class/APKBUILD
@@ -11,9 +11,9 @@ pkgdesc="Create Perl test classes in xUnit/JUnit style"
 url="https://metacpan.org/release/Test-Class"
 arch="noarch"
 license="Artistic-1.0-Perl"
-depends="perl-module-runtime perl-mro-compat perl-try-tiny"
-makedepends=""
+depends="perl perl-module-runtime perl-mro-compat perl-try-tiny"
 checkdepends="perl-test-exception"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-cleannamespaces/APKBUILD b/user/perl-test-cleannamespaces/APKBUILD
index afcf5a7fd..c4b260329 100644
--- a/user/perl-test-cleannamespaces/APKBUILD
+++ b/user/perl-test-cleannamespaces/APKBUILD
@@ -11,11 +11,11 @@ pkgdesc="Check Perl code for uncleaned imports"
 url="https://metacpan.org/release/Test-CleanNamespaces"
 arch="noarch"
 license="Artistic-1.0-Perl"
-depends="perl-file-pushd perl-module-runtime perl-namespace-clean
+depends="perl perl-file-pushd perl-module-runtime perl-namespace-clean
 	perl-package-stash perl-sub-identify"
-makedepends=""
 checkdepends="perl-moo perl-mouse perl-sub-exporter perl-test-deep
 	perl-test-needs perl-test-warnings"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-data-split/APKBUILD b/user/perl-test-data-split/APKBUILD
index 93e7e0c54..7d55b1116 100644
--- a/user/perl-test-data-split/APKBUILD
+++ b/user/perl-test-data-split/APKBUILD
@@ -11,9 +11,9 @@ pkgdesc="Split data-driven Perl tests into several test scripts"
 url="https://metacpan.org/release/Test-Data-Split"
 arch="noarch"
 license="MIT"
-depends="perl-io-all perl-list-moreutils perl-moox perl-moox-late"
-makedepends="perl-module-build"
+depends="perl perl-io-all perl-list-moreutils perl-moox perl-moox-late"
 checkdepends="perl-test-differences"
+makedepends="perl-dev perl-module-build"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-deep/APKBUILD b/user/perl-test-deep/APKBUILD
index bba7fbd1d..b41b1e20a 100644
--- a/user/perl-test-deep/APKBUILD
+++ b/user/perl-test-deep/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/pod/Test::Deep"
 arch="noarch"
 license="Artistic-1.0-Perl AND GPL-2.0"
 depends="perl"
-makedepends=""
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-differences/APKBUILD b/user/perl-test-differences/APKBUILD
index 0db0fa3b6..cc77d3c06 100644
--- a/user/perl-test-differences/APKBUILD
+++ b/user/perl-test-differences/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Test strings and data structures and show differences if not ok"
 url="https://metacpan.org/pod/Test::Differences"
 arch="noarch"
 license="Artistic-1.0-Perl OR GPL-1.0"
-depends="perl-text-diff perl-capture-tiny perl-test-pod-coverage perl-test-pod"
-makedepends=""
+depends="perl perl-text-diff perl-capture-tiny perl-test-pod-coverage perl-test-pod"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-file/APKBUILD b/user/perl-test-file/APKBUILD
index 8fb30801f..5306421c2 100644
--- a/user/perl-test-file/APKBUILD
+++ b/user/perl-test-file/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/pod/Test::File"
 arch="noarch"
 license="Artistic-1.0-Perl AND GPL-2.0"
 depends="perl"
-makedepends=""
 checkdepends="perl-test-pod perl-test-pod-coverage perl-test-utf8"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-mockrandom/APKBUILD b/user/perl-test-mockrandom/APKBUILD
index f7d1b201f..8711be987 100644
--- a/user/perl-test-mockrandom/APKBUILD
+++ b/user/perl-test-mockrandom/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/pod/Test::MockRandom"
 arch="noarch"
 license="Apache-2.0"
 depends="perl"
-makedepends=""
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-most/APKBUILD b/user/perl-test-most/APKBUILD
index deffa4376..7d6895596 100644
--- a/user/perl-test-most/APKBUILD
+++ b/user/perl-test-most/APKBUILD
@@ -11,8 +11,9 @@ pkgdesc="Most commonly needed Perl test functions and features"
 url="https://metacpan.org/release/Test-Most"
 arch="noarch"
 license="Artistic-1.0-Perl"
-depends="perl-exception-class perl-test-deep perl-test-differences perl-test-exception perl-test-warn"
-makedepends=""
+depends="perl perl-exception-class perl-test-deep perl-test-differences
+	perl-test-exception perl-test-warn"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-output/APKBUILD b/user/perl-test-output/APKBUILD
index 241c8b29c..130871fd0 100644
--- a/user/perl-test-output/APKBUILD
+++ b/user/perl-test-output/APKBUILD
@@ -1,5 +1,3 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
 pkgname=perl-test-output
 _pkgreal=Test-Output
@@ -12,9 +10,9 @@ pkgdesc="Utilities to test STDOUT and STDERR messages"
 url="https://metacpan.org/release/Test-Output"
 arch="noarch"
 license="Artistic-2.0"
-depends="perl-capture-tiny perl-sub-exporter perl-test-simple"
-makedepends=""
+depends="perl perl-capture-tiny perl-sub-exporter perl-test-simple"
 checkdepends="perl-test-pod"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-perltidy/APKBUILD b/user/perl-test-perltidy/APKBUILD
index d631c4fa1..29d325646 100644
--- a/user/perl-test-perltidy/APKBUILD
+++ b/user/perl-test-perltidy/APKBUILD
@@ -11,9 +11,9 @@ pkgdesc="Check all your Perl files for tidiness"
 url="https://metacpan.org/release/Test-PerlTidy"
 arch="noarch"
 license="Artistic-1.0-Perl"
-depends="perl-file-finder perl-file-slurp perl-perl-tidy perl-text-diff"
+depends="perl perl-file-finder perl-file-slurp perl-perl-tidy perl-text-diff"
 checkdepends="perl-path-tiny"
-makedepends=""
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-pod-coverage/APKBUILD b/user/perl-test-pod-coverage/APKBUILD
index 9992a6bda..35e3e6096 100644
--- a/user/perl-test-pod-coverage/APKBUILD
+++ b/user/perl-test-pod-coverage/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/pod/Test::Pod::Coverage"
 arch="noarch"
 license="Artistic-2.0"
 depends="perl perl-pod-coverage"
-makedepends=""
 checkdepends="perl-test-pod"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-run-cmdline/APKBUILD b/user/perl-test-run-cmdline/APKBUILD
index e1c32a2af..aa806f921 100644
--- a/user/perl-test-run-cmdline/APKBUILD
+++ b/user/perl-test-run-cmdline/APKBUILD
@@ -11,10 +11,10 @@ pkgdesc="Analyse tests from the command line using Perl Test::Run"
 url="https://metacpan.org/release/Test-Run-CmdLine"
 arch="noarch"
 license="MIT"
-depends="perl-moose perl-moosex-getopt perl-test-run perl-universal-require
-	perl-yaml-libyaml"
-makedepends=""
+depends="perl perl-moose perl-moosex-getopt perl-test-run
+	perl-universal-require perl-yaml-libyaml"
 checkdepends="perl-test-trap"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-run-plugin-ai/APKBUILD b/user/perl-test-run-plugin-ai/APKBUILD
index a48610aa8..4fc3b2de7 100644
--- a/user/perl-test-run-plugin-ai/APKBUILD
+++ b/user/perl-test-run-plugin-ai/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Define different interpreters for test scripts with Perl Test::Run"
 url="https://metacpan.org/release/Test-Run-Plugin-AlternateInterpreters"
 arch="noarch"
 license="MIT"
-depends="perl-moose perl-mro-compat perl-test-run perl-test-run-cmdline"
-makedepends=""
+depends="perl perl-moose perl-mro-compat perl-test-run perl-test-run-cmdline"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-run-plugin-bof/APKBUILD b/user/perl-test-run-plugin-bof/APKBUILD
index b0e224125..d1bd6da75 100644
--- a/user/perl-test-run-plugin-bof/APKBUILD
+++ b/user/perl-test-run-plugin-bof/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Stop processing entire Test::Run suite on single failure"
 url="https://metacpan.org/release/Test-Run-Plugin-BreakOnFailure"
 arch="noarch"
 license="MIT"
-depends="perl-moose perl-mro-compat perl-test-run perl-test-run-cmdline"
-makedepends=""
+depends="perl perl-moose perl-mro-compat perl-test-run perl-test-run-cmdline"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-v$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-v$pkgver"
diff --git a/user/perl-test-run-plugin-cfv/APKBUILD b/user/perl-test-run-plugin-cfv/APKBUILD
index a6b38f143..8c8f9438b 100644
--- a/user/perl-test-run-plugin-cfv/APKBUILD
+++ b/user/perl-test-run-plugin-cfv/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Make Perl Test::Run file verdicts (ok, not ok) colourful"
 url="https://metacpan.org/release/Test-Run-Plugin-ColorFileVerdicts"
 arch="noarch"
 license="MIT"
-depends="perl-moose perl-mro-compat perl-test-run perl-test-run-cmdline"
-makedepends=""
+depends="perl perl-moose perl-mro-compat perl-test-run perl-test-run-cmdline"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 provides="perl-test-run-plugin-colorfileverdicts=$pkgver-r$pkgrel"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-test-run-plugin-cs/APKBUILD b/user/perl-test-run-plugin-cs/APKBUILD
index e0e828863..5814e7d28 100644
--- a/user/perl-test-run-plugin-cs/APKBUILD
+++ b/user/perl-test-run-plugin-cs/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Perl Test::Run plugin that colours test summary"
 url="https://metacpan.org/release/Test-Run-Plugin-ColorSummary"
 arch="noarch"
 license="MIT"
-depends="perl-moose perl-mro-compat perl-test-run perl-test-run-cmdline"
-makedepends=""
+depends="perl perl-moose perl-mro-compat perl-test-run perl-test-run-cmdline"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 provides="perl-test-run-plugin-colorsummary=$pkgver-r$pkgrel"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-test-run-plugin-tdf/APKBUILD b/user/perl-test-run-plugin-tdf/APKBUILD
index 9a5367aff..3121ebba3 100644
--- a/user/perl-test-run-plugin-tdf/APKBUILD
+++ b/user/perl-test-run-plugin-tdf/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Handle excessively long filenames in Perl Test::Run suites"
 url="https://metacpan.org/release/Test-Run-Plugin-TrimDisplayedFilenames"
 arch="noarch"
 license="MIT"
-depends="perl-moose perl-mro-compat perl-test-run perl-test-run-cmdline"
-makedepends=""
+depends="perl perl-moose perl-mro-compat perl-test-run perl-test-run-cmdline"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-run/APKBUILD b/user/perl-test-run/APKBUILD
index de126e631..e35eebd21 100644
--- a/user/perl-test-run/APKBUILD
+++ b/user/perl-test-run/APKBUILD
@@ -11,10 +11,10 @@ pkgdesc="Perl classes to run standard TAP scripts"
 url="https://metacpan.org/release/Test-Run"
 arch="noarch"
 license="MIT"
-depends="perl-ipc-system-simple perl-list-moreutils perl-moose
+depends="perl perl-ipc-system-simple perl-list-moreutils perl-moose
 	perl-moosex-strictconstructor perl-test-trap perl-text-sprintf-named
 	perl-universal-require"
-makedepends=""
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-runvalgrind/APKBUILD b/user/perl-test-runvalgrind/APKBUILD
index 9f7d5b9d5..e6f13fde5 100644
--- a/user/perl-test-runvalgrind/APKBUILD
+++ b/user/perl-test-runvalgrind/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Tests an external program is 'valgrind clean' from Perl"
 url="https://metacpan.org/release/Test-RunValgrind"
 arch="noarch"
 license="MIT"
-depends="perl-path-tiny perl-test-trap"
-makedepends="perl-module-build"
+depends="perl perl-path-tiny perl-test-trap valgrind"
+makedepends="perl-dev perl-module-build"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz
 	portable-memory-assumptions.patch
diff --git a/user/perl-test-trailingspace/APKBUILD b/user/perl-test-trailingspace/APKBUILD
index e84ca6bc1..3da940f14 100644
--- a/user/perl-test-trailingspace/APKBUILD
+++ b/user/perl-test-trailingspace/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Test for trailing spaces in Perl source files"
 url="https://metacpan.org/release/Test-TrailingSpace"
 arch="noarch"
 license="MIT"
-depends="perl-file-find-object-rule"
-makedepends="perl-module-build"
+depends="perl perl-file-find-object-rule"
+makedepends="perl-dev perl-module-build"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-trap/APKBUILD b/user/perl-test-trap/APKBUILD
index fa119c353..fa4764ce1 100644
--- a/user/perl-test-trap/APKBUILD
+++ b/user/perl-test-trap/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Trap Perl exit codes, exceptions, and output"
 url="https://metacpan.org/release/Test-Trap"
 arch="noarch"
 license="Artistic-1.0-Perl"
-depends="perl-data-dump"
-makedepends=""
+depends="perl perl-data-dump"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-v$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-v$pkgver"
diff --git a/user/perl-test-utf8/APKBUILD b/user/perl-test-utf8/APKBUILD
index 909e0fa45..408a847be 100644
--- a/user/perl-test-utf8/APKBUILD
+++ b/user/perl-test-utf8/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/pod/Test::utf8"
 arch="noarch"
 license="Artistic-1.0-Perl AND GPL-2.0"
 depends="perl"
-makedepends="perl-module-install"
+makedepends="perl-dev perl-module-install"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-text-diff/APKBUILD b/user/perl-text-diff/APKBUILD
index 394263c58..17b4f16d4 100644
--- a/user/perl-text-diff/APKBUILD
+++ b/user/perl-text-diff/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Perform diffs on files and record sets"
 url="https://metacpan.org/pod/Text::Diff"
 arch="noarch"
 license="GPL-2.0+ OR Artistic-1.0-Perl"
-depends="perl-algorithm-diff"
-makedepends=""
+depends="perl perl-algorithm-diff"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-text-glob/APKBUILD b/user/perl-text-glob/APKBUILD
index 310656f6c..ca186c590 100644
--- a/user/perl-text-glob/APKBUILD
+++ b/user/perl-text-glob/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/release/Text-Glob"
 arch="noarch"
 license="Artistic-1.0-Perl"
 depends="perl"
-makedepends=""
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-text-sprintf-named/APKBUILD b/user/perl-text-sprintf-named/APKBUILD
index 5b2e0125f..8d7ff5b92 100644
--- a/user/perl-text-sprintf-named/APKBUILD
+++ b/user/perl-text-sprintf-named/APKBUILD
@@ -11,9 +11,9 @@ pkgdesc="sprintf-like function for Perl with named conversions"
 url="https://metacpan.org/release/Text-Sprintf-Named"
 arch="noarch"
 license="MIT"
-depends="perl-module-build"
-makedepends=""
+depends="perl perl-module-build"
 checkdepends="perl-test-warn"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-time-duration-parse/APKBUILD b/user/perl-time-duration-parse/APKBUILD
index b7bd2c169..7f9c5b6f7 100644
--- a/user/perl-time-duration-parse/APKBUILD
+++ b/user/perl-time-duration-parse/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Parse strings in Perl that represent time durations"
 url="https://metacpan.org/release/Time-Duration-Parse"
 arch="noarch"
 license="Artistic-1.0-Perl"
-depends="perl-exporter-lite perl-time-duration"
-makedepends=""
+depends="perl perl-exporter-lite perl-time-duration"
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-time-duration/APKBUILD b/user/perl-time-duration/APKBUILD
index cdeeaa508..469a307d3 100644
--- a/user/perl-time-duration/APKBUILD
+++ b/user/perl-time-duration/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/release/Time-Duration"
 arch="noarch"
 license="Artistic-1.0-Perl"
 depends="perl"
-makedepends=""
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-timedate/APKBUILD b/user/perl-timedate/APKBUILD
index f1e1e2bc0..fec167717 100644
--- a/user/perl-timedate/APKBUILD
+++ b/user/perl-timedate/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/release/TimeDate"
 arch="noarch"
 license="Artistic-1.0-Perl"
 depends="perl"
-makedepends=""
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-universal-require/APKBUILD b/user/perl-universal-require/APKBUILD
index 6b573becc..73e7604d4 100644
--- a/user/perl-universal-require/APKBUILD
+++ b/user/perl-universal-require/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/release/UNIVERSAL-require"
 arch="noarch"
 license="Artistic-1.0-Perl"
 depends="perl"
-makedepends=""
+makedepends="perl-dev"
 subpackages="$pkgname-doc"
 source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"