gentoo resync : 18.03.2018

3 files changed, 327 insertions, 0 deletions

diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index 4867c2989da0..0c968aab2e5e 100644
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -5,5 +5,7 @@ DIST lucene-3.6.2-src.tgz 32139784 BLAKE2B 48fe88efeae8396e084f827aa66530480f40a
 EBUILD lucene-1.4.3-r4.ebuild 981 BLAKE2B c506d4a98402026bca8e4c968bb9d56ecaf5ab5f37891834b587db8069c32bc41ac2d8f75a7c63f26a4eb80929a3fe9b6310ba3577bad32cf505809971cbd568 SHA512 abcbbadabe7dd9dccd2fa59c8888b6871e0104d803139a53549341f2a691975de2a3e9092c7dd4c2738dd89038fa154fd32dc91c293a8373bd012408bf2d1d69
 EBUILD lucene-2.4.1-r2.ebuild 1804 BLAKE2B 09b9ec3959dce0cd93fe8db4f091c4734c61bad7efb0717db0816a357945f310c866d732054920f86755a63849b500d0739f8c7f3f804a3b90d3244baccd560f SHA512 c8558fe7bb43e2bbe40daca7a05fbe5de006ab8aa8eac810e1528a12b5de84e030dbdf724382cfd6667a0c8c456e9b86ff66e8cfa15f5efc9a7a3cb8a6b84e35
 EBUILD lucene-3.5.0-r1.ebuild 3514 BLAKE2B 4e944c04e995278521268166d300e292c21b477969505de26f56d2450c2461e2fe76040d52ab81218176ac52a1104de7de37f7f05e942975789710b5304e2b08 SHA512 c1cd0378af15f5c555cbb9459415552e10861738107a321b3023ce57b569b8733d6779cdb87bcc75ff1f2f526f8cc87a74aab8402fbc3d2ffdedab5a93c805db
+EBUILD lucene-3.5.0-r2.ebuild 3514 BLAKE2B 08d936f48b45430c56c4c3485affce07c208ac6d204de1be7d6cdf24423dc0473af6553075266ab678f9e55204723950cc386c09636995fe17d72316cfbd048a SHA512 02d58b267125d3fd0e5ea0d2e7acdd691b8e40d0b180c21200797234a5d7485d72a72a12eed7ec0963ca7862505efb1c520845711e44dac348a7acc260ebd286
 EBUILD lucene-3.6.2-r1.ebuild 5555 BLAKE2B ab16e0833ee520598e3590a98379fd51ea01eb09d46e04e69b350e86fa51c52b329967081a844a33505494ffc953b08420418faf9ef41a994748e900d71649e7 SHA512 c47459c094fa94f22a79c1623a4a9fa3c4edec4de72520d641d21f054eb1089b2949de0666678407dcb0ac9bc3114126a8651b9ddf7ae5729c8b789736513098
+EBUILD lucene-3.6.2-r2.ebuild 5555 BLAKE2B 14ba002faa12b7d11e2575bb7a76aacbf826499ef4be171ff0674e85f22ba9abe88184ed850572cc5a3dfd980f8191d85f6ce1c8ebd6510d21de193307ffb7b1 SHA512 082aa5ecf6a13d4e4b887be80b579372fe1a0e8a2784a20f56f223f62b1cf63c8b7a6b03d30f8827507f98b75f72d9943abf3642b9bcb5bd7feae170c0b60021
 MISC metadata.xml 462 BLAKE2B 2f93e0f1a5f130d6e17e1431764c6492bb1c66200ab79175a54f8ecb3311b8edc9fc6ce1c7e062bc7357d2f48c4155829c34d719a780b373336a2c95d52d70e8 SHA512 611e91130a53366e58e7a628f1eb63317064eff25cc9921e3f4c0c649e7e140a5478667fed236da8c10c52d3c4a70cf0f3d87445d6e82f052910b6b35550036f
diff --git a/dev-java/lucene/lucene-3.5.0-r2.ebuild b/dev-java/lucene/lucene-3.5.0-r2.ebuild
new file mode 100644
index 000000000000..9eaf6f89d189
--- /dev/null
+++ b/dev-java/lucene/lucene-3.5.0-r2.ebuild
@@ -0,0 +1,136 @@
+# 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/lucene/lucene-3.6.2-r2.ebuild b/dev-java/lucene/lucene-3.6.2-r2.ebuild
new file mode 100644
index 000000000000..6ff6151e9bb8
--- /dev/null
+++ b/dev-java/lucene/lucene-3.6.2-r2.ebuild
@@ -0,0 +1,189 @@
+# 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
+}