--- eclipse-sdk-3.1_pre6.ebuild	2005-05-06 01:35:32.000000000 +0200
+++ eclipse-sdk-3.1_pre7.ebuild	2005-05-14 17:09:39.000000000 +0200
@@ -5,10 +5,10 @@
 inherit eutils java-utils
 
 # karltk: Portage 2.0.51_pre13 needs this
-MY_A="eclipse-sourceBuild-srcIncluded-3.1M6.zip"
+MY_A="eclipse-sourceBuild-srcIncluded-3.1M7.zip"
 DESCRIPTION="Eclipse Tools Platform"
 HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://download.eclipse.org/downloads/drops/S-3.1M6-200504011645/${MY_A}"
+SRC_URI="ftp://download.eclipse.org/S-3.1M7-200505131415/${MY_A}"
 IUSE="gnome mozilla jikes gcj nosrc nodoc"
 SLOT="3.1"
 LICENSE="CPL-1.0"
@@ -179,18 +179,18 @@
 }
 
 function setup-dir-vars() {
-	launcher_src_dir="features/org.eclipse.launchers/library/gtk"
+	launcher_src_dir="features/org.eclipse.platform.launchers/library/gtk"
 	swt_src_dir="plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
 
 	core_src_dir="plugins/org.eclipse.core.resources.linux/src"
 
 	case ${ARCH} in
 		x86)
-			swt_dest_dir="plugins/org.eclipse.swt.gtk/os/linux/x86"
+			swt_dest_dir="plugins/org.eclipse.swt.gtk.linux.x86"
 			core_dest_dir="plugins/org.eclipse.core.resources.linux/os/linux/x86"
 			;;
 		ppc)
-			swt_dest_dir="plugins/org.eclipse.swt.gtk/os/linux/ppc"
+			swt_dest_dir="plugins/org.eclipse.swt.gtk.linux.ppc"
 			core_dest_dir="plugins/org.eclipse.core.resources.linux/os/linux/ppc/"
 			;;
 	esac
@@ -232,7 +232,7 @@
 	local target=${1}
 
 	einfo "Building GTK+ frontend (${target}) -- see compilelog.txt for details"
-	LOCALCLASSPATH=jdtcore.jar ant -q -q  \
+	LOCALCLASSPATH=jdtcore.jar:ecj.jar ant -q -q  \
 		-buildfile build.xml \
 		-DcollPlace="eclipse-${SLOT}" \
 		-DinstallOs=linux \
@@ -281,9 +281,9 @@
 
 	[ ${ARCH} == 'amd64' ] && swt_ptr_cflags=-DSWT_PTR_SIZE_64
 
-	[ ${ARCH} == 'x86' ] && output_dir="../../../org.eclipse.swt.gtk/os/linux/x86"
-	[ ${ARCH} == 'ppc' ] && output_dir="../../../org.eclipse.swt.gtk64/os/linux/ppc"
-	[ ${ARCH} == 'amd64' ] && output_dir="../../../org.eclipse.swt.gtk64/os/linux/x86_64"
+	[ ${ARCH} == 'x86' ] && output_dir="../../../org.eclipse.swt.gtk.linux.x86"
+	[ ${ARCH} == 'ppc' ] && output_dir="../../../org.eclipse.swt.gtk.linux.ppc"
+	[ ${ARCH} == 'amd64' ] && output_dir="../../../org.eclipse.swt.gtk.linux.x86_64"
 
 	export AWT_LIB_PATH=${awt_lib_path}
 	export XTEST_LIB_PATH=/usr/X11R6/lib
@@ -418,7 +418,7 @@
 	use jikes && antopts="-Dbuild.compiler=jikes"
 
 	ant ${antopts} -q -f compilejdtcorewithjavac.xml || die "Failed to bootstrap jdtcore compiler"
-	LOCALCLASSPATH=jdtcore.jar ant -q -f compilejdtcore.xml || die "Failed to compile jdtcore"
+	LOCALCLASSPATH=jdtcore.jar:ecj.jar ant -q -f compilejdtcore.xml || die "Failed to compile jdtcore"
 
 	# WTF? Just to make things interesting, compilejdtcore.xml suddenly moves jdtcore.jar to ../