gentoo resync : 28.04.2021

3 files changed, 149 insertions, 2 deletions

diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest
index c8c029c6844d..e99a35ffbbe0 100644
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@@ -1,3 +1,5 @@
 DIST velocity-1.7.tar.gz 5882643 BLAKE2B 4c1499bb015fe1c6b87257a60d247b1b0fb8558e6f879a3d04cf9ef0561ed69b89491c9ebba55cc54d14f6d377b300ee0f7e55ae4118236bba60dc632b5686b3 SHA512 542c9cc0efa118693bf1c952ac4b0c7c3d0229ef804afaa4f0f1c01ad40b0112055c21df7f800c302bf173d58461a864b29b9bc4b9174029d9748f88f2fcf9ab
-EBUILD velocity-1.7-r2.ebuild 1158 BLAKE2B fd1b951233aa2b2c141bb49d4835d04cf089239ebc6445d8f21bb7e5927bbc952f0ab53456e0ac122e3d4669ff792f5b0414d8931c35d553be921f67dfefb061 SHA512 64a0917d557e3e9b8fb0621d853c72be3b5ec51cbc9694f32e69d322a313a31ee3492049c70e1f5b0ce61eff4262372f94b641371cf15a235567d4805f02483f
+DIST velocity-2.3.tar.gz 443754 BLAKE2B 16b7aaa87eb6be899f40d09ee8aa50b2ac24dd59c33f29b944d46ea84a77de07cd69f344632b4b829b92a92fe6ccd75cf79e021787b2ca59a79040aa08a53eed SHA512 987f2991a96fa8fae43ff2f72d6a57b25b1cb7d98b7def7a1a6e9a308c8b5b86e394444c47ee0eca8b70d41b341759c7309404dc4b952dbc65fc3a5b92d46cdb
+EBUILD velocity-1.7-r2.ebuild 1199 BLAKE2B 9f49ea54fd948039507d236e2b1cc9519212d9ed3b3075dd8b209974ed4ddbe6190d22b5b5a6621a890d8b6eed04853f78d028fc4029c6626c3e18924a372a9c SHA512 39d3fa723ec7dfb4c98c91025364836b8e0c3ec03cc19de744aca2504960fab9f4aefe37828df14dee8377096067c1573f99568dd9941d64d38525dc116a4ea1
+EBUILD velocity-2.3.ebuild 5213 BLAKE2B 3a159172994cbaf4d0ef6c3e5150ffaf64eb34b11a41133ca1e11254f007351a309419bdbfd16827049c076ae255d1549c4ec3dbb42c7b495cda5fe37cc67b17 SHA512 de97e153f3fe9d807791a0a7e01abd35d0888828ca15c19c25371669088c63c678f4dcc18a88041d4c8cd2f5f327f1117482cdcad94bfae987b21f4de4721e7e
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/velocity/velocity-1.7-r2.ebuild b/dev-java/velocity/velocity-1.7-r2.ebuild
index fd655d63ddbc..facc1a8d7f55 100644
--- a/dev-java/velocity/velocity-1.7-r2.ebuild
+++ b/dev-java/velocity/velocity-1.7-r2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 JAVA_PKG_IUSE="examples doc source"
+MAVEN_ID="org.apache.velocity:velocity:1.7"
 
 inherit java-pkg-2 java-pkg-simple
 
diff --git a/dev-java/velocity/velocity-2.3.ebuild b/dev-java/velocity/velocity-2.3.ebuild
new file mode 100644
index 000000000000..495e3056411d
--- /dev/null
+++ b/dev-java/velocity/velocity-2.3.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2021 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/apache/velocity-engine/archive/refs/tags/2.3.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild velocity-2.3.ebuild
+
+EAPI=7
+
+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"
+SRC_URI="https://github.com/apache/${PN}-engine/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# commons-io:commons-io:2.8.0 -> >=dev-java/commons-io-2.8.0:1
+# org.apache.commons:commons-lang3:3.11 -> >=dev-java/commons-lang-3.11:3.6
+# org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
+
+CDEPEND="
+	>=dev-java/commons-io-2.8.0:1
+	>=dev-java/commons-lang-3.11:3.6
+	>=dev-java/slf4j-api-1.7.30:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
+# test? org.hsqldb:hsqldb:2.5.1 -> !!!groupId-not-found!!!
+# test? org.slf4j:slf4j-simple:1.7.30 -> >=dev-java/slf4j-simple-1.7.30:0
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+	test? (
+		dev-db/hsqldb:0
+		>=dev-java/slf4j-simple-1.7.30:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}
+"
+
+BDEPEND="
+	dev-java/javacc:0
+"
+
+S="${WORKDIR}/${PN}-engine-${PV}/${PN}-engine-core"
+
+JAVA_GENTOO_CLASSPATH="commons-io-1,commons-lang-3.6,slf4j-api"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,hsqldb,slf4j-simple"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+JAVA_TEST_EXCLUDES=(
+	# org.junit.runners.model.InvalidTestClassError: Invalid test class, No runnable methods
+	"org.apache.velocity.test.RenderVelocityTemplateTest"
+	"org.apache.velocity.test.provider.TestNumber"
+	"org.apache.velocity.test.provider.TestProvider"
+	"org.apache.velocity.test.sql.TestDataSource"
+	"org.apache.velocity.test.misc.TestContext"
+
+	# java.lang.IllegalArgumentException: Test class can only have one constructor
+	"org.apache.velocity.test.misc.TestLogger"
+
+	# junit.framework.AssertionFailedError: Class org.apache.velocity.test.sql.BaseSQLTest has no public constructor TestCase(String name) or TestCase()
+	"org.apache.velocity.test.sql.BaseSQLTest"
+
+	# requires configured jdbc
+	# junit.framework.AssertionFailedError: Exception in constructor: testSimpleTemplate (java.lang.NullPointerException
+	# junit.framework.AssertionFailedError: Exception in constructor: testNullTimestamp (java.lang.NullPointerException
+	# junit.framework.AssertionFailedError: Exception in constructor: testMacroInvocation (java.lang.NullPointerException
+	# junit.framework.AssertionFailedError: Exception in constructor: testRenderTool (java.lang.NullPointerException
+	"org.apache.velocity.test.sql.DataSourceResourceLoaderTestCase"
+)
+
+src_prepare() {
+	default
+
+	cp -v "${JAVA_SRC_DIR}-templates/org/apache/velocity/runtime/VelocityEngineVersion.java" \
+		"${JAVA_SRC_DIR}/org/apache/velocity/runtime/VelocityEngineVersion.java" || die
+
+	sed -i "s/\${project.version}/${PV}/g" \
+		"${JAVA_SRC_DIR}/org/apache/velocity/runtime/VelocityEngineVersion.java" || die
+
+	# fix paths for tests
+	sed -i \
+		-e "s%System.getProperty(\"test.compare.dir\")%\"${S}/target/test-classes\"%g" \
+		-e "s%System.getProperty(\"test.result.dir\")%\"${S}/results\"%g" \
+		"${JAVA_TEST_SRC_DIR}/org/apache/velocity/test/TemplateTestBase.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 -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 -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'"
+}