--- dev-util/eclipse-sdk/eclipse-sdk-3.1.2-r3.ebuild       2006-07-06 14:50:04.000000000 +1200
+++ dev-util/eclipse-sdk/eclipse-sdk-3.1.2-r4.ebuild  2006-08-30 14:01:38.000000000 +1200
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.1.2-r3.ebuild,v 1.1 2006/07/06 02:50:04 nichoj Exp $

-inherit eutils java-pkg java-utils flag-o-matic check-reqs
+inherit eutils java-ant-2 java-pkg-2 java-utils-2 flag-o-matic check-reqs

 MY_A="eclipse-sourceBuild-srcIncluded-${PV}.zip"
 RELEASE_DATE="200601181600"
@@ -42,7 +42,7 @@
 # -

 pkg_setup() {
-       java-pkg_pkg_setup
+       #java-pkg_pkg_setup
        debug-print "Checking for sufficient physical RAM"
        CHECKREQS_MEMORY="768"
        check_reqs
@@ -51,7 +51,7 @@
        check-cflags

        # Make sure our vm is sane
-       java-utils_pkg_setup
+       #java-utils_pkg_setup
 #      java-utils_setup-vm
 #      java-utils_ensure-vm-version-ge 1 4 2

@@ -83,7 +83,7 @@
        epatch ${FILESDIR}/06-path-fixups.patch

        einfo "Setting up virtual machine"
-       java-utils_setup-vm
+       #java-utils_setup-vm

        einfo "Cleaning out prebuilt code"
        clean-prebuilt-code
@@ -112,14 +112,14 @@
        use jikes && bootstrap_ant_opts="-Dbuild.compiler=jikes"

        debug-print "Bootstrapping bootstrap ecj"
-       ant ${bootstrap_ant_opts} -q -f jdtcoresrc/compilejdtcorewithjavac.xml || die "Failed to bootstrap ecj"
+       eant ${bootstrap_ant_opts} -q -f jdtcoresrc/compilejdtcorewithjavac.xml || die "Failed to bootstrap ecj"

        debug-print "Bootstrapping ecj"
-       ant -lib jdtcoresrc/ecj.jar -q -f jdtcoresrc/compilejdtcore.xml || die "Failed to bootstrap ecj"
+       eant -lib jdtcoresrc/ecj.jar -q -f jdtcoresrc/compilejdtcore.xml || die "Failed to bootstrap ecj"

        debug-print "Compiling Eclipse -- see ${S}/compilelog.txt for details"
        ANT_OPTS="-Xmx1024M" \
-               ant -lib jdtcoresrc/ecj.jar -q -f build.xml \
+               eant -lib jdtcoresrc/ecj.jar -q -f build.xml \
                -DinstallOs=linux \
                -DinstallWs=gtk \
                -DinstallArch=${eclipsearch} \