Cleanup.

Package-Manager: portage-2.1.2.4

6 files changed, 12 insertions, 634 deletions

diff --git a/dev-util/eclipse-sdk/ChangeLog b/dev-util/eclipse-sdk/ChangeLog
index 557a7ac02ca2..dd38aac73c2d 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.125 2007/04/19 21:26:03 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.126 2007/04/25 15:56:42 betelgeuse Exp $
+
+  25 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
+  -eclipse-sdk-3.2.ebuild, -eclipse-sdk-3.2.1.ebuild:
+  Cleanup.
 
   19 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
   files/digest-eclipse-sdk-3.1.2-r3, Manifest:
diff --git a/dev-util/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest
index 8bb173648785..e3bc53ce7783 100644
--- a/dev-util/eclipse-sdk/Manifest
+++ b/dev-util/eclipse-sdk/Manifest
@@ -53,14 +53,11 @@ AUX eclipse.1 2607 RMD160 06aaeb02a7c7720c8d8b26d9d1252095b6098a25 SHA1 c00e2916
 MD5 32be5292ce0af7ff9c1866c1f59e1859 files/eclipse.1 2607
 RMD160 06aaeb02a7c7720c8d8b26d9d1252095b6098a25 files/eclipse.1 2607
 SHA256 5165b07f736763eab05decb39397be0be8ae03b77f614ba3794eff71d411537b files/eclipse.1 2607
-DIST eclipse-sdk-3.2-patches.tar.bz2 24883 RMD160 a7b5826d8f63a00b4db70cbcec6f179372ed6806 SHA1 49a69e3a4793985ca37a9912c04296976e0b63bb SHA256 0a1db1c111d0188487e6fb7ead77d158e9d8c61e483081b089d1f765bb2dfd56
-DIST eclipse-sdk-3.2.1-patches.tar.bz2 24267 RMD160 b3ee64e3079ed6076d1f75db9ee70535a581854f SHA1 4789c28e2c5199ec15023f9f481649f13093b8bf SHA256 5617ec70e7225ef935f81f95a9a4992b4ef40f74cdc379cfd4b93cbeefa1f127
 DIST eclipse-sdk-3.2.1-r1-patches.tar.bz2 85951 RMD160 55a0f98229feb47d936acbcdcf7ad42074ebdb5c SHA1 4af81d8615dbfbd771136c441ee8a7b53096b468 SHA256 fa9f8d047d8375ab55eaca12c110bd9faf9eb5452af2a70d038afd5a6b4b5171
 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.2.zip 66630673 RMD160 ffe59352fe02b4a47be3e9a6daad3a5501f196b0 SHA1 d399232b586e0c6b516f990296a202dcd814404d SHA256 31233332f205a197a42aafdc4f15a4f38eb5e4be19ac8a7192492ab8a21324a4
 DIST eclipse-sourceBuild-srcIncluded-3.2.1.zip 82433420 RMD160 9648176b79adac7217371e5b8dee7aeb4cd458db SHA1 a27bae4ff9f866a1fab995eae2da00ab2be5e840 SHA256 2d6a0628333d068b6ab678c42f925d71df1c003035543830a30e3ee80fb855c7
-DIST eclipse-sourceBuild-srcIncluded-3.2.zip 82018640 RMD160 eadb8c5dde4ebe8b134fb35e6c42d08f52c145a7 SHA1 29ad412bd2778423e77337c034ad0382f9da172a SHA256 e9366fd3046be753f821be786156c472148928101cf6bf8f9d31b455cb6039da
 EBUILD eclipse-sdk-3.0.1-r3.ebuild 12995 RMD160 b2579a56e287bc9e51f1888b55f72c36130f6cc2 SHA1 c0f4f3ecdcceba3d581f4eea5422e97d1cb182de SHA256 cb87495cf4a2b3b322fb72513d5feaf7ff7b1ccc1165db8b4b3b9329d783aa00
 MD5 090fdc3ad041a19be452087de41ac65b eclipse-sdk-3.0.1-r3.ebuild 12995
 RMD160 b2579a56e287bc9e51f1888b55f72c36130f6cc2 eclipse-sdk-3.0.1-r3.ebuild 12995
@@ -77,18 +74,10 @@ EBUILD eclipse-sdk-3.2.1-r1.ebuild 12677 RMD160 fd2c497e15af30883bc3bfab260fcd63
 MD5 5f975f6962eff2a13ecb0c38711af98a eclipse-sdk-3.2.1-r1.ebuild 12677
 RMD160 fd2c497e15af30883bc3bfab260fcd6344023647 eclipse-sdk-3.2.1-r1.ebuild 12677
 SHA256 c47ca38c9a3196a5c3a7b90a27262cab842e6caec6e6d21cbbda13c5e183a868 eclipse-sdk-3.2.1-r1.ebuild 12677
-EBUILD eclipse-sdk-3.2.1.ebuild 8990 RMD160 2fd6d259baa1fc481cb2173b51b4dd5fcb7f15f6 SHA1 a8640a781778819c92e0a2eecdc9393702bd8934 SHA256 2ee87362a5f450c1cbfc09cfdcec10a4c085e4898f42fa6bbe2cc65c611f8ed3
-MD5 308022f67affd29ec82c64f56ec683a1 eclipse-sdk-3.2.1.ebuild 8990
-RMD160 2fd6d259baa1fc481cb2173b51b4dd5fcb7f15f6 eclipse-sdk-3.2.1.ebuild 8990
-SHA256 2ee87362a5f450c1cbfc09cfdcec10a4c085e4898f42fa6bbe2cc65c611f8ed3 eclipse-sdk-3.2.1.ebuild 8990
-EBUILD eclipse-sdk-3.2.ebuild 9462 RMD160 4ead1bab19b1bb427c3b1a6499dc373992046fb6 SHA1 7e52075dfecd28dd47c8b7fdda97c6db2bc1d2a7 SHA256 89ae0857c07f20bacc8a781d6c71da74bc75054012d57ebff1deb8e39ffbf3ae
-MD5 743dde7667111ec099b47bcd726959db eclipse-sdk-3.2.ebuild 9462
-RMD160 4ead1bab19b1bb427c3b1a6499dc373992046fb6 eclipse-sdk-3.2.ebuild 9462
-SHA256 89ae0857c07f20bacc8a781d6c71da74bc75054012d57ebff1deb8e39ffbf3ae eclipse-sdk-3.2.ebuild 9462
-MISC ChangeLog 23997 RMD160 aecf93c2a1063023b10c288bd71d75f82b459106 SHA1 52ba4a8fb1b23dd66ddcf8044795dc4be807b58c SHA256 6e19baee45bd176a91e5cb9cc93481af68f3cdecd92da6d2e73813b42b19df1d
-MD5 2ee7a6ca54a1fb1514f687108ba745f1 ChangeLog 23997
-RMD160 aecf93c2a1063023b10c288bd71d75f82b459106 ChangeLog 23997
-SHA256 6e19baee45bd176a91e5cb9cc93481af68f3cdecd92da6d2e73813b42b19df1d ChangeLog 23997
+MISC ChangeLog 24116 RMD160 772f473d1f71cda0fa9c7b4176a736d112f32923 SHA1 901f9cd22793dfec37f8862b3ef2c005c0dc2cfe SHA256 a7a19efa121609225a949244dd0cd9de446305dad14b6c0a24bfde9fc8d9b0c5
+MD5 0952d64c4275dd32a02403381c24e1c5 ChangeLog 24116
+RMD160 772f473d1f71cda0fa9c7b4176a736d112f32923 ChangeLog 24116
+SHA256 a7a19efa121609225a949244dd0cd9de446305dad14b6c0a24bfde9fc8d9b0c5 ChangeLog 24116
 MISC metadata.xml 800 RMD160 f97cc4ac78898369a7706331bb14bc838519cf21 SHA1 21cd52a15acb6510aa3b955f78fb28a73cf58234 SHA256 76e243573c28c3d705f54745cfbcedd85dae3233b6ed00e2f81a61ac9caeeeaa
 MD5 b6f0d37527da7caa081271b008f06f96 metadata.xml 800
 RMD160 f97cc4ac78898369a7706331bb14bc838519cf21 metadata.xml 800
@@ -102,19 +91,13 @@ SHA256 da189a7c7ddd6b1661391f5e149d905d79779d4863502d4b769216b19a5fed42 files/di
 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
-MD5 605794882dbb6032b2578f53103784e1 files/digest-eclipse-sdk-3.2 575
-RMD160 5b3897188894935f13640cd9fe8cad7346fab3ae files/digest-eclipse-sdk-3.2 575
-SHA256 9665c3d9e6f1eb99cb6bd255d70ec40f1a7d16aa720bb376e2079c97850da568 files/digest-eclipse-sdk-3.2 575
-MD5 170cc52a6e0d3a9b358903fe71be00e1 files/digest-eclipse-sdk-3.2.1 587
-RMD160 16edd5a1504b7d70f6048a03e7f6c64bf6d57349 files/digest-eclipse-sdk-3.2.1 587
-SHA256 f6dfe941dfe74e72e6a39c2f00dc1572f0d7851e796de4fcc6f1f7b49fe9c848 files/digest-eclipse-sdk-3.2.1 587
 MD5 2364957019ebba24ca9af9631f7a86c8 files/digest-eclipse-sdk-3.2.1-r1 596
 RMD160 130025e444efc3a79b198baa4b673b49b117400f files/digest-eclipse-sdk-3.2.1-r1 596
 SHA256 da442cfe724dbdf31b936830117b876bff94378e5bbb0e1162d12ce590de0e82 files/digest-eclipse-sdk-3.2.1-r1 596
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGJ954cxLzpIGCsLQRAp4xAJ4gsagtrxy5WZQAvs3PncU1yebL+QCeKwLj
-wlkYc/63vdK4UOhP2vlom4I=
-=FPZH
+iD8DBQFGL3pFcxLzpIGCsLQRApG/AJ9QTD4AZuehgnZn0VH4j/ObKQULwQCfcKU5
+6/prSaFHr3VNURBd5Eb5/3E=
+=BHEQ
 -----END PGP SIGNATURE-----
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.2.1.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.2.1.ebuild
deleted file mode 100644
index 880254b4d280..000000000000
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.2.1.ebuild
+++ /dev/null
@@ -1,293 +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.2.1.ebuild,v 1.2 2007/01/29 18:44:37 betelgeuse Exp $
-
-inherit eutils java-pkg-2 flag-o-matic check-reqs multilib
-
-DATESTAMP="200609210945"
-MY_A="eclipse-sourceBuild-srcIncluded-${PV}.zip"
-DESCRIPTION="Eclipse Tools Platform"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/R-${PV}-${DATESTAMP}/${MY_A}
-mirror://gentoo/${P}-patches.tar.bz2"
-IUSE="seamonkey gnome cairo opengl"
-SLOT="3.2"
-LICENSE="EPL-1.0"
-# TODO might be able to have ia64 and ppc64 support
-KEYWORDS="~x86 ~ppc ~amd64"
-S="${WORKDIR}"
-
-COMMON_DEP="
-	>=x11-libs/gtk+-2.2.4
-	seamonkey? ( www-client/seamonkey )
-	gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* )
-	opengl? ( virtual/opengl )
-	>=dev-java/ant-core-1.6.5
-	>=dev-java/ant-tasks-1.6.5
-	=dev-java/lucene-1*"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND="
-	${COMMON_DEP}
-	=virtual/jdk-1.4*
-	>=virtual/jdk-1.5
-	>=sys-apps/findutils-4.1.7
-	app-arch/unzip
-	app-arch/zip"
-# Force 1.4 to be used for building
-JAVA_PKG_NV_DEPEND="=virtual/jdk-1.4*"
-
-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
-# - update man page
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	debug-print "Checking for sufficient physical RAM"
-	CHECKREQS_MEMORY="768"
-	check_reqs
-
-	# All other gentoo archs match in eclipse build system except amd64
-	if use amd64 ; then
-		eclipsearch=x86_64
-	else
-		eclipsearch=${ARCH}
-	fi
-
-	if use x86 ; then
-		jvmarch=i386
-	else
-		jvmarch=${ARCH}
-	fi
-
-	# Add the eclipse group, for our plugins/features directories
-	enewgroup eclipse
-}
-
-src_unpack() {
-	unpack ${A}
-
-	fix-swt-targets
-
-	pushd plugins/org.apache.ant/lib >/dev/null
-	rm *.jar
-	java-pkg_jar-from ant-core,ant-tasks
-	popd >/dev/null
-
-	pushd plugins/org.junit >/dev/null
-	rm *.jar
-	java-pkg_jar-from junit
-	popd >/dev/null
-
-	pushd plugins/org.apache.lucene >/dev/null
-	rm *.jar
-	java-pkg_jar-from lucene-1 lucene.jar lucene-1.4.3.jar
-	popd >/dev/null
-
-	# TODO replace stuff in plugins/org.eclipse.team.cvs.ssh2
-	# TODO replace stuff in plugins/org.eclipse.tomcat
-	# TODO replace stuff in plugins/org.junit4
-
-	# begin: patches/comments from fedora
-
-	# Build JNI libs
-	# FIXME:  these should be built by upstream build method
-	# http://www.bagu.org/eclipse/plugin-source-drops.html
-	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=71637
-	# GNU XML issue identified by Michael Koch
-	# patches 2, 4, 5
-	epatch ${WORKDIR}/${P}-build.patch
-	epatch ${WORKDIR}/${P}-libupdatebuild.patch
-	epatch ${WORKDIR}/${P}-libupdatebuild2.patch
-
-	# Build swttools.jar
-	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90364
-	pushd plugins/org.eclipse.swt.gtk.linux.x86_64 >/dev/null
-	epatch ${WORKDIR}/${P}-swttools.patch # patch18
-	popd >/dev/null
-
-	# install location should automatically be added to homedir
-	# if ECLIPSE_HOME is not writable
-	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90630
-	epatch ${WORKDIR}/${P}-updatehomedir.patch # patch22
-
-	# .so files installed in a strange location
-	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90535
-	pushd plugins/org.eclipse.core.runtime >/dev/null
-	epatch ${WORKDIR}/${P}-fileinitializer.patch # patch24
-	popd >/dev/null
-
-	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=98707
-	# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=178726
-# TODO figure out why this doesn't apply
-#	pushd plugins/org.eclipse.compare >/dev/null
-#	epatch ${WORKDIR}/${P}-compare-create-api.patch # patch 33
-#	popd >/dev/null
-
-	# JPackage []s in names of symlinks ...
-	# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=162177
-	pushd plugins/org.eclipse.jdt.core >/dev/null
-	epatch ${WORKDIR}/${P}-bz162177.patch # patch34
-	popd >/dev/null
-
-	epatch ${WORKDIR}/${P}-genjavadocoutput.patch # patch35
-
-	epatch ${WORKDIR}/${P}-usebuiltlauncher.patch # patch40
-
-	# Eclipse launcher does not follow symlinks
-	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=79592
-	# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=168726
-	mkdir launchertmp
-	unzip -d launchertmp \
-		plugins/org.eclipse.platform/launchersrc.zip >/dev/null || die "unzip failed"
-	pushd launchertmp >/dev/null
-	epatch ${WORKDIR}/${P}-launcher-link.patch # patch47
-	zip -9 -r ../launchersrc.zip * >/dev/null || die "zip failed"
-	popd >/dev/null
-	mv launchersrc.zip plugins/org.eclipse.platform
-	rm -rf launchertmp
-
-	pushd features/org.eclipse.platform.launchers >/dev/null
-	epatch ${WORKDIR}/${P}-launcher-link.patch # patch47
-	popd >/dev/null
-
-	# Don't attempt to link to Sun's javadocs
-	epatch ${WORKDIR}/${P}-javadoclinks.patch # patch48
-
-	# generic releng plugins that can be used to build plugins
-	# see this thread for deails:
-	# https://www.redhat.com/archives/fedora-devel-java-list/2006-April/msg00048.html
-	pushd plugins/org.eclipse.pde.build >/dev/null
-	epatch ${WORKDIR}/${P}-pde.build-add-package-build.patch # patch53
-	sed --in-place "s:@eclipse_base@:${ECLIPSE_DIR}:" templates/package-build/build.properties
-	popd >/dev/null
-
-	# We need to disable junit4 and apt until GCJ can handle Java5 code
-	# FIXME for some reason junit isn't using java5...
-	epatch ${WORKDIR}/${P}-disable-junit4-apt.patch # patch55
-}
-
-src_compile() {
-	# Figure out VM, set up ant classpath and native library paths
-	setup-jvm-opts
-
-	if use seamonkey ; then
-		einfo "Will compile embedded seamonkey support against www-client/seamonkey"
-		setup-mozilla-opts
-	else
-		einfo "Not building embedded seamonkey support"
-	fi
-
-	local java5vm=$(depend-java-query --get-vm ">=virtual/jdk-1.5")
-	local java5home=$(GENTOO_VM=${java5vm} java-config --jdk-home)
-	einfo "Using ${java5home} for java5home"
-	# TODO patch build to take buildId
-	./build -os linux \
-		-arch ${eclipsearch} \
-		-ws gtk \
-		-java5home ${java5home} || die "build failed"
-}
-
-src_install() {
-	dodir /usr/lib
-
-	# TODO maybe there's a better way of installing than extracting the tar?
-	[[ -f result/linux-gtk-${eclipsearch}-sdk.tar.gz ]] || die "tar.gz bundle was not built properly!"
-	tar zxf result/linux-gtk-${eclipsearch}-sdk.tar.gz -C ${D}/usr/lib \
-		|| die "Failed to extract the built package"
-
-	mv ${D}/usr/lib/eclipse ${D}/${ECLIPSE_DIR}
-	insinto ${ECLIPSE_DIR}
-	exeinto ${ECLIPSE_DIR}
-	echo "-Djava.library.path=/usr/lib" >> ${D}/${ECLIPSE_DIR}/eclipse.ini
-
-	debug-print "Installing eclipse-gtk binary"
-	doexe eclipse || die "Failed to install eclipse binary"
-
-	# Install startup script
-	exeinto /usr/bin
-	doexe ${FILESDIR}/eclipse-${SLOT}
-
-	make_desktop_entry eclipse-${SLOT} "Eclipse ${PV}" "${ECLIPSE_DIR}/icon.xpm"
-}
-
-# -----------------------------------------------------------------------------
-#  Helper functions
-# -----------------------------------------------------------------------------
-
-fix-swt-targets() {
-	# Select the set of native libraries to compile
-	local targets="make_swt make_awt make_atk"
-
-	if use gnome ; then
-		einfo "Enabling GNOME VFS support"
-		targets="${targets} make_gnome"
-	fi
-
-	if use seamonkey ; then
-		einfo "Enabling embedded Mozilla support"
-		targets="${targets} make_mozilla"
-	fi
-
-	if use cairo ; then
-		einfo "Enabling CAIRO support"
-		targets="${targets} make_cairo"
-	fi
-
-	if use opengl ; then
-		einfo "Enabling OpenGL support"
-		targets="${targets} make_glx"
-	fi
-
-	sed -i "s/^all:.*/all: ${targets}/" \
-		"plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak" \
-		|| die "Failed to tweak make_linux.mak"
-}
-
-setup-jvm-opts() {
-	# Figure out correct boot classpath
-	# karltk: this should be handled by the java-pkg eclass in setup-vm
-	local bp="$(java-config --jdk-home)/jre/lib"
-	local bootclasspath=$(java-config --runtime)
-	if [[ ! -z "`java-config --java-version | grep IBM`" ]] ; then
-		# IBM JDK
-		JAVA_LIB_DIR="$(java-config --jdk-home)/jre/bin"
-	else
-		# Sun derived JDKs (Blackdown, Sun)
-		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() {
-	export GECKO_SDK="/usr/$(get_libdir)/seamonkey"
-	# TODO should this be using pkg-config?
-	export GECKO_INCLUDES=$(pkg-config seamonkey-gtkmozembed --cflags)
-	export GECKO_LIBS=$(pkg-config seamonkey-gtkmozembed --libs)
-}
-
-pkg_postinst() {
-	einfo "Users can now install plugins via Update Manager without any"
-	einfo "tweaking."
-	echo
-	einfo "Eclipse plugin packages (ie eclipse-cdt) will likely go away in"
-	einfo "the near future until they can be properly packaged. Update Manager"
-	einfo "is prefered in the meantime."
-}
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.2.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.2.ebuild
deleted file mode 100644
index 474df6f85d9b..000000000000
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.2.ebuild
+++ /dev/null
@@ -1,304 +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.2.ebuild,v 1.3 2007/02/05 10:59:47 opfer Exp $
-
-inherit eutils java-pkg-2 flag-o-matic check-reqs multilib
-
-DATESTAMP="200606291905"
-MY_A="eclipse-sourceBuild-srcIncluded-${PV}.zip"
-DESCRIPTION="Eclipse Tools Platform"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/R-${PV}-${DATESTAMP}/${MY_A}
-mirror://gentoo/${P}-patches.tar.bz2"
-IUSE="no-seamonkey gnome cairo opengl"
-SLOT="3.2"
-LICENSE="EPL-1.0"
-# TODO might be able to have ia64 and ppc64 support
-KEYWORDS="~amd64 ~ppc x86"
-S="${WORKDIR}"
-
-COMMON_DEP="
-	>=x11-libs/gtk+-2.2.4
-	!no-seamonkey? ( www-client/seamonkey )
-	gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* )
-	opengl? ( virtual/opengl )
-	>=dev-java/ant-core-1.6.5
-	>=dev-java/ant-tasks-1.6.5
-	=dev-java/lucene-1*"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND="
-	${COMMON_DEP}
-	=virtual/jdk-1.4*
-	>=virtual/jdk-1.5
-	>=sys-apps/findutils-4.1.7
-	app-arch/unzip
-	app-arch/zip"
-# Force 1.4 to be used for building
-JAVA_PKG_NV_DEPEND="=virtual/jdk-1.4*"
-
-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
-# - update man page
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	debug-print "Checking for sufficient physical RAM"
-	CHECKREQS_MEMORY="768"
-	check_reqs
-
-	# All other gentoo archs match in eclipse build system except amd64
-	if use amd64 ; then
-		eclipsearch=x86_64
-	else
-		eclipsearch=${ARCH}
-	fi
-
-	if use x86 ; then
-		jvmarch=i386
-	else
-		jvmarch=${ARCH}
-	fi
-
-	# Add the eclipse group, for our plugins/features directories
-	enewgroup eclipse
-}
-
-src_unpack() {
-	unpack ${A}
-
-	fix-swt-targets
-
-	pushd plugins/org.apache.ant/lib >/dev/null
-	rm *.jar
-	java-pkg_jar-from ant-core,ant-tasks
-	popd >/dev/null
-
-	pushd plugins/org.junit >/dev/null
-	rm *.jar
-	java-pkg_jar-from junit
-	popd >/dev/null
-
-	pushd plugins/org.apache.lucene >/dev/null
-	rm *.jar
-	java-pkg_jar-from lucene-1 lucene.jar lucene-1.4.3.jar
-	popd >/dev/null
-
-	# TODO replace stuff in plugins/org.eclipse.team.cvs.ssh2
-	# TODO replace stuff in plugins/org.eclipse.tomcat
-	# TODO replace stuff in plugins/org.junit4
-
-	# begin: patches/comments from fedora
-
-	# Build JNI libs
-	# FIXME:  these should be built by upstream build method
-	# http://www.bagu.org/eclipse/plugin-source-drops.html
-	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=71637
-	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=86848
-	# GNU XML issue identified by Michael Koch
-	# patches 2, 4, 5
-	epatch ${WORKDIR}/${P}-build.patch
-	epatch ${WORKDIR}/${P}-libupdatebuild.patch
-	epatch ${WORKDIR}/${P}-libupdatebuild2.patch
-
-	# Build swttools.jar
-	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90364
-	pushd plugins/org.eclipse.swt.gtk.linux.x86_64 >/dev/null
-	epatch ${WORKDIR}/${P}-swttools.patch # patch18
-	popd >/dev/null
-
-	# install location should automatically be added to homedir
-	# if ECLIPSE_HOME is not writable
-	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90630
-	epatch ${WORKDIR}/${P}-updatehomedir.patch # patch22
-
-	# .so files installed in a strange location
-	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90535
-	pushd plugins/org.eclipse.core.runtime >/dev/null
-	epatch ${WORKDIR}/${P}-fileinitializer.patch # patch24
-	popd >/dev/null
-
-	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=98707
-	# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=178726
-# TODO figure out why this doesn't apply
-#	pushd plugins/org.eclipse.compare >/dev/null
-#	epatch ${WORKDIR}/${P}-compare-create-api.patch # patch 33
-#	popd >/dev/null
-
-	# JPackage []s in names of symlinks ...
-	# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=162177
-	pushd plugins/org.eclipse.jdt.core >/dev/null
-	epatch ${WORKDIR}/${P}-bz162177.patch # patch34
-	popd >/dev/null
-
-	epatch ${WORKDIR}/${P}-genjavadocoutput.patch # patch35
-
-	# buildHelpIndex caused a OutOfMemoryException
-	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=114001
-	epatch ${WORKDIR}/${P}-helpindexbuilder.patch # patch38
-
-	epatch ${WORKDIR}/${P}-usebuiltlauncher.patch # patch40
-
-	# Eclipse launcher does not follow symlinks
-	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=79592
-	# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=168726
-	mkdir launchertmp
-	unzip -d launchertmp \
-		plugins/org.eclipse.platform/launchersrc.zip >/dev/null || die "unzip failed"
-	pushd launchertmp >/dev/null
-	epatch ${WORKDIR}/${P}-launcher-link.patch # patch47
-	zip -9 -r ../launchersrc.zip * >/dev/null || die "zip failed"
-	popd >/dev/null
-	mv launchersrc.zip plugins/org.eclipse.platform
-	rm -rf launchertmp
-
-	pushd features/org.eclipse.platform.launchers >/dev/null
-	epatch ${WORKDIR}/${P}-launcher-link.patch # patch47
-	popd >/dev/null
-
-	# Don't attempt to link to Sun's javadocs
-	epatch ${WORKDIR}/${P}-javadoclinks.patch # patch48
-
-	# generic releng plugins that can be used to build plugins
-	# see this thread for deails:
-	# https://www.redhat.com/archives/fedora-devel-java-list/2006-April/msg00048.html
-	pushd plugins/org.eclipse.pde.build >/dev/null
-	epatch ${WORKDIR}/${P}-pde.build-add-package-build.patch # patch53
-	sed --in-place "s:@eclipse_base@:${ECLIPSE_DIR}:" templates/package-build/build.properties
-	popd >/dev/null
-
-	# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=191536
-	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=142861
-	pushd plugins/org.eclipse.swt/Eclipse\ SWT >/dev/null
-	epatch ${WORKDIR}/${P}-swt-rm-ON_TOP.patch # patch54
-	popd >/dev/null
-
-	# We need to disable junit4 and apt until GCJ can handle Java5 code
-	# FIXME for some reason junit isn't using java5...
-	epatch ${WORKDIR}/${P}-disable-junit4-apt.patch # patch55
-}
-
-src_compile() {
-	# Figure out VM, set up ant classpath and native library paths
-	setup-jvm-opts
-
-	if ! use no-seamonkey ; then
-		einfo "Will compile embedded seamonkey support against www-client/seamonkey"
-		setup-mozilla-opts
-	else
-		einfo "Not building embedded seamonkey support"
-	fi
-
-	local java5vm=$(depend-java-query --get-vm ">=virtual/jdk-1.5")
-	local java5home=$(GENTOO_VM=${java5vm} java-config --jdk-home)
-	einfo "Using ${java5home} for java5home"
-	# TODO patch build to take buildId
-	./build -os linux \
-		-arch ${eclipsearch} \
-		-ws gtk \
-		-java5home ${java5home} || die "build failed"
-}
-
-src_install() {
-	dodir /usr/lib
-
-	# TODO maybe there's a better way of installing than extracting the tar?
-	[[ -f result/linux-gtk-${eclipsearch}-sdk.tar.gz ]] || die "tar.gz bundle was not built properly!"
-	tar zxf result/linux-gtk-${eclipsearch}-sdk.tar.gz -C ${D}/usr/lib \
-		|| die "Failed to extract the built package"
-
-	mv ${D}/usr/lib/eclipse ${D}/${ECLIPSE_DIR}
-	insinto ${ECLIPSE_DIR}
-	exeinto ${ECLIPSE_DIR}
-	echo "-Djava.library.path=/usr/lib" >> ${D}/${ECLIPSE_DIR}/eclipse.ini
-
-	debug-print "Installing eclipse-gtk binary"
-	doexe eclipse || die "Failed to install eclipse binary"
-
-	# Install startup script
-	exeinto /usr/bin
-	doexe ${FILESDIR}/eclipse-${SLOT}
-
-	make_desktop_entry eclipse-${SLOT} "Eclipse ${PV}" "${ECLIPSE_DIR}/icon.xpm"
-}
-
-# -----------------------------------------------------------------------------
-#  Helper functions
-# -----------------------------------------------------------------------------
-
-fix-swt-targets() {
-	# Select the set of native libraries to compile
-	local targets="make_swt make_awt make_atk"
-
-	if use gnome ; then
-		einfo "Enabling GNOME VFS support"
-		targets="${targets} make_gnome"
-	fi
-
-	if ! use no-seamonkey ; then
-		einfo "Enabling embedded Mozilla support"
-		targets="${targets} make_mozilla"
-	fi
-
-	if use cairo ; then
-		einfo "Enabling CAIRO support"
-		targets="${targets} make_cairo"
-	fi
-
-	if use opengl ; then
-		einfo "Enabling OpenGL support"
-		targets="${targets} make_glx"
-	fi
-
-	sed -i "s/^all:.*/all: ${targets}/" \
-		"plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak" \
-		|| die "Failed to tweak make_linux.mak"
-}
-
-setup-jvm-opts() {
-	# Figure out correct boot classpath
-	# karltk: this should be handled by the java-pkg eclass in setup-vm
-	local bp="$(java-config --jdk-home)/jre/lib"
-	local bootclasspath=$(java-config --runtime)
-	if [[ ! -z "`java-config --java-version | grep IBM`" ]] ; then
-		# IBM JDK
-		JAVA_LIB_DIR="$(java-config --jdk-home)/jre/bin"
-	else
-		# Sun derived JDKs (Blackdown, Sun)
-		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() {
-	export GECKO_SDK="/usr/$(get_libdir)/seamonkey"
-	# TODO should this be using pkg-config?
-	export GECKO_INCLUDES=$(pkg-config seamonkey-gtkmozembed --cflags)
-	export GECKO_LIBS=$(pkg-config seamonkey-gtkmozembed --libs)
-}
-
-pkg_postinst() {
-	einfo "Users can now install plugins via Update Manager without any"
-	einfo "tweaking."
-	echo
-	einfo "Eclipse plugin packages (ie eclipse-cdt) will likely go away in"
-	einfo "the near future until they can be properly packaged. Update Manager"
-	einfo "is prefered in the meantime."
-}
diff --git a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.2 b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.2
deleted file mode 100644
index 173d7da147b7..000000000000
--- a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 14b0ca859138e648d404a781b7e4acd7 eclipse-sdk-3.2-patches.tar.bz2 24883
-RMD160 a7b5826d8f63a00b4db70cbcec6f179372ed6806 eclipse-sdk-3.2-patches.tar.bz2 24883
-SHA256 0a1db1c111d0188487e6fb7ead77d158e9d8c61e483081b089d1f765bb2dfd56 eclipse-sdk-3.2-patches.tar.bz2 24883
-MD5 67b41802092d4b2f779fb756dcaec85c eclipse-sourceBuild-srcIncluded-3.2.zip 82018640
-RMD160 eadb8c5dde4ebe8b134fb35e6c42d08f52c145a7 eclipse-sourceBuild-srcIncluded-3.2.zip 82018640
-SHA256 e9366fd3046be753f821be786156c472148928101cf6bf8f9d31b455cb6039da eclipse-sourceBuild-srcIncluded-3.2.zip 82018640
diff --git a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.2.1 b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.2.1
deleted file mode 100644
index 9961a8464a46..000000000000
--- a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.2.1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 ac8ed24b593bd49b20bf0b7b0938cd57 eclipse-sdk-3.2.1-patches.tar.bz2 24267
-RMD160 b3ee64e3079ed6076d1f75db9ee70535a581854f eclipse-sdk-3.2.1-patches.tar.bz2 24267
-SHA256 5617ec70e7225ef935f81f95a9a4992b4ef40f74cdc379cfd4b93cbeefa1f127 eclipse-sdk-3.2.1-patches.tar.bz2 24267
-MD5 0fe89e9c7cf07a56c4fe8e2d7f5a394b eclipse-sourceBuild-srcIncluded-3.2.1.zip 82433420
-RMD160 9648176b79adac7217371e5b8dee7aeb4cd458db eclipse-sourceBuild-srcIncluded-3.2.1.zip 82433420
-SHA256 2d6a0628333d068b6ab678c42f925d71df1c003035543830a30e3ee80fb855c7 eclipse-sourceBuild-srcIncluded-3.2.1.zip 82433420