From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1718371-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 759E71582EF
	for <garchives@archives.gentoo.org>; Sun, 16 Feb 2025 07:22:33 +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 5EEAD34309D
	for <garchives@archives.gentoo.org>; Sun, 16 Feb 2025 07:22:33 +0000 (UTC)
Received: from bobolink.gentoo.org (localhost [127.0.0.1])
	by bobolink.gentoo.org (Postfix) with ESMTP id C441C110472;
	Sun, 16 Feb 2025 07:22:28 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.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 BBA82110472
	for <gentoo-commits@lists.gentoo.org>; Sun, 16 Feb 2025 07:22:28 +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))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 6D3593406A2
	for <gentoo-commits@lists.gentoo.org>; Sun, 16 Feb 2025 07:22:28 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 064B82720
	for <gentoo-commits@lists.gentoo.org>; Sun, 16 Feb 2025 07:22:27 +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: <1739690527.f68f6548c347c508e0b6047ebc874307f1539daf.ulm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-java/antlr/antlr-3.5.3.ebuild dev-java/antlr/antlr-4.9.3.ebuild
X-VCS-Directories: dev-java/antlr/
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: f68f6548c347c508e0b6047ebc874307f1539daf
X-VCS-Branch: master
Date: Sun, 16 Feb 2025 07:22:27 +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: 747680ee-e6d2-4e42-8af0-54868ef316a5
X-Archives-Hash: a69cb78b9ef49ba2e048982554b49e7a

commit:     f68f6548c347c508e0b6047ebc874307f1539daf
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 14 14:11:06 2025 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 07:22:07 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f68f6548

dev-java/antlr: Port to ver_replacing

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 dev-java/antlr/antlr-3.5.3.ebuild | 13 +++----------
 dev-java/antlr/antlr-4.9.3.ebuild | 13 +++----------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/dev-java/antlr/antlr-3.5.3.ebuild b/dev-java/antlr/antlr-3.5.3.ebuild
index d0a32d44e244..062a48415e29 100644
--- a/dev-java/antlr/antlr-3.5.3.ebuild
+++ b/dev-java/antlr/antlr-3.5.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit java-pkg-2
+inherit eapi9-ver java-pkg-2
 
 DESCRIPTION="A parser generator for many languages"
 HOMEPAGE="https://www.antlr3.org/"
@@ -49,14 +49,7 @@ pkg_postinst() {
 	# If upgrading from a version of this slot that installs JARs,
 	# display a message about submodule split
 	local changed_ver="3.5.2-r2"
-	local should_show_msg
-	for replaced_ver in ${REPLACING_VERSIONS}; do
-		if ver_test "${replaced_ver}" -lt "${changed_ver}"; then
-			should_show_msg=1
-			break
-		fi
-	done
-	[[ "${should_show_msg}" ]] || return
+	ver_replacing -lt "${changed_ver}" || return
 	elog "Since version ${changed_ver}, ${PN}-${SLOT} no longer installs JARs."
 	elog "Please find the JARs from files installed by submodule packages"
 	elog "antlr-runtime-${SLOT} and antlr-tool-${SLOT}."

diff --git a/dev-java/antlr/antlr-4.9.3.ebuild b/dev-java/antlr/antlr-4.9.3.ebuild
index 50b53bbba0b2..3a8b33648053 100644
--- a/dev-java/antlr/antlr-4.9.3.ebuild
+++ b/dev-java/antlr/antlr-4.9.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit java-pkg-2
+inherit eapi9-ver java-pkg-2
 
 DESCRIPTION="A parser generator for many languages"
 HOMEPAGE="https://www.antlr.org/"
@@ -49,14 +49,7 @@ pkg_postinst() {
 	# If upgrading from a version of this slot that installs JARs,
 	# display a message about submodule split
 	local changed_ver="4.9.3"
-	local should_show_msg
-	for replaced_ver in ${REPLACING_VERSIONS}; do
-		if ver_test "${replaced_ver}" -lt "${changed_ver}"; then
-			should_show_msg=1
-			break
-		fi
-	done
-	[[ "${should_show_msg}" ]] || return
+	ver_replacing -lt "${changed_ver}" || return
 	elog "Since version ${changed_ver}, ${PN}-${SLOT} no longer installs JARs."
 	elog "Please find the JARs from files installed by submodule packages"
 	elog "antlr-runtime-${SLOT} and antlr-tool-${SLOT}."