dev-java/lucene: fixed compilation problem

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

diff --git a/dev-java/lucene/ChangeLog b/dev-java/lucene/ChangeLog
index 8dbc436b5a4ac4c2f5282b1c8ad796c020de6d9c..d7bdfcac950ee7c19e1e2e063c91d40e63ee1715 100644 (file)
--- a/dev-java/lucene/ChangeLog
+++ b/dev-java/lucene/ChangeLog
@@ -1,6 +1,9 @@
 # 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.81 2011/10/18 23:18:57 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/ChangeLog,v 1.82 2011/12/01 12:37:46 fordfrog Exp $
+
+  01 Dec 2011; Miroslav Šulc <fordfrog@gentoo.org> lucene-2.9.4.ebuild:
+  It fails to build with source 1.4 because of annotations and generics
 
 *lucene-2.1.0-r2 (18 Oct 2011)
 

diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index 70ab11ce20b17c051c7d622e8f26d6d23523620b..a9a0be99b5fe4d86f8ba18c74aec6207cc9726d1 100644 (file)
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -26,8 +26,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 1860 RMD160 14f0f0431addd8dce7479725981e285bcccbd05f SHA1 287562e306151a1db1243c8195d755afe19476dd SHA256 315ec400bf514e5622d13672b4dfedf5ea6bff1a72da408d3005d4b3a7df2b42
 EBUILD lucene-2.9.1-r1.ebuild 1856 RMD160 df5582532889cc78fa59715c4f15b7776dcc7b35 SHA1 0cad841c458cc49b258ba58af4cb6e5cf930d368 SHA256 2b5957e1f97407add90ec065fdcf04b8ef096e90a2a5f03506d050203bb7ba13
-EBUILD lucene-2.9.4.ebuild 2089 RMD160 327a6b2e3202ddba20c54c9aee4c00c8412cbffa SHA1 495ba5fcf7b72ece4293d2ef259b8c7f8f28f6d9 SHA256 573a5ad8680c235a623d0f80f49c27a443c07117c84156ad668eca6471b79257
+EBUILD lucene-2.9.4.ebuild 2087 RMD160 f1b2c319ed054f985274aeba72be73d3e2b7f6fe SHA1 2944dfd9a7e6cc7ec975716feafd1a816c2f4466 SHA256 06d77325cf6df94c459f0c8494431508fd048a0d9cccf392285d75771f6e7e35
 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 11188 RMD160 7702465324fab6fe9f082a3c775654665e6c3ce0 SHA1 8d5222c9d722ad42e849f7d69310cf8385992800 SHA256 1f177def1969d14e16a8603a10a0d35c7f60691426d4032d4df3b3d93feb3376
+MISC ChangeLog 11334 RMD160 f054afe0442bd312873499f700ee8eb2622bb098 SHA1 3858b32233672c3491011a44b915e38eec771e5a SHA256 c832e2c3e82547d08fc1248279e90589649fc3f7333938b1f0353087b837a5d0
 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
index 134dc4b5567db589b34e6d173832c9cb4ba7f330..9dcd4ea81df7d21da9912bdb3a5bd26a4eb7f8b8 100644 (file)
--- a/dev-java/lucene/lucene-2.9.4.ebuild
+++ b/dev-java/lucene/lucene-2.9.4.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2011/03/20 17:44:56 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-2.9.4.ebuild,v 1.5 2011/12/01 12:37:46 fordfrog Exp $
 
 EAPI="3"
 JAVA_PKG_IUSE="doc source test"
@@ -18,13 +18,13 @@ LICENSE="Apache-2.0"
 SLOT="2.9"
 KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
 IUSE=""
-DEPEND=">=virtual/jdk-1.4
+DEPEND=">=virtual/jdk-1.5
        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"
+RDEPEND=">=virtual/jdk-1.5"
 
 java_prepare() {
        sed -i -e '/-Xmax/ d' common-build.xml