gentoo auto-resync : 09:04:2024 - 12:31:21

7 files changed, 116 insertions, 6 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 30d5e1e2cd73..ce75287fc783 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/gson/Manifest b/dev-java/gson/Manifest
index 22237029304a..8273c42cd0c9 100644
--- a/dev-java/gson/Manifest
+++ b/dev-java/gson/Manifest
@@ -1,5 +1,5 @@
 AUX gson-2.10.2-GsonVersionDiagnosticsTest.patch 615 BLAKE2B ac75e23e48885403f61cd0b078984a7210576fc2567086a9d9af99a212471cead5d2d5961bb6b7958fb956eda6c348c08124c6e2c6cbc7afac6ff6a36b82a424 SHA512 c363625a645df1a7c3db737db39cc2e163fe4975b6bb51930b805ba359e61509e41397022d689874b6fa100917f6dd936c13c8c6457137f55370b48de35e2bed
 DIST gson-2.10.2_pre20231128.tar.gz 451312 BLAKE2B d16e0510e0806fd33e8d49b5a8fb73e969b89acb2598ca34a43faa97a09debc99466ab472176d60d617aa20b2190884def25881f0bf651e96be2c1bb9a976d70 SHA512 37f2073e5eee2cb85626040552ac750f4917abd05e3b7944c30a2d5ace6888424870a95a0ceba89bf2dadf9ab33e6bbae1591509b84f35aba4521780764c0877
 DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8
-EBUILD gson-2.10.2_pre20231128.ebuild 2351 BLAKE2B 9425f0f87e1790c08dbadfb2317c857d6ad12d03cf6171ffe645d2c405e108ab4dda167b82c2b7c9203539b758382c9494a3c6351dedeb422778403e909761ef SHA512 92c22523077009d0cdb0ce5a897f3bf171e60cba16b8b9b8d94a67edf846cdaadd57b2b1ea29037717d510536cfd68aa50b24452c2ab4efea44a307f84eff95c
+EBUILD gson-2.10.2_pre20231128.ebuild 2349 BLAKE2B d6dfbd7cedb55f46be4555af5ed44ab5f354a144f1976f63a2484fb82fdc7bdb223d81c2d14b67500f9fe28b1e083058ce09d1aeb706112a0e06e6f2f3175633 SHA512 387f18057dd39e4d232c5937d3f32b5d888a70ea2a2f63fcb661a9a02e382c4964d4c7b8da0a2835063f7f72628510cf43869bdd15dd8a09bf7a8f60100863ce
 MISC metadata.xml 630 BLAKE2B e4732be361d93273cb3c6084e4fa596def785aa6b0cd747f3cc65b9d9b693666e60188c6b30c0e7a234cca56239b9d22c14eaf21af7958f818de3a6b4b246729 SHA512 063d42b12383dde777dfdea7fb884423bdf3e377aa585b4b46d6d2581e81cd943e0a444792997c87d3443fa4516d211d9c3f78e5702b7376cda63718f14f6504
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/Manifest b/dev-java/reflections/Manifest
index 0c779150e8ad..13d673046a54 100644
--- a/dev-java/reflections/Manifest
+++ b/dev-java/reflections/Manifest
@@ -1,3 +1,3 @@
 DIST reflections-0.9.12.tar.gz 48235 BLAKE2B c82bd69f4433d8db738fcd32dd7fbf643984917622853b1886e15b906a91579de0193daf0fc1a9642c12d13de8236acf3e1f1409a18713b37c6e705a3cae34bd SHA512 8f8c7603ab73b599c6e2160f42b61c4e0eedef9981c06124bba0437d6636e7bf8a916784e266754562dc17f4d3ccf8df6c9ba707d1a7c38d97dc5eea9138064f
-EBUILD reflections-0.9.12-r5.ebuild 3793 BLAKE2B 14b4a6b3ffaf9e2cda4b81489aac2e9f81b63ab38b1f3c838af74a861e52e44009a9f85cfac645ef9430496f0fd538eb2fc302de10bb96debba16273efec97fe SHA512 c7e5450942cedb8b779fadc09acde59e09e7e6ea76aa7cb7d1954dccc86f69c0abec2f2d9a7f1ed835ed04596b200117da8fdc0e2ee994192d8a42f3d32f627c
+EBUILD reflections-0.9.12-r6.ebuild 3789 BLAKE2B 63e44d3c4ae2e0da8cbcab0ddacbc6f35adca3d665239bd95da579955093ceacd49010f45086440b0f3760aa3fa97973ea676b852e43f4db83f78a561e3fabf4 SHA512 7232989936f94d283150f15848a4dbb3146ad5298da1c619483d76f569cee2defa705199a886d96d1e9eb72fbf6840743dfe3bf627ac9ee8b7838f74fa425faf
 MISC metadata.xml 527 BLAKE2B 92b0ca46422b8b0107bef220664c0079db47a3c8f306f59d5b681b653e5bcb835a192c8018d719447ebc864ead58f3844340bf3f84ff5bbef0ab126b7d314efe SHA512 a7ad6c598f83a911b20f5b31573127433d2bd756ac15d4a29de907ce102a5fb77de2426035a8255125446128b8ef13ed1f9fa002bff285cddbaf9043bd71dddc
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 b8110c0059b0..63dc06a49283 100644
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@@ -1,4 +1,6 @@
 AUX velocity-2.3-skipSecurityManager.patch 383 BLAKE2B ce955f4336d4184b9c3d27f12e28c4f721fc25b613aef07f5f0a161ff9d43333e63ad0a145b67e83b91d7ce6afc2520effe84e529dce0ea97ee7f7ad2eb1eb5b SHA512 b76fe09011ce5ae5d621ef03c16fc23586df4b06115ea2b6bea18ef5c28cf7e11b7023e9c654f59f1e03c31c8bc56ab73bfe95eef7094f42a1f7bdb590c454c6
 DIST velocity-2.3.tar.gz 443754 BLAKE2B 16b7aaa87eb6be899f40d09ee8aa50b2ac24dd59c33f29b944d46ea84a77de07cd69f344632b4b829b92a92fe6ccd75cf79e021787b2ca59a79040aa08a53eed SHA512 987f2991a96fa8fae43ff2f72d6a57b25b1cb7d98b7def7a1a6e9a308c8b5b86e394444c47ee0eca8b70d41b341759c7309404dc4b952dbc65fc3a5b92d46cdb
+DIST velocity-2.3_p20240314.tar.gz 440967 BLAKE2B c5fcea7af49d6c46d5c0943efe82f3c04d921afc2c53201b97842ae71714e7035d075c147b3bea71e959db12dd970b7879ade73bbc23bab09a1fd262e21f2fc6 SHA512 9055e780d2a3c798bfe30e5c7859a7311c4984b551d7b2ffa68c57c076549326d0ddae31eabff8009ea021c749331d34c71eee8cab55599dea5f3c8dba841a02
 EBUILD velocity-2.3.ebuild 5324 BLAKE2B 13c09feae6a40da9f60665174b57e81c041238a22854b35ede8334d5b72e0a9941818fc25ddd54b139231f2214d47a54e537401665e569cf31ef27aed0ff89e6 SHA512 6b6932e00b61f1f77f04853ffd781954e291783bed80b54ac4070ff085d910ff4dfb3597a6885949fb296dd06d1e8f26e46b5851517187d37dde1d1795cbcc73
+EBUILD velocity-2.3_p20240314.ebuild 3485 BLAKE2B 15f22a5365bccaac70e7a263cd78d2f8a2b363a1fad7d35c159fd12eac8f17ed491208d78b2389be7c911dec0f68dcc767a0b4c09d71b81f9fcef1df281bac9d SHA512 b58fbb1de6c97358a16b224ae06d16b5e2de4428d2477d7192db9f7a0150bb42d96b0f54e362818c85448f137ab7700d24c148a1e3c70418d5a5efd89186388f
 MISC metadata.xml 324 BLAKE2B c8eea57701703ec431e972c8e9c79135f5c124f1d16d4882cdcf64b884ba656654f030dc63ae7bcba3f0485cf751c53cce51e3b337eae198d61ae84abb3d04ed SHA512 29c6d5194ebede2598996e03408bd4c3c54bdcfce18c1025ffa95fbfba99a953acc66af25e4bb046d33a71d2c462e4fc84867ff8067a2434af885fb046980840
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
+}