added prefix support (bug #435378)

(Portage version: 2.2.0_alpha140/cvs/Linux i686, signed Manifest commit with key C2000586)

2 files changed, 16 insertions, 14 deletions

diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog
index 33b9abfae3ae..c577a0300bbf 100644
--- a/dev-java/gnu-classpath/ChangeLog
+++ b/dev-java/gnu-classpath/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/gnu-classpath
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.116 2011/03/29 09:13:40 caster Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.117 2012/10/18 08:44:11 ottxor Exp $
+
+  18 Oct 2012; Christoph Junghans <ottxor@gentoo.org>
+  gnu-classpath-0.98-r3.ebuild:
+  added prefix support (bug #435378)
 
   29 Mar 2011; Vlastimil Babka <caster@gentoo.org>
   -gnu-classpath-0.98-r2.ebuild, gnu-classpath-0.98-r3.ebuild:
@@ -500,4 +504,3 @@
   09 Mar 2004; Chris Aniszczyk <zx@gentoo.org> gnu-classpath-0.06.ebuild,
   metadata.xml:
   Initial Import. Closes #43926
-
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild
index e41e5d9ce92a..fbf77a2ef911 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild,v 1.6 2011/03/29 09:13:40 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild,v 1.7 2012/10/18 08:44:11 ottxor Exp $
 
-EAPI=2
+EAPI=4
 
 inherit eutils java-pkg-2 base multilib
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnu.org/software/classpath"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0.98"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="alsa debug doc dssi examples gconf gjdoc gmp gtk gstreamer qt4 xml"
 
@@ -65,8 +65,8 @@ S=${WORKDIR}/${MY_P}
 
 src_configure() {
 	# We require ecj anyway, so force it to avoid problems with bad versions of javac
-	export JAVAC="/usr/bin/ecj"
-	export JAVA="/usr/bin/java"
+	export JAVAC="${EPREFIX}/usr/bin/ecj"
+	export JAVA="${EPREFIX}/usr/bin/java"
 	# build takes care of them itself, duplicate -source -target kills ecj
 	export JAVACFLAGS="-nowarn"
 	# build system is passing -J-Xmx768M which ecj however ignores
@@ -98,15 +98,14 @@ src_configure() {
 		--disable-dependency-tracking \
 		--disable-plugin \
 		--host=${CHOST} \
-		--prefix=/usr/${PN}-${SLOT} \
+		--prefix="${EPREFIX}"/usr/${PN}-${SLOT} \
 		--with-ecj-jar=$(java-pkg_getjar --build-only eclipse-ecj-* ecj.jar) \
 		--disable-Werror \
-		${myconf} \
-		|| die "configure failed"
+		${myconf}
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO || die
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO
 	java-pkg_regjar /usr/${P}/share/classpath/glibj.zip
 }