6 files changed, 5 insertions, 769 deletions
diff --git a/dev-util/eclipse-sdk/ChangeLog b/dev-util/eclipse-sdk/ChangeLog
index 1a7e167486ec..4ac61f9576cc 100644
--- a/dev-util/eclipse-sdk/ChangeLog
+++ b/dev-util/eclipse-sdk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/eclipse-sdk
 # Copyright 2003-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.103 2006/04/19 04:39:41 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.104 2006/04/19 04:45:44 nichoj Exp $
+
+  19 Apr 2006; Joshua Nichols <nichoj@gentoo.org>
+  -eclipse-sdk-3.1-r1.ebuild, -eclipse-sdk-3.1.2.ebuild:
+  Cleaning out some ebuilds.
 
 *eclipse-sdk-3.1.2-r1 (18 Apr 2006)
 
diff --git a/dev-util/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest
index 7a95455029de..fa6c7de491e8 100644
--- a/dev-util/eclipse-sdk/Manifest
+++ b/dev-util/eclipse-sdk/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 04835c10cdb6c4206f3c293448dd790e ChangeLog 20377
 RMD160 4daaf1fa14f8360ef1f6b913566d1ff1458436b7 ChangeLog 20377
 SHA256 342dba0349bf0238e6f3b41cfc220de8fbb8ffc286223a5942595ed3d71342b9 ChangeLog 20377
@@ -16,18 +13,12 @@ SHA256 b27b0266a767263a5eddf98ab3fb36dbfb6d378d334dedbb189610b7c6b72d25 eclipse-
 MD5 d1b1a1ccb18e4977fb1548bb20e1de63 eclipse-sdk-3.0.2.ebuild 13828
 RMD160 0ff8c21197b594fbe05b01506a316990b533a67c eclipse-sdk-3.0.2.ebuild 13828
 SHA256 01312d059ea42f34b6819306dc06b08098850e18ed1a64cb5d8b18349f9f7154 eclipse-sdk-3.0.2.ebuild 13828
-MD5 d4bd64b3abb0e431031bf7d8766a0f0e eclipse-sdk-3.1-r1.ebuild 10418
-RMD160 cca83414ca5b6ac0bfaafa37037caf31192a7680 eclipse-sdk-3.1-r1.ebuild 10418
-SHA256 e6fb525198e777c7d87893dd04b225b9cd7a92b5afb51ef41e0a6eed8f801a19 eclipse-sdk-3.1-r1.ebuild 10418
 MD5 e56bed895cd713529b60cb5dc49e4b0a eclipse-sdk-3.1.1.ebuild 10393
 RMD160 9b5c6e089102ee34a8fb05a4a8164213065a195e eclipse-sdk-3.1.1.ebuild 10393
 SHA256 6432c3d38373ad2f472b7a002312a3c64dcb24ab5a4a16dc85cdb39efaa50058 eclipse-sdk-3.1.1.ebuild 10393
 MD5 7b43ff2a928ebff95b8aa4afd37b389d eclipse-sdk-3.1.2-r1.ebuild 10577
 RMD160 da9f300e4a962bc09bf8d16b31d3bb0fc25e02b0 eclipse-sdk-3.1.2-r1.ebuild 10577
 SHA256 470df9418b4e76e21cb3552a36c4ce6f53425e3251458a17492ec7a13bdda1db eclipse-sdk-3.1.2-r1.ebuild 10577
-MD5 55d2870f781ab6eb8450d6ef2b4bebd9 eclipse-sdk-3.1.2.ebuild 10395
-RMD160 c268daf205090c9fcc8147289b1ca37df430a68c eclipse-sdk-3.1.2.ebuild 10395
-SHA256 1ce0bb9597635551f293d9175bdea4a26877cf2ddfeba730408ed52ffd50e860 eclipse-sdk-3.1.2.ebuild 10395
 MD5 ab0f6620b4767e065bd533b06245b0fc files/01-distribute_ant_target-2.1.patch 1103
 RMD160 b1e41e2a202fcd91135b9df0573b3611c27bc046 files/01-distribute_ant_target-2.1.patch 1103
 SHA256 98b71329db9aae0bbeef88613939c68a9220764e8c207f4301f38a9087e72cd3 files/01-distribute_ant_target-2.1.patch 1103
@@ -61,15 +52,9 @@ SHA256 0de94c0723ef302003eab0a95ab2a1c38869a827d50c01984f74d1dfd83eb203 files/di
 MD5 e4fe184225b61ac63ba71f1157e0bb4e files/digest-eclipse-sdk-3.0.2 310
 RMD160 370ff7e60e462001598b2f8357b463b9389071b7 files/digest-eclipse-sdk-3.0.2 310
 SHA256 da189a7c7ddd6b1661391f5e149d905d79779d4863502d4b769216b19a5fed42 files/digest-eclipse-sdk-3.0.2 310
-MD5 909ae2ff15ca1bfea0ec7dd4b62db08e files/digest-eclipse-sdk-3.1-r1 304
-RMD160 237b4ca74b0c334bf16911f05cc9fe40d381ba8f files/digest-eclipse-sdk-3.1-r1 304
-SHA256 6d7604d43e4d856247546d63161499eeebeb1522125cf36357b86eb363e0db2b files/digest-eclipse-sdk-3.1-r1 304
 MD5 cffbffb2d9d08ac2123a1a393df33aa7 files/digest-eclipse-sdk-3.1.1 88
 RMD160 ca27938bbb231a3b6f26aee1002c56af1cae68de files/digest-eclipse-sdk-3.1.1 88
 SHA256 8c5f1687cc5701180e20605b6672f79a2a1d3b9d6800a63f28b02b26e5e39346 files/digest-eclipse-sdk-3.1.1 88
-MD5 0dd05cebf3928888ff566c433da96335 files/digest-eclipse-sdk-3.1.2 310
-RMD160 dea902b88d52673c42f034ab9451e145bc52b30c files/digest-eclipse-sdk-3.1.2 310
-SHA256 01187ce1cad8c9037d48c130cd9d98167d7c934e075d42c7c55f3adae8105749 files/digest-eclipse-sdk-3.1.2 310
 MD5 0dd05cebf3928888ff566c433da96335 files/digest-eclipse-sdk-3.1.2-r1 310
 RMD160 dea902b88d52673c42f034ab9451e145bc52b30c files/digest-eclipse-sdk-3.1.2-r1 310
 SHA256 01187ce1cad8c9037d48c130cd9d98167d7c934e075d42c7c55f3adae8105749 files/digest-eclipse-sdk-3.1.2-r1 310
@@ -100,10 +85,3 @@ SHA256 5165b07f736763eab05decb39397be0be8ae03b77f614ba3794eff71d411537b files/ec
 MD5 8de14dda7d318d8fb514fdbcecd4058b metadata.xml 782
 RMD160 5b8dc4f4b6bdd457da62f967ec176bee2ae7e5e4 metadata.xml 782
 SHA256 a1e6bbc5427799b8607d355e3e09ce7d4de98f2a365417ec158eb56f4f00746f metadata.xml 782
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFERb91ndWRXhKOboURArX/AKCjo/Ks7YMdkFYwuVu9jbGEhB1YWQCfdJuU
-3VQ7FPGjz91oH3sn4sdHZ4Y=
-=r1Fm
------END PGP SIGNATURE-----
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.1-r1.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.1-r1.ebuild
deleted file mode 100644
index 864aeb116a04..000000000000
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.1-r1.ebuild
+++ /dev/null
@@ -1,370 +0,0 @@
-# Copyright 1999-2005 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-r1.ebuild,v 1.7 2005/08/15 18:56:16 karltk Exp $
-
-inherit eutils java-utils
-
-MY_A="eclipse-sourceBuild-srcIncluded-3.1.zip"
-DESCRIPTION="Eclipse Tools Platform"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/R-3.1-200506271435/${MY_A}"
-IUSE="gnome mozilla firefox jikes nosrc nodoc atk"
-SLOT="3.1"
-LICENSE="CPL-1.0"
-KEYWORDS="~x86 ~ppc ~amd64"
-
-RDEPEND=">=virtual/jre-1.4.2
-	>=x11-libs/gtk+-2.2.4
-	mozilla? ( >=www-client/mozilla-1.7 )
-	atk? ( >=dev-libs/atk-1.6 )
-	firefox? ( >=www-client/mozilla-firefox-1.0.2 )
-	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"
-
-# TODO:
-# - use CFLAGS from make.conf when building native libraries
-#   - must patch eclipse build files
-#   - also submit patch to bugs.eclipse
-# - intergration to eclipse plugin ebuilds most likely broken
-# - ppc support not tested, but not explicitly broken either
-
-pkg_setup() {
-
-	einfo "Checking for sufficient physical RAM"
-	check-ram
-	check-cflags
-
-	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 [ ${ARCH} == 'amd64' ] ; then
-		eclipsearch=x86_64
-	else
-		eclipsearch=${ARCH}
-	fi
-
-	# all other gentoo archs match in sun jdk library patch except x86
-	if [ ${ARCH} == 'x86' ] ; then
-		jvmarch=i386
-	else
-		jvmarch=${ARCH}
-	fi
-}
-
-src_unpack() {
-
-	mkdir ${S}
-	cd ${S}
-	unpack ${MY_A} || die "Could not unpack ${MY_A}"
-
-	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"
-	process-makefiles
-
-	patch_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
-
-	${use_gtk} && use mozilla && setup-mozilla-opts
-
-	use jikes && bootstrap_ant_opts="-Dbuild.compiler=jikes"
-
-	einfo "Bootstrapping bootstrap ecj"
-	ant ${bootstrap_ant_opts} -q -f jdtcoresrc/compilejdtcorewithjavac.xml || die "Failed to bootstrap ecj"
-
-	einfo "Bootstrapping ecj"
-	ant -lib jdtcoresrc/ecj.jar -q -f jdtcoresrc/compilejdtcore.xml || die "Failed to bootstrap ecj"
-
-	einfo "Compiling Eclipse -- see ${S}/compilelog.txt for details"
-	ANT_OPTS="-Xmx1024M -XX:CompileThreshold=1500" \
-		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"
-
-	einfo "Creating .desktop entry"
-	create-desktop-entry
-}
-
-src_install() {
-
-	eclipse_dir="/usr/lib/eclipse-${SLOT}"
-
-	dodir /usr/lib
-
-	einfo "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}
-
-	# Install launchers and native code
-	exeinto ${eclipse_dir}
-
-	einfo "Installing eclipse-gtk binary"
-	doexe eclipse-gtk || die "Failed to install eclipse binary"
-
-	if use nosrc ; then
-		einfo "Stripping away source code"
-		strip-src
-	fi
-
-	if use nodoc ; then
-		einfo "Stripping away documentation"
-		strip-docs
-	fi
-
-	# Install startup script
-	exeinto /usr/bin
-	doexe ${FILESDIR}/eclipse-${SLOT}
-
-	install-desktop-entry
-
-	doman ${FILESDIR}/eclipse.1
-
-	install-link-files
-}
-
-# -----------------------------------------------------------------------------
-#  Helper functions
-# -----------------------------------------------------------------------------
-
-function setup-mozilla-opts()
-{
-	mozilla_dir="--mozdir-unset---"
-
-	if [ -f ${ROOT}/usr/lib/MozillaFirefox/libgtkembedmoz.so ] ; then
-		einfo "Compiling against www-client/mozilla-firefox"
-		mozilla_dir=/usr/lib/MozillaFirefox
-	elif [ -f ${ROOT}/usr/lib/mozilla/libgtkembedmoz.so ] ; then
-		einfo "Compiling against www-client/mozilla"
-		mozilla_dir=/usr/lib/mozilla
-	else
-		eerror "You have enabled the embedded mozilla component, but no suitable"
-		eerror "provider was found. You need Mozilla or Firefox 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}"
-	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} -lgtkembedmoz"
-}
-
-function build-native() {
-	sh features/org.eclipse.platform.launchers/library/gtk/build.sh \
-		-os linux -ws gtk \
-		-arch ${eclipsearch} || die "Failed to build launcher"
-}
-
-function process-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 mozilla ; 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"
-}
-
-function create-desktop-entry() {
-
-	cat ${FILESDIR}/eclipse-${SLOT}.desktop | \
-		sed -e "s/@PV@/${PV}/" \
-		> eclipse-${SLOT}.desktop || die "Failed to create desktop entry"
-}
-
-function install-desktop-entry() {
-
-	dodir /usr/share/applications
-	insinto /usr/share/applications
-	doins eclipse-${SLOT}.desktop
-}
-
-function clean-prebuilt-code() {
-
-	find ${S} -type f \( -name '*.class' -o -name '*.so' -o -name '*.so.*' -o -name 'eclipse' \) | xargs rm -f
-}
-
-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 775000 ] &&
-		(
-		echo
-		ewarn "To build Eclipse, at least 768MB of RAM is recommended."
-		ewarn "Your machine has less RAM. Continuing anyway. If the build"
-		ewarn "stops with an error about invalid memory, increase your swap."
-		echo
-		)
-}
-
-function install-link-files() {
-
-	einfo "Installing 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=/opt/eclipse-extensions-3.1" > ${D}/${eclipse_dir}/links/eclipse-binary-extensions-3.1.link
-
-	echo "path=/usr/lib/eclipse-extensions-3" > ${D}/${eclipse_dir}/links/eclipse-extensions-3.link
-	echo "path=/usr/lib/eclipse-extensions-3.1" > ${D}/${eclipse_dir}/links/eclipse-extensions-3.1.link
-}
-
-function patch_amd64_ibm_jvm() {
-	# the ibm jdk ebuild should have fixed headers, but until then
-	# we just fix the compiling here (see bug #97421)
-	if [ ${ARCH} == '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
-}
-
-function 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 JRE
-		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 JREs (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}
-}
-
-function strip-src() {
-
-	local bp=${D}/${eclipse_dir}
-
-	rm -rf ${bp}/plugins/org.eclipse.pde.source_3*
-	rm -rf ${bp}/plugins/org.eclipse.jdt.source_3*
-	rm -rf ${bp}/plugins/org.eclipse.platform.source.linux.*
-	rm -rf ${bp}/plugins/org.eclipse.platform.source_3*
-
-	rm -rf ${bp}/features/org.eclipse.jdt.source_3*/
-	rm -rf ${bp}/features/org.eclipse.pde.source_3*/
-	rm -rf ${bp}/features/org.eclipse.platform.source_3*/
-}
-
-function strip-docs() {
-	local bp=${D}/${eclipse_dir}
-
-	rm -rf ${bp}/plugins/org.eclipse.platform.doc.*
-	rm -rf ${bp}/plugins/org.eclipse.jdt.doc.*
-	rm -rf ${bp}/plugins/org.eclipse.pde.doc.*
-}
-
-function check-cflags() {
-
-	einfo "Checking for bad CFLAGS"
-
-	local badflags="-fomit-frame-pointer -msse2"
-	local error=false
-
-	for x in ${badflags} ; do
-		if [ ! -z "$(echo ${CFLAGS} | grep -- $x)" ] ; then
-			ewarn "Found offending option $x 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
-}
-
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.1.2.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.1.2.ebuild
deleted file mode 100644
index b5cf2556af5d..000000000000
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.1.2.ebuild
+++ /dev/null
@@ -1,370 +0,0 @@
-# Copyright 1999-2006 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.ebuild,v 1.1 2006/04/17 14:52:11 centic Exp $
-
-inherit eutils java-utils
-
-MY_A="eclipse-sourceBuild-srcIncluded-3.1.2.zip"
-DESCRIPTION="Eclipse Tools Platform"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/R-3.1.2-200601181600/${MY_A}"
-IUSE="gnome mozilla firefox jikes nosrc nodoc atk"
-SLOT="3.1"
-LICENSE="CPL-1.0"
-KEYWORDS="~x86 ~ppc ~amd64"
-
-RDEPEND=">=virtual/jre-1.4.2
-	>=x11-libs/gtk+-2.2.4
-	mozilla? ( >=www-client/mozilla-1.7 )
-	atk? ( >=dev-libs/atk-1.6 )
-	firefox? ( >=www-client/mozilla-firefox-1.0.2 )
-	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"
-
-# TODO:
-# - use CFLAGS from make.conf when building native libraries
-#   - must patch eclipse build files
-#   - also submit patch to bugs.eclipse
-# - intergration to eclipse plugin ebuilds most likely broken
-# - ppc support not tested, but not explicitly broken either
-
-pkg_setup() {
-
-	einfo "Checking for sufficient physical RAM"
-	check-ram
-	check-cflags
-
-	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 [ ${ARCH} == 'amd64' ] ; then
-		eclipsearch=x86_64
-	else
-		eclipsearch=${ARCH}
-	fi
-
-	# all other gentoo archs match in sun jdk library patch except x86
-	if [ ${ARCH} == 'x86' ] ; then
-		jvmarch=i386
-	else
-		jvmarch=${ARCH}
-	fi
-}
-
-src_unpack() {
-
-	mkdir ${S}
-	cd ${S}
-	unpack ${MY_A} || die "Could not unpack ${MY_A}"
-
-	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"
-	process-makefiles
-
-	patch_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
-
-	${use_gtk} && use mozilla && setup-mozilla-opts
-
-	use jikes && bootstrap_ant_opts="-Dbuild.compiler=jikes"
-
-	einfo "Bootstrapping bootstrap ecj"
-	ant ${bootstrap_ant_opts} -q -f jdtcoresrc/compilejdtcorewithjavac.xml || die "Failed to bootstrap ecj"
-
-	einfo "Bootstrapping ecj"
-	ant -lib jdtcoresrc/ecj.jar -q -f jdtcoresrc/compilejdtcore.xml || die "Failed to bootstrap ecj"
-
-	einfo "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"
-
-	einfo "Creating .desktop entry"
-	create-desktop-entry
-}
-
-src_install() {
-
-	eclipse_dir="/usr/lib/eclipse-${SLOT}"
-
-	dodir /usr/lib
-
-	einfo "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}
-
-	# Install launchers and native code
-	exeinto ${eclipse_dir}
-
-	einfo "Installing eclipse-gtk binary"
-	doexe eclipse-gtk || die "Failed to install eclipse binary"
-
-	if use nosrc ; then
-		einfo "Stripping away source code"
-		strip-src
-	fi
-
-	if use nodoc ; then
-		einfo "Stripping away documentation"
-		strip-docs
-	fi
-
-	# Install startup script
-	exeinto /usr/bin
-	doexe ${FILESDIR}/eclipse-${SLOT}
-
-	install-desktop-entry
-
-	doman ${FILESDIR}/eclipse.1
-
-	install-link-files
-}
-
-# -----------------------------------------------------------------------------
-#  Helper functions
-# -----------------------------------------------------------------------------
-
-function setup-mozilla-opts()
-{
-	mozilla_dir="--mozdir-unset---"
-
-	if [ -f ${ROOT}/usr/lib/MozillaFirefox/libgtkembedmoz.so ] ; then
-		einfo "Compiling against www-client/mozilla-firefox"
-		mozilla_dir=/usr/lib/MozillaFirefox
-	elif [ -f ${ROOT}/usr/lib/mozilla/libgtkembedmoz.so ] ; then
-		einfo "Compiling against www-client/mozilla"
-		mozilla_dir=/usr/lib/mozilla
-	else
-		eerror "You have enabled the embedded mozilla component, but no suitable"
-		eerror "provider was found. You need Mozilla or Firefox 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}"
-	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} -lgtkembedmoz"
-}
-
-function build-native() {
-	sh features/org.eclipse.platform.launchers/library/gtk/build.sh \
-		-os linux -ws gtk \
-		-arch ${eclipsearch} || die "Failed to build launcher"
-}
-
-function process-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 mozilla ; 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"
-}
-
-function create-desktop-entry() {
-
-	cat ${FILESDIR}/eclipse-${SLOT}.desktop | \
-		sed -e "s/@PV@/${PV}/" \
-		> eclipse-${SLOT}.desktop || die "Failed to create desktop entry"
-}
-
-function install-desktop-entry() {
-
-	dodir /usr/share/applications
-	insinto /usr/share/applications
-	doins eclipse-${SLOT}.desktop
-}
-
-function clean-prebuilt-code() {
-
-	find ${S} -type f \( -name '*.class' -o -name '*.so' -o -name '*.so.*' -o -name 'eclipse' \) | xargs rm -f
-}
-
-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 775000 ] &&
-		(
-		echo
-		ewarn "To build Eclipse, at least 768MB of RAM is recommended."
-		ewarn "Your machine has less RAM. Continuing anyway. If the build"
-		ewarn "stops with an error about invalid memory, increase your swap."
-		echo
-		)
-}
-
-function install-link-files() {
-
-	einfo "Installing 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=/opt/eclipse-extensions-3.1" > ${D}/${eclipse_dir}/links/eclipse-binary-extensions-3.1.link
-
-	echo "path=/usr/lib/eclipse-extensions-3" > ${D}/${eclipse_dir}/links/eclipse-extensions-3.link
-	echo "path=/usr/lib/eclipse-extensions-3.1" > ${D}/${eclipse_dir}/links/eclipse-extensions-3.1.link
-}
-
-function patch_amd64_ibm_jvm() {
-	# the ibm jdk ebuild should have fixed headers, but until then
-	# we just fix the compiling here (see bug #97421)
-	if [ ${ARCH} == '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
-}
-
-function 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 JRE
-		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 JREs (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}
-}
-
-function strip-src() {
-
-	local bp=${D}/${eclipse_dir}
-
-	rm -rf ${bp}/plugins/org.eclipse.pde.source_3*
-	rm -rf ${bp}/plugins/org.eclipse.jdt.source_3*
-	rm -rf ${bp}/plugins/org.eclipse.platform.source.linux.*
-	rm -rf ${bp}/plugins/org.eclipse.platform.source_3*
-
-	rm -rf ${bp}/features/org.eclipse.jdt.source_3*/
-	rm -rf ${bp}/features/org.eclipse.pde.source_3*/
-	rm -rf ${bp}/features/org.eclipse.platform.source_3*/
-}
-
-function strip-docs() {
-	local bp=${D}/${eclipse_dir}
-
-	rm -rf ${bp}/plugins/org.eclipse.platform.doc.*
-	rm -rf ${bp}/plugins/org.eclipse.jdt.doc.*
-	rm -rf ${bp}/plugins/org.eclipse.pde.doc.*
-}
-
-function check-cflags() {
-
-	einfo "Checking for bad CFLAGS"
-
-	local badflags="-fomit-frame-pointer -msse2"
-	local error=false
-
-	for x in ${badflags} ; do
-		if [ ! -z "$(echo ${CFLAGS} | grep -- $x)" ] ; then
-			ewarn "Found offending option $x 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
-}
-
diff --git a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.1-r1 b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.1-r1
deleted file mode 100644
index e6f820af5967..000000000000
--- a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 19ad65d52005da5eaa1d3687b3a50de2 eclipse-sourceBuild-srcIncluded-3.1.zip 66241870
-RMD160 ea38b1c8d0933aafcf1286a5c5160e2cffccb6d2 eclipse-sourceBuild-srcIncluded-3.1.zip 66241870
-SHA256 5af7804d1629dbb3e6c8e2809b846966178e2f626d03395cceac488397ee9c79 eclipse-sourceBuild-srcIncluded-3.1.zip 66241870
diff --git a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.1.2 b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.1.2
deleted file mode 100644
index f22ddffd2fd5..000000000000
--- a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.1.2
+++ /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