gentoo resync : 20.06.2021

4 files changed, 9 insertions, 52 deletions

diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index 0833c8818940..15de79a6518a 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -10,10 +10,9 @@ 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
-EBUILD antlr-2.7.7-r7.ebuild 1076 BLAKE2B 49124667f298ebfad5989d19972baed8e3f66c0cdb6ff4027d4c0b1692430debbe2844d87fcfd04d885b728aeaa38554337bff7a1ec227151f43fccdb0559653 SHA512 b9fe195653c78a3bd7ae0ffcee143ccd8bfb770567fb83fe9ff9e7e2201c0ae4683520addaeddd759e0f82fcfb034788c1e933776b3d87e0206eb05cc5f60b08
-EBUILD antlr-2.7.7-r9.ebuild 1155 BLAKE2B c7b2ba6a11db4ed11ca61e716a800dcc7d285b2d021a22f638e007967a0bd95ebd91aa6464606b320e72f8dcf90b29ab54e1b266c478876b2b2028b3a301cf4e SHA512 cfcf41dd63df29abdde02f7333baa1982f875577ee2f32df5d7e8ac72c74f74d43e6a933c92ff6489a3008d793af7c210eac8767bb9f6a6a3b8c02bb8eabd250
+EBUILD antlr-2.7.7-r9.ebuild 1152 BLAKE2B 46708d1153f7d4bfc9a58f5e7f19b3c4129c23c8c0e038882f83c6da05d452fae2ce8ec5cd4c5f8f13d2c8893471ba6eeb9aa925f677d07b2d5582f47d604c13 SHA512 e484d133f9560694a030682a5a013e14ff58fe736d66975f65dbba7c6180b03c395d65bfb27fdf5a774679542d098886e3deb6357a047e350bc0e763b0213485
 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
+EBUILD antlr-4.5.3-r1.ebuild 2522 BLAKE2B 57b57fb24b9066d3491036acc4ad8e95ff456866a51882f1de869b5b01a8a027521bd91194d458d3658593be3a8ae41e41839dcc27bfa69c5b828b39ea7985f9 SHA512 2be264b788fde22e8225d8b4b2979820bc9cfbebf59f874a2cb8f847a76d5ece8d699311794dd1e01fe17e262d16f02589d2730130fed1a64a13563c6f470c0b
 MISC metadata.xml 313 BLAKE2B 211bde607161c54e23a30950b17cda11291e84a9f745a2c44c17c7c224ad8ef309786ec4952f094e90cc569d86e0186bd2fa426fc1de6718541e207be12c3fd0 SHA512 01f11b9e45bc3c331d445213704287f1f034087930d4b55cbde700a483dcb64260d4805a4c2ec3686a99b59f3225999409d499cb63a40b3d8278d8a2e6213f57
diff --git a/dev-java/antlr/antlr-2.7.7-r7.ebuild b/dev-java/antlr/antlr-2.7.7-r7.ebuild
deleted file mode 100644
index dfa69c648825..000000000000
--- a/dev-java/antlr/antlr-2.7.7-r7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="https://www.antlr2.org/"
-SRC_URI="https://www.antlr2.org/download/${P}.tar.gz"
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples source"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
-	source? ( app-arch/zip )"
-
-S="${WORKDIR}/${P}"
-JAVA_SRC_DIR="${S}/${PN}"
-
-java_prepare() {
-	java-pkg_clean
-
-	# Delete build files from examples.
-	find examples \( -name Makefile.in -o -name shiplist \) -delete || die
-}
-
-src_configure() {
-	: # Avoid configure script.
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dolauncher antlr --main antlr.Tool
-	dodoc {CHANGES,README}.txt
-
-	use doc && java-pkg_dohtml -r doc/*
-	use examples && java-pkg_doexamples examples/java
-	use source && java-pkg_dosrc antlr
-}
diff --git a/dev-java/antlr/antlr-2.7.7-r9.ebuild b/dev-java/antlr/antlr-2.7.7-r9.ebuild
index 5b7e3a5f797a..ed770ed14cf8 100644
--- a/dev-java/antlr/antlr-2.7.7-r9.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.antlr2.org/download/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/antlr/antlr-4.5.3.ebuild b/dev-java/antlr/antlr-4.5.3-r1.ebuild
index 3cd757f2a8eb..3c70f1210ae3 100644
--- a/dev-java/antlr/antlr-4.5.3.ebuild
+++ b/dev-java/antlr/antlr-4.5.3-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 JAVA_PKG_IUSE="source"
 MAVEN_ID="org.antlr:antlr4:4.5.3"
@@ -12,6 +12,7 @@ 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"
@@ -23,10 +24,10 @@ CDEPEND="dev-java/antlr:3.5
 	dev-java/treelayout:0"
 
 RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
+	>=virtual/jre-1.8:*"
 
 DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
+	>=virtual/jdk-1.8:*
 	test? (
 		dev-java/hamcrest-core:1.3
 		dev-java/junit:4
@@ -39,7 +40,8 @@ src_unpack() {
 	unpack ${P}.tar.gz
 }
 
-java_prepare() {
+src_prepare() {
+	default
 	java-pkg_clean
 }