gentoo resync : 22.05.2021

4 files changed, 32 insertions, 25 deletions

diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index 04140315f67e..271f24335c11 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -1,5 +1,5 @@
 AUX 3.2-java-8.patch 1318 BLAKE2B f7cf19e6da346c50ed066782905fffeac9b9f42c9988bc3ba0d18bc434fecfaa6d4ad3e74d2c84c87854716435be4a596c47b919ce42b310e48dc70d184bc7f5 SHA512 70c9dc23ec64ba75bfcfc0597544b13c2c35c523c6f2c9d82dbc54a44c30a5432a56b6193db74ca9c3d92235bdadc5427857c364abc4df79ffdc1d2b55221d32
-AUX 3.2-test-fixes.patch 10278 BLAKE2B 868e9dc24f26b9933fe169f93b9156b3965473da7e636058ac630455b4f9347f465f86151681ee9734bcf1e435345abb033fbfb7cfbd845d6d41b423ae6478e0 SHA512 b593da8fb05d8ac51b0fd72172b740aeae060bd18c58413c67ff0c5242609b419d4a1b0a4f5ae66d5a3b2103007d4511ece41da6b09dab5f12ffd5f905d45d31
+AUX 3.2-test-fixes.patch 10294 BLAKE2B e2bed0bc4acd8c7de9eacfa6755f81db2cab78fb20518a51051d5a38fb33e25442e5e39ced3a94b525f3dcb5d0bad4c640c3df9da5b431efdf6d76764b11c5bd SHA512 0af15f7e315182f54c65ebcd298ebc02d6715f2233996d0effe7f44eb433e73ed7a33ee12e96d29f72b4437cead864c99150fee60c3c1740b6451619396be72b
 AUX 3.5.2-test-fixes.patch 2093 BLAKE2B 4016d770a226f1fb86f7f6e630df38c0d2ed0b4a025991f6b88e88506d2a44838c17097fc4ad5f63e506a839ebce0fcfa8e57f22415f777b0bd4c37afc93a0b1 SHA512 dcdde9daabfb3379f85d831a594259b21e1cc0283f7f0972d42801cb144d6932fe5cccff576cc885614db3f9e07b98782c4932a03687658df35f698455588533
 DIST antlr-2.7.7.tar.gz 1816180 BLAKE2B 3a9a51070f8651befeb4d22be344b544e119db34a78522828c2ffc3c481c14b9c7784f0a9997a61f6faedde5b6d1fe12214cfd84fb274f7065f3ffe6a44abf1c SHA512 faa72d2ddcba434ef1233e70c1549e63eba67c00793966322e821cf7f015cccb804448cb92d8fbef0429f59928fad65ec954f8ffbda0acbb8e983de0806d349d
 DIST antlr-3.2.jar 1928009 BLAKE2B 9c56b0142abdb7d0caabebbae12618a665f91001e2f472519549a65b8601b81fcca485898c7420087a7b631351eb26e4b98589d7284960efcc3c65155919fd2a SHA512 25a61404c4b41e48eeaed49d41122f9400092248a10eb776d75ce3513295870eca1acc4b06c74925284a27cc64ca0506e34de39fb91996f09727cc5cc72dd9a6
@@ -11,8 +11,8 @@ DIST antlr-4.5.1.tar.gz 6158475 BLAKE2B 17cf84a60393c786d8b8addd93b87998178cea55
 DIST antlr-4.5.3-complete.jar 1485121 BLAKE2B 84d41b17bd30dfad7a79e9759802c76d986299cc592c7b2c859225ed00989bb2709b14635ee40c8ecfe79e2441ecb697b2d17b7e6e789a7549868b93a3876f77 SHA512 53dcadf3007c9bdbeb391ea72fb9bab7c086fa0b9d1d93b83050b2ebb726c2f52743b5ba944c68f6da513d915ab5e8721676d74d823c32484928ccad2a28f1e4
 DIST antlr-4.5.3.tar.gz 6760401 BLAKE2B d436b4a964c527e230912a0ba23146af199478570cf5491eadeb5025e814642658cc71d71e6a09b5df3cc18e9b8991abf930cab70677d117a112e0922e046e07 SHA512 d0e61baebb338e5e4e8eaf87aa6ef52a568ec51bc86bc07acf8f82be0c173ea4f0f85978dfd034c2642505888c0849663f6b6fb030c4c19e0571f29277fb54f7
 EBUILD antlr-2.7.7-r7.ebuild 1076 BLAKE2B 49124667f298ebfad5989d19972baed8e3f66c0cdb6ff4027d4c0b1692430debbe2844d87fcfd04d885b728aeaa38554337bff7a1ec227151f43fccdb0559653 SHA512 b9fe195653c78a3bd7ae0ffcee143ccd8bfb770567fb83fe9ff9e7e2201c0ae4683520addaeddd759e0f82fcfb034788c1e933776b3d87e0206eb05cc5f60b08
-EBUILD antlr-2.7.7-r8.ebuild 1087 BLAKE2B c6bdc1f7d552392aa67ef176906a1166015198d5fd2ae67c1c323d664f3313d7333e8669a2b5f354953b7618045a1bd6d9a5dc733c393dcba00732b5745c6852 SHA512 01d07904b06d66fe88467846734466ff8510c0e3c6bec84d03f52ce9db38bbc2e761157ccb5480a59647da4605b6093673c0d71ce0d9290fc545a2251db37b5f
-EBUILD antlr-3.2.ebuild 3258 BLAKE2B d5421808caca91f7b1d15a304c0f37fa6a4216920cf0aef7c66df36a5b622144f23db838cdd7b248037bd45864847368d2b921157fe340b571237df4805b0011 SHA512 63234889e423852a17067dcf253ba63f70443de7e0df4be6dddc423f5035aa582796ecd32906ef4e9421bebfa6c0b419bcfcbe125643715eaf3004f25066f7d0
+EBUILD antlr-2.7.7-r9.ebuild 1126 BLAKE2B d39a0e5d9d46d345dd23ce49cf44c1f40bb1a8c2929dfe98acb0265fb24c06466ead638cfc004999bd60b4a163439846a589062dcc2d1a829b8b7b14ac82c09e SHA512 6af7b69db4a2eab58bdc2ec16872b67e76027c40bfb8d13426c2036d4a788ebc3ce0599dd2bc84f12535325a9c0c68f4ab606dc8a5b2c0412ec3f5f8f78d1f24
+EBUILD antlr-3.2-r1.ebuild 3250 BLAKE2B c167679ccfd464a16bc0bdb59dc41ed59df58861bc2b38acbd042d9237d3ba6ca7d5b593d2edd4f9d9d61bace967490ddb7bea8d8b9f44a0243448f97b613dec SHA512 1df42dea6115d437fd875eb04571f3dad91ca95ce1299b20181faecad2a56277497093068d51c0fa537ac85f3c051524b9e2ffeeb911de5c104ba4f410e46195
 EBUILD antlr-3.5.2-r1.ebuild 3022 BLAKE2B 6f3a8b1716d3206391d5f657f732ee1ffe9a02075560afb39ba33b452b03f70b75d953ead0b09a8fd0e96262ef470a39cdb9f852be2e31cfede284d2982d3b0d SHA512 9f19d2fa54a8cfcd0c3d7bc8d6fb0d23886435e0ca6b78da5db97a84598224d9e1a5b68db2d4a4521a3afa60f1e4faa15085d17507e87abe3cfff17417302f74
 EBUILD antlr-4.5.1.ebuild 2467 BLAKE2B 176f21576d433466f221190f71bb27a7600904efef43d182a025698e30420345b244f5c2e353d49fb25937bceca683aa30e18d5ee3b0b44c5f89baf1e8bc742c SHA512 74174f4ee6fe803c4e243be51562339e530934a6aed38a8024ed687fbc888b2f01c942558e8de90d42f28a5ae0801d95b148497310304466686c087cd4eb8d7a
 EBUILD antlr-4.5.3.ebuild 2511 BLAKE2B d1e36cee6e8d101a265a337071c19020528f42a70976b554f2eecf8ec7200ab020e2d971fcc2f0bdcba0be0b4d96f738face2492df498ddf6012aec56a2f4c69 SHA512 ce63e0a89420501f9a7580c409fd30d5714d49ab18cc5f04ecbdba569f9b73307878f3617151146b0c099584eb142166c485dfb4ba24980c78a6ed453a6e4d19
diff --git a/dev-java/antlr/antlr-2.7.7-r8.ebuild b/dev-java/antlr/antlr-2.7.7-r9.ebuild
index 3ca31ab70cf0..f7a428518635 100644
--- a/dev-java/antlr/antlr-2.7.7-r8.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r9.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
 
@@ -10,13 +10,14 @@ 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"
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
 
 S="${WORKDIR}/${P}"
 
@@ -43,5 +44,6 @@ src_install() {
 	use examples && java-pkg_doexamples examples/java
 	use source && java-pkg_dosrc antlr
 
+	# https://bugs.gentoo.org/789582
 	einstalldocs
 }
diff --git a/dev-java/antlr/antlr-3.2.ebuild b/dev-java/antlr/antlr-3.2-r1.ebuild
index 3efa97660287..fba666dc5ad6 100644
--- a/dev-java/antlr/antlr-3.2.ebuild
+++ b/dev-java/antlr/antlr-3.2-r1.ebuild
@@ -1,30 +1,38 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit epatch java-pkg-2 java-pkg-simple
+JAVA_PKG_IUSE="doc test"
+
+inherit 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"
+	>=virtual/jre-1.8:*"
 
 DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
+	>=virtual/jdk-1.8:*
 	test? ( dev-java/junit:4 )"
 
+PATCHES=(
+	# These fixes have been applied in 3.5.
+	"${FILESDIR}/${PV}-test-fixes.patch"
+	"${FILESDIR}/${PV}-java-8.patch"
+)
+
 S="${WORKDIR}/${P}"
 JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-runtime.jar"
 JAVA_GENTOO_CLASSPATH="antlr,stringtemplate"
@@ -33,13 +41,10 @@ src_unpack() {
 	unpack ${P}.tar.gz
 }
 
-java_prepare() {
+src_prepare() {
+	default
 	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
@@ -54,7 +59,7 @@ java_prepare() {
 
 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
+	JAVA_JAR_FILENAME="${S}/${PN}-runtime.jar" java-pkg-simple_src_compile
 
 	cd "${S}/tool/src/main" || die
 
diff --git a/dev-java/antlr/files/3.2-test-fixes.patch b/dev-java/antlr/files/3.2-test-fixes.patch
index 0544b7006170..28068edb76ba 100644
--- a/dev-java/antlr/files/3.2-test-fixes.patch
+++ b/dev-java/antlr/files/3.2-test-fixes.patch
@@ -1,5 +1,5 @@
---- tool/src/test/java/org/antlr/test/BaseTest.java.orig	2010-11-30 01:54:04.000000000 +0000
-+++ tool/src/test/java/org/antlr/test/BaseTest.java	2015-09-24 22:25:36.872191194 +0100
+--- a/tool/src/test/java/org/antlr/test/BaseTest.java.orig	2010-11-30 01:54:04.000000000 +0000
++++ b/tool/src/test/java/org/antlr/test/BaseTest.java	2015-09-24 22:25:36.872191194 +0100
 @@ -130,8 +130,8 @@
  		try {
  			Process process =
@@ -43,8 +43,8 @@
  					buf.append(line);
  					buf.append('\n');
  					line = in.readLine();
---- tool/src/test/java/org/antlr/test/TestTopologicalSort.java.orig	2009-09-23 19:36:14.000000000 +0100
-+++ tool/src/test/java/org/antlr/test/TestTopologicalSort.java	2010-11-30 01:54:04.000000000 +0000
+--- a/tool/src/test/java/org/antlr/test/TestTopologicalSort.java.orig	2009-09-23 19:36:14.000000000 +0100
++++ b/tool/src/test/java/org/antlr/test/TestTopologicalSort.java	2010-11-30 01:54:04.000000000 +0000
 @@ -49,7 +49,7 @@
          g.addEdge("F", "H");
          g.addEdge("E", "F");
@@ -72,8 +72,8 @@
          List nodes = g.sort();
          String result = nodes.toString();
          assertEquals(expecting, result);
---- tool/src/test/java/org/antlr/test/TestSemanticPredicates.java.orig	2009-09-23 19:36:12.000000000 +0100
-+++ tool/src/test/java/org/antlr/test/TestSemanticPredicates.java	2015-12-05 13:52:05.923411552 +0000
+--- a/tool/src/test/java/org/antlr/test/TestSemanticPredicates.java.orig	2009-09-23 19:36:12.000000000 +0100
++++ b/tool/src/test/java/org/antlr/test/TestSemanticPredicates.java	2015-12-05 13:52:05.923411552 +0000
 @@ -731,19 +731,23 @@
  			"c : a\n" +
  			"  | b\n" +
@@ -111,8 +111,8 @@
  	}
  
      @Test
---- tool/src/test/java/org/antlr/test/TestAttributes.java.orig	2015-12-05 13:55:55.392843185 +0000
-+++ tool/src/test/java/org/antlr/test/TestAttributes.java	2015-12-05 14:04:38.120599871 +0000
+--- a/tool/src/test/java/org/antlr/test/TestAttributes.java.orig	2015-12-05 13:55:55.392843185 +0000
++++ b/tool/src/test/java/org/antlr/test/TestAttributes.java	2015-12-05 14:04:38.120599871 +0000
 @@ -439,20 +439,15 @@
  		ErrorManager.setErrorListener(equeue);
  		Grammar g = new Grammar(