--- gnu-classpath-0.98-r3.ebuild	2012-09-17 21:33:20.000000000 -0600
+++ /usr/portage/dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild	2011-03-29 03:13:40.000000000 -0600
@@ -2,7 +2,7 @@
 # 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 $
 
-EAPI=4
+EAPI=2
 
 inherit eutils java-pkg-2 base multilib
 
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0.98"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 IUSE="alsa debug doc dssi examples gconf gjdoc gmp gtk gstreamer qt4 xml"
 
@@ -65,8 +65,8 @@
 
 src_configure() {
 	# We require ecj anyway, so force it to avoid problems with bad versions of javac
-	export JAVAC="${EPREFIX}/usr/bin/ecj"
-	export JAVA="${EPREFIX}/usr/bin/java"
+	export JAVAC="/usr/bin/ecj"
+	export JAVA="/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,14 +98,15 @@
 		--disable-dependency-tracking \
 		--disable-plugin \
 		--host=${CHOST} \
-		--prefix="${EPREFIX}"/usr/${PN}-${SLOT} \
+		--prefix=/usr/${PN}-${SLOT} \
 		--with-ecj-jar=$(java-pkg_getjar --build-only eclipse-ecj-* ecj.jar) \
 		--disable-Werror \
-		${myconf}
+		${myconf} \
+		|| die "configure failed"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO || die
 	java-pkg_regjar /usr/${P}/share/classpath/glibj.zip
 }