commit: 52013a947b62f88873a924a8cd7adb69af66c3b9
Author: Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Sun May 26 01:46:34 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 28 00:54:21 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52013a94
dev-lang/perl: PDEPEND on perl-cleaner if USE !minimal
This change effectively reverts fe38b09da732bbee5c7cf411852b04eb76ebb40f
as the combination of moving perl-cleaner to IDEPEND after this
and 00aadd9b5059a0675edb18cbb3278059b987ed24 moving
dev-lang/perl from RDEPEND -> PDEPEND in perl-cleaner results in circular
dependencies.
```
(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)
It might be possible to break this cycle
by applying any of the following changes:
- app-admin/perl-cleaner-2.31-r1 (Change USE: +pkgcore)
- sys-apps/portage-3.0.64-r2 (Change USE: +build)
```
[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 <kangie <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
...erl-5.40.0_rc1.ebuild => perl-5.38.2-r6.ebuild} | 40 ++++++++++++----------
...5.40.0_rc1.ebuild => perl-5.40.0_rc1-r1.ebuild} | 3 +-
2 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/dev-lang/perl/perl-5.40.0_rc1.ebuild
b/dev-lang/perl/perl-5.38.2-r6.ebuild
similarity index 95%
copy from dev-lang/perl/perl-5.40.0_rc1.ebuild
copy to dev-lang/perl/perl-5.38.2-r6.ebuild
index ec43cd31561d..ee16fbfbfdcb 100644
--- a/dev-lang/perl/perl-5.40.0_rc1.ebuild
+++ b/dev-lang/perl/perl-5.38.2-r6.ebuild
@@ -5,9 +5,9 @@ EAPI=8
inherit alternatives flag-o-matic toolchain-funcs multilib multiprocessing
-PATCH_VER=2
+PATCH_VER=1
CROSS_VER=1.5.2
-PATCH_BASE="perl-5.40.0-patches-${PATCH_VER}"
+PATCH_BASE="perl-5.38.0-patches-${PATCH_VER}"
PATCH_DEV=dilfridge
DIST_AUTHOR=PEVANS
@@ -18,7 +18,7 @@ DIST_AUTHOR=PEVANS
PERL_BIN_OLDVERSEN=""
if [[ "${PV##*.}" == "9999" ]]; then
- DIST_VERSION=5.40.0
+ DIST_VERSION=5.30.0
else
DIST_VERSION="${PV/_rc/-RC}"
fi
@@ -44,9 +44,9 @@ HOMEPAGE="https://www.perl.org/";
SRC_URI="
mirror://cpan/src/5.0/${MY_P}.tar.xz
mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${MY_P}.tar.xz
- https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PATCH_BASE}.tar.xz
+
https://github.com/gentoo-perl/perl-patchset/archive/refs/tags/${PATCH_BASE}.tar.gz
+ https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PATCH_BASE}.tar.gz
https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
- https://haarg.org/${MY_P}.tar.xz
"
S="${WORKDIR}/${MY_P}"
@@ -72,6 +72,7 @@ DEPEND="${RDEPEND}"
BDEPEND="${RDEPEND}"
PDEPEND="
!minimal? (
+ >=app-admin/perl-cleaner-2.30
>=virtual/perl-CPAN-2.290.0
>=virtual/perl-Encode-3.120.0
>=virtual/perl-File-Temp-0.230.400-r2
@@ -80,26 +81,25 @@ PDEPEND="
virtual/perl-Test-Harness
)
"
-IDEPEND="app-admin/perl-cleaner"
# bug 390719, bug 523624
# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker
dual_scripts() {
- src_remove_dual perl-core/Archive-Tar 3.20.10_rc ptar
ptardiff ptargrep
+ src_remove_dual perl-core/Archive-Tar 2.400.0 ptar
ptardiff ptargrep
src_remove_dual perl-core/CPAN 2.360.0 cpan
src_remove_dual perl-core/Digest-SHA 6.40.0 shasum
- src_remove_dual perl-core/Encode 3.210.0 enc2xs
piconv
+ src_remove_dual perl-core/Encode 3.190.0 enc2xs
piconv
src_remove_dual perl-core/ExtUtils-MakeMaker 7.700.0
instmodsh
src_remove_dual perl-core/ExtUtils-ParseXS 3.510.0 xsubpp
- src_remove_dual perl-core/IO-Compress 2.212.0
zipdetails
- src_remove_dual perl-core/JSON-PP 4.160.0 json_pp
- src_remove_dual perl-core/Module-CoreList 5.202.405.240 corelist
- src_remove_dual perl-core/Pod-Checker 1.770.0
podchecker
+ src_remove_dual perl-core/IO-Compress 2.204.0
zipdetails
+ src_remove_dual perl-core/JSON-PP 4.160.0 json_pp
+ src_remove_dual perl-core/Module-CoreList 5.202.311.290 corelist
+ src_remove_dual perl-core/Pod-Checker 1.750.0
podchecker
src_remove_dual perl-core/Pod-Perldoc 3.280.100 perldoc
- src_remove_dual perl-core/Pod-Usage 2.30.0
pod2usage
- src_remove_dual perl-core/Test-Harness 3.480.0 prove
- src_remove_dual perl-core/podlators 5.10.200_rc pod2man
pod2text
- src_remove_dual_man perl-core/podlators 5.10.200_rc
/usr/share/man/man1/perlpodstyle.1
+ src_remove_dual perl-core/Pod-Usage 2.30.0 pod2usage
+ src_remove_dual perl-core/Test-Harness 3.440.0 prove
+ src_remove_dual perl-core/podlators 5.10.0 pod2man
pod2text
+ src_remove_dual_man perl-core/podlators 5.10.0
/usr/share/man/man1/perlpodstyle.1
}
check_rebuild() {
@@ -416,8 +416,8 @@ src_prepare() {
local patchdir="${WORKDIR}/patches"
- # mv -v "${WORKDIR}/perl-patchset-${PATCH_BASE}/patches"
"${WORKDIR}/patches" || die
- # mv -v "${WORKDIR}/perl-patchset-${PATCH_BASE}/patch-info"
"${WORKDIR}/patch-info" || die
+ mv -v "${WORKDIR}/perl-patchset-${PATCH_BASE}/patches"
"${WORKDIR}/patches" || die
+ mv -v "${WORKDIR}/perl-patchset-${PATCH_BASE}/patch-info"
"${WORKDIR}/patch-info" || die
# Prepare Patch dir with additional patches / remove unwanted patches
# Inject bug/desc entries for perl -V
@@ -425,6 +425,10 @@ src_prepare() {
# add_patch "${FILESDIR}/${PN}-5.26.2-hppa.patch"
"100-5.26.2-hppa.patch"\
# "Fix broken miniperl on hppa"\
# "https://bugs.debian.org/869122";
"https://bugs.gentoo.org/634162";
+ add_patch "${FILESDIR}/${PN}-5.36.0-fix-configure-for-clang.patch" \
+ "100-5.36.0-fix-configure-for-clang.patch" \
+ "Fix clang check in configure" \
+ "https://github.com/Perl/perl5/issues/21099";
if [[ ${CHOST} == *-solaris* ]] ; then
# do NOT mess with nsl, on Solaris this is always necessary,
diff --git a/dev-lang/perl/perl-5.40.0_rc1.ebuild
b/dev-lang/perl/perl-5.40.0_rc1-r1.ebuild
similarity index 99%
rename from dev-lang/perl/perl-5.40.0_rc1.ebuild
rename to dev-lang/perl/perl-5.40.0_rc1-r1.ebuild
index ec43cd31561d..55a626058dc8 100644
--- a/dev-lang/perl/perl-5.40.0_rc1.ebuild
+++ b/dev-lang/perl/perl-5.40.0_rc1-r1.ebuild
@@ -72,6 +72,7 @@ DEPEND="${RDEPEND}"
BDEPEND="${RDEPEND}"
PDEPEND="
!minimal? (
+ >=app-admin/perl-cleaner-2.30
>=virtual/perl-CPAN-2.290.0
>=virtual/perl-Encode-3.120.0
>=virtual/perl-File-Temp-0.230.400-r2
@@ -80,7 +81,7 @@ PDEPEND="
virtual/perl-Test-Harness
)
"
-IDEPEND="app-admin/perl-cleaner"
+
# bug 390719, bug 523624
# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker
