From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1720228-garchives=archives.gentoo.org@lists.gentoo.org>
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 finch.gentoo.org (Postfix) with ESMTPS id BF2AF1582EF
	for <garchives@archives.gentoo.org>; Sat, 22 Feb 2025 08:02:14 +0000 (UTC)
Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189])
	(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)
	(Authenticated sender: relay-lists.gentoo.org@gentoo.org)
	by smtp.gentoo.org (Postfix) with ESMTPSA id A9F443431C7
	for <garchives@archives.gentoo.org>; Sat, 22 Feb 2025 08:02:14 +0000 (UTC)
Received: from bobolink.gentoo.org (localhost [127.0.0.1])
	by bobolink.gentoo.org (Postfix) with ESMTP id 370201102A2;
	Sat, 22 Feb 2025 08:02:06 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(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 bobolink.gentoo.org (Postfix) with ESMTPS id 31FBC1102A2
	for <gentoo-commits@lists.gentoo.org>; Sat, 22 Feb 2025 08:02:06 +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 D8EED343113
	for <gentoo-commits@lists.gentoo.org>; Sat, 22 Feb 2025 08:02:05 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 27F7D2736
	for <gentoo-commits@lists.gentoo.org>; Sat, 22 Feb 2025 08:02:04 +0000 (UTC)
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" <ulm@gentoo.org>
Message-ID: <1740211069.de0b9ff858352a9278a8f000627eb970c0f80ed3.ulm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/perl/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-lang/perl/perl-5.40.0-r1.ebuild dev-lang/perl/perl-5.40.1_rc1.ebuild
X-VCS-Directories: dev-lang/perl/
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: de0b9ff858352a9278a8f000627eb970c0f80ed3
X-VCS-Branch: master
Date: Sat, 22 Feb 2025 08:02:04 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 0c8a8236-fe0d-489e-9ddb-c41290fb7b16
X-Archives-Hash: ecdb2cf261d4a8c123c4df96fbfd613f

commit:     de0b9ff858352a9278a8f000627eb970c0f80ed3
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 15 09:57:48 2025 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 22 07:57:49 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de0b9ff8

dev-lang/perl: Fix incorrect REPLACING_VERSIONS usage

Closes: https://bugs.gentoo.org/949735
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 dev-lang/perl/perl-5.40.0-r1.ebuild  | 17 ++++++++++-------
 dev-lang/perl/perl-5.40.1_rc1.ebuild | 17 ++++++++++-------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/dev-lang/perl/perl-5.40.0-r1.ebuild b/dev-lang/perl/perl-5.40.0-r1.ebuild
index 5cdfd028245b..135515a28648 100644
--- a/dev-lang/perl/perl-5.40.0-r1.ebuild
+++ b/dev-lang/perl/perl-5.40.0-r1.ebuild
@@ -109,12 +109,14 @@ dual_scripts() {
 
 check_rebuild() {
 	# Fresh install
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		return 0;
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		return 0
+	fi
+
 	# Major Upgrade
-	# doesn't matter if there's multiple copies, it still needs a rebuild
-	# if the string is anything other than "5.CURRENTMAJOR"
-	elif [[ "${REPLACING_VERSIONS%.*}" != "${PV%.*}" ]]; then
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		[[ ${v%.*} == "${SHORT_PV}" ]] && continue
 		echo ""
 		ewarn "UPDATE THE PERL MODULES:"
 		ewarn "After updating dev-lang/perl the installed Perl modules"
@@ -130,10 +132,11 @@ check_rebuild() {
 		ewarn "You should then call perl-cleaner to clean up any old files and trigger any"
 		ewarn "remaining rebuilds portage may have missed."
 		ewarn "Use: perl-cleaner --all"
-		return 0;
+		return 0
+	done
 
 	# Reinstall w/ USE Change
-	elif
+	if
 		 (   use perl_features_ithreads && ( has_version '<dev-lang/perl-5.38.2-r3[-ithreads]' || has_version '>=dev-lang/perl-5.38.2-r3[-perl_features_ithreads]' ) ) || \
 		 ( ! use perl_features_ithreads && ( has_version '<dev-lang/perl-5.38.2-r3[ithreads]'  || has_version '>=dev-lang/perl-5.38.2-r3[perl_features_ithreads]'  ) ) || \
 		 (   use perl_features_quadmath && ( has_version '<dev-lang/perl-5.38.2-r3[-quadmath]' || has_version '>=dev-lang/perl-5.38.2-r3[-perl_features_quadmath]' ) ) || \

diff --git a/dev-lang/perl/perl-5.40.1_rc1.ebuild b/dev-lang/perl/perl-5.40.1_rc1.ebuild
index 49d74632e547..760c17c59b15 100644
--- a/dev-lang/perl/perl-5.40.1_rc1.ebuild
+++ b/dev-lang/perl/perl-5.40.1_rc1.ebuild
@@ -104,12 +104,14 @@ dual_scripts() {
 
 check_rebuild() {
 	# Fresh install
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		return 0;
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		return 0
+	fi
+
 	# Major Upgrade
-	# doesn't matter if there's multiple copies, it still needs a rebuild
-	# if the string is anything other than "5.CURRENTMAJOR"
-	elif [[ "${REPLACING_VERSIONS%.*}" != "${PV%.*}" ]]; then
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		[[ ${v%.*} == "${SHORT_PV}" ]] && continue
 		echo ""
 		ewarn "UPDATE THE PERL MODULES:"
 		ewarn "After updating dev-lang/perl the installed Perl modules"
@@ -125,10 +127,11 @@ check_rebuild() {
 		ewarn "You should then call perl-cleaner to clean up any old files and trigger any"
 		ewarn "remaining rebuilds portage may have missed."
 		ewarn "Use: perl-cleaner --all"
-		return 0;
+		return 0
+	done
 
 	# Reinstall w/ USE Change
-	elif
+	if
 		 (   use perl_features_ithreads && ( has_version '<dev-lang/perl-5.38.2-r3[-ithreads]' || has_version '>=dev-lang/perl-5.38.2-r3[-perl_features_ithreads]' ) ) || \
 		 ( ! use perl_features_ithreads && ( has_version '<dev-lang/perl-5.38.2-r3[ithreads]'  || has_version '>=dev-lang/perl-5.38.2-r3[perl_features_ithreads]'  ) ) || \
 		 (   use perl_features_quadmath && ( has_version '<dev-lang/perl-5.38.2-r3[-quadmath]' || has_version '>=dev-lang/perl-5.38.2-r3[-perl_features_quadmath]' ) ) || \