gentoo resync : 20.03.2022

4 files changed, 85 insertions, 195 deletions

diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index 266e5432944f..944fc9c585eb 100644
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -1,5 +1,4 @@
 DIST lucene-2.4.1.tar.gz 5057003 BLAKE2B 3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3faaaa3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba SHA512 cf227eea4aeee904ccf5316ee7f2399864bf28b9c01e044ef27232dd483c3a5f0ecc8836633f44acfa41ffee6bf1c530e756ef45fa77ac1d15e1f83129b7aa5e
-DIST lucene-3.6.2-src.tgz 32139784 BLAKE2B 48fe88efeae8396e084f827aa66530480f40aee3a2e59c8524420059f004a73be4c1e50c98345ad0ad4808ff8a0a996f9406523bf5c124616657ec91f9797f70 SHA512 e9a08a1b5303c44e4feecc0bb6e7013e4a9420517ae4e98999bd318ec25b5b2ff3b6de8b51db8f68afc0fdc3149829297023a95b103d4f99e7db68deee4c3965
 EBUILD lucene-2.4.1-r2.ebuild 1802 BLAKE2B 71e720f396d65c1621d956d0536c3655a1530014861df0350dc506b7e03f2acd4f75ab70f0f7768ae867523ee49e1b7fac11095502fbba65d350ecf8223d1d41 SHA512 2551db0ac39d6ca7516b71e86202cef50e7784ee49f715f03703b205509e89983e735cc66ce3970abca9212390edbb06a948399310845e758855fb4764e2c985
-EBUILD lucene-3.6.2-r2.ebuild 5553 BLAKE2B 4602e1ddf43e0fc5b71093bbc88069fe7f016187e78b61fd7a1fbd7ed03f1ce54b1dcf42e918f128c3bb58cc7eadfdd4fcb3ba455d5567788a9866834c805db4 SHA512 92d2a8aa60347ae964ed8d99e50c57addb4b3621fee34262a865565c6280f381dfc9f14792ddb330d89a1b7fbaaf07d4031bf6cbbd2ddfffa62634fd84779b49
-MISC metadata.xml 320 BLAKE2B 964c2f3d2447805c88b2e80f6430adb397ae5d39397f989c281c93419ec2ed5b777944be9666d74985095010b1de72bfbbdee1533fbbb9ef1bfb5f53c783cce6 SHA512 d3c1f696fe447d24b8023f391d205b7a0e64613494a6d8f14561646b4b842b354bf07430157600a1db151b47a00b8883fb14cb2dc54e7bbc25570469887dce4f
+EBUILD lucene-2.4.1-r3.ebuild 2074 BLAKE2B 46e4ac4faf9de5e5a8017c80cb373e84cd4f9934b441f8ea57c5250f046a0f44b744bdf0057c198456c2f228d8e537efee1514b337962c7dce30e6b3a20b6694 SHA512 02dbcafbf53a6e2eba563ce9f0df44f327acd7732d1c293ad722d816918a8c14537f2b18d8af2572c539c04fec58169a6806619d7d6bf0d4c8bb1339d4d1df0f
+MISC metadata.xml 235 BLAKE2B 5144dc07ec1e929d9a5734dc5c96258dbc8292cd9710c8deb32bdb3b585964b29e7f28563f2b71fc10e8601805c8d75549315d5997c5c0544bacfbd1c554c365 SHA512 da42efb5c9e4e199aa88b5ff4c2ba647284a3f82d251ddabd7e888ffb7e0efe68f6060aa06ebf8c059f3affdf275ee787566acb355ccbc9f072f9f7f3e28f729
diff --git a/dev-java/lucene/lucene-2.4.1-r3.ebuild b/dev-java/lucene/lucene-2.4.1-r3.ebuild
new file mode 100644
index 000000000000..762e6681fc1e
--- /dev/null
+++ b/dev-java/lucene/lucene-2.4.1-r3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_PKG_BSFIX_ALL="no"
+JAVA_PKG_BSFIX_NAME="build.xml common-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="https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.4"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+	dev-java/javacc:0"
+
+# Restricting to jdk:1.8 since it fails to build with openjdk-17
+# BUILD FAILED
+# /var/tmp/portage/dev-java/lucene-2.4.1-r3/work/lucene-2.4.1/build.xml:52: rmic does not exist under Java 15 and higher,
+# use rmic of an older JDK and explicitly set the executable attribute
+DEPEND="
+	${CDEPEND}
+	virtual/jdk:1.8
+	test? (
+		dev-java/junit:0
+		dev-java/ant-core:0
+	)"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+src_prepare() {
+	default
+	java-pkg_clean
+	sed -i -e '/-Xmax/ d' common-build.xml || die
+
+	# Portage marks shese files as bogus for some reason.
+	find . -type f -name instruction_arrow.png -exec rm -v {} \; || die
+}
+
+src_compile() {
+	# regenerate javacc files just because we can
+	# put javacc.jar on ant's classpath here even when <javacc> task
+	# doesn't use it - it's to fool the <available> test, first time
+	# it's useful not to have ignoresystemclasses=true...
+	ANT_TASKS="ant-core javacc" \
+		eant \
+		-Djavacc.home="${EPREFIX}"/usr/share/javacc/lib \
+		javacc
+	ANT_TASKS="none" \
+		eant \
+		-Dversion=${PV} \
+		jar-core \
+		jar-demo \
+		$(use_doc javadocs-core javadocs-demo)
+}
+
+src_test() {
+	java-ant_rewrite-classpath common-build.xml
+	EANT_GENTOO_CLASSPATH="junit ant-core" \
+		ANT_TASKS="ant-junit" \
+		eant \
+		test-core
+}
+
+src_install() {
+	einstalldocs
+	java-pkg_newjar "build/${PN}-core-${PV}.jar" "${PN}-core.jar"
+	java-pkg_newjar "build/${PN}-demos-${PV}.jar" "${PN}-demos.jar"
+
+	if use doc; then
+		dodoc -r docs
+		java-pkg_dohtml -r build/docs/api
+	fi
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/lucene/lucene-3.6.2-r2.ebuild b/dev-java/lucene/lucene-3.6.2-r2.ebuild
deleted file mode 100644
index 091821750c1b..000000000000
--- a/dev-java/lucene/lucene-3.6.2-r2.ebuild
+++ /dev/null
@@ -1,189 +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.6"
-KEYWORDS="amd64 x86"
-
-CDEPEND="
-	dev-java/ant-ivy:2
-	dev-java/ant-junit:0
-	dev-java/ant-core:0
-	dev-java/hamcrest-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
-	)"
-
-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_prepare() {
-	default
-	java-pkg_clean
-	sed -i \
-		-e '/-Xmax/ d' \
-		-e '/property="ivy.available"/s,resource="${ivy.resource}",file="." type="dir",g' \
-		-e '/<ivy:retrieve/d' \
-		common-build.xml || die
-	mkdir -p {.,queries,benchmark,analyzers/phonetic}/lib || die
-	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
-	java-pkg_jar-from --build-only --into lib \
-		ant-ivy:2
-	java-pkg_jar-from --build-only --into lib \
-		junit-4 junit.jar junit-4.10.jar
-	java-pkg_jar-from --build-only --into lib \
-		hamcrest-core
-
-	# Always needed anyway
-	cd "${S}"/test-framework/ || die
-	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
-	java-pkg_jar-from --build-only --into lib \
-		junit-4 junit.jar junit-4.10.jar
-	java-pkg_jar-from --build-only --into lib \
-		hamcrest-core
-
-	if use contrib; then
-	    cd "${S}"/contrib/ || die
-		# queries
-	    java-pkg_jar-from --build-only --into queries/lib \
-	    	jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexp-1.4.jar
-		# benchmark
-	    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
-		# analyzers/phonetic
-	    java-pkg_jar-from --build-only --into analyzers/phonetic/lib \
-	    	commons-codec commons-codec.jar commons-codec-1.6.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/core/${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 core/src/java/org
-	  	 use contrib && java-pkg_dosrc contrib
-	fi
-}
diff --git a/dev-java/lucene/metadata.xml b/dev-java/lucene/metadata.xml
index fc70b0ebf07e..9a0df749aac0 100644
--- a/dev-java/lucene/metadata.xml
+++ b/dev-java/lucene/metadata.xml
@@ -5,7 +5,4 @@
   <email>java@gentoo.org</email>
   <name>Java</name>
 </maintainer>
-<use>
-  <flag name="contrib">Include extra functionality from contrib/</flag>
-</use>
 </pkgmetadata>