[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[James Le Cuirot]

commit:     e17e5de890c99421aed7b5ad37281696ffd626ae
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 14 14:33:11 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Oct 14 15:22:16 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e17e5de8

dev-java/antlr: v2 ebuild that only builds the tool and Java runtime

The old ANTLR 2 ebuild tried to cram all the runtimes together, which
was messy. The C++ runtime has been split into dev-cpp/antlr-cpp. The
other runtimes have been dropped due to lack of use. v2 is really
ancient anyway.

Package-Manager: portage-2.2.20.1

 dev-java/antlr/antlr-2.7.7-r7.ebuild | 45 ++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/dev-java/antlr/antlr-2.7.7-r7.ebuild b/dev-java/antlr/antlr-2.7.7-r7.ebuild
new file mode 100644
index 0000000..70cf2fb
--- /dev/null
+++ b/dev-java/antlr/antlr-2.7.7-r7.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A parser generator for many languages"
+HOMEPAGE="http://www.antlr2.org/"
+SRC_URI="http://www.antlr2.org/download/${P}.tar.gz"
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[James Le Cuirot]

commit:     dc18ffba835c9fe1d6d7fab1df0b040188ae7268
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 14 14:36:04 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Oct 14 15:22:18 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc18ffba

dev-java/antlr: Remove old

I believe bug #555300, which created 2.7.7-r6, was bogus anyway.

Package-Manager: portage-2.2.20.1

 dev-java/antlr/antlr-2.7.7-r6.ebuild | 173 -----------------------------------
 1 file changed, 173 deletions(-)

diff --git a/dev-java/antlr/antlr-2.7.7-r6.ebuild b/dev-java/antlr/antlr-2.7.7-r6.ebuild
deleted file mode 100644
index 783a98f..0000000
--- a/dev-java/antlr/antlr-2.7.7-r6.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-DISTUTILS_OPTIONAL="y"
-DISTUTILS_SINGLE_IMPL="y"
-DISTUTILS_IN_SOURCE_BUILD="y"
-
-inherit base java-pkg-2 mono autotools distutils-r1 multilib toolchain-funcs versionator
-
-DESCRIPTION="A parser generator for C++, C#, Java, and Python"
-HOMEPAGE="http://www.antlr2.org/"
-SRC_URI="http://www.antlr2.org/download/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc debug examples mono +cxx +java python script source static-libs"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# TODO do we actually need jdk at runtime?
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	>=virtual/jdk-1.6
-	mono? ( dev-lang/mono )"
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.15
-	script? ( !dev-util/pccts )
-	source? ( app-arch/zip )"
-
-PATCHES=( "${FILESDIR}"/${PV}-{gcc-4.3,gcc-4.4,makefixes}.patch )
-
-make_shared_lib() {
-	local soname=$(basename "${1%.a}")$(get_libname $(get_major_version))
-	einfo "Making ${soname}"
-	[[ ${CHOST} == *-darwin* ]] \
-		&& make_shared_lib_macho "${soname}" "$1" "$2"\
-		|| make_shared_lib_elf "${soname}" "$1" "$2"
-}
-
-make_shared_lib_elf() {
-	local soname=$1 archive=$2 cc=$3
-	${cc:-$(tc-getCXX)} ${LDFLAGS} \
-		-shared -Wl,-soname="${soname}" \
-		-Wl,--whole-archive "${archive}" -Wl,--no-whole-archive \
-		-o $(dirname "${archive}")/"${soname}" || return 1
-}
-
-make_shared_lib_macho() {
-	local soname=$1 archive=$2 cc=$3
-	${cc:-$(tc-getCXX)} ${LDFLAGS} \
-		-dynamiclib -install_name "${EPREFIX}/usr/$(get_libdir)/${soname}" \
-		-force_load "${archive}" \
-		-o $(dirname "${archive}")/"${soname}" || return 1
-}
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	if use python ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	base_src_prepare
-
-	sed -i \
-		-e 's/install:.*this-install/install:/' \
-		lib/cpp/src/Makefile.in || die
-
-	use static-libs || epatch "${FILESDIR}/${PV}-static-libs-fix.patch"
-
-	# See bug #468540, this can be removed once bug #469150 is fixed.
-	sed -i 's/tlib lib ar/ar/' configure.in || die
-	eautoreconf
-}
-
-src_configure() {
-	# don't ask why, but this is needed for stuff to get built properly
-	# across the various JDKs
-	JAVACFLAGS="+ ${JAVACFLAGS}"
-
-	# mcs for https://bugs.gentoo.org/show_bug.cgi?id=172104
-	CSHARPC="mcs" econf $(use_enable java) \
-		$(use_enable python) \
-		$(use_enable mono csharp) \
-		$(use_enable debug) \
-		$(use_enable examples) \
-		$(use_enable cxx) \
-		--enable-verbose
-}
-
-src_compile() {
-	emake CXXFLAGS="${CXXFLAGS} -fPIC"
-	if use cxx; then
-		pushd lib/cpp/src > /dev/null
-		make_shared_lib libantlr.a || die
-		if use static-libs; then
-			make clean
-			emake
-		fi
-		popd > /dev/null
-	fi
-
-	if use python ; then
-		pushd "${S}"/lib/python > /dev/null
-		distutils-r1_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	dobin scripts/antlr-config
-
-	if use cxx ; then
-		pushd lib/cpp > /dev/null
-		einstall
-		dolib.so src/libantlr$(get_libname $(get_major_version))
-		dosym libantlr$(get_libname $(get_major_version)) \
-			/usr/$(get_libdir)/libantlr$(get_libname)
-		use static-libs && dolib.a src/libantlr.a
-		newdoc AUTHORS{,.cpp}
-		newdoc ChangeLog{,.cpp}
-		newdoc TODO{,.cpp}
-		popd > /dev/null
-	fi
-
-	if use java ; then
-		java-pkg_dojar antlr/antlr.jar
-		use script && java-pkg_dolauncher antlr --main antlr.Tool
-		use source && java-pkg_dosrc antlr
-		use doc && java-pkg_dohtml -r doc/*
-	fi
-
-	if use mono ; then
-		pushd lib > /dev/null
-		dodir /usr/$(get_libdir)/antlr/
-		insinto /usr/$(get_libdir)/antlr/
-		doins antlr.astframe.dll
-		doins antlr.runtime.dll
-		sed -e "s|@prefix@|${EPREFIX}/usr|" \
-			-e 's|@exec_prefix@|${prefix}|' \
-			-e "s|@libdir@|\$\{exec_prefix\}/$(get_libdir)/antlr|" \
-			-e 's|@libs@|-r:${libdir}/antlr.astframe.dll -r:${libdir}/antlr.runtime.dll|' \
-			-e "s|@VERSION@|${PV}|" \
-			"${FILESDIR}"/antlr.pc.in > antlr.pc
-		insinto /usr/$(get_libdir)/pkgconfig
-		doins antlr.pc
-		popd > /dev/null
-	fi
-
-	if use python ; then
-		pushd "${S}"/lib/python > /dev/null
-		distutils-r1_src_install
-		popd > /dev/null
-	fi
-
-	if use examples ; then
-		find "${S}"/examples -iname Makefile\* -exec rm \{\} \;
-		insinto /usr/share/doc/${PF}/examples
-		use cxx && doins -r "${S}"/examples/cpp
-		use java && doins -r "${S}"/examples/java
-		use mono && doins -r "${S}"/examples/csharp
-		use python && doins -r "${S}"/examples/python
-	fi
-
-	dodoc README.txt
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[James Le Cuirot]

commit:     287c3d3d13374e24c70ea97e4c959dfba8005d02
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 13:45:10 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Dec  6 13:46:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=287c3d3d

dev-java/antlr: Version bump to 4.5.1 (closes bug #545384)

This is a rewrite as the 4.4 ebuild bundled a lot of prebuilt stuff
and didn't include any tests. gunit support has been dropped because
no one uses it and it is not worth the hassle.

Nothing in the tree truly needs at present this as the existing
dependencies are bogus but no doubt something will before long.

Package-Manager: portage-2.2.26

 dev-java/antlr/Manifest           |  2 +
 dev-java/antlr/antlr-4.5.1.ebuild | 91 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+)

diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index dd63ef1..2aa81ba 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -8,3 +8,5 @@ DIST antlr-3.5.2-complete-no-st3.jar 1862097 SHA256 46531814ba9739cdf20c6c1789c2
 DIST antlr-3.5.2-complete.jar 2456317 SHA256 26ca659f47d77384f518cf2b6463892fcd4f0b0d4d8c0de2addf697e63e7326b SHA512 560f208e38759b5e626de56816e1fce9c191c526c04ca782513859d468ac444d1e8e62c03870a68f8f9d8daee0f45fca465150e2bbfc71b46e46b952519044b1 WHIRLPOOL bdbbb081bf0aab83fa26a4a75f7f42487da688a5e3c765ea4cbd7b8c1bcb80b66e8b98bf95ee8bcd2acd60b4eacb6745f879cb899b672ea7fc4489d651a6f2e0
 DIST antlr-3.5.2.tar.gz 6927126 SHA256 529baf7d11f06b773543e25271c1a6e1735d2f8061f4866d1ea5c99a5d71ee1f SHA512 e2a0520093fb2a77dcd9d44f26a9fdd612dceaffb398c53b2b8cd29f4630830647ede29e8dd55b434cb2c165b0fd1d77968ec6e6de0798f14d9cdfd9e6fccd99 WHIRLPOOL a3a2bf81cc91a332725a4ce15dcccf10df5395b27a521656b1f3e80fed10197edc132fa2a8b9a259b2ee603320492b4b1f664692a967fdfdbb574d919b9aa20e
 DIST antlr-4.3-complete.jar 1340431 SHA256 da9afec193edcc4d8080a4897e77e1e2f6a0c0bc265fccb8c44ae10660f7a8f0 SHA512 669cc21ef72ec899509181b1ec77d918fce9dba3db165d9d7429e0058c58a9d716cbf274d7a54b6bd9143d95d9a902d82acfa5bcb5e6c805c4e9fdf90b83349e WHIRLPOOL f665a200850d294ee0f8c3127bb918a9c9625098a97a960afe08b3a3940ba2c2ad54099e34c82fab5058b668a721b3ed5621a85820d0aca0e16af2f81627c723
+DIST antlr-4.5.1-complete.jar 1478820 SHA256 9cff6c76bc5aafcbf51cac7f0974ae01e4f6119402e75436abbb97f8ab15c211 SHA512 1109087c44706694d75a7f88f6ce96e8653467d5721505db747e7e70a4f40a24469b1fb3ffcb327819bba1548b0025412e46a11a41e329b0ecf847cb1094238c WHIRLPOOL 54d8a59bbd935b84a76370645d57eb07ee9160297ad457106b7b773682f915c9632446fc818a9fb23ab37074c923b918c168a7eca98555513cfb4dfa2eb106e5
+DIST antlr-4.5.1.tar.gz 6158475 SHA256 faaaea662e7b4792fc2264bbefaf0e196e74f45ebe29ec638f978b008e6bb5ff SHA512 949306b0ee87a0c002664ee7ac0f32c43385c501b4e28f181417559ce09b07cc12a8441c3bb81f8a72feba3d4ccc693a3c03bcccad7fc81223cddb19e10468a9 WHIRLPOOL 00aeb41f8864d65d7693cf3ca4d36a10f094967fe96fefd67e4d64eb22d1502658ff2355125ab5e36f88a276d143247c0a2814cfcd990e08ec3fe6f6212ea42e

diff --git a/dev-java/antlr/antlr-4.5.1.ebuild b/dev-java/antlr/antlr-4.5.1.ebuild
new file mode 100644
index 0000000..17c21dc
--- /dev/null
+++ b/dev-java/antlr/antlr-4.5.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A parser generator for many languages"
+HOMEPAGE="http://www.antlr.org/"
+SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
+	http://www.antlr.org/download/${P}-complete.jar" # Prebuilt version needed.
+LICENSE="BSD"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc 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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[James Le Cuirot]

commit:     53f2c70462d84f2c7c34b049251d400fb6f2972d
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  2 20:25:36 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 21:42:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53f2c704

dev-java/antlr: Mark 2.7.7-r7 and 3.2 stable using ALLARCHES policy

Package-Manager: portage-2.2.26

 dev-java/antlr/antlr-2.7.7-r7.ebuild | 4 ++--
 dev-java/antlr/antlr-3.2.ebuild      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-java/antlr/antlr-2.7.7-r7.ebuild b/dev-java/antlr/antlr-2.7.7-r7.ebuild
index 70cf2fb..dec6bd9 100644
--- a/dev-java/antlr/antlr-2.7.7-r7.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.antlr2.org/"
 SRC_URI="http://www.antlr2.org/download/${P}.tar.gz"
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples source"
 
 RDEPEND=">=virtual/jre-1.6"

diff --git a/dev-java/antlr/antlr-3.2.ebuild b/dev-java/antlr/antlr-3.2.ebuild
index 13b7623..5d9561d 100644
--- a/dev-java/antlr/antlr-3.2.ebuild
+++ b/dev-java/antlr/antlr-3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.antlr3.org/download/${P}.tar.gz
 	http://www.antlr3.org/download/${P}.jar" # Prebuilt version needed.
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 CDEPEND=">=dev-java/antlr-2.7.7-r7:0

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[James Le Cuirot]

commit:     95efce9a3e132780e1b387ff3eb7465fe8ecaecd
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  2 23:26:47 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 21:42:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95efce9a

dev-java/antlr: Remove old

Package-Manager: portage-2.2.26

 dev-java/antlr/Manifest              |   2 -
 dev-java/antlr/antlr-2.7.7-r5.ebuild | 172 -----------------------------------
 dev-java/antlr/antlr-3.1.3-r3.ebuild | 117 ------------------------
 dev-java/antlr/metadata.xml          |   1 -
 4 files changed, 292 deletions(-)

diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index 2aa81ba..42cc048 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -1,7 +1,5 @@
 DIST 4.4.zip 1107695 SHA256 68a79e4accae4dfd9d45a8292fe9b2812c6a3ec1d903412e205a06ead083b8ae SHA512 5e4a92b3d0bb8583f52cbed554ef68909412cd3e9de7589870eead3359a6f5efb492029c3bcce50d6a19a220c83c809824dbde3d08a6b39a42e9fbe3eaef8ce4 WHIRLPOOL 80cf60f9679cd5d3cb512b2e1a9c4987d34fb7994a976b42c95351fb4670944343dd8b8cf0e1738b94cc177122dcf635ee5d1a262290f6b89a8e38d06adc2077
 DIST antlr-2.7.7.tar.gz 1816180 SHA256 853aeb021aef7586bda29e74a6b03006bcb565a755c86b66032d8ec31b67dbb9 SHA512 faa72d2ddcba434ef1233e70c1549e63eba67c00793966322e821cf7f015cccb804448cb92d8fbef0429f59928fad65ec954f8ffbda0acbb8e983de0806d349d WHIRLPOOL def5ac0ddfe5a65f9f7d5489d039048c5d630b46cd5626593bd12e9b393d5ec26884f90b013bcdf58511e26abbf06e0d7b3789a11298b017f7e70af2ec8dde4a
-DIST antlr-3.1.3-generated.tar.bz2 47167 SHA256 ed326de0f1f92dd72e8d9644e8eaf59d02b9725b4b5218f5c54e12100f8d05f4 SHA512 4ea01ad0d5fc99607ffa445fb99ae424648b713dca293d05ff4ec064cac0a0fe5073df3834f9b6990e99f3cefc5cdd191a1ee3c3951d97615908b94630070bba WHIRLPOOL 61f7829811251a35528c322952830dc5a6e82e23e36f664af179b41955734e771aaad070298666a15be0f41982dbb8b19955b5967987582c6b666e602384d060
-DIST antlr-3.1.3.tar.gz 10743515 SHA256 1fca0fc7304140807e64ec263a58d93ef1b380cfb6407084e6909f8220bc1039 SHA512 6814b970740bd61e6727f81b1a2fb4249f8f029e756694d852224eee54e0231540f8e23d2fa8f78eef234d6497f5fa1411e76020ffaed737d8c1a5178321a062 WHIRLPOOL 9d9a1caf39595dbb9b300f730091cfa38a12ab10b8a59d58c7bdd9ba4674bce9f49bc21b5b170129216ff9d880dbf5f0bdb5bfe614b003a4ffe948948b5413c9
 DIST antlr-3.2.jar 1928009 SHA256 4c8737014e7ca0d2c85171edf37f5a26b2d8d8237c283357b81a3269b6848d38 SHA512 25a61404c4b41e48eeaed49d41122f9400092248a10eb776d75ce3513295870eca1acc4b06c74925284a27cc64ca0506e34de39fb91996f09727cc5cc72dd9a6 WHIRLPOOL 19d99c9f50339ee9ef31e9458ac3a44ce52aa89ed84f96be905d626e3a53d5e2bbdb2e8eb4c5ca16413e7493499b141f940dd200658f8e60e9ecbd777f83a84b
 DIST antlr-3.2.tar.gz 837320 SHA256 01548fa03ef1f0ed05a93f0749b65db8a35a191ad7ad34e1e6a6a2529ca2ef45 SHA512 8984221cd89253c033a4596dd56cd51b297393a53b4682f5ab401172745d343371bf0d45417fa286ce972add1b4e474f1f3091fa1345158dbfc040702d61607c WHIRLPOOL 40080efc13c88312aaa318cde097f240e711b477e264739ea71b6c246ede29ac48f42eccd55365af531eb428f1ca1d89386d7e5753b6bc35cad9bf937b70e6de
 DIST antlr-3.5.2-complete-no-st3.jar 1862097 SHA256 46531814ba9739cdf20c6c1789c252d3d95b68932813d79fb8bbfdf8d5840417 SHA512 227f56edfb8d1935fc0f5bd69a730a2230b173f38baa7837b6dac9b4a10c5d4a9b2eb806416b21bed2621bb0b8e0fb98a6f48da2660b326728326f078bc28ea9 WHIRLPOOL 5c5285894e2d4182650a8a573ae83996e1f463d6ce866ddcff43959b16cf1070c3042b21d80c9350865716a6719d15fcd42b7370b4af69b6eca863d26ffcc325

diff --git a/dev-java/antlr/antlr-2.7.7-r5.ebuild b/dev-java/antlr/antlr-2.7.7-r5.ebuild
deleted file mode 100644
index dad4b63..0000000
--- a/dev-java/antlr/antlr-2.7.7-r5.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-DISTUTILS_OPTIONAL="y"
-DISTUTILS_SINGLE_IMPL="y"
-DISTUTILS_IN_SOURCE_BUILD="y"
-
-inherit base java-pkg-2 mono autotools distutils-r1 multilib toolchain-funcs versionator
-
-DESCRIPTION="A parser generator for C++, C#, Java, and Python"
-HOMEPAGE="http://www.antlr2.org/"
-SRC_URI="http://www.antlr2.org/download/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc debug examples mono +cxx +java python script source static-libs"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# TODO do we actually need jdk at runtime?
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	>=virtual/jdk-1.3
-	mono? ( dev-lang/mono )"
-DEPEND="${RDEPEND}
-	script? ( !dev-util/pccts )
-	source? ( app-arch/zip )"
-
-PATCHES=( "${FILESDIR}"/${PV}-{gcc-4.3,gcc-4.4,makefixes}.patch )
-
-make_shared_lib() {
-	local soname=$(basename "${1%.a}")$(get_libname $(get_major_version))
-	einfo "Making ${soname}"
-	[[ ${CHOST} == *-darwin* ]] \
-		&& make_shared_lib_macho "${soname}" "$1" "$2"\
-		|| make_shared_lib_elf "${soname}" "$1" "$2"
-}
-
-make_shared_lib_elf() {
-	local soname=$1 archive=$2 cc=$3
-	${cc:-$(tc-getCXX)} ${LDFLAGS} \
-		-shared -Wl,-soname="${soname}" \
-		-Wl,--whole-archive "${archive}" -Wl,--no-whole-archive \
-		-o $(dirname "${archive}")/"${soname}" || return 1
-}
-
-make_shared_lib_macho() {
-	local soname=$1 archive=$2 cc=$3
-	${cc:-$(tc-getCXX)} ${LDFLAGS} \
-		-dynamiclib -install_name "${EPREFIX}/usr/$(get_libdir)/${soname}" \
-		-force_load "${archive}" \
-		-o $(dirname "${archive}")/"${soname}" || return 1
-}
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	if use python ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	base_src_prepare
-
-	sed -i \
-		-e 's/install:.*this-install/install:/' \
-		lib/cpp/src/Makefile.in || die
-
-	use static-libs || epatch "${FILESDIR}/${PV}-static-libs-fix.patch"
-
-	# See bug #468540, this can be removed once bug #469150 is fixed.
-	sed -i 's/tlib lib ar/ar/' configure.in || die
-	eautoreconf
-}
-
-src_configure() {
-	# don't ask why, but this is needed for stuff to get built properly
-	# across the various JDKs
-	JAVACFLAGS="+ ${JAVACFLAGS}"
-
-	# mcs for https://bugs.gentoo.org/show_bug.cgi?id=172104
-	CSHARPC="mcs" econf $(use_enable java) \
-		$(use_enable python) \
-		$(use_enable mono csharp) \
-		$(use_enable debug) \
-		$(use_enable examples) \
-		$(use_enable cxx) \
-		--enable-verbose
-}
-
-src_compile() {
-	emake CXXFLAGS="${CXXFLAGS} -fPIC"
-	if use cxx; then
-		pushd lib/cpp/src > /dev/null
-		make_shared_lib libantlr.a || die
-		if use static-libs; then
-			make clean
-			emake
-		fi
-		popd > /dev/null
-	fi
-
-	if use python ; then
-		pushd "${S}"/lib/python > /dev/null
-		distutils-r1_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	dobin scripts/antlr-config
-
-	if use cxx ; then
-		pushd lib/cpp > /dev/null
-		einstall
-		dolib.so src/libantlr$(get_libname $(get_major_version))
-		dosym libantlr$(get_libname $(get_major_version)) \
-			/usr/$(get_libdir)/libantlr$(get_libname)
-		use static-libs && dolib.a src/libantlr.a
-		newdoc AUTHORS{,.cpp}
-		newdoc ChangeLog{,.cpp}
-		newdoc TODO{,.cpp}
-		popd > /dev/null
-	fi
-
-	if use java ; then
-		java-pkg_dojar antlr/antlr.jar
-		use script && java-pkg_dolauncher antlr --main antlr.Tool
-		use source && java-pkg_dosrc antlr
-		use doc && java-pkg_dohtml -r doc/*
-	fi
-
-	if use mono ; then
-		pushd lib > /dev/null
-		dodir /usr/$(get_libdir)/antlr/
-		insinto /usr/$(get_libdir)/antlr/
-		doins antlr.astframe.dll
-		doins antlr.runtime.dll
-		sed -e "s|@prefix@|${EPREFIX}/usr|" \
-			-e 's|@exec_prefix@|${prefix}|' \
-			-e "s|@libdir@|\$\{exec_prefix\}/$(get_libdir)/antlr|" \
-			-e 's|@libs@|-r:${libdir}/antlr.astframe.dll -r:${libdir}/antlr.runtime.dll|' \
-			-e "s|@VERSION@|${PV}|" \
-			"${FILESDIR}"/antlr.pc.in > antlr.pc
-		insinto /usr/$(get_libdir)/pkgconfig
-		doins antlr.pc
-		popd > /dev/null
-	fi
-
-	if use python ; then
-		pushd "${S}"/lib/python > /dev/null
-		distutils-r1_src_install
-		popd > /dev/null
-	fi
-
-	if use examples ; then
-		find "${S}"/examples -iname Makefile\* -exec rm \{\} \;
-		insinto /usr/share/doc/${PF}/examples
-		use cxx && doins -r "${S}"/examples/cpp
-		use java && doins -r "${S}"/examples/java
-		use mono && doins -r "${S}"/examples/csharp
-		use python && doins -r "${S}"/examples/python
-	fi
-
-	dodoc README.txt
-}

diff --git a/dev-java/antlr/antlr-3.1.3-r3.ebuild b/dev-java/antlr/antlr-3.1.3-r3.ebuild
deleted file mode 100644
index 8a8c83b..0000000
--- a/dev-java/antlr/antlr-3.1.3-r3.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A parser generator for C++, C#, Java, and Python"
-HOMEPAGE="http://www.antlr.org/"
-# You need to generate v3 grammars so that boostrapping works
-SRC_URI="http://www.antlr.org/download/${P}.tar.gz
-	mirror://gentoo/${P}-generated.tar.bz2"
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="gunit"
-
-COMMON_DEPEND=">=dev-java/stringtemplate-3.2:0
-	 >=dev-java/antlr-2.7.7:0[java]
-	 gunit? ( dev-java/junit:4 )"
-
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEPEND}"
-
-DEPEND="${RDEPEND}
-	>=virtual/jdk-1.5"
-
-java_prepare() {
-	epatch "${FILESDIR}"/${P}-jdk-8.patch || die
-
-	rm -v lib/*.jar lib/.*.jar || die
-	rm -v runtime/ActionScript/project/lib/*.jar || die
-	# We must bundle this as we can't depend on ourselves
-	cp -v "${WORKDIR}"/*.java tool/src/main/antlr/org/antlr/grammar/v3 || die
-	local version="${PV} $(date '+%B %d, %Y %T')"
-	local propertyfile="tool/src/main/resources/org/antlr/antlr.properties"
-	[[ $(egrep "^[^#]" ${propertyfile} | wc -l) != 1 ]] \
-		&& die "Unknown property found"
-	sed -i "s/^\(antlr.version\)=.*$/\1=${version}/" ${propertyfile} || die
-}
-
-antlr2() {
-	java -cp $(java-pkg_getjars antlr) antlr.Tool "${@}" || die "antlr2 failed"
-}
-
-antlr3() {
-	local cp="${S}/bootstrap:${S}/tool/src/main/resources/"
-	java -cp "${cp}":$(java-pkg_getjars antlr,stringtemplate) \
-		org.antlr.Tool "${@}" || die "building v3 grammars failed"
-}
-
-build_antlr() {
-	cd "${S}"
-	local dest="${1}"
-	# runtime
-	find runtime -name "*.java" > "${T}/sources" || die
-	# tool
-	find tool/src/main -name "*.java" >> "${T}/sources" || die
-	ejavac -d "${dest}" -cp $(java-pkg_getjars antlr,stringtemplate) "@${T}/sources"
-}
-
-# Uses maven so let's just do things manully for now
-# when bumping use jardiff and apicheck to make sure
-# produced jars are good
-src_compile() {
-	einfo "Bootstrapping antlr3 with bundled sources"
-	cd tool/src/main/antlr2/org/antlr/grammar/v2/ || die
-	# the command line only takes one at a time
-	for grammar in *.g; do
-		antlr2 ${grammar} || die
-	done
-
-	cd "${S}" || die
-	mkdir bootstrap || die
-	build_antlr bootstrap
-
-	einfo "Building v3 grammars with boostrapped antlr"
-	local v3dir=tool/src/main/antlr/org/antlr/grammar/v3/
-	rm -v "${v3dir}"/*.java || die
-	antlr3 "${v3dir}"/*.g
-
-	mkdir build || die
-	cp -r "${S}"/tool/src/main/resources/* build || die
-	build_antlr build
-
-	if use gunit; then
-		einfo "building gunit"
-		antlr3 gunit/src/main/antlr3/org/antlr/gunit/*.g
-
-		find gunit -name "*.java" > "${T}/gunit" || die
-		ejavac -d build -cp $(java-pkg_getjars stringtemplate,junit-4):build \
-			"@${T}/gunit"
-
-		cp -vr gunit/src/main/resources/org build || die
-	fi
-
-	# jar things up
-	cd build
-	find -type f >> "${T}/classes" || die
-	jar cf ${PN}3.jar "@${T}/classes" || die "jar failed"
-}
-
-src_install() {
-	# Single jar like upstream
-	java-pkg_dojar build/antlr3.jar
-	java-pkg_dolauncher antlr3 --main org.antlr.Tool
-	use gunit && java-pkg_dolauncher gunit --main org.antlr.gunit.Interp
-
-	use source && java-pkg_dosrc tool/src/main/org \
-		runtime/Java/src/main/java/org/
-}
-
-pkg_postinst() {
-	elog "Currently the ebuild only has support for the Java backend."
-}

diff --git a/dev-java/antlr/metadata.xml b/dev-java/antlr/metadata.xml
index b73c834..e00adfd 100644
--- a/dev-java/antlr/metadata.xml
+++ b/dev-java/antlr/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 	<herd>java</herd>
 	<use>
-		<flag name="script">Install a script to run antlr</flag>
 		<flag name="gunit" restrict="&gt;=dev-java/antlr-3.1.3-r1">
 		  gUnit is a "Unit Test" framework for ANTLR grammars
 	  </flag>

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[James Le Cuirot]

commit:     88321eede2569159b49a39aef1421dc5369f5424
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  7 20:54:26 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Oct  7 20:55:14 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88321eed

dev-java/antlr: Version bump to 4.5.3

Package-Manager: portage-2.3.1

 dev-java/antlr/Manifest           |  2 +
 dev-java/antlr/antlr-4.5.3.ebuild | 91 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+)

diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index 942768f..c3495bf 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -5,3 +5,5 @@ DIST antlr-3.5.2-complete.jar 2456317 SHA256 26ca659f47d77384f518cf2b6463892fcd4
 DIST antlr-3.5.2.tar.gz 6927126 SHA256 529baf7d11f06b773543e25271c1a6e1735d2f8061f4866d1ea5c99a5d71ee1f SHA512 e2a0520093fb2a77dcd9d44f26a9fdd612dceaffb398c53b2b8cd29f4630830647ede29e8dd55b434cb2c165b0fd1d77968ec6e6de0798f14d9cdfd9e6fccd99 WHIRLPOOL a3a2bf81cc91a332725a4ce15dcccf10df5395b27a521656b1f3e80fed10197edc132fa2a8b9a259b2ee603320492b4b1f664692a967fdfdbb574d919b9aa20e
 DIST antlr-4.5.1-complete.jar 1478820 SHA256 9cff6c76bc5aafcbf51cac7f0974ae01e4f6119402e75436abbb97f8ab15c211 SHA512 1109087c44706694d75a7f88f6ce96e8653467d5721505db747e7e70a4f40a24469b1fb3ffcb327819bba1548b0025412e46a11a41e329b0ecf847cb1094238c WHIRLPOOL 54d8a59bbd935b84a76370645d57eb07ee9160297ad457106b7b773682f915c9632446fc818a9fb23ab37074c923b918c168a7eca98555513cfb4dfa2eb106e5
 DIST antlr-4.5.1.tar.gz 6158475 SHA256 faaaea662e7b4792fc2264bbefaf0e196e74f45ebe29ec638f978b008e6bb5ff SHA512 949306b0ee87a0c002664ee7ac0f32c43385c501b4e28f181417559ce09b07cc12a8441c3bb81f8a72feba3d4ccc693a3c03bcccad7fc81223cddb19e10468a9 WHIRLPOOL 00aeb41f8864d65d7693cf3ca4d36a10f094967fe96fefd67e4d64eb22d1502658ff2355125ab5e36f88a276d143247c0a2814cfcd990e08ec3fe6f6212ea42e
+DIST antlr-4.5.3-complete.jar 1485121 SHA256 a32de739cfdf515774e696f91aa9697d2e7731e5cb5045ca8a4b657f8b1b4fb4 SHA512 53dcadf3007c9bdbeb391ea72fb9bab7c086fa0b9d1d93b83050b2ebb726c2f52743b5ba944c68f6da513d915ab5e8721676d74d823c32484928ccad2a28f1e4 WHIRLPOOL 9547b9e18bbef393036feeff9608b14bb57916e27bb4a4e15f1842ed428a6ccbd6c3fc819cf322532876ec4500bca3e4d73194e3ed85662768240750f8db235e
+DIST antlr-4.5.3.tar.gz 6760401 SHA256 5eaf01d4994383029a7d5d9c4604d7c7dc3122b787b69c541821d0f4dc0e9f05 SHA512 d0e61baebb338e5e4e8eaf87aa6ef52a568ec51bc86bc07acf8f82be0c173ea4f0f85978dfd034c2642505888c0849663f6b6fb030c4c19e0571f29277fb54f7 WHIRLPOOL a58ccbe6b1bed2cbb77f689cc3b8a731abd480f689a2e2129eecbd68e843906ec8931f958e174c2bf463651018cd6facf97eb5eb4b7aba69ea337f26040fcdf3

diff --git a/dev-java/antlr/antlr-4.5.3.ebuild b/dev-java/antlr/antlr-4.5.3.ebuild
new file mode 100644
index 00000000..6fe3fe4
--- /dev/null
+++ b/dev-java/antlr/antlr-4.5.3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A parser generator for many languages"
+HOMEPAGE="http://www.antlr.org/"
+SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
+	http://www.antlr.org/download/${P}-complete.jar" # Prebuilt version needed.
+LICENSE="BSD"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc 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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[James Le Cuirot]

commit:     21424382268246483bd078e4fdd2b838641871fa
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  7 20:35:19 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Oct  7 20:55:11 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21424382

dev-java/antlr: Remove old 4.4

Package-Manager: portage-2.3.1

 dev-java/antlr/Manifest         |  3 --
 dev-java/antlr/antlr-4.4.ebuild | 70 -----------------------------------------
 dev-java/antlr/metadata.xml     |  5 ---
 3 files changed, 78 deletions(-)

diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index 42cc048..942768f 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -1,10 +1,7 @@
-DIST 4.4.zip 1107695 SHA256 68a79e4accae4dfd9d45a8292fe9b2812c6a3ec1d903412e205a06ead083b8ae SHA512 5e4a92b3d0bb8583f52cbed554ef68909412cd3e9de7589870eead3359a6f5efb492029c3bcce50d6a19a220c83c809824dbde3d08a6b39a42e9fbe3eaef8ce4 WHIRLPOOL 80cf60f9679cd5d3cb512b2e1a9c4987d34fb7994a976b42c95351fb4670944343dd8b8cf0e1738b94cc177122dcf635ee5d1a262290f6b89a8e38d06adc2077
 DIST antlr-2.7.7.tar.gz 1816180 SHA256 853aeb021aef7586bda29e74a6b03006bcb565a755c86b66032d8ec31b67dbb9 SHA512 faa72d2ddcba434ef1233e70c1549e63eba67c00793966322e821cf7f015cccb804448cb92d8fbef0429f59928fad65ec954f8ffbda0acbb8e983de0806d349d WHIRLPOOL def5ac0ddfe5a65f9f7d5489d039048c5d630b46cd5626593bd12e9b393d5ec26884f90b013bcdf58511e26abbf06e0d7b3789a11298b017f7e70af2ec8dde4a
 DIST antlr-3.2.jar 1928009 SHA256 4c8737014e7ca0d2c85171edf37f5a26b2d8d8237c283357b81a3269b6848d38 SHA512 25a61404c4b41e48eeaed49d41122f9400092248a10eb776d75ce3513295870eca1acc4b06c74925284a27cc64ca0506e34de39fb91996f09727cc5cc72dd9a6 WHIRLPOOL 19d99c9f50339ee9ef31e9458ac3a44ce52aa89ed84f96be905d626e3a53d5e2bbdb2e8eb4c5ca16413e7493499b141f940dd200658f8e60e9ecbd777f83a84b
 DIST antlr-3.2.tar.gz 837320 SHA256 01548fa03ef1f0ed05a93f0749b65db8a35a191ad7ad34e1e6a6a2529ca2ef45 SHA512 8984221cd89253c033a4596dd56cd51b297393a53b4682f5ab401172745d343371bf0d45417fa286ce972add1b4e474f1f3091fa1345158dbfc040702d61607c WHIRLPOOL 40080efc13c88312aaa318cde097f240e711b477e264739ea71b6c246ede29ac48f42eccd55365af531eb428f1ca1d89386d7e5753b6bc35cad9bf937b70e6de
-DIST antlr-3.5.2-complete-no-st3.jar 1862097 SHA256 46531814ba9739cdf20c6c1789c252d3d95b68932813d79fb8bbfdf8d5840417 SHA512 227f56edfb8d1935fc0f5bd69a730a2230b173f38baa7837b6dac9b4a10c5d4a9b2eb806416b21bed2621bb0b8e0fb98a6f48da2660b326728326f078bc28ea9 WHIRLPOOL 5c5285894e2d4182650a8a573ae83996e1f463d6ce866ddcff43959b16cf1070c3042b21d80c9350865716a6719d15fcd42b7370b4af69b6eca863d26ffcc325
 DIST antlr-3.5.2-complete.jar 2456317 SHA256 26ca659f47d77384f518cf2b6463892fcd4f0b0d4d8c0de2addf697e63e7326b SHA512 560f208e38759b5e626de56816e1fce9c191c526c04ca782513859d468ac444d1e8e62c03870a68f8f9d8daee0f45fca465150e2bbfc71b46e46b952519044b1 WHIRLPOOL bdbbb081bf0aab83fa26a4a75f7f42487da688a5e3c765ea4cbd7b8c1bcb80b66e8b98bf95ee8bcd2acd60b4eacb6745f879cb899b672ea7fc4489d651a6f2e0
 DIST antlr-3.5.2.tar.gz 6927126 SHA256 529baf7d11f06b773543e25271c1a6e1735d2f8061f4866d1ea5c99a5d71ee1f SHA512 e2a0520093fb2a77dcd9d44f26a9fdd612dceaffb398c53b2b8cd29f4630830647ede29e8dd55b434cb2c165b0fd1d77968ec6e6de0798f14d9cdfd9e6fccd99 WHIRLPOOL a3a2bf81cc91a332725a4ce15dcccf10df5395b27a521656b1f3e80fed10197edc132fa2a8b9a259b2ee603320492b4b1f664692a967fdfdbb574d919b9aa20e
-DIST antlr-4.3-complete.jar 1340431 SHA256 da9afec193edcc4d8080a4897e77e1e2f6a0c0bc265fccb8c44ae10660f7a8f0 SHA512 669cc21ef72ec899509181b1ec77d918fce9dba3db165d9d7429e0058c58a9d716cbf274d7a54b6bd9143d95d9a902d82acfa5bcb5e6c805c4e9fdf90b83349e WHIRLPOOL f665a200850d294ee0f8c3127bb918a9c9625098a97a960afe08b3a3940ba2c2ad54099e34c82fab5058b668a721b3ed5621a85820d0aca0e16af2f81627c723
 DIST antlr-4.5.1-complete.jar 1478820 SHA256 9cff6c76bc5aafcbf51cac7f0974ae01e4f6119402e75436abbb97f8ab15c211 SHA512 1109087c44706694d75a7f88f6ce96e8653467d5721505db747e7e70a4f40a24469b1fb3ffcb327819bba1548b0025412e46a11a41e329b0ecf847cb1094238c WHIRLPOOL 54d8a59bbd935b84a76370645d57eb07ee9160297ad457106b7b773682f915c9632446fc818a9fb23ab37074c923b918c168a7eca98555513cfb4dfa2eb106e5
 DIST antlr-4.5.1.tar.gz 6158475 SHA256 faaaea662e7b4792fc2264bbefaf0e196e74f45ebe29ec638f978b008e6bb5ff SHA512 949306b0ee87a0c002664ee7ac0f32c43385c501b4e28f181417559ce09b07cc12a8441c3bb81f8a72feba3d4ccc693a3c03bcccad7fc81223cddb19e10468a9 WHIRLPOOL 00aeb41f8864d65d7693cf3ca4d36a10f094967fe96fefd67e4d64eb22d1502658ff2355125ab5e36f88a276d143247c0a2814cfcd990e08ec3fe6f6212ea42e

diff --git a/dev-java/antlr/antlr-4.4.ebuild b/dev-java/antlr/antlr-4.4.ebuild
deleted file mode 100644
index 409a9d4..00000000
--- a/dev-java/antlr/antlr-4.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-# List of jar files we need to get from the Internets.
-JAR_LIST=(antlr-3.5.2-complete-no-st3.jar antlr-4.3-complete.jar)
-
-DESCRIPTION="A parser generator for C++, C#, Java, and Python"
-HOMEPAGE="http://www.antlr.org/"
-SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.zip
-http://www.antlr3.org/download/${JAR_LIST[0]}
-http://www.antlr.org/download/${JAR_LIST[1]}"
-LICENSE="BSD"
-SLOT="4"
-KEYWORDS="amd64 ~arm ppc64 x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="gunit"
-
-CDEPEND="
-	>=dev-java/stringtemplate-3.2:0
-	gunit? ( dev-java/junit:4 )"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="${RDEPEND}
-	>=virtual/jdk-1.6"
-
-S="${WORKDIR}/${PN}4-${PV}"
-
-src_prepare() {
-	# Disable manual download + lib directory creation.
-	epatch "${FILESDIR}"/${P}-build.xml.patch
-
-	# Create lib directory ourselves.
-	mkdir "${S}"/lib/
-
-	# Copy downloaded jars in lib directory.
-	for myjar in ${JAR_LIST[@]}; do
-		cp "${DISTDIR}"/${myjar} "${S}"/lib/
-	done
-}
-
-src_compile() {
-	eant -f build.xml
-}
-
-src_install() {
-	# Single jar like upstream
-	java-pkg_newjar dist/antlr-4.4-complete.jar antlr.jar
-	java-pkg_dolauncher antlr4 --main org.antlr.v4.Tool
-
-	if use gunit; then
-		java-pkg_dolauncher gunit --main org.antlr.v4.gunit.Interp
-	fi
-
-	if use source; then
-		java-pkg_dosrc tool/src/org \
-			runtime/Java/src/org
-	fi
-}
-
-pkg_postinst() {
-	elog "This ebuild only supports the Java backend for the time being."
-}

diff --git a/dev-java/antlr/metadata.xml b/dev-java/antlr/metadata.xml
index 7526b4d..f70ce39 100644
--- a/dev-java/antlr/metadata.xml
+++ b/dev-java/antlr/metadata.xml
@@ -5,11 +5,6 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
-	<use>
-		<flag name="gunit" restrict="&gt;=dev-java/antlr-3.1.3-r1">
-		  gUnit is a "Unit Test" framework for ANTLR grammars
-	  </flag>
-	</use>
 	<upstream>
 		<remote-id type="github">antlr/antlr4</remote-id>
 	</upstream>

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[James Le Cuirot]

commit:     ff106800e746382f155bafa5aedb96e2a1f65719
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  7 20:34:08 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Oct  7 20:55:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff106800

dev-java/antlr: 3.5.2 + 4.5.1 stable on amd64, ppc64, x86 (ALLARCHES)

Package-Manager: portage-2.3.1

 dev-java/antlr/antlr-3.5.2.ebuild | 2 +-
 dev-java/antlr/antlr-4.5.1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/antlr/antlr-3.5.2.ebuild b/dev-java/antlr/antlr-3.5.2.ebuild
index acaad6f..a44d11a 100644
--- a/dev-java/antlr/antlr-3.5.2.ebuild
+++ b/dev-java/antlr/antlr-3.5.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz
 	http://www.antlr3.org/download/${P}-complete.jar" # Prebuilt version needed.
 LICENSE="BSD"
 SLOT="3.5"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 CDEPEND="dev-java/stringtemplate:4"

diff --git a/dev-java/antlr/antlr-4.5.1.ebuild b/dev-java/antlr/antlr-4.5.1.ebuild
index 6fe3fe4..e114ee8 100644
--- a/dev-java/antlr/antlr-4.5.1.ebuild
+++ b/dev-java/antlr/antlr-4.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
 	http://www.antlr.org/download/${P}-complete.jar" # Prebuilt version needed.
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 CDEPEND="dev-java/antlr:3.5

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Fabian Groffen]

commit:     3f8ef11f664f1c11cc0e0a932bd04c5603620828
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 15:39:18 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 15:39:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f8ef11f

dev-java/antlr: dropped ~x64-freebsd ~x86-freebsd

Package-Manager: portage-2.3.3

 dev-java/antlr/antlr-2.7.7-r7.ebuild | 4 ++--
 dev-java/antlr/antlr-3.2.ebuild      | 4 ++--
 dev-java/antlr/antlr-3.5.2.ebuild    | 4 ++--
 dev-java/antlr/antlr-4.5.1.ebuild    | 4 ++--
 dev-java/antlr/antlr-4.5.3.ebuild    | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dev-java/antlr/antlr-2.7.7-r7.ebuild b/dev-java/antlr/antlr-2.7.7-r7.ebuild
index 19c39cb..9499bd4 100644
--- a/dev-java/antlr/antlr-2.7.7-r7.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.antlr2.org/"
 SRC_URI="http://www.antlr2.org/download/${P}.tar.gz"
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples source"
 
 RDEPEND=">=virtual/jre-1.6"

diff --git a/dev-java/antlr/antlr-3.2.ebuild b/dev-java/antlr/antlr-3.2.ebuild
index b8a0512..176dbde 100644
--- a/dev-java/antlr/antlr-3.2.ebuild
+++ b/dev-java/antlr/antlr-3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.antlr3.org/download/${P}.tar.gz
 	http://www.antlr3.org/download/${P}.jar" # Prebuilt version needed.
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="amd64 ~arm ppc64 x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 CDEPEND=">=dev-java/antlr-2.7.7-r7:0

diff --git a/dev-java/antlr/antlr-3.5.2.ebuild b/dev-java/antlr/antlr-3.5.2.ebuild
index a44d11a..a8b2381 100644
--- a/dev-java/antlr/antlr-3.5.2.ebuild
+++ b/dev-java/antlr/antlr-3.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz
 	http://www.antlr3.org/download/${P}-complete.jar" # Prebuilt version needed.
 LICENSE="BSD"
 SLOT="3.5"
-KEYWORDS="amd64 ~arm ppc64 x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 CDEPEND="dev-java/stringtemplate:4"

diff --git a/dev-java/antlr/antlr-4.5.1.ebuild b/dev-java/antlr/antlr-4.5.1.ebuild
index e114ee8..193cef0 100644
--- a/dev-java/antlr/antlr-4.5.1.ebuild
+++ b/dev-java/antlr/antlr-4.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
 	http://www.antlr.org/download/${P}-complete.jar" # Prebuilt version needed.
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="amd64 ~arm ppc64 x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 CDEPEND="dev-java/antlr:3.5

diff --git a/dev-java/antlr/antlr-4.5.3.ebuild b/dev-java/antlr/antlr-4.5.3.ebuild
index 6fe3fe4..f5a598b 100644
--- a/dev-java/antlr/antlr-4.5.3.ebuild
+++ b/dev-java/antlr/antlr-4.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
 	http://www.antlr.org/download/${P}-complete.jar" # Prebuilt version needed.
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 CDEPEND="dev-java/antlr:3.5

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Patrice Clement]

commit:     293d29dc72695b002937e96a62fab57d4c0e31d2
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 20 11:06:12 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Mar 20 11:06:28 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=293d29dc

dev-java/antlr: EAPI 6 bump.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-java/antlr/antlr-2.7.7-r8.ebuild | 47 ++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/dev-java/antlr/antlr-2.7.7-r8.ebuild b/dev-java/antlr/antlr-2.7.7-r8.ebuild
new file mode 100644
index 00000000000..2a3ce769066
--- /dev/null
+++ b/dev-java/antlr/antlr-2.7.7-r8.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A parser generator for many languages"
+HOMEPAGE="http://www.antlr2.org/"
+SRC_URI="http://www.antlr2.org/download/${P}.tar.gz"
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="${S}/${PN}"
+
+DOCS=( CHANGES.txt README.txt )
+
+src_prepare() {
+	default
+	java-pkg_clean
+
+	# Delete build files from examples.
+	find examples \( -name Makefile.in -o -name shiplist \) -delete || die
+}
+
+# Avoid configure script.
+src_configure() { :; }
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher antlr --main antlr.Tool
+
+	use doc && java-pkg_dohtml -r doc/*
+	use examples && java-pkg_doexamples examples/java
+	use source && java-pkg_dosrc antlr
+
+	einstalldocs
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Alexis Ballier]

commit:     708f180b66a9a396dade2af3ce7773d5946fcbda
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 13 12:10:35 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jul 13 12:13:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=708f180b

dev-java/antlr: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-java/antlr/antlr-2.7.7-r8.ebuild | 2 +-
 dev-java/antlr/antlr-3.2.ebuild      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/antlr/antlr-2.7.7-r8.ebuild b/dev-java/antlr/antlr-2.7.7-r8.ebuild
index 2a3ce769066..7b6c1b00af0 100644
--- a/dev-java/antlr/antlr-2.7.7-r8.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.antlr2.org/"
 SRC_URI="http://www.antlr2.org/download/${P}.tar.gz"
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
 RDEPEND=">=virtual/jre-1.6"

diff --git a/dev-java/antlr/antlr-3.2.ebuild b/dev-java/antlr/antlr-3.2.ebuild
index 42cde6897ec..d8976fb1678 100644
--- a/dev-java/antlr/antlr-3.2.ebuild
+++ b/dev-java/antlr/antlr-3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.antlr3.org/download/${P}.tar.gz
 	http://www.antlr3.org/download/${P}.jar" # Prebuilt version needed.
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 CDEPEND=">=dev-java/antlr-2.7.7-r7:0

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Michał Górny]

commit:     201a6575bbe35b2e2feaca669f7c08ccafc58a6c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  1 08:37:20 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Mar  1 08:39:32 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=201a6575

dev-java/antlr: Dekeyword *-fbsd

 dev-java/antlr/antlr-2.7.7-r7.ebuild | 4 ++--
 dev-java/antlr/antlr-2.7.7-r8.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-java/antlr/antlr-2.7.7-r7.ebuild b/dev-java/antlr/antlr-2.7.7-r7.ebuild
index 3eae09ac430..09dc38c165a 100644
--- a/dev-java/antlr/antlr-2.7.7-r7.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.antlr2.org/"
 SRC_URI="http://www.antlr2.org/download/${P}.tar.gz"
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples source"
 
 RDEPEND=">=virtual/jre-1.6"

diff --git a/dev-java/antlr/antlr-2.7.7-r8.ebuild b/dev-java/antlr/antlr-2.7.7-r8.ebuild
index 7b6c1b00af0..10056965f25 100644
--- a/dev-java/antlr/antlr-2.7.7-r8.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.antlr2.org/"
 SRC_URI="http://www.antlr2.org/download/${P}.tar.gz"
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
 RDEPEND=">=virtual/jre-1.6"

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Aaron Bauman]

commit:     7e00b43b1343ede053095e2324c1671f633aeac0
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Apr 14 12:02:21 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Apr 20 01:28:09 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e00b43b

dev-java/antlr: use HTTPS

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 dev-java/antlr/antlr-2.7.7-r7.ebuild | 6 +++---
 dev-java/antlr/antlr-2.7.7-r8.ebuild | 6 +++---
 dev-java/antlr/antlr-3.2.ebuild      | 8 ++++----
 dev-java/antlr/antlr-3.5.2.ebuild    | 6 +++---
 dev-java/antlr/antlr-4.5.1.ebuild    | 6 +++---
 dev-java/antlr/antlr-4.5.3.ebuild    | 6 +++---
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/dev-java/antlr/antlr-2.7.7-r7.ebuild b/dev-java/antlr/antlr-2.7.7-r7.ebuild
index 09dc38c165a..c999d7417a3 100644
--- a/dev-java/antlr/antlr-2.7.7-r7.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,8 +8,8 @@ JAVA_PKG_IUSE="doc"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="http://www.antlr2.org/"
-SRC_URI="http://www.antlr2.org/download/${P}.tar.gz"
+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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

diff --git a/dev-java/antlr/antlr-2.7.7-r8.ebuild b/dev-java/antlr/antlr-2.7.7-r8.ebuild
index 10056965f25..de3952a26d0 100644
--- a/dev-java/antlr/antlr-2.7.7-r8.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,8 +8,8 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="http://www.antlr2.org/"
-SRC_URI="http://www.antlr2.org/download/${P}.tar.gz"
+HOMEPAGE="https://www.antlr2.org/"
+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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

diff --git a/dev-java/antlr/antlr-3.2.ebuild b/dev-java/antlr/antlr-3.2.ebuild
index d8976fb1678..48831af505d 100644
--- a/dev-java/antlr/antlr-3.2.ebuild
+++ b/dev-java/antlr/antlr-3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -6,9 +6,9 @@ EAPI="5"
 inherit eutils java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="http://www.antlr3.org/"
-SRC_URI="http://www.antlr3.org/download/${P}.tar.gz
-	http://www.antlr3.org/download/${P}.jar" # Prebuilt version needed.
+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.
 LICENSE="BSD"
 SLOT="3"
 KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

diff --git a/dev-java/antlr/antlr-3.5.2.ebuild b/dev-java/antlr/antlr-3.5.2.ebuild
index 46c6402f4b2..ffbb7faf52a 100644
--- a/dev-java/antlr/antlr-3.5.2.ebuild
+++ b/dev-java/antlr/antlr-3.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -6,9 +6,9 @@ EAPI="5"
 inherit eutils java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="http://www.antlr3.org/"
+HOMEPAGE="https://www.antlr3.org/"
 SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz
-	http://www.antlr3.org/download/${P}-complete.jar" # Prebuilt version needed.
+	https://www.antlr3.org/download/${P}-complete.jar" # Prebuilt version needed.
 LICENSE="BSD"
 SLOT="3.5"
 KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

diff --git a/dev-java/antlr/antlr-4.5.1.ebuild b/dev-java/antlr/antlr-4.5.1.ebuild
index a7c4c1ffbb7..38d9b405e65 100644
--- a/dev-java/antlr/antlr-4.5.1.ebuild
+++ b/dev-java/antlr/antlr-4.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,9 +8,9 @@ JAVA_PKG_IUSE="source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="http://www.antlr.org/"
+HOMEPAGE="https://www.antlr.org/"
 SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
-	http://www.antlr.org/download/${P}-complete.jar" # Prebuilt version needed.
+	https://www.antlr.org/download/${P}-complete.jar" # Prebuilt version needed.
 LICENSE="BSD"
 SLOT="4"
 KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

diff --git a/dev-java/antlr/antlr-4.5.3.ebuild b/dev-java/antlr/antlr-4.5.3.ebuild
index 3b48b132714..ed1027b16e8 100644
--- a/dev-java/antlr/antlr-4.5.3.ebuild
+++ b/dev-java/antlr/antlr-4.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,9 +8,9 @@ JAVA_PKG_IUSE="source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="http://www.antlr.org/"
+HOMEPAGE="https://www.antlr.org/"
 SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
-	http://www.antlr.org/download/${P}-complete.jar" # Prebuilt version needed.
+	https://www.antlr.org/download/${P}-complete.jar" # Prebuilt version needed.
 LICENSE="BSD"
 SLOT="4"
 KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Sam James]

commit:     0bca11b5258b3057465b17d81cd45b3cf0f9ee32
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 20 01:06:34 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 20 01:06:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bca11b5

dev-java/antlr: arm64 keyworded (bug #720116)

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/antlr/antlr-3.5.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/antlr/antlr-3.5.2.ebuild b/dev-java/antlr/antlr-3.5.2.ebuild
index 330d0ce8f42..43986264fbc 100644
--- a/dev-java/antlr/antlr-3.5.2.ebuild
+++ b/dev-java/antlr/antlr-3.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz
 	https://www.antlr3.org/download/${P}-complete.jar" # Prebuilt version needed.
 LICENSE="BSD"
 SLOT="3.5"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Sam James]

commit:     ca06ec93ecd8272e99864401783e22b84b7e2eb6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 25 02:19:47 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 25 02:19:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca06ec93

dev-java/antlr: arm64 keyworded (bug #733822)

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/antlr/antlr-4.5.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/antlr/antlr-4.5.3.ebuild b/dev-java/antlr/antlr-4.5.3.ebuild
index 5c66074f5d0..b250b7871a0 100644
--- a/dev-java/antlr/antlr-4.5.3.ebuild
+++ b/dev-java/antlr/antlr-4.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ 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 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Miroslav Šulc]

commit:     328e8d91d758ff48a29908db00c416a4389f4220
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 14 11:27:40 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Dec 14 11:27:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=328e8d91

dev-java/antlr: migrated 3.5.2 to eapi7

Closes: https://bugs.gentoo.org/739746
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../antlr/{antlr-3.5.2.ebuild => antlr-3.5.2-r1.ebuild}    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/dev-java/antlr/antlr-3.5.2.ebuild b/dev-java/antlr/antlr-3.5.2-r1.ebuild
similarity index 95%
rename from dev-java/antlr/antlr-3.5.2.ebuild
rename to dev-java/antlr/antlr-3.5.2-r1.ebuild
index 43986264fbc..72eaa9b7c8b 100644
--- a/dev-java/antlr/antlr-3.5.2.ebuild
+++ b/dev-java/antlr/antlr-3.5.2-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 inherit eutils java-pkg-2 java-pkg-simple
 
@@ -18,21 +18,26 @@ RESTRICT="!test? ( test )"
 CDEPEND="dev-java/stringtemplate:4"
 
 RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
+	>=virtual/jre-1.8"
 
 DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
+	>=virtual/jdk-1.8
 	test? ( dev-java/junit:4 )"
 
 S="${WORKDIR}/${PN}3-${PV}"
 JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-runtime.jar"
 JAVA_GENTOO_CLASSPATH="stringtemplate-4"
+PATCHES=(
+	"${FILESDIR}/${PV}-test-fixes.patch"
+)
 
 src_unpack() {
 	unpack ${P}.tar.gz
 }
 
-java_prepare() {
+src_prepare() {
+	default
+
 	java-pkg_clean
 
 	# This requires StringTemplate v3 and is only needed for
@@ -42,7 +47,6 @@ java_prepare() {
 
 	# Some tests have to be removed as a result.
 	rm -v tool/src/test/java/org/antlr/test/Test{RewriteTemplates,Templates}.java || die
-	epatch "${FILESDIR}/${PV}-test-fixes.patch"
 
 	# Some tests fail under Java 8 in ways that probably aren't limited
 	# to the tests. This is bad but upstream is never going to update

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Miroslav Šulc]

commit:     e52aaabb39f96d65264d41f4b18403411e41a313
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Apr 26 10:17:44 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Apr 28 09:23:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e52aaabb

dev-java/antlr: MAVEN_ID

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20546/commits/ec214b627dfe4e50832359fdd1b48cb71a71b77c
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/antlr/antlr-4.5.3.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-java/antlr/antlr-4.5.3.ebuild b/dev-java/antlr/antlr-4.5.3.ebuild
index bf5db82387e..3cd757f2a8e 100644
--- a/dev-java/antlr/antlr-4.5.3.ebuild
+++ b/dev-java/antlr/antlr-4.5.3.ebuild
@@ -4,6 +4,7 @@
 EAPI="5"
 
 JAVA_PKG_IUSE="source"
+MAVEN_ID="org.antlr:antlr4:4.5.3"
 
 inherit java-pkg-2 java-pkg-simple
 

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Miroslav Šulc]

commit:     314148a1802a3bca0b6a9e32c39533a5d4255c3f
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun May 16 08:27:48 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun May 16 19:06:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=314148a1

dev-java/antlr: EAPI 7, min java 1.8

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/antlr/antlr-2.7.7-r9.ebuild | 49 ++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/dev-java/antlr/antlr-2.7.7-r9.ebuild b/dev-java/antlr/antlr-2.7.7-r9.ebuild
new file mode 100644
index 00000000000..f7a42851863
--- /dev/null
+++ b/dev-java/antlr/antlr-2.7.7-r9.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+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 ~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:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="${S}/${PN}"
+
+DOCS=( CHANGES.txt README.txt )
+
+src_prepare() {
+	default
+	java-pkg_clean
+
+	# Delete build files from examples.
+	find examples \( -name Makefile.in -o -name shiplist \) -delete || die
+}
+
+# Avoid configure script.
+src_configure() { :; }
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher antlr --main antlr.Tool
+
+	use doc && java-pkg_dohtml -r doc/*
+	use examples && java-pkg_doexamples examples/java
+	use source && java-pkg_dosrc antlr
+
+	# https://bugs.gentoo.org/789582
+	einstalldocs
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Miroslav Šulc]

commit:     31124a323eb568a6d382f2b062d9be254033b242
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun May 16 19:05:47 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun May 16 19:06:10 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31124a32

dev-java/antlr: dropped obsolete 3.2

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/antlr/antlr-3.2.ebuild | 96 -----------------------------------------
 1 file changed, 96 deletions(-)

diff --git a/dev-java/antlr/antlr-3.2.ebuild b/dev-java/antlr/antlr-3.2.ebuild
deleted file mode 100644
index 3efa9766028..00000000000
--- a/dev-java/antlr/antlr-3.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit epatch java-pkg-2 java-pkg-simple
-
-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.
-LICENSE="BSD"
-SLOT="3"
-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-2.7.7-r7:0
-	dev-java/stringtemplate:0"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
-	test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/${P}"
-JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-runtime.jar"
-JAVA_GENTOO_CLASSPATH="antlr,stringtemplate"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-}
-
-java_prepare() {
-	java-pkg_clean
-
-	# These fixes have been applied in 3.5.
-	epatch "${FILESDIR}/${PV}-test-fixes.patch"
-	epatch "${FILESDIR}/${PV}-java-8.patch"
-
-	# Some tests fail under Java 8 in ways that probably aren't limited
-	# 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
-		rm -v tool/src/test/java/org/antlr/test/Test{DFAConversion,SemanticPredicates,TopologicalSort}.java || die
-	fi
-
-	# 3.2 has strange hidden files.
-	find -type f -name "._*.*" -delete || die
-}
-
-src_compile() {
-	cd "${S}/runtime/Java/src/main" || die
-	JAVA_JAR_FILENAME="${S}/${PN}-runtime.jar" JAVA_PKG_IUSE="doc" java-pkg-simple_src_compile
-
-	cd "${S}/tool/src/main" || die
-
-	local G; for G in antlr codegen antlr.print assign.types buildnfa define; do # from pom.xml
-		antlr -o antlr2/org/antlr/grammar/v2/{,${G}.g} || die
-	done
-
-	# We have applied a patch to fix this version under Java 8. Trouble
-	# is that we need to run a prebuilt version before we can build our
-	# own and that version doesn't have the fix applied. We work around
-	# this by building just the offending class against the prebuilt
-	# version and then putting them together in the classpath. That
-	# isn't all. Due to a compiler limitation that Chewi doesn't fully
-	# understand, this class cannot be compiled by itself without a
-	# couple of tweaks that have been applied in the Java 8 patch.
-	ejavac -classpath "${DISTDIR}/${P}.jar" java/org/antlr/tool/CompositeGrammar.java
-
-	java -classpath "java:${DISTDIR}/${P}.jar" org.antlr.Tool $(find antlr3 -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.Tool
-	use doc && java-pkg_dojavadoc runtime/Java/src/main/target/api
-}
-
-src_test() {
-	cd tool/src/test/java || die
-	local CP=".:${S}/${PN}-runtime.jar:${S}/${PN}-tool.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
-
-	local TESTS=$(find * -name "Test*.java")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -classpath "${CP}" $(find -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Miroslav Šulc]

commit:     4ae9d5b42367214a170b0f8d0185fdac5c496399
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun May 16 08:36:48 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun May 16 19:06:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ae9d5b4

dev-java/antlr: remove obsolete

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/antlr/antlr-2.7.7-r8.ebuild | 47 ------------------------------------
 1 file changed, 47 deletions(-)

diff --git a/dev-java/antlr/antlr-2.7.7-r8.ebuild b/dev-java/antlr/antlr-2.7.7-r8.ebuild
deleted file mode 100644
index 3ca31ab70cf..00000000000
--- a/dev-java/antlr/antlr-2.7.7-r8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-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 ~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.6"
-DEPEND=">=virtual/jdk-1.6"
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="${S}/${PN}"
-
-DOCS=( CHANGES.txt README.txt )
-
-src_prepare() {
-	default
-	java-pkg_clean
-
-	# Delete build files from examples.
-	find examples \( -name Makefile.in -o -name shiplist \) -delete || die
-}
-
-# Avoid configure script.
-src_configure() { :; }
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher antlr --main antlr.Tool
-
-	use doc && java-pkg_dohtml -r doc/*
-	use examples && java-pkg_doexamples examples/java
-	use source && java-pkg_dosrc antlr
-
-	einstalldocs
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Miroslav Šulc]

commit:     2b76ad17a40afdb3a5888bb935de48657291421d
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed May 26 08:43:39 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu May 27 08:03:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b76ad17

dev-java/antlr: MAVEN_ID

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20991/commits/1cf9ba6f2946ecdbf36cbbdf2b2e7cc9bc319edb
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/antlr/antlr-2.7.7-r9.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-java/antlr/antlr-2.7.7-r9.ebuild b/dev-java/antlr/antlr-2.7.7-r9.ebuild
index f7a42851863..5b7e3a5f797 100644
--- a/dev-java/antlr/antlr-2.7.7-r9.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r9.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="antlr:antlr:2.7.7"
 
 inherit java-pkg-2 java-pkg-simple
 

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Sam James]

commit:     2a37e290b16b42d716912cac52d0fd95406b1438
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 18 15:45:45 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 18 15:45:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a37e290

dev-java/antlr: Stabilize 2.7.7-r9 x86, #796617

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/antlr/antlr-2.7.7-r9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/antlr/antlr-2.7.7-r9.ebuild b/dev-java/antlr/antlr-2.7.7-r9.ebuild
index 5b7e3a5f797..99355058f12 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:*"

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Sam James]

commit:     2aab70dfc8bc00e9c44b9ae38d71b2b9483a0a92
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 18 22:25:25 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 18 22:25:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2aab70df

dev-java/antlr: Stabilize 2.7.7-r9 amd64, #796617

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/antlr/antlr-2.7.7-r9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/antlr/antlr-2.7.7-r9.ebuild b/dev-java/antlr/antlr-2.7.7-r9.ebuild
index 99355058f12..2a646439c8e 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:*"

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Miroslav Šulc]

commit:     faa9d3b2c09a1e6eb29338d66008625eecf6b577
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri Jun 18 19:01:58 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jun 19 07:53:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faa9d3b2

dev-java/antlr: remove unstable obsolete version

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/21314
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/antlr/antlr-4.5.3.ebuild | 92 ---------------------------------------
 1 file changed, 92 deletions(-)

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 3cd757f2a8e..00000000000
--- 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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Miroslav Šulc]

commit:     f9742899f7659dd4e3804b25fc696c24fb68369f
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri Jun 18 18:40:43 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jun 19 07:52:56 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9742899

dev-java/antlr: v4.5.3-r1 min java 1.8:*

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/antlr/antlr-4.5.3-r1.ebuild | 94 ++++++++++++++++++++++++++++++++++++
 1 file changed, 94 insertions(+)

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 00000000000..3c70f1210ae
--- /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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Agostino Sarubbo]

commit:     65745cda2d27e620ed8bbe6d09a7546b6cbe9cee
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 19 10:00:58 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Jun 19 10:00:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65745cda

dev-java/antlr: ppc64 stable wrt bug #796617

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-java/antlr/antlr-2.7.7-r9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/antlr/antlr-2.7.7-r9.ebuild b/dev-java/antlr/antlr-2.7.7-r9.ebuild
index 2a646439c8e..ed770ed14cf 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:*"

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Miroslav Šulc]

commit:     84a7d48724df1b91babb553c3ddee4f0f5137a7f
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 19 11:54:32 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jun 19 11:54:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84a7d487

dev-java/antlr: removed obsolete 2.7.7-r7

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/antlr/antlr-2.7.7-r7.ebuild | 44 ------------------------------------
 1 file changed, 44 deletions(-)

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 dfa69c64882..00000000000
--- 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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Agostino Sarubbo]

commit:     671c7b04a4a46564a2480c1309bfa8088b847040
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 18 06:31:25 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jul 18 06:31:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=671c7b04

dev-java/antlr: amd64 stable wrt bug #796695

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-java/antlr/antlr-4.5.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/antlr/antlr-4.5.3-r1.ebuild b/dev-java/antlr/antlr-4.5.3-r1.ebuild
index 3c70f1210ae..b9cfe823789 100644
--- a/dev-java/antlr/antlr-4.5.3-r1.ebuild
+++ b/dev-java/antlr/antlr-4.5.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 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"
+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 )"
 

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Sam James]

commit:     e0c0f717eadcfb27f9babafad8f321b1db0549e6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 23 21:36:10 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 23 21:36:10 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0c0f717

dev-java/antlr: Stabilize 3.2-r1 arm64, #826766

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/antlr/antlr-3.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/antlr/antlr-3.2-r1.ebuild b/dev-java/antlr/antlr-3.2-r1.ebuild
index fba666dc5ad6..1ab54993c309 100644
--- a/dev-java/antlr/antlr-3.2-r1.ebuild
+++ b/dev-java/antlr/antlr-3.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.antlr3.org/download/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="3"
-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"
 RESTRICT="!test? ( test )"
 
 CDEPEND=">=dev-java/antlr-2.7.7-r7:0

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Sam James]

commit:     d1e2cd051adefb07d1bd9819dd1a4845535a1368
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 23 21:36:08 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 23 21:36:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1e2cd05

dev-java/antlr: Stabilize 2.7.7-r9 arm64, #826766

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/antlr/antlr-2.7.7-r9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/antlr/antlr-2.7.7-r9.ebuild b/dev-java/antlr/antlr-2.7.7-r9.ebuild
index ed770ed14cf8..304ae169d371 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:*"

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Miroslav Šulc]

commit:     eb9234c26f9dd6984276ee8c499835a4318152ec
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Thu Jan 20 20:50:39 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Jan 25 09:30:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb9234c2

dev-java/antlr: Split antlr-runtime and antlr-tool for 3.5.2

Suggested-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
Bug: https://bugs.gentoo.org/742554
Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23904
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/antlr/antlr-3.5.2-r2.ebuild | 63 ++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/dev-java/antlr/antlr-3.5.2-r2.ebuild b/dev-java/antlr/antlr-3.5.2-r2.ebuild
new file mode 100644
index 000000000000..c085043de3e4
--- /dev/null
+++ b/dev-java/antlr/antlr-3.5.2-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2
+
+DESCRIPTION="A parser generator for many languages"
+HOMEPAGE="https://www.antlr3.org/"
+# Reuse tarball for DOCS files
+SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="3.5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="
+	~dev-java/antlr-runtime-${PV}:${SLOT}
+	~dev-java/antlr-tool-${PV}:${SLOT}
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+S="${WORKDIR}/${PN}3-${PV}"
+
+DOCS=( contributors.txt README.txt )
+
+src_compile() {
+	:
+}
+
+src_install() {
+	java-pkg_regjar "$(java-pkg_getjar antlr-runtime-3.5 antlr-runtime.jar)"
+	java-pkg_regjar "$(java-pkg_getjar antlr-tool-3.5 antlr-tool.jar)"
+
+	java-pkg_dolauncher ${PN}${SLOT} --main org.antlr.Tool
+	einstalldocs # https://bugs.gentoo.org/789582
+}
+
+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
+	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}."
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Miroslav Šulc]

commit:     9bf289c4c6372a3ab19c1af18800af8f492d9a21
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Fri Jan 28 21:22:19 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Feb  4 08:17:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bf289c4

dev-java/antlr: Add 4.9.3

Closes: https://bugs.gentoo.org/605036
Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24006
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/antlr/Manifest           |  1 +
 dev-java/antlr/antlr-4.9.3.ebuild | 63 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+)

diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index b36664559005..b1d446eb0c3b 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -7,3 +7,4 @@ DIST antlr-4.5.1-complete.jar 1478820 BLAKE2B 7f6ab8d1bad6b75ede4930fe594a3302bd
 DIST antlr-4.5.1.tar.gz 6158475 BLAKE2B 17cf84a60393c786d8b8addd93b87998178cea55f2a6bcc4ca244655a6d2aacc15226111b00fc0a8a6424f8a7c6eb3bfa49172e3b2149714a5c0c6ad69943cd9 SHA512 949306b0ee87a0c002664ee7ac0f32c43385c501b4e28f181417559ce09b07cc12a8441c3bb81f8a72feba3d4ccc693a3c03bcccad7fc81223cddb19e10468a9
 DIST antlr-4.5.3-complete.jar 1485121 BLAKE2B 84d41b17bd30dfad7a79e9759802c76d986299cc592c7b2c859225ed00989bb2709b14635ee40c8ecfe79e2441ecb697b2d17b7e6e789a7549868b93a3876f77 SHA512 53dcadf3007c9bdbeb391ea72fb9bab7c086fa0b9d1d93b83050b2ebb726c2f52743b5ba944c68f6da513d915ab5e8721676d74d823c32484928ccad2a28f1e4
 DIST antlr-4.5.3.tar.gz 6760401 BLAKE2B d436b4a964c527e230912a0ba23146af199478570cf5491eadeb5025e814642658cc71d71e6a09b5df3cc18e9b8991abf930cab70677d117a112e0922e046e07 SHA512 d0e61baebb338e5e4e8eaf87aa6ef52a568ec51bc86bc07acf8f82be0c173ea4f0f85978dfd034c2642505888c0849663f6b6fb030c4c19e0571f29277fb54f7
+DIST antlr-4.9.3.tar.gz 4640242 BLAKE2B fb58f5e533051cb2c439c32f0462c1d463c99df862ba7e1a37a1c61378ab36a9edb9525c2a342de5b517da6f02d8291de5976c550932314f3464aad1a778afb9 SHA512 61452404c9639b5a0908cda16605f17c0fed0c9adfc3278c7408f9971420e9d1fe8f9e974e0826c2e3e780fdd83324094c0246cd5b28fa63f5686b094ea08127

diff --git a/dev-java/antlr/antlr-4.9.3.ebuild b/dev-java/antlr/antlr-4.9.3.ebuild
new file mode 100644
index 000000000000..7bbb32776001
--- /dev/null
+++ b/dev-java/antlr/antlr-4.9.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2
+
+DESCRIPTION="A parser generator for many languages"
+HOMEPAGE="https://www.antlr.org/"
+# Reuse tarball for DOCS
+SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+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"
+
+CP_DEPEND="
+	~dev-java/antlr-runtime-${PV}:${SLOT}
+	~dev-java/antlr-tool-${PV}:${SLOT}
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+S="${WORKDIR}/${PN}4-${PV}"
+
+DOCS=( CHANGES.txt CONTRIBUTING.md contributors.txt README.md doc )
+
+src_compile() {
+	:
+}
+
+src_install() {
+	java-pkg_regjar "$(java-pkg_getjar "antlr-runtime-${SLOT}" antlr-runtime.jar)"
+	java-pkg_regjar "$(java-pkg_getjar "antlr-tool-${SLOT}" antlr-tool.jar)"
+
+	java-pkg_dolauncher "${PN}${SLOT}" --main org.antlr.v4.Tool
+	einstalldocs # https://bugs.gentoo.org/789582
+}
+
+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
+	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}."
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Jakov Smolić]

commit:     f538236ba9192cbb0e897d3492d9cd46fcc653aa
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 24 08:46:08 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 08:46:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f538236b

dev-java/antlr: Stabilize 3.5.2-r2 amd64, #833953

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-java/antlr/antlr-3.5.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/antlr/antlr-3.5.2-r2.ebuild b/dev-java/antlr/antlr-3.5.2-r2.ebuild
index c085043de3e4..09a8c188a2ff 100644
--- a/dev-java/antlr/antlr-3.5.2-r2.ebuild
+++ b/dev-java/antlr/antlr-3.5.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="3.5"
-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"
 
 CP_DEPEND="
 	~dev-java/antlr-runtime-${PV}:${SLOT}

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Jakov Smolić]

commit:     f95d7721b00630f453bede5d826044d0bb7abc3b
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 24 08:46:25 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 08:46:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f95d7721

dev-java/antlr: Stabilize 3.5.2-r2 x86, #833953

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-java/antlr/antlr-3.5.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/antlr/antlr-3.5.2-r2.ebuild b/dev-java/antlr/antlr-3.5.2-r2.ebuild
index 09a8c188a2ff..a28402ea4c52 100644
--- a/dev-java/antlr/antlr-3.5.2-r2.ebuild
+++ b/dev-java/antlr/antlr-3.5.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="3.5"
-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"
 
 CP_DEPEND="
 	~dev-java/antlr-runtime-${PV}:${SLOT}

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Sam James]

commit:     bdc44d29aa8779ee846683a5684fda9f45cef51e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 25 21:30:57 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 25 21:30:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdc44d29

dev-java/antlr: Stabilize 3.5.2-r2 arm64, #833953

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/antlr/antlr-3.5.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/antlr/antlr-3.5.2-r2.ebuild b/dev-java/antlr/antlr-3.5.2-r2.ebuild
index a28402ea4c52..6137fcfaa937 100644
--- a/dev-java/antlr/antlr-3.5.2-r2.ebuild
+++ b/dev-java/antlr/antlr-3.5.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="3.5"
-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"
 
 CP_DEPEND="
 	~dev-java/antlr-runtime-${PV}:${SLOT}

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Agostino Sarubbo]

commit:     21a0ffe3493ecb5aadb9f3651a1b5d381838da59
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  8 13:04:21 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Mar  8 13:04:21 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21a0ffe3

dev-java/antlr: amd64 stable wrt bug #834702

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-java/antlr/antlr-4.9.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/antlr/antlr-4.9.3.ebuild b/dev-java/antlr/antlr-4.9.3.ebuild
index 7bbb32776001..a1bc92b2e5e7 100644
--- a/dev-java/antlr/antlr-4.9.3.ebuild
+++ b/dev-java/antlr/antlr-4.9.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="
 	~dev-java/antlr-runtime-${PV}:${SLOT}

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Agostino Sarubbo]

commit:     5c5d34f2b1eb07d7e27b54ff4eb10764b08bb8a0
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  9 09:19:18 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Mar  9 09:19:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c5d34f2

dev-java/antlr: x86 stable wrt bug #834702

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-java/antlr/antlr-4.9.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/antlr/antlr-4.9.3.ebuild b/dev-java/antlr/antlr-4.9.3.ebuild
index a1bc92b2e5e7..05ea76cc1036 100644
--- a/dev-java/antlr/antlr-4.9.3.ebuild
+++ b/dev-java/antlr/antlr-4.9.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="
 	~dev-java/antlr-runtime-${PV}:${SLOT}

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Sam James]

commit:     eb7805f9a48d663980bf1c79b41a4781bdfc6239
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 17 00:21:42 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 17 00:21:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb7805f9

dev-java/antlr: Stabilize 4.9.3 arm64, #834702

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/antlr/antlr-4.9.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/antlr/antlr-4.9.3.ebuild b/dev-java/antlr/antlr-4.9.3.ebuild
index 05ea76cc1036..0a6fdef4c5ec 100644
--- a/dev-java/antlr/antlr-4.9.3.ebuild
+++ b/dev-java/antlr/antlr-4.9.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 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"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="
 	~dev-java/antlr-runtime-${PV}:${SLOT}

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Sam James]

commit:     3e8d149b5720f1744df70d9dc32362475eddfa46
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 17 00:57:32 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 17 00:57:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e8d149b

dev-java/antlr: Stabilize 3.5.2-r2 ppc64, #833953

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/antlr/antlr-3.5.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/antlr/antlr-3.5.2-r2.ebuild b/dev-java/antlr/antlr-3.5.2-r2.ebuild
index 6137fcfaa937..3dc31c7456f2 100644
--- a/dev-java/antlr/antlr-3.5.2-r2.ebuild
+++ b/dev-java/antlr/antlr-3.5.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="3.5"
-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"
 
 CP_DEPEND="
 	~dev-java/antlr-runtime-${PV}:${SLOT}

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Sam James]

commit:     5020446e751cbaad2da0847e6c551355bd6aaa73
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 17 01:36:38 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 17 01:36:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5020446e

dev-java/antlr: Stabilize 4.9.3 ppc64, #834702

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/antlr/antlr-4.9.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/antlr/antlr-4.9.3.ebuild b/dev-java/antlr/antlr-4.9.3.ebuild
index 0a6fdef4c5ec..be89da27f17e 100644
--- a/dev-java/antlr/antlr-4.9.3.ebuild
+++ b/dev-java/antlr/antlr-4.9.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 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"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="
 	~dev-java/antlr-runtime-${PV}:${SLOT}

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Sam James]

commit:     a0d30baa34d5f4bf8ede796bd262cfe813415244
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 17 02:09:31 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 17 02:09:31 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0d30baa

dev-java/antlr: Stabilize 4.5.3-r1 ppc64, #796695

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/antlr/antlr-4.5.3-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/antlr/antlr-4.5.3-r1.ebuild b/dev-java/antlr/antlr-4.5.3-r1.ebuild
index b9cfe8237899..3c098f5c976f 100644
--- a/dev-java/antlr/antlr-4.5.3-r1.ebuild
+++ b/dev-java/antlr/antlr-4.5.3-r1.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
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 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"
+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 )"
 

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Miroslav Šulc]

commit:     a96ead8fecc919eba7a3576207c88acefdaecc53
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Mar 17 06:30:59 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Mar 17 08:56:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a96ead8f

dev-java/antlr: Drop 3.5.2-r1, 4.5.1 and 4.5.3-r1

Closes: https://bugs.gentoo.org/707068
Closes: https://bugs.gentoo.org/796695
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/antlr/Manifest              |  5 --
 dev-java/antlr/antlr-3.5.2-r1.ebuild | 91 ----------------------------------
 dev-java/antlr/antlr-4.5.1.ebuild    | 91 ----------------------------------
 dev-java/antlr/antlr-4.5.3-r1.ebuild | 94 ------------------------------------
 4 files changed, 281 deletions(-)

diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index b1d446eb0c3b..1de9662c4657 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -1,10 +1,5 @@
 DIST antlr-2.7.7.tar.gz 1816180 BLAKE2B 3a9a51070f8651befeb4d22be344b544e119db34a78522828c2ffc3c481c14b9c7784f0a9997a61f6faedde5b6d1fe12214cfd84fb274f7065f3ffe6a44abf1c SHA512 faa72d2ddcba434ef1233e70c1549e63eba67c00793966322e821cf7f015cccb804448cb92d8fbef0429f59928fad65ec954f8ffbda0acbb8e983de0806d349d
 DIST antlr-3.2.jar 1928009 BLAKE2B 9c56b0142abdb7d0caabebbae12618a665f91001e2f472519549a65b8601b81fcca485898c7420087a7b631351eb26e4b98589d7284960efcc3c65155919fd2a SHA512 25a61404c4b41e48eeaed49d41122f9400092248a10eb776d75ce3513295870eca1acc4b06c74925284a27cc64ca0506e34de39fb91996f09727cc5cc72dd9a6
 DIST antlr-3.2.tar.gz 837320 BLAKE2B 3addcfed45e67a7f8f3841a890be418626d93229dc326fe4670c6b145a457203a26f01723695573692c65bb6c376349a8d8cd852b339b1f6da7b71a52e14bb4f SHA512 8984221cd89253c033a4596dd56cd51b297393a53b4682f5ab401172745d343371bf0d45417fa286ce972add1b4e474f1f3091fa1345158dbfc040702d61607c
-DIST antlr-3.5.2-complete.jar 2456317 BLAKE2B d9afa08ad98dbff16d30425b97a0ddac7402055916e6a7dd290c3b9a2b26a4751c02f405d8d13c186333430c370c94bd73419b14c8e46df2971f68536cc484a0 SHA512 560f208e38759b5e626de56816e1fce9c191c526c04ca782513859d468ac444d1e8e62c03870a68f8f9d8daee0f45fca465150e2bbfc71b46e46b952519044b1
 DIST antlr-3.5.2.tar.gz 6927126 BLAKE2B 1907229549434dfea6ef1fa915137a2f733bd61f0a40aacb131689df619d1c92e125453ec3d1febc5d92da1841ffbde060af196cff1ca8fb6f4684600375e161 SHA512 e2a0520093fb2a77dcd9d44f26a9fdd612dceaffb398c53b2b8cd29f4630830647ede29e8dd55b434cb2c165b0fd1d77968ec6e6de0798f14d9cdfd9e6fccd99
-DIST antlr-4.5.1-complete.jar 1478820 BLAKE2B 7f6ab8d1bad6b75ede4930fe594a3302bd2bdeac8426d65d0a16610a8da4dd3bda23db68b7feafc90449bda5032115ad0f0dbe7c376c4095cb4ccac3e7a70e84 SHA512 1109087c44706694d75a7f88f6ce96e8653467d5721505db747e7e70a4f40a24469b1fb3ffcb327819bba1548b0025412e46a11a41e329b0ecf847cb1094238c
-DIST antlr-4.5.1.tar.gz 6158475 BLAKE2B 17cf84a60393c786d8b8addd93b87998178cea55f2a6bcc4ca244655a6d2aacc15226111b00fc0a8a6424f8a7c6eb3bfa49172e3b2149714a5c0c6ad69943cd9 SHA512 949306b0ee87a0c002664ee7ac0f32c43385c501b4e28f181417559ce09b07cc12a8441c3bb81f8a72feba3d4ccc693a3c03bcccad7fc81223cddb19e10468a9
-DIST antlr-4.5.3-complete.jar 1485121 BLAKE2B 84d41b17bd30dfad7a79e9759802c76d986299cc592c7b2c859225ed00989bb2709b14635ee40c8ecfe79e2441ecb697b2d17b7e6e789a7549868b93a3876f77 SHA512 53dcadf3007c9bdbeb391ea72fb9bab7c086fa0b9d1d93b83050b2ebb726c2f52743b5ba944c68f6da513d915ab5e8721676d74d823c32484928ccad2a28f1e4
-DIST antlr-4.5.3.tar.gz 6760401 BLAKE2B d436b4a964c527e230912a0ba23146af199478570cf5491eadeb5025e814642658cc71d71e6a09b5df3cc18e9b8991abf930cab70677d117a112e0922e046e07 SHA512 d0e61baebb338e5e4e8eaf87aa6ef52a568ec51bc86bc07acf8f82be0c173ea4f0f85978dfd034c2642505888c0849663f6b6fb030c4c19e0571f29277fb54f7
 DIST antlr-4.9.3.tar.gz 4640242 BLAKE2B fb58f5e533051cb2c439c32f0462c1d463c99df862ba7e1a37a1c61378ab36a9edb9525c2a342de5b517da6f02d8291de5976c550932314f3464aad1a778afb9 SHA512 61452404c9639b5a0908cda16605f17c0fed0c9adfc3278c7408f9971420e9d1fe8f9e974e0826c2e3e780fdd83324094c0246cd5b28fa63f5686b094ea08127

diff --git a/dev-java/antlr/antlr-3.5.2-r1.ebuild b/dev-java/antlr/antlr-3.5.2-r1.ebuild
deleted file mode 100644
index 0c83334bc403..000000000000
--- a/dev-java/antlr/antlr-3.5.2-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="https://www.antlr3.org/"
-SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://www.antlr3.org/download/${P}-complete.jar" # Prebuilt version needed.
-LICENSE="BSD"
-SLOT="3.5"
-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/stringtemplate:4"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8
-	test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/${PN}3-${PV}"
-JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-runtime.jar"
-JAVA_GENTOO_CLASSPATH="stringtemplate-4"
-PATCHES=(
-	"${FILESDIR}/${PV}-test-fixes.patch"
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-}
-
-src_prepare() {
-	default
-
-	java-pkg_clean
-
-	# This requires StringTemplate v3 and is only needed for
-	# output=template. Nothing in the tree currently needs that and the
-	# dependency situation is already hairy enough as it is.
-	rm -v runtime/Java/src/main/java/org/antlr/runtime/tree/DOTTreeGenerator.java || die
-
-	# Some tests have to be removed as a result.
-	rm -v tool/src/test/java/org/antlr/test/Test{RewriteTemplates,Templates}.java || die
-
-	# Some tests fail under Java 8 in ways that probably aren't limited
-	# to the tests. This is bad but upstream is never going to update
-	# 3.5. At the time of writing, we only use it to build 4 anyway.
-	if java-pkg_is-vm-version-ge 1.8; then
-		rm -v tool/src/test/java/org/antlr/test/Test{DFAConversion,SemanticPredicates,TopologicalSort}.java || die
-	fi
-}
-
-src_compile() {
-	cd "${S}/runtime/Java/src/main" || die
-	JAVA_JAR_FILENAME="${S}/${PN}-runtime.jar" JAVA_PKG_IUSE="doc" java-pkg-simple_src_compile
-
-	cd "${S}/tool/src/main" || die
-	java -jar "${DISTDIR}/${P}-complete.jar" $(find antlr3 -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.Tool
-	use doc && java-pkg_dojavadoc runtime/Java/src/main/target/api
-}
-
-src_test() {
-	cd tool/src/test/java || die
-	local CP=".:${S}/${PN}-runtime.jar:${S}/${PN}-tool.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
-
-	local TESTS=$(find * -name "Test*.java")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -classpath "${CP}" $(find -name "*.java")
-
-	# ejunit automatically adds all registered subdependencies to the
-	# classpath, which is annoying in this case because of the cyclic
-	# dependency on stringtemplate. It will blow up when trying to find
-	# antlr-3.5 on the system before it is installed. The easiest but
-	# somewhat ugly way to avoid this is to unset JAVA_PKG_DEPEND_FILE.
-	JAVA_PKG_DEPEND_FILE= ejunit4 -classpath "${CP}" ${TESTS}
-}

diff --git a/dev-java/antlr/antlr-4.5.1.ebuild b/dev-java/antlr/antlr-4.5.1.ebuild
deleted file mode 100644
index 4c411e077bb3..000000000000
--- a/dev-java/antlr/antlr-4.5.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-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 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
-}

diff --git a/dev-java/antlr/antlr-4.5.3-r1.ebuild b/dev-java/antlr/antlr-4.5.3-r1.ebuild
deleted file mode 100644
index 3c098f5c976f..000000000000
--- a/dev-java/antlr/antlr-4.5.3-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2022 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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Miroslav Šulc]

commit:     ddf5a2cd99f5b0c2190ea361c68b7b02fc9230e9
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Sun Apr 10 06:39:30 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 06:14:47 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddf5a2cd

dev-java/antlr: Add 3.5.3

Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24977
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/antlr/Manifest           |  1 +
 dev-java/antlr/antlr-3.5.3.ebuild | 63 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+)

diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index 1de9662c4657..49def7a90a7c 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -2,4 +2,5 @@ DIST antlr-2.7.7.tar.gz 1816180 BLAKE2B 3a9a51070f8651befeb4d22be344b544e119db34
 DIST antlr-3.2.jar 1928009 BLAKE2B 9c56b0142abdb7d0caabebbae12618a665f91001e2f472519549a65b8601b81fcca485898c7420087a7b631351eb26e4b98589d7284960efcc3c65155919fd2a SHA512 25a61404c4b41e48eeaed49d41122f9400092248a10eb776d75ce3513295870eca1acc4b06c74925284a27cc64ca0506e34de39fb91996f09727cc5cc72dd9a6
 DIST antlr-3.2.tar.gz 837320 BLAKE2B 3addcfed45e67a7f8f3841a890be418626d93229dc326fe4670c6b145a457203a26f01723695573692c65bb6c376349a8d8cd852b339b1f6da7b71a52e14bb4f SHA512 8984221cd89253c033a4596dd56cd51b297393a53b4682f5ab401172745d343371bf0d45417fa286ce972add1b4e474f1f3091fa1345158dbfc040702d61607c
 DIST antlr-3.5.2.tar.gz 6927126 BLAKE2B 1907229549434dfea6ef1fa915137a2f733bd61f0a40aacb131689df619d1c92e125453ec3d1febc5d92da1841ffbde060af196cff1ca8fb6f4684600375e161 SHA512 e2a0520093fb2a77dcd9d44f26a9fdd612dceaffb398c53b2b8cd29f4630830647ede29e8dd55b434cb2c165b0fd1d77968ec6e6de0798f14d9cdfd9e6fccd99
+DIST antlr-3.5.3.tar.gz 6752328 BLAKE2B 8ebd098c9475122cddcadd5991b9f882b7fda5868ad979b29c9f4dab97e39cd31e7fc943476c3a854f3e3aee9c1c56384b7fcc893f87548482af5d5d0839fd30 SHA512 c565e1ade7a62bb127df707015afded9a9cea54cbf5488730a327671c57e8718f93f76c4fa28edd856810cb9c7ccbcb27b53a7c8f7e3efc8169e64cfcc535a4c
 DIST antlr-4.9.3.tar.gz 4640242 BLAKE2B fb58f5e533051cb2c439c32f0462c1d463c99df862ba7e1a37a1c61378ab36a9edb9525c2a342de5b517da6f02d8291de5976c550932314f3464aad1a778afb9 SHA512 61452404c9639b5a0908cda16605f17c0fed0c9adfc3278c7408f9971420e9d1fe8f9e974e0826c2e3e780fdd83324094c0246cd5b28fa63f5686b094ea08127

diff --git a/dev-java/antlr/antlr-3.5.3.ebuild b/dev-java/antlr/antlr-3.5.3.ebuild
new file mode 100644
index 000000000000..41ea8dc96c2b
--- /dev/null
+++ b/dev-java/antlr/antlr-3.5.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2
+
+DESCRIPTION="A parser generator for many languages"
+HOMEPAGE="https://www.antlr3.org/"
+# Reuse tarball for DOCS
+SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="3.5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="
+	~dev-java/antlr-runtime-${PV}:${SLOT}
+	~dev-java/antlr-tool-${PV}:${SLOT}
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+S="${WORKDIR}/${PN}3-${PV}"
+
+DOCS=( contributors.txt README.txt )
+
+src_compile() {
+	:
+}
+
+src_install() {
+	java-pkg_regjar "$(java-pkg_getjar "antlr-runtime-${SLOT}" antlr-runtime.jar)"
+	java-pkg_regjar "$(java-pkg_getjar "antlr-tool-${SLOT}" antlr-tool.jar)"
+
+	java-pkg_dolauncher "${PN}${SLOT}" --main org.antlr.Tool
+	einstalldocs # https://bugs.gentoo.org/789582
+}
+
+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
+	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}."
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Agostino Sarubbo]

commit:     aec11a09f79b721b16672593679ea84d823ce1b0
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed May 11 14:50:27 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed May 11 14:50:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aec11a09

dev-java/antlr: amd64 stable wrt bug #843767

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-java/antlr/antlr-3.5.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/antlr/antlr-3.5.3.ebuild b/dev-java/antlr/antlr-3.5.3.ebuild
index 41ea8dc96c2b..9ba4854d9d32 100644
--- a/dev-java/antlr/antlr-3.5.3.ebuild
+++ b/dev-java/antlr/antlr-3.5.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="3.5"
-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"
 
 CP_DEPEND="
 	~dev-java/antlr-runtime-${PV}:${SLOT}

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Jakov Smolić]

commit:     f2c5f3ef6ec4a31f7ebe4c34c5f459389d9d8b33
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu May 12 08:24:17 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu May 12 08:24:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2c5f3ef

dev-java/antlr: Stabilize 3.5.3 arm64, #843767

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-java/antlr/antlr-3.5.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/antlr/antlr-3.5.3.ebuild b/dev-java/antlr/antlr-3.5.3.ebuild
index 9ba4854d9d32..1cd84839a55e 100644
--- a/dev-java/antlr/antlr-3.5.3.ebuild
+++ b/dev-java/antlr/antlr-3.5.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="3.5"
-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"
 
 CP_DEPEND="
 	~dev-java/antlr-runtime-${PV}:${SLOT}

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Jakov Smolić]

commit:     b6a0d1bc1b6b1bd916c2644c3db700851cd96c75
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu May 12 08:24:25 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu May 12 08:24:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6a0d1bc

dev-java/antlr: Stabilize 3.5.3 ppc64, #843767

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-java/antlr/antlr-3.5.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/antlr/antlr-3.5.3.ebuild b/dev-java/antlr/antlr-3.5.3.ebuild
index 1cd84839a55e..541574a8f149 100644
--- a/dev-java/antlr/antlr-3.5.3.ebuild
+++ b/dev-java/antlr/antlr-3.5.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="3.5"
-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"
 
 CP_DEPEND="
 	~dev-java/antlr-runtime-${PV}:${SLOT}

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Jakov Smolić]

commit:     ac6317d020035cffd8ce8a3e58b3b24e415d1480
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Fri May 13 14:15:02 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Fri May 13 14:15:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac6317d0

dev-java/antlr: Stabilize 3.5.3 x86, #843767

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-java/antlr/antlr-3.5.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/antlr/antlr-3.5.3.ebuild b/dev-java/antlr/antlr-3.5.3.ebuild
index 541574a8f149..7751c1fad885 100644
--- a/dev-java/antlr/antlr-3.5.3.ebuild
+++ b/dev-java/antlr/antlr-3.5.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="3.5"
-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"
 
 CP_DEPEND="
 	~dev-java/antlr-runtime-${PV}:${SLOT}

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Miroslav Šulc]

commit:     ca3f195c34205742e25d3a20c4813e7aedfd7e0d
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri May 13 17:08:23 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri May 13 17:08:23 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca3f195c

dev-java/antlr: removed obsolete 3.5.2-r2

Bug: https://bugs.gentoo.org/843767
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/antlr/Manifest              |  1 -
 dev-java/antlr/antlr-3.5.2-r2.ebuild | 63 ------------------------------------
 2 files changed, 64 deletions(-)

diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index 49def7a90a7c..1033fe86e07b 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -1,6 +1,5 @@
 DIST antlr-2.7.7.tar.gz 1816180 BLAKE2B 3a9a51070f8651befeb4d22be344b544e119db34a78522828c2ffc3c481c14b9c7784f0a9997a61f6faedde5b6d1fe12214cfd84fb274f7065f3ffe6a44abf1c SHA512 faa72d2ddcba434ef1233e70c1549e63eba67c00793966322e821cf7f015cccb804448cb92d8fbef0429f59928fad65ec954f8ffbda0acbb8e983de0806d349d
 DIST antlr-3.2.jar 1928009 BLAKE2B 9c56b0142abdb7d0caabebbae12618a665f91001e2f472519549a65b8601b81fcca485898c7420087a7b631351eb26e4b98589d7284960efcc3c65155919fd2a SHA512 25a61404c4b41e48eeaed49d41122f9400092248a10eb776d75ce3513295870eca1acc4b06c74925284a27cc64ca0506e34de39fb91996f09727cc5cc72dd9a6
 DIST antlr-3.2.tar.gz 837320 BLAKE2B 3addcfed45e67a7f8f3841a890be418626d93229dc326fe4670c6b145a457203a26f01723695573692c65bb6c376349a8d8cd852b339b1f6da7b71a52e14bb4f SHA512 8984221cd89253c033a4596dd56cd51b297393a53b4682f5ab401172745d343371bf0d45417fa286ce972add1b4e474f1f3091fa1345158dbfc040702d61607c
-DIST antlr-3.5.2.tar.gz 6927126 BLAKE2B 1907229549434dfea6ef1fa915137a2f733bd61f0a40aacb131689df619d1c92e125453ec3d1febc5d92da1841ffbde060af196cff1ca8fb6f4684600375e161 SHA512 e2a0520093fb2a77dcd9d44f26a9fdd612dceaffb398c53b2b8cd29f4630830647ede29e8dd55b434cb2c165b0fd1d77968ec6e6de0798f14d9cdfd9e6fccd99
 DIST antlr-3.5.3.tar.gz 6752328 BLAKE2B 8ebd098c9475122cddcadd5991b9f882b7fda5868ad979b29c9f4dab97e39cd31e7fc943476c3a854f3e3aee9c1c56384b7fcc893f87548482af5d5d0839fd30 SHA512 c565e1ade7a62bb127df707015afded9a9cea54cbf5488730a327671c57e8718f93f76c4fa28edd856810cb9c7ccbcb27b53a7c8f7e3efc8169e64cfcc535a4c
 DIST antlr-4.9.3.tar.gz 4640242 BLAKE2B fb58f5e533051cb2c439c32f0462c1d463c99df862ba7e1a37a1c61378ab36a9edb9525c2a342de5b517da6f02d8291de5976c550932314f3464aad1a778afb9 SHA512 61452404c9639b5a0908cda16605f17c0fed0c9adfc3278c7408f9971420e9d1fe8f9e974e0826c2e3e780fdd83324094c0246cd5b28fa63f5686b094ea08127

diff --git a/dev-java/antlr/antlr-3.5.2-r2.ebuild b/dev-java/antlr/antlr-3.5.2-r2.ebuild
deleted file mode 100644
index 3dc31c7456f2..000000000000
--- a/dev-java/antlr/antlr-3.5.2-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-pkg-2
-
-DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="https://www.antlr3.org/"
-# Reuse tarball for DOCS files
-SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3.5"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-CP_DEPEND="
-	~dev-java/antlr-runtime-${PV}:${SLOT}
-	~dev-java/antlr-tool-${PV}:${SLOT}
-"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}
-"
-
-S="${WORKDIR}/${PN}3-${PV}"
-
-DOCS=( contributors.txt README.txt )
-
-src_compile() {
-	:
-}
-
-src_install() {
-	java-pkg_regjar "$(java-pkg_getjar antlr-runtime-3.5 antlr-runtime.jar)"
-	java-pkg_regjar "$(java-pkg_getjar antlr-tool-3.5 antlr-tool.jar)"
-
-	java-pkg_dolauncher ${PN}${SLOT} --main org.antlr.Tool
-	einstalldocs # https://bugs.gentoo.org/789582
-}
-
-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
-	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}."
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/antlr/

[Miroslav Šulc]

commit:     6c03ff491e8bc52f74321b04cfc6947bd01b9463
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri Mar 29 08:47:17 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> 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 <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> 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