From 32499b48da6ebacee94f4c84e49a145beb681d11 Mon Sep 17 00:00:00 2001 From: Matt Jolly Date: Sun, 26 May 2024 11:52:15 +1000 Subject: app-admin/perl-cleaner: dev-lang/perl from PDEPEND -> RDEPEND This commit effectively reverts 00aadd9b5059a0675edb18cbb3278059b987ed24 as the combination of that change with fe38b09da732bbee5c7cf411852b04eb76ebb40f's changes to dev-lang/perl's dependencies result in circular dependencies in prefix. ``` (dev-lang/perl-5.38.2-r5:0/5.38::gentoo, ebuild scheduled for merge) depends on (app-admin/perl-cleaner-2.31-r1:0/0::gentoo, ebuild scheduled for merge) (runtime) (sys-apps/portage-3.0.64-r2:0/0::gentoo, ebuild scheduled for merge) (runtime) (app-admin/eselect-1.4.27-r1:0/0::gentoo, ebuild scheduled for merge) (runtime) (sys-apps/coreutils-9.5:0/0::gentoo, ebuild scheduled for merge) (buildtime) (dev-lang/perl-5.38.2-r5:0/5.38::gentoo, ebuild scheduled for merge) (buildtime) ``` [sam: Added some detail to commit message, revbumped too.] Bug: https://bugs.gentoo.org/932348 Bug: https://bugs.gentoo.org/905625 Bug: https://bugs.gentoo.org/915046 Signed-off-by: Matt Jolly Closes: https://github.com/gentoo/gentoo/pull/36818 Signed-off-by: Sam James --- app-admin/perl-cleaner/perl-cleaner-2.31-r1.ebuild | 43 ---------------------- app-admin/perl-cleaner/perl-cleaner-2.31-r2.ebuild | 43 ++++++++++++++++++++++ app-admin/perl-cleaner/perl-cleaner-9999.ebuild | 1 - 3 files changed, 43 insertions(+), 44 deletions(-) delete mode 100644 app-admin/perl-cleaner/perl-cleaner-2.31-r1.ebuild create mode 100644 app-admin/perl-cleaner/perl-cleaner-2.31-r2.ebuild (limited to 'app-admin') diff --git a/app-admin/perl-cleaner/perl-cleaner-2.31-r1.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.31-r1.ebuild deleted file mode 100644 index 4446279177ae..000000000000 --- a/app-admin/perl-cleaner/perl-cleaner-2.31-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2024 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://wiki.gentoo.org/wiki/Project:Perl" - -if [[ "${PV}" == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git" -else - 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="pkgcore" - -[[ "${PV}" == "9999" ]] && BDEPEND="sys-apps/help2man" - -RDEPEND=" - app-shells/bash - pkgcore? ( sys-apps/pkgcore ) - !pkgcore? ( - app-portage/portage-utils - sys-apps/portage - ) -" -PDEPEND="dev-lang/perl" - -src_prepare() { - default - eprefixify ${PN} -} - -src_install() { - dosbin perl-cleaner - doman perl-cleaner.1 -} diff --git a/app-admin/perl-cleaner/perl-cleaner-2.31-r2.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.31-r2.ebuild new file mode 100644 index 000000000000..c8d659c9e0b4 --- /dev/null +++ b/app-admin/perl-cleaner/perl-cleaner-2.31-r2.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 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://wiki.gentoo.org/wiki/Project:Perl" + +if [[ "${PV}" == "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git" +else + 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="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 26e8acae9d9d..c8d659c9e0b4 100644 --- a/app-admin/perl-cleaner/perl-cleaner-9999.ebuild +++ b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild @@ -31,7 +31,6 @@ RDEPEND=" sys-apps/portage ) " -PDEPEND="dev-lang/perl" src_prepare() { default -- cgit v1.2.3-65-gdbad