Fix all slots for Prefix, bug #351447

(Portage version: 2.2.01.17719-prefix/cvs/Darwin powerpc)

7 files changed, 32 insertions, 24 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/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)
 }