Eclipse 3.3.1.1 version bump, minor syntax changes for 3.2.1-r2 ebuild.

(Portage version: 2.1.3.19)

14 files changed, 1103 insertions, 27 deletions

diff --git a/dev-util/eclipse-sdk/ChangeLog b/dev-util/eclipse-sdk/ChangeLog
index a50cb2e446c1..4fd8a7f8b0f9 100644
--- a/dev-util/eclipse-sdk/ChangeLog
+++ b/dev-util/eclipse-sdk/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for dev-util/eclipse-sdk
 # Copyright 2003-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.134 2008/01/17 21:29:34 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.135 2008/01/21 12:15:55 elvanor Exp $
+
+*eclipse-sdk-3.3.1.1 (21 Jan 2008)
+
+  21 Jan 2008; Jean-Noël Rivasseau <elvanor@gentoo.org>
+  +files/3.3/ant-osgi-manifest.mf, +files/3.3/disable-jdt-tool.diff,
+  +files/3.3/eclipse-workbench-miscompile-workaround.diff,
+  +files/3.3/eclipse-3.3, +files/3.3/eclipserc,
+  +files/3.3/disable-jdk6.diff, +files/3.3/disable-swt.diff,
+  +files/3.3/eclipse-jsch-api-update.patch,
+  +files/3.3/fedora/eclipse-fileinitializer.patch,
+  +files/3.3/fedora/eclipse-libupdatebuild2.patch,
+  +files/3.3/fedora/eclipse-pde.build-add-package-build.patch,
+  +files/3.3/launcher_double-free.diff, +files/3.3/set-java-home.diff,
+  eclipse-sdk-3.2.1-r2.ebuild, +eclipse-sdk-3.3.1.1.ebuild:
+  Version bump to Eclipse 3.3.1.1.
 
   17 Jan 2008; Petteri Räty <betelgeuse@gentoo.org>
   eclipse-sdk-3.2.1-r2.ebuild:
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.2.1-r2.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.2.1-r2.ebuild
index c516dd4ad0a0..baa2b7031613 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.2.1-r2.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.2.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.2.1-r2.ebuild,v 1.7 2008/01/17 21:29:34 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.2.1-r2.ebuild,v 1.8 2008/01/21 12:15:55 elvanor Exp $
 
 EAPI=1
 
@@ -130,12 +130,12 @@ src_install() {
 
 	# TODO maybe there's a better way of installing than extracting the tar?
 	[[ -f result/linux-gtk-${eclipsearch}-sdk.tar.gz ]] || die "tar.gz bundle was not built properly!"
-	tar zxf result/linux-gtk-${eclipsearch}-sdk.tar.gz -C ${D}/usr/lib \
+	tar zxf "result/linux-gtk-${eclipsearch}-sdk.tar.gz" -C "${D}/usr/lib" \
 		|| die "Failed to extract the built package"
 
-	mv ${D}/usr/lib/eclipse ${D}/${ECLIPSE_DIR}
+	mv "${D}/usr/lib/eclipse" "${D}/${ECLIPSE_DIR}"
 	#insinto ${ECLIPSE_DIR}
-	echo "-Djava.library.path=/usr/lib" >> ${D}/${ECLIPSE_DIR}/eclipse.ini
+	echo "-Djava.library.path=/usr/lib" >> "${D}/${ECLIPSE_DIR}/eclipse.ini"
 
 	debug-print "Installing eclipse-gtk binary"
 	exeinto ${ECLIPSE_DIR}
@@ -143,7 +143,7 @@ src_install() {
 
 	# Install startup script
 	exeinto /usr/bin
-	doexe ${FILESDIR}/eclipse-${SLOT}
+	doexe "${FILESDIR}/eclipse-${SLOT}"
 
 	make_desktop_entry eclipse-${SLOT} "Eclipse ${PV}" "${ECLIPSE_DIR}/icon.xpm"
 }
@@ -162,24 +162,24 @@ apply-patchset() {
 	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=86848
 	# GNU XML issue identified by Michael Koch
 	# %patch2 -p0
-	epatch ${WORKDIR}/${P}-build.patch
+	epatch "${WORKDIR}/${P}-build.patch"
 	# %patch4 -p0
-	epatch ${WORKDIR}/${P}-libupdatebuild.patch
+	epatch "${WORKDIR}/${P}-libupdatebuild.patch"
 	# %patch5 -p0
-	epatch ${WORKDIR}/${P}-libupdatebuild2.patch
+	epatch "${WORKDIR}/${P}-libupdatebuild2.patch"
 	# Build swttools.jar
 	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90364
 	pushd plugins/org.eclipse.swt.gtk.linux.x86_64 >/dev/null
 	# %patch18 -p0
-	epatch ${WORKDIR}/${P}-swttools.patch
+	epatch "${WORKDIR}/${P}-swttools.patch"
 	popd >/dev/null
 	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90630
 	# %patch22 -p0
-	epatch ${WORKDIR}/${P}-updatehomedir.patch
+	epatch "${WORKDIR}/${P}-updatehomedir.patch"
 	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90535
 	pushd plugins/org.eclipse.core.runtime >/dev/null
 	# %patch24 -p0
-	epatch ${WORKDIR}/${P}-fileinitializer.patch
+	epatch "${WORKDIR}/${P}-fileinitializer.patch"
 	popd >/dev/null
 
 	##
@@ -211,16 +211,16 @@ apply-patchset() {
 	# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=162177
 	pushd plugins/org.eclipse.jdt.core >/dev/null
 	# %patch34 -p0
-	epatch ${WORKDIR}/${P}-bz162177.patch
+	epatch "${WORKDIR}/${P}-bz162177.patch"
 	# Use ecj for gcj
 	# %patch57 -p0
-	epatch ${WORKDIR}/${P}-ecj-gcj.patch
+	epatch "${WORKDIR}/${P}-ecj-gcj.patch"
 	popd >/dev/null
 	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=114001
 	# %patch38 -p0
-	epatch ${WORKDIR}/${P}-helpindexbuilder.patch
+	epatch "${WORKDIR}/${P}-helpindexbuilder.patch"
 	# %patch40 -p0
-	epatch ${WORKDIR}/${P}-usebuiltlauncher.patch
+	epatch "${WORKDIR}/${P}-usebuiltlauncher.patch"
 	# DO NOT APPLY %patch43
 	pushd plugins/org.eclipse.swt/Eclipse\ SWT\ Mozilla/common/library >/dev/null
 	# Build cairo native libs
@@ -235,7 +235,7 @@ apply-patchset() {
 	# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=168726
 	pushd launchertmp >/dev/null
 	# %patch47 -p1
-	epatch ${WORKDIR}/${P}-launcher-link.patch
+	epatch "${WORKDIR}/${P}-launcher-link.patch"
 	zip -q -9 -r ../launchersrc.zip * >/dev/null || die "zip failed"
 	popd >/dev/null
 	mv launchersrc.zip plugins/org.eclipse.platform
@@ -243,12 +243,12 @@ apply-patchset() {
 
 	pushd features/org.eclipse.platform.launchers >/dev/null
 	# %patch47 -p1
-	epatch ${WORKDIR}/${P}-launcher-link.patch
+	epatch "${WORKDIR}/${P}-launcher-link.patch"
 	popd >/dev/null
 	# Link against our system-installed javadocs
 	# Don't attempt to link to Sun's javadocs
 	# %patch48 -p0
-	epatch ${WORKDIR}/${P}-javadoclinks.patch
+	epatch "${WORKDIR}/${P}-javadoclinks.patch"
 	sed --in-place "s:/usr/share/:%{_datadir}/:g"           \
 		plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt  \
 		plugins/org.eclipse.pde.doc.user/pdeOptions.txt \
@@ -256,14 +256,14 @@ apply-patchset() {
 		plugins/org.eclipse.platform.doc.isv/platformOptions.txt
 	# Always generate debug info when building RPMs (Andrew Haley)
 	# %patch49 -p0
-	epatch ${WORKDIR}/${P}-ecj-rpmdebuginfo.patch
+	epatch "${WORKDIR}/${P}-ecj-rpmdebuginfo.patch"
 
 	# generic releng plugins that can be used to build plugins
 	# see this thread for deails:
 	# https://www.redhat.com/archives/fedora-devel-java-list/2006-April/msg00048.html
 	pushd plugins/org.eclipse.pde.build >/dev/null
 	# %patch53
-	epatch ${WORKDIR}/${P}-pde.build-add-package-build.patch
+	epatch "${WORKDIR}/${P}-pde.build-add-package-build.patch"
 	sed --in-place "s:@eclipse_base@:%{_datadir}/%{name}:" templates/package-build/build.properties
 	popd >/dev/null
 
@@ -271,12 +271,12 @@ apply-patchset() {
 	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=142861
 	pushd plugins/org.eclipse.swt/Eclipse\ SWT >/dev/null
 	# %patch54
-	epatch ${WORKDIR}/${P}-swt-rm-ON_TOP.patch
+	epatch "${WORKDIR}/${P}-swt-rm-ON_TOP.patch"
 	popd >/dev/null
 
 	# We need to disable junit4 and apt until GCJ can handle Java5 code
 	# %patch55 -p0
-	epatch ${WORKDIR}/${P}-disable-junit4-apt.patch
+	epatch "${WORKDIR}/${P}-disable-junit4-apt.patch"
 	rm plugins/org.junit4/junit-4.1.jar
 
 	##
@@ -310,16 +310,16 @@ apply-patchset() {
 	# FIXME check if this has been applied upstream
 	pushd plugins/org.eclipse.platform.doc.isv >/dev/null
 	# %patch100 -p0
-	epatch ${WORKDIR}/customBuildCallbacks.xml-add-pre.gather.bin.parts.patch
+	epatch "${WORKDIR}/customBuildCallbacks.xml-add-pre.gather.bin.parts.patch"
 	popd >/dev/null
 	pushd plugins/org.eclipse.platform.doc.user >/dev/null
 	# %patch100 -p0
-	epatch ${WORKDIR}/customBuildCallbacks.xml-add-pre.gather.bin.parts.patch
+	epatch "${WORKDIR}/customBuildCallbacks.xml-add-pre.gather.bin.parts.patch"
 	popd >/dev/null
 
 	if use branding; then
 		pushd plugins/org.eclipse.platform >/dev/null
-		cp ${WORKDIR}/splash.bmp .
+		cp "${WORKDIR}/splash.bmp" .
 		popd >/dev/null
 	fi
 
@@ -333,7 +333,7 @@ fix-swt-targets() {
 	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=71637
 	pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library >/dev/null
 	# %patch0 -p0
-	epatch ${WORKDIR}/${P}-gentoo-libswt-enableallandO2.patch
+	epatch "${WORKDIR}/${P}-gentoo-libswt-enableallandO2.patch"
 	popd >/dev/null
 
 	# Select the set of native libraries to compile
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.3.1.1.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.3.1.1.ebuild
new file mode 100644
index 000000000000..642e880f1aec
--- /dev/null
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.3.1.1.ebuild
@@ -0,0 +1,328 @@
+# Copyright 2007-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.3.1.1.ebuild,v 1.1 2008/01/21 12:15:55 elvanor Exp $
+
+# Notes: This is a preliminary ebuild of Eclipse-3.3
+# It was based on the initial ebuild in the gcj-overlay, so much of the credit goes out to geki.
+
+# Tomcat is almost no longer needed in 3.3 and removed in 3.4.
+# See bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=173692
+# Currently we remove the Tomcat stuff entirely - potentially this can still break things.
+# We'll put it back if there is any bug report, which is unlikely.
+
+# To unbundle a jar, do the following:
+# 1) Rewrite the ebuild so it uses OSGi packaging
+# 2) Add the dependency and add it to gentoo_jars/system_jars
+# 3) Remove it from the build directory, and don't forget to modify the main Ant file
+# so that it does *NOT* copy the file at the end
+# 4) Install the symlink itself via java-pkg_jarfrom
+
+# Jetty, Tomcat-jasper and Lucene analysis (1.9.1) jars have to stay bundled for now, until someone does some work on them.
+# Hopefully, wltjr will soon package tomcat-jasper.
+
+# Current patches are hard to maintain when revbumping.
+# Two solutions:
+# 1) Split patches so that there is one per file
+# 2) Use sed, better solution I would say.
+
+EAPI="1"
+JAVA_PKG_IUSE="doc"
+inherit java-pkg-2 java-ant-2 check-reqs
+
+DMF="R-${PV}-200710231652"
+MY_A="eclipse-sourceBuild-srcIncluded-${PV/.0}.zip"
+
+DESCRIPTION="Eclipse Tools Platform"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_A}"
+
+SLOT="3.3"
+LICENSE="EPL-1.0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+S=${WORKDIR}
+PATCHDIR="${FILESDIR}/${SLOT}"
+FEDORA="${PATCHDIR}/fedora"
+ECLIPSE_DIR="/usr/lib/eclipse-${SLOT}"
+
+CDEPEND=">=dev-java/ant-eclipse-ecj-3.3
+	dev-java/ant-core
+	dev-java/ant-nodeps
+	=dev-java/junit-3*
+	dev-java/junit:4
+	>=dev-java/swt-${PV}
+	>=dev-java/jsch-0.1.36-r1
+	>=dev-java/icu4j-3.6.1
+	>=dev-java/commons-el-1.0-r2
+	>=dev-java/commons-logging-1.1-r4
+	>=dev-java/tomcat-servlet-api-5.5.25-r1:2.4
+	dev-java/lucene:1.9"
+
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+
+DEPEND="=virtual/jdk-1.5*
+	sys-apps/findutils
+	dev-java/sun-j2me-bin
+	app-arch/unzip
+	app-arch/zip
+	${CDEPEND}"
+
+JAVA_PKG_BSFIX="off"
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+
+	CHECKREQS_MEMORY="768"
+	check_reqs
+
+	eclipseArch=${ARCH}
+	use amd64 && eclipseArch="x86_64"
+}
+
+src_unpack() {
+	unpack "${A}"
+	patch-apply
+	remove-bundled-stuff
+
+	# No warnings / Java 5 / all output should be directed to stdout
+	find "${S}" -type f -name '*.xml' -exec \
+		sed -r -e "s:(-encoding ISO-8859-1):\1 -nowarn:g" -e "s:(\"compilerArg\" value=\"):\1-nowarn :g" \
+		-e "s:(<property name=\"javacSource\" value=)\".*\":\1\"1.5\":g" \
+		-e "s:(<property name=\"javacTarget\" value=)\".*\":\1\"1.5\":g" -e "s:output=\".*(txt|log).*\"::g" -i {} \;
+
+	# JDK home
+	sed -r -e "s:^(JAVA_HOME =) .*:\1 $(java-config --jdk-home):" -e "s:gcc :gcc ${CFLAGS} :" \
+		-i plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile || die "sed Makefile failed"
+
+	while read line; do
+		java-ant_rewrite-classpath "$line" > /dev/null
+	done < <(find "${S}" -type f -name "build.xml" )
+}
+
+src_compile() {
+	# Figure out correct boot classpath
+	local bootClassPath=$(java-config --runtime)
+	einfo "Using boot classpath ${bootClassPath}"
+
+	java-pkg_force-compiler ecj-3.3
+
+	# system_jars will be used when compiling (javac)
+	# gentoo_jars will be used when building JSPs and other ant tasks (not javac)
+
+	local systemJars="$(java-pkg_getjars swt-3,icu4j,ant-core,jsch,ant-nodeps,junit-4,tomcat-servlet-api-2.4,lucene-1.9):$(java-pkg_getjars --build-only sun-j2me-bin)"
+	local gentooJars="$(java-pkg_getjars ant-core,icu4j,jsch,commons-logging,commons-el,tomcat-servlet-api-2.4)"
+	local options="-q -Dnobootstrap=true -Dlibsconfig=true -Dbootclasspath=${bootClassPath} -DinstallOs=linux \
+		-DinstallWs=gtk -DinstallArch=${eclipseArch} -Djava5.home=$(java-config --jdk-home)"
+
+	use doc && options="${options} -Dgentoo.javadoc=true"
+
+	ANT_OPTS=-Xmx1024M ANT_TASKS="ant-nodeps" eant ${options} -Dgentoo.classpath="${systemJars}" -Dgentoo.jars="${gentooJars//:/,}"
+}
+
+src_install() {
+	dodir /usr/lib
+
+	[[ -f result/linux-gtk-${eclipseArch}-sdk.tar.gz ]] || die "tar.gz bundle was not built properly!"
+	tar zxf "result/linux-gtk-${eclipseArch}-sdk.tar.gz" -C "${D}/usr/lib" || die "Failed to extract the built package"
+
+	mv "${D}/usr/lib/eclipse" "${D}/${ECLIPSE_DIR}"
+
+	# Install startup script
+	dobin "${FILESDIR}/${SLOT}/eclipse-${SLOT}"
+
+	# Chmod the actual binary in the Eclipse dir
+	chmod +x "${D}/${ECLIPSE_DIR}/eclipse"
+
+	insinto "/etc" && doins "${FILESDIR}/${SLOT}/eclipserc"
+
+	make_desktop_entry eclipse-${SLOT} "Eclipse ${PV}" "${ECLIPSE_DIR}/icon.xpm"
+
+	cd "${D}/${ECLIPSE_DIR}"
+	install-link-system-jars
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Welcome to Eclipse-3.3 (Europa)!"
+	einfo
+	einfo "You can now install plugins via Update Manager without any"
+	einfo "tweaking. This is the recommended way to install new features for Eclipse."
+	einfo
+	einfo "Please read http://gentoo-wiki.com/Eclipse"
+	einfo "It contains a lot of useful information and help about Eclipse on Gentoo."
+}
+
+# -----------------------------------------------------------------------------
+#  Helper functions
+# -----------------------------------------------------------------------------
+
+install-link-system-jars() {
+
+	pushd plugins/ > /dev/null
+	java-pkg_jarfrom swt-3
+
+	mkdir "org.apache.ant"
+	mkdir "org.apache.ant/META-INF/"
+	mkdir "org.apache.ant/lib"
+	cp "${FILESDIR}/${SLOT}/ant-osgi-manifest.mf" "org.apache.ant/META-INF/MANIFEST.MF"
+	pushd org.apache.ant/lib > /dev/null
+	java-pkg_jarfrom ant-core
+	java-pkg_jarfrom ant-nodeps
+	popd > /dev/null
+
+	java-pkg_jarfrom icu4j
+	java-pkg_jarfrom jsch
+	java-pkg_jarfrom commons-el
+	java-pkg_jarfrom commons-logging
+	java-pkg_jarfrom lucene-1.9
+	java-pkg_jarfrom tomcat-servlet-api-2.4
+
+	popd > /dev/null
+
+	pushd plugins/org.junit_*/ > /dev/null
+	java-pkg_jarfrom junit
+	popd > /dev/null
+
+	pushd plugins/org.junit4*/ > /dev/null
+	java-pkg_jarfrom junit-4
+	popd > /dev/null
+}
+
+patch-apply() {
+	# Patch launcher source
+	mkdir launchertmp
+	unzip -qq -d launchertmp plugins/org.eclipse.platform/launchersrc.zip > /dev/null || die "unzip failed"
+	pushd launchertmp/ > /dev/null
+	epatch "${PATCHDIR}/launcher_double-free.diff"
+	sed -i "s/CFLAGS\ =\ -O\ -s\ -Wall/CFLAGS = ${CFLAGS}\ -Wall/" library/gtk/make_linux.mak \
+		|| die "Failed to tweak make_linux.mak"
+	zip -q -6 -r ../launchersrc.zip * >/dev/null || die "zip failed"
+	popd > /dev/null
+	mv launchersrc.zip plugins/org.eclipse.platform/launchersrc.zip
+	rm -rf launchertmp
+
+	# Disable SWT, JDT-Tool, JDK-6
+	epatch "${PATCHDIR}/disable-swt.diff"
+	epatch "${PATCHDIR}/disable-jdt-tool.diff"
+	epatch "${PATCHDIR}/disable-jdk6.diff"
+	epatch "${PATCHDIR}/set-java-home.diff" # this setups the java5 home variable
+
+	# Following are patches from Fedora - I did not investigate this yet
+
+	epatch "${FEDORA}/eclipse-libupdatebuild2.patch"
+
+	# Fedora does not apply this anymore because they checkout
+	# org.eclipse.equinox.initializer project from cvs. Untill a fix, we'll
+	# keep the old patch
+	pushd plugins/org.eclipse.core.runtime >/dev/null
+	epatch "${FEDORA}/eclipse-fileinitializer.patch"
+	popd >/dev/null
+
+	# Generic releng plugins that can be used to build plugins
+	# https://www.redhat.com/archives/fedora-devel-java-list/2006-April/msg00048.html
+	pushd plugins/org.eclipse.pde.build > /dev/null
+	# Patch 53
+	epatch "${FEDORA}/eclipse-pde.build-add-package-build.patch"
+	sed -e "s:@eclipse_base@:${ECLIPSE_DIR}:g" -i templates/package-build/build.properties
+	popd > /dev/null
+
+	# Gentoo patch to support jsch-0.1.36 - ali_bush
+	# Already fixed in upstream svn.  Remove after next release?
+
+	pushd "plugins/org.eclipse.jsch.ui" > /dev/null
+	epatch "${PATCHDIR}/eclipse-jsch-api-update.patch"
+	popd > /dev/null
+
+	# Later we could produce a patch out of all these sed, but this is not the best solution
+	# since this would make a lot of patches (x86, x86_64...) and would be hard to revbump
+
+	# Following adds an additional classpath when building JSPs
+
+	sed -i '/<path id="@dot\.classpath">/ a\
+			<filelist dir="" files="${gentoo.jars}" />'  "plugins/org.eclipse.help.webapp/build.xml"
+
+	# Following allows the doc USE flag to be honored
+
+	sed -i -e '/<target name="generateJavadoc" depends="getJavadocPath"/ c\
+		<target name="generateJavadoc" depends="getJavadocPath" if="gentoo.javadoc">' \
+		-e '/<replace file="\${basedir}\/\${optionsFile}" token="@rt@" value="\${bootclasspath}/ c\
+		<replace file="${basedir}/${optionsFile}" token="@rt@" value="${bootclasspath}:${gentoo.classpath}" />' \
+		"plugins/org.eclipse.platform.doc.isv/buildDoc.xml"
+
+	# Following disables Tomcat entirely
+
+	sed -i '/plugins\/org\.eclipse\.tomcat"/{N;N;N;N;d;}' "features/org.eclipse.platform/build.xml"
+	sed -i '/org\.eclipse\.tomcat/{N;N;N;d;}' "plugins/org.eclipse.platform.source/build.xml"
+	sed -i '/<ant.*org\.eclipse\.tomcat/{N;N;d;}' "assemble.org.eclipse.sdk.linux.gtk.${eclipseArch}.xml"
+
+	# This allows to compile osgi.util and osgi.service, and fixes IPluginDescriptor.class which is present compiled
+
+	sed -i -e 's/<src path="\."/<src path="org"/' -e '/<include name="org\/"\/>/ d' \
+	-e '/<subant antfile="\${customBuildCallbacks}" target="pre\.gather\.bin\.parts" failonerror="false" buildpath="\.">/ { n;n;n; a\
+		<copy todir="${destination.temp.folder}/org.eclipse.osgi.services_3.1.200.v20070605" failonerror="true" overwrite="false"> \
+			<fileset dir="${build.result.folder}/@dot"> \
+				<include name="**"/> \
+			</fileset> \
+		</copy>
+}' "plugins/org.eclipse.osgi.services/build.xml"
+
+	sed -i -e 's/<src path="\."/<src path="org"/' -e '/<include name="org\/"\/>/ d' \
+	-e '/<subant antfile="\${customBuildCallbacks}" target="pre\.gather\.bin\.parts" failonerror="false" buildpath="\.">/ { n;n;n; a\
+		<copy todir="${destination.temp.folder}/org.eclipse.osgi.util_3.1.200.v20070605" failonerror="true" overwrite="false"> \
+			<fileset dir="${build.result.folder}/@dot"> \
+				<include name="**"/> \
+			</fileset> \
+		</copy>
+}' 	"plugins/org.eclipse.osgi.util/build.xml"
+
+	sed -i 	'/<mkdir dir="${temp\.folder}\/runtime_registry_compatibility\.jar\.bin"\/>/ a\
+		<mkdir dir="classes"/> \
+		<copy todir="classes" failonerror="true" overwrite="false"> \
+			<fileset dir="${build.result.folder}/../org.eclipse.core.runtime/@dot/" includes="**/IPluginDescriptor.class" > \
+			</fileset> \
+		</copy>' "plugins/org.eclipse.core.runtime.compatibility.registry/build.xml"
+
+	# This removes the copying operation for bundled jars
+
+	sed -i -e "s/<copy.*com\.jcraft\.jsch.*\/>//" -e "s/<copy.*com\.ibm\.icu.*\/>//" -e "s/<copy.*org\.apache\.commons\.el_.*\/>//" \
+		-e "s/<copy.*org\.apache\.commons\.logging_.*\/>//" -e "s/<copy.*javax\.servlet\.jsp_.*\/>//" -e "s/<copy.*javax\.servlet_.*\/>//" \
+		-e "s/<copy.*org\.apache\.lucene_.*\/>//" "package.org.eclipse.sdk.linux.gtk.${eclipseArch}.xml"
+
+	#  -e "s/<copy.*org\.apache\.lucene\.analysis_.*\/>//"
+}
+
+remove-bundled-stuff() {
+	# Remove pre-built eclipse binaries
+	find "${S}" -type f -name eclipse | xargs rm
+	# ...  .so libraries
+	find "${S}" -type f -name '*.so' | xargs rm
+	# ... .jar files
+	rm plugins/org.eclipse.swt/extra_jars/exceptions.jar plugins/org.eclipse.osgi/osgi/osgi*.jar \
+		plugins/org.eclipse.osgi/supplement/osgi/osgi.jar
+
+	rm -rf plugins/org.eclipse.swt.*
+	rm -rf plugins/org.apache.ant_*
+	rm plugins/org.apache.commons.*.jar
+	rm plugins/com.jcraft.jsch*
+	rm plugins/com.ibm.icu*
+	rm plugins/org.junit_*/*.jar
+	rm plugins/org.junit4*/*.jar
+	rm plugins/javax.*.jar
+	rm plugins/org.apache.lucene_*.jar
+
+	# Removing Tomcat stuff
+
+	rm -rf "plugins/org.eclipse.tomcat/"
+
+	# Remove bundled classes
+
+	rm -rf "plugins/org.eclipse.osgi.services/org"
+	unzip -q "plugins/org.eclipse.osgi.services/src.zip" -d "plugins/org.eclipse.osgi.services/"
+	rm -rf "plugins/org.eclipse.osgi.util/org"
+	unzip -q "plugins/org.eclipse.osgi.util/src.zip" -d "plugins/org.eclipse.osgi.util/"
+
+	rm -rf plugins/org.eclipse.jdt.core/scripts/*.class
+	rm -rf plugins/org.eclipse.core.runtime.compatibility.registry/classes
+}
diff --git a/dev-util/eclipse-sdk/files/3.3/ant-osgi-manifest.mf b/dev-util/eclipse-sdk/files/3.3/ant-osgi-manifest.mf
new file mode 100644
index 000000000000..deb8a6aa87a8
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/3.3/ant-osgi-manifest.mf
@@ -0,0 +1,30 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Apache Ant
+Bundle-Vendor: Gentoo
+Bundle-SymbolicName: org.apache.ant
+Bundle-Version: 1.7.0
+Bundle-ClassPath: lib/ant.jar,lib/ant-launcher.jar,lib/ant-nodeps.jar
+Export-Package: images,org.apache.tools.ant,org.apache.tools.ant.dispatch,org.apache.tools.ant.filters,org.apache.tools.ant.filters.util,
+ org.apache.tools.ant.helper,org.apache.tools.ant.input,org.apache.tools.ant.listener,org.apache.tools.ant.loader,
+ org.apache.tools.ant.taskdefs,org.apache.tools.ant.taskdefs.compilers,org.apache.tools.ant.taskdefs.condition,
+ org.apache.tools.ant.taskdefs.cvslib,org.apache.tools.ant.taskdefs.email,org.apache.tools.ant.taskdefs.optional,
+ org.apache.tools.ant.taskdefs.optional.ccm,org.apache.tools.ant.taskdefs.optional.clearcase,org.apache.tools.ant.taskdefs.optional.depend,
+ org.apache.tools.ant.taskdefs.optional.depend.constantpool,org.apache.tools.ant.taskdefs.optional.dotnet,
+ org.apache.tools.ant.taskdefs.optional.ejb,org.apache.tools.ant.taskdefs.optional.extension,org.apache.tools.ant.launch,
+ org.apache.tools.ant.taskdefs.optional.extension.resolvers,org.apache.tools.ant.taskdefs.optional.i18n,
+ org.apache.tools.ant.taskdefs.optional.image,org.apache.tools.ant.taskdefs.optional.j2ee,org.apache.tools.ant.taskdefs.optional.javacc,
+ org.apache.tools.ant.taskdefs.optional.javah,org.apache.tools.ant.taskdefs.optional.jdepend,org.apache.tools.ant.taskdefs.optional.jlink,
+ org.apache.tools.ant.taskdefs.optional.jsp,org.apache.tools.ant.taskdefs.optional.jsp.compilers,org.apache.tools.ant.taskdefs.optional.junit,
+ org.apache.tools.ant.taskdefs.optional.junit.xsl,org.apache.tools.ant.taskdefs.optional.native2ascii,org.apache.tools.ant.taskdefs.optional.net,
+ org.apache.tools.ant.taskdefs.optional.perforce,org.apache.tools.ant.taskdefs.optional.pvcs,org.apache.tools.ant.taskdefs.optional.scm,
+ org.apache.tools.ant.taskdefs.optional.script,org.apache.tools.ant.taskdefs.optional.sos,org.apache.tools.ant.taskdefs.optional.sound,
+ org.apache.tools.ant.taskdefs.optional.splash,org.apache.tools.ant.taskdefs.optional.ssh,org.apache.tools.ant.taskdefs.optional.starteam,
+ org.apache.tools.ant.taskdefs.optional.unix,org.apache.tools.ant.taskdefs.optional.vss,org.apache.tools.ant.taskdefs.optional.windows,
+ org.apache.tools.ant.taskdefs.rmic,org.apache.tools.ant.types,org.apache.tools.ant.types.conditions,org.apache.tools.ant.types.mappers,
+ org.apache.tools.ant.types.optional,org.apache.tools.ant.types.optional.depend,org.apache.tools.ant.types.optional.image,
+ org.apache.tools.ant.types.resolver,org.apache.tools.ant.types.resources,org.apache.tools.ant.types.resources.comparators,
+ org.apache.tools.ant.types.resources.selectors,org.apache.tools.ant.types.selectors,org.apache.tools.ant.types.selectors.modifiedselector,
+ org.apache.tools.ant.types.spi,org.apache.tools.ant.util,org.apache.tools.ant.util.depend,org.apache.tools.ant.util.depend.bcel,
+ org.apache.tools.ant.util.facade,org.apache.tools.ant.util.java15,org.apache.tools.ant.util.optional,org.apache.tools.ant.util.regexp,
+ org.apache.tools.bzip2,org.apache.tools.mail,org.apache.tools.tar,org.apache.tools.zip
\ No newline at end of file
diff --git a/dev-util/eclipse-sdk/files/3.3/disable-jdk6.diff b/dev-util/eclipse-sdk/files/3.3/disable-jdk6.diff
new file mode 100644
index 000000000000..8a2c3504025c
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/3.3/disable-jdk6.diff
@@ -0,0 +1,160 @@
+diff -ur --exclude='*.java' eclipse-sourceBuild-srcIncluded-3.3.1.1-after-jdt/assemble.org.eclipse.sdk.linux.gtk.ppc.xml eclipse-sourceBuild-srcIncluded-3.3.1.1-new/assemble.org.eclipse.sdk.linux.gtk.ppc.xml
+--- eclipse-sourceBuild-srcIncluded-3.3.1.1-after-jdt/assemble.org.eclipse.sdk.linux.gtk.ppc.xml	2007-11-05 18:19:38.000000000 +0100
++++ eclipse-sourceBuild-srcIncluded-3.3.1.1-new/assemble.org.eclipse.sdk.linux.gtk.ppc.xml	2007-11-06 11:39:09.000000000 +0100
+@@ -269,9 +269,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.pluggable.core" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.equinox.preferences" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -293,9 +290,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.navigator" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.apt" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jface.databinding" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -708,10 +702,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20070831-0435"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.equinox.preferences_3.2.100.v20070522"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+@@ -740,10 +730,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20070831-0435"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.jface.databinding_1.1.1.M20070910-0800b"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+diff -ur --exclude='*.java' eclipse-sourceBuild-srcIncluded-3.3.1.1-after-jdt/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml eclipse-sourceBuild-srcIncluded-3.3.1.1-new/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml
+--- eclipse-sourceBuild-srcIncluded-3.3.1.1-after-jdt/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml	2007-11-05 18:19:53.000000000 +0100
++++ eclipse-sourceBuild-srcIncluded-3.3.1.1-new/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml	2007-11-06 11:40:02.000000000 +0100
+@@ -266,9 +266,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.pluggable.core" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.equinox.preferences" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -290,9 +287,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.navigator" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.apt" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jface.databinding" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -704,10 +698,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20070831-0435"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.equinox.preferences_3.2.100.v20070522"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+@@ -736,10 +726,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20070831-0435"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.jface.databinding_1.1.1.M20070910-0800b"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+diff -ur --exclude='*.java' eclipse-sourceBuild-srcIncluded-3.3.1.1-after-jdt/assemble.org.eclipse.sdk.linux.gtk.x86.xml eclipse-sourceBuild-srcIncluded-3.3.1.1-new/assemble.org.eclipse.sdk.linux.gtk.x86.xml
+--- eclipse-sourceBuild-srcIncluded-3.3.1.1-after-jdt/assemble.org.eclipse.sdk.linux.gtk.x86.xml	2007-11-05 18:20:07.000000000 +0100
++++ eclipse-sourceBuild-srcIncluded-3.3.1.1-new/assemble.org.eclipse.sdk.linux.gtk.x86.xml	2007-11-06 11:40:34.000000000 +0100
+@@ -266,9 +266,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.pluggable.core" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.equinox.preferences" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -293,9 +290,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.navigator" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.apt" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jface.databinding" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -704,10 +698,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20070831-0435"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.equinox.preferences_3.2.100.v20070522"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+@@ -740,10 +730,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20070831-0435"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.jface.databinding_1.1.1.M20070910-0800b"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+diff -ur --exclude='*.java' eclipse-sourceBuild-srcIncluded-3.3.1.1-after-jdt/features/org.eclipse.jdt/build.xml eclipse-sourceBuild-srcIncluded-3.3.1.1-new/features/org.eclipse.jdt/build.xml
+--- eclipse-sourceBuild-srcIncluded-3.3.1.1-after-jdt/features/org.eclipse.jdt/build.xml	2007-11-05 18:20:50.000000000 +0100
++++ eclipse-sourceBuild-srcIncluded-3.3.1.1-new/features/org.eclipse.jdt/build.xml	2007-11-06 11:37:20.000000000 +0100
+@@ -32,21 +32,11 @@
+ 			<property name="os" value="win32"/>
+ 			<property name="ws" value="win32"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.compiler.apt" target="${target}">
+-			<property name="arch" value="x86"/>
+-			<property name="os" value="win32"/>
+-			<property name="ws" value="win32"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.apt.core" target="${target}">
+ 			<property name="arch" value="x86"/>
+ 			<property name="os" value="win32"/>
+ 			<property name="ws" value="win32"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.apt.pluggable.core" target="${target}">
+-			<property name="arch" value="x86"/>
+-			<property name="os" value="win32"/>
+-			<property name="ws" value="win32"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.debug" target="${target}">
+ 			<property name="arch" value="x86"/>
+ 			<property name="os" value="win32"/>
diff --git a/dev-util/eclipse-sdk/files/3.3/disable-jdt-tool.diff b/dev-util/eclipse-sdk/files/3.3/disable-jdt-tool.diff
new file mode 100644
index 000000000000..636e830e1a32
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/3.3/disable-jdt-tool.diff
@@ -0,0 +1,104 @@
+diff -ur --exclude='*.java' eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/assemble.org.eclipse.sdk.linux.gtk.ppc.xml eclipse-sourceBuild-srcIncluded-3.3.1.1-new/assemble.org.eclipse.sdk.linux.gtk.ppc.xml
+--- eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/assemble.org.eclipse.sdk.linux.gtk.ppc.xml	2007-11-05 17:29:09.000000000 +0100
++++ eclipse-sourceBuild-srcIncluded-3.3.1.1-new/assemble.org.eclipse.sdk.linux.gtk.ppc.xml	2007-11-05 18:19:38.000000000 +0100
+@@ -98,9 +98,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.help.ui" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.tool" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.equinox.http.jetty" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -531,10 +528,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_780_R33x"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.equinox.http.jetty_1.0.1.R33x_v20070816"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+diff -ur --exclude='*.java' eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml eclipse-sourceBuild-srcIncluded-3.3.1.1-new/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml
+--- eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml	2007-11-05 17:30:35.000000000 +0100
++++ eclipse-sourceBuild-srcIncluded-3.3.1.1-new/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml	2007-11-05 18:19:53.000000000 +0100
+@@ -98,9 +98,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.help.ui" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.tool" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.equinox.http.jetty" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -527,10 +524,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_780_R33x"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.equinox.http.jetty_1.0.1.R33x_v20070816"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+diff -ur --exclude='*.java' eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/assemble.org.eclipse.sdk.linux.gtk.x86.xml eclipse-sourceBuild-srcIncluded-3.3.1.1-new/assemble.org.eclipse.sdk.linux.gtk.x86.xml
+--- eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/assemble.org.eclipse.sdk.linux.gtk.x86.xml	2007-11-05 17:30:20.000000000 +0100
++++ eclipse-sourceBuild-srcIncluded-3.3.1.1-new/assemble.org.eclipse.sdk.linux.gtk.x86.xml	2007-11-05 18:20:07.000000000 +0100
+@@ -98,9 +98,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.help.ui" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.tool" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.equinox.http.jetty" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -527,10 +524,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_780_R33x"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.equinox.http.jetty_1.0.1.R33x_v20070816"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+diff -ur --exclude='*.java' eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/features/org.eclipse.jdt/build.xml eclipse-sourceBuild-srcIncluded-3.3.1.1-new/features/org.eclipse.jdt/build.xml
+--- eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/features/org.eclipse.jdt/build.xml	2007-10-23 23:31:15.000000000 +0200
++++ eclipse-sourceBuild-srcIncluded-3.3.1.1-new/features/org.eclipse.jdt/build.xml	2007-11-05 18:20:50.000000000 +0100
+@@ -32,11 +32,6 @@
+ 			<property name="os" value="win32"/>
+ 			<property name="ws" value="win32"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.compiler.tool" target="${target}">
+-			<property name="arch" value="x86"/>
+-			<property name="os" value="win32"/>
+-			<property name="ws" value="win32"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.compiler.apt" target="${target}">
+ 			<property name="arch" value="x86"/>
+ 			<property name="os" value="win32"/>
+diff -ur --exclude='*.java' eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/features/org.eclipse.jdt/feature.xml eclipse-sourceBuild-srcIncluded-3.3.1.1-new/features/org.eclipse.jdt/feature.xml
+--- eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/features/org.eclipse.jdt/feature.xml	2007-10-23 23:48:30.000000000 +0200
++++ eclipse-sourceBuild-srcIncluded-3.3.1.1-new/features/org.eclipse.jdt/feature.xml	2007-11-05 18:21:00.000000000 +0100
+@@ -66,13 +66,6 @@
+          fragment="true"
+          unpack="false"/>
+          
+-   <plugin
+-         id="org.eclipse.jdt.compiler.tool"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         fragment="true"
+-         unpack="false"/> 
+ 
+    <plugin
+          id="org.eclipse.jdt.core"
diff --git a/dev-util/eclipse-sdk/files/3.3/disable-swt.diff b/dev-util/eclipse-sdk/files/3.3/disable-swt.diff
new file mode 100644
index 000000000000..88120037469c
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/3.3/disable-swt.diff
@@ -0,0 +1,331 @@
+diff -ur --exclude='*.java' eclipse-sourceBuild-srcIncluded-3.3.1.1-orig/assemble.org.eclipse.sdk.linux.gtk.ppc.xml eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/assemble.org.eclipse.sdk.linux.gtk.ppc.xml
+--- eclipse-sourceBuild-srcIncluded-3.3.1.1-orig/assemble.org.eclipse.sdk.linux.gtk.ppc.xml	2007-10-23 23:31:15.000000000 +0200
++++ eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/assemble.org.eclipse.sdk.linux.gtk.ppc.xml	2007-11-05 17:29:09.000000000 +0100
+@@ -239,9 +239,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.core" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.swt.gtk.linux.ppc" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.update.scheduler" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -570,10 +567,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.swt_3.3.2.v3347"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.core.commands_3.3.0.I20070605-0010"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+diff -ur --exclude='*.java' eclipse-sourceBuild-srcIncluded-3.3.1.1-orig/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml
+--- eclipse-sourceBuild-srcIncluded-3.3.1.1-orig/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml	2007-10-23 23:31:15.000000000 +0200
++++ eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml	2007-11-05 17:30:35.000000000 +0100
+@@ -257,9 +257,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.core.manipulation" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.swt.gtk.linux.x86_64" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.presentations.r21" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -566,10 +563,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.swt_3.3.2.v3347"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.core.commands_3.3.0.I20070605-0010"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+diff -ur --exclude='*.java' eclipse-sourceBuild-srcIncluded-3.3.1.1-orig/assemble.org.eclipse.sdk.linux.gtk.x86.xml eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/assemble.org.eclipse.sdk.linux.gtk.x86.xml
+--- eclipse-sourceBuild-srcIncluded-3.3.1.1-orig/assemble.org.eclipse.sdk.linux.gtk.x86.xml	2007-10-23 23:31:15.000000000 +0200
++++ eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/assemble.org.eclipse.sdk.linux.gtk.x86.xml	2007-11-05 17:30:20.000000000 +0100
+@@ -68,9 +68,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ant.ui" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.swt.gtk.linux.x86" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.ide.application" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -494,10 +491,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.swt.gtk.linux.x86_3.3.2.v3347"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.ui.ide.application_1.0.0.I20070530-0100"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+diff -ur --exclude='*.java' eclipse-sourceBuild-srcIncluded-3.3.1.1-orig/build.xml eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/build.xml
+--- eclipse-sourceBuild-srcIncluded-3.3.1.1-orig/build.xml	2007-10-23 23:49:43.000000000 +0200
++++ eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/build.xml	2007-11-05 17:23:39.000000000 +0100
+@@ -72,26 +72,6 @@
+ 	</target>
+ 
+ 	<target name="compilelibs" depends="init,clean,compile" if="libsconfig">
+-		<property name="swtlibs" value="${buildDirectory}/swttmp" />
+-		<mkdir dir="${swtlibs}" />
+-
+-		<!-- unzip swt zips -->
+-		<unzip dest="${swtlibs}">
+-			<fileset dir="${buildDirectory}/plugins/org.eclipse.rcp.source.${installOs}.${installWs}.${installArch}/src/">
+-				<include name="org.eclipse.swt.${installWs}.${installOs}.${installArch}_*/*.zip" />
+-			</fileset>
+-		</unzip>
+-		<exec dir="${swtlibs}/" executable="sh" failonerror="true">
+-			<arg line="build.sh" />
+-		</exec>
+-		<property name="swtdir" value="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}" />
+-		<mkdir dir="${swtdir}" />
+-		<move todir="${swtdir}/">
+-			<fileset dir="${swtlibs}">
+-				<include name="**/*.so" />
+-			</fileset>
+-		</move>
+-	
+ 		<property name="launcherlibs" value="${buildDirectory}/features/org.eclipse.equinox.executable" />
+ 		<exec dir="${launcherlibs}/library/${installWs}/" executable="sh" failonerror="true">
+ 			<arg line="build.sh" />
+diff -ur --exclude='*.java' eclipse-sourceBuild-srcIncluded-3.3.1.1-orig/features/org.eclipse.platform/build.xml eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/features/org.eclipse.platform/build.xml
+--- eclipse-sourceBuild-srcIncluded-3.3.1.1-orig/features/org.eclipse.platform/build.xml	2007-10-23 23:31:14.000000000 +0200
++++ eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/features/org.eclipse.platform/build.xml	2007-11-05 17:21:53.000000000 +0100
+@@ -292,11 +292,6 @@
+ 			<property name="os" value="win32"/>
+ 			<property name="ws" value="win32"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.win32" target="${target}">
+-			<property name="arch" value="x86"/>
+-			<property name="os" value="win32"/>
+-			<property name="ws" value="win32"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.workbench.texteditor" target="${target}">
+ 			<property name="arch" value="x86"/>
+ 			<property name="os" value="win32"/>
+diff -ur --exclude='*.java' eclipse-sourceBuild-srcIncluded-3.3.1.1-orig/features/org.eclipse.rcp/build.xml eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/features/org.eclipse.rcp/build.xml
+--- eclipse-sourceBuild-srcIncluded-3.3.1.1-orig/features/org.eclipse.rcp/build.xml	2007-10-23 23:31:15.000000000 +0200
++++ eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/features/org.eclipse.rcp/build.xml	2007-11-05 17:25:38.000000000 +0100
+@@ -77,86 +77,6 @@
+ 			<property name="os" value="win32"/>
+ 			<property name="ws" value="win32"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt" target="${target}">
+-			<property name="arch" value="x86"/>
+-			<property name="os" value="win32"/>
+-			<property name="ws" value="win32"/>
+-		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.hpux.ia64_32" target="${target}">
+-			<property name="arch" value="ia64_32"/>
+-			<property name="os" value="hpux"/>
+-			<property name="ws" value="motif"/>
+-		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.photon.qnx.x86" target="${target}">
+-			<property name="arch" value="x86"/>
+-			<property name="os" value="qnx"/>
+-			<property name="ws" value="photon"/>
+-		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.solaris.sparc" target="${target}">
+-			<property name="arch" value="sparc"/>
+-			<property name="os" value="solaris"/>
+-			<property name="ws" value="motif"/>
+-		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.ia64" target="${target}">
+-			<property name="arch" value="ia64"/>
+-			<property name="os" value="linux"/>
+-			<property name="ws" value="gtk"/>
+-		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.linux.x86" target="${target}">
+-			<property name="arch" value="x86"/>
+-			<property name="os" value="linux"/>
+-			<property name="ws" value="motif"/>
+-		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.hpux.PA_RISC" target="${target}">
+-			<property name="arch" value="PA_RISC"/>
+-			<property name="os" value="hpux"/>
+-			<property name="ws" value="motif"/>
+-		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.aix.ppc" target="${target}">
+-			<property name="arch" value="ppc"/>
+-			<property name="os" value="aix"/>
+-			<property name="ws" value="motif"/>
+-		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.carbon.macosx" target="${target}">
+-			<property name="arch" value="ppc"/>
+-			<property name="os" value="macosx"/>
+-			<property name="ws" value="carbon"/>
+-		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.ppc" target="${target}">
+-			<property name="arch" value="ppc"/>
+-			<property name="os" value="linux"/>
+-			<property name="ws" value="gtk"/>
+-		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.solaris.x86" target="${target}">
+-			<property name="arch" value="x86"/>
+-			<property name="os" value="solaris"/>
+-			<property name="ws" value="gtk"/>
+-		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.solaris.sparc" target="${target}">
+-			<property name="arch" value="sparc"/>
+-			<property name="os" value="solaris"/>
+-			<property name="ws" value="gtk"/>
+-		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.s390x" target="${target}">
+-			<property name="arch" value="s390x"/>
+-			<property name="os" value="linux"/>
+-			<property name="ws" value="gtk"/>
+-		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.s390" target="${target}">
+-			<property name="arch" value="s390"/>
+-			<property name="os" value="linux"/>
+-			<property name="ws" value="gtk"/>
+-		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.x86" target="${target}">
+-			<property name="arch" value="x86"/>
+-			<property name="os" value="linux"/>
+-			<property name="ws" value="gtk"/>
+-		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.wpf.win32.x86" target="${target}">
+-			<property name="arch" value="x86"/>
+-			<property name="os" value="win32"/>
+-			<property name="ws" value="wpf"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="../../plugins/org.eclipse.osgi" target="${target}">
+ 			<property name="arch" value="x86"/>
+ 			<property name="os" value="win32"/>
+@@ -232,16 +152,6 @@
+ 			<property name="os" value="win32"/>
+ 			<property name="ws" value="win32"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.win32.win32.x86" target="${target}">
+-			<property name="arch" value="x86"/>
+-			<property name="os" value="win32"/>
+-			<property name="ws" value="win32"/>
+-		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.x86_64" target="${target}">
+-			<property name="arch" value="x86_64"/>
+-			<property name="os" value="linux"/>
+-			<property name="ws" value="gtk"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="../../plugins/org.eclipse.jface" target="${target}">
+ 			<property name="arch" value="x86"/>
+ 			<property name="os" value="win32"/>
+@@ -262,11 +172,6 @@
+ 			<property name="os" value="win32"/>
+ 			<property name="ws" value="win32"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.carbon" target="${target}">
+-			<property name="arch" value="ppc"/>
+-			<property name="os" value="macosx"/>
+-			<property name="ws" value="carbon"/>
+-		</ant>
+ 	</target>
+ 	<target name="all.features" depends="init">
+ 	</target>
+diff -ur --exclude='*.java' eclipse-sourceBuild-srcIncluded-3.3.1.1-orig/features/org.eclipse.rcp.source/build.xml eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/features/org.eclipse.rcp.source/build.xml
+--- eclipse-sourceBuild-srcIncluded-3.3.1.1-orig/features/org.eclipse.rcp.source/build.xml	2007-10-23 23:31:14.000000000 +0200
++++ eclipse-sourceBuild-srcIncluded-3.3.1.1-after-swt/features/org.eclipse.rcp.source/build.xml	2007-11-06 17:06:52.000000000 +0100
+@@ -12,91 +12,6 @@
+ 			<property name="os" value="win32"/>
+ 			<property name="ws" value="win32"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.linux.motif.x86" target="${target}">
+-			<property name="arch" value="x86"/>
+-			<property name="os" value="linux"/>
+-			<property name="ws" value="motif"/>
+-		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.linux.gtk.s390" target="${target}">
+-			<property name="arch" value="s390"/>
+-			<property name="os" value="linux"/>
+-			<property name="ws" value="gtk"/>
+-		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.solaris.motif.sparc" target="${target}">
+-			<property name="arch" value="sparc"/>
+-			<property name="os" value="solaris"/>
+-			<property name="ws" value="motif"/>
+-		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.win32.win32.x86" target="${target}">
+-			<property name="arch" value="x86"/>
+-			<property name="os" value="win32"/>
+-			<property name="ws" value="win32"/>
+-		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.linux.gtk.x86" target="${target}">
+-			<property name="arch" value="x86"/>
+-			<property name="os" value="linux"/>
+-			<property name="ws" value="gtk"/>
+-		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.aix.motif.ppc" target="${target}">
+-			<property name="arch" value="ppc"/>
+-			<property name="os" value="aix"/>
+-			<property name="ws" value="motif"/>
+-		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.macosx.carbon.ppc" target="${target}">
+-			<property name="arch" value="ppc"/>
+-			<property name="os" value="macosx"/>
+-			<property name="ws" value="carbon"/>
+-		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.solaris.gtk.sparc" target="${target}">
+-			<property name="arch" value="sparc"/>
+-			<property name="os" value="solaris"/>
+-			<property name="ws" value="gtk"/>
+-		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.solaris.gtk.x86" target="${target}">
+-			<property name="arch" value="x86"/>
+-			<property name="os" value="solaris"/>
+-			<property name="ws" value="gtk"/>
+-		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.linux.gtk.x86_64" target="${target}">
+-			<property name="arch" value="x86_64"/>
+-			<property name="os" value="linux"/>
+-			<property name="ws" value="gtk"/>
+-		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.win32.wpf.x86" target="${target}">
+-			<property name="arch" value="x86"/>
+-			<property name="os" value="win32"/>
+-			<property name="ws" value="wpf"/>
+-		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.hpux.motif.PA_RISC" target="${target}">
+-			<property name="arch" value="PA_RISC"/>
+-			<property name="os" value="hpux"/>
+-			<property name="ws" value="motif"/>
+-		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.linux.gtk.ppc" target="${target}">
+-			<property name="arch" value="ppc"/>
+-			<property name="os" value="linux"/>
+-			<property name="ws" value="gtk"/>
+-		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.qnx.photon.x86" target="${target}">
+-			<property name="arch" value="x86"/>
+-			<property name="os" value="qnx"/>
+-			<property name="ws" value="photon"/>
+-		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.linux.gtk.s390x" target="${target}">
+-			<property name="arch" value="s390x"/>
+-			<property name="os" value="linux"/>
+-			<property name="ws" value="gtk"/>
+-		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.linux.gtk.ia64" target="${target}">
+-			<property name="arch" value="ia64"/>
+-			<property name="os" value="linux"/>
+-			<property name="ws" value="gtk"/>
+-		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.hpux.motif.ia64_32" target="${target}">
+-			<property name="arch" value="ia64_32"/>
+-			<property name="os" value="hpux"/>
+-			<property name="ws" value="motif"/>
+-		</ant>
+ 	</target>
+ 	<target name="all.features" depends="init">
+ 	</target>
diff --git a/dev-util/eclipse-sdk/files/3.3/eclipse-3.3 b/dev-util/eclipse-sdk/files/3.3/eclipse-3.3
new file mode 100644
index 000000000000..8ceb23fdfac4
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/3.3/eclipse-3.3
@@ -0,0 +1,37 @@
+#!/bin/bash
+#
+# Tiny startup wrapper for Eclipse-3.3
+#
+# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org>
+# Copyright (c) 2007-2008, Jean-Noël Rivasseau <elvanor@gentoo.org>
+# Copyright (c) 2004-2008, Gentoo Foundation
+#
+# Licensed under the GNU General Public License, version 2
+#
+
+[[ -f "/etc/eclipserc" ]] && source "/etc/eclipserc"
+[[ -f "$HOME/.gentoo/eclipserc" ]] && source "$HOME/.gentoo/eclipserc"
+
+ECLIPSE_HOME=${ECLIPSE_HOME:="/usr/lib/eclipse-3.3"}
+ECLIPSE_BIN="${ECLIPSE_HOME}/eclipse"
+
+if [[ ! -x "${ECLIPSE_BIN}" ]] ; then
+	echo "Failed to find executable '${ECLIPSE_BIN}'" > /dev/stderr
+	exit -1
+fi
+
+if ((EUID==0)); then
+	echo "!!! You are running Eclipse as root."
+	echo "!!! This is not recommended, nor needed."
+fi
+
+if [[ -d /usr/lib/mozilla-firefox/ ]]; then
+	export MOZILLA_FIVE_HOME="/usr/lib/mozilla-firefox/"
+fi
+
+if [[ "${ECLIPSE_XMS}" ]]; then VM_ARGS="${VM_ARGS} -Xms${ECLIPSE_XMS}"; fi
+if [[ "${ECLIPSE_XMX}" ]]; then VM_ARGS="${VM_ARGS} -Xmx${ECLIPSE_XMX}"; fi
+if [[ "${ECLIPSE_PERMSIZE}" ]]; then VM_ARGS="${VM_ARGS} -XX:PermSize=${ECLIPSE_PERMSIZE}"; fi
+if [[ "${ECLIPSE_MAX_PERMSIZE}" ]]; then VM_ARGS="${VM_ARGS} -XX:MaxPermSize=${ECLIPSE_MAX_PERMSIZE}"; fi
+
+exec "${ECLIPSE_BIN}" "$@" -vmargs ${VM_ARGS}
\ No newline at end of file
diff --git a/dev-util/eclipse-sdk/files/3.3/eclipse-jsch-api-update.patch b/dev-util/eclipse-sdk/files/3.3/eclipse-jsch-api-update.patch
new file mode 100644
index 000000000000..d829d3ec8081
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/3.3/eclipse-jsch-api-update.patch
@@ -0,0 +1,14 @@
+--- src/org/eclipse/jsch/internal/ui/preference/PreferencePage.java.orig	2007-12-16 14:36:48.000000000 +1300
++++ src/org/eclipse/jsch/internal/ui/preference/PreferencePage.java	2007-12-16 15:05:08.000000000 +1300
+@@ -886,10 +886,10 @@
+ 	      channel.connect();
+ 	      ChannelSftp c=(ChannelSftp)channel;
+ 
+-	      /* String pwd= */c.pwd(); // Read off the channel
+ 	      SftpATTRS attr=null;
+ 	
+ 	      try{
++	        c.pwd(); // Read off the channel
+ 	        attr=c.stat(".ssh");} //$NON-NLS-1$
+ 	      catch(SftpException ee){
+           // Ignore
diff --git a/dev-util/eclipse-sdk/files/3.3/eclipse-workbench-miscompile-workaround.diff b/dev-util/eclipse-sdk/files/3.3/eclipse-workbench-miscompile-workaround.diff
new file mode 100644
index 000000000000..77a4d0b3c30c
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/3.3/eclipse-workbench-miscompile-workaround.diff
@@ -0,0 +1,13 @@
+--- plugins/org.eclipse.ui.workbench/build.xml.orig	2007-04-11 21:13:58.000000000 +0200
++++ plugins/org.eclipse.ui.workbench/build.xml	2007-04-11 21:00:49.000000000 +0200
+@@ -51,8 +51,8 @@
+ 	<condition property="bundleJavacTarget" value="1.1">
+ 		<isset property="J2SE-1.3"/>
+ 	</condition>
+-	<property name="bundleJavacSource" value="${javacSource}"/>
+-	<property name="bundleJavacTarget" value="${javacTarget}"/>
++	<property name="bundleJavacSource" value="1.4"/>
++	<property name="bundleJavacTarget" value="1.4"/>
+ 	<property name="bundleBootClasspath" value="${bootclasspath}"/>
+ 
+ 	<target name="init" depends="properties">
diff --git a/dev-util/eclipse-sdk/files/3.3/eclipserc b/dev-util/eclipse-sdk/files/3.3/eclipserc
new file mode 100644
index 000000000000..703b6491c463
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/3.3/eclipserc
@@ -0,0 +1,20 @@
+# This file specifies some initial Eclipse settings, like memory allowed
+# These settings only affect Eclipse startup and overall configuration
+# Main Eclipse configuration should be done within Eclipse (with the GUI)
+
+# Following variables controls the minimal and maximum amounts of memory
+# allocated to Eclipse (respectively).
+# Increase those numbers if you get OutOfMemory errors.
+
+ECLIPSE_XMS=128m
+ECLIPSE_XMX=256m
+
+# Following variables controls the minimal and maximum amounts of memory
+# allocated to the permanent generation space.
+# This space contains data related to all classes.
+# Thus, if you use a lot of Eclipse plugins, it is recommended to uncomment
+# these variables and even increase it, if you have enough RAM.
+# Else you will get crashes related to OutOfMemory in PermGen exceptions. 
+
+#ECLIPSE_PERMSIZE=64m
+#ECLIPSE_MAX_PERMSIZE=128m
\ No newline at end of file
diff --git a/dev-util/eclipse-sdk/files/3.3/launcher_double-free.diff b/dev-util/eclipse-sdk/files/3.3/launcher_double-free.diff
new file mode 100644
index 000000000000..b0c11b08b639
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/3.3/launcher_double-free.diff
@@ -0,0 +1,10 @@
+--- library/eclipse.c.orig	2007-07-28 17:46:20.000000000 +0200
++++ library/eclipse.c	2007-07-28 17:46:39.000000000 +0200
+@@ -529,6 +530,7 @@
+ 		            }
+ 		            displayMessage( title, errorMsg );
+ 		            free( errorMsg );
++ 		            errorMsg = NULL;
+ 	            }
+ 	            free( title );
+ 	            break;
diff --git a/dev-util/eclipse-sdk/files/3.3/set-java-home.diff b/dev-util/eclipse-sdk/files/3.3/set-java-home.diff
new file mode 100644
index 000000000000..469fa00624de
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/3.3/set-java-home.diff
@@ -0,0 +1,11 @@
+--- build.xml.orig	2007-02-12 19:56:26.000000000 +0100
++++ build.xml	2007-02-12 19:58:08.000000000 +0100
+@@ -73,7 +73,7 @@
+ 			</fileset>
+ 		</unzip>
+ 		<exec dir="${launcherlibs}/library/${installWs}/" executable="sh" failonerror="true">
+-			<arg line="build.sh" />
++			<arg line="build.sh -java ${java5.home}" />
+ 		</exec>
+ 		<move file="${launcherlibs}/library/${installWs}/eclipse" todir="${launcherlibs}/" />
+ 
diff --git a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.3.1.1 b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.3.1.1
new file mode 100644
index 000000000000..46fce428cf00
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.3.1.1
@@ -0,0 +1,3 @@
+MD5 593b56fce7d1f1f799e87365cafefbef eclipse-sourceBuild-srcIncluded-3.3.1.1.zip 94267330
+RMD160 78d19b528e99c3f3416de099ab5dcd59430fc9ac eclipse-sourceBuild-srcIncluded-3.3.1.1.zip 94267330
+SHA256 e4c24d54a2b9bc630f961320c61f8e804255f49b141370d240ce0444eb89a658 eclipse-sourceBuild-srcIncluded-3.3.1.1.zip 94267330