summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2009-09-09 23:56:08 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2009-09-09 23:56:08 +0000
commit5dfaa6bf2daee3aa99aae22207993133af9f2413 (patch)
tree0305e4614fcc651b8f00a0ae77d2b5cbc911df97 /dev-java/lucene
parentRemoved old (diff)
downloadhistorical-5dfaa6bf2daee3aa99aae22207993133af9f2413.tar.gz
historical-5dfaa6bf2daee3aa99aae22207993133af9f2413.tar.bz2
historical-5dfaa6bf2daee3aa99aae22207993133af9f2413.zip
Bug #270712: Fix build with non-Sun javac.
Package-Manager: portage-2.2_rc40/cvs/Linux x86_64
Diffstat (limited to 'dev-java/lucene')
-rw-r--r--dev-java/lucene/ChangeLog7
-rw-r--r--dev-java/lucene/Manifest4
-rw-r--r--dev-java/lucene/lucene-2.4.0.ebuild11
3 files changed, 16 insertions, 6 deletions
diff --git a/dev-java/lucene/ChangeLog b/dev-java/lucene/ChangeLog
index a5d0d2e2bb54..614860b4abc5 100644
--- a/dev-java/lucene/ChangeLog
+++ b/dev-java/lucene/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/lucene
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/ChangeLog,v 1.53 2008/11/01 09:39:23 robbat2 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/ChangeLog,v 1.54 2009/09/09 23:56:08 robbat2 Exp $
+
+ 09 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> lucene-2.4.0.ebuild:
+ Bug #270712: Fix build with non-Sun javac.
01 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> lucene-1.4.3-r3.ebuild,
lucene-1.9.1.ebuild, lucene-2.1.0.ebuild, lucene-2.1.0-r1.ebuild,
diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index 79f7e5d09082..8637b39f6922 100644
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -16,6 +16,6 @@ EBUILD lucene-2.2.0.ebuild 1613 RMD160 0b27be0f6ad508278ac7658c302312b792d511be
EBUILD lucene-2.3.0.ebuild 1784 RMD160 a7c2f41b4ad2c462b4f91efa348472aaf756a4f2 SHA1 e2b6af1a205be69db76b6ac3ddcc459bc0b57f7e SHA256 162a0930fb37d9659e259235bd537c200b47833b3581badf86ddeb7043ac283e
EBUILD lucene-2.3.1.ebuild 1784 RMD160 1fd5d9c0897fe108abcc7dcc3085d0006e91f215 SHA1 427774768ef25727c7143424968ebe299259088a SHA256 6ff41b246e01a6814283cbec427dd80d32842b670942204dc89a66c422037660
EBUILD lucene-2.3.2.ebuild 1784 RMD160 6b28e49081d64db23fced33f55c6356014c5ec35 SHA1 b3dab93038cfb5803a7ab7b5cadbff7489db87b6 SHA256 ba562df5fd251b0fbde42a73ac5adfa3dc4da9914728c2389db73310bf123391
-EBUILD lucene-2.4.0.ebuild 1784 RMD160 9c9c246a8661dabeab0fae0a4b2c2b5e95f770af SHA1 c3b80e1ccac7b4b7b2945409ab8739b99a16dacf SHA256 00cc532a78122321619ebc2bc94b58f590a1149bb83fb5c1a185b88aad5542e9
-MISC ChangeLog 7485 RMD160 a24785e6b571abfbfbaa6d0229b997a7e14147ff SHA1 e6d66126fdd36efb64aa7ef3548f7e96a760a8a9 SHA256 20f7afba3a6cd6147ef718671229682d915aa2011fba62dff5884a760224ffb7
+EBUILD lucene-2.4.0.ebuild 1869 RMD160 38708f09078761ad170c2051e644606cc69fd554 SHA1 68e933c273190ac15d8f3a3a4404f5a2485f96b6 SHA256 24d1e8c90db2c93e8f0b39554a44e1ff5e3cbd15ced8bcb287ce87c07ef49428
+MISC ChangeLog 7605 RMD160 9648b79cec4097b4bf1d31c585f3bdcfb31c37d3 SHA1 104022686c9c78d79ff8c6acf5c3ddfe9d001b8a SHA256 40a2d3cfdd1421e0e0449b63cba7dcd49ad976c271f69d9115c643f04b48d556
MISC metadata.xml 286 RMD160 7ffc68ccd1e5e140d8f02fac2515611577d8ced7 SHA1 767c66c35ce232e683a70d4b8a3340d2af8fcf25 SHA256 1d61296c0f173473153e45ea775cb6909a64a10d89476c8519b3e6fd2cd6461a
diff --git a/dev-java/lucene/lucene-2.4.0.ebuild b/dev-java/lucene/lucene-2.4.0.ebuild
index 8b9b38ab563d..b64c4571615c 100644
--- a/dev-java/lucene/lucene-2.4.0.ebuild
+++ b/dev-java/lucene/lucene-2.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-2.4.0.ebuild,v 1.3 2008/11/01 09:39:23 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-2.4.0.ebuild,v 1.4 2009/09/09 23:56:08 robbat2 Exp $
JAVA_PKG_IUSE="doc source test"
JAVA_PKG_BSFIX_ALL="no"
@@ -23,6 +23,13 @@ DEPEND=">=virtual/jdk-1.4
test? ( dev-java/ant-junit =dev-java/junit-3* )"
RDEPEND=">=virtual/jdk-1.4"
+src_unpack() {
+ unpack "${A}"
+ cd "${S}"
+
+ sed -i -e '/-Xmax/ d' common-build.xml
+}
+
src_compile() {
# regenerate javacc files just because we can
# put javacc.jar on ant's classpath here even when <javacc> task