Adding metadata

9 files changed, 188 insertions, 191 deletions

diff --git a/dev-java/gwt/Manifest b/dev-java/gwt/Manifest
index 45f07b6b71dd..6a0f247896b3 100644
--- a/dev-java/gwt/Manifest
+++ b/dev-java/gwt/Manifest
@@ -1,2 +1,4 @@
 DIST gwt-2.8.2.zip 22017212 BLAKE2B b112df08885e607c975f9585d6b83e2a12894e974850ada052918e4b946b11bfc8d9cf9d71f4e684121d9d16714885be549eed44d77a119e695c2b50cd6bc6c3 SHA512 ac16311c3b00b36d421eef914e73ad8dea01f022c87fc7ed722fdfee8eed391f1987cc1c34522978afc542cdb90eee791efcdcc725d9a395ab468e458b708074
+DIST gwt-2.9.0.tar.gz 13081965 BLAKE2B 8b18e4cad6df9b1a2336bdf537a26def021ccd950299a6064e9a7328d0161c093f56284cce7b8a0e0a0c72b0dc9604e5e5527332d1878afd19a3c95eed5129a7 SHA512 424484a42f28387734a89a3a12b48716031e194e3a712a5e7cbdb66f77ab68e72ff8751f70a4048f4b9f35d92948c285490fd8e23c34d5c5e5558fee33952bf5
+DIST gwt-tools-194772ed94078802d8030136796de344eb1fdbe1.tar.gz 575902138 BLAKE2B 518ed1752cc82a527521525e181db712a641d36db203f511bdcc5206de314aa1eb693415b690fc42f38c9beabaffc484ad6ec3444e3cd8b4f2a3fa2ab9505f11 SHA512 0365d664b4b14ec833c922c8fab5df269e69ac8f1526315810f4922132439b880ee15e7e8b80e8b505469a374ba4a47998c7ed07b5f53227d50100247fade82b
 DIST gwt-tools-f42d2729a3a8e6ba9b9aec069957bce5dc0f6f6d.zip 577453206 BLAKE2B 83a3824d6418727876b4708ed44ab1f58513a5b39d4e48f9bf21290ca358f76ec2ccd98ce2aee76afe7f621fb1f703bf459b8c3d6a3d4f32d4be807bc723513e SHA512 f4f033c972d955da40258020a9fb84ae90f30b7afeb1ae8044cf00f4f5f45200129bf84e2f69660a4eb80bb60f3a5a1d3c5af69fe9e07e0b985de0e708ca933f
diff --git a/dev-java/gwt/files/gwt-2.9.0-jsinterop-classpath.patch b/dev-java/gwt/files/gwt-2.9.0-jsinterop-classpath.patch
new file mode 100644
index 000000000000..5e69341210cf
--- /dev/null
+++ b/dev-java/gwt/files/gwt-2.9.0-jsinterop-classpath.patch
@@ -0,0 +1,20 @@
+# It's unclear how upstream gets their "dev.compile.test" target to compile
+# without this - it could be that their testing is done with the local tools/
+# dir, and that some assumptions are made somewhere in the bulid system that
+# don't apply when the tools dir is elsewhere. Either way, this fixes it.
+#
+# a Pull Request (of sorts) has been issued with upstream to incorporate this
+# change. I would list the PR link here, but they use gerrit, and i don't
+# understand what happened to my submission after I issued
+# `git push upstream HEAD:refs/for/master`
+
+--- a/dev/build.xml
++++ b/dev/build.xml
+@@ -60,6 +60,7 @@
+         <pathelement
+             location="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar"/>
+         <pathelement location="${gwt.build.lib}/gwt-dev-${build.host.platform}.jar"/>
++        <pathelement location="${gwt.tools.lib}/jsinterop/jsinterop-annotations-2.0.0.jar"/>
+         <pathelement location="${alldeps.jar}"/>
+       </classpath>
+     </gwt.javac>
diff --git a/dev-java/gwt/files/gwt-2.9.0-remove-git-usage.patch b/dev-java/gwt/files/gwt-2.9.0-remove-git-usage.patch
new file mode 100644
index 000000000000..9ebbafb99099
--- /dev/null
+++ b/dev-java/gwt/files/gwt-2.9.0-remove-git-usage.patch
@@ -0,0 +1,26 @@
+# This git stuff in the ant configs is useful during development, since it does
+# something or other withe git revision and sets some sort of sentinel file.
+# Since this package is for a release, we don't need it.
+--- a/common.ant.xml
++++ b/common.ant.xml
+@@ -277,16 +277,16 @@
+ 
+   <macrodef name="gwt.getgitinfo" description="Identifies the GIT info of a workspace">
+     <sequential>
+-      <exec executable="git" searchpath="true" outputproperty="gwt.gitrev">
+-        <arg line="rev-parse --short HEAD"/>
+-      </exec>
++      <!-- <exec executable="git" searchpath="true" outputproperty="gwt.gitrev"> -->
++      <!--   <arg line="rev-parse - -short HEAD"/> -->
++      <!-- </exec> -->
+       <!-- Generally, filtering requires a sentinel file so that changes to git rev will
+          be noticed as invalidating the previously-generated filter output.  This property
+          names where such a sentinel lives; it is tested with <available/> and created
+          with <touch/> -->
+       <mkdir dir="${project.build}/sentinels"/>
+       <property name="filter.sentinel"
+-                location="${project.build}/sentinels/gwt-${gwt.version}-git-${gwt.gitrev}"/>
++                location="${project.build}/sentinels/gwt-${gwt.version}"/>
+     </sequential>
+   </macrodef>
+ 
diff --git a/dev-java/gwt/gwt-2.9.0.ebuild b/dev-java/gwt/gwt-2.9.0.ebuild
new file mode 100644
index 000000000000..b3a3173ebca2
--- /dev/null
+++ b/dev-java/gwt/gwt-2.9.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2 java-utils-2
+
+GWT_TOOLS_COMMIT="194772ed94078802d8030136796de344eb1fdbe1"
+GWT_TOOLS_PN="tools"
+
+DESCRIPTION="Google Web Toolkit library"
+HOMEPAGE="http://www.gwtproject.org/"
+SRC_URI="https://github.com/gwtproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/gwtproject/${GWT_TOOLS_PN}/archive/${GWT_TOOLS_COMMIT}.tar.gz -> ${PN}-${GWT_TOOLS_PN}-${GWT_TOOLS_COMMIT}.tar.gz"
+# While the test suite does compile and does execute with an exit status of 0,
+# there are many tests that end with FAILED status. It is unclear if this is
+# expected from upstream or not, but in order to keep things honest, the test
+# suite is being restricted
+RESTRICT="mirror test"
+SLOT="2.8"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+CDEPEND="
+	dev-java/json:0
+	dev-java/guava:20
+	dev-java/rhino:1.6
+	dev-java/asm:9
+	dev-java/eclipse-ecj:4.5
+	dev-java/validation-api:1.0
+"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+DEPEND="
+	${CDEPEND}
+	virtual/jdk:1.8
+"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_BUILD_TARGET="build"
+EANT_GENTOO_CLASSPATH="
+		json
+		asm-9
+		guava-20
+		rhino-1.6
+		eclipse-ecj-4.5
+		validation-api-1.0
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.9.0-jsinterop-classpath.patch"
+	"${FILESDIR}/${PN}-2.9.0-remove-git-usage.patch"
+)
+
+src_prepare() {
+	default
+
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	# the default setup assumes that you've placed these in ${S}/tools. We put
+	# it in ${WORKDIR} though
+	export GWT_TOOLS="${WORKDIR}/${GWT_TOOLS_PN}-${GWT_TOOLS_COMMIT}"
+	export GWT_VERSION="${PV}"
+
+	java-pkg-2_src_compile
+}
+
+src_test() {
+	local -x ANT_OPTS=-Dfile.encoding=UTF-8
+	local -x TZ=America/Los_Angeles
+
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local i18nCreater_launcher_args=(
+		i18nCreater
+		--main com.google.gwt.i18n.tools.I18NCreater
+		--jar gwt-dev.jar
+		)
+	local webAppCreator_launcher_args=(
+		webAppCreator
+		--main com.google.gwt.user.tools.WebAppCreator
+		--jar gwt-dev.jar
+	)
+
+	java-pkg_dojar build/lib/*.jar
+	java-pkg_dolauncher ${i18nCreater_launcher_args[@]}
+	java-pkg_dolauncher ${webAppCreator_launcher_args[@]}
+}
diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index 9ba9127489ef..b91637637531 100644
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -1,4 +1,2 @@
-DIST lucene-1.4.3-src.tar.gz 768320 BLAKE2B 8017b672b0104be007582a67cff5cb130187afcf9608bec0cb2b6bae9b3ea8c67486b324740c99e4db8f23879dd614a098f778f6b52b429d3dd1906387e9b61e SHA512 426539a4b4a8887485c4301b2127ad4815646d1a81bca877ed2b0e68d886fcaf844449532a080754b79696c0f9e9c5f304be28487e0f9aa11178565a20f29911
 DIST lucene-2.4.1.tar.gz 5057003 BLAKE2B 3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3faaaa3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba SHA512 cf227eea4aeee904ccf5316ee7f2399864bf28b9c01e044ef27232dd483c3a5f0ecc8836633f44acfa41ffee6bf1c530e756ef45fa77ac1d15e1f83129b7aa5e
-DIST lucene-3.5.0-src.tgz 39564076 BLAKE2B 5018f0e07a9df3f2f55c540e94e349e64e2c02c99acf14946e4471e16ace4f17a18e306aca6187028cde4434f0d6b38090442baaddaa79ef12ff34a8461f9e98 SHA512 58846190ed0e8c0747e14cb46bf27255d0e4ee93aa0969cf16140713ce20c8fc3f451353437313f14416c92b7b6825d4ce3416d9c7ce4cb1854f31877c2af275
 DIST lucene-3.6.2-src.tgz 32139784 BLAKE2B 48fe88efeae8396e084f827aa66530480f40aee3a2e59c8524420059f004a73be4c1e50c98345ad0ad4808ff8a0a996f9406523bf5c124616657ec91f9797f70 SHA512 e9a08a1b5303c44e4feecc0bb6e7013e4a9420517ae4e98999bd318ec25b5b2ff3b6de8b51db8f68afc0fdc3149829297023a95b103d4f99e7db68deee4c3965
diff --git a/dev-java/lucene/lucene-1.4.3-r4.ebuild b/dev-java/lucene/lucene-1.4.3-r4.ebuild
deleted file mode 100644
index a5604d395c7c..000000000000
--- a/dev-java/lucene/lucene-1.4.3-r4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance, full-featured Java text search engine"
-HOMEPAGE="https://lucene.apache.org"
-SRC_URI="mirror://apache/lucene/java/archive/${P}-src.tar.gz"
-
-KEYWORDS="amd64 x86"
-LICENSE="Apache-1.1"
-SLOT="1"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	test? ( dev-java/ant-junit:0 )"
-
-RDEPEND="
-	>=virtual/jre-1.6"
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-src_compile() {
-	eant jar-core $(use_doc javadocs)
-}
-
-src_test() {
-	java-ant_rewrite-classpath build.xml
-	EANT_GENTOO_CLASSPATH="junit ant-core" \
-		ANT_TASKS="ant-junit" \
-		eant test
-}
-
-src_install() {
-	einstalldocs
-	java-pkg_newjar build/lucene-1.5-rc1-dev.jar
-
-	if use doc; then
-		dodoc -r docs/*
-		java-pkg_dojavadoc build/docs/api
-	fi
-
-	use examples && java-pkg_doexamples src/demo
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/lucene/lucene-3.5.0-r2.ebuild b/dev-java/lucene/lucene-3.5.0-r2.ebuild
deleted file mode 100644
index 6d0031e124b3..000000000000
--- a/dev-java/lucene/lucene-3.5.0-r2.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test contrib"
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_BSFIX_NAME="build.xml common-build.xml contrib-build.xml"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="https://lucene.apache.org"
-SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="3.5"
-KEYWORDS="amd64 x86"
-
-CDEPEND="
-	dev-java/junit:4
-	dev-java/ant-junit:0
-	dev-java/ant-core:0
-	contrib? (
-	          dev-java/jakarta-regexp:1.4
-			  dev-java/commons-compress:0
-	          dev-java/commons-collections:0
-	          dev-java/commons-digester:0
-	          dev-java/commons-logging:0
-			  dev-java/commons-beanutils:1.7
-	)"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6
-	test? (
-		dev-java/junit:4
-		dev-java/ant-core:0
-	)"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DOCS=(
-	CHANGES.txt README.txt
-	NOTICE.txt CHANGES.txt
-	JRE_VERSION_MIGRATION.txt
-)
-
-# All tests fail with the following error:
-# junit.framework.AssertionFailedError: ensure your setUp() calls super.setUp()!!!
-RESTRICT="test"
-
-src_prepare() {
-	default
-	java-pkg_clean
-	sed -i \
-		-e '/-Xmax/ d' \
-		common-build.xml || die
-
-	# FIXME: contrib builds do not work if junit not included
-	#java-pkg_jar-from --build-only --into lib \
-	#	junit-4 junit.jar junit-4.7.jar
-	java-pkg_jar-from --build-only --into lib \
-		ant-core ant.jar ant-1.7.1.jar
-	java-pkg_jar-from --build-only --into lib \
-		ant-junit ant-junit.jar ant-junit-1.7.1.jar
-
-	if use contrib; then
-	  cd contrib/ || die
-	  java-pkg_jar-from --build-only --into queries/lib \
-	  	jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexpt-1.4.jar
-	  java-pkg_jar-from --build-only --into benchmark/lib \
-	  	commons-compress commons-compress.jar commons-compress-1.1.jar
-	  java-pkg_jar-from --build-only --into benchmark/lib \
-	  	commons-collections commons-collections.jar commons-collections-3.1.jar
-	  java-pkg_jar-from --build-only --into benchmark/lib \
-	  	commons-digester commons-digester.jar commons-digester-1.7.jar
-	  java-pkg_jar-from --build-only --into benchmark/lib \
-	  	commons-logging commons-logging.jar commons-logging-1.0.4.jar
-	  java-pkg_jar-from --build-only --into benchmark/lib \
-	  	commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
-	fi
-}
-
-src_compile() {
-	# FIXME: docs do not build if behind a proxy, -autoproxy does not work
-	java-ant_xml-rewrite -f common-build.xml \
-		-c -e javadoc \
-		-a failonerror \
-		-v "false"
-
-	ANT_TASKS="none" \
-		eant -Dversion=${PV} \
-		-Dfailonjavadocwarning=false \
-		jar-core \
-		$(use_doc javadocs-core)
-
-	if use contrib; then
-		ANT_TASKS="none" \
-			eant -Dversion=${PV} \
-			-Dfailonjavadocwarning=false \
-			build-contrib \
-			$(use_doc javadocs-all)
-	fi
-}
-
-src_test() {
-	# FIXME: test does not get run, even when selected
-	java-ant_rewrite-classpath common-build.xml
-	EANT_GENTOO_CLASSPATH="junit-4 ant-core ant-junit" \
-		ANT_TASKS="ant-junit" \
-		eant test-core
-}
-
-src_install() {
-	einstalldocs
-	java-pkg_newjar build/${PN}-core-${PV}.jar ${PN}-core.jar
-
-	if use contrib; then
-		local i j
-		for i in $(find build/contrib -name \*-${PV}.jar); do
-		    j=${i##*/}
-			java-pkg_newjar $i ${j%%-${PV}.jar}.jar
-		done
-	fi
-	if use doc; then
-		dodoc -r docs
-		java-pkg_dohtml -r build/docs/api
-	fi
-	if use source; then
-	     java-pkg_dosrc src/java/org
-	  	 use contrib && java-pkg_dosrc contrib
-	fi
-}
diff --git a/dev-java/mockito/mockito-1.9.5-r2.ebuild b/dev-java/mockito/mockito-1.9.5-r2.ebuild
new file mode 100644
index 000000000000..1076b1486ea3
--- /dev/null
+++ b/dev-java/mockito/mockito-1.9.5-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A mocking framework for Java"
+HOMEPAGE="https://github.com/mockito/mockito"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+CDEPEND="
+	dev-java/ant-core:0
+	dev-java/hamcrest-core:0
+	dev-java/junit:4
+	dev-java/objenesis:0
+"
+RDEPEND="${CDEPEND}
+	virtual/jre:1.8"
+DEPEND="${CDEPEND}
+	virtual/jdk:1.8"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+JAVA_SRC_DIR="src"
+JAVA_GENTOO_CLASSPATH="junit-4,objenesis,hamcrest-core,ant-core"
+
+src_unpack() {
+	unpack ${A}
+	unzip "${S}"/sources/${PN}-core-${PV}-sources.jar -d src/ || die
+}
+
+src_prepare() {
+	default
+	find "${S}" -name "*.jar" -delete || die
+}
diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild b/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild
index 5ad6b886170b..e3e792562312 100644
--- a/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/antlr/stringtemplate3/archive/${MY_COMMIT}.tar.gz ->
 
 LICENSE="BSD-1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Common dependencies
 # POM: pom.xml