Bump with changes written during ApacheCon NA 2011 (yes, it took me 6 months to get around to this commit.)

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

4 files changed, 224 insertions, 1 deletions

diff --git a/dev-java/lucene/ChangeLog b/dev-java/lucene/ChangeLog
index eafcb1590a35..a09018dbeddb 100644
--- a/dev-java/lucene/ChangeLog
+++ b/dev-java/lucene/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/lucene
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/ChangeLog,v 1.87 2012/05/12 03:39:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/ChangeLog,v 1.88 2012/05/28 23:21:36 robbat2 Exp $
+
+*lucene-3.4.0 (28 May 2012)
+*lucene-3.5.0 (28 May 2012)
+
+  28 May 2012; Robin H. Johnson <robbat2@gentoo.org> +lucene-3.4.0.ebuild,
+  +lucene-3.5.0.ebuild, metadata.xml:
+  Bump with changes written during ApacheCon NA 2011 (yes, it took me 6 months
+  to get around to this commit.)
 
   12 May 2012; Alexis Ballier <aballier@gentoo.org> lucene-2.1.0-r2.ebuild:
   keyword ~amd64-fbsd
diff --git a/dev-java/lucene/lucene-3.4.0.ebuild b/dev-java/lucene/lucene-3.4.0.ebuild
new file mode 100644
index 000000000000..591b05f4bbc6
--- /dev/null
+++ b/dev-java/lucene/lucene-3.4.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-3.4.0.ebuild,v 1.1 2012/05/28 23:21:36 robbat2 Exp $
+
+EAPI="3"
+JAVA_PKG_IUSE="doc source test contrib"
+JAVA_PKG_BSFIX_ALL="no"
+JAVA_PKG_BSFIX_NAME="build.xml common-build.xml contrib-build.xml"
+#JAVA_PKG_DEBUG=1
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="High-performance, full-featured text search engine library
+written entirely in Java"
+HOMEPAGE="http://lucene.apache.org"
+SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
+LICENSE="Apache-2.0"
+SLOT="3.4"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND=">=virtual/jdk-1.5
+	dev-java/ant-nodeps:0
+	dev-java/junit:4
+	dev-java/ant-junit: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
+	)"
+RDEPEND=">=virtual/jdk-1.5"
+
+#dev-java/javacc:0 - no longer needed, files are prebuilt
+
+java_prepare() {
+	#find -name "*.jar" -type f | xargs rm -v
+	sed -i \
+		-e '/-Xmax/ d' \
+		common-build.xml
+	# 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/
+	  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
+	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 ant-core ant-junit" ANT_TASKS="ant-junit" eant test-core
+}
+
+src_install() {
+	dodoc CHANGES.txt README.txt NOTICE.txt CHANGES.txt \
+	    JRE_VERSION_MIGRATION.txt|| die
+	java-pkg_newjar build/${PN}-core-${PV}.jar ${PN}-core.jar
+	if use contrib; then
+		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
+		dohtml -r docs/* || die
+		java-pkg_dohtml -r build/docs/api
+	fi
+	if use source; then
+	     java-pkg_dosrc src/java/org || die
+	  	 if use contrib; then
+	    	java-pkg_dosrc  contrib  || die
+	  	 fi
+	fi
+}
diff --git a/dev-java/lucene/lucene-3.5.0.ebuild b/dev-java/lucene/lucene-3.5.0.ebuild
new file mode 100644
index 000000000000..273b045d1f38
--- /dev/null
+++ b/dev-java/lucene/lucene-3.5.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-3.5.0.ebuild,v 1.1 2012/05/28 23:21:36 robbat2 Exp $
+
+EAPI="3"
+JAVA_PKG_IUSE="doc source test contrib"
+JAVA_PKG_BSFIX_ALL="no"
+JAVA_PKG_BSFIX_NAME="build.xml common-build.xml contrib-build.xml"
+#JAVA_PKG_DEBUG=1
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="High-performance, full-featured text search engine library
+written entirely in Java"
+HOMEPAGE="http://lucene.apache.org"
+SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
+LICENSE="Apache-2.0"
+SLOT="3.5"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND=">=virtual/jdk-1.5
+	dev-java/ant-nodeps:0
+	dev-java/junit:4
+	dev-java/ant-junit: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
+	)"
+RDEPEND=">=virtual/jdk-1.5"
+
+#dev-java/javacc:0 - no longer needed, files are prebuilt
+
+java_prepare() {
+	#find -name "*.jar" -type f | xargs rm -v
+	sed -i \
+		-e '/-Xmax/ d' \
+		common-build.xml
+	# 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/
+	  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
+	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 ant-core ant-junit" ANT_TASKS="ant-junit" eant test-core
+}
+
+src_install() {
+	dodoc CHANGES.txt README.txt NOTICE.txt CHANGES.txt \
+	    JRE_VERSION_MIGRATION.txt|| die
+	java-pkg_newjar build/${PN}-core-${PV}.jar ${PN}-core.jar
+	if use contrib; then
+		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
+		dohtml -r docs/* || die
+		java-pkg_dohtml -r build/docs/api
+	fi
+	if use source; then
+	     java-pkg_dosrc src/java/org || die
+	  	 if use contrib; then
+	    	java-pkg_dosrc  contrib  || die
+	  	 fi
+	fi
+}
diff --git a/dev-java/lucene/metadata.xml b/dev-java/lucene/metadata.xml
index a8562b808a9b..bd2c9d01b9b3 100644
--- a/dev-java/lucene/metadata.xml
+++ b/dev-java/lucene/metadata.xml
@@ -6,4 +6,7 @@
   <email>robbat2@gentoo.org</email>
   <description>Maintainer for actual Lucene issues.</description>
 </maintainer>
+<use>
+  <flag name='contrib'>Include extra functionality from contrib/</flag>
+</use>
 </pkgmetadata>