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

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

5 files changed, 230 insertions, 13 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/Manifest b/dev-java/lucene/Manifest
index bcd1a572a3e7..f543c1d61532 100644
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX disable-contrib.patch 2457 RMD160 a84c94094fab55c8b3fbf7c66f81518a2b9c0a37 SHA1 259d8abacdd8f1c2de2fb438e8ad5d38443169da SHA256 ddaa9d857e09ec02f64acdfb94c2eeff2b9ce061833b13822d2ecfac3bd8290f
 AUX lucene-manifest 505 RMD160 82ee9900dee2f4ccee3d8b7b19b94c613326e473 SHA1 3cfc8148961f45eaa194e97948bd9c726c946247 SHA256 47d26e144e15ac7d675547630f8d4d4399244eaaf1fb84429a7f82e806463218
 DIST lucene-1.4.3-src.tar.gz 768320 RMD160 e865c15885722e87c437d36e60fabd333976fb14 SHA1 7a7b62aa57ca4bae3a83c37aeb494592a677ef01 SHA256 62051daecebbae50c4e9d1c4d840f32fc58d85b0a5b370095c98e346c9ba1049
@@ -16,6 +13,8 @@ DIST lucene-2.9.1-src.tar.gz 12459850 RMD160 dc8467e31c17038fae140831fa7a0c87bb9
 DIST lucene-2.9.4-src.tar.gz 12494586 RMD160 da4229b7541cab1776a491c4bec86bbd15871c73 SHA1 bac4fdea0fcd18788d798f5cdd24fd975cca6b3f SHA256 2a8bd7c6f0632bc406bcec0091d286b3efd4743c2d45fd88b0d0d564281780cd
 DIST lucene-3.0.0-src.tar.gz 12421467 RMD160 ff42a7084f7f3fc2e0bdd0f14c6fd96d4ef8dc03 SHA1 45e6c44c15eaaf866dffc81379279036eaec971f SHA256 661fc4eec33c2c509c1a53896da469304a51c5cc5ce51313d9f77f385c63346a
 DIST lucene-3.0.3-src.tar.gz 12446839 RMD160 163a0d8130ef27c9b55bc055cdd4286c1e2e9e3b SHA1 68a312095b44f24dec253059f3abf314e19cce5e SHA256 91365fe5af0279b7b6300f17033580746c90272417665d9572db1c1a9d1ba37e
+DIST lucene-3.4.0-src.tgz 39329123 RMD160 1490f62672a1d842f50792c238320adf66c72e0d SHA1 da71a706438d9ac2d5efad8e373f0ffba3d582da SHA256 e0471a61085b4aac8db831b5c981262d972a611e4fea491c4e188a9ee730ff2a
+DIST lucene-3.5.0-src.tgz 39564076 RMD160 6958b7df2e1e8f83eaa5197a545ce5a2cad38436 SHA1 06969f57ad93f31e173419b6991d117b5f111624 SHA256 814dbfcd91b76522ae350817c306be8c4a72dfe8c809540be4b20209acfb9a27
 EBUILD lucene-1.4.3-r3.ebuild 1184 RMD160 8fb2df71fdf9c9fad95b9e3ff8b1608b9a31b405 SHA1 c6d55beea7cf3bfefe63ba1287fd6fc83ec476b4 SHA256 d7d41cfa6b974d0be063d9b8a8da2479f9595c2df309ac843d1fc5458380e3b2
 EBUILD lucene-1.9.1.ebuild 1463 RMD160 6b6da276c3cfdade86f8f2a187e3140dbf494871 SHA1 058042aaa9b634f504adcf25a9f3240821157987 SHA256 3ec26ce608e07173447e59a4eb6b16f09c835cfaf83f152baf695f69dfd5cbad
 EBUILD lucene-2.1.0-r1.ebuild 1634 RMD160 4b9aa69dd35f2f5bc10b59528e777d8a3326bb36 SHA1 c284c75ca8aaf8010d110ef32d327f3083794084 SHA256 f2ac5066e3994f3e88df48813da846fd8bcfc5b7ad7567aa1d6cbc9b95252306
@@ -32,12 +31,7 @@ EBUILD lucene-2.9.1-r1.ebuild 1846 RMD160 b953f8a8208b6b7af4d633a2bdeb6f9c52db53
 EBUILD lucene-2.9.4.ebuild 2073 RMD160 89129b6f76d9a655aa4eea77e90a48d238f3dbf5 SHA1 bb377da504a8579ce3ab1fb50517d2299ba2cdd6 SHA256 8d9ece6712a5bdd3a66176eb20a3cc476e22fbe9e108387faa0ebcfc2bc1c177
 EBUILD lucene-3.0.0.ebuild 1855 RMD160 61f2fcf0f3f8b2798806c6a19bad178b3aeda5bb SHA1 1b917733ba3e88520b3447d2b1a3fd2be1ed1cd6 SHA256 a9e467a8bbf1e9b2b7fe1143fcaa5e9f747056d71ce94ef21a1c19efce4e9c10
 EBUILD lucene-3.0.3.ebuild 2092 RMD160 417f0397aef56c1fe5230a85654476a2272c5405 SHA1 8d3223e8a80498d4021adb85ae21c4b533d41ca0 SHA256 b89f57ff97ac76d04394fd0c9d933472f5da51a0bb62b5f73c4ce5ad4e7082fe
-MISC ChangeLog 12188 RMD160 00ca3d0cc08b8d0c2cf12203dfb8312d4f366cbd SHA1 12408fe819d7cba0333e4eb03d2a3753e080e3de SHA256 18363853839ea3a653fc2ea51cb3f14bf6ea4c740abe3d20efb3ea8c95d18b91
-MISC metadata.xml 286 RMD160 7ffc68ccd1e5e140d8f02fac2515611577d8ced7 SHA1 767c66c35ce232e683a70d4b8a3340d2af8fcf25 SHA256 1d61296c0f173473153e45ea775cb6909a64a10d89476c8519b3e6fd2cd6461a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEARECAAYFAk+t244ACgkQvFcC4BYPU0pqZgCfeNfu07JcnnHUJrdWsKID8dB7
-2+IAnRvF37OlzCcMw7a+taCuFas+wAJd
-=Km6V
------END PGP SIGNATURE-----
+EBUILD lucene-3.4.0.ebuild 3390 RMD160 73a5748c0ce3e9ef9ead97011dd285db1823c0df SHA1 b6531988cdc8b98cea4a5c3b4efa3f4fe957b6d7 SHA256 47592e12860fab19064a0eac5c4f95e9f16b2940a201d21aac1ac13b7900cfa3
+EBUILD lucene-3.5.0.ebuild 3390 RMD160 b4384942281a935e6350a35d8999bac599d00477 SHA1 6dbefead5cf96f0f8b30ea2d9bbfdef21b0e8fa0 SHA256 201cc57998bac14d138b31a088e2bb07fae5e33dae80ee2fba91444348b35f52
+MISC ChangeLog 12470 RMD160 62754644cf7dd8701493f6702aef1e5e1525bc09 SHA1 fdf3062188f7da101c1349982af67e6ba13e46c1 SHA256 e687e307919a13b340d357dde730f0bedcb800c3dc29705dad89c4bc53fcadbc
+MISC metadata.xml 371 RMD160 28214f9a23a96ed6dd593f39db0ed6bc5e0b19e9 SHA1 3009a5c43e88843fd7f0faf7de6b886a7ec43ee9 SHA256 30d6aa8ff474df00e447a1d5cbf29421d0da4aa6fb9029093a234580e97d333e
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>