6 files changed, 175 insertions, 4 deletions
diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index 846f9187a6c0..98941f07f28e 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -1,2 +1,3 @@
 DIST gradle-bin-8.4.zip 212870963 BLAKE2B da32c1010e85f6cded0c1b539b243db6d41fcd033266be3b03b389e6a2e317bea17ddbe65c597c7ea82628cc5bec913954ec998d018b68daa67d39f9a8958e7e SHA512 52d5f622b8ad0ab36ff84589733b47423b12f94211086a84eca9810690af29e396877f1155ee31279c4325e98cd1d55b32137d52efcf48eb1e258caeece08f22
 DIST gradle-bin-8.5.zip 218636663 BLAKE2B 0360f240f6183abec540f7755a966767a8dc175ca0ea047273e05c4b2219fd80cb92e62e9b961481d646157418cc91ea211eb83530cc6ec815ea790f6ad8380a SHA512 37a1c2989c46dad0f843565d05fd29010df10ac199d81f0ccddf56ffd490642039046d43a320ba04d1f87cbbc6d4cebf20ff66ce45ec005931cfc85aee2e0180
+DIST gradle-bin-8.7.zip 224435312 BLAKE2B 1926765aea8931b25a9f0b7b9a224dd70756cfd337eecb364c6d288486187dd6311f888c7e1c36b1fc81b454c3514d2807884343e7782f1be45fce03e611496b SHA512 fc18863654cbe8dd2357f388c0fc5f699ca2d40ffd32c283f00cfd5bda94e1711ab7b7a3b154e7da66c17468f00c3c72fe6b6603c4a29617b33b0f292cbac3de
diff --git a/dev-java/gradle-bin/gradle-bin-8.7.ebuild b/dev-java/gradle-bin/gradle-bin-8.7.ebuild
new file mode 100644
index 000000000000..61b08c49be55
--- /dev/null
+++ b/dev-java/gradle-bin/gradle-bin-8.7.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+IUSE="doc"
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2
+
+MY_PN=${PN%%-bin}
+MY_P="${MY_PN}-${PV/_rc/-rc-}"
+
+DESCRIPTION="A project automation and build tool with a Groovy based DSL"
+SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip"
+HOMEPAGE="https://www.gradle.org/"
+
+LICENSE="Apache-2.0"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-eselect/eselect-gradle"
+BDEPEND="app-arch/unzip"
+RDEPEND="
+	${DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local gradle_dir="/usr/share/${PN}-${SLOT}"
+
+	if use source; then
+		java-pkg_dosrc src
+	fi
+
+	docinto html
+	dodoc -r docs/release-notes.html
+	if use doc; then
+		dodoc -r docs/{dsl,userguide}
+		java-pkg_dojavadoc docs/javadoc
+	fi
+
+	insinto "${gradle_dir}"
+	doins -r bin/ lib/
+	fperms 755 "${gradle_dir}/bin/gradle"
+	dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}"
+}
+
+pkg_postinst() {
+	eselect gradle update ifunset
+}
+
+pkg_postrm() {
+	eselect gradle update ifunset
+}
diff --git a/dev-java/gson/gson-2.10.2_pre20231128.ebuild b/dev-java/gson/gson-2.10.2_pre20231128.ebuild
index a8894239bea7..4247c08c2190 100644
--- a/dev-java/gson/gson-2.10.2_pre20231128.ebuild
+++ b/dev-java/gson/gson-2.10.2_pre20231128.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/google/gson/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.
 S="${WORKDIR}/gson-${MY_COMMIT}/gson"
 
 LICENSE="Apache-2.0"
-SLOT="2.6"
+SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
diff --git a/dev-java/reflections/reflections-0.9.12-r5.ebuild b/dev-java/reflections/reflections-0.9.12-r6.ebuild
index 4b2b9ab7668c..630e94c431ca 100644
--- a/dev-java/reflections/reflections-0.9.12-r5.ebuild
+++ b/dev-java/reflections/reflections-0.9.12-r6.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
 
 # Skeleton command:
@@ -22,7 +22,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml
-# com.google.code.gson:gson:2.8.6 -> >=dev-java/gson-2.8.8:2.6
+# com.google.code.gson:gson:2.8.6 -> >=dev-java/gson-2.8.8:0
 # org.dom4j:dom4j:2.1.1 -> >=dev-java/dom4j-2.1.3:1
 # org.javassist:javassist:3.26.0-GA -> !!!suitable-mavenVersion-not-found!!!
 # org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
@@ -30,7 +30,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 CP_DEPEND="
 	dev-java/dom4j:1
-	dev-java/gson:2.6
+	dev-java/gson:0
 	dev-java/javassist:3
 	dev-java/slf4j-api:0
 	dev-java/slf4j-simple:0
diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest
index 7b243dc27a93..bafc24692cd9 100644
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@@ -1 +1,2 @@
 DIST velocity-2.3.tar.gz 443754 BLAKE2B 16b7aaa87eb6be899f40d09ee8aa50b2ac24dd59c33f29b944d46ea84a77de07cd69f344632b4b829b92a92fe6ccd75cf79e021787b2ca59a79040aa08a53eed SHA512 987f2991a96fa8fae43ff2f72d6a57b25b1cb7d98b7def7a1a6e9a308c8b5b86e394444c47ee0eca8b70d41b341759c7309404dc4b952dbc65fc3a5b92d46cdb
+DIST velocity-2.3_p20240314.tar.gz 440967 BLAKE2B c5fcea7af49d6c46d5c0943efe82f3c04d921afc2c53201b97842ae71714e7035d075c147b3bea71e959db12dd970b7879ade73bbc23bab09a1fd262e21f2fc6 SHA512 9055e780d2a3c798bfe30e5c7859a7311c4984b551d7b2ffa68c57c076549326d0ddae31eabff8009ea021c749331d34c71eee8cab55599dea5f3c8dba841a02
diff --git a/dev-java/velocity/velocity-2.3_p20240314.ebuild b/dev-java/velocity/velocity-2.3_p20240314.ebuild
new file mode 100644
index 000000000000..9fc3d0f5f420
--- /dev/null
+++ b/dev-java/velocity/velocity-2.3_p20240314.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.velocity:velocity-engine-core:2.3"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache Velocity is a general purpose template engine"
+HOMEPAGE="https://velocity.apache.org"
+MY_COMMIT="86cfcf41105f8a25db11ca6483e33c20fc0804d9"
+SRC_URI="https://github.com/apache/${PN}-engine/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-engine-${MY_COMMIT}/${PN}-engine-core"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+CP_DEPEND="
+	>=dev-java/commons-io-2.8.0:1
+	>=dev-java/commons-lang-3.11:3.6
+	>=dev-java/slf4j-api-1.7.30:0
+"
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+	test? (
+		dev-db/hsqldb:0
+		>=dev-java/slf4j-simple-1.7.30:0
+	)
+"
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+JAVACC_SLOT="7.0.13"
+BDEPEND="dev-java/javacc:${JAVACC_SLOT}"
+
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_EXTRA_ARGS="-Dtest.compare.dir=target/test-classes -Dtest.result.dir=results"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,hsqldb,slf4j-simple"
+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}/" \
+		src/main/java-templates/org/apache/velocity/runtime/VelocityEngineVersion.java > \
+		src/main/java/org/apache/velocity/runtime/VelocityEngineVersion.java || die
+
+	sed -i \
+		-e 's/\${parser.basename}/Standard/g' \
+		-e 's/\${parser.package}/org.apache.velocity.runtime.parser/g' \
+		-e 's/\${parser.char.asterisk}/\*/g' \
+		-e 's/\${parser.char.at}/\@/g' \
+		-e 's/\${parser.char.dollar}/\$/g' \
+		-e 's/\${parser.char.hash}/\#/g' \
+		"${S}/src/main/parser/Parser.jjt" || die
+
+	# File "StandardParserTreeConstants.java" does not exist.  Will create one.
+	# File "StandardParserVisitor.java" does not exist.  Will create one.
+	# File "JJTStandardParserState.java" does not exist.  Will create one.
+	"jjtree-${JAVACC_SLOT}" -GRAMMAR_ENCODING=UTF-8 \
+		-JDK_VERSION=1.8 \
+		-BUILD_NODE_FILES=false \
+		-MULTI=true \
+		-NODE_PACKAGE=org.apache.velocity.runtime.parser.node \
+		-NODE_USES_PARSER=true \
+		-STATIC=false \
+		-OUTPUT_DIRECTORY="${JAVA_SRC_DIR}/org/apache/velocity/runtime/parser/node" \
+		"${S}/src/main/parser/Parser.jjt" \
+		|| die "Code generation via jjtree failed"
+
+	"javacc-${JAVACC_SLOT}" -GRAMMAR_ENCODING=UTF-8 \
+		-JDK_VERSION=1.8 \
+		-STATIC=false \
+		-DEBUG_PARSER=false \
+		-DEBUG_LOOKAHEAD=false \
+		-DEBUG_TOKEN_MANAGER=false \
+		-BUILD_PARSER=true \
+		-TOKEN_MANAGER_USES_PARSER=true \
+		-OUTPUT_DIRECTORY="${JAVA_SRC_DIR}" \
+		"${JAVA_SRC_DIR}/org/apache/velocity/runtime/parser/node/Parser.jj" \
+		|| die "Parser.java code generation via javacc failed"
+
+	# Avoid "error: duplicate class: org.apache.velocity.runtime.parser...."
+	rm -v "${JAVA_SRC_DIR}/CharStream.java" || die "cannot remove 'CharStream.java'"
+	rm -v "${JAVA_SRC_DIR}/ParseException.java" || die "cannot remove 'ParseException.java'"
+}
+
+src_test() {
+	pushd src/test/java || die
+		# DataSourceResourceLoaderTestCase.java requires configured jdbc
+		local JAVA_TEST_RUN_ONLY=$(find * \
+			-name "*TestCase.java" \
+			! -name "BaseTestCase.java" \
+			! -name "DataSourceResourceLoaderTestCase.java" \
+			)
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	popd
+	java-pkg-simple_src_test
+}