gentoo resync : 29.12.2022

4 files changed, 2 insertions, 118 deletions

diff --git a/dev-java/antlr-tool/Manifest b/dev-java/antlr-tool/Manifest
index a61e400ea0e6..e5d4bc7d9427 100644
--- a/dev-java/antlr-tool/Manifest
+++ b/dev-java/antlr-tool/Manifest
@@ -1,12 +1,8 @@
-AUX 3.5.2-test-fixes.patch 2093 BLAKE2B 4016d770a226f1fb86f7f6e630df38c0d2ed0b4a025991f6b88e88506d2a44838c17097fc4ad5f63e506a839ebce0fcfa8e57f22415f777b0bd4c37afc93a0b1 SHA512 dcdde9daabfb3379f85d831a594259b21e1cc0283f7f0972d42801cb144d6932fe5cccff576cc885614db3f9e07b98782c4932a03687658df35f698455588533
 AUX 4.9.3-test-fixes.patch 1399 BLAKE2B 719571607153951b6a44a7bed7c405b6e217f7a458667388d89ca15683342a5d9849155ad03771eb0f7d326af31fd0cf6e0ab9ddfbd385e189b33f0c842ab53e SHA512 b0aed6d54873ffd841ae5ac6ce1afb5d037fdde6e322903e250e46b38b84fd29ca87668f8b1f38a5c6b0ec4ad99953021d4260b67515158accbc37fd325e98eb
-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
-DIST antlr-tool-3.5.2-sources.jar 957096 BLAKE2B 39b75824e129c8111f302eb71407a683c59e91e79a3fa13c5386c4ba4aa322e706deb10b36df3591ab0843faff5702091d543272ee85d63cd92cb36cc72e1ceb SHA512 50fece361b69299be0c0941e6fe2bfacfc39c0b3dad3320126a9a80cd0f053fbaa6332612e2bab2872db122025d6abfe4b35a4636ef1c101e9131bbd2cdf5e28
 DIST antlr-tool-3.5.3-sources.jar 949247 BLAKE2B f7afa52faae8324093206b7e56dfda58a79815cc2c13baca1cb93b3424c8b310325885ca8c86f0ca8a016a73e30740c2fa5f34ce71ed3a6cfc5fdeb6f2c4a9a7 SHA512 cfbc612c0257c4f0e09451cd76fe904680b6af132596696f2ef9c4e21dcfc53d53501e4d4d2b1c1cf4391355fa3766cf8dabc718dc3580728d24db3ebc14e696
 DIST antlr-tool-4.9.3-sources.jar 961749 BLAKE2B 294c7ba6dff9a1039d3e570d7d49f46a564302d1e7a25ac9f662a2c293cbabadd6a5a4a94d026c4e5fcca37c407e104956badbd1cbbf71b957e464dc67cf823e SHA512 7d70e80714b673eb8301def5e66a7133b2ac477e3cc219e37877ef9df673e0599a1148a8c1929ca8eab081d4e7375c9079241765a1f38832b21cfe8608ef4429
-EBUILD antlr-tool-3.5.2.ebuild 1979 BLAKE2B 8a50f774daf5cf0f89963b1ca66444dff7e5f23b087c9049d065cceedf4c64fca5a2ee7d2f8ad6fe24367b97f467808bef8123e0b579d2c3e9398a056fb4cf3b SHA512 4fba8468420a8bfaea0800d3269cbb7ffe75465571d6523b118d40088e43eb723f0af78ff1cdace480d9c57313528011d6518767004c123d4060522b03f05781
-EBUILD antlr-tool-3.5.3.ebuild 1931 BLAKE2B e8dd37f1fe914ac96c7204d597b26b7db00a1fa226586708fc6e9a7bc53294a567bccaaf84d6ea4a324ec438feee596f5e3977a3d537636a25b978bbe8bc68b1 SHA512 ecfd086168aba2362f8af0f7a388d6dd599a485c58852dd328c12892fa708bb82e54e56f47557bfed2553c57667df67cd42b0d5ba503d8bbfa4df62fa874989b
+EBUILD antlr-tool-3.5.3.ebuild 1930 BLAKE2B 93c9336366335265de79b8a9e98e0af6dfd095e4b868709c3f77121ad926c89802264c8be11aead224d726670b81dfad554f1563b8e121583202834c9beaca1d SHA512 d0b1b534c005d13c55eff047a9041268b80feee9b91dea3099d5335b1293bdecea4d33aa2ccbd42aa7367a22187c1ab0cf5bbb858c0f68ac13a2056b9526fc79
 EBUILD antlr-tool-4.9.3.ebuild 3751 BLAKE2B 148b08582d38087e00413bddb0ebaf47fa3dd9eef87bf8cae25cea455610f2016438afe5b59a49a479f82e6a8db446df1ceae5395e5b13c6e383501a1a62652b SHA512 ffbd7b9fe6bdd3e0c4be521f22131055e48f03550a1e8f2857b05fa6f5f669d74719e6f9eaf6ccdc2b39f223dbb4c11457bfc19273fe1d6c616ccaf8ad6f5ce2
 MISC metadata.xml 366 BLAKE2B 134ea633a45f3e33d57f4761afb1ff2d7f7778d06d66ff6e2e77a0c5777d48e8009697f64a4d50780b84b6672f352f4714a2b61d206cd158fcddd50902485caa SHA512 5b0bb774c494f1e7bbc486732abcea66922e65cd209df3d9fa090d71dabbc9aae59d437c340a5d78941d730388c95554fa80fb9852c8c0ceed05c9197d236301
diff --git a/dev-java/antlr-tool/antlr-tool-3.5.2.ebuild b/dev-java/antlr-tool/antlr-tool-3.5.2.ebuild
deleted file mode 100644
index b6a32d34d18f..000000000000
--- a/dev-java/antlr-tool/antlr-tool-3.5.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Artifact ID for antlr-tool is 'antlr'
-# https://github.com/antlr/antlr3/blob/3.5.2/tool/pom.xml#L4
-MAVEN_ID="org.antlr:antlr:3.5.2"
-
-JAVA_PKG_IUSE="doc source test"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="${PN%-tool}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="The ANTLR 3 tool"
-HOMEPAGE="https://www.antlr3.org/"
-# Maven Central sources JAR for *.java sources pre-generated from *.g files;
-# the source generation requires this package itself.
-# Tarball for resources, the test suite, and DOCS files
-SRC_URI="
-	https://repo1.maven.org/maven2/org/antlr/antlr/${PV}/${MY_P}-sources.jar -> ${P}-sources.jar
-	https://github.com/antlr/antlr3/archive/${PV}.tar.gz -> ${MY_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/stringtemplate:4
-"
-
-BDEPEND="
-	app-arch/unzip
-"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}
-"
-
-S="${WORKDIR}"
-TARBALL_S="${S}/${MY_PN}3-${PV}"
-
-JAVA_SRC_DIR="org"
-JAVA_RESOURCE_DIRS=( "${TARBALL_S}/tool/src/main/resources" )
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="${TARBALL_S}/tool/src/test/java"
-
-DOCS=( "${TARBALL_S}/tool/CHANGES.txt" )
-
-src_prepare() {
-	java-pkg_clean
-	eapply -p0 "${FILESDIR}/${PV}-test-fixes.patch"
-	java-pkg-2_src_prepare
-
-	# 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.
-	rm -v "${JAVA_TEST_SRC_DIR}/org/antlr/test/"Test{DFAConversion,SemanticPredicates,TopologicalSort}.java || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	einstalldocs # https://bugs.gentoo.org/789582
-}
diff --git a/dev-java/antlr-tool/antlr-tool-3.5.3.ebuild b/dev-java/antlr-tool/antlr-tool-3.5.3.ebuild
index 15acdcf47e32..8e2844054251 100644
--- a/dev-java/antlr-tool/antlr-tool-3.5.3.ebuild
+++ b/dev-java/antlr-tool/antlr-tool-3.5.3.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 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}
diff --git a/dev-java/antlr-tool/files/3.5.2-test-fixes.patch b/dev-java/antlr-tool/files/3.5.2-test-fixes.patch
deleted file mode 100644
index f2609ac1f0b5..000000000000
--- a/dev-java/antlr-tool/files/3.5.2-test-fixes.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestAttributes.java antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestAttributes.java
---- antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestAttributes.java	2014-03-25 11:47:54.000000000 +0000
-+++ antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestAttributes.java	2015-10-02 22:42:56.921263410 +0100
-@@ -2131,7 +2132,7 @@
- 		assertEquals(expecting, found);
- 	}
- 
--	@Test public void testRuleLabelOnTwoDifferentRulesTemplate() throws Exception {
-+	@org.junit.Ignore @Test public void testRuleLabelOnTwoDifferentRulesTemplate() throws Exception {
- 		String grammar =
- 			"grammar T;\n"+
- 				"options {output=template;}\n"+
-diff -Naur antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java
---- antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java	2014-03-25 11:47:54.000000000 +0000
-+++ antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java	2015-10-02 22:43:07.303105023 +0100
-@@ -339,7 +340,7 @@
- 		assertEquals("b:alt 2 a:alt 1\n", found);
- 	}
- 
--	@Test public void testSynPredWithOutputTemplate() throws Exception {
-+	@org.junit.Ignore @Test public void testSynPredWithOutputTemplate() throws Exception {
- 		// really just seeing if it will compile
- 		String grammar =
- 			"grammar T;\n" +
-diff -Naur antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestTreeParsing.java antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestTreeParsing.java
---- antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestTreeParsing.java	2014-03-25 11:47:54.000000000 +0000
-+++ antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestTreeParsing.java	2015-10-02 22:41:32.235554776 +0100
-@@ -141,7 +142,7 @@
- 		assertEquals("alt 1\n", found);
- 	}
- 
--	@Test public void testTemplateOutput() throws Exception {
-+	@org.junit.Ignore @Test public void testTemplateOutput() throws Exception {
- 		String grammar =
- 			"grammar T;\n" +
- 			"options {output=AST;}\n" +