Fix all slots for Prefix, bug #351447

Package-Manager: portage-2.2.01.17719-prefix/cvs/Darwin powerpc

8 files changed, 39 insertions, 31 deletions

diff --git a/dev-java/lucene/ChangeLog b/dev-java/lucene/ChangeLog
index 3946fdd933d2..b1010fa6863a 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.74 2011/01/28 14:32:09 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/ChangeLog,v 1.75 2011/01/31 21:19:52 grobian Exp $
+
+  31 Jan 2011; Fabian Groffen <grobian@gentoo.org> lucene-2.1.0-r1.ebuild,
+  lucene-2.2.0.ebuild, lucene-2.4.1.ebuild, lucene-2.9.4.ebuild,
+  lucene-3.0.0.ebuild, lucene-3.0.3.ebuild:
+  Fix all slots for Prefix, bug #351447
 
 *lucene-2.9.4 (28 Jan 2011)
 
diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index 7df3944f35ff..4b851f26093e 100644
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -15,18 +15,18 @@ DIST lucene-3.0.0-src.tar.gz 12421467 RMD160 ff42a7084f7f3fc2e0bdd0f14c6fd96d4ef
 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
 EBUILD lucene-1.9.1.ebuild 1480 RMD160 d3ca6f1c62b574430d4b5cc6163aa4404e64c6bf SHA1 a4700771a499b329c0cacc9a3bcd26528866c348 SHA256 f4b5c9847ec6d0ccf17bec623f4ccab6c2fb3e33681ec26d0891650b6528f910
-EBUILD lucene-2.1.0-r1.ebuild 1608 RMD160 ae8719197775250a37b8c974d6e6065dc85b95c4 SHA1 ed1d20106fcdb11ed805176ea35c0e9e896168da SHA256 a8c3ba5a90d15bb8c83175a75ccdf39395d34404eb30068833ded82abea1a700
+EBUILD lucene-2.1.0-r1.ebuild 1628 RMD160 547d4d914bf6e0914ceab4f990d40fb3440bd63a SHA1 8b2353040e86663ed6a3c37fe2462f272a83529d SHA256 0eae0d7e1ec1206b6e30d00d76d814986da6c2745c9be04a9ca6feefabccb3ba
 EBUILD lucene-2.1.0.ebuild 1603 RMD160 d660e077fd75a123f69991c02119bd2b8ec1ceb0 SHA1 c0ce024636a6c9a94642e029566a9a6641bbf26f SHA256 7c607bad9a7dc41bcc80e9f5b1530d2d62a21c13af6e9b852eacc15c8a49de43
-EBUILD lucene-2.2.0.ebuild 1613 RMD160 0b27be0f6ad508278ac7658c302312b792d511be SHA1 8dbd24af69e910491318a83b8a44d72fccc87264 SHA256 f64b745b35cb096d1be2309c18ee41ea1ef23e25d46624c5b05b7234372dccd9
+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
 EBUILD lucene-2.3.1.ebuild 1784 RMD160 1fd5d9c0897fe108abcc7dcc3085d0006e91f215 SHA1 427774768ef25727c7143424968ebe299259088a SHA256 6ff41b246e01a6814283cbec427dd80d32842b670942204dc89a66c422037660
 EBUILD lucene-2.3.2-r1.ebuild 1842 RMD160 2ab0cdfb8518bccbcb27cd166cf6746ac998cb30 SHA1 88d8f8a90744e55210d7778e7f720e29714e7924 SHA256 a9c62ba907bab80a040c7f26b9e77d67aa7a76af43e917e9235a4ca122fdd219
 EBUILD lucene-2.3.2.ebuild 1781 RMD160 f18b7713d4f448536b3fb0c1008f74b05254d128 SHA1 7aff8a196881427c22ced2c0bedd6ce1df300079 SHA256 640bebf5e590ded0f0c9707ae53d1de9837ca2bb1936c669d78079e7d9b5ce68
 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.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 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 10245 RMD160 3d9cfd7fbe99d1138e24e0f2a846f8560d0240f8 SHA1 d3afcae2039e526751db9c0ea7a95e4480762bf7 SHA256 47b5de3b6057818f8493099789af79f4b461d2c2173bea8f0f42af5271fe2fae
+EBUILD lucene-2.9.4.ebuild 2088 RMD160 0bc79861ac296a41c5e0a7aa037835b2b56c2572 SHA1 40f324e4746682231201853c72aa4463b342f846 SHA256 d01c65065c69cbe9f35dc44ffd8dabd48805190bfe328bcb15ad1861fcca526c
+EBUILD lucene-3.0.0.ebuild 1866 RMD160 e68abe21d34b47889dc2cf19414c28bb444a3a78 SHA1 c38e65651d934c78b012b4edb2125a94cce62c8e SHA256 2974c619b8e0bb02ea07b08723ae9d587f7f49f33bc0fcda331203753ab4a1b0
+EBUILD lucene-3.0.3.ebuild 2088 RMD160 018cae55e592130cd14444d3a164cebb08559f4a SHA1 bab45fdae75a700a3eab637533717707ea71e5a0 SHA256 29ffca9ba8d48500aabeece5860d4fdbc263c8af47005ae7e1c615e86fb5c0e6
+MISC ChangeLog 10469 RMD160 1ebf0f6d71d3f27a20f8046a8309be1b9d74796a SHA1 764daae771cd51a6835429aec0153e87acc85482 SHA256 d68f77d0d64e51c4f661f150626dd41205f7584e2024354b66da5fd2ff62462d
 MISC metadata.xml 286 RMD160 7ffc68ccd1e5e140d8f02fac2515611577d8ced7 SHA1 767c66c35ce232e683a70d4b8a3340d2af8fcf25 SHA256 1d61296c0f173473153e45ea775cb6909a64a10d89476c8519b3e6fd2cd6461a
diff --git a/dev-java/lucene/lucene-2.1.0-r1.ebuild b/dev-java/lucene/lucene-2.1.0-r1.ebuild
index f367aafd92c5..90a96b2bf61b 100644
--- a/dev-java/lucene/lucene-2.1.0-r1.ebuild
+++ b/dev-java/lucene/lucene-2.1.0-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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-r1.ebuild,v 1.2 2008/11/01 09:39:23 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-2.1.0-r1.ebuild,v 1.3 2011/01/31 21:19:52 grobian Exp $
+
+EAPI=3
 
 JAVA_PKG_IUSE="doc source test"
 JAVA_PKG_BSFIX_ALL="no"
@@ -27,7 +29,7 @@ src_compile() {
 	# 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
+		-Djavacc.home="${EPREFIX}"/usr/share/javacc/lib javacc
 	ANT_TASKS="none" eant -Dversion=${PV} jar-core jar-demo $(use_doc javadocs)
 }
 
diff --git a/dev-java/lucene/lucene-2.2.0.ebuild b/dev-java/lucene/lucene-2.2.0.ebuild
index c151dde39b35..8c68481c1610 100644
--- a/dev-java/lucene/lucene-2.2.0.ebuild
+++ b/dev-java/lucene/lucene-2.2.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.2.0.ebuild,v 1.3 2008/11/01 09:39:23 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-2.2.0.ebuild,v 1.4 2011/01/31 21:19:52 grobian Exp $
+
+EAPI=3
 
 JAVA_PKG_IUSE="doc source test"
 JAVA_PKG_BSFIX_ALL="no"
@@ -27,7 +29,7 @@ src_compile() {
 	# 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
+		-Djavacc.home="${EPREFIX}"/usr/share/javacc/lib javacc
 	ANT_TASKS="none" eant -Dversion=${PV} jar-core jar-demo $(use_doc javadocs)
 }
 
diff --git a/dev-java/lucene/lucene-2.4.1.ebuild b/dev-java/lucene/lucene-2.4.1.ebuild
index 8220b379e30e..6493a7ed0cf1 100644
--- a/dev-java/lucene/lucene-2.4.1.ebuild
+++ b/dev-java/lucene/lucene-2.4.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.4.1.ebuild,v 1.5 2009/12/29 07:32:32 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-2.4.1.ebuild,v 1.6 2011/01/31 21:19:52 grobian Exp $
+
+EAPI=3
 
 JAVA_PKG_IUSE="doc source test"
 JAVA_PKG_BSFIX_ALL="no"
@@ -23,10 +25,7 @@ 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}"
-
+src_prepare() {
 	sed -i -e '/-Xmax/ d' common-build.xml
 }
 
@@ -36,7 +35,7 @@ src_compile() {
 	# 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
+		-Djavacc.home="${EPREFIX}"/usr/share/javacc/lib javacc
 	ANT_TASKS="none" eant -Dversion=${PV} jar-core jar-demo $(use_doc javadocs-core javadocs-demo)
 }
 
diff --git a/dev-java/lucene/lucene-2.9.4.ebuild b/dev-java/lucene/lucene-2.9.4.ebuild
index cc2b4974d6b7..8fe10d992b88 100644
--- a/dev-java/lucene/lucene-2.9.4.ebuild
+++ b/dev-java/lucene/lucene-2.9.4.ebuild
@@ -1,8 +1,8 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-2.9.4.ebuild,v 1.2 2011/01/31 21:19:52 grobian Exp $
 
-EAPI="2"
+EAPI="3"
 JAVA_PKG_IUSE="doc source test"
 JAVA_PKG_BSFIX_ALL="no"
 JAVA_PKG_BSFIX_NAME="build.xml common-build.xml"
@@ -38,7 +38,7 @@ src_compile() {
 	# 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
+		-Djavacc.home="${EPREFIX}"/usr/share/javacc/lib javacc
 	ANT_TASKS="none" eant -Dversion=${PV} jar-core jar-demo $(use_doc javadocs-core javadocs-demo)
 }
 
diff --git a/dev-java/lucene/lucene-3.0.0.ebuild b/dev-java/lucene/lucene-3.0.0.ebuild
index 84ea574bcdff..0728c97d660b 100644
--- a/dev-java/lucene/lucene-3.0.0.ebuild
+++ b/dev-java/lucene/lucene-3.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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-3.0.0.ebuild,v 1.4 2010/06/01 14:49:21 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-3.0.0.ebuild,v 1.5 2011/01/31 21:19:52 grobian Exp $
 
-EAPI="2"
+EAPI="3"
 JAVA_PKG_IUSE="doc source test"
 JAVA_PKG_BSFIX_ALL="no"
 JAVA_PKG_BSFIX_NAME="build.xml common-build.xml"
@@ -34,7 +34,7 @@ src_compile() {
 	# 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
+		-Djavacc.home="${EPREFIX}"/usr/share/javacc/lib javacc
 	ANT_TASKS="none" eant -Dversion=${PV} jar-core jar-demo $(use_doc javadocs-core javadocs-demo)
 }
 
diff --git a/dev-java/lucene/lucene-3.0.3.ebuild b/dev-java/lucene/lucene-3.0.3.ebuild
index e74d00704987..312d1377cc0c 100644
--- a/dev-java/lucene/lucene-3.0.3.ebuild
+++ b/dev-java/lucene/lucene-3.0.3.ebuild
@@ -1,8 +1,8 @@
 # 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-3.0.3.ebuild,v 1.1 2011/01/28 14:04:40 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-3.0.3.ebuild,v 1.2 2011/01/31 21:19:52 grobian Exp $
 
-EAPI="2"
+EAPI="3"
 JAVA_PKG_IUSE="doc source test"
 JAVA_PKG_BSFIX_ALL="no"
 JAVA_PKG_BSFIX_NAME="build.xml common-build.xml"
@@ -38,7 +38,7 @@ src_compile() {
 	# 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
+		-Djavacc.home="${EPREFIX}"/usr/share/javacc/lib javacc
 	ANT_TASKS="none" eant -Dversion=${PV} jar-core jar-demo $(use_doc javadocs-core javadocs-demo)
 }