--- astyle-1.22.ebuild.orig	2008-09-29 21:38:18.000000000 +0200
+++ astyle-1.22.ebuild	2008-09-29 21:39:51.000000000 +0200
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/astyle-1.22.ebuild,v 1.3 2008/05/30 18:53:54 corsair Exp $
 
-inherit eutils java-pkg-2 java-pkg-opt-2 toolchain-funcs
+inherit eutils java-pkg-opt-2 toolchain-funcs
 
 DESCRIPTION="Artistic Style is a reindenter and reformatter of C++, C and Java source code"
 HOMEPAGE="http://astyle.sourceforge.net/"
@@ -22,7 +22,7 @@
 
 pkg_setup() {
 	if use java ; then
-	    java-pkg-2_pkg_setup
+		java-pkg-opt-2_pkg_setup
 
 	    if use x86; then
 		jvmarch=i386
@@ -45,9 +45,11 @@
 		buildgcc/Makefile || die "sed failed"
 	fi
 	# Fix JAVA_HOME
-	sed -i -e \
-	    "s:/usr/lib/jvm/java-6-sun-1.6.0.00:$(java-config --jdk-home):g" \
-	    buildgcc/Makefile || die "sed failed"
+	if use java; then
+		sed -i -e \
+	    	"s:/usr/lib/jvm/java-6-sun-1.6.0.00:$(java-config --jdk-home):g" \
+		    buildgcc/Makefile || die "sed failed"
+	fi
 }
 
 src_compile() {