Pruning old revisions with SLOT='3.1'

(Portage version: 2.1.1_pre2-r2)
 (Unsigned Manifest commit)

5 files changed, 4 insertions, 760 deletions

diff --git a/dev-util/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest
index 129a141aebf8..7ceef858d9bf 100644
--- a/dev-util/eclipse-sdk/Manifest
+++ b/dev-util/eclipse-sdk/Manifest
@@ -53,7 +53,6 @@ SHA256 5165b07f736763eab05decb39397be0be8ae03b77f614ba3794eff71d411537b files/ec
 DIST eclipse-sdk-3.2-patches.tar.bz2 24883 RMD160 a7b5826d8f63a00b4db70cbcec6f179372ed6806 SHA1 49a69e3a4793985ca37a9912c04296976e0b63bb SHA256 0a1db1c111d0188487e6fb7ead77d158e9d8c61e483081b089d1f765bb2dfd56
 DIST eclipse-sourceBuild-srcIncluded-3.0.1.zip 55618511 RMD160 fba01eb0f019a888e9d9deb57ad7b284f218e783 SHA1 2302ee6160be86466a6e7ef265fff0431bee72e3 SHA256 5f6eb496d3db940b1085032a807337dbc477a0da9877a7cea50d39d32dfde050
 DIST eclipse-sourceBuild-srcIncluded-3.0.2.zip 55945573 RMD160 57f0b11c24a8e9982e6d446d14b4782112e5b1a7 SHA1 07324f2aa963e33aea269b89b879fb2d59b354e6 SHA256 0c9e961fbf11d782b0c8c743122e5cc8567f3b06f48f38d6b40a8a78ead567d9
-DIST eclipse-sourceBuild-srcIncluded-3.1.1.zip 66272356 RMD160 8720b278af7119d8915f82219e6843ba5c779f5f SHA1 75a4e47257d0e1d1f6a85d62a4452d1a6071d602 SHA256 d7b3d24e2e9f4b15a4b7ab08ab8c0ebf636acccd3b855dd7ce3242841a16326f
 DIST eclipse-sourceBuild-srcIncluded-3.1.2.zip 66630673 RMD160 ffe59352fe02b4a47be3e9a6daad3a5501f196b0 SHA1 d399232b586e0c6b516f990296a202dcd814404d SHA256 31233332f205a197a42aafdc4f15a4f38eb5e4be19ac8a7192492ab8a21324a4
 DIST eclipse-sourceBuild-srcIncluded-3.2.zip 82018640 RMD160 eadb8c5dde4ebe8b134fb35e6c42d08f52c145a7 SHA1 29ad412bd2778423e77337c034ad0382f9da172a SHA256 e9366fd3046be753f821be786156c472148928101cf6bf8f9d31b455cb6039da
 EBUILD eclipse-sdk-3.0.1-r2.ebuild 14287 RMD160 35f7ff67930ebe4a65ed3520b61bdef3a076d1bd SHA1 f7d549ac924b5f61df8d32117bc1439269df9751 SHA256 b27b0266a767263a5eddf98ab3fb36dbfb6d378d334dedbb189610b7c6b72d25
@@ -64,14 +63,6 @@ EBUILD eclipse-sdk-3.0.2.ebuild 13828 RMD160 0ff8c21197b594fbe05b01506a316990b53
 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
-EBUILD eclipse-sdk-3.1.1.ebuild 10393 RMD160 9b5c6e089102ee34a8fb05a4a8164213065a195e SHA1 afee18007d1175fbaa4e766d9e24caf7305e7594 SHA256 6432c3d38373ad2f472b7a002312a3c64dcb24ab5a4a16dc85cdb39efaa50058
-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
-EBUILD eclipse-sdk-3.1.2-r2.ebuild 10622 RMD160 a2c326ec7581a6043c047c3d6ebe250c01d1a859 SHA1 d42343ad51643a9b16bfd88a374b5a1d5203036a SHA256 915f1c557575b78056cf7f3a1e1c36b5a5453a19b1b0227b3264b599d615fc04
-MD5 e77415dbec316fe321b89e52ec2611a8 eclipse-sdk-3.1.2-r2.ebuild 10622
-RMD160 a2c326ec7581a6043c047c3d6ebe250c01d1a859 eclipse-sdk-3.1.2-r2.ebuild 10622
-SHA256 915f1c557575b78056cf7f3a1e1c36b5a5453a19b1b0227b3264b599d615fc04 eclipse-sdk-3.1.2-r2.ebuild 10622
 EBUILD eclipse-sdk-3.1.2-r3.ebuild 10602 RMD160 a2acd26ab238961dda0e7db667874e55f0d1ad51 SHA1 f0625c165c0ce44f26d580935c60f77ff821b4ca SHA256 b133c1f00538d73171189a019125495c6594d442aae0b0ccdf6463e3a9b73b06
 MD5 ee36b3e067bfcc68ad409accd7537d87 eclipse-sdk-3.1.2-r3.ebuild 10602
 RMD160 a2acd26ab238961dda0e7db667874e55f0d1ad51 eclipse-sdk-3.1.2-r3.ebuild 10602
@@ -80,10 +71,10 @@ EBUILD eclipse-sdk-3.2.ebuild 9467 RMD160 1c5b06efce3b58f57f01d5ccafe433c7bdc756
 MD5 b1c5ef3ae89e8239d89765bd444834e2 eclipse-sdk-3.2.ebuild 9467
 RMD160 1c5b06efce3b58f57f01d5ccafe433c7bdc7561b eclipse-sdk-3.2.ebuild 9467
 SHA256 00c6f86a6f0bd7fd340e8e4ad7948d25b4794cc95899c74c64de91b1370413d2 eclipse-sdk-3.2.ebuild 9467
-MISC ChangeLog 21584 RMD160 31a70867667e659bd896865e61e947b8160344c9 SHA1 8fe0eeb8c7210a84adaf1795f9da2f56dab563d7 SHA256 0d849e81c34c642e280e5eb5be69590d4d5ba5729120be086f891ba2c2c5334a
-MD5 fe73e6ea684bd950f93cad6ad44a8034 ChangeLog 21584
-RMD160 31a70867667e659bd896865e61e947b8160344c9 ChangeLog 21584
-SHA256 0d849e81c34c642e280e5eb5be69590d4d5ba5729120be086f891ba2c2c5334a ChangeLog 21584
+MISC ChangeLog 21736 RMD160 c0f7584e9080b63cb8db2da023f498987c5938e1 SHA1 1f4df5624310ffc8f44903b44bd2b6ccb1d9f8fc SHA256 89c24c547504e63fad5d2bacb387726052095fd2bd0abb6a3f30221e10db8852
+MD5 652444d8d83a90bf68bf67a3c9b4b35e ChangeLog 21736
+RMD160 c0f7584e9080b63cb8db2da023f498987c5938e1 ChangeLog 21736
+SHA256 89c24c547504e63fad5d2bacb387726052095fd2bd0abb6a3f30221e10db8852 ChangeLog 21736
 MISC metadata.xml 782 RMD160 5b8dc4f4b6bdd457da62f967ec176bee2ae7e5e4 SHA1 17bc63605d0a30dca27521cf908a69c0996eab07 SHA256 a1e6bbc5427799b8607d355e3e09ce7d4de98f2a365417ec158eb56f4f00746f
 MD5 8de14dda7d318d8fb514fdbcecd4058b metadata.xml 782
 RMD160 5b8dc4f4b6bdd457da62f967ec176bee2ae7e5e4 metadata.xml 782
@@ -94,12 +85,6 @@ 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 94faa9f764cd8bbf3bf01f16e9e202ec files/digest-eclipse-sdk-3.1.1 310
-RMD160 924ae5bb5b7d708ba631a49d0af8a3b555e857fe files/digest-eclipse-sdk-3.1.1 310
-SHA256 30e8d46419eb5e17e23ab944e03d42adf3a860b9363d299f5618080fe90a2779 files/digest-eclipse-sdk-3.1.1 310
-MD5 0dd05cebf3928888ff566c433da96335 files/digest-eclipse-sdk-3.1.2-r2 310
-RMD160 dea902b88d52673c42f034ab9451e145bc52b30c files/digest-eclipse-sdk-3.1.2-r2 310
-SHA256 01187ce1cad8c9037d48c130cd9d98167d7c934e075d42c7c55f3adae8105749 files/digest-eclipse-sdk-3.1.2-r2 310
 MD5 0dd05cebf3928888ff566c433da96335 files/digest-eclipse-sdk-3.1.2-r3 310
 RMD160 dea902b88d52673c42f034ab9451e145bc52b30c files/digest-eclipse-sdk-3.1.2-r3 310
 SHA256 01187ce1cad8c9037d48c130cd9d98167d7c934e075d42c7c55f3adae8105749 files/digest-eclipse-sdk-3.1.2-r3 310
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.1.1.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.1.1.ebuild
deleted file mode 100644
index 2a7804deaa60..000000000000
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.1.1.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.1.ebuild,v 1.1 2005/11/09 19:00:28 axxo Exp $
-
-inherit eutils java-utils
-
-MY_A="eclipse-sourceBuild-srcIncluded-3.1.1.zip"
-DESCRIPTION="Eclipse Tools Platform"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/R-3.1.1-200509290840/${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/eclipse-sdk-3.1.2-r2.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.1.2-r2.ebuild
deleted file mode 100644
index 98ce6a2e23f0..000000000000
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.1.2-r2.ebuild
+++ /dev/null
@@ -1,365 +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-r2.ebuild,v 1.2 2006/07/06 02:50:04 nichoj 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="nogecko-sdk 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
-	!nogecko-sdk? ( net-libs/gecko-sdk )
-	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() {
-	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/digest-eclipse-sdk-3.1.1 b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.1.1
deleted file mode 100644
index 27390f57ede8..000000000000
--- a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.1.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0d78d5f8afe767014a1cc69ee8c20869 eclipse-sourceBuild-srcIncluded-3.1.1.zip 66272356
-RMD160 8720b278af7119d8915f82219e6843ba5c779f5f eclipse-sourceBuild-srcIncluded-3.1.1.zip 66272356
-SHA256 d7b3d24e2e9f4b15a4b7ab08ab8c0ebf636acccd3b855dd7ce3242841a16326f eclipse-sourceBuild-srcIncluded-3.1.1.zip 66272356
diff --git a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.1.2-r2 b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.1.2-r2
deleted file mode 100644
index f22ddffd2fd5..000000000000
--- a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.1.2-r2
+++ /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