--- /usr/portage/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild	2012-01-01 11:05:56.000000000 -0700
+++ gnu-crypto-2.0.1-r2.ebuild	2012-09-18 21:32:24.000000000 -0600
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild,v 1.12 2012/01/01 18:05:56 sera Exp $
 
+EAPI=4
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 eutils
@@ -12,7 +13,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.3"
@@ -20,25 +21,25 @@
 
 RESTRICT="test"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epatch "${FILESDIR}/${P}-jdk15.patch"
 }
 
-src_compile() {
+src_configure() {
 	# jikes support disabled, doesnt work: #86655
-	econf JAVAC="javac" JAVACFLAGS="$(java-pkg_javac-args)" --with-jce=yes --with-sasl=yes || die
-	emake -j1 || die
+	econf JAVAC="javac" JAVACFLAGS="$(java-pkg_javac-args)" --with-jce=yes --with-sasl=yes
+}
+
+src_compile() {
+	emake -j1
 	if use doc ; then
-		emake -j1 javadoc || die
+		emake -j1 javadoc
 	fi
 }
 
 src_install() {
-	einstall || die
-	rm "${D}"/usr/share/*.jar
+	einstall
+	rm "${ED}"/usr/share/*.jar
 
 	java-pkg_dojar source/gnu-crypto.jar
 	java-pkg_dojar jce/javax-crypto.jar
@@ -47,5 +48,5 @@
 	use doc && java-pkg_dojavadoc api
 	use source && java-pkg_dosrc source/* jce/* security/*
 
-	dodoc AUTHORS ChangeLog NEWS README THANKS || die
+	dodoc AUTHORS ChangeLog NEWS README THANKS
 }