gentoo resync : 12.05.2022

3 files changed, 2 insertions, 102 deletions

diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
index 700deba5a560..7e63692cfebd 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -1,10 +1,7 @@
 AUX stringtemplate-4.3.1-BaseTest-javac-source-target.patch 1318 BLAKE2B 6b93c9591b220584c8dca11a10c7012801f54d922a2dc938ce87cb7c996b0eec1124fb5ec57725a71c482c18922f8bae585f7aacc5609ac9e40715553f96d8e8 SHA512 618b10a46373cc0be12e3bbc6cf4d2177b300b52e65385d1babd1af67236f080a848ab61271c84102a305552de48071945e5f66c40aa084bf4aa8705ed92a267
-DIST ST4-4.3.1-sources.jar 198002 BLAKE2B d1bd78dac71800e342291920ba78ab39c9a43b1f3866e2afcb0e1d61d439592663a625efe2a5a215c6032469e7ebeeebb31267e1681536ca0cc524cc58781a3d SHA512 bd06940b629ab0378afd6342b6f5beef002023387843cefd866ebe6ae8e94996edc3f21a0c70ed3570d3fcb7194bf354d0e42d4eff32522b3c01c51369867be0
 DIST ST4-4.3.2-sources.jar 198754 BLAKE2B 667953642ed2721d1a7c7e94d90a1f8690cfa9c31c391e9b5089f04c64728dac75edc9cd0e529607cad4c1b07abaf45719c2cbab9e962a5feef657b59c3baccc SHA512 7de339d34adf6b9207a23e8936092ea4fde78bf1faa63cee869673e91ba73d0fcbaa555602d0905c7347e894985613c63ff4ce04825decc34c896da5a687d42f
 DIST stringtemplate-3.2.1.tar.gz 107877 BLAKE2B e099aaef047de12706ca4c771f28742dc48ec14a577b2384b32850e304b29284436b3c850846136cbd37481ff48cfb2fd5935d2de3aafa5c817ae24f62579435 SHA512 76203182302d42a0f79de7e8a22f44c59ddc5604761034e420b6973894e0ca1e6154cbcb322ec6f9a064ee89cc5f6478b775a716692c80c7f0c77566aa8a0e25
-DIST stringtemplate-4.3.1.tar.gz 432541 BLAKE2B c5b4124524e36a7104908dabf9ed258d2397095d8dc86eef401d0da1ac245629e88a1b2d0e35417ed7735ad6b8495fd2cc82970601a16ee856f5456fdc24b48f SHA512 afe62ca1cbc7572d05859c6fdaa1eb3221045da582bce5d88c328acae39128c904396f8ba1e10643a2757123297ba1924e046841cc8a667fbc724bdeca95680c
 DIST stringtemplate-4.3.2.tar.gz 437013 BLAKE2B 0fb0fd62314a1fa5045285966b28aaf8f18579261722c0383e4ec8b3198aff59fd0e9760dcd43d8ecddf795ce3b2a882f3f339ec56d117a4b5b22e9c2718d679 SHA512 d6150f86ce458b5c74d533016bc3168fad969fc1d814d01c5ad3be2f866f7aa531357a903565f31afa3ba62423acc760b7762865e0ee5dd3af4ea546f6be25e1
 EBUILD stringtemplate-3.2.1-r2.ebuild 1557 BLAKE2B 23393c4b73e75d1dd536957bceef00194eef22db42db38a6423f3fbc515e9bcd89a554d725735c94040c8abdae462e712ed92e2f58594338710c8790b8ef3c0c SHA512 244089013be014dbc4de338339ead998c9aa19464e651f7fcc02fa56410218e8289e1d91b5deb6b3905a11696b4ff6c44a0d19f783157b96acf8f3d85647a7d6
-EBUILD stringtemplate-4.3.1.ebuild 2946 BLAKE2B d6552374db1cea1a9bcf20e725f0ebb441579e0a7f56872fdecb2d6276203618bbdfed84ddc6680b7f464aeb3746e0fedae4597026ccb90a8808f662662d83c3 SHA512 17cb383f2e8e6111a82bf1d257136e789e7fafe1ffd88c50ca5065236a36a03001e3adaad600696766d34db5ac25fa16dcbec544dd6a933efa77950d24aacd64
-EBUILD stringtemplate-4.3.2.ebuild 3316 BLAKE2B 06dd4da8ed999fc0b5b45cdfa4bc20e8a761a3d8124af852d7e2da144c6e50f6c72248cb7283cbbe6878b35cfe8e2bed2d3d6a36f7e352b6495ce632c0c3389b SHA512 6de7c508469f70597611c196b70926a0d57a49dde870b8e769bf34fb24fc1fee706322f5b1c5b54f69dc75c367999abfc79cfb0ff8facf8b56d3cae1f0f3a987
+EBUILD stringtemplate-4.3.2.ebuild 3312 BLAKE2B 831ddaeb827e85e9749b13725bbdbc75f15a277b97ecd107839f988efa21becf70fc851ddb2b2e39f2478637798dc72c38495907565db908f91c06ce35f0d920 SHA512 32a4d5a7698c87d6e0e6a683b29ffc33500ee4f8d13543ad93f58e33853f58cfc9d963fdb8341371e31b64c858b958ac86db4e25281ccbdae740c2d8699f1f5e
 MISC metadata.xml 323 BLAKE2B 4b53767b7c81b78dfcfb69b4175baba46ee266cf145dff77dc855838f8b3209edf2fa1949b17aa88b284f0cc92d68250c0b64d4966253de734f1263d46b6b6be SHA512 9f7523f1186535db76c503816be7b41a6f58fb07469347d43acfbee68effdb5e748ebae3cc9cba2c9ac45b0c504b64eabd4947c48f040efa2d42f11328ae100c
diff --git a/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild b/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
deleted file mode 100644
index 96b458d2cc14..000000000000
--- a/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.antlr:ST4:4.3.1"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java template engine"
-HOMEPAGE="https://www.stringtemplate.org/"
-# Maven Central sources JAR for *.java sources pre-generated from *.g files;
-# the source generation requires antlr-tool-3.5, which depends on this package.
-# Tarball for the test suite and DOCS files
-SRC_URI="
-	https://repo1.maven.org/maven2/org/antlr/ST4/${PV}/ST4-${PV}-sources.jar
-	https://github.com/antlr/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="4"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-CP_DEPEND="
-	dev-java/antlr-runtime:3.5
-"
-
-BDEPEND="
-	app-arch/unzip
-"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
-	test? (
-		dev-java/antlr-tool:3.5
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}
-"
-
-S="${WORKDIR}"
-TARBALL_S="${S}/${PN}4-${PV}"
-
-JAVA_SRC_DIR="org"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,antlr-tool-3.5"
-JAVA_TEST_SRC_DIR="${TARBALL_S}/test"
-
-DOCS=( "${TARBALL_S}/"{CHANGES.txt,contributors.txt,README.md} )
-
-src_prepare() {
-	java-pkg_clean # Just in case Maven Central sources JAR contains binary
-	if use test; then
-		pushd "${TARBALL_S}" > /dev/null ||
-			die "Failed to enter directory storing tarball contents"
-		eapply "${FILESDIR}/${P}-BaseTest-javac-source-target.patch"
-		popd > /dev/null ||
-			die "Failed to leave directory storing tarball contents"
-	fi
-	java-pkg-2_src_prepare
-	# Some of these tests requires a graphical display.
-	rm -v "${JAVA_TEST_SRC_DIR}/org/stringtemplate/v4/test/TestEarlyEvaluation.java" || die
-}
-
-src_test() {
-	# Make sure no older versions of this slot are present in the classpath
-	# https://bugs.gentoo.org/834138#c4
-	local old_ver_cp="$(nonfatal java-pkg_getjars "${PN}-${SLOT}")"
-	local new_test_cp="$(\
-		java-pkg_getjars --with-dependencies "${JAVA_TEST_GENTOO_CLASSPATH}")"
-	new_test_cp="${new_test_cp//"${old_ver_cp}"/}"
-
-	# Some of the test cases require an absolute path to the JAR being tested
-	# against to be in the classpath, due to the fact that they call the 'java'
-	# command outside ${S} and reuse the classpath for the tests:
-	# https://github.com/antlr/stringtemplate4/blob/4.3.1/test/org/stringtemplate/v4/test/TestImports.java#L103
-	# https://github.com/antlr/stringtemplate4/blob/4.3.1/test/org/stringtemplate/v4/test/BaseTest.java#L174
-	new_test_cp="${S}/${JAVA_JAR_FILENAME}:${new_test_cp}"
-
-	# Use JAVA_GENTOO_CLASSPATH_EXTRA to set test classpath
-	local JAVA_TEST_GENTOO_CLASSPATH=""
-	[[ -n "${JAVA_GENTOO_CLASSPATH_EXTRA}" ]] &&
-		JAVA_GENTOO_CLASSPATH_EXTRA+=":"
-	JAVA_GENTOO_CLASSPATH_EXTRA+="${new_test_cp}"
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	einstalldocs # https://bugs.gentoo.org/789582
-}
diff --git a/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild b/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild
index 1d0130c2b54f..760604d57456 100644
--- a/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.3.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 CP_DEPEND="
 	dev-java/antlr-runtime:3.5