5 files changed, 69 insertions, 15 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 687d173e0333..94e9d0366bdd 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/perl-cleaner/Manifest b/app-admin/perl-cleaner/Manifest
index e47a38e1be3e..0c7b7629aa9e 100644
--- a/app-admin/perl-cleaner/Manifest
+++ b/app-admin/perl-cleaner/Manifest
@@ -1,4 +1,5 @@
 DIST perl-cleaner-2.30.tar.bz2 6963 BLAKE2B 8983060c7a904266ac82a67eba7b5d2184803b59c077f947a35d07e9af3046953705d31840b9508116578b8f3e8a8b97d77cf21eeac3b70f1c3fb5c1d71ae64e SHA512 436d26727bbb598bcd3c4f31e6b81e415a797cdba82dccfd55e54ee179bd2d6c1dc443e865f6f0a05b59f47ffd231dd10e55d5ea97a9a6875235ea1b49b68898
+EBUILD perl-cleaner-2.30-r1.ebuild 1158 BLAKE2B d8b63f675eb4dc33b8070ce9382952bb43524ad82010e1ffbaf794e04516dd0326edf13c405623d40c09bb06059da745867ba209e918e8c812d706521f386b7b SHA512 4280dcc2f4205714ebd556847ce3c75e093d8f9f6aaaddc97e84ca8d03ae0daaad4d6ef0ceafc01f6218a38bd83db087eeba9c640a5cae80e633e745811a7b56
 EBUILD perl-cleaner-2.30.ebuild 992 BLAKE2B a1113e13b337eee36b99391c491c4cd9f8c5e188809e5630228d417b11b700f5dc91cc102a3978c2fcddb7dafab6c1158e38ea3a2606614b836a1acb1e28572e SHA512 025d9a064a62312266dce0c54f6d9f68bfa230ea9b4a41ed6472980b608239621154bf43e3bd4b52b7b5df80cbdd9611a7a4dd9e5c0fde529d3deea4735ffb0e
-EBUILD perl-cleaner-9999.ebuild 993 BLAKE2B 5a1d9800943d0560dd5381cddcf473ab8a26798869da13ccc9b2a2d01891ee8890b5eb4a64ae3e832e0539a0e1fe89814fb65275f62624f1aea3c185af709e60 SHA512 e7ca81ee7f0ebf59c0588c5303c4b7e27f644fb74bfaf9fab9796630be7107368e6be23ac7eefddcfc5cad53cc6a6ddddcd44c2266db51a55e51803d8082022d
-MISC metadata.xml 248 BLAKE2B 0d1d11428d1008e62a8b5c6931968f6738b3513564be9b8cd12ef278e330bd75267254e647810e7ef09e0bce95d57c69ce66a78543495c0eb82bd1dc1b5f59f1 SHA512 0275643f8915fc6efb0b472c2876b7645145948919f345e8a20dd87454ac773f7762835481241d53c40812e01c081bd2901fd1fed975ab689f20881610bdf84e
+EBUILD perl-cleaner-9999.ebuild 1027 BLAKE2B 98a5cea7405f287f5fb5ce3b4ed55737410325f76c2330f340e89d0165c275d5e5817dd7a040ca26f1414eb5473511a1ce16ac3d44b6164f920d98470999df5d SHA512 c21b0adde62a3174137a3ff42bb84d574578578aa8ba03654e6f9738b1ceeda897a7615f36f1d03ecea83ed801249b709b8b2d0e1b14b3f14e833dc599dc8abe
+MISC metadata.xml 420 BLAKE2B d259e9ba8b0bf36b8985837e6d37737dbf0f32ca5727a41a84ae8e674dbe1ebbddf0279ccf8500f86b381e143f6bc611a3ba6adfe03a8305a932efb7bd174014 SHA512 752e5cc42413c4ded2e816ed756b51b45df2b109143ece14850383c7763dee2d627008280d1f35bc4751e5d442d2e895bcccbd37b434f5a52f2b5542ab2f6fe6
diff --git a/app-admin/perl-cleaner/metadata.xml b/app-admin/perl-cleaner/metadata.xml
index d1aa590a84f5..97ce6f33156c 100644
--- a/app-admin/perl-cleaner/metadata.xml
+++ b/app-admin/perl-cleaner/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>perl@gentoo.org</email>
-	<name>Gentoo Perl Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
+	<use>
+		<flag name="pkgcore">
+			Use <pkg>sys-apps/pkgcore</pkg> instead of <pkg>sys-apps/portage</pkg>
+			and <pkg>app-portage/portage-utils</pkg>.
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.30-r1.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.30-r1.ebuild
new file mode 100644
index 000000000000..ff13ed8ec124
--- /dev/null
+++ b/app-admin/perl-cleaner/perl-cleaner-2.30-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit prefix
+
+DESCRIPTION="User land tool for cleaning up old perl installs"
+HOMEPAGE="https://www.gentoo.org/proj/en/perl/"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# TODO: Detect at runtime what's available and fallback if needed, possibly
+# integrate with eselect-package-manager, bug #779007.
+IUSE="pkgcore"
+
+[[ "${PV}" == "9999" ]] && BDEPEND="sys-apps/help2man"
+
+RDEPEND="
+	app-shells/bash
+	dev-lang/perl
+	pkgcore? ( sys-apps/pkgcore )
+	!pkgcore? (
+		app-portage/portage-utils
+		sys-apps/portage
+	)
+"
+
+src_prepare() {
+	default
+	eprefixify ${PN}
+}
+
+src_install() {
+	dosbin perl-cleaner
+	doman perl-cleaner.1
+}
diff --git a/app-admin/perl-cleaner/perl-cleaner-9999.ebuild b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
index a7624afba081..87ae00a7f9e3 100644
--- a/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit prefix
 
@@ -13,20 +13,22 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
+IUSE="pkgcore"
 
-[[ "${PV}" == "9999" ]] && DEPEND="sys-apps/help2man"
+[[ "${PV}" == "9999" ]] && BDEPEND="sys-apps/help2man"
 
-RDEPEND="app-shells/bash
+RDEPEND="
+	app-shells/bash
 	dev-lang/perl
-	|| (
-		( sys-apps/portage app-portage/portage-utils )
-		sys-apps/pkgcore
+	pkgcore? ( sys-apps/pkgcore )
+	!pkgcore? (
+		app-portage/portage-utils
+		sys-apps/portage
 	)
 "