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 BD359158043 for ; Mon, 15 Apr 2024 07:45:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BBE7CE29D6; Mon, 15 Apr 2024 07:45:26 +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 9E960E29D6 for ; Mon, 15 Apr 2024 07:45:26 +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 AB55B3433D6 for ; Mon, 15 Apr 2024 07:45:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 42BD116E6 for ; Mon, 15 Apr 2024 07:45:24 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1713167117.6c03ff491e8bc52f74321b04cfc6947bd01b9463.fordfrog@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.2-r2.ebuild X-VCS-Directories: dev-java/antlr/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 6c03ff491e8bc52f74321b04cfc6947bd01b9463 X-VCS-Branch: master Date: Mon, 15 Apr 2024 07:45:24 +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: 9fccf2a7-b675-4bfc-84f4-9712947d2bba X-Archives-Hash: e6481194d5d0620d6dfc9b450c35fdfd commit: 6c03ff491e8bc52f74321b04cfc6947bd01b9463 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Fri Mar 29 08:47:17 2024 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Mon Apr 15 07:45:17 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c03ff49 dev-java/antlr: avoid InternalEclassUsage Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Miroslav Šulc gentoo.org> dev-java/antlr/antlr-3.2-r2.ebuild | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dev-java/antlr/antlr-3.2-r2.ebuild b/dev-java/antlr/antlr-3.2-r2.ebuild index b3ec93f8722e..9b58f9bff97e 100644 --- a/dev-java/antlr/antlr-3.2-r2.ebuild +++ b/dev-java/antlr/antlr-3.2-r2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 JAVA_PKG_IUSE="doc test" @@ -11,19 +11,20 @@ DESCRIPTION="A parser generator for many languages" HOMEPAGE="https://www.antlr3.org/" SRC_URI="https://www.antlr3.org/download/${P}.tar.gz https://www.antlr3.org/download/${P}.jar" # Prebuilt version needed. +S="${WORKDIR}/${P}" LICENSE="BSD" SLOT="3" KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" RESTRICT="!test? ( test )" -CDEPEND=">=dev-java/antlr-2.7.7-r7:0 +CP_DEPEND=">=dev-java/antlr-2.7.7-r7:0 dev-java/stringtemplate:0" -RDEPEND="${CDEPEND} +RDEPEND="${CP_DEPEND} >=virtual/jre-1.8:*" -DEPEND="${CDEPEND} +DEPEND="${CP_DEPEND} >=virtual/jdk-1.8:* test? ( dev-java/junit:4 )" @@ -34,9 +35,7 @@ PATCHES=( "${FILESDIR}/antlr-3.2-java21.patch" ) -S="${WORKDIR}/${P}" JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-runtime.jar" -JAVA_GENTOO_CLASSPATH="antlr,stringtemplate" src_unpack() { unpack ${P}.tar.gz @@ -50,7 +49,8 @@ src_prepare() { # to the tests. This is bad but upstream is never going to update # 3.2 even though other projects still rely on it. If any issues # arise, we can only put pressure on those projects to upgrade. - if java-pkg_is-vm-version-ge 1.8; then + local vm_version="$(java-config -g PROVIDES_VERSION)" + if ver_test "${vm_version}" -ge 1.8; then rm -v tool/src/test/java/org/antlr/test/Test{DFAConversion,SemanticPredicates,TopologicalSort}.java || die fi