Cleanup old versions after month in package.mask.

(Portage version: 2.1.2.7)

19 files changed, 10 insertions, 1629 deletions

diff --git a/dev-util/eclipse-sdk/ChangeLog b/dev-util/eclipse-sdk/ChangeLog
index 173e2026448a..4031f86baf1d 100644
--- a/dev-util/eclipse-sdk/ChangeLog
+++ b/dev-util/eclipse-sdk/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-util/eclipse-sdk
 # Copyright 2003-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.130 2007/05/12 18:51:24 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.131 2007/05/28 23:58:39 caster Exp $
+
+  28 May 2007; Vlastimil Babka <caster@gentoo.org> -files/eclipse-2.desktop,
+  -files/eclipse-3, -files/04-amd64-gtk.patch, -files/eclipse-3.0.2,
+  -files/eclipse-3.1, -files/05-mozilla-xpcom.patch,
+  -files/eclipse-3.1.desktop, -files/03-motif-java1.5-build.patch,
+  -files/eclipse-3.desktop, -files/06-path-fixups.patch, -files/eclipse-2,
+  -files/eclipse.1, -eclipse-sdk-3.0.1-r3.ebuild,
+  -eclipse-sdk-3.0.2-r1.ebuild, -eclipse-sdk-3.1.2-r3.ebuild:
+  Cleanup old versions after month in package.mask.
 
   12 May 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   eclipse-sdk-3.2.1-r2.ebuild:
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.0.1-r3.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.0.1-r3.ebuild
deleted file mode 100644
index 15d9651c4fb6..000000000000
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.0.1-r3.ebuild
+++ /dev/null
@@ -1,429 +0,0 @@
-# Copyright 1999-2007 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.0.1-r3.ebuild,v 1.5 2007/05/12 18:51:24 wltjr Exp $
-
-inherit eutils java-pkg java-utils
-
-# karltk: Portage 2.0.51_pre13 needs this
-MY_A="eclipse-sourceBuild-srcIncluded-3.0.1.zip"
-DESCRIPTION="Eclipse Tools Platform"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://download2.eclipse.org/downloads/drops/R-3.0.1-200409161125/${MY_A}"
-IUSE="gtk motif gnome kde"
-SLOT="3"
-LICENSE="CPL-1.0"
-KEYWORDS="x86 ppc ~amd64"
-
-RDEPEND="=virtual/jdk-1.4*
-	gtk? ( >=x11-libs/gtk+-2.2.4 )
-	!gtk? (	kde? ( kde-base/kdelibs x11-libs/openmotif )
-		!kde? ( motif? ( x11-libs/openmotif )
-			!motif? ( >=x11-libs/gtk+-2.2.4 )
-		      )
-	      )
-	gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* )
-	!media-fonts/unifont"
-
-DEPEND="${RDEPEND}
-	>=dev-java/ant-1.5.3
-	>=sys-apps/findutils-4.1.7
-	>=app-shells/tcsh-6.11
-	app-arch/unzip
-	app-arch/zip"
-
-pkg_setup() {
-	java-pkg_pkg_setup
-
-	check-ram
-
-	java-utils_setup-vm
-
-	java-utils_ensure-vm-version-ge 1 4 2
-
-	setup-dir-vars
-
-	use gtk && use_gtk='true' || use_gtk='false'
-	use motif && use_motif='true' || use_motif='false'
-
-	# If gtk+ enabled, disable motif
-	${use_gtk} && use_motif='false'
-
-	# If neither enabled, default to gtk+
-	${use_gtk} || ${use_motif} || use_gtk='true'
-
-	# If both enabled, use gtk+ only
-	${use_gtk} && ${use_motif} && use_motif='false'
-
-	einfo "Compiling gtk+ frontend  : ${use_gtk}"
-	einfo "Compiling Motif frontend : ${use_motif}"
-
-}
-
-src_unpack() {
-	mkdir ${S}
-	cd ${S}
-	unpack ${MY_A} || die "Could not unpack ${MY_A}"
-
-	epatch ${FILESDIR}/03-motif-java1.5-build.patch
-	epatch ${FILESDIR}/04-amd64-gtk.patch
-
-	einfo "Setting up virtual machine"
-	java-utils_setup-vm
-
-	einfo "Patching build.xmls"
-	process-build-xmls
-
-	einfo "Cleaning out prebuilt code"
-	clean-prebuilt-code
-
-	einfo "Patching gtk+ frontend"
-	patch-gtk-frontend
-
-	einfo "Patching Motif frontend"
-	patch-motif-frontend
-
-	einfo "Set build version in Help->About"
-	find -type f -name about.mappings -exec sed -e "s/@build@/Gentoo Linux ${PF}/" -i \{\} \;
-}
-
-src_compile() {
-
-	# karltk: this should be handled by the java-pkg eclass in setup-vm
-	addwrite "/proc/self/maps"
-	addwrite "/proc/cpuinfo"
-	addwrite "/dev/random"
-
-	# Figure out correct boot classpath
-	# karltk: this should be handled by the java-pkg eclass in setup-vm
-	if [ ! -z "`java-config --java-version | grep IBM`" ] ; then
-		# IBM JRE
-		ant_extra_opts="-Dbootclasspath=$(java-config --jdk-home)/jre/lib/core.jar:$(java-config --jdk-home)/jre/lib/xml.jar:$(java-config --jdk-home)/jre/lib/graphics.jar"
-	else
-		# Sun derived JREs (Blackdown, Sun)
-		ant_extra_opts="-Dbootclasspath=$(java-config --jdk-home)/jre/lib/rt.jar"
-	fi
-
-	export ANT_OPTS=-Xmx768m
-
-	einfo "Building resources.core plugin"
-	cd ${S}/${core_src_dir}
-	make JDK_INCLUDE="`java-config -O`/include -I`java-config -O`/include/linux" || die "Failed to build resource.core plugin"
-	mkdir -p ${S}/"${core_dest_dir}"
-	mv *.so ${S}/"${core_dest_dir}"
-	cd ${S}
-
-	# Compile all Java code
-	${use_gtk} && build-gtk-java compile
-	${use_motif} && build-motif-java compile
-
-	# Build selected native frontend code
-	${use_gtk} && build-gtk-native
-	${use_motif} && build-motif-native
-
-	# Install all Java code
-	${use_gtk} && build-gtk-java install
-	${use_motif} && build-motif-java install
-
-	create-desktop-entry
-}
-
-src_install() {
-	eclipse_dir="/usr/lib/eclipse-${SLOT}"
-
-	dodir /usr/lib
-
-	einfo "Installing features and plugins"
-	if ${use_gtk} ; then
-		[ -f result/linux-gtk-${ARCH}-sdk.zip ] || die "gtk zip bundle was not build properly!"
-		unzip -o -q result/linux-gtk-${ARCH}-sdk.zip -d ${D}/usr/lib
-	fi
-	if ${use_motif} ; then
-		[ -f result/linux-motif-${ARCH}-sdk.zip ] || die "motif zip bundle was not build properly!"
-		unzip -o -q result/linux-motif-${ARCH}-sdk.zip -d ${D}/usr/lib
-	fi
-
-	mv ${D}/usr/lib/eclipse ${D}/${eclipse_dir}
-
-	insinto ${eclipse_dir}
-
-	# Install launchers and native code
-	exeinto ${eclipse_dir}
-	if ${use_gtk} ; then
-		einfo "Installing eclipse-gtk binary"
-		doexe plugins/platform-launcher/library/gtk/eclipse-gtk \
-			|| die "Failed to install eclipse-gtk"
-	fi
-	if ${use_motif} ; then
-		einfo "Installing eclipse-motif binary"
-		doexe plugins/platform-launcher/library/motif/eclipse-motif \
-			|| die "Failed to install eclipse-motif"
-	fi
-
-	doins plugins/org.eclipse.platform/{startup.jar,splash.bmp}
-
-	# Install startup script
-	exeinto /usr/bin
-	doexe ${FILESDIR}/eclipse-${SLOT}
-
-	install-desktop-entry
-
-	install-link-files
-
-
-	doman ${FILESDIR}/eclipse.1
-}
-
-# -----------------------------------------------------------------------------
-#  Helper functions
-# -----------------------------------------------------------------------------
-
-function setup-dir-vars() {
-	gtk_launcher_src_dir="plugins/platform-launcher/library/gtk"
-	motif_launch_src_dir="plugins/platform-launcher/library/motif"
-	gtk_swt_src_dir="plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
-	motif_swt_src_dir="plugins/org.eclipse.swt/Eclipse SWT PI/motif/library"
-
-	core_src_dir="plugins/org.eclipse.core.resources.linux/src"
-
-	case ${ARCH} in
-		sparc)
-			gtk_swt_dest_dir="plugins/org.eclipse.swt.gtk/os/solaris/sparc"
-			motif_swt_dest_dir="plugins/org.eclipse.swt.motif/os/solaris/sparc"
-			core_dest_dir="plugins/org.eclipse.core.resources.linux/os/solaris/sparc"
-			;;
-		x86)
-			gtk_swt_dest_dir="plugins/org.eclipse.swt.gtk/os/linux/x86"
-			motif_swt_dest_dir="plugins/org.eclipse.swt.motif/os/linux/x86"
-			core_dest_dir="plugins/org.eclipse.core.resources.linux/os/linux/x86"
-			;;
-		ppc)
-			gtk_swt_dest_dir="plugins/org.eclipse.swt.gtk/os/linux/ppc"
-			motif_swt_dest_dir="plugins/org.eclipse.swt.motif/os/linux/ppc"
-			core_dest_dir="plugins/org.eclipse.core.resources.linux/os/linux/ppc/"
-			;;
-		amd64)
-			gtk_swt_dest_dir="plugins/org.eclipse.swt.gtk64/os/linux/amd64"
-			motif_swt_dest_dir="plugins/org.eclipse.swt.motif/os/linux/amd64"
-			core_dest_dir="plugins/org.eclipse.core.resources.linux/os/linux/amd64"
-			;;
-	esac
-}
-
-function process-build-xmls() {
-
-	# Turn off verbose mode and on errors in all build.xml files
-	for x in $(find . -type f -name "build.xml") ; do
-		sed -i -r \
-			-e 's/failonerror="[^"]+"/failonerror="true"/' \
-			-e 's/verbose="[^"]+"/verbose="false"/' $x
-	done
-}
-
-function patch-gtk-frontend() {
-
-	# Move around some source code that should have been handled by the build system
-	local m="Failed to move native files for SWT gtk+"
-	cp ${S}/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/* ${S}/"${gtk_swt_src_dir}" || die ${m}
-	cp ${S}/plugins/org.eclipse.swt/Eclipse\ SWT\ Mozilla/common/library/* ${S}/"${gtk_swt_src_dir}" || die ${m}
-	cp ${S}/plugins/org.eclipse.swt/Eclipse\ SWT\ Program/gnome/library/* ${S}/"${gtk_swt_src_dir}" || die ${m}
-	cp ${S}/plugins/org.eclipse.swt/Eclipse\ SWT\ AWT/gtk/library/* ${S}/"${gtk_swt_src_dir}" || die ${m}
-
-	if use gnome ; then
-	    gnome_lib=`pkg-config --libs gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 | sed -e "s:-pthread:-lpthread:" -e "s:-Wl,--export:--export:"`
-	fi
-
-	if ${use_gtk} ; then
-		gtk_lib=`pkg-config --libs gtk+-2.0 gthread-2.0 | sed -e "s:-pthread:-lpthread:" -e "s:-Wl,--export:--export:"`
-		atk_lib=`pkg-config --libs atk gtk+-2.0 | sed -e "s:-Wl,--export:--export:"`
-	fi
-
-	sed -e "s:/bluebird/teamswt/swt-builddir/IBMJava2-141:$JAVA_HOME:" \
-		-e "s:/bluebird/teamswt/swt-builddir/jdk1.5.0:$JAVA_HOME:" \
-		-e "s:\`pkg-config --libs gtk+-2.0 gthread-2.0\`:${gtk_lib}:" \
-		-e "s:\`pkg-config --libs atk gtk+-2.0\`:${atk_lib}:" \
-		-e "s:\`pkg-config --libs gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0\`:${gnome_lib}:" \
-		-e "s:-I\$(JAVA_HOME)/include:-I\$(JAVA_HOME)/include -I\$(JAVA_HOME)/include/linux:" \
-		-e "s:-I\$(JAVA_HOME)\t:-I\$(JAVA_HOME)/include -I\$(JAVA_HOME)/include/linux:" \
-		-e "s:\$(JAVA_HOME)/jre/bin:\$(JAVA_HOME)/jre/lib/i386:" \
-		-i ${S}/"${gtk_swt_src_dir}"/make_gtk.mak || die "Failed to modify make_gtk.mak"
-
-}
-
-function patch-motif-frontend()
-{
-	cp plugins/org.eclipse.swt/Eclipse\ SWT/common/library/* "${motif_swt_src_dir}"
-	sed -e "s:/bluebird/teamswt/swt-builddir/IBMJava2-141:$JAVA_HOME:" \
-		-e "s:/bluebird/teamswt/swt-builddir/motif21:/usr/X11R6:" \
-		-e "s:/usr/lib/qt-3.1:/usr/qt/3:" \
-		-e "s:-lkdecore:-L\`kde-config --prefix\`/lib -lkdecore:" \
-		-e "s:-I/usr/include/kde:-I\`kde-config --prefix\`/include:" \
-		-e "s:-I\$(JAVA_HOME)/include:-I\$(JAVA_HOME)/include -I\$(JAVA_HOME)/include/linux:" \
-		-e "s:-I\$(JAVA_HOME)\t:-I\$(JAVA_HOME)/include -I\$(JAVA_HOME)/include/linux:" \
-		-e "s:-L\$(JAVA_HOME)/jre/bin:-L\$(JAVA_HOME)/jre/lib/i386:" \
-		-i "${motif_swt_src_dir}"/make_linux.mak || die "Failed to modify Motfit make_linux.mak"
-}
-
-
-function create-desktop-entry() {
-
-	cat ${FILESDIR}/eclipse-${SLOT}.desktop | \
-		sed -e "s/@PV@/${PV}/" \
-		> eclipse-${SLOT}.desktop || die "Failed to create desktop entry"
-}
-
-function build-gtk-java() {
-	local target=${1}
-
-	einfo "Building GTK+ frontend (${target}) -- see compilelog.txt for details"
-	ant -q -q  \
-		-buildfile build.xml \
-		-DinstallOs=linux \
-		-DinstallWs=gtk \
-		-DinstallArch=$ARCH \
-		${ant_extra_opts} ${target} \
-		|| die "Failed to ${target} Java code (gtk+)"
-}
-
-function build-motif-java() {
-	local target=${1}
-
-	einfo "Building Motif frontend (${target}) -- see compilelog.txt for details"
-	ant -q -q  \
-		-buildfile build.xml \
-		-DcollPlace="eclipse-${SLOT}" \
-		-DinstallOs=linux \
-		-DinstallWs=motif \
-		-DinstallArch=$ARCH \
-		${ant_extra_opts} ${target} \
-		|| die "Failed to ${target} java code (Motif)"
-}
-
-function install-desktop-entry() {
-
-	# Install GNOME .desktop file
-	if use gnome ; then
-		insinto /usr/share/gnome/apps/Development
-		doins eclipse-${SLOT}.desktop
-	fi
-
-	# Install KDE .desktop file
-	if use kde ; then
-		insinto /usr/share/applnk/Development
-		doins eclipse-${SLOT}.desktop
-	fi
-}
-
-function build-gtk-native() {
-
-	einfo "Building gtk+ SWT"
-
-	# kludge to allow patches to applied at unpack, but correct compilation
-	if [ ${ARCH} == "amd64" ] ; then
-		gtk_swt_src_dir="plugins/org.eclipse.swt.gtk64/src/Eclipse SWT PI/gtk/library"
-	fi
-
-	# Perpare destination directory
-	mkdir -p ${S}/"${gtk_swt_dest_dir}"
-
-	# Build the eclipse gtk binary
-	cd ${S}/plugins/platform-launcher/library/gtk
-	case ${ARCH} in
-		sparc|x86|ppc)
-			tcsh -f build.csh -output eclipse-gtk -arch $ARCH || die "Failed to build eclipse-gtk"
-			;;
-		amd64)
-			tcsh -f build64.csh -output eclipse-gtk -arch $ARCH || die "Failed to build eclipse-gtk"
-			;;
-	esac
-
-
-	cd ${S}/"${gtk_swt_src_dir}"
-	case ${ARCH} in
-		sparc|x86|ppc)
-			bash ./build.sh make_swt || die "Failed to build platform-independent SWT support"
-			bash ./build.sh make_atk || die "Failed to build atk support"
-			;;
-		amd64)
-			bash ./build64.sh make_swt || die "Failed to build platform-independent SWT support"
-			bash ./build64.sh make_atk || die "Failed to build atk support"
-			;;
-	esac
-
-	if use gnome ; then
-		einfo "Building GNOME VFS support"
-		case ${ARCH} in
-			sparc|x86|ppc)
-				bash ./build.sh make_gnome || die "Failed to build GNOME VFS support"
-				;;
-			amd64)
-				bash ./build64.sh make_gnome || die "Failed to build GNOME VFS support"
-				;;
-		esac
-	fi
-
-	# move the *.so files to the right path so eclipse can find them
-	# karltk: do this incrementally at each step above, with || die
-	mv *.so ${S}/"${gtk_swt_dest_dir}"
-	cd ${S}
-}
-
-function build-motif-native() {
-
-	# Prepare destination directory
-	mkdir -p ${S}/"${motif_swt_dest_dir}"
-
-	# Build eclipse motif binary
-	cd ${S}/plugins/platform-launcher/library/motif
-	tcsh -f build.csh -output eclipse-motif -arch $ARCH || die "Failed to build eclipse-motif"
-
-	cd ${S}/"${motif_swt_src_dir}"
-
-	make -f make_linux.mak make_swt || die "Failed to build Motif support"
-	if use kde ; then
-		make -f make_linux.mak make_kde || die "Failed to build KDE support"
-	fi
-
-	# move the *.so files to the right path so eclipse can find them
-	# karltk: do this incrementally at each step above, with || die
-	mv *.so ${S}/"${motif_swt_dest_dir}"
-	cd ${S}
-}
-
-
-
-function clean-prebuilt-code() {
-
-	# Clean up all pre-built code
-	ant -q -DinstallWs=gtk -DinstallOs=linux clean
-	ant -q -DinstallWs=motif -DinstallOs=linux clean
-	find ${S} -name '*.so' -exec rm -f {} \;
-	find ${S} -name '*.so.*' -exec rm -f {} \;
-	find ${S} -type f -name 'eclipse' -exec rm {} \;
-	rm -f eclipse
-
-}
-
-function get-memory-total() {
-	cat /proc/meminfo | grep MemTotal | sed -r "s/[^0-9]*([0-9]+).*/\1/"
-}
-
-function check-ram() {
-
-	local mem=$(get-memory-total)
-	[ $(get-memory-total) -lt 775669 ] &&
-		(
-		echo
-		ewarn "To build Eclipse, at least 768MB of RAM is recommended."
-		ewarn "Your machine has less RAM. Continuing anyway."
-		echo
-	)
-}
-
-function install-link-files() {
-	dodir /usr/lib/eclipse-${SLOT}/links
-
-	echo "path=/opt/eclipse-extensions-3" > ${D}/${eclipse_dir}/links/eclipse-binary-extensions-3.link
-
-	echo "path=/usr/lib/eclipse-extensions-3" > ${D}/${eclipse_dir}/links/eclipse-extensions-3.link
-}
-
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.0.2-r1.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.0.2-r1.ebuild
deleted file mode 100644
index 437163fdb17d..000000000000
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,407 +0,0 @@
-# Copyright 1999-2007 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.0.2-r1.ebuild,v 1.3 2007/05/12 18:51:24 wltjr Exp $
-
-inherit eutils java-utils
-
-# karltk: Portage 2.0.51_pre13 needs this
-MY_A="eclipse-sourceBuild-srcIncluded-3.0.2.zip"
-DESCRIPTION="Eclipse Tools Platform"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://download.eclipse.org/downloads/drops/R-3.0.2-200503110845/${MY_A}"
-IUSE="gtk motif gnome kde"
-SLOT="3"
-LICENSE="CPL-1.0"
-KEYWORDS="~x86 ~ppc ~amd64"
-
-RDEPEND="|| ( >=virtual/jdk-1.4.2 =dev-java/blackdown-jdk-1.4.2* )
-	gtk? ( >=x11-libs/gtk+-2.2.4 )
-	!gtk? (	kde? ( kde-base/kdelibs x11-libs/openmotif )
-		!kde? ( motif? ( x11-libs/openmotif )
-			!motif? ( >=x11-libs/gtk+-2.2.4 )
-		      )
-	      )
-	gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* )
-	!media-fonts/unifont"
-
-DEPEND="${RDEPEND}
-	>=dev-java/ant-1.5.3
-	>=sys-apps/findutils-4.1.7
-	>=app-shells/tcsh-6.11
-	app-arch/unzip
-	app-arch/zip"
-
-pkg_setup() {
-
-	check-ram
-
-	java-utils_setup-vm
-
-	java-utils_ensure-vm-version-ge 1 4 2
-
-	setup-dir-vars
-
-	use gtk && use_gtk='true' || use_gtk='false'
-	use motif && use_motif='true' || use_motif='false'
-
-	# If gtk+ enabled, disable motif
-	${use_gtk} && use_motif='false'
-
-	# If neither enabled, default to gtk+
-	${use_gtk} || ${use_motif} || use_gtk='true'
-
-	# If both enabled, use gtk+ only
-	${use_gtk} && ${use_motif} && use_motif='false'
-
-	einfo "Compiling gtk+ frontend  : ${use_gtk}"
-	einfo "Compiling Motif frontend : ${use_motif}"
-
-}
-
-src_unpack() {
-	mkdir ${S}
-	cd ${S}
-	unpack ${MY_A} || die "Could not unpack ${MY_A}"
-
-	epatch ${FILESDIR}/03-motif-java1.5-build.patch
-	epatch ${FILESDIR}/04-amd64-gtk.patch
-	epatch ${FILESDIR}/05-mozilla-xpcom.patch
-
-	einfo "Setting up virtual machine"
-	java-utils_setup-vm
-
-	einfo "Patching build.xmls"
-	process-build-xmls
-
-	einfo "Cleaning out prebuilt code"
-	clean-prebuilt-code
-
-	einfo "Patching gtk+ frontend"
-	patch-gtk-frontend
-
-	einfo "Patching Motif frontend"
-	patch-motif-frontend
-
-	einfo "Set build version in Help->About"
-	find -type f -name about.mappings -exec sed -e "s/@build@/Gentoo Linux ${PF}/" -i \{\} \;
-}
-
-src_compile() {
-
-	# karltk: this should be handled by the java-pkg eclass in setup-vm
-	addwrite "/proc/self/maps"
-	addwrite "/proc/cpuinfo"
-	addwrite "/dev/random"
-
-	# Figure out correct boot classpath
-	# karltk: this should be handled by the java-pkg eclass in setup-vm
-	if [ ! -z "`java-config --java-version | grep IBM`" ] ; then
-		# IBM JRE
-		ant_extra_opts="-Dbootclasspath=$(java-config --jdk-home)/jre/lib/core.jar:$(java-config --jdk-home)/jre/lib/xml.jar:$(java-config --jdk-home)/jre/lib/graphics.jar"
-	else
-		# Sun derived JREs (Blackdown, Sun)
-		ant_extra_opts="-Dbootclasspath=$(java-config --jdk-home)/jre/lib/rt.jar"
-	fi
-
-	export ANT_OPTS=-Xmx768m
-
-	einfo "Building resources.core plugin"
-	cd ${S}/${core_src_dir}
-	make JDK_INCLUDE="`java-config -O`/include -I`java-config -O`/include/linux" || die "Failed to build resource.core plugin"
-	mkdir -p ${S}/"${core_dest_dir}"
-	mv *.so ${S}/"${core_dest_dir}"
-	cd ${S}
-
-	# Compile all Java code
-	${use_gtk} && build-gtk-java compile
-	${use_motif} && build-motif-java compile
-
-	# Build selected native frontend code
-	${use_gtk} && build-gtk-native
-	${use_motif} && build-motif-native
-
-	# Install all Java code
-	${use_gtk} && build-gtk-java install
-	${use_motif} && build-motif-java install
-
-	create-desktop-entry
-}
-
-src_install() {
-	eclipse_dir="/usr/lib/eclipse-${SLOT}"
-
-	dodir /usr/lib
-
-	einfo "Installing features and plugins"
-	if ${use_gtk} ; then
-		[ -f result/linux-gtk-${ARCH}-sdk.zip ] || die "gtk zip bundle was not build properly!"
-		unzip -o -q result/linux-gtk-${ARCH}-sdk.zip -d ${D}/usr/lib
-	fi
-	if ${use_motif} ; then
-		[ -f result/linux-motif-${ARCH}-sdk.zip ] || die "motif zip bundle was not build properly!"
-		unzip -o -q result/linux-motif-${ARCH}-sdk.zip -d ${D}/usr/lib
-	fi
-
-	mv ${D}/usr/lib/eclipse ${D}/${eclipse_dir}
-
-	insinto ${eclipse_dir}
-
-	# Install launchers and native code
-	exeinto ${eclipse_dir}
-	if ${use_gtk} ; then
-		einfo "Installing eclipse-gtk binary"
-		doexe plugins/platform-launcher/library/gtk/eclipse-gtk \
-			|| die "Failed to install eclipse-gtk"
-	fi
-	if ${use_motif} ; then
-		einfo "Installing eclipse-motif binary"
-		doexe plugins/platform-launcher/library/motif/eclipse-motif \
-			|| die "Failed to install eclipse-motif"
-	fi
-
-	doins plugins/org.eclipse.platform/{startup.jar,splash.bmp}
-
-	# Install startup script
-	exeinto /usr/bin
-	newexe ${FILESDIR}/eclipse-3.0.2 eclipse-${SLOT}
-
-	install-desktop-entry
-
-	install-link-files
-
-
-	doman ${FILESDIR}/eclipse.1
-}
-
-# -----------------------------------------------------------------------------
-#  Helper functions
-# -----------------------------------------------------------------------------
-
-function setup-dir-vars() {
-	gtk_launcher_src_dir="plugins/platform-launcher/library/gtk"
-	motif_launch_src_dir="plugins/platform-launcher/library/motif"
-	gtk_swt_src_dir="plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
-	motif_swt_src_dir="plugins/org.eclipse.swt/Eclipse SWT PI/motif/library"
-
-	core_src_dir="plugins/org.eclipse.core.resources.linux/src"
-
-	case ${ARCH} in
-		sparc)
-			gtk_swt_dest_dir="plugins/org.eclipse.swt.gtk/os/solaris/sparc"
-			motif_swt_dest_dir="plugins/org.eclipse.swt.motif/os/solaris/sparc"
-			core_dest_dir="plugins/org.eclipse.core.resources.linux/os/solaris/sparc"
-			;;
-		x86)
-			gtk_swt_dest_dir="plugins/org.eclipse.swt.gtk/os/linux/x86"
-			motif_swt_dest_dir="plugins/org.eclipse.swt.motif/os/linux/x86"
-			core_dest_dir="plugins/org.eclipse.core.resources.linux/os/linux/x86"
-			;;
-		ppc)
-			gtk_swt_dest_dir="plugins/org.eclipse.swt.gtk/os/linux/ppc"
-			motif_swt_dest_dir="plugins/org.eclipse.swt.motif/os/linux/ppc"
-			core_dest_dir="plugins/org.eclipse.core.resources.linux/os/linux/ppc/"
-			;;
-		amd64)
-			gtk_swt_dest_dir="plugins/org.eclipse.swt.gtk64/os/linux/amd64"
-			motif_swt_dest_dir="plugins/org.eclipse.swt.motif/os/linux/amd64"
-			core_dest_dir="plugins/org.eclipse.core.resources.linux/os/linux/amd64"
-			;;
-	esac
-}
-
-function process-build-xmls() {
-
-	# Turn off verbose mode and on errors in all build.xml files
-	for x in $(find . -type f -name "build.xml") ; do
-		sed -i -r \
-			-e 's/failonerror="[^"]+"/failonerror="true"/' \
-			-e 's/verbose="[^"]+"/verbose="false"/' $x
-	done
-}
-
-function patch-gtk-frontend() {
-
-	# Move around some source code that should have been handled by the build system
-	local m="Failed to move native files for SWT gtk+"
-	cp ${S}/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/* ${S}/"${gtk_swt_src_dir}" || die ${m}
-	cp ${S}/plugins/org.eclipse.swt/Eclipse\ SWT\ Mozilla/common/library/* ${S}/"${gtk_swt_src_dir}" || die ${m}
-	cp ${S}/plugins/org.eclipse.swt/Eclipse\ SWT\ Program/gnome/library/* ${S}/"${gtk_swt_src_dir}" || die ${m}
-	cp ${S}/plugins/org.eclipse.swt/Eclipse\ SWT\ AWT/gtk/library/* ${S}/"${gtk_swt_src_dir}" || die ${m}
-
-	if use gnome ; then
-	    gnome_lib=`pkg-config --libs gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 | sed -e "s:-pthread:-lpthread:" -e "s:-Wl,--export:--export:"`
-	fi
-
-	if ${use_gtk} ; then
-		gtk_lib=`pkg-config --libs gtk+-2.0 gthread-2.0 | sed -e "s:-pthread:-lpthread:" -e "s:-Wl,--export:--export:"`
-		atk_lib=`pkg-config --libs atk gtk+-2.0 | sed -e "s:-Wl,--export:--export:"`
-	fi
-
-	sed -e "s:/bluebird/teamswt/swt-builddir/IBMJava2-141:$JAVA_HOME:" \
-		-e "s:/bluebird/teamswt/swt-builddir/jdk1.5.0:$JAVA_HOME:" \
-		-i ${S}/"${gtk_swt_src_dir}"/build.sh || die "Failed to modify build.sh"
-
-	sed -e "s:-I\$(JAVA_HOME)/include:-I\$(JAVA_HOME)/include -I\$(JAVA_HOME)/include/linux:" \
-		-e "s:GECKO_SDK)/\([^/]*\)/include:GECKO_SDK)/include/\1:" \
-		-e "s:GECKO_SDK)/embedstring/bin -lembedstring:GECKO_SDK)/components -lembedcomponents:" \
-		-e "s:GECKO_SDK)/embed_base/bin -lembed_base_s:GECKO_SDK) -lgtkembedmoz:" \
-		-e "s:GECKO_SDK)/xpcom/bin -lxpcomglue_s -lxpcom:GECKO_SDK) -lxpcom:" \
-		-i ${S}/"${gtk_swt_src_dir}"/make_linux.mak || die "Failed to modify make_linux.mak"
-
-
-}
-
-function patch-motif-frontend()
-{
-	cp plugins/org.eclipse.swt/Eclipse\ SWT/common/library/* "${motif_swt_src_dir}"
-	sed -e "s:/bluebird/teamswt/swt-builddir/IBMJava2-141:$JAVA_HOME:" \
-		-e "s:/bluebird/teamswt/swt-builddir/motif21:/usr/X11R6:" \
-		-e "s:/usr/lib/qt-3.1:/usr/qt/3:" \
-		-e "s:-lkdecore:-L\`kde-config --prefix\`/lib -lkdecore:" \
-		-e "s:-I/usr/include/kde:-I\`kde-config --prefix\`/include:" \
-		-e "s:-I\$(JAVA_HOME)/include:-I\$(JAVA_HOME)/include -I\$(JAVA_HOME)/include/linux:" \
-		-e "s:-I\$(JAVA_HOME)\t:-I\$(JAVA_HOME)/include -I\$(JAVA_HOME)/include/linux:" \
-		-e "s:-L\$(JAVA_HOME)/jre/bin:-L\$(JAVA_HOME)/jre/lib/i386:" \
-		-i "${motif_swt_src_dir}"/make_linux.mak || die "Failed to modify Motfit make_linux.mak"
-}
-
-
-function create-desktop-entry() {
-
-	cat ${FILESDIR}/eclipse-${SLOT}.desktop | \
-		sed -e "s/@PV@/${PV}/" \
-		> eclipse-${SLOT}.desktop || die "Failed to create desktop entry"
-}
-
-function build-gtk-java() {
-	local target=${1}
-
-	einfo "Building GTK+ frontend (${target}) -- see compilelog.txt for details"
-	ant -q -q  \
-		-buildfile build.xml \
-		-DinstallOs=linux \
-		-DinstallWs=gtk \
-		-DinstallArch=$ARCH \
-		${ant_extra_opts} ${target} \
-		|| die "Failed to ${target} Java code (gtk+)"
-}
-
-function build-motif-java() {
-	local target=${1}
-
-	einfo "Building Motif frontend (${target}) -- see compilelog.txt for details"
-	ant -q -q  \
-		-buildfile build.xml \
-		-DcollPlace="eclipse-${SLOT}" \
-		-DinstallOs=linux \
-		-DinstallWs=motif \
-		-DinstallArch=$ARCH \
-		${ant_extra_opts} ${target} \
-		|| die "Failed to ${target} java code (Motif)"
-}
-
-function install-desktop-entry() {
-
-	# Install GNOME .desktop file
-	if use gnome ; then
-		insinto /usr/share/gnome/apps/Development
-		doins eclipse-${SLOT}.desktop
-	fi
-
-	# Install KDE .desktop file
-	if use kde ; then
-		insinto /usr/share/applnk/Development
-		doins eclipse-${SLOT}.desktop
-	fi
-}
-
-function build-gtk-native() {
-
-	einfo "Building gtk+ SWT"
-
-	# kludge to allow patches to applied at unpack, but correct compilation
-	if [ ${ARCH} == "amd64" ] ; then
-		gtk_swt_src_dir="plugins/org.eclipse.swt.gtk64/src/Eclipse SWT PI/gtk/library"
-	fi
-
-	# Perpare destination directory
-	mkdir -p ${S}/"${gtk_swt_dest_dir}"
-
-	# Build the eclipse gtk binary
-	cd ${S}/plugins/platform-launcher/library/gtk
-	bash build.sh -output eclipse-gtk -arch $ARCH || die "Failed to build eclipse-gtk"
-
-	cd ${S}/"${gtk_swt_src_dir}"
-	bash ./build.sh make_swt || die "Failed to build platform-independent SWT support"
-	bash ./build.sh make_atk || die "Failed to build atk support"
-
-	if use gnome ; then
-		einfo "Building GNOME VFS support"
-		bash ./build.sh make_gnome || die "Failed to build GNOME VFS support"
-	fi
-
-	# move the *.so files to the right path so eclipse can find them
-	# karltk: do this incrementally at each step above, with || die
-	mv *.so ${S}/"${gtk_swt_dest_dir}"
-	cd ${S}
-}
-
-function build-motif-native() {
-
-	# Prepare destination directory
-	mkdir -p ${S}/"${motif_swt_dest_dir}"
-
-	# Build eclipse motif binary
-	cd ${S}/plugins/platform-launcher/library/motif
-	tcsh -f build.csh -output eclipse-motif -arch $ARCH || die "Failed to build eclipse-motif"
-
-	cd ${S}/"${motif_swt_src_dir}"
-
-	make -f make_linux.mak make_swt || die "Failed to build Motif support"
-	if use kde ; then
-		make -f make_linux.mak make_kde || die "Failed to build KDE support"
-	fi
-
-	# move the *.so files to the right path so eclipse can find them
-	# karltk: do this incrementally at each step above, with || die
-	mv *.so ${S}/"${motif_swt_dest_dir}"
-	cd ${S}
-}
-
-
-
-function clean-prebuilt-code() {
-
-	# Clean up all pre-built code
-	ant -q -DinstallWs=gtk -DinstallOs=linux clean
-	ant -q -DinstallWs=motif -DinstallOs=linux clean
-	find ${S} -name '*.so' -exec rm -f {} \;
-	find ${S} -name '*.so.*' -exec rm -f {} \;
-	find ${S} -type f -name 'eclipse' -exec rm {} \;
-	rm -f eclipse
-
-}
-
-function get-memory-total() {
-	cat /proc/meminfo | grep MemTotal | sed -r "s/[^0-9]*([0-9]+).*/\1/"
-}
-
-function check-ram() {
-
-	local mem=$(get-memory-total)
-	[ $(get-memory-total) -lt 775669 ] &&
-		(
-		echo
-		ewarn "To build Eclipse, at least 768MB of RAM is recommended."
-		ewarn "Your machine has less RAM. Continuing anyway."
-		echo
-	)
-}
-
-function install-link-files() {
-	dodir /usr/lib/eclipse-${SLOT}/links
-
-	echo "path=/opt/eclipse-extensions-3" > ${D}/${eclipse_dir}/links/eclipse-binary-extensions-3.link
-
-	echo "path=/usr/lib/eclipse-extensions-3" > ${D}/${eclipse_dir}/links/eclipse-extensions-3.link
-}
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.1.2-r3.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.1.2-r3.ebuild
deleted file mode 100644
index bf36dcb922cd..000000000000
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.1.2-r3.ebuild
+++ /dev/null
@@ -1,365 +0,0 @@
-# Copyright 1999-2007 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.1.2-r3.ebuild,v 1.3 2007/05/12 18:51:24 wltjr Exp $
-
-inherit eutils java-pkg java-utils flag-o-matic check-reqs
-
-MY_A="eclipse-sourceBuild-srcIncluded-${PV}.zip"
-RELEASE_DATE="200601181600"
-DESCRIPTION="Eclipse Tools Platform"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/R-${PV}-${RELEASE_DATE}/${MY_A}"
-IUSE="gnome jikes nosrc nodoc atk"
-SLOT="3.1"
-LICENSE="CPL-1.0"
-KEYWORDS="~x86 ~ppc ~amd64"
-S="${WORKDIR}"
-
-RDEPEND=">=virtual/jre-1.4.2
-	>=x11-libs/gtk+-2.2.4
-	atk? ( >=dev-libs/atk-1.6 )
-	gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* )"
-
-DEPEND="${RDEPEND}
-	>=virtual/jdk-1.4.2
-	jikes? ( >=dev-java/jikes-1.21 )
-	>=dev-java/ant-1.6.2
-	>=dev-java/ant-core-1.6.2-r4
-	>=sys-apps/findutils-4.1.7
-	app-arch/unzip
-	app-arch/zip"
-
-ECLIPSE_DIR="/usr/lib/eclipse-${SLOT}"
-ECLIPSE_LINKS_DIR="${ECLIPSE_DIR}/links"
-
-# TODO:
-# - use CFLAGS from make.conf when building native libraries
-#   - must patch eclipse build files
-#   - also submit patch to bugs.eclipse.org
-# - ppc support not tested, but not explicitly broken either
-# - make a extension location in /var/lib that's writable by 'eclipse' group
-# - use make_desktop_entry from eutils instead of our own stuff
-# -
-
-pkg_setup() {
-	java-pkg_pkg_setup
-	debug-print "Checking for sufficient physical RAM"
-	CHECKREQS_MEMORY="768"
-	check_reqs
-
-	debug-print "Checking for bad CFLAGS"
-	check-cflags
-
-	# Make sure our vm is sane
-	java-utils_pkg_setup
-#	java-utils_setup-vm
-#	java-utils_ensure-vm-version-ge 1 4 2
-
-	# All other gentoo archs match in eclipse build system except amd64
-	if use amd64 ; then
-		eclipsearch=x86_64
-	else
-		eclipsearch=${ARCH}
-	fi
-
-	# All other gentoo archs match in sun jdk library patch except x86
-	if use x86 ; then
-		jvmarch=i386
-	else
-		jvmarch=${ARCH}
-	fi
-
-	# eventually, we'll have a plugin directory that's user writable, as group
-	# 'eclipse' -nichoj
-
-	# Add the eclipse group, for our plugin directories
-	#enewgroup eclipse
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# TODO figure out what this does -nichoj
-	epatch ${FILESDIR}/06-path-fixups.patch
-
-	einfo "Setting up virtual machine"
-	java-utils_setup-vm
-
-	einfo "Cleaning out prebuilt code"
-	clean-prebuilt-code
-
-	einfo "Patching makefiles"
-	fix_makefiles
-	fix_amd64_ibm_jvm
-}
-
-src_compile() {
-	# karltk: this should be handled by the java-pkg eclass in setup-vm
-	addwrite "/proc/self/maps"
-	addwrite "/proc/cpuinfo"
-	addwrite "/dev/random"
-
-	# Figure out VM, set up ant classpath and native library paths
-	setup-jvm-opts
-
-#	if use !nogecko-sdk ; then
-#		einfo "Will compile embedded Mozilla support against net-libs/gecko-sdk"
-#		setup-mozilla-opts
-#	else
-#		einfo "Not building embedded Mozilla support"
-#	fi
-
-	use jikes && bootstrap_ant_opts="-Dbuild.compiler=jikes"
-
-	debug-print "Bootstrapping bootstrap ecj"
-	ant ${bootstrap_ant_opts} -q -f jdtcoresrc/compilejdtcorewithjavac.xml || die "Failed to bootstrap ecj"
-
-	debug-print "Bootstrapping ecj"
-	ant -lib jdtcoresrc/ecj.jar -q -f jdtcoresrc/compilejdtcore.xml || die "Failed to bootstrap ecj"
-
-	debug-print "Compiling Eclipse -- see ${S}/compilelog.txt for details"
-	ANT_OPTS="-Xmx1024M" \
-		ant -lib jdtcoresrc/ecj.jar -q -f build.xml \
-		-DinstallOs=linux \
-		-DinstallWs=gtk \
-		-DinstallArch=${eclipsearch} \
-		-Dbootclasspath=${bootclasspath} \
-		-Dlibsconfig=true \
-		-DjavacTarget=1.4 \
-		-DjavacSource=1.4 \
-		-DjavacVerbose=false \
-		-DjavacFailOnError=true \
-		-DjavacDebugInfo=true \
-		-DbuildId="Gentoo Linux ${PF}" \
-		|| die "Failed to compile Eclipse"
-
-	cp launchertmp/eclipse eclipse-gtk || die "Cannot find eclipse binary"
-
-	# TODO use make_desktop_entry from eutils during src_install instead -nichoj
-	create-desktop-entry
-}
-
-src_install() {
-	dodir /usr/lib
-
-	debug-print "Installing features and plugins"
-
-	[ -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}
-	insinto ${ECLIPSE_DIR}
-	exeinto ${ECLIPSE_DIR}
-
-	debug-print "Installing eclipse-gtk binary"
-	doexe eclipse-gtk || die "Failed to install eclipse binary"
-	# need to rename inf file to eclipse-gtk.ini, see bug #128128
-
-	if use nosrc; then
-		debug-print "Removing source code"
-		strip-src
-	fi
-
-	if use nodoc ; then
-		debug-print "Removing documentation"
-		strip-docs
-	fi
-
-	# Install startup script
-	exeinto /usr/bin
-	doexe ${FILESDIR}/eclipse-${SLOT}
-
-	install-desktop-entry
-
-	doman ${FILESDIR}/eclipse.1
-
-	install-link-files
-
-	# eventually, we'll have a user writable extension location -nichoj
-	# TODO make g+w
-	#dodir /var/lib/eclipse-${SLOT}
-	#touch ${D}/var/lib/eclipse-${SLOT}/.eclipseextension
-	#fowners root:eclipse /var/lib/eclipse-${SLOT}
-
-}
-
-# -----------------------------------------------------------------------------
-#  Helper functions
-# -----------------------------------------------------------------------------
-
-fix_makefiles() {
-	# Comment out hard-coded JAVA_HOME
-	sed -i 's/^JAVA_HOME/#JAVA_HOME/' plugins/org.eclipse.core.resources.linux/src/Makefile || die "Failed to patch Makefile"
-
-	# Select the set of native libraries to compile
-	local libs="make_swt make_awt make_atk"
-
-	if use gnome ; then
-		einfo "Building GNOME VFS support"
-		libs="${libs} make_gnome"
-	fi
-
-#	if use !nogecko-sdk ; then
-#		einfo "Building Mozilla embed support"
-#		libs="${libs} make_mozilla"
-#	fi
-
-	if use atk ; then
-		einfo "Building ATK support"
-		libs="${libs} make_atk"
-	fi
-
-	sed -i "s/^all:.*/all: ${libs}/" "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak" || die "Failed to patch make_linux.mak"
-}
-
-fix_amd64_ibm_jvm() {
-	# the ibm jdk ebuild should have fixed headers, but until then
-	# we just fix the compiling here (see bug #97421)
-	if use amd64 ; then
-	    if [ ! -z "`java-config --java-version | grep IBM`" ] ; then
-			einfo "Fixing IBM jdk header problem"
-			find plugins -name "make_linux.mak" -print0 | xargs -0 sed -i -e 's/^CFLAGS =/CFLAGS = -D_JNI_IMPORT_OR_EXPORT_= /'
-	    fi
-	fi
-}
-
-
-clean-prebuilt-code() {
-	find ${S} -type f \( -name '*.class' -o -name '*.so' -o -name '*.so.*' -o -name 'eclipse' \) | xargs rm -f
-}
-
-check-cflags() {
-	local badflags="-fomit-frame-pointer -msse2"
-	local error=false
-	local flag
-
-	for flag in ${badflags} ; do
-		if is-flag ${flag}; then
-			ewarn "Found offending option ${flag} in your CFLAGS"
-			error=true
-		fi
-	done
-	if [ ${error} == "true" ]; then
-		echo
-		ewarn "One or more potentially gruesome CFLAGS detected. When you run into trouble,"
-		ewarn "please edit /etc/make.conf and remove all offending flags, then recompile"
-		ewarn "Eclipse and all its dependencies before submitting a bug report."
-		echo
-		ewarn "In particular, gtk+ is extremely sensitive to which which flags it was"
-		ewarn "compiled with."
-		echo
-		einfo "Tip: use equery depgraph \"=${PF}\" to list all dependencies."
-		echo
-		ebeep
-	fi
-}
-
-setup-jvm-opts() {
-	# Figure out correct boot classpath
-	# karltk: this should be handled by the java-pkg eclass in setup-vm
-	if [ ! -z "`java-config --java-version | grep IBM`" ] ; then
-		# IBM JDK
-		local bp="$(java-config --jdk-home)/jre/lib"
-		bootclasspath="${bp}/core.jar:${bp}/xml.jar:${bp}/graphics.jar:${bp}/security.jar:${bp}/server.jar"
-		JAVA_LIB_DIR="$(java-config --jdk-home)/jre/bin"
-	else
-		# Sun derived JDKs (Blackdown, Sun)
-		local bp="$(java-config --jdk-home)/jre/lib"
-		bootclasspath="${bp}/rt.jar:${bp}/jsse.jar"
-		JAVA_LIB_DIR="$(java-config --jdk-home)/jre/lib/${jvmarch}"
-	fi
-
-	einfo "Using bootclasspath ${bootclasspath}"
-	einfo "Using JVM library path ${JAVA_LIB_DIR}"
-
-	if [ ! -f ${JAVA_LIB_DIR}/libawt.so ] ; then
-	    die "Could not find libawt.so native library"
-	fi
-
-	export AWT_LIB_PATH=${JAVA_LIB_DIR}
-}
-
-setup-mozilla-opts() {
-	mozilla_dir="--mozdir-unset---"
-
-	if [ -f ${ROOT}/usr/lib/gecko-sdk/lib/libgtkembedmoz.so ] ; then
-		mozilla_dir=/usr/lib/gecko-sdk
-	else
-		# TODO need to update this appropriately for gecko-sdk
-		eerror "You have enabled the embedded mozilla component, but no suitable"
-		eerror "provider was found. You need gecko-sdk compiled against"
-		eerror "gtk+ v2.0 or newer."
-		eerror "To merge it, execute 'USE=\"gtk2\" emerge mozilla' as root."
-		eerror "To disable embedded mozilla, remove \"mozilla\" from your USE flags."
-		die "Need Mozilla compiled with gtk+-2.x support"
-	fi
-
-	export GECKO_SDK="${mozilla_dir}"
-	# TODO should this be using pkg-config?
-	export GECKO_INCLUDES="-include ${GECKO_SDK}/include/mozilla-config.h \
-		-I${GECKO_SDK}/include/nspr \
-		-I${GECKO_SDK}/include/nspr \
-		-I${GECKO_SDK}/include/xpcom \
-		-I${GECKO_SDK}/include/string \
-		-I${GECKO_SDK}/include/embed_base \
-		-I${JAVA_HOME}/include/linux"
-	export GECKO_LIBS="-L${GECKO_SDK}/lib -lgtkembedmoz"
-}
-
-build-native() {
-	sh features/org.eclipse.platform.launchers/library/gtk/build.sh \
-		-os linux -ws gtk \
-		-arch ${eclipsearch} || die "Failed to build launcher"
-}
-create-desktop-entry() {
-	sed -e "s/@PV@/${PV}/" ${FILESDIR}/eclipse-${SLOT}.desktop \
-		> eclipse-${SLOT}.desktop || die "Failed to create desktop entry"
-}
-
-install-desktop-entry() {
-	dodir /usr/share/applications
-	insinto /usr/share/applications
-	doins eclipse-${SLOT}.desktop
-}
-
-install_link_file() {
-	local path=${1}
-	local file=${2}
-
-	echo "path=${path}" > "${D}/${ECLIPSE_LINKS_DIR}/${file}"
-}
-
-install-link-files() {
-	einfo "Installing link files"
-
-	dodir ${ECLIPSE_LINKS_DIR}
-	install_link_file /opt/eclipse-extensions-3 eclipse-binary-extensions-3.link
-	install_link_file /opt/eclipse-extensions-3.1 eclipse-binary-extensions-3.1.link
-
-	install_link_file /usr/lib/eclipse-extensions-3 eclipse-extensions-3.link
-	install_link_file /usr/lib/eclipse-extensions-3.1 eclipse-extensions-3.1.link
-
-#	install_link_file /var/lib/eclipse-3 eclipse-var-3.link
-#	install_link_file /var/lib/eclipse-3.1 eclipse-var-3.1.link
-}
-
-strip-src() {
-	local bp=${D}/${ECLIPSE_DIR}
-
-	rm -rf ${bp}/plugins/org.eclipse.pde.source_3* \
-		${bp}/plugins/org.eclipse.jdt.source_3* \
-		${bp}/plugins/org.eclipse.platform.source.linux.* \
-		${bp}/plugins/org.eclipse.platform.source_3* \
-		${bp}/features/org.eclipse.jdt.source_3* \
-		${bp}/features/org.eclipse.pde.source_3* \
-		${bp}/features/org.eclipse.platform.source_3*
-}
-
-strip-docs() {
-	local bp=${D}/${ECLIPSE_DIR}
-
-	rm -rf ${bp}/plugins/org.eclipse.platform.doc.* \
-		${bp}/plugins/org.eclipse.jdt.doc.* \
-		${bp}/plugins/org.eclipse.pde.doc.*
-}
diff --git a/dev-util/eclipse-sdk/files/03-motif-java1.5-build.patch b/dev-util/eclipse-sdk/files/03-motif-java1.5-build.patch
deleted file mode 100644
index 3d639216967a..000000000000
--- a/dev-util/eclipse-sdk/files/03-motif-java1.5-build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urN eclipse-sdk-3.0.0.orig/plugins/org.eclipse.swt.motif/build.xml eclipse-sdk-3.0.0/plugins/org.eclipse.swt.motif/build.xml
---- eclipse-sdk-3.0.0.orig/plugins/org.eclipse.swt.motif/build.xml	2004-06-25 18:26:03.000000000 +0200
-+++ eclipse-sdk-3.0.0/plugins/org.eclipse.swt.motif/build.xml	2004-07-07 00:53:06.000000000 +0200
-@@ -105,7 +105,7 @@
- 		<property name="destdir" value="${temp.folder}/ws/motif/swt-gtk.jar.bin"/>
- 		<delete dir="${temp.folder}/ws/motif/swt-gtk.jar.bin"/>
- 		<mkdir dir="${temp.folder}/ws/motif/swt-gtk.jar.bin"/>
--		<javac destdir="${temp.folder}/ws/motif/swt-gtk.jar.bin" verbose="true" debug="on" failonerror="no" bootclasspath="${bootclasspath}">
-+		<javac destdir="${temp.folder}/ws/motif/swt-gtk.jar.bin" source="1.3" target="1.2" verbose="true" debug="on" failonerror="no" bootclasspath="${bootclasspath}">
- 			<src path="${plugindir}/Eclipse SWT PI/motif_gtk/"/>
- 		</javac>
-         <property name="includes" value=""/>
-@@ -125,7 +125,7 @@
- 	<property name="destdir" value="${temp.folder}/ws/motif/swt-mozilla.jar.bin"/>
- 	<delete dir="${temp.folder}/ws/motif/swt-mozilla.jar.bin"/>
- 	<mkdir dir="${temp.folder}/ws/motif/swt-mozilla.jar.bin"/>
--	<javac destdir="${temp.folder}/ws/motif/swt-mozilla.jar.bin" verbose="true" debug="on" failonerror="no" bootclasspath="${bootclasspath}" classpath="${build.result.folder}/ws/motif/swt-gtk.jar">
-+	<javac destdir="${temp.folder}/ws/motif/swt-mozilla.jar.bin" source="1.3" target="1.2" verbose="true" debug="on" failonerror="no" bootclasspath="${bootclasspath}" classpath="${build.result.folder}/ws/motif/swt-gtk.jar">
- 		<src path="${plugindir}/Eclipse SWT Mozilla/gtk/"/>
- 		<src path="${plugindir}/Eclipse SWT Mozilla/common/"/>
- 	</javac>
-@@ -315,4 +315,4 @@
- 		<delete dir="${temp.folder}"/>
- 	</target>
- 
--</project>
-\ No newline at end of file
-+</project>
diff --git a/dev-util/eclipse-sdk/files/04-amd64-gtk.patch b/dev-util/eclipse-sdk/files/04-amd64-gtk.patch
deleted file mode 100644
index bcd186a284f2..000000000000
--- a/dev-util/eclipse-sdk/files/04-amd64-gtk.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-*** eclipse-3.0.1.orig/plugins/platform-launcher/library/gtk/eclipseGtk.c  Thu Sep 16 17:46:23 2004
---- eclipse-3.0.1/plugins/platform-launcher/library/gtk/eclipseGtk.c Sun Oct 17 21:06:47 2004
-***************
-*** 23,28 ****
---- 23,29 ----
-  #include <stdio.h>
-  #include <string.h>
-  #include <locale.h>
-+ #include <stdlib.h>
-
-  #include <gtk/gtk.h>
-  #include <gdk-pixbuf/gdk-pixbuf.h>
diff --git a/dev-util/eclipse-sdk/files/05-mozilla-xpcom.patch b/dev-util/eclipse-sdk/files/05-mozilla-xpcom.patch
deleted file mode 100644
index 87767cae73ae..000000000000
--- a/dev-util/eclipse-sdk/files/05-mozilla-xpcom.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ur eclipse.orig/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp
---- eclipse.orig/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp	2005-03-11 15:59:28.000000000 +0200
-+++ eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp	2005-03-30 08:03:03.983042167 +0300
-@@ -234,16 +234,6 @@
- 	return rc;

- }

- 

--JNIEXPORT jboolean JNICALL XPCOM_NATIVE(nsString_1Equals)

--	(JNIEnv *env, jclass, jint arg0, jint arg1)

--{

--	nsEmbedString *lparg0 = NULL;

--	nsEmbedString *lparg1 = NULL;

--	if (arg0 != 0) lparg0 = (nsEmbedString*)arg0;

--	if (arg1 != 0) lparg1 = (nsEmbedString*)arg1;

--	return lparg0->Equals(*lparg1);

--}

--

- JNIEXPORT jstring JNICALL XPCOM_NATIVE(PR_1GetEnv)

- 	(JNIEnv *env, jclass, jstring arg0)

- {

diff --git a/dev-util/eclipse-sdk/files/06-path-fixups.patch b/dev-util/eclipse-sdk/files/06-path-fixups.patch
deleted file mode 100644
index ed07886a66e1..000000000000
--- a/dev-util/eclipse-sdk/files/06-path-fixups.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff -ur eclipse.orig/plugins/org.eclipse.core.resources.linux/build.xml eclipse.fix/plugins/org.eclipse.core.resources.linux/build.xml
---- eclipse.orig/plugins/org.eclipse.core.resources.linux/build.xml	2005-05-13 21:34:52.000000000 +0300
-+++ eclipse.fix/plugins/org.eclipse.core.resources.linux/build.xml	2005-05-23 21:43:30.000000000 +0300
-@@ -57,10 +57,15 @@
- 
- 	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
- 		<mkdir dir="${destination.temp.folder}/org.eclipse.core.resources.linux_3.1.0"/>
-+          <exec dir="./src" executable="make">
-+          </exec>
-+	  <copy todir="os/linux/${basearch}" failonerror="true" overwrite="false">
-+        	<fileset dir="src" includes="*.so"/>
-+          </copy>
- 		<copy todir="${destination.temp.folder}/org.eclipse.core.resources.linux_3.1.0" failonerror="true" overwrite="false">
- 			<fileset dir="${basedir}" includes="os/,META-INF/,about.html"			/>
- 		</copy>
--		<chmod perm="755" dir="${destination.temp.folder}/org.eclipse.core.resources.linux_3.1.0" includes="os/linux/x86/*.so" /> 
-+		<chmod perm="755" dir="${destination.temp.folder}/org.eclipse.core.resources.linux_3.1.0" includes="os/linux/${basearch}/*.so" /> 
- 	</target>
- 
- 	<target name="build.zips" depends="init">
-diff -ur eclipse.orig/plugins/org.eclipse.update.core.linux/src/build.xml eclipse.fix/plugins/org.eclipse.update.core.linux/src/build.xml
---- eclipse.orig/plugins/org.eclipse.update.core.linux/src/build.xml	2005-05-13 21:37:28.000000000 +0300
-+++ eclipse.fix/plugins/org.eclipse.update.core.linux/src/build.xml	2005-05-23 21:43:30.000000000 +0300
-@@ -5,7 +5,7 @@
-   <!-- 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="destination" value="${eclipse-home}/org.eclipse.update.core.linux/os/linux/x86/"/>
-+  <property name="destination" value="${eclipse-home}/org.eclipse.update.core.linux/os/linux/${arch}/"/>
-   <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/"/>  
-   
-@@ -47,17 +47,17 @@
-     <property name="header-path" value="${jdk-path}/../include"/>
-     <property name="header-linux-path" value="${header-path}/linux" />
- 
--	<echo message="gcc -o  ${library-file} -shared -I${src-path} -I${header-linux-path} ${library-file} -static -lc"/>
-+	<echo message="gcc -o  ${library-file} -shared -fPIC -I${src-path} -I${header-linux-path} ${library-file} -lc"/>
- 
-     <apply executable="gcc" dest="${eclipse-home}/" parallel="false">
-       <arg value="-o"/>
-       <arg value="${library-file}"/>
-       <arg value="-shared"/>
-+      <arg value="-fPIC"/>
-       <arg value="-I${src-path}"/>
-       <arg value="-I${header-path}"/>      
-       <arg value="-I${header-linux-path}"/>  
- 	  <srcfile/>
--	  <arg value="-static"/>           
-       <arg value="-lc"/>	  
-       <fileset dir="${src-path}" includes="*.c"/>
-       <mapper type="glob" from="*.c" to="*.o"/>
-diff -ur eclipse.orig/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh eclipse.fix/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
---- eclipse.orig/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	2005-06-27 23:46:32.000000000 +0300
-+++ eclipse.fix./plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	2005-06-27 23:51:09.000000000 +0300
-@@ -30,7 +30,9 @@
- 				if [ "${JAVA_HOME}" = "" ]; then
- 					JAVA_HOME=/bluebird/teamswt/swt-builddir/jdk1.5.0
- 				fi
--				AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64
-+				if [ "${AWT_LIB_PATH}" = "" ]; then
-+				    AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64
-+				fi
- 				XTEST_LIB_PATH=/usr/X11R6/lib64
- 				if [ "${GECKO_SDK}" = "" ]; then
- 					GECKO_SDK=/mozilla/mozilla/1.7/amd64/gtk2/mozilla/dist/sdk
-@@ -48,7 +50,9 @@
- 				if [ "${JAVA_HOME}" = "" ]; then
- 					JAVA_HOME=/bluebird/teamswt/swt-builddir/IBMJava2-141
- 				fi
--				AWT_LIB_PATH=$JAVA_HOME/jre/bin
-+				if [ "${AWT_LIB_PATH}" = "" ]; then
-+				    AWT_LIB_PATH=$JAVA_HOME/jre/bin
-+				fi
- 				XTEST_LIB_PATH=/usr/X11R6/lib
- 				if [ "${GECKO_SDK}" = "" ]; then
- 					GECKO_SDK=/mozilla/mozilla/1.4/linux_gtk2/mozilla/dist/sdk
---- eclipse-sdk-3.1/plugins/org.eclipse.help.webapp/build.xml.orig	2005-07-02 23:53:29.888012464 +0000
-+++ eclipse-sdk-3.1/plugins/org.eclipse.help.webapp/build.xml	2005-07-02 23:53:42.596080544 +0000
-@@ -165,7 +165,7 @@
- 		<java
- 			classname="org.apache.jasper.JspC"
- 			fork="true"
--			failonerror="false"
-+			failonerror="true"
- 			classpathref="jasper.classpath"
- 			output="${temp.folder}/WEB-INF/lib/jsp.jar.bin.log">
- 			<arg value="-v3" />
diff --git a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.0.1-r3 b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.0.1-r3
deleted file mode 100644
index 183c809210df..000000000000
--- a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.0.1-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c95561df899a47fc05261531ed0b9221 eclipse-sourceBuild-srcIncluded-3.0.1.zip 55618511
-RMD160 fba01eb0f019a888e9d9deb57ad7b284f218e783 eclipse-sourceBuild-srcIncluded-3.0.1.zip 55618511
-SHA256 5f6eb496d3db940b1085032a807337dbc477a0da9877a7cea50d39d32dfde050 eclipse-sourceBuild-srcIncluded-3.0.1.zip 55618511
diff --git a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.0.2-r1 b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.0.2-r1
deleted file mode 100644
index 94a883fe46af..000000000000
--- a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.0.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1e2e595469af58245781f17075495389 eclipse-sourceBuild-srcIncluded-3.0.2.zip 55945573
-RMD160 57f0b11c24a8e9982e6d446d14b4782112e5b1a7 eclipse-sourceBuild-srcIncluded-3.0.2.zip 55945573
-SHA256 0c9e961fbf11d782b0c8c743122e5cc8567f3b06f48f38d6b40a8a78ead567d9 eclipse-sourceBuild-srcIncluded-3.0.2.zip 55945573
diff --git a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.1.2-r3 b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.1.2-r3
deleted file mode 100644
index f22ddffd2fd5..000000000000
--- a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.1.2-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f2c8066151de14c5ccdf420266ce9f39 eclipse-sourceBuild-srcIncluded-3.1.2.zip 66630673
-RMD160 ffe59352fe02b4a47be3e9a6daad3a5501f196b0 eclipse-sourceBuild-srcIncluded-3.1.2.zip 66630673
-SHA256 31233332f205a197a42aafdc4f15a4f38eb5e4be19ac8a7192492ab8a21324a4 eclipse-sourceBuild-srcIncluded-3.1.2.zip 66630673
diff --git a/dev-util/eclipse-sdk/files/eclipse-2 b/dev-util/eclipse-sdk/files/eclipse-2
deleted file mode 100644
index 542c267edcef..000000000000
--- a/dev-util/eclipse-sdk/files/eclipse-2
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-#
-# Tiny startup wrapper for the Eclipse 2.1.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
-#
-
-if [ -f $HOME/.eclipserc ] ; then
-	. $HOME/.eclipserc
-fi
-
-if [ -z "${ECLIPSE_HOME}" ] ; then
-	ECLIPSE_HOME=/usr/lib/eclipse-2
-fi
-
-if [ "${PREFERRED_FRONTEND}" == "gtk" ] && [ -x ${ECLIPSE_HOME}/eclipse-gtk ] ; then
-	ECLIPSE_BIN=${ECLIPSE_HOME}/eclipse-gtk
-elif [ "${PREFERRED_FRONTEND}" == "motif" ] && [ -x ${ECLIPSE_HOME}/eclipse-motif ] ; then
-	ECLIPSE_BIN=${ECLIPSE_HOME}/eclipse-motif
-else
-	if [ -x "${ECLIPSE_HOME}/eclipse-gtk" ] ; then
-		ECLIPSE_BIN=${ECLIPSE_HOME}/eclipse-gtk
-	elif [ -x "${ECLIPSE_HOME}/eclipse-motif" ] ; then
-		ECLIPSE_BIN=${ECLIPSE_HOME}/eclipse-motif
-	fi
-fi
-
-if [ ! -x "${ECLIPSE_BIN}" ] ; then
-	echo "Failed to find executable '${ECLIPSE_BIN}'" > /dev/stderr
-	exit -1
-fi
-
-${ECLIPSE_BIN} $@
diff --git a/dev-util/eclipse-sdk/files/eclipse-2.desktop b/dev-util/eclipse-sdk/files/eclipse-2.desktop
deleted file mode 100644
index fc9f76580088..000000000000
--- a/dev-util/eclipse-sdk/files/eclipse-2.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Eclipse @PV@
-Comment=A Java Development Environment
-Icon=/usr/lib/eclipse-2/icon.xpm
-Exec=/usr/bin/eclipse-2
-Terminal=false
-Type=Application
-Categories=GNOME;Application;Development
-StartupNotify=true
diff --git a/dev-util/eclipse-sdk/files/eclipse-3 b/dev-util/eclipse-sdk/files/eclipse-3
deleted file mode 100644
index d0b5d9bd7735..000000000000
--- a/dev-util/eclipse-sdk/files/eclipse-3
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-#
-# Tiny startup wrapper for the Eclipse 3.0.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
-#
-
-if [ -f $HOME/.eclipserc ] ; then
-	. $HOME/.eclipserc
-fi
-
-if [ -z "${ECLIPSE_HOME}" ] ; then
-	ECLIPSE_HOME=/usr/lib/eclipse-3
-fi
-
-if [ "${PREFERRED_FRONTEND}" == "gtk" ] && [ -x ${ECLIPSE_HOME}/eclipse-gtk ] ; then
-	ECLIPSE_BIN=${ECLIPSE_HOME}/eclipse-gtk
-elif [ "${PREFERRED_FRONTEND}" == "motif" ] && [ -x ${ECLIPSE_HOME}/eclipse-motif ] ; then
-	ECLIPSE_BIN=${ECLIPSE_HOME}/eclipse-motif
-else
-	if [ -x ${ECLIPSE_HOME}/eclipse-gtk ] ; then
-		ECLIPSE_BIN=${ECLIPSE_HOME}/eclipse-gtk
-	elif [ -x ${ECLIPSE_HOME}/eclipse-motif ] ; then
-		ECLIPSE_BIN=${ECLIPSE_HOME}/eclipse-motif
-	fi
-fi
-
-if [ ! -x ${ECLIPSE_BIN} ] ; then
-	echo "Failed to find executable '${ECLIPSE_BIN}'" > /dev/stderr
-	exit -1
-fi
-
-${ECLIPSE_BIN} $@
diff --git a/dev-util/eclipse-sdk/files/eclipse-3.0.2 b/dev-util/eclipse-sdk/files/eclipse-3.0.2
deleted file mode 100644
index 19d9a3d558f3..000000000000
--- a/dev-util/eclipse-sdk/files/eclipse-3.0.2
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-#
-# Tiny startup wrapper for the Eclipse 3.0.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
-#
-
-if [ -f $HOME/.eclipserc ] ; then
-	. $HOME/.eclipserc
-fi
-
-if [ -z "${ECLIPSE_HOME}" ] ; then
-	ECLIPSE_HOME=/usr/lib/eclipse-3
-fi
-
-if [ "${PREFERRED_FRONTEND}" == "gtk" ] && [ -x ${ECLIPSE_HOME}/eclipse-gtk ] ; then
-	ECLIPSE_BIN=${ECLIPSE_HOME}/eclipse-gtk
-elif [ "${PREFERRED_FRONTEND}" == "motif" ] && [ -x ${ECLIPSE_HOME}/eclipse-motif ] ; then
-	ECLIPSE_BIN=${ECLIPSE_HOME}/eclipse-motif
-else
-	if [ -x ${ECLIPSE_HOME}/eclipse-gtk ] ; then
-		ECLIPSE_BIN=${ECLIPSE_HOME}/eclipse-gtk
-	elif [ -x ${ECLIPSE_HOME}/eclipse-motif ] ; then
-		ECLIPSE_BIN=${ECLIPSE_HOME}/eclipse-motif
-	fi
-fi
-
-if [ ! -x ${ECLIPSE_BIN} ] ; then
-	echo "Failed to find executable '${ECLIPSE_BIN}'" > /dev/stderr
-	exit -1
-fi
-
-LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib/MozillaFirefox/components:/usr/lib/mozilla/components \
-	${ECLIPSE_BIN} $@
diff --git a/dev-util/eclipse-sdk/files/eclipse-3.1 b/dev-util/eclipse-sdk/files/eclipse-3.1
deleted file mode 100644
index 32bbe4a8ba82..000000000000
--- a/dev-util/eclipse-sdk/files/eclipse-3.1
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh
-#
-# Tiny startup wrapper for the Eclipse 3.0.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
-#
-
-if [ -f $HOME/.eclipserc ] ; then
-	. $HOME/.eclipserc
-fi
-
-if [ -z "${ECLIPSE_HOME}" ] ; then
-	ECLIPSE_HOME=/usr/lib/eclipse-3.1
-fi
-
-if [ "${PREFERRED_FRONTEND}" == "gtk" ] && [ -x ${ECLIPSE_HOME}/eclipse-gtk ] ; then
-	ECLIPSE_BIN=${ECLIPSE_HOME}/eclipse-gtk
-elif [ "${PREFERRED_FRONTEND}" == "motif" ] && [ -x ${ECLIPSE_HOME}/eclipse-motif ] ; then
-	ECLIPSE_BIN=${ECLIPSE_HOME}/eclipse-motif
-else
-	if [ -x ${ECLIPSE_HOME}/eclipse-gtk ] ; then
-		ECLIPSE_BIN=${ECLIPSE_HOME}/eclipse-gtk
-	elif [ -x ${ECLIPSE_HOME}/eclipse-motif ] ; then
-		ECLIPSE_BIN=${ECLIPSE_HOME}/eclipse-motif
-	fi
-fi
-
-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.1, and that such a modification may prevent you from safely"
-    echo "!!! upgrading to later 3.1 revisions."
-	echo
-	echo "!!! To ensure correct behavior on your next upgrade, do:"
-    echo "!!!  1) 'emerge unmerge \"=eclipse-sdk-3.1\"'"
-    echo "!!!  2) 'rm -rf /usr/lib/eclipse-3.1'"
-	echo "!!!  3) 'emerge eclipse-sdk'"
-fi
-
-${ECLIPSE_BIN} $@
diff --git a/dev-util/eclipse-sdk/files/eclipse-3.1.desktop b/dev-util/eclipse-sdk/files/eclipse-3.1.desktop
deleted file mode 100644
index bdb91b357ef4..000000000000
--- a/dev-util/eclipse-sdk/files/eclipse-3.1.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Eclipse @PV@
-Comment=A Java Development Environment
-Icon=/usr/lib/eclipse-3.1/icon.xpm
-Exec=/usr/bin/eclipse-3.1
-Terminal=false
-Type=Application
-Categories=GNOME;Application;Development
-StartupNotify=true
diff --git a/dev-util/eclipse-sdk/files/eclipse-3.desktop b/dev-util/eclipse-sdk/files/eclipse-3.desktop
deleted file mode 100644
index 55f8b6e77b65..000000000000
--- a/dev-util/eclipse-sdk/files/eclipse-3.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Eclipse @PV@
-Comment=A Java Development Environment
-Icon=/usr/lib/eclipse-3/icon.xpm
-Exec=/usr/bin/eclipse-3
-Terminal=false
-Type=Application
-Categories=GNOME;Application;Development
-StartupNotify=true
diff --git a/dev-util/eclipse-sdk/files/eclipse.1 b/dev-util/eclipse-sdk/files/eclipse.1
deleted file mode 100644
index 6572ca4e54f3..000000000000
--- a/dev-util/eclipse-sdk/files/eclipse.1
+++ /dev/null
@@ -1,87 +0,0 @@
-.TH eclipse 1 "3.0.0"
-.SH "NAME"
-.LP 
-eclipse \- Eclipse Tools Platform
-.SH "SYNTAX"
-.LP 
-eclipse gensync [\fIplatform options\fP] [\fI-vmargs [Java VM arguments]\fP]
-
-.SH "DESCRIPTION"
-
-\fIeclipse\fR is the Gentoo startup script for the Eclipse Tools platform. It
-will search for an appropriate front-end for Eclipse (either gtk+ or Motif, in
-order of preference), and start the platform.
-
-.SH "OPTIONS"
-
-.LP
-\fB-application <app id>\fB
-.IP
-Identifies the application to run.  If not specified, the Eclipse workbench is
-run.  Applications are declared by plug-ins supplying extensions to the
-org.eclipse.core.runtime.applications extension point.
-
-
-.LP
-\fB-boot <boot code path>\fB
-.IP
-Defines the path to the boot plug-in code (i.e., boot.jar).  Only required when
-changing the relative location of startup.jar and boot.jar. 
-
-
-.LP
-\fB-consolelog\fB
-.IP
-Mirrors the platform's error log to the console used to run Eclipse.
-
-
-.LP
-\fB-data <workspace path>\fB
-.IP
-Defines the path of the workspace on which to run the platform.
-
-
-.LP
-\fB-debug [options file path]\fB
-.IP
-Puts the platform in debug mode and loads the debug options in the specified file.  If a file path is not given, the platform looks in the platform install directory and in the workspace's metadata directory for a file called ".options".
-
-
-.LP
-\fB-dev [classpath entries]\fB
-.IP
-Puts the platform in development mode.  The optional classpath entries (a comma-separated list) are added to each plug-in's classpath.  For example, when developing plug-ins, use "-dev bin" to add the Java tooling's bin directory for each plug-in.  Redundant or non-existant classpath entries are eliminated.
-
-
-.LP
-\fB-nosplash\fB
-.IP
-Runs the platform without putting up the splash screen.
-
-
-.LP
-\fB-os <os-id>\fB
-.IP
-Defines the operating system on which the platform is running.  Typically the platform can detect the OS but some situations may require explicit specification.  The value specified here is related to Platform.getOS().
-
-
-.LP
-\fB-vm <vm path>\fB
-.IP
-Specifies the Java VM to use to run the platform.  If not specified, a Java VM is located relative to the Eclipse executable.
-
-
-.LP
-\fB-ws <ws-id>\fB
-.IP
-Defines the window system on which the platform is running.  In many cases the platform can detect the window system but some situations may require explicit specification.  The value specified here is related to Platform.getWS().
-
-.SH "SEE ALSO"
-.LP 
-\fIhttp://dev.gentoo.org/~karltk/projects/eclipse\fR for tips and tricks.
-
-.SH "AUTHORS"
-.LP 
-Karl Trygve Kalleberg <karltk@gentoo.org>
-.br
-The Eclipse Project, \fIwww.eclipse.org\fR