gentoo resync : 29.12.2022

3 files changed, 2 insertions, 67 deletions

diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index c6db48e4e6c2..81767619e381 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -3,12 +3,10 @@ AUX 3.2-test-fixes.patch 10294 BLAKE2B e2bed0bc4acd8c7de9eacfa6755f81db2cab78fb2
 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
 EBUILD antlr-2.7.7-r9.ebuild 1151 BLAKE2B c5e4df7a9ddc43f3e1b490dbc9e05d252cfef1350a96ef9d4f8cf01dff06953e949a192d5bd36ba80d0315f33e32d91cab07176a4f0d5e7f368088342751891d SHA512 faf7da062bfbd5558d29d9d4fa2036f1cba91d4921e2b83ea3bf30f966a41536de0d657ef14ec19e45c8ed460e28778bc90e55edc4940b3331eac5ea2e3d4056
 EBUILD antlr-3.2-r1.ebuild 3249 BLAKE2B d0c72e2b8052f426e5c001f2860d7af1ca1c1bc213451507fbab4ea6570e3045e1c55307dc1b1dd0820d97d16347ae794d93b64e1b9049976c3b02f56b2ff29d SHA512 5f21e8ab24d2040299e7638d74a2f764a165c31c36128c07414960c317d1895804bc79dffe2c6ea760b21cd1e4a27aa01a8ebb44c4ef21dfae42edc51e4a6080
-EBUILD antlr-3.5.2-r2.ebuild 1604 BLAKE2B 8e9c84841818f52589ca22790f7e61c5c8b78b018e1f78dfa45b0bc3245f3c1a10a48f5fa96f1a45c6b5a2d1640ebe24683bd41d705f18e9ddab41a0ee0da5bc SHA512 46ff86ab7b47a783b8080ab7957fda04d8765da069d2e5daed6e9a39b921ed9bc56c21b32807b29ebdb3240282515e355a8ec3ec5d0e15a1ca5fbe997c9a7199
-EBUILD antlr-3.5.3.ebuild 1613 BLAKE2B 8f4f55c7946a48127ce629e7aaec265cde92ed0174aa569403821bce0cc230dff5da4fa13167d24b42086256c4dcacdd0842a173dd9118b5924c0b36a401dea1 SHA512 31a22d538a8e5b900c51c26220afa43398acc962ccdcd2ca1aa2b3c3b71ba369e1968cbc830948e495932c73d2d7d36d4d0da2e143846fec57a86416eb812ae1
+EBUILD antlr-3.5.3.ebuild 1612 BLAKE2B 88db289b80bbdd3c8262995a01bc26124f97b37210dffbf63936968e3c530e5f263fd6d6d8c7d12250b8fe416466b307d3cf5769abf8612a1ef9b50b1f9e78a3 SHA512 7bb06cdf7d8647b41ce6e4e617fd2e8ece1a783832a4e10958fd591c3b111ebcefbcebed2f10ce97d68ccbe9ae7ee0838f20131f6e3b4b6c306689b3b0b0d321
 EBUILD antlr-4.9.3.ebuild 1640 BLAKE2B 408eb5fda7d1598621e34462f177fd641ad36d8e7906e508227377eeea2dd7e55ad3cb71af2a603de6a38cb0da85065ee7b71db42af4309c3ee251e10f5c4bd0 SHA512 485130449328d364975926fc0374e0ed9e12ca2c7d619c9d1af0daaa3dd5879a491bb953d41ffe84ef653702863f7da950b38766414ce9e1823fa1c909ce3174
 MISC metadata.xml 314 BLAKE2B 997f9c85d72f9b4cae21a3ecd063374f769f369d66ce8531fb158a17b9408ae3d35f117386acd08b89c16d5e0e8130b26ddada87b448529bf41a02deb5c1cdf2 SHA512 ad99513f6581ce95415e908eeba185cd4b6d03a8297e99735c7e79bf3dca1fa0c61a7ae03e47d8ba7429269a29558fae7321583b4f7d328e1da6a091237d9fde
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}."
-}
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}