Remove 3.4. #362217

(Portage version: 2.1.11.7/cvs/Linux x86_64)

12 files changed, 11 insertions, 886 deletions

diff --git a/dev-util/eclipse-sdk/ChangeLog b/dev-util/eclipse-sdk/ChangeLog
index 4fa91183c584..ca6450df2e00 100644
--- a/dev-util/eclipse-sdk/ChangeLog
+++ b/dev-util/eclipse-sdk/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-util/eclipse-sdk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.162 2012/05/21 20:05:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.163 2012/07/18 14:24:28 sera Exp $
+
+  18 Jul 2012; Ralph Sennhauser <sera@gentoo.org> -files/eclipse-3.2,
+  -files/3.4/eclipse_build-libs.diff, -files/eclipse-3.2-r1,
+  -files/3.4/ant-osgi-manifest.mf,
+  -files/3.4/fedora/eclipse-pde.build-add-package-build.patch,
+  -files/3.4/eclipse-3.4, -eclipse-sdk-3.4-r2.ebuild,
+  -files/3.4/eclipse_String.compareTo.diff,
+  -files/3.4/eclipse_buildfix-pde.diff, -files/3.4/eclipserc,
+  -files/3.4/fedora/eclipse-libupdatebuild2.patch:
+  Remove 3.4. #362217
 
   21 May 2012; Samuli Suominen <ssuominen@gentoo.org>
   eclipse-sdk-3.4-r2.ebuild, eclipse-sdk-3.5.1-r1.ebuild:
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.4-r2.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.4-r2.ebuild
deleted file mode 100644
index a1855dec2531..000000000000
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.4-r2.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2012 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.4-r2.ebuild,v 1.5 2012/05/21 20:05:07 ssuominen Exp $
-
-# 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 have to stay bundled for now, until someone does some work on them.
-
-# 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 eutils java-pkg-2 java-ant-2 check-reqs
-
-DMF="R-${PV}-200806172000"
-MY_A="eclipse-sourceBuild-srcIncluded-${PV}.zip"
-
-DESCRIPTION="Eclipse Tools Platform"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://archive.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_A}"
-
-SLOT="3.4"
-LICENSE="EPL-1.0"
-IUSE="java6"
-KEYWORDS="amd64 ~ppc x86"
-
-S=${WORKDIR}
-PATCHDIR="${FILESDIR}/${SLOT}"
-FEDORA="${PATCHDIR}/fedora"
-ECLIPSE_DIR="/usr/lib/eclipse-${SLOT}"
-
-CDEPEND="dev-java/ant-eclipse-ecj:${SLOT}
-	dev-java/ant-core
-	dev-java/ant-nodeps
-	dev-java/junit:0
-	dev-java/junit:4
-	dev-java/swt:${SLOT}
-	>=dev-java/jsch-0.1.36-r1
-	>=dev-java/icu4j-3.8.1:0
-	>=dev-java/commons-el-1.0-r2
-	>=dev-java/commons-logging-1.1-r6
-	>=dev-java/tomcat-servlet-api-5.5.25-r1:2.4
-	dev-java/lucene:1.9
-	>=dev-java/lucene-analyzers-1.9.1-r1:1.9"
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
-	dev-java/cldc-api:1.1
-	app-arch/unzip
-	app-arch/zip
-	${CDEPEND}"
-
-JAVA_PKG_BSFIX="off"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	CHECKREQS_MEMORY="512"
-	check_reqs
-
-	eclipsearch=${ARCH}
-	use amd64 && eclipsearch="x86_64"
-}
-
-src_unpack() {
-	unpack ${A}
-	patch-apply
-	remove-bundled-stuff
-
-	# Specific Gentoo tweaks for the build
-	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:gcc :gcc ${CFLAGS} :" \
-		-e "s:^(JAVA_HOME =) .*:\1 $(java-config --jdk-home):" \
-		-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-${SLOT}
-
-	# system_jars will be used when compiling (javac)
-	# gentoo_jars will be used when building JSPs and other ant tasks (not javac)
-	local system_jars="$(java-pkg_getjars swt-${SLOT},icu4j,ant-core,jsch,junit-4,tomcat-servlet-api-2.4,\
-lucene-1.9,lucene-analyzers-1.9):$(java-pkg_getjars --build-only ant-nodeps,cldc-api-1.1)"
-	local gentoo_jars="$(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 java6 && options="${options} -DJavaSE-1.6=${bootclasspath}"
-	use doc && options="${options} -Dgentoo.javadoc=true"
-
-	ANT_OPTS=-Xmx512M ANT_TASKS="ant-nodeps" \
-	eant ${options} \
-		-Dgentoo.classpath="${system_jars}" \
-		-Dgentoo.jars="${gentoo_jars//:/,}"
-}
-
-src_install() {
-	dodir "/usr/lib"
-
-	[ -f "result/linux-gtk-${eclipsearch}-sdk.tar.gz" ] \
-		|| die "tar.gz bundle was not built properly!"
-	tar xzf "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 +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 "Welcome to Eclipse ${PV} (Ganymede)!"
-	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."
-	einfo
-	einfo "The FileInitializer Plugin is no more integrated."
-	einfo "If you need it, get org.eclipse.equinox.initializer_x.y.z.jar from:"
-	einfo "	http://download.eclipse.org/eclipse/equinox/"
-	echo
-	ewarn "The new Update Manager (P2) is not yet supported under Gentoo."
-	ewarn "Please enable the 'Classic Update' under:"
-	ewarn "Window > Preferences > General > Capabilities"
-}
-
-# -----------------------------------------------------------------------------
-#  Helper functions
-# -----------------------------------------------------------------------------
-
-install-link-system-jars() {
-	pushd plugins/ > /dev/null
-
-	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 swt-${SLOT}
-	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 lucene-analyzers-1.9
-	java-pkg_jarfrom tomcat-servlet-api-2.4
-	java-pkg_jarfrom --into org.junit_*/ junit
-	java-pkg_jarfrom --into org.junit4*/ junit-4
-	popd > /dev/null
-}
-
-patch-apply() {
-	# optimize launcher build
-	mkdir launchertmp
-	unzip -qq -d launchertmp plugins/org.eclipse.platform/launchersrc.zip \
-		|| die "unzip failed"
-	pushd launchertmp/ > /dev/null
-	sed -r -e "s/CFLAGS = -O -s -Wall/CFLAGS = ${CFLAGS} -Wall/" \
-		-i library/gtk/make_linux.mak || die "Failed to tweak make_linux.mak"
-	zip -q -6 -r ../launchersrc.zip * || die "zip failed"
-	popd > /dev/null
-	mv launchersrc.zip plugins/org.eclipse.platform/launchersrc.zip
-	rm -rf launchertmp
-
-	# disable swt, jdk6
-	# use sed where possible => ease bump :)
-	sed -e "/..\/..\/plugins\/org.eclipse.ui.win32/,/<\/ant>/d" \
-		-i features/org.eclipse.platform/build.xml
-	sed -e "/dir=\"..\/..\/plugins\/org.eclipse.swt/,/<\/ant>/d" \
-		-i features/org.eclipse.rcp/build.xml \
-		-i features/org.eclipse.rcp.source/build.xml
-	sed -e "/dir=\"..\/..\/plugins\/org.eclipse.ui.carbon\"/,/<\/ant>/d" \
-		-i features/org.eclipse.rcp/build.xml
-
-	sed -e "/dir=\"plugins\/org.eclipse.swt.gtk.linux.${eclipsearch}\"/d" \
-		-e "/value=\"org.eclipse.swt.gtk.linux.${eclipsearch}_/,/eclipse.plugins/d" \
-		-i assemble.org.eclipse.sdk.linux.gtk.${eclipsearch}.xml
-	sed -e "s:\${basedir}/swt.jar:$(java-pkg_getjars --build-only swt-${SLOT}):" \
-		-i plugins/org.eclipse.swt.gtk.linux.${eclipsearch}/build.xml
-
-	if ! use java6; then
-		sed -e "/..\/..\/plugins\/org.eclipse.jdt.apt.pluggable.core/,/<\/ant>/d" \
-			-e "/..\/..\/plugins\/org.eclipse.jdt.compiler.apt/,/<\/ant>/d" \
-			-e "/..\/..\/plugins\/org.eclipse.jdt.compiler.tool/,/<\/ant>/d" \
-			-i features/org.eclipse.jdt/build.xml
-
-		sed -e "/id=\"org.eclipse.jdt.apt.pluggable.core\"/,/<plugin/d" \
-			-e "/id=\"org.eclipse.jdt.compiler.apt\"/,/<plugin/d" \
-			-e "/id=\"org.eclipse.jdt.compiler.tool\"/,/<plugin/d" \
-			-i features/org.eclipse.jdt/feature.xml
-
-		sed -e "/dir=\"plugins\/org.eclipse.jdt.apt.pluggable.core\"/d" \
-			-e "/dir=\"plugins\/org.eclipse.jdt.compiler.apt/d" \
-			-e "/dir=\"plugins\/org.eclipse.jdt.compiler.tool\"/d" \
-			-e "/value=\"org.eclipse.jdt.apt.pluggable.core/,/eclipse.plugins/d" \
-			-e "/value=\"org.eclipse.jdt.compiler.apt/,/eclipse.plugins/d" \
-			-e "/value=\"org.eclipse.jdt.compiler.tool/,/eclipse.plugins/d" \
-			-i assemble.org.eclipse.sdk.linux.gtk.${eclipsearch}.xml
-	fi
-
-	epatch "${PATCHDIR}/eclipse_build-libs.diff"
-	epatch "${PATCHDIR}/eclipse_String.compareTo.diff"
-	epatch "${PATCHDIR}/eclipse_buildfix-pde.diff"
-
-	# JNI
-	epatch "${FEDORA}/eclipse-libupdatebuild2.patch"
-
-	# 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
-	# %patch53
-	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
-
-	# Following adds an additional classpath when building JSPs
-	sed '/<path id="@dot\.classpath">/ a\
-		<filelist dir="" files="${gentoo.jars}" />' \
-		-i plugins/org.eclipse.help.webapp/build.xml
-
-	# Following allows the doc USE flag to be honored
-	sed -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}" />' \
-		-i plugins/org.eclipse.platform.doc.isv/buildDoc.xml
-
-	# This allows to compile osgi.util and osgi.service, and fixes IPluginDescriptor.class which is present compiled
-	sed -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.v20071203" failonerror="true" overwrite="false"> \
-			<fileset dir="${build.result.folder}/@dot"> \
-				<include name="**"/> \
-			</fileset> \
-		</copy>
-		}' \
-		-i plugins/org.eclipse.osgi.services/build.xml
-
-	sed -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.v20071203" failonerror="true" overwrite="false"> \
-			<fileset dir="${build.result.folder}/@dot"> \
-				<include name="**"/> \
-			</fileset> \
-		</copy>
-		}' \
-		-i plugins/org.eclipse.osgi.util/build.xml
-
-	sed '/<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" /> \
-		</copy>' \
-		-i plugins/org.eclipse.core.runtime.compatibility.registry/build.xml
-
-	# This removes the copying operation for bundled jars
-	sed -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_.*\/>//" \
-		-e "s/<copy.*org\.apache\.lucene\.analysis_.*\/>//" \
-		-i package.org.eclipse.sdk.linux.gtk.${eclipsearch}.xml
-}
-
-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
-	pushd plugins/ >/dev/null
-	rm org.eclipse.osgi/osgi/osgi*.jar \
-		org.eclipse.osgi/supplement/osgi/osgi.jar \
-		org.eclipse.swt/extra_jars/exceptions.jar
-
-	rm -rf org.apache.ant_*/*
-	rm org.apache.commons.el_*.jar org.apache.commons.logging_*.jar \
-		com.jcraft.jsch_*.jar com.ibm.icu_*.jar org.junit_*/*.jar \
-		org.junit4*/*.jar javax.servlet.jsp_*.jar javax.servlet_*.jar \
-		org.apache.lucene_*.jar org.apache.lucene.analysis_*.jar
-
-	# Remove bundled classes
-	rm -rf org.eclipse.osgi.services/org
-	unzip -q org.eclipse.osgi.services/src.zip -d org.eclipse.osgi.services/
-	rm -rf org.eclipse.osgi.util/org
-	unzip -q org.eclipse.osgi.util/src.zip -d org.eclipse.osgi.util/
-
-	rm -rf org.eclipse.jdt.core/scripts/*.class
-	rm -rf org.eclipse.core.runtime.compatibility.registry/classes
-	popd >/dev/null
-}
diff --git a/dev-util/eclipse-sdk/files/3.4/ant-osgi-manifest.mf b/dev-util/eclipse-sdk/files/3.4/ant-osgi-manifest.mf
deleted file mode 100644
index deb8a6aa87a8..000000000000
--- a/dev-util/eclipse-sdk/files/3.4/ant-osgi-manifest.mf
+++ /dev/null
@@ -1,30 +0,0 @@
-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.4/eclipse-3.4 b/dev-util/eclipse-sdk/files/3.4/eclipse-3.4
deleted file mode 100644
index c7dba1c94d8c..000000000000
--- a/dev-util/eclipse-sdk/files/3.4/eclipse-3.4
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-#
-# Tiny startup wrapper for Eclipse
-#
-# 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
-#
-
-SLOT="3.4"
-
-[ -f "/etc/eclipserc" ] && source "/etc/eclipserc"
-[ -f "$HOME/.gentoo/.eclipserc" ] && source "$HOME/.gentoo/.eclipserc"
-
-ECLIPSE_HOME=${ECLIPSE_HOME:="/usr/lib/eclipse-${SLOT}"}
-ECLIPSE_BIN="${ECLIPSE_HOME}/eclipse"
-
-if [ ! -x ${ECLIPSE_BIN} ] ; then
-	echo "Failed to find executable '${ECLIPSE_BIN}'" > /dev/stderr
-	exit -1
-fi
-
-if [ $(id -u) -eq 0 ] ; then
-	echo "Do not run eclipse as root user! Exiting ..."
-	exit -1
-fi
-
-case "$(java-config -f)" in
-	*gcj*)
-		export JAVA_PKG_CLASSMAP="${ECLIPSE_HOME}/eclipse.gcjdb"
-		;;
-esac
-
-eval $(gjl --package "swt-${SLOT}" --get-args)
-
-[ -n "${ECLIPSE_XMS}" ] && VM_ARGS="${VM_ARGS} -Xms${ECLIPSE_XMS}"
-[ -n "${ECLIPSE_XMX}" ] && VM_ARGS="${VM_ARGS} -Xmx${ECLIPSE_XMX}"
-[ -n "${ECLIPSE_PERMSIZE}" ] && VM_ARGS="${VM_ARGS} -XX:PermSize=${ECLIPSE_PERMSIZE}"
-[ -n "${ECLIPSE_MAX_PERMSIZE}" ] && VM_ARGS="${VM_ARGS} -XX:MaxPermSize=${ECLIPSE_MAX_PERMSIZE}"
-
-exec ${ECLIPSE_BIN} -vm $(java-config --java) "$@" "${ECLIPSE_USER_ARGS}" -vmargs ${VM_ARGS}
\ No newline at end of file
diff --git a/dev-util/eclipse-sdk/files/3.4/eclipse_String.compareTo.diff b/dev-util/eclipse-sdk/files/3.4/eclipse_String.compareTo.diff
deleted file mode 100644
index a39c23618d3c..000000000000
--- a/dev-util/eclipse-sdk/files/3.4/eclipse_String.compareTo.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- plugins/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/ApiProfileWizardPage.java.orig	2008-04-01 11:24:25.000000000 +0200
-+++ plugins/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/ApiProfileWizardPage.java	2008-04-01 11:25:43.000000000 +0200
-@@ -282,7 +282,7 @@
- 		}
- 		Collections.sort(items, new Comparator() {
- 			public int compare(Object o1, Object o2) {
--				return ((String)o1).compareTo(o2);
-+				return ((String)o1).compareTo((String)o2);
- 			}
- 		});		
- 				
---- plugins/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/DeltaReportConversionTask.java.orig	2008-05-05 21:35:49.000000000 +0200
-+++ plugins/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/DeltaReportConversionTask.java	2008-05-05 21:36:16.000000000 +0200
-@@ -243,7 +243,7 @@
- 			public int compare(Object o1, Object o2) {
- 				Map.Entry entry1 = (Map.Entry) o1;
- 				Map.Entry entry2 = (Map.Entry) o2;
--				return ((String) entry1.getKey()).compareTo(entry2.getKey());
-+				return ((String)entry1.getKey()).compareTo((String)entry2.getKey());
- 			}
- 		});
- 		for (Iterator iterator = allEntries.iterator(); iterator.hasNext(); ) {
---- plugins/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/APIToolsVerificationTask.java.orig	2008-06-11 17:16:18.000000000 +0200
-+++ plugins/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/APIToolsVerificationTask.java	2008-06-11 17:16:39.000000000 +0200
-@@ -656,7 +656,7 @@
- 			public int compare(Object o1, Object o2) {
- 				Map.Entry entry1 = (Map.Entry) o1;
- 				Map.Entry entry2 = (Map.Entry) o2;
--				return ((String) entry1.getKey()).compareTo(entry2.getKey());
-+				return ((String)entry1.getKey()).compareTo((String)entry2.getKey());
- 			}
- 		});
- 		Summary[] summaries = new Summary[size];
diff --git a/dev-util/eclipse-sdk/files/3.4/eclipse_build-libs.diff b/dev-util/eclipse-sdk/files/3.4/eclipse_build-libs.diff
deleted file mode 100644
index 0f77f3634b72..000000000000
--- a/dev-util/eclipse-sdk/files/3.4/eclipse_build-libs.diff
+++ /dev/null
@@ -1,45 +0,0 @@
---- build.xml	2008-06-11 17:43:11.000000000 +0200
-+++ build.xml	2008-05-02 07:33:57.000000000 +0200
-@@ -1,7 +1,7 @@
- <project name="Eclipse SDK Source Build" default="run" basedir=".">
- 
- 	<!--  default target that runs complete build  -->
--	<target name="run" depends="fetch,insertBuildId,compile,install" />
-+	<target name="run" depends="fetch,insertBuildId,compile,compilelibs,install" />
- 
- 	<!--  all features required to build eclipse sdk and javadoc  -->
- 	<target name="allElements">
-@@ -71,6 +71,33 @@
- 		<record name="compilelog.txt" action="stop" />
- 	</target>
- 
-+	<target name="compilelibs" depends="init,clean,compile" if="libsconfig">
-+		<property name="launcherlibs" value="${buildDirectory}/features/org.eclipse.equinox.executable" />
-+		<exec dir="${launcherlibs}/library/${installWs}/" executable="sh" failonerror="true">
-+			<arg line="build.sh -java ${java5.home}" />
-+		</exec>
-+		<copy file="${launcherlibs}/library/${installWs}/eclipse" todir="${buildDirectory}/eclipse/" />
-+
-+		<property name="launcherfragment" value="org.eclipse.equinox.launcher.${installWs}.${installOs}.${installArch}" />
-+
-+		<copy file="${launcherlibs}/library/${installWs}/eclipse" todir="features/org.eclipse.equinox.executable/contributed/${installWs}/${installOs}/${installArch}/" />
-+		<copy todir="${buildDirectory}/plugins/${launcherfragment}">
-+			<fileset dir="${launcherlibs}/library/${installWs}">
-+				<include name="**/*.so" />
-+			</fileset>
-+		</copy>
-+
-+		<!-- build liblocalfile -->
-+		<exec dir="plugins/org.eclipse.core.filesystem/natives/unix/linux" executable="make" failonerror="true" />
-+		<move file="plugins/org.eclipse.core.filesystem/natives/unix/linux/liblocalfile_1_0_0.so" todir="plugins/org.eclipse.core.filesystem.linux.${installArch}/os/linux/${installArch}">
-+		</move>
-+		<!-- build libupdate -->
-+		<ant dir="plugins/org.eclipse.update.core.linux/src" antfile="build.xml" />
-+
-+	</target>
-+
-+
-+
- 	<!--create an installable eclipse runtime-->
- 	<target name="install" depends="init">
- 		<echo message="Assembling..." />
diff --git a/dev-util/eclipse-sdk/files/3.4/eclipse_buildfix-pde.diff b/dev-util/eclipse-sdk/files/3.4/eclipse_buildfix-pde.diff
deleted file mode 100644
index 129658735945..000000000000
--- a/dev-util/eclipse-sdk/files/3.4/eclipse_buildfix-pde.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- features/org.eclipse.pde/build.xml.orig	2008-05-05 21:45:14.000000000 +0200
-+++ features/org.eclipse.pde/build.xml	2008-05-05 21:45:31.000000000 +0200
-@@ -69,7 +69,7 @@
- 	<target name="update.feature" depends="init">
- 	</target>
- 
--	<target name="all.children" depends="init,all.features,all.plugins,update.feature">
-+	<target name="all.children" depends="init,all.plugins,all.features,update.feature">
- 	</target>
- 
- 	<target name="children" if="include.children">
diff --git a/dev-util/eclipse-sdk/files/3.4/eclipserc b/dev-util/eclipse-sdk/files/3.4/eclipserc
deleted file mode 100644
index 3e97c2b25b36..000000000000
--- a/dev-util/eclipse-sdk/files/3.4/eclipserc
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file specifies some initial Eclipse settings, like memory allowed to Eclipse.
-# 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 or if you have lots of memory to
-# throw at Eclipse.
-
-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.
-# The default values should be enough for most people, but you can increase those amounts
-# if you get crashes related to OutOfMemory in PermGen exceptions.
-# If you lack memory, you can also try decrease those amounts.
-
-ECLIPSE_PERMSIZE=128m
-ECLIPSE_MAX_PERMSIZE=256m
-
-# Additional needed properties (see bug #219413)
-
-#ECLIPSE_USER_ARGS=""
\ No newline at end of file
diff --git a/dev-util/eclipse-sdk/files/3.4/fedora/eclipse-libupdatebuild2.patch b/dev-util/eclipse-sdk/files/3.4/fedora/eclipse-libupdatebuild2.patch
deleted file mode 100644
index 263adbbc516c..000000000000
--- a/dev-util/eclipse-sdk/files/3.4/fedora/eclipse-libupdatebuild2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/org.eclipse.update.core.linux/src/build.xml.orig	2008-06-11 17:29:43.000000000 +0200
-+++ plugins/org.eclipse.update.core.linux/src/build.xml	2008-06-11 17:30:03.000000000 +0200
-@@ -5,7 +5,6 @@
-   <!-- Set a meaningful default value for when it is not. -->
-   <property name="eclipse-home" value="${basedir}/../.."/>
-   <property name="jdk-path" value="${java.home}"/>
--  <property name="installArch" value="x86" />
-   <property name="destination" value="${eclipse-home}/org.eclipse.update.core.linux/os/linux/${installArch}/"/>
-   <property name="obj-path" value="${eclipse-home}/org.eclipse.update.core.linux/src/"/>
-   <property name="src-path" value="${eclipse-home}/org.eclipse.update.core.linux/src/"/>  
diff --git a/dev-util/eclipse-sdk/files/3.4/fedora/eclipse-pde.build-add-package-build.patch b/dev-util/eclipse-sdk/files/3.4/fedora/eclipse-pde.build-add-package-build.patch
deleted file mode 100644
index 77f347d6a73a..000000000000
--- a/dev-util/eclipse-sdk/files/3.4/fedora/eclipse-pde.build-add-package-build.patch
+++ /dev/null
@@ -1,273 +0,0 @@
-Index: templates/package-build/build.properties
-===================================================================
-RCS file: templates/package-build/build.properties
-diff -N templates/package-build/build.properties
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ templates/package-build/build.properties	1 Jan 1970 00:00:00 -0000
-@@ -0,0 +1,12 @@
-+buildDirectory=${sourceDirectory}/build
-+buildLabel=rpmBuild
-+archivePrefix=eclipse
-+skipFetch=true
-+javacFailOnError=true
-+collectingFolder=eclipse
-+archivesFormat=*,*,*-zip
-+zipargs=-y
-+javacDebugInfo=true
-+archiveName=${id}.zip
-+runPackager=false
-+baseLocation=/usr/share/eclipse
-Index: templates/package-build/customTargets-assemble-target.xml
-===================================================================
-RCS file: templates/package-build/customTargets-assemble-target.xml
-diff -N templates/package-build/customTargets-assemble-target.xml
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ templates/package-build/customTargets-assemble-target.xml	1 Jan 1970 00:00:00 -0000
-@@ -0,0 +1,12 @@
-+<project>
-+	<!-- ===================================================================== -->
-+	<!-- Targets to assemble the built elements for particular configurations  -->
-+	<!-- These generally call the generated assemble scripts (named in -->
-+	<!-- ${assembleScriptName}) but may also add pre and post processing -->
-+	<!-- Add one target for each root element and each configuration -->
-+	<!-- ===================================================================== -->
-+
-+	<target name="assemble.@id@">
-+		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-+	</target>
-+</project>
-Index: templates/package-build/customTargets.xml
-===================================================================
-RCS file: templates/package-build/customTargets.xml
-diff -N templates/package-build/customTargets.xml
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ templates/package-build/customTargets.xml	1 Jan 1970 00:00:00 -0000
-@@ -0,0 +1,144 @@
-+<project name="Build specific targets and properties" default="noDefault">
-+
-+	<fail unless="type" message="Please set the ${type} property to 'feature', 'plugin' or 'fragment'." />
-+	<fail unless="id" message="Please set the ${id} property to the feature, plugin or fragment id of the plugin you are building." />
-+	<fail unless="sourceDirectory" message="Please set the ${sourceDirectory} property to the directory that has the source plugins." />
-+
-+	<!-- we need to do this because you can't expand variables in target names -->	
-+	<copy file="${builder}/customTargets-assemble-target.xml" tofile="${buildDirectory}/customTargets-${id}-assemble-target.xml" /> 
-+	<replace file="${buildDirectory}/customTargets-${id}-assemble-target.xml" token="@id@" value="${id}" />
-+	<import file="${buildDirectory}/customTargets-${id}-assemble-target.xml" />
-+
-+	<!-- ===================================================================== -->
-+	<!-- Run a given ${target} on all elements being built -->
-+	<!-- Add on <ant> task for each top level element being built. -->
-+	<!-- ===================================================================== -->
-+	<target name="allElements">
-+		<ant antfile="${genericTargets}" target="${target}">
-+			<property name="type" value="${type}" />
-+			<property name="id" value="${id}" />
-+		</ant>
-+	</target>
-+
-+	
-+	<!-- ===================================================================== -->
-+	<!-- Check out map files from correct repository -->
-+	<!-- ===================================================================== -->
-+	<target name="getMapFiles">
-+	</target>
-+
-+	<!-- ===================================================================== -->
-+
-+	<target name="clean" unless="noclean">
-+		<antcall target="allElements">
-+			<param name="target" value="cleanElement" />
-+		</antcall>
-+	</target>
-+
-+	<!-- ===================================================================== -->
-+	<!-- Steps to do before setup -->
-+	<!-- ===================================================================== -->
-+	<target name="preSetup">
-+	</target>
-+
-+	<!-- ===================================================================== -->
-+	<!-- Steps to do after setup but before starting the build proper -->
-+	<!-- ===================================================================== -->
-+	<target name="postSetup">
-+	</target>
-+
-+	<!-- ===================================================================== -->
-+	<!-- Steps to do before fetching the build elements -->
-+	<!-- ===================================================================== -->
-+	<target name="preFetch">
-+	</target>
-+
-+	<!-- ===================================================================== -->
-+	<!-- Steps to do after fetching the build elements -->
-+	<!-- ===================================================================== -->
-+	<target name="postFetch">
-+	</target>
-+
-+	<!-- ===================================================================== -->
-+	<!-- Steps to do before generating the build scripts. -->
-+	<!-- ===================================================================== -->
-+	<target name="preGenerate">
-+		<!-- Eclipse expects the feature projects to be in the 'features' directory and 
-+   		plugin projects to be in the 'plugins' directory. The build infrastructure 
-+		normally arranges the projects during the fetch stage. Since we aren't doing
-+ 		the fetch stage, we have to manually arrange the files -->
-+		<exec dir="${builder}" executable="/bin/sh">
-+			<arg line="prepare-build-dir.sh ${sourceDirectory} ${buildDirectory}" />
-+		</exec> 
-+
-+	</target>
-+
-+	<!-- ===================================================================== -->
-+	<!-- Steps to do after generating the build scripts. -->
-+	<!-- ===================================================================== -->
-+	<target name="postGenerate">
-+		<antcall target="clean" />
-+	</target>
-+
-+	<!-- ===================================================================== -->
-+	<!-- Steps to do before running the build.xmls for the elements being built. -->
-+	<!-- ===================================================================== -->
-+	<target name="preProcess">
-+	</target>
-+
-+	<!-- ===================================================================== -->
-+	<!-- Steps to do after running the build.xmls for the elements being built. -->
-+	<!-- ===================================================================== -->
-+	<target name="postProcess">
-+	</target>
-+
-+	<!-- ===================================================================== -->
-+	<!-- Steps to do before running assemble. -->
-+	<!-- ===================================================================== -->
-+	<target name="preAssemble">
-+	</target>
-+
-+	<!-- ===================================================================== -->
-+	<!-- Steps to do after  running assemble. -->
-+	<!-- ===================================================================== -->
-+	<target name="postAssemble">
-+	</target>
-+
-+	<!-- ===================================================================== -->
-+	<!-- Steps to do before running package. -->
-+	<!-- ===================================================================== -->
-+	<target name="prePackage">
-+	</target>
-+
-+	<!-- ===================================================================== -->
-+	<!-- Steps to do after  running package. -->
-+	<!-- ===================================================================== -->
-+	<target name="postPackage">
-+	</target>
-+
-+	<!-- ===================================================================== -->
-+	<!-- Steps to do after the build is done. -->
-+	<!-- ===================================================================== -->
-+	<target name="postBuild">
-+	</target>
-+
-+	<!-- ===================================================================== -->
-+	<!-- Steps to do to test the build results -->
-+	<!-- ===================================================================== -->
-+	<target name="test">
-+	</target>
-+
-+	<!-- ===================================================================== -->
-+	<!-- Steps to do to publish the build results -->
-+	<!-- ===================================================================== -->
-+	<target name="publish">
-+	</target>
-+
-+	<!-- ===================================================================== -->
-+	<!-- Default target                                                        -->
-+	<!-- ===================================================================== -->
-+	<target name="noDefault">
-+		<echo message="You must specify a target when invoking this file" />
-+	</target>
-+
-+</project>
-Index: templates/package-build/prepare-build-dir.sh
-===================================================================
-RCS file: templates/package-build/prepare-build-dir.sh
-diff -N templates/package-build/prepare-build-dir.sh
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ templates/package-build/prepare-build-dir.sh	1 Jan 1970 00:00:00 -0000
-@@ -0,0 +1,77 @@
-+#!/bin/sh
-+
-+if [ $# -ne 2 ]; then 
-+  echo "usage: $0 <path to source dir> <path to build dir>"
-+  exit 1
-+fi
-+
-+if [ ! -d $1 ]; then
-+  echo "usage: $0 <path to source dir> <path to build dir>"
-+  exit 1
-+fi
-+
-+SOURCEDIR=$1
-+BUILDDIR=$2
-+
-+echo "preparing files in $1 for buildfile generation ..."
-+mkdir -p $BUILDDIR
-+
-+# make some ant build files to extract the id from the feature.xml, plugin.xml or the fragment.xml
-+mkdir -p $BUILDDIR/tmp
-+BUILDFILE=$BUILDDIR/tmp/build.xml
-+
-+echo "<project default=\"main\">
-+	<target name=\"main\">
-+               	<xmlproperty file=\"@type@.xml\" collapseAttributes=\"true\"/>
-+		<fail unless=\"@type@.id\" message=\"feature.id not set\"/>
-+               	<echo message=\"\${@type@.id}\" />
-+        </target>
-+</project>" > $BUILDFILE
-+
-+for type in feature plugin fragment; do
-+  CURBUILDFILE=$BUILDDIR/tmp/$type-build.xml
-+  cat $BUILDFILE | sed "s|@type@|$type|" > $CURBUILDFILE
-+done
-+
-+# make the directories eclipse is expecting 
-+echo "  making the 'features' and 'plugins' directories"
-+mkdir -p $BUILDDIR/features $BUILDDIR/plugins
-+
-+# make symlinks for the features
-+FEATURES=$(find $SOURCEDIR -name feature.xml)
-+for f in $FEATURES; do
-+  PROJECTDIR=$(dirname $f)
-+  PROJECTNAME=$(ant -Dbasedir=$PROJECTDIR -f $BUILDDIR/tmp/feature-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7)
-+  if [ -z $PROJECTNAME ]; then
-+    echo "ERROR: could not determine the feature id for $PROJECTDIR"
-+    exit 1
-+  fi
-+
-+  echo "  making symlink: $BUILDDIR/features/$PROJECTNAME -> $PROJECTDIR"
-+  ln -sf $PROJECTDIR $BUILDDIR/features/$PROJECTNAME
-+done
-+
-+# make symlinks for plugins and fragments
-+PLUGINDIRS=$(find $SOURCEDIR -name plugin.xml -o -name fragment.xml -o -name MANIFEST.MF | sed "s/plugin.xml//g" | sed "s/fragment.xml//g" | sed "s/META-INF\/MANIFEST.MF//" | sort | uniq)
-+for dir in $PLUGINDIRS; do
-+  PROJECTNAME=""
-+  if [ -e $dir/META-INF/MANIFEST.MF ]; then
-+    PROJECTNAME=$(grep Bundle-SymbolicName $dir/META-INF/MANIFEST.MF | cut --delimiter=';' -f 1 | cut --delimiter=' ' -f 2)
-+  elif [ -e $dir/plugin.xml ]; then
-+    PROJECTNAME=$(ant -Dbasedir=$dir -f $BUILDDIR/tmp/plugin-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7)
-+  elif [ -e $dir/fragment.xml ]; then
-+    PROJECTNAME=$(ant -Dbasedir=$dir -f $BUILDDIR/tmp/fragment-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7)
-+  fi
-+
-+  if [ -z $PROJECTNAME  ]; then
-+    echo "ERROR: could not determine the plugin or fragment id for $dir"
-+    exit 1
-+  fi
-+
-+  echo "  making symlink: $BUILDDIR/plugins/$PROJECTNAME -> $dir"
-+  ln -sf $dir $BUILDDIR/plugins/$PROJECTNAME
-+
-+done 
-+
-+rm -rf $BUILDDIR/tmp
-+echo done 
diff --git a/dev-util/eclipse-sdk/files/eclipse-3.2 b/dev-util/eclipse-sdk/files/eclipse-3.2
deleted file mode 100644
index 0859cd52a485..000000000000
--- a/dev-util/eclipse-sdk/files/eclipse-3.2
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/bash
-#
-# Tiny startup wrapper for the Eclipse 3.2.x series
-#
-# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org>
-# Copyright (c) 2004, Gentoo Foundation
-#
-# Licensed under the GNU General Public License, version 2
-#
-
-[[ -f $HOME/.eclipserc ]] && source $HOME/.eclipserc
-
-ECLIPSE_HOME=${ECLIPSE_HOME:="/usr/lib/eclipse-3.2"}
-ECLIPSE_BIN="${ECLIPSE_HOME}/eclipse"
-
-if [ ! -x ${ECLIPSE_BIN} ] ; then
-	echo "Failed to find executable '${ECLIPSE_BIN}'" > /dev/stderr
-	exit -1
-fi
-
-if [ $(whoami) == "root" ] ; then
-	echo "!!! You are running Eclipse as root. Be advised that this will modify the contents of"
-	echo "!!! /usr/lib/eclipse-3.2, and that such a modification may prevent you from safely"
-	echo "!!! upgrading to later 3.2 revisions."
-	echo
-	echo "!!! To ensure correct behavior on your next upgrade, do:"
-	echo "!!!  1) 'emerge unmerge \"=eclipse-sdk-3.2\"'"
-	echo "!!!  2) 'rm -rf /usr/lib/eclipse-3.2'"
-	echo "!!!  3) 'emerge eclipse-sdk'"
-fi
-
-if [[ -d /usr/lib/gecko-sdk/lib/ ]] && [[ -f /usr/lib/gecko-sdk/lib/libgtkembedmoz.so ]] ; then
-    export MOZILLA_FIVE_HOME="/usr/lib/gecko-sdk/lib/"
-fi
-
-exec ${ECLIPSE_BIN} "$@"
diff --git a/dev-util/eclipse-sdk/files/eclipse-3.2-r1 b/dev-util/eclipse-sdk/files/eclipse-3.2-r1
deleted file mode 100644
index 466cc3f62691..000000000000
--- a/dev-util/eclipse-sdk/files/eclipse-3.2-r1
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/bash
-#
-# Tiny startup wrapper for the Eclipse 3.2.x series
-#
-# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org>
-# Copyright (c) 2004, Gentoo Foundation
-#
-# Licensed under the GNU General Public License, version 2
-#
-
-[[ -f $HOME/.eclipserc ]] && source $HOME/.eclipserc
-
-ECLIPSE_HOME=${ECLIPSE_HOME:="/usr/lib/eclipse-3.2"}
-ECLIPSE_BIN="${ECLIPSE_HOME}/eclipse"
-
-if [ ! -x ${ECLIPSE_BIN} ] ; then
-	echo "Failed to find executable '${ECLIPSE_BIN}'" > /dev/stderr
-	exit -1
-fi
-
-if [ $(whoami) == "root" ] ; then
-	echo "!!! You are running Eclipse as root. Be advised that this will modify the contents of"
-	echo "!!! /usr/lib/eclipse-3.2, and that such a modification may prevent you from safely"
-	echo "!!! upgrading to later 3.2 revisions."
-	echo
-	echo "!!! To ensure correct behavior on your next upgrade, do:"
-	echo "!!!  1) 'emerge unmerge \"=eclipse-sdk-3.2\"'"
-	echo "!!!  2) 'rm -rf /usr/lib/eclipse-3.2'"
-	echo "!!!  3) 'emerge eclipse-sdk'"
-fi
-
-if [[ -d /usr/lib/gecko-sdk/lib/ ]] && [[ -f /usr/lib/gecko-sdk/lib/libgtkembedmoz.so ]] ; then
-    export MOZILLA_FIVE_HOME="/usr/lib/gecko-sdk/lib/"
-fi
-
-# workaround for bug #215150
-if [[ $(java-config -f) == sun-jdk-1.6 || $(java-config -f) == sun-jre-bin-1.6 ]]; then
-    if [[ $(java-config -g VERSION) == *1.6.0.06 || $(java-config -g VERSION) == *1.6.0.05 || $(java-config -g VERSION) == *1.6.0.04 ]]; then
-    echo "Performing workaround for bug #215150"
-    VM_ARGS="${VM_ARGS} -XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith"
-    fi
-fi
-
-exec ${ECLIPSE_BIN} "$@" -vmargs ${VM_ARGS}