gentoo auto-resync : 30:07:2023 - 16:42:14

4 files changed, 19 insertions, 13 deletions

diff --git a/app-admin/perl-cleaner/Manifest b/app-admin/perl-cleaner/Manifest
index ac9faa7a6695..03e7adc08739 100644
--- a/app-admin/perl-cleaner/Manifest
+++ b/app-admin/perl-cleaner/Manifest
@@ -1,5 +1,6 @@
 DIST perl-cleaner-2.30.tar.bz2 6963 BLAKE2B 8983060c7a904266ac82a67eba7b5d2184803b59c077f947a35d07e9af3046953705d31840b9508116578b8f3e8a8b97d77cf21eeac3b70f1c3fb5c1d71ae64e SHA512 436d26727bbb598bcd3c4f31e6b81e415a797cdba82dccfd55e54ee179bd2d6c1dc443e865f6f0a05b59f47ffd231dd10e55d5ea97a9a6875235ea1b49b68898
+DIST perl-cleaner-2.31.tar.bz2 6914 BLAKE2B 4b13ae42ab06ad75b6dbcb1306f3f4f476315db4504d0ffbc4c56d4d66a2da3a751d3682305daca6bcbae1861d182f16296c92f9a8d25687e35ab03a6f8734e3 SHA512 c4df0437604d41dbfdce0b72d72f975d464cf0c44f417c708917f01829e498ef8d6b47a78cee517836cac9344791ad49db98f29da5f78599e80b000e41b8127e
 EBUILD perl-cleaner-2.30-r1.ebuild 1111 BLAKE2B 527a75e277026c76a43ca91572572e6208f551dc72abe16641539a79b7caa5075580aad8235f7cc562279ce248b3338700389fae16c28f473657a1a28e55003c SHA512 54304e071f2862e171c1e374a565dbd9d560a4564684f72f8303476e168b54d4b79cc68c035b67e2f0c373a5a700c617195c4610bfb80d0e238c9043c12c1d55
-EBUILD perl-cleaner-2.30.ebuild 953 BLAKE2B 6d75203e89cadb65724d83950edca5aa875c08aa4d3475cb15493e38e3dd8ede8557861d31c106e28f712cb94341cd30424fa9da274872c270cab647c22d4671 SHA512 488a7adc2fee88163d4317fcae98ad73cf48974006d7afadf39ce9d38610bfd9dfa309587f390797daf4cfaab9663fb1e5cf03a18bab6fcdf9ae3caaf07c9285
-EBUILD perl-cleaner-9999.ebuild 988 BLAKE2B 9dcaaf9dd394eed72c27f5519009ffdead61cd156ce7e5536546e4e380de8aab9eade9b316fddc78345134d17ece5e3d34299fcb9e487b566e623bf186eb91f3 SHA512 1c2910aedd3f73db3bbdbb85f6d3cca1ed4bdddc5ba4aa9ede94157e34e93fadff6d3b0e80b0ebe9fade0d0c8804e2d2bd1a466793f72daa58b6eb4ed56560f1
-MISC metadata.xml 420 BLAKE2B d259e9ba8b0bf36b8985837e6d37737dbf0f32ca5727a41a84ae8e674dbe1ebbddf0279ccf8500f86b381e143f6bc611a3ba6adfe03a8305a932efb7bd174014 SHA512 752e5cc42413c4ded2e816ed756b51b45df2b109143ece14850383c7763dee2d627008280d1f35bc4751e5d442d2e895bcccbd37b434f5a52f2b5542ab2f6fe6
+EBUILD perl-cleaner-2.31.ebuild 959 BLAKE2B 3eab4dd3cdb9efafd1b786fb3c24468e9bd8f920fe050985cb55f37e968fc6972b206cb91265e75088cab51751371f7ff1d0a371519900d9504a3a8395be0fe3 SHA512 61baba3623a7bbbbbc4d4e7891379dfc8e7fb8f212fd26e9c61a7dcd3ac3a1a0fe3091719db2c9c8a9dfacdca6d0e11f63f2b17c57a19726f703c4774019320b
+EBUILD perl-cleaner-9999.ebuild 959 BLAKE2B 3eab4dd3cdb9efafd1b786fb3c24468e9bd8f920fe050985cb55f37e968fc6972b206cb91265e75088cab51751371f7ff1d0a371519900d9504a3a8395be0fe3 SHA512 61baba3623a7bbbbbc4d4e7891379dfc8e7fb8f212fd26e9c61a7dcd3ac3a1a0fe3091719db2c9c8a9dfacdca6d0e11f63f2b17c57a19726f703c4774019320b
+MISC metadata.xml 509 BLAKE2B 4d80cf3b299ea530173c8295cdd5039e1663772f09ea1d718448843968029e58791565d7e2265e5f653b8260364a92921edab6293ed4b3c914c30aafc6ad8b41 SHA512 98eaef261e37fd9727a5a8ebba9418c2fa77e4f2deec9bee6a405a742ad32e68eb3d7d5e03c4e95a55d025eb72701f1257b539cc61069c410a48516e77e09dfd
diff --git a/app-admin/perl-cleaner/metadata.xml b/app-admin/perl-cleaner/metadata.xml
index 97ce6f33156c..e0aae08711fb 100644
--- a/app-admin/perl-cleaner/metadata.xml
+++ b/app-admin/perl-cleaner/metadata.xml
@@ -11,4 +11,7 @@
 			and <pkg>app-portage/portage-utils</pkg>.
 		</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">gentoo-perl/perl-cleaner</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.30.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.31.ebuild
index c9246a3e8cca..b7bf446c4729 100644
--- a/app-admin/perl-cleaner/perl-cleaner-2.30.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.31.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit prefix
 
@@ -12,21 +12,23 @@ 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	SRC_URI="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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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
 	)
 "
 
diff --git a/app-admin/perl-cleaner/perl-cleaner-9999.ebuild b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
index 6e0fcfe3ba3e..b7bf446c4729 100644
--- a/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
@@ -12,7 +12,7 @@ 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"
+	SRC_URI="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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi