gentoo auto-resync : 06:11:2024 - 03:03:24

4 files changed, 121 insertions, 6 deletions

diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest
index 8d12ea185842..b1533b4d92fb 100644
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@@ -1,5 +1,7 @@
 DIST velocity-2.3_p20240314.tar.gz 440967 BLAKE2B c5fcea7af49d6c46d5c0943efe82f3c04d921afc2c53201b97842ae71714e7035d075c147b3bea71e959db12dd970b7879ade73bbc23bab09a1fd262e21f2fc6 SHA512 9055e780d2a3c798bfe30e5c7859a7311c4984b551d7b2ffa68c57c076549326d0ddae31eabff8009ea021c749331d34c71eee8cab55599dea5f3c8dba841a02
+DIST velocity-2.4.1.tar.gz 445671 BLAKE2B 3a142303bd7bb1a6e012b9d33f96078fa925249bd62287e166e45faca7ad605b1b57f8f72b4829d009e4c11f54780727d919a96bcc081d83c26adf0a61eaecaa SHA512 3e821eaeb705e6ede8a51a8d3bff00d26909c20738bed92f5ef9600f3736709324807f7bbb93f5d431e60380b9a4f757f47cca6ec64e8e774c7ec1e4708d25f1
 DIST velocity-2.4.tar.gz 444952 BLAKE2B 0db598bad6743383e62e89acc55b887f28108b6065c3e615b78485e4f94c9f1a316bff7c04d66052541d6173311e97dab28142dad69e6caca168b2a2fcc28637 SHA512 b3f7ae68fa2e0f30193f089a2e8ee5366e71726d93e85fa2f4c3f95d20aa599df053ee7103c71b01c89fe08dd5276e5a2c7da3e26eaffeafd94c078241a9e264
-EBUILD velocity-2.3_p20240314.ebuild 3484 BLAKE2B d523792a502ce5fe7318b3a48c3daad09c05ad3e8bac6e02527abd6d7288865230ee8a1e490dc04a18f9817c4fc84aba789678af003628b885fafeea3ec5d54b SHA512 be61868f896446727b26c9bbfcf2f7d072aabe1b64da73c5963c75c6aa747da0b989eba05eef00c2320f48a9bc7a88b8434e64b4b9532af8b2c744e0b2a1483a
-EBUILD velocity-2.4.ebuild 3498 BLAKE2B 7eb3687afa4c291363c8420c5548debef6dac1ae53cfe60768ee3107ec71092381818d066a4ba7330b37ed0ef990fe9940acf05d3a812ff60c2e5997ce1c7bd8 SHA512 ca4b99627d1f62dc3282aad474accfa9e233e930728a4a7880a8c8a8e6a3fcd1b251e4d03046065da7b63d16695e48093be24391638bc858d5b1e879fce9c70c
+EBUILD velocity-2.3_p20240314.ebuild 3515 BLAKE2B 70e49bb066ff4f032216c0bf85a03507f7913ac9a86a585b802189495966cb55eb8c2ef9dce688f98c5631798980559d0b67db9b4f89ce0314da4ad5779830b8 SHA512 d020abf77e73a8ed6a1b08245904779506110f65f0256a59769f328683c3686432a246b6edc690a6a016c4eeb2023a312dbb1ac02d27ff2db9917e0c0e8dd9b0
+EBUILD velocity-2.4.1.ebuild 3548 BLAKE2B de11e5508eb32456d2b75be1fa51268ba9ac25ff14cdf4f23085331d5d0fd7e73cdc1799cf8858cefbf97607b1ffa96581634a29f4278085c6a0489ad6d73517 SHA512 a9211a9323e4a78ff4334127b58cb765238aceadb972664f92c820bedabbb53641352ea9c7664e7dafa8b695c556c8fa38d7324457b8bd6049c3455051255869
+EBUILD velocity-2.4.ebuild 3529 BLAKE2B a46026162942d782723c540aea2bfe95a10229fe9a35e7c1dd7e12bedfe5f36ed5d4a88cfe5279f8cc56f55d8498ebdb177f7ebccb9ea5ce0f22e8612eea8b80 SHA512 e3177f5224db111cebee8f31c0dcc08a49d1920683ae994ea7cd9ea0ae546131db5f4de447fe374aa842c5f893650480d28e4a957edeb56e86d9b9c0731ad847
 MISC metadata.xml 401 BLAKE2B b11e2740816123dd6a2e4c19958be0309b72bce734f677acac45570597adaaf7b1b21b240612fe7f0a31165d81bc8d70c258f0ff2ab41922acd74acd1e731b54 SHA512 1ebed6a12dd89d632574519db9e266fbf434d11ae28221813499a96a926fe33db2e52af6e36f5854b49df7b1898d166eece550a67c5e6bab4b4439e8b6289c36
diff --git a/dev-java/velocity/velocity-2.3_p20240314.ebuild b/dev-java/velocity/velocity-2.3_p20240314.ebuild
index 2288fd91a1a5..03a0be67f16f 100644
--- a/dev-java/velocity/velocity-2.3_p20240314.ebuild
+++ b/dev-java/velocity/velocity-2.3_p20240314.ebuild
@@ -94,7 +94,7 @@ src_prepare() {
 }
 
 src_test() {
-	pushd src/test/java || die
+	pushd src/test/java > /dev/null || die
 		# DataSourceResourceLoaderTestCase.java requires configured jdbc
 		local JAVA_TEST_RUN_ONLY=$(find * \
 			-name "*TestCase.java" \
@@ -103,6 +103,6 @@ src_test() {
 			)
 		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
 		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-	popd
+	popd > /dev/null || die
 	java-pkg-simple_src_test
 }
diff --git a/dev-java/velocity/velocity-2.4.1.ebuild b/dev-java/velocity/velocity-2.4.1.ebuild
new file mode 100644
index 000000000000..b674930844e6
--- /dev/null
+++ b/dev-java/velocity/velocity-2.4.1.ebuild
@@ -0,0 +1,113 @@
+# 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.4.1"
+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"
+SRC_URI="https://github.com/apache/${PN}-engine/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-engine-${PV}/${PN}-engine-core"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+CP_DEPEND="
+	dev-java/commons-lang:3.6
+	dev-java/slf4j-api:0
+"
+
+DEPEND="
+	${CP_DEPEND}
+	>=dev-java/commons-io-2.17.0:1
+	>=virtual/jdk-1.8:*
+	test? (
+		>=dev-db/hsqldb-2.4.1:0
+		dev-java/slf4j-simple:0
+	)
+"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+JAVACC_SLOT="7.0.13"
+BDEPEND="dev-java/javacc:${JAVACC_SLOT}"
+
+JAVA_CLASSPATH_EXTRA="commons-io-1"
+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
+
+	cp -r src/main/{,resources/org/apache/velocity/runtime}/parser || die
+
+	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 > /dev/null || 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 > /dev/null || die
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/velocity/velocity-2.4.ebuild b/dev-java/velocity/velocity-2.4.ebuild
index 27d9d96922dc..e3727ab40d9f 100644
--- a/dev-java/velocity/velocity-2.4.ebuild
+++ b/dev-java/velocity/velocity-2.4.ebuild
@@ -99,7 +99,7 @@ src_prepare() {
 }
 
 src_test() {
-	pushd src/test/java || die
+	pushd src/test/java > /dev/null || die
 		# DataSourceResourceLoaderTestCase.java requires configured jdbc
 		local JAVA_TEST_RUN_ONLY=$(find * \
 			-name "*TestCase.java" \
@@ -108,6 +108,6 @@ src_test() {
 			)
 		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
 		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-	popd
+	popd > /dev/null || die
 	java-pkg-simple_src_test
 }