Adding metadata

6 files changed, 103 insertions, 57 deletions

diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index ebf942b29489..94e019b823ba 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1 +1,2 @@
 DIST json-20250107.tar.gz 260468 BLAKE2B 830c43e242204cfa1cd544b05ca99664c6401665d7937fade4435c502061a76809828ee70bb3375d2b81a224c5051837f603f895fcd6ebeaf3313cd8402043af SHA512 8b56c0c3e03377a25c5f4ac0a30e0ff050c71f282b123236a699af7905d7fd2d809f9fa85276fd22f744763a72a2709a8999f900a269e0e3b1373423ed2bab19
+DIST json-20250517.tar.gz 264229 BLAKE2B fd720a9d0726735a11277553c6ff3f5f1a4cb2d8191b714058576e641ebfda19d057ab4c5a9bb8013a227cba6b43fb3e742e34741c3771ade04f7237a45915cd SHA512 fc58d061882e50f2da60cfa2587d58b868647fa9ebaa0a3375b38b820ff28b7ede2841da7e06345c149a25e47d664db9cab09e1a86ad9af5a46607bbabf8d981
diff --git a/dev-java/json/json-20250517.ebuild b/dev-java/json/json-20250517.ebuild
new file mode 100644
index 000000000000..e090e84eaedd
--- /dev/null
+++ b/dev-java/json/json-20250517.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.json:json:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple check-reqs
+
+DESCRIPTION="A reference implementation of a JSON package in Java"
+HOMEPAGE="https://github.com/stleary/JSON-java"
+SRC_URI="https://github.com/stleary/JSON-java/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/JSON-java-${PV}"
+
+LICENSE="JSON"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		>=dev-java/asm-9.8:0
+		dev-java/json-path:0
+		>=dev-java/json-smart-2.5.2:0
+		dev-java/mockito:4
+		dev-java/slf4j-api:0
+	)
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {CONTRIBUTING,README,SECURITY}.md )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.json"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="
+	asm
+	json-path
+	json-smart
+	junit-4
+	mockito-4
+	slf4j-api
+"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+check_env() {
+	if use test; then
+		# this is needed only for tests
+		CHECKREQS_MEMORY="2048M"
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	check_env
+}
+
+pkg_setup() {
+	check_env
+	java-pkg-2_pkg_setup
+}
+
+src_test() {
+	# setting Xms for bug #930723
+	# gradlew: DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"
+	JAVA_TEST_EXTRA_ARGS=" -Xmx${CHECKREQS_MEMORY}"
+
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge 17; then
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.io=ALL-UNNAMED )
+	fi
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/jsonp-api/jsonp-api-2.0.2.ebuild b/dev-java/jsonp-api/jsonp-api-2.0.2-r1.ebuild
index d4dfde635f40..651c9bb99c7b 100644
--- a/dev-java/jsonp-api/jsonp-api-2.0.2.ebuild
+++ b/dev-java/jsonp-api/jsonp-api-2.0.2-r1.ebuild
@@ -17,7 +17,7 @@ LICENSE="EPL-2.0"
 SLOT="0"
 KEYWORDS="amd64"
 
-DEPEND=">=virtual/jdk-1.8:*"
+DEPEND=">=virtual/jdk-1.9:*"	# module-info
 RDEPEND=">=virtual/jre-1.8:*"
 
 JAVA_SRC_DIR="api/src/main/java"
diff --git a/dev-java/msv/msv-2022.7.ebuild b/dev-java/msv/msv-2022.7-r1.ebuild
index 63e4fa8f8afd..b856af5f0157 100644
--- a/dev-java/msv/msv-2022.7.ebuild
+++ b/dev-java/msv/msv-2022.7-r1.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/xmlark/msv/archive/msv-2022.7.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild msv-2022.7.ebuild
-
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
@@ -15,55 +12,43 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="Multi-Schema Validator Core package"
 HOMEPAGE="https://xmlark.github.io/msv/core/"
 SRC_URI="https://github.com/xmlark/msv/archive/msv-${PV}.tar.gz"
+S="${WORKDIR}/msv-${P}/msv"
 
 LICENSE="BSD-1"
 SLOT="0"
 KEYWORDS="amd64 arm64 ppc64"
 
-# Common dependencies
-# POM: pom.xml
-# isorelax:isorelax:20030108 -> !!!groupId-not-found!!!
-# net.java.dev.msv:xsdlib:2022.7 -> !!!suitable-mavenVersion-not-found!!!
-# relaxngDatatype:relaxngDatatype:20020414 -> >=dev-java/relaxng-datatype-20020414:0
-# xerces:xercesImpl:2.12.2 -> >=dev-java/xerces-2.12.2:2
-# xml-apis:xml-apis:1.4.01 -> >=dev-java/xml-commons-external-1.4.01:1.4
-# xml-resolver:xml-resolver:1.2 -> >=dev-java/xml-commons-resolver-1.2:0
-
 CP_DEPEND="
 	dev-java/iso-relax:0
 	dev-java/relaxng-datatype:0
-	dev-java/xerces:2
 	dev-java/xml-commons-external:1.4
 	dev-java/xml-commons-resolver:0
 	dev-java/xsdlib:0
 "
 
 DEPEND=">=virtual/jdk-1.8:*
+	dev-java/xerces:2
 	${CP_DEPEND}"
 
 RDEPEND=">=virtual/jre-1.8:*
 	${CP_DEPEND}"
 
-S="${WORKDIR}/msv-${P}/msv"
-
+JAVA_CLASSPATH_EXTRA="xerces-2"
 JAVA_MAIN_CLASS="com.sun.msv.driver.textui.Driver"
-JAVA_SRC_DIR="src/main/java"
 JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
 
 JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
 JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
 
 src_test() {
 	# Selection according to pom.xml#L182-L210
-	pushd src/test/java || die
-		local JAVA_TEST_RUN_ONLY=$(find * \
-			\( -wholename "**/*Test.java" \
-			-o -wholename "**/*TestCase.java" \
-			-o -wholename "**/*TestCases.java" \) \
-			! -wholename "**/*\$*" \
-			)
-	popd
+	local JAVA_TEST_RUN_ONLY=$(find src/test/java \
+		\( -name "*Test.java" \
+		-o -name "*TestCase.java" \
+		-o -name "*TestCases.java" \) \
+		! -name "*\$*" -printf "%P\n")
 	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
 	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
 	java-pkg-simple_src_test
diff --git a/dev-java/tapestry-json/tapestry-json-5.8.7-r1.ebuild b/dev-java/tapestry-json/tapestry-json-5.8.7-r1.ebuild
index 86a92de6444b..d225a77afdb4 100644
--- a/dev-java/tapestry-json/tapestry-json-5.8.7-r1.ebuild
+++ b/dev-java/tapestry-json/tapestry-json-5.8.7-r1.ebuild
@@ -34,6 +34,7 @@ JAVA_SRC_DIR="tapestry-json/src/main/java"
 
 src_compile() {
 	# build classes needed for compilation
+	mkdir -p target/deps || die "mkdir" # openjdk:8 doesn't do it.
 	ejavac -d target/deps \
 		-cp "$(java-pkg_getjars --build-only slf4j-api)" \
 		$(find \
diff --git a/dev-java/xsdlib/xsdlib-2022.7.ebuild b/dev-java/xsdlib/xsdlib-2022.7-r1.ebuild
index 008ce11476f1..240259a7d76d 100644
--- a/dev-java/xsdlib/xsdlib-2022.7.ebuild
+++ b/dev-java/xsdlib/xsdlib-2022.7-r1.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/xmlark/msv/archive/msv-2022.7.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild xsdlib-2022.7.ebuild
-
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
@@ -15,27 +12,16 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="XML Schema datatypes library"
 HOMEPAGE="https://github.com/xmlark/msv/tree/main/xsdlib"
 SRC_URI="https://github.com/xmlark/msv/archive/msv-${PV}.tar.gz"
+S="${WORKDIR}/msv-msv-${PV}/xsdlib"
 
 LICENSE="BSD-1"
 SLOT="0"
 KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
-# Common dependencies
-# POM: pom.xml
-# relaxngDatatype:relaxngDatatype:20020414 -> >=dev-java/relaxng-datatype-20020414:0
-# xerces:xercesImpl:2.12.2 -> >=dev-java/xerces-2.12.2:2
-
-CP_DEPEND="
-	dev-java/relaxng-datatype:0
-	dev-java/xerces:2
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
-# test? org.jdom:jdom2:2.0.6.1 -> >=dev-java/jdom-2.0.6.1:2
+CP_DEPEND="dev-java/relaxng-datatype:0"
 
 DEPEND="
+	dev-java/xerces:2
 	>=virtual/jdk-1.8:*
 	${CP_DEPEND}
 	test? (
@@ -48,25 +34,20 @@ RDEPEND="
 	${CP_DEPEND}
 "
 
-S="${WORKDIR}/msv-msv-${PV}/xsdlib"
-
+JAVA_CLASSPATH_EXTRA="xerces-2"
 JAVA_MAIN_CLASS="com.sun.msv.datatype.xsd.CommandLineTester"
-JAVA_SRC_DIR="src/main/java"
 JAVA_RESOURCE_DIRS="src/main/resources"
-
+JAVA_SRC_DIR="src/main/java"
 JAVA_TEST_GENTOO_CLASSPATH="junit-4,jdom-2"
 JAVA_TEST_SRC_DIR="src/test/java"
 
 src_test() {
 	# Selection according to pom.xml#L156-L184
-	pushd src/test/java || die
-		local JAVA_TEST_RUN_ONLY=$(find * \
-			\( -wholename "**/*Test.java" \
-			-o -wholename "**/*TestCase.java" \
-			-o -wholename "**/*TestCases.java" \) \
-			! -wholename "**/*\$*" \
-			)
-	popd
+	local JAVA_TEST_RUN_ONLY=$(find src/test/java \
+		\( -name "*Test.java" \
+		-o -name "*TestCase.java" \
+		-o -name "*TestCases.java" \) \
+		! -name "*\$*" -printf "%P\n")
 	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
 	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
 	java-pkg-simple_src_test