dev-java/lucene: version bump

Package-Manager: portage-2.1.9.35/cvs/Linux x86_64

3 files changed, 71 insertions, 2 deletions

diff --git a/dev-java/lucene/ChangeLog b/dev-java/lucene/ChangeLog
index 69a1e916f2ff..3946fdd933d2 100644
--- a/dev-java/lucene/ChangeLog
+++ b/dev-java/lucene/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/lucene
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/ChangeLog,v 1.73 2011/01/28 14:04:40 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/ChangeLog,v 1.74 2011/01/28 14:32:09 fordfrog Exp $
+
+*lucene-2.9.4 (28 Jan 2011)
+
+  28 Jan 2011; Miroslav Šulc <fordfrog@gentoo.org> +lucene-2.9.4.ebuild:
+  Version bump. The new ebuild removes bundled jars and puts junit on classpath
+  for compilation always, because javacc builds tests too.
 
 *lucene-3.0.3 (28 Jan 2011)
 
diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index 67f668ddabff..7df3944f35ff 100644
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -10,6 +10,7 @@ DIST lucene-2.3.2-src.tar.gz 4602041 RMD160 89537777752d458b8b9c94b0add86b2dedee
 DIST lucene-2.4.0-src.tar.gz 5053702 RMD160 c6c33faec176af806bf5e70ccef76458b1fd5f6c SHA1 7e7e59db8a006521459cde70376784bc95dac2f2 SHA256 01509848b8cf2e6675a38fc06124c7622cdd573e975ebcc893c36903b416b7c7
 DIST lucene-2.4.1-src.tar.gz 5057003 RMD160 ee991b32ad4729a647d94fb62c43a02dfb8568bd SHA1 7e4b31458255d6f0fa6b5a0fa9148a4ef1fb5a85 SHA256 47ecc5e105717d356e0468433d1a60f84f620d79ff9f48a78ca4be6c349b6a10
 DIST lucene-2.9.1-src.tar.gz 12459850 RMD160 dc8467e31c17038fae140831fa7a0c87bb956194 SHA1 edd7b39ad1aa65fce4112a4f6b14335376c1de04 SHA256 7e1d06d3bbc2a71889c84f5f89c8af0b438184097a57e7070790c79a1aeb9102
+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
 EBUILD lucene-1.4.3-r3.ebuild 1201 RMD160 b3ab6dee5897d9b48f93e7b6ed71a3a4803891a2 SHA1 bcfb3635a2855f2fdb77939a4401efc92d44b6c2 SHA256 3f941a5c8bde393964bf63595b69497e1ed81d81edc824c6228c7219f4d4610c
@@ -24,7 +25,8 @@ EBUILD lucene-2.3.2.ebuild 1781 RMD160 f18b7713d4f448536b3fb0c1008f74b05254d128
 EBUILD lucene-2.4.0.ebuild 1865 RMD160 84129bf4577979f4f160c34dbaef5a1edb7c826c SHA1 7f65068b8ebcfe67b2e59f1b6d0541765d088496 SHA256 d4d72ed639a34eef15c0d9c1d727f441e8b9b99aeecf4c1e9d01001c7298ff15
 EBUILD lucene-2.4.1.ebuild 1863 RMD160 d75cb32cdc274ba44a106f81b965b1a6b0e44611 SHA1 aa862fa6c104a1418a4b244d682c97e3debfbeff SHA256 f7da33646d98c40119005cf0b2be16d2378d6ddcafe3eef8f6010822651ddf10
 EBUILD lucene-2.9.1-r1.ebuild 1856 RMD160 df5582532889cc78fa59715c4f15b7776dcc7b35 SHA1 0cad841c458cc49b258ba58af4cb6e5cf930d368 SHA256 2b5957e1f97407add90ec065fdcf04b8ef096e90a2a5f03506d050203bb7ba13
+EBUILD lucene-2.9.4.ebuild 2077 RMD160 5edd59b03b8c4261711eacda53740961bc2941dc SHA1 750e21db0ed9dead067d96c8944ec59f30b7c623 SHA256 976b8845436526a03a89233b0c08c7703c416ba8f7bc9c59006a73431cd39a4b
 EBUILD lucene-3.0.0.ebuild 1853 RMD160 4435ab1577400d8e291fccbe4f2932585b1000d5 SHA1 cd940aa0bc3d81b4e3da80f14ef20f6954c45b66 SHA256 3ecfa556c90c1a8a5897b5d64844b9a5251a806f284e130bf8c289501dece8a2
 EBUILD lucene-3.0.3.ebuild 2077 RMD160 b2d82c125bb6b754a7aaa8b3f2af34f2b5d70749 SHA1 7d7f67b78bea921d412922ec0d2bfddebde65a50 SHA256 631ce183408a80b0b450d2708e63abb218b9bd33634a7db25a86c9d719e9a21c
-MISC ChangeLog 10002 RMD160 d33d326cd41d0818e07c1536f252fc90ed5a6d04 SHA1 24e8a72e64974b278d929cbc4c11bc97d304d339 SHA256 cdf7033bfce43717e4f79b5e85eadd1578de5cd6669df0d279380bd5bf9bb542
+MISC ChangeLog 10245 RMD160 3d9cfd7fbe99d1138e24e0f2a846f8560d0240f8 SHA1 d3afcae2039e526751db9c0ea7a95e4480762bf7 SHA256 47b5de3b6057818f8493099789af79f4b461d2c2173bea8f0f42af5271fe2fae
 MISC metadata.xml 286 RMD160 7ffc68ccd1e5e140d8f02fac2515611577d8ced7 SHA1 767c66c35ce232e683a70d4b8a3340d2af8fcf25 SHA256 1d61296c0f173473153e45ea775cb6909a64a10d89476c8519b3e6fd2cd6461a
diff --git a/dev-java/lucene/lucene-2.9.4.ebuild b/dev-java/lucene/lucene-2.9.4.ebuild
new file mode 100644
index 000000000000..cc2b4974d6b7
--- /dev/null
+++ b/dev-java/lucene/lucene-2.9.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-2.9.4.ebuild,v 1.1 2011/01/28 14:32:09 fordfrog Exp $
+
+EAPI="2"
+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="http://jakarta.apache.org/lucene"
+# when doing version bump, SRC_URI of the previous version should most probably
+# be changed to java/archive/ !
+SRC_URI="mirror://apache/lucene/java/${P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2.9"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-nodeps:0
+	dev-java/javacc:0
+	dev-java/junit:0
+	test? ( dev-java/ant-junit )"
+# junit is needed for compilation because tests are compiled for javacc target even when not requested
+RDEPEND=">=virtual/jdk-1.4"
+
+java_prepare() {
+	sed -i -e '/-Xmax/ d' common-build.xml
+	find -name "*.jar" -type f | xargs rm -v
+	java-pkg_jar-from --build-only --into lib junit junit.jar junit-3.8.2.jar
+}
+
+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-nodeps javacc" eant \
+		-Djavacc.home=/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() {
+	dodoc CHANGES.txt README.txt || die
+	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
+		dohtml -r docs/* || die
+		# for the core and demo subdirs
+		java-pkg_dohtml -r build/docs/api
+	fi
+	use source && java-pkg_dosrc src/java/org
+}