Adding metadata

5 files changed, 25 insertions, 36 deletions

diff --git a/dev-java/jdepend/Manifest b/dev-java/jdepend/Manifest
index 1875c28e754f..806ea8f5a29b 100644
--- a/dev-java/jdepend/Manifest
+++ b/dev-java/jdepend/Manifest
@@ -1,2 +1 @@
 DIST jdepend-2.10.tar.gz 1226471 BLAKE2B d4ec55913a882e4796de88bd220e6bf6a13df516653e7f247a4c84c0c6967f642b1633341955704a0d89b1d449368c4b0d1cd4b52034c64caeb5781e9d2c5839 SHA512 7a01ab4311f41c9176e61e6b0ad50e7c50b4d5638550775a6bd8ee9587ea5978b7dde502d5a82b2ff12811c57a6407e2add42e0c5400517680f425e55e04ae3f
-DIST jdepend-2.9.zip 302836 BLAKE2B dcf3b9c37037926d3792932327ddeb1e95fbbc47beaffb2197653b32bb919a0f3bb4d80c3b32d8e8d83f58e3c216ae5ae6e7ad923971adb460ef0d7fd6036149 SHA512 93ae1ca82422be0dce9794f25ad98c078da7437bca59c697405806a462f81b52028e0536075e2a2f428d8f8c5a27ae50fa7a580b75edbd4e8c9c750315b1c919
diff --git a/dev-java/jdepend/jdepend-2.10.ebuild b/dev-java/jdepend/jdepend-2.10.ebuild
index 7a061be76437..1c22b5cab1e6 100644
--- a/dev-java/jdepend/jdepend-2.10.ebuild
+++ b/dev-java/jdepend/jdepend-2.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/clarkware/jdepend/archive/refs/tags/${PV}.tar.gz ->
 
 LICENSE="BSD"
 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"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jdepend/jdepend-2.9-r6.ebuild b/dev-java/jdepend/jdepend-2.9-r6.ebuild
deleted file mode 100644
index 676b7d948b74..000000000000
--- a/dev-java/jdepend/jdepend-2.9-r6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Traverses Java class file directories and generates design quality metrics"
-HOMEPAGE="http://www.clarkware.com/software/JDepend.html"
-SRC_URI="http://www.clarkware.com/software/${P}.zip"
-
-LICENSE="BSD"
-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=""
-
-DEPEND=">=virtual/jdk-1.8
-	>=app-arch/unzip-5.50-r1"
-RDEPEND=">=virtual/jre-1.8"
-
-java_prepare() {
-	rm -v "${S}"/lib/*.jar || die
-}
-
-src_install() {
-	java-pkg_newjar dist/jdepend-2.9.jar
-	dodoc README
-	dohtml -r docs/*
-	use doc && java-pkg_dojavadoc build/docs/api
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
index ea0df485cb9f..9cbca2b187e5 100644
--- a/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
+++ b/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2"
 LICENSE="codehaus-classworlds"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild b/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
index 27b01afa316f..ed368f6c2c6d 100644
--- a/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
@@ -68,6 +68,29 @@ src_prepare() {
 	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