dev-java/lucene: fixed jdk to 1.5 as it uses generics

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

3 files changed, 59 insertions, 12 deletions

diff --git a/dev-java/lucene/ChangeLog b/dev-java/lucene/ChangeLog
index df28deeef6a8..8dbc436b5a4a 100644
--- a/dev-java/lucene/ChangeLog
+++ b/dev-java/lucene/ChangeLog
@@ -1,6 +1,11 @@
 # 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.80 2011/08/28 16:17:17 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/ChangeLog,v 1.81 2011/10/18 23:18:57 fordfrog Exp $
+
+*lucene-2.1.0-r2 (18 Oct 2011)
+
+  18 Oct 2011; Miroslav Šulc <fordfrog@gentoo.org> +lucene-2.1.0-r2.ebuild:
+  Contains generics so must use at least JDK 1.5
 
   28 Aug 2011; Fabian Groffen <grobian@gentoo.org> lucene-2.1.0-r1.ebuild:
   Marked ~x64-macos
diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index d624b2cb10ca..70ab11ce20b1 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
@@ -19,6 +16,7 @@ DIST lucene-3.0.3-src.tar.gz 12446839 RMD160 163a0d8130ef27c9b55bc055cdd4286c1e2
 EBUILD lucene-1.4.3-r3.ebuild 1201 RMD160 b3ab6dee5897d9b48f93e7b6ed71a3a4803891a2 SHA1 bcfb3635a2855f2fdb77939a4401efc92d44b6c2 SHA256 3f941a5c8bde393964bf63595b69497e1ed81d81edc824c6228c7219f4d4610c
 EBUILD lucene-1.9.1.ebuild 1480 RMD160 d3ca6f1c62b574430d4b5cc6163aa4404e64c6bf SHA1 a4700771a499b329c0cacc9a3bcd26528866c348 SHA256 f4b5c9847ec6d0ccf17bec623f4ccab6c2fb3e33681ec26d0891650b6528f910
 EBUILD lucene-2.1.0-r1.ebuild 1645 RMD160 073cc9f17d8a1374f1fba286505e497ebd770df6 SHA1 0adaf70b4e3d6834f6e49bed9d538b369570c001 SHA256 a1aee776a66cba9e5943819a2d646677046190bed382d5482a951e0352020262
+EBUILD lucene-2.1.0-r2.ebuild 1650 RMD160 984c9bc5e266cba3f254a4ff7c05999808816f91 SHA1 9c49e2ee7344fb3f0e69e32a105bba6a0cbdcea1 SHA256 807e173f73941db20d23e661244d1806a6230cfa3389da609e03137a11338254
 EBUILD lucene-2.1.0.ebuild 1603 RMD160 d660e077fd75a123f69991c02119bd2b8ec1ceb0 SHA1 c0ce024636a6c9a94642e029566a9a6641bbf26f SHA256 7c607bad9a7dc41bcc80e9f5b1530d2d62a21c13af6e9b852eacc15c8a49de43
 EBUILD lucene-2.2.0.ebuild 1633 RMD160 cd2b30dd91b2b186bd2a5f6f7784154752b6063b SHA1 2b3525677bb61bd1b5c2580bfc0f498b94e3d578 SHA256 922fae4ad4ca767bb0bb80478028472f0f675a0a5454667d42bb099ac4b0b27a
 EBUILD lucene-2.3.0.ebuild 1784 RMD160 a7c2f41b4ad2c462b4f91efa348472aaf756a4f2 SHA1 e2b6af1a205be69db76b6ac3ddcc459bc0b57f7e SHA256 162a0930fb37d9659e259235bd537c200b47833b3581badf86ddeb7043ac283e
@@ -31,12 +29,5 @@ EBUILD lucene-2.9.1-r1.ebuild 1856 RMD160 df5582532889cc78fa59715c4f15b7776dcc7b
 EBUILD lucene-2.9.4.ebuild 2089 RMD160 327a6b2e3202ddba20c54c9aee4c00c8412cbffa SHA1 495ba5fcf7b72ece4293d2ef259b8c7f8f28f6d9 SHA256 573a5ad8680c235a623d0f80f49c27a443c07117c84156ad668eca6471b79257
 EBUILD lucene-3.0.0.ebuild 1866 RMD160 e68abe21d34b47889dc2cf19414c28bb444a3a78 SHA1 c38e65651d934c78b012b4edb2125a94cce62c8e SHA256 2974c619b8e0bb02ea07b08723ae9d587f7f49f33bc0fcda331203753ab4a1b0
 EBUILD lucene-3.0.3.ebuild 2090 RMD160 c196c7e1bb798e28af287d50642d6f72116d6dc4 SHA1 e35ffe407b9bec9717ebdbd3732f9a9ead953211 SHA256 a97e559b423911a1feadf4b1e9a6e052a7e559974a65795b29fb8e8916dd850a
-MISC ChangeLog 11028 RMD160 8007f259b7a819f6dd2b19a9be5c17418eb467e1 SHA1 270fb21fed56931cb53c204186cb1f6838c9a9f2 SHA256 e6260acdb17632f8b157079421ba6b57a4af8599eca31b4cc082009966e9f205
+MISC ChangeLog 11188 RMD160 7702465324fab6fe9f082a3c775654665e6c3ce0 SHA1 8d5222c9d722ad42e849f7d69310cf8385992800 SHA256 1f177def1969d14e16a8603a10a0d35c7f60691426d4032d4df3b3d93feb3376
 MISC metadata.xml 286 RMD160 7ffc68ccd1e5e140d8f02fac2515611577d8ced7 SHA1 767c66c35ce232e683a70d4b8a3340d2af8fcf25 SHA256 1d61296c0f173473153e45ea775cb6909a64a10d89476c8519b3e6fd2cd6461a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (Darwin)
-
-iEYEARECAAYFAk5aahMACgkQX3X2B8XHTon4EwCfbIsrTCSDYFe0ZOUeOXYxsg4F
-o3QAn2kyCFZvL18F7TiPUmjR3WEYlAmx
-=UjED
------END PGP SIGNATURE-----
diff --git a/dev-java/lucene/lucene-2.1.0-r2.ebuild b/dev-java/lucene/lucene-2.1.0-r2.ebuild
new file mode 100644
index 000000000000..6e3e1fc4c374
--- /dev/null
+++ b/dev-java/lucene/lucene-2.1.0-r2.ebuild
@@ -0,0 +1,51 @@
+# 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.1.0-r2.ebuild,v 1.1 2011/10/18 23:18:57 fordfrog Exp $
+
+EAPI=3
+
+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"
+SRC_URI="mirror://apache/lucene/java/archive/${P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2.1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-macos"
+IUSE=""
+DEPEND=">=virtual/jdk-1.5
+	dev-java/ant-nodeps
+	dev-java/javacc
+	test? ( dev-java/ant-junit =dev-java/junit-3* )"
+RDEPEND=">=virtual/jdk-1.5"
+
+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="${EPREFIX}"/usr/share/javacc/lib javacc
+	ANT_TASKS="none" eant -Dversion=${PV} jar-core jar-demo $(use_doc javadocs)
+}
+
+src_test() {
+	java-ant_rewrite-classpath common-build.xml
+	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test
+}
+
+src_install() {
+	dodoc CHANGES.txt README.txt
+	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/*
+		java-pkg_dojavadoc build/docs/api
+	fi
+	use source && java-pkg_dosrc src/java/org
+}