Adding metadata

4 files changed, 11 insertions, 64 deletions

diff --git a/dev-java/bsf/bsf-2.4.0-r4.ebuild b/dev-java/bsf/bsf-2.4.0-r5.ebuild
index 392c3e6152ec..129e8013ff23 100644
--- a/dev-java/bsf/bsf-2.4.0-r4.ebuild
+++ b/dev-java/bsf/bsf-2.4.0-r5.ebuild
@@ -35,16 +35,17 @@ RDEPEND="${CDEPEND}
 
 DOCS=( CHANGES.txt NOTICE.txt README.txt RELEASE-NOTE.txt TODO.txt )
 
-JAVA_CLASSPATH_EXTRA="
+JAVA_GENTOO_CLASSPATH="
 	commons-logging
 	xalan
 "
 JAVA_MAIN_CLASS="org.apache.bsf.Main"
+JAVA_RESOURCE_DIRS="res"
 JAVA_SRC_DIR="src"
 
 src_prepare() {
 	java-pkg-2_src_prepare
-	rm -r src/org/apache/bsf/engines/{netrexx,jython} || die
+	rm -r src/org/apache/bsf/engines/{java,javaclass,jython,netrexx} || die
 	if use javascript; then
 		JAVA_GENTOO_CLASSPATH+=" rhino-1.6"
 	else
@@ -55,6 +56,12 @@ src_prepare() {
 	else
 		rm -r src/org/apache/bsf/engines/jacl || die
 	fi
+	# java-pkg-simple.eclass wants resources in JAVA_RESOURCE_DIRS
+	mkdir res || die "create res"
+	pushd src > /dev/null || die "pushd"
+		find -type f -name '*.properties' \
+			| xargs cp --parent -t ../res || die "copy resources"
+	popd > /dev/null
 }
 
 src_install() {
diff --git a/dev-java/gson/Manifest b/dev-java/gson/Manifest
index b2d31e9659c7..be2124b47485 100644
--- a/dev-java/gson/Manifest
+++ b/dev-java/gson/Manifest
@@ -1,3 +1,2 @@
 DIST gson-2.10.2_pre20231128.tar.gz 451312 BLAKE2B d16e0510e0806fd33e8d49b5a8fb73e969b89acb2598ca34a43faa97a09debc99466ab472176d60d617aa20b2190884def25881f0bf651e96be2c1bb9a976d70 SHA512 37f2073e5eee2cb85626040552ac750f4917abd05e3b7944c30a2d5ace6888424870a95a0ceba89bf2dadf9ab33e6bbae1591509b84f35aba4521780764c0877
-DIST gson-parent-2.10.1.tar.gz 394777 BLAKE2B e118a7c39b17c4119b4140f3c105fef4c3cb07580dbc530d9bfd59edc4f152f62ac5ff93db1a3861c73758e369ecef4f8ed4e94d556869291469764ea848bbbd SHA512 074f40f7f9aa48daf5b5a3ec371713db02f6f8fceb959b01e8a16732862645d2350f3276ab7ff8021d48082f890b53c6e80d992af6af4b74e4646f85494b8e70
 DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8
diff --git a/dev-java/gson/gson-2.10.1.ebuild b/dev-java/gson/gson-2.10.1.ebuild
deleted file mode 100644
index 96e7d452fb78..000000000000
--- a/dev-java/gson/gson-2.10.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.google.code.gson:gson:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Gson JSON library"
-HOMEPAGE="https://github.com/google/gson"
-SRC_URI="https://github.com/google/gson/archive/gson-parent-${PV}.tar.gz"
-S="${WORKDIR}/gson-gson-parent-${PV}/gson"
-
-LICENSE="Apache-2.0"
-SLOT="2.6"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-17:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=(
-	../CHANGELOG.md
-	../GsonDesignDocument.md
-	../README.md
-	../Troubleshooting.md
-	../UserGuide.md
-)
-
-JAVA_SRC_DIR=(
-	"src/main/java"
-	"src/main/java-templates"
-)
-
-JAVA_TEST_EXCLUDES=(
-	# requires the test class to be obfuscated using proguard which we do not have atm
-	"com.google.gson.functional.EnumWithObfuscatedTest"
-	# FAILURES!!!
-	# Tests run: 1258,  Failures: 2
-	# testComGoogleGsonAnnotationsPackage(com.google.gson.regression.OSGiTest)
-	# junit.framework.AssertionFailedError: Cannot find com.google.gson OSGi bundle manifest
-	"com.google.gson.regression.OSGiTest"
-)
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	sed -e "s/\${project.version}/${PV}/g" \
-		-i src/main/java-templates/com/google/gson/internal/GsonBuildConfig.java \
-			|| die "Failed to set version"
-	# error: records are not supported in -source 8
-	# This test would pass "OK (25 tests)" only with >=jre-17
-	# pom.xml, lines 20-22
-	rm src/test/java/com/google/gson/functional/Java17RecordTest.java || die
-}
diff --git a/dev-java/gson/gson-2.10.2_pre20231128.ebuild b/dev-java/gson/gson-2.10.2_pre20231128.ebuild
index a8544b4d9312..a8894239bea7 100644
--- a/dev-java/gson/gson-2.10.2_pre20231128.ebuild
+++ b/dev-java/gson/gson-2.10.2_pre20231128.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ S="${WORKDIR}/gson-${MY_COMMIT}/gson"
 
 LICENSE="Apache-2.0"
 SLOT="2.6"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	dev-java/error-prone-annotations:0