From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7FBEB158020 for ; Tue, 27 Dec 2022 23:37:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 711FAE088B; Tue, 27 Dec 2022 23:37:46 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4A645E088B for ; Tue, 27 Dec 2022 23:37:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 375833411AE for ; Tue, 27 Dec 2022 23:37:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F231C7E8 for ; Tue, 27 Dec 2022 23:37:42 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1672184222.3ece5e5e0258e7f57458c979ffb91781a66d40ac.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/perl-cleaner/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/perl-cleaner/metadata.xml app-admin/perl-cleaner/perl-cleaner-2.30-r1.ebuild app-admin/perl-cleaner/perl-cleaner-9999.ebuild X-VCS-Directories: app-admin/perl-cleaner/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3ece5e5e0258e7f57458c979ffb91781a66d40ac X-VCS-Branch: master Date: Tue, 27 Dec 2022 23:37:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: eba82e85-a248-41d2-8ebe-634996d9e3e1 X-Archives-Hash: f62a6bf7f983dc8843682677c7166f75 commit: 3ece5e5e0258e7f57458c979ffb91781a66d40ac Author: Sam James gentoo org> AuthorDate: Tue Dec 27 23:35:42 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Dec 27 23:37:02 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ece5e5e app-admin/perl-cleaner: rework portage/pkgcore dependencies This gives us a runtime-only USE flag but it's better than the alternative which regularly leads to at least portage-utils being depcleaned because pkgcore is installed, and then perl-cleaner being broken at runtime because it doesn't actually detect which to use based on available tools. Closes: https://bugs.gentoo.org/779007 Signed-off-by: Sam James gentoo.org> app-admin/perl-cleaner/metadata.xml | 14 +++++-- app-admin/perl-cleaner/perl-cleaner-2.30-r1.ebuild | 45 ++++++++++++++++++++++ app-admin/perl-cleaner/perl-cleaner-9999.ebuild | 20 +++++----- 3 files changed, 66 insertions(+), 13 deletions(-) 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 @@ - - perl@gentoo.org - Gentoo Perl Project - + + perl@gentoo.org + Gentoo Perl Project + + + + Use sys-apps/pkgcore instead of sys-apps/portage + and app-portage/portage-utils. + + 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 ) "