From ffe910e129da5362318efdc5cc819064aedbce6d Mon Sep 17 00:00:00 2001
From: "Liguros - Gitlab CI/CD [develop]" <gitlab@liguros.net>
Date: Sat, 19 Jun 2021 13:45:42 +0000
Subject: Adding metadata

---
 dev-java/antlr/antlr-2.7.7-r7.ebuild | 44 -----------------
 dev-java/antlr/antlr-2.7.7-r9.ebuild |  2 +-
 dev-java/antlr/antlr-4.5.3-r1.ebuild | 94 ++++++++++++++++++++++++++++++++++++
 dev-java/antlr/antlr-4.5.3.ebuild    | 92 -----------------------------------
 4 files changed, 95 insertions(+), 137 deletions(-)
 delete mode 100644 dev-java/antlr/antlr-2.7.7-r7.ebuild
 create mode 100644 dev-java/antlr/antlr-4.5.3-r1.ebuild
 delete mode 100644 dev-java/antlr/antlr-4.5.3.ebuild

(limited to 'dev-java')

diff --git a/dev-java/antlr/antlr-2.7.7-r7.ebuild b/dev-java/antlr/antlr-2.7.7-r7.ebuild
deleted file mode 100644
index dfa69c648825..000000000000
--- a/dev-java/antlr/antlr-2.7.7-r7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="https://www.antlr2.org/"
-SRC_URI="https://www.antlr2.org/download/${P}.tar.gz"
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples source"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
-	source? ( app-arch/zip )"
-
-S="${WORKDIR}/${P}"
-JAVA_SRC_DIR="${S}/${PN}"
-
-java_prepare() {
-	java-pkg_clean
-
-	# Delete build files from examples.
-	find examples \( -name Makefile.in -o -name shiplist \) -delete || die
-}
-
-src_configure() {
-	: # Avoid configure script.
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher antlr --main antlr.Tool
-	dodoc {CHANGES,README}.txt
-
-	use doc && java-pkg_dohtml -r doc/*
-	use examples && java-pkg_doexamples examples/java
-	use source && java-pkg_dosrc antlr
-}
diff --git a/dev-java/antlr/antlr-2.7.7-r9.ebuild b/dev-java/antlr/antlr-2.7.7-r9.ebuild
index 2a646439c8ed..ed770ed14cf8 100644
--- a/dev-java/antlr/antlr-2.7.7-r9.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.antlr2.org/download/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/antlr/antlr-4.5.3-r1.ebuild b/dev-java/antlr/antlr-4.5.3-r1.ebuild
new file mode 100644
index 000000000000..3c70f1210ae3
--- /dev/null
+++ b/dev-java/antlr/antlr-4.5.3-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+MAVEN_ID="org.antlr:antlr4:4.5.3"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A parser generator for many languages"
+HOMEPAGE="https://www.antlr.org/"
+SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://www.antlr.org/download/${P}-complete.jar" # Prebuilt version needed.
+
+LICENSE="BSD"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="dev-java/antlr:3.5
+	dev-java/stringtemplate:4
+	dev-java/treelayout:0"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/hamcrest-core:1.3
+		dev-java/junit:4
+	)"
+
+S="${WORKDIR}/${PN}4-${PV}"
+JAVA_GENTOO_CLASSPATH="stringtemplate-4,treelayout"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+}
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_configure() {
+	# TODO: Make java-config accept a jar@package query.
+	JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-runtime.jar:$(java-pkg_getjar antlr-3.5 antlr-runtime.jar)"
+}
+
+src_compile() {
+	cd "${S}/runtime/Java/src"
+	local G PKG
+
+	for G in $(find * -name "*.g4"); do
+		PKG="${G%/*}"
+		PKG="${PKG//\//.}"
+		java -jar "${DISTDIR}/${P}-complete.jar" -package "${PKG}" "${G}" || die
+	done
+
+	JAVA_JAR_FILENAME="${S}/${PN}-runtime.jar" JAVA_PKG_IUSE="doc" java-pkg-simple_src_compile
+
+	cd "${S}/tool/src"
+	antlr3.5 $(find -name "*.g") || die
+	JAVA_JAR_FILENAME="${S}/${PN}-tool.jar" java-pkg-simple_src_compile
+	java-pkg_addres "${S}/${PN}-tool.jar" ../resources
+}
+
+src_install() {
+	java-pkg_dojar ${PN}-{runtime,tool}.jar
+	java-pkg_dolauncher ${PN}${SLOT} --main org.antlr.v4.Tool
+	use doc && java-pkg_dojavadoc runtime/Java/src/target/api
+	use source && java-pkg_dosrc runtime/Java/src/org tool/src/org
+}
+
+junit_suite() {
+	cd "${S}/$1-testsuite/test" || die
+	local CP=".:${S}/runtime-testsuite/test:${S}/${PN}-tool.jar:$(java-pkg_getjars hamcrest-core-1.3,junit-4,${JAVA_GENTOO_CLASSPATH}):${JAVA_GENTOO_CLASSPATH_EXTRA}"
+
+	local TESTS=$(find ${2:-*} -name "Test*.java")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -classpath "${CP}" $(find ${2:-*} -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
+
+src_test() {
+	# Only run Java runtime tests as we haven't built other languages.
+	junit_suite runtime org/antlr/v4/test/runtime/java
+	junit_suite tool
+}
diff --git a/dev-java/antlr/antlr-4.5.3.ebuild b/dev-java/antlr/antlr-4.5.3.ebuild
deleted file mode 100644
index 3cd757f2a8eb..000000000000
--- a/dev-java/antlr/antlr-4.5.3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-MAVEN_ID="org.antlr:antlr4:4.5.3"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="https://www.antlr.org/"
-SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://www.antlr.org/download/${P}-complete.jar" # Prebuilt version needed.
-LICENSE="BSD"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-java/antlr:3.5
-	dev-java/stringtemplate:4
-	dev-java/treelayout:0"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
-	test? (
-		dev-java/hamcrest-core:1.3
-		dev-java/junit:4
-	)"
-
-S="${WORKDIR}/${PN}4-${PV}"
-JAVA_GENTOO_CLASSPATH="stringtemplate-4,treelayout"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-}
-
-java_prepare() {
-	java-pkg_clean
-}
-
-src_configure() {
-	# TODO: Make java-config accept a jar@package query.
-	JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-runtime.jar:$(java-pkg_getjar antlr-3.5 antlr-runtime.jar)"
-}
-
-src_compile() {
-	cd "${S}/runtime/Java/src"
-	local G PKG
-
-	for G in $(find * -name "*.g4"); do
-		PKG="${G%/*}"
-		PKG="${PKG//\//.}"
-		java -jar "${DISTDIR}/${P}-complete.jar" -package "${PKG}" "${G}" || die
-	done
-
-	JAVA_JAR_FILENAME="${S}/${PN}-runtime.jar" JAVA_PKG_IUSE="doc" java-pkg-simple_src_compile
-
-	cd "${S}/tool/src"
-	antlr3.5 $(find -name "*.g") || die
-	JAVA_JAR_FILENAME="${S}/${PN}-tool.jar" java-pkg-simple_src_compile
-	java-pkg_addres "${S}/${PN}-tool.jar" ../resources
-}
-
-src_install() {
-	java-pkg_dojar ${PN}-{runtime,tool}.jar
-	java-pkg_dolauncher ${PN}${SLOT} --main org.antlr.v4.Tool
-	use doc && java-pkg_dojavadoc runtime/Java/src/target/api
-	use source && java-pkg_dosrc runtime/Java/src/org tool/src/org
-}
-
-junit_suite() {
-	cd "${S}/$1-testsuite/test" || die
-	local CP=".:${S}/runtime-testsuite/test:${S}/${PN}-tool.jar:$(java-pkg_getjars hamcrest-core-1.3,junit-4,${JAVA_GENTOO_CLASSPATH}):${JAVA_GENTOO_CLASSPATH_EXTRA}"
-
-	local TESTS=$(find ${2:-*} -name "Test*.java")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -classpath "${CP}" $(find ${2:-*} -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
-
-src_test() {
-	# Only run Java runtime tests as we haven't built other languages.
-	junit_suite runtime org/antlr/v4/test/runtime/java
-	junit_suite tool
-}
-- 
cgit v1.3.1