gentoo resync : 04.01.2022

4 files changed, 10 insertions, 13 deletions

diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 006b42eeffc0..7b02208f80eb 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -4,7 +4,7 @@ AUX perl-5.34.0-gdbm-1.20.patch 1627 BLAKE2B 9cbe976f43134022aab2aca203ee6590af5
 DIST perl-5.34.0-patches-1.tar.xz 20360 BLAKE2B e60074c49f357d4841708f58b5165a44201783238ff33ee81580bb83ba07d3d2dda447edd30a71ce8c9bafe5e5e0235b68e31a79081c3482bdd589231f0e898e SHA512 909e1fb22cda4ca769b51645b51a64df81b92210cfee388ac57834406bc13e404f0a1e6bad0888fafc73fc34b7fb224801fd02e87fb4c2f9145482ad74374e7b
 DIST perl-5.34.0.tar.xz 12881416 BLAKE2B 4139e77fbb38b2b72671c0b130233cf5ed35112bbba3301b8ed724739c7ff96b041752aa505b938e257ef6ebf98a9b6dad1858e00f756c841a0520688d974e9a SHA512 691b4b31eacec357191fba777612b4e3eae59e946a22998a50766697c0d61db1d42a9b3bc1e41abf0d1ca1893e4a7c06d7bf3290480cf03d7f79befd7a8a3267
 DIST perl-cross-1.3.6.tar.gz 110210 BLAKE2B 39074d6f4a526f59de2b1c40432936552e625a5a4e44fbb7ce3c1c3828b12c5298d1ab49b7d34ea92e2a4c8c88f8bbef8cc0c582a3fbbed975cf46d331e89c08 SHA512 d394fbd75d890442aa599eae8893a26540c8b7af966583ad1c3213c3fe0e074415cfed8814de8f397830833fd78267bdc55adc5267168198f269634c2ef3b982
-EBUILD perl-5.34.0-r3.ebuild 26141 BLAKE2B 9eb33f6777b266b9a617a06d14b89ec29ca7e3a0a3596d5955f1b5f9e10a05db45eb2883b782329317065f2e92fee4378e75faebcbf49ad83d13f7714d036dcd SHA512 f0a140c3536192d0198e54b7d2f7b2316eae2b065627fe96df8949d97e0e61c37406e0cac7c827a58002251235c2b21f75d5b32f4cdf874596e6ec0fcbbe7295
-EBUILD perl-5.34.0-r5.ebuild 25333 BLAKE2B b4ba8ef137c8b63648044bdf958346cce5577391673a0deef33f5ed9a322847fac5bad647c031a1b11ce2c186e729aeb5e143c16464b0cb98d6a31aca04cc23f SHA512 0cb2560fab5060333a5306086d6a9a9b356dbdc579e7da3eeb091b229cc510be8196f8a94ae8bd6d791e59aeb009f4b1c8e7ee776c9f9dd0d93634a37a119fe9
-EBUILD perl-5.34.0-r6.ebuild 25763 BLAKE2B 5008d3d3b3d17b432b08387a6c5e28f847af73516847bf630aebe0c034b9ca182e75fdb1a4e9fa01d27401fc287f990afd31d62914269283c83dc74976e91a0d SHA512 e1b72d3681eb6f567c6b4d93c52bd0e91984f4b63ddbd205b602f3fb3da4b6392f6204400ecca84fb8dd9956b7634ce7e23f8e3c7e466614028dce48476a0965
+EBUILD perl-5.34.0-r3.ebuild 26076 BLAKE2B b3bb0bea66cbabfe90855823671eb6faa72e72fbf9ec86dfa7279a028e34aeb8734e80bf7563138b4003500ed25d40d76a7f987c017c0f77122cb2df8f8851e4 SHA512 7d9e8755a050030c7d4df0614609c909b5ed5eaab05e84764fa86ad024edadcbf13e41f9326f4247f0f7c7735f3f67b718e5e35c88023358d562239e0d6aa5d6
+EBUILD perl-5.34.0-r5.ebuild 25268 BLAKE2B 0c65f2c0a8e779414e173d4ab989e9b520d8dea63339c3a8578ceed6e07246451014ebc77258c5a7dc74657036a210c6b856d3827999a494f065c2d010c5defc SHA512 076a03cae039e5df49defef09de5c3869d87d7bd85e03adb71099f64428a78371f5758e43193e0e29928b3490941ded376de34008613800fd67537279dde5554
+EBUILD perl-5.34.0-r6.ebuild 25691 BLAKE2B dece7bd6639994cc0a5a7eca3cc6c790f2f9302526cc1a09181f61ae9d9d0914aca223ba1c76943c8b5904f4e67edf19ba7588e8c33714807c3960120bc54b23 SHA512 012343f382ba6cc20b0016fcfb0fd5d159c76cf8cec44bdad7d7df76d895feca3dcc2a476f642c6a31d5e908ab01577ea820fd4d762c2ad08403fd259bbba71e
 MISC metadata.xml 431 BLAKE2B 89471506c7b258c1806338a5850ee9337f48b8e7497a3cad8b1e8bf18811152071d416732e0267e7d0c13386097990d1ca12bb0051deb7cb70403ab2e9bdb367 SHA512 87d2a0c6a10f71b243b1e9a79306ed0d440a7f447d84fe37f2bd3c40c60e8749fd9d7e97ad482e286153587b57d7db5d6a8df7cef94f332de7175f053dc843e1
diff --git a/dev-lang/perl/perl-5.34.0-r3.ebuild b/dev-lang/perl/perl-5.34.0-r3.ebuild
index 4f15c0a9e41f..8f3eb1ad8b3f 100644
--- a/dev-lang/perl/perl-5.34.0-r3.ebuild
+++ b/dev-lang/perl/perl-5.34.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -533,7 +533,7 @@ src_configure() {
 	[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
 
 	# Perl has problems compiling with -Os in your flags with glibc
-	use elibc_uclibc || replace-flags "-Os" "-O2"
+	replace-flags "-Os" "-O2"
 
 	# xlocale.h is going away in glibc-2.26, so it's counterproductive
 	# if we use it and include it in CORE/perl.h ... Perl builds just
@@ -742,7 +742,6 @@ src_test() {
 		ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
 		return 0
 	fi
-	use elibc_uclibc && export MAKEOPTS+=" -j1"
 	TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
 }
 
diff --git a/dev-lang/perl/perl-5.34.0-r5.ebuild b/dev-lang/perl/perl-5.34.0-r5.ebuild
index e066689b21b8..effe3c01df9a 100644
--- a/dev-lang/perl/perl-5.34.0-r5.ebuild
+++ b/dev-lang/perl/perl-5.34.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -518,7 +518,7 @@ src_configure() {
 	[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
 
 	# Perl has problems compiling with -Os in your flags with glibc
-	use elibc_uclibc || replace-flags "-Os" "-O2"
+	replace-flags "-Os" "-O2"
 
 	# xlocale.h is going away in glibc-2.26, so it's counterproductive
 	# if we use it and include it in CORE/perl.h ... Perl builds just
@@ -727,7 +727,6 @@ src_test() {
 		ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
 		return 0
 	fi
-	use elibc_uclibc && export MAKEOPTS+=" -j1"
 	TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
 }
 
diff --git a/dev-lang/perl/perl-5.34.0-r6.ebuild b/dev-lang/perl/perl-5.34.0-r6.ebuild
index 10a8bdee8bdb..f3c4092ef4d6 100644
--- a/dev-lang/perl/perl-5.34.0-r6.ebuild
+++ b/dev-lang/perl/perl-5.34.0-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -52,7 +52,7 @@ LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SUBSLOT}"
 
 if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
-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 ~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
 
 IUSE="berkdb debug doc gdbm ithreads minimal"
@@ -525,7 +525,7 @@ src_configure() {
 	[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
 
 	# Perl has problems compiling with -Os in your flags with glibc
-	use elibc_uclibc || replace-flags "-Os" "-O2"
+	replace-flags "-Os" "-O2"
 
 	# xlocale.h is going away in glibc-2.26, so it's counterproductive
 	# if we use it and include it in CORE/perl.h ... Perl builds just
@@ -736,7 +736,6 @@ src_test() {
 		ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
 		return 0
 	fi
-	use elibc_uclibc && export MAKEOPTS+=" -j1"
 	TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
 }