Eclipse-3.4 now requires JDK-1.6.

(Portage version: 2.1.6.13/cvs/Linux i686)

5 files changed, 4 insertions, 1389 deletions

diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.2.1-r2.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.2.1-r2.ebuild
deleted file mode 100644
index 2f2277c4bc1a..000000000000
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.2.1-r2.ebuild
+++ /dev/null
@@ -1,409 +0,0 @@
-# Copyright 1999-2009 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-r2.ebuild,v 1.9 2009/03/15 00:24:02 betelgeuse Exp $
-
-EAPI=1
-
-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}-r1-patches.tar.bz2"
-IUSE="branding cairo gnome opengl seamonkey "
-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/libX11
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=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-1.7.0
-	=dev-java/junit-3*
-	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
-	x11-proto/xextproto
-	x11-proto/inputproto
-	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 >/dev/null || die "pushd failed"
-	rm -rf lib
-	ln -s /usr/share/ant/lib lib
-	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
-	# For some reason popd above fails to go back to workdir.
-	# ^Was caused by the three argument form of java-pkg_jar-from
-	# that Caster recently broke in the eclass. The cd here does not
-	# hurt and I like these comments.
-	# https://bugs.gentoo.org/show_bug.cgi?id=163969
-	cd "${WORKDIR}"
-	apply-patchset
-}
-
-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}
-	echo "-Djava.library.path=/usr/lib" >> "${D}/${ECLIPSE_DIR}/eclipse.ini"
-
-	debug-print "Installing eclipse-gtk binary"
-	exeinto ${ECLIPSE_DIR}
-	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
-# -----------------------------------------------------------------------------
-
-apply-patchset() {
-	# 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
-	# %patch2 -p0
-	epatch "${WORKDIR}/${P}-build.patch"
-	# %patch4 -p0
-	epatch "${WORKDIR}/${P}-libupdatebuild.patch"
-	# %patch5 -p0
-	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
-	# %patch18 -p0
-	epatch "${WORKDIR}/${P}-swttools.patch"
-	popd >/dev/null
-	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90630
-	# %patch22 -p0
-	epatch "${WORKDIR}/${P}-updatehomedir.patch"
-	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90535
-	pushd plugins/org.eclipse.core.runtime >/dev/null
-	# %patch24 -p0
-	epatch "${WORKDIR}/${P}-fileinitializer.patch"
-	popd >/dev/null
-
-	##
-	## FIXME: breaks!!
-	##
-	## tomcat patches
-	## These patches need to go upstream
-	## https://bugs.eclipse.org/bugs/show_bug.cgi?id=98371
-	#pushd plugins/org.eclipse.tomcat >/dev/null
-	## %patch28 -p0
-	#epatch ${WORKDIR}/${P}-tomcat55.patch
-	## %patch29 -p0
-	#epatch ${WORKDIR}/${P}-tomcat55-build.patch
-	#popd >/dev/null
-	#sed --in-place "s/4.1.130/5.5.17/"                      \
-	#		features/org.eclipse.platform/build.xml \
-	#		plugins/org.eclipse.tomcat/build.xml    \
-	#		assemble.*.xml
-	#pushd plugins/org.eclipse.help.webapp >/dev/null
-	## %patch31 -p0
-	#epatch ${WORKDIR}/${P}-webapp-tomcat55.patch
-	#popd >/dev/null
-
-	# pushd plugins/org.eclipse.compare
-	# COMMENTED BY FEDORA %patch33 -p0
-	# popd
-
-	# JPackage []s in names of symlinks ...
-	# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=162177
-	pushd plugins/org.eclipse.jdt.core >/dev/null
-	# %patch34 -p0
-	epatch "${WORKDIR}/${P}-bz162177.patch"
-	# Use ecj for gcj
-	# %patch57 -p0
-	epatch "${WORKDIR}/${P}-ecj-gcj.patch"
-	popd >/dev/null
-	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=114001
-	# %patch38 -p0
-	epatch "${WORKDIR}/${P}-helpindexbuilder.patch"
-	# %patch40 -p0
-	epatch "${WORKDIR}/${P}-usebuiltlauncher.patch"
-	# DO NOT APPLY %patch43
-	pushd plugins/org.eclipse.swt/Eclipse\ SWT\ Mozilla/common/library >/dev/null
-	# Build cairo native libs
-	# %patch46
-	# epatch ${WORKDIR}/${P}-libswt-xpcomgcc4.patch
-	popd >/dev/null
-
-	# Because the launcher source is zipped up, we need to unzip, patch, and re-pack
-	mkdir launchertmp
-	unzip -qq -d launchertmp plugins/org.eclipse.platform/launchersrc.zip >/dev/null || die "unzip failed"
-	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=79592
-	# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=168726
-	pushd launchertmp >/dev/null
-	# %patch47 -p1
-	epatch "${WORKDIR}/${P}-launcher-link.patch"
-	zip -q -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
-	# %patch47 -p1
-	epatch "${WORKDIR}/${P}-launcher-link.patch"
-	popd >/dev/null
-	# Link against our system-installed javadocs
-	# Don't attempt to link to Sun's javadocs
-	# %patch48 -p0
-	epatch "${WORKDIR}/${P}-javadoclinks.patch"
-	sed --in-place "s:/usr/share/:%{_datadir}/:g"           \
-		plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt  \
-		plugins/org.eclipse.pde.doc.user/pdeOptions.txt \
-		plugins/org.eclipse.pde.doc.user/pdeOptions     \
-		plugins/org.eclipse.platform.doc.isv/platformOptions.txt
-	# Always generate debug info when building RPMs (Andrew Haley)
-	# %patch49 -p0
-	epatch "${WORKDIR}/${P}-ecj-rpmdebuginfo.patch"
-
-	# 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
-	# %patch53
-	epatch "${WORKDIR}/${P}-pde.build-add-package-build.patch"
-	sed --in-place "s:@eclipse_base@:%{_datadir}/%{name}:" 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
-	# %patch54
-	epatch "${WORKDIR}/${P}-swt-rm-ON_TOP.patch"
-	popd >/dev/null
-
-	# We need to disable junit4 and apt until GCJ can handle Java5 code
-	# %patch55 -p0
-	epatch "${WORKDIR}/${P}-disable-junit4-apt.patch"
-	rm plugins/org.junit4/junit-4.1.jar
-
-	##
-	## FIXME: breaks!!
-	##
-	## I love directories with spaces in their names
-	#pushd plugins/org.eclipse.swt >/dev/null
-	#mv "Eclipse SWT Mozilla" Eclipse_SWT_Mozilla
-	#mv "Eclipse SWT PI" Eclipse_SWT_PI
-	## Build against firefox:
-	##  - fix swt profile include path
-	##  - don't compile the mozilla 1.7 / firefox profile library -- build it inline
-	##  - don't use symbols not in our firefox builds
-	## FIXME:  add reference(s) to discussion(s) and bug(s)
-	## Note:  I made this patch from within Eclipse and then did the following to
-	##        it due to spaces in the paths:
-	##  sed --in-place "s/Eclipse\ SWT\ Mozilla/Eclipse_SWT_Mozilla/g" eclipse-swt-firefox.patch
-	##  sed --in-place "s/Eclipse\ SWT\ PI/Eclipse_SWT_PI/g" eclipse-swt-firefox.patch
-	## %patch59
-	#epatch ${WORKDIR}/${P}-swt-firefox.patch
-	#mv Eclipse_SWT_Mozilla "Eclipse SWT Mozilla"
-	#mv Eclipse_SWT_PI "Eclipse SWT PI"
-	#popd >/dev/null
-	#pushd plugins/org.eclipse.swt.tools >/dev/null
-	#mv "JNI Generation" JNI_Generation
-	## %patch60
-	#epatch ${WORKDIR}/${P}-swt-firefox.2.patch
-	#mv JNI_Generation "JNI Generation"
-	#popd >/dev/null
-
-	# FIXME check if this has been applied upstream
-	pushd plugins/org.eclipse.platform.doc.isv >/dev/null
-	# %patch100 -p0
-	epatch "${WORKDIR}/customBuildCallbacks.xml-add-pre.gather.bin.parts.patch"
-	popd >/dev/null
-	pushd plugins/org.eclipse.platform.doc.user >/dev/null
-	# %patch100 -p0
-	epatch "${WORKDIR}/customBuildCallbacks.xml-add-pre.gather.bin.parts.patch"
-	popd >/dev/null
-
-	if use branding; then
-		pushd plugins/org.eclipse.platform >/dev/null
-		cp "${WORKDIR}/splash.bmp" .
-		popd >/dev/null
-	fi
-
-	# FIXME this should be patched upstream with a flag to turn on and off
-	# all output should be directed to stdout
-	find -type f -name \*.xml -exec sed --in-place -r "s/output=\".*(txt|log).*\"//g" "{}" \;
-}
-
-fix-swt-targets() {
-	# Build using O2
-	# https://bugs.eclipse.org/bugs/show_bug.cgi?id=71637
-	pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library >/dev/null
-	# %patch0 -p0
-	epatch "${WORKDIR}/${P}-gentoo-libswt-enableallandO2.patch"
-	popd >/dev/null
-
-	# 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.3.1.1-r1.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.3.1.1-r1.ebuild
deleted file mode 100644
index 6f7d31e44658..000000000000
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.3.1.1-r1.ebuild
+++ /dev/null
@@ -1,325 +0,0 @@
-# Copyright 2007-2008 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.3.1.1-r1.ebuild,v 1.2 2008/04/08 16:07:51 caster Exp $
-
-# Tomcat is almost no longer needed in 3.3 and removed in 3.4.
-# See bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=173692
-# Currently we remove the Tomcat stuff entirely - potentially this can still break things.
-# We'll put it back if there is any bug report, which is unlikely.
-
-# To unbundle a jar, do the following:
-# 1) Rewrite the ebuild so it uses OSGi packaging
-# 2) Add the dependency and add it to gentoo_jars/system_jars
-# 3) Remove it from the build directory, and don't forget to modify the main Ant file
-# so that it does *NOT* copy the file at the end
-# 4) Install the symlink itself via java-pkg_jarfrom
-
-# Jetty, Tomcat-jasper and Lucene analysis (1.9.1) jars have to stay bundled for now, until someone does some work on them.
-# Hopefully, wltjr will soon package tomcat-jasper.
-
-# Current patches are hard to maintain when revbumping.
-# Two solutions:
-# 1) Split patches so that there is one per file
-# 2) Use sed, better solution I would say.
-
-EAPI="1"
-JAVA_PKG_IUSE="doc"
-inherit java-pkg-2 java-ant-2 check-reqs
-
-DMF="R-${PV}-200710231652"
-MY_A="eclipse-sourceBuild-srcIncluded-${PV/.0}.zip"
-
-DESCRIPTION="Eclipse Tools Platform"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_A}"
-
-SLOT="3.3"
-LICENSE="EPL-1.0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-S=${WORKDIR}
-PATCHDIR="${FILESDIR}/${SLOT}"
-FEDORA="${PATCHDIR}/fedora"
-ECLIPSE_DIR="/usr/lib/eclipse-${SLOT}"
-
-CDEPEND=">=dev-java/ant-eclipse-ecj-3.3
-	dev-java/ant-core
-	dev-java/ant-nodeps
-	=dev-java/junit-3*
-	dev-java/junit:4
-	<dev-java/swt-3.4_alpha:3
-	>=dev-java/jsch-0.1.36-r1
-	>=dev-java/icu4j-3.6.1
-	>=dev-java/commons-el-1.0-r2
-	>=dev-java/commons-logging-1.1-r6
-	>=dev-java/tomcat-servlet-api-5.5.25-r1:2.4
-	dev-java/lucene:1.9"
-
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.5
-	sys-apps/findutils
-	dev-java/cldc-api:1.1
-	app-arch/unzip
-	app-arch/zip
-	${CDEPEND}"
-
-JAVA_PKG_BSFIX="off"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	CHECKREQS_MEMORY="768"
-	check_reqs
-
-	eclipseArch=${ARCH}
-	use amd64 && eclipseArch="x86_64"
-}
-
-src_unpack() {
-	unpack ${A}
-	patch-apply
-	remove-bundled-stuff
-
-	# No warnings / Java 5 / all output should be directed to stdout
-	find "${S}" -type f -name '*.xml' -exec \
-		sed -r -e "s:(-encoding ISO-8859-1):\1 -nowarn:g" -e "s:(\"compilerArg\" value=\"):\1-nowarn :g" \
-		-e "s:(<property name=\"javacSource\" value=)\".*\":\1\"1.5\":g" \
-		-e "s:(<property name=\"javacTarget\" value=)\".*\":\1\"1.5\":g" -e "s:output=\".*(txt|log).*\"::g" -i {} \;
-
-	# JDK home
-	sed -r -e "s:^(JAVA_HOME =) .*:\1 $(java-config --jdk-home):" -e "s:gcc :gcc ${CFLAGS} :" \
-		-i plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile || die "sed Makefile failed"
-
-	while read line; do
-		java-ant_rewrite-classpath "$line" > /dev/null
-	done < <(find "${S}" -type f -name "build.xml" )
-}
-
-src_compile() {
-	# Figure out correct boot classpath
-	local bootClassPath=$(java-config --runtime)
-	einfo "Using boot classpath ${bootClassPath}"
-
-	java-pkg_force-compiler ecj-3.3
-
-	# system_jars will be used when compiling (javac)
-	# gentoo_jars will be used when building JSPs and other ant tasks (not javac)
-
-	local systemJars="$(java-pkg_getjars swt-3,icu4j,ant-core,jsch,ant-nodeps,junit-4,tomcat-servlet-api-2.4,lucene-1.9):$(java-pkg_getjars --build-only cldc-api-1.1)"
-	local gentooJars="$(java-pkg_getjars ant-core,icu4j,jsch,commons-logging,commons-el,tomcat-servlet-api-2.4)"
-	local options="-q -Dnobootstrap=true -Dlibsconfig=true -Dbootclasspath=${bootClassPath} -DinstallOs=linux \
-		-DinstallWs=gtk -DinstallArch=${eclipseArch} -Djava5.home=$(java-config --jdk-home)"
-
-	use doc && options="${options} -Dgentoo.javadoc=true"
-
-	ANT_OPTS=-Xmx1024M ANT_TASKS="ant-nodeps" eant ${options} -Dgentoo.classpath="${systemJars}" -Dgentoo.jars="${gentooJars//:/,}"
-}
-
-src_install() {
-	dodir /usr/lib
-
-	[[ -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}"
-
-	# Install startup script
-	newbin "${FILESDIR}"/${SLOT}/eclipse-${SLOT}-r1 eclipse-${SLOT}
-
-	# Chmod the actual binary in the Eclipse dir
-	chmod +x "${D}/${ECLIPSE_DIR}/eclipse"
-
-	insinto "/etc" && doins "${FILESDIR}/${SLOT}/eclipserc"
-
-	make_desktop_entry eclipse-${SLOT} "Eclipse ${PV}" "${ECLIPSE_DIR}/icon.xpm"
-
-	cd "${D}/${ECLIPSE_DIR}"
-	install-link-system-jars
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Welcome to Eclipse-3.3 (Europa)!"
-	einfo
-	einfo "You can now install plugins via Update Manager without any"
-	einfo "tweaking. This is the recommended way to install new features for Eclipse."
-	einfo
-	einfo "Please read http://gentoo-wiki.com/Eclipse"
-	einfo "It contains a lot of useful information and help about Eclipse on Gentoo."
-}
-
-# -----------------------------------------------------------------------------
-#  Helper functions
-# -----------------------------------------------------------------------------
-
-install-link-system-jars() {
-
-	pushd plugins/ > /dev/null
-	java-pkg_jarfrom swt-3
-
-	mkdir "org.apache.ant"
-	mkdir "org.apache.ant/META-INF/"
-	mkdir "org.apache.ant/lib"
-	cp "${FILESDIR}/${SLOT}/ant-osgi-manifest.mf" "org.apache.ant/META-INF/MANIFEST.MF"
-	pushd org.apache.ant/lib > /dev/null
-	java-pkg_jarfrom ant-core
-	java-pkg_jarfrom ant-nodeps
-	popd > /dev/null
-
-	java-pkg_jarfrom icu4j
-	java-pkg_jarfrom jsch
-	java-pkg_jarfrom commons-el
-	java-pkg_jarfrom commons-logging
-	java-pkg_jarfrom lucene-1.9
-	java-pkg_jarfrom tomcat-servlet-api-2.4
-
-	popd > /dev/null
-
-	pushd plugins/org.junit_*/ > /dev/null
-	java-pkg_jarfrom junit
-	popd > /dev/null
-
-	pushd plugins/org.junit4*/ > /dev/null
-	java-pkg_jarfrom junit-4
-	popd > /dev/null
-}
-
-patch-apply() {
-	# Patch launcher source
-	mkdir launchertmp
-	unzip -qq -d launchertmp plugins/org.eclipse.platform/launchersrc.zip > /dev/null || die "unzip failed"
-	pushd launchertmp/ > /dev/null
-	epatch "${PATCHDIR}/launcher_double-free.diff"
-	sed -i "s/CFLAGS\ =\ -O\ -s\ -Wall/CFLAGS = ${CFLAGS}\ -Wall/" library/gtk/make_linux.mak \
-		|| die "Failed to tweak make_linux.mak"
-	zip -q -6 -r ../launchersrc.zip * >/dev/null || die "zip failed"
-	popd > /dev/null
-	mv launchersrc.zip plugins/org.eclipse.platform/launchersrc.zip
-	rm -rf launchertmp
-
-	# Disable SWT, JDT-Tool, JDK-6
-	epatch "${PATCHDIR}/disable-swt.diff"
-	epatch "${PATCHDIR}/disable-jdt-tool.diff"
-	epatch "${PATCHDIR}/disable-jdk6.diff"
-	epatch "${PATCHDIR}/set-java-home.diff" # this setups the java5 home variable
-
-	# Following are patches from Fedora - I did not investigate this yet
-
-	epatch "${FEDORA}/eclipse-libupdatebuild2.patch"
-
-	# Fedora does not apply this anymore because they checkout
-	# org.eclipse.equinox.initializer project from cvs. Untill a fix, we'll
-	# keep the old patch
-	pushd plugins/org.eclipse.core.runtime >/dev/null
-	epatch "${FEDORA}/eclipse-fileinitializer.patch"
-	popd >/dev/null
-
-	# Generic releng plugins that can be used to build plugins
-	# https://www.redhat.com/archives/fedora-devel-java-list/2006-April/msg00048.html
-	pushd plugins/org.eclipse.pde.build > /dev/null
-	# Patch 53
-	epatch "${FEDORA}/eclipse-pde.build-add-package-build.patch"
-	sed -e "s:@eclipse_base@:${ECLIPSE_DIR}:g" -i templates/package-build/build.properties
-	popd > /dev/null
-
-	# Gentoo patch to support jsch-0.1.36 - ali_bush
-	# Already fixed in upstream svn.  Remove after next release?
-
-	pushd "plugins/org.eclipse.jsch.ui" > /dev/null
-	epatch "${PATCHDIR}/eclipse-jsch-api-update.patch"
-	popd > /dev/null
-
-	# Later we could produce a patch out of all these sed, but this is not the best solution
-	# since this would make a lot of patches (x86, x86_64...) and would be hard to revbump
-
-	# Following adds an additional classpath when building JSPs
-
-	sed -i '/<path id="@dot\.classpath">/ a\
-			<filelist dir="" files="${gentoo.jars}" />'  "plugins/org.eclipse.help.webapp/build.xml"
-
-	# Following allows the doc USE flag to be honored
-
-	sed -i -e '/<target name="generateJavadoc" depends="getJavadocPath"/ c\
-		<target name="generateJavadoc" depends="getJavadocPath" if="gentoo.javadoc">' \
-		-e '/<replace file="\${basedir}\/\${optionsFile}" token="@rt@" value="\${bootclasspath}/ c\
-		<replace file="${basedir}/${optionsFile}" token="@rt@" value="${bootclasspath}:${gentoo.classpath}" />' \
-		"plugins/org.eclipse.platform.doc.isv/buildDoc.xml"
-
-	# Following disables Tomcat entirely
-
-	sed -i '/plugins\/org\.eclipse\.tomcat"/{N;N;N;N;d;}' "features/org.eclipse.platform/build.xml"
-	sed -i '/org\.eclipse\.tomcat/{N;N;N;d;}' "plugins/org.eclipse.platform.source/build.xml"
-	sed -i '/<ant.*org\.eclipse\.tomcat/{N;N;d;}' "assemble.org.eclipse.sdk.linux.gtk.${eclipseArch}.xml"
-
-	# This allows to compile osgi.util and osgi.service, and fixes IPluginDescriptor.class which is present compiled
-
-	sed -i -e 's/<src path="\."/<src path="org"/' -e '/<include name="org\/"\/>/ d' \
-	-e '/<subant antfile="\${customBuildCallbacks}" target="pre\.gather\.bin\.parts" failonerror="false" buildpath="\.">/ { n;n;n; a\
-		<copy todir="${destination.temp.folder}/org.eclipse.osgi.services_3.1.200.v20070605" failonerror="true" overwrite="false"> \
-			<fileset dir="${build.result.folder}/@dot"> \
-				<include name="**"/> \
-			</fileset> \
-		</copy>
-}' "plugins/org.eclipse.osgi.services/build.xml"
-
-	sed -i -e 's/<src path="\."/<src path="org"/' -e '/<include name="org\/"\/>/ d' \
-	-e '/<subant antfile="\${customBuildCallbacks}" target="pre\.gather\.bin\.parts" failonerror="false" buildpath="\.">/ { n;n;n; a\
-		<copy todir="${destination.temp.folder}/org.eclipse.osgi.util_3.1.200.v20070605" failonerror="true" overwrite="false"> \
-			<fileset dir="${build.result.folder}/@dot"> \
-				<include name="**"/> \
-			</fileset> \
-		</copy>
-}' 	"plugins/org.eclipse.osgi.util/build.xml"
-
-	sed -i 	'/<mkdir dir="${temp\.folder}\/runtime_registry_compatibility\.jar\.bin"\/>/ a\
-		<mkdir dir="classes"/> \
-		<copy todir="classes" failonerror="true" overwrite="false"> \
-			<fileset dir="${build.result.folder}/../org.eclipse.core.runtime/@dot/" includes="**/IPluginDescriptor.class" > \
-			</fileset> \
-		</copy>' "plugins/org.eclipse.core.runtime.compatibility.registry/build.xml"
-
-	# This removes the copying operation for bundled jars
-
-	sed -i -e "s/<copy.*com\.jcraft\.jsch.*\/>//" -e "s/<copy.*com\.ibm\.icu.*\/>//" -e "s/<copy.*org\.apache\.commons\.el_.*\/>//" \
-		-e "s/<copy.*org\.apache\.commons\.logging_.*\/>//" -e "s/<copy.*javax\.servlet\.jsp_.*\/>//" -e "s/<copy.*javax\.servlet_.*\/>//" \
-		-e "s/<copy.*org\.apache\.lucene_.*\/>//" "package.org.eclipse.sdk.linux.gtk.${eclipseArch}.xml"
-
-	#  -e "s/<copy.*org\.apache\.lucene\.analysis_.*\/>//"
-}
-
-remove-bundled-stuff() {
-	# Remove pre-built eclipse binaries
-	find "${S}" -type f -name eclipse | xargs rm
-	# ...  .so libraries
-	find "${S}" -type f -name '*.so' | xargs rm
-	# ... .jar files
-	rm plugins/org.eclipse.swt/extra_jars/exceptions.jar plugins/org.eclipse.osgi/osgi/osgi*.jar \
-		plugins/org.eclipse.osgi/supplement/osgi/osgi.jar
-
-	rm -rf plugins/org.eclipse.swt.*
-	rm -rf plugins/org.apache.ant_*
-	rm plugins/org.apache.commons.*.jar
-	rm plugins/com.jcraft.jsch*
-	rm plugins/com.ibm.icu*
-	rm plugins/org.junit_*/*.jar
-	rm plugins/org.junit4*/*.jar
-	rm plugins/javax.*.jar
-	rm plugins/org.apache.lucene_*.jar
-
-	# Removing Tomcat stuff
-
-	rm -rf "plugins/org.eclipse.tomcat/"
-
-	# Remove bundled classes
-
-	rm -rf "plugins/org.eclipse.osgi.services/org"
-	unzip -q "plugins/org.eclipse.osgi.services/src.zip" -d "plugins/org.eclipse.osgi.services/"
-	rm -rf "plugins/org.eclipse.osgi.util/org"
-	unzip -q "plugins/org.eclipse.osgi.util/src.zip" -d "plugins/org.eclipse.osgi.util/"
-
-	rm -rf plugins/org.eclipse.jdt.core/scripts/*.class
-	rm -rf plugins/org.eclipse.core.runtime.compatibility.registry/classes
-}
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.3.1.1-r2.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.3.1.1-r2.ebuild
deleted file mode 100644
index 2e47268f621d..000000000000
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.3.1.1-r2.ebuild
+++ /dev/null
@@ -1,325 +0,0 @@
-# Copyright 2007-2008 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.3.1.1-r2.ebuild,v 1.2 2008/08/01 20:27:52 elvanor Exp $
-
-# Tomcat is almost no longer needed in 3.3 and removed in 3.4.
-# See bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=173692
-# Currently we remove the Tomcat stuff entirely - potentially this can still break things.
-# We'll put it back if there is any bug report, which is unlikely.
-
-# To unbundle a jar, do the following:
-# 1) Rewrite the ebuild so it uses OSGi packaging
-# 2) Add the dependency and add it to gentoo_jars/system_jars
-# 3) Remove it from the build directory, and don't forget to modify the main Ant file
-# so that it does *NOT* copy the file at the end
-# 4) Install the symlink itself via java-pkg_jarfrom
-
-# Jetty, Tomcat-jasper and Lucene analysis (1.9.1) jars have to stay bundled for now, until someone does some work on them.
-# Hopefully, wltjr will soon package tomcat-jasper.
-
-# Current patches are hard to maintain when revbumping.
-# Two solutions:
-# 1) Split patches so that there is one per file
-# 2) Use sed, better solution I would say.
-
-EAPI="1"
-JAVA_PKG_IUSE="doc"
-inherit java-pkg-2 java-ant-2 check-reqs
-
-DMF="R-${PV}-200710231652"
-MY_A="eclipse-sourceBuild-srcIncluded-${PV/.0}.zip"
-
-DESCRIPTION="Eclipse Tools Platform"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_A}"
-
-SLOT="3.3"
-LICENSE="EPL-1.0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-S=${WORKDIR}
-PATCHDIR="${FILESDIR}/${SLOT}"
-FEDORA="${PATCHDIR}/fedora"
-ECLIPSE_DIR="/usr/lib/eclipse-${SLOT}"
-
-CDEPEND="dev-java/ant-eclipse-ecj:3.3
-	dev-java/ant-core
-	dev-java/ant-nodeps
-	=dev-java/junit-3*
-	dev-java/junit:4
-	<dev-java/swt-3.4_alpha:3
-	>=dev-java/jsch-0.1.36-r1
-	>=dev-java/icu4j-3.6.1:0
-	>=dev-java/commons-el-1.0-r2
-	>=dev-java/commons-logging-1.1-r6
-	>=dev-java/tomcat-servlet-api-5.5.25-r1:2.4
-	dev-java/lucene:1.9"
-
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.5
-	sys-apps/findutils
-	dev-java/cldc-api:1.1
-	app-arch/unzip
-	app-arch/zip
-	${CDEPEND}"
-
-JAVA_PKG_BSFIX="off"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	CHECKREQS_MEMORY="768"
-	check_reqs
-
-	eclipseArch=${ARCH}
-	use amd64 && eclipseArch="x86_64"
-}
-
-src_unpack() {
-	unpack ${A}
-	patch-apply
-	remove-bundled-stuff
-
-	# No warnings / Java 5 / all output should be directed to stdout
-	find "${S}" -type f -name '*.xml' -exec \
-		sed -r -e "s:(-encoding ISO-8859-1):\1 -nowarn:g" -e "s:(\"compilerArg\" value=\"):\1-nowarn :g" \
-		-e "s:(<property name=\"javacSource\" value=)\".*\":\1\"1.5\":g" \
-		-e "s:(<property name=\"javacTarget\" value=)\".*\":\1\"1.5\":g" -e "s:output=\".*(txt|log).*\"::g" -i {} \;
-
-	# JDK home
-	sed -r -e "s:^(JAVA_HOME =) .*:\1 $(java-config --jdk-home):" -e "s:gcc :gcc ${CFLAGS} :" \
-		-i plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile || die "sed Makefile failed"
-
-	while read line; do
-		java-ant_rewrite-classpath "$line" > /dev/null
-	done < <(find "${S}" -type f -name "build.xml" )
-}
-
-src_compile() {
-	# Figure out correct boot classpath
-	local bootClassPath=$(java-config --runtime)
-	einfo "Using boot classpath ${bootClassPath}"
-
-	java-pkg_force-compiler ecj-3.3
-
-	# system_jars will be used when compiling (javac)
-	# gentoo_jars will be used when building JSPs and other ant tasks (not javac)
-
-	local systemJars="$(java-pkg_getjars swt-3,icu4j,ant-core,jsch,ant-nodeps,junit-4,tomcat-servlet-api-2.4,lucene-1.9):$(java-pkg_getjars --build-only cldc-api-1.1)"
-	local gentooJars="$(java-pkg_getjars ant-core,icu4j,jsch,commons-logging,commons-el,tomcat-servlet-api-2.4)"
-	local options="-q -Dnobootstrap=true -Dlibsconfig=true -Dbootclasspath=${bootClassPath} -DinstallOs=linux \
-		-DinstallWs=gtk -DinstallArch=${eclipseArch} -Djava5.home=$(java-config --jdk-home)"
-
-	use doc && options="${options} -Dgentoo.javadoc=true"
-
-	ANT_OPTS=-Xmx1024M ANT_TASKS="ant-nodeps" eant ${options} -Dgentoo.classpath="${systemJars}" -Dgentoo.jars="${gentooJars//:/,}"
-}
-
-src_install() {
-	dodir /usr/lib
-
-	[[ -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}"
-
-	# Install startup script
-	newbin "${FILESDIR}"/${SLOT}/eclipse-${SLOT}-r1 eclipse-${SLOT}
-
-	# Chmod the actual binary in the Eclipse dir
-	chmod +x "${D}/${ECLIPSE_DIR}/eclipse"
-
-	insinto "/etc" && doins "${FILESDIR}/${SLOT}/eclipserc"
-
-	make_desktop_entry eclipse-${SLOT} "Eclipse ${PV}" "${ECLIPSE_DIR}/icon.xpm"
-
-	cd "${D}/${ECLIPSE_DIR}"
-	install-link-system-jars
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Welcome to Eclipse-3.3 (Europa)!"
-	einfo
-	einfo "You can now install plugins via Update Manager without any"
-	einfo "tweaking. This is the recommended way to install new features for Eclipse."
-	einfo
-	einfo "Please read http://gentoo-wiki.com/Eclipse"
-	einfo "It contains a lot of useful information and help about Eclipse on Gentoo."
-}
-
-# -----------------------------------------------------------------------------
-#  Helper functions
-# -----------------------------------------------------------------------------
-
-install-link-system-jars() {
-
-	pushd plugins/ > /dev/null
-	java-pkg_jarfrom swt-3
-
-	mkdir "org.apache.ant"
-	mkdir "org.apache.ant/META-INF/"
-	mkdir "org.apache.ant/lib"
-	cp "${FILESDIR}/${SLOT}/ant-osgi-manifest.mf" "org.apache.ant/META-INF/MANIFEST.MF"
-	pushd org.apache.ant/lib > /dev/null
-	java-pkg_jarfrom ant-core
-	java-pkg_jarfrom ant-nodeps
-	popd > /dev/null
-
-	java-pkg_jarfrom icu4j
-	java-pkg_jarfrom jsch
-	java-pkg_jarfrom commons-el
-	java-pkg_jarfrom commons-logging
-	java-pkg_jarfrom lucene-1.9
-	java-pkg_jarfrom tomcat-servlet-api-2.4
-
-	popd > /dev/null
-
-	pushd plugins/org.junit_*/ > /dev/null
-	java-pkg_jarfrom junit
-	popd > /dev/null
-
-	pushd plugins/org.junit4*/ > /dev/null
-	java-pkg_jarfrom junit-4
-	popd > /dev/null
-}
-
-patch-apply() {
-	# Patch launcher source
-	mkdir launchertmp
-	unzip -qq -d launchertmp plugins/org.eclipse.platform/launchersrc.zip > /dev/null || die "unzip failed"
-	pushd launchertmp/ > /dev/null
-	epatch "${PATCHDIR}/launcher_double-free.diff"
-	sed -i "s/CFLAGS\ =\ -O\ -s\ -Wall/CFLAGS = ${CFLAGS}\ -Wall/" library/gtk/make_linux.mak \
-		|| die "Failed to tweak make_linux.mak"
-	zip -q -6 -r ../launchersrc.zip * >/dev/null || die "zip failed"
-	popd > /dev/null
-	mv launchersrc.zip plugins/org.eclipse.platform/launchersrc.zip
-	rm -rf launchertmp
-
-	# Disable SWT, JDT-Tool, JDK-6
-	epatch "${PATCHDIR}/disable-swt.diff"
-	epatch "${PATCHDIR}/disable-jdt-tool.diff"
-	epatch "${PATCHDIR}/disable-jdk6.diff"
-	epatch "${PATCHDIR}/set-java-home.diff" # this setups the java5 home variable
-
-	# Following are patches from Fedora - I did not investigate this yet
-
-	epatch "${FEDORA}/eclipse-libupdatebuild2.patch"
-
-	# Fedora does not apply this anymore because they checkout
-	# org.eclipse.equinox.initializer project from cvs. Untill a fix, we'll
-	# keep the old patch
-	pushd plugins/org.eclipse.core.runtime >/dev/null
-	epatch "${FEDORA}/eclipse-fileinitializer.patch"
-	popd >/dev/null
-
-	# Generic releng plugins that can be used to build plugins
-	# https://www.redhat.com/archives/fedora-devel-java-list/2006-April/msg00048.html
-	pushd plugins/org.eclipse.pde.build > /dev/null
-	# Patch 53
-	epatch "${FEDORA}/eclipse-pde.build-add-package-build.patch"
-	sed -e "s:@eclipse_base@:${ECLIPSE_DIR}:g" -i templates/package-build/build.properties
-	popd > /dev/null
-
-	# Gentoo patch to support jsch-0.1.36 - ali_bush
-	# Already fixed in upstream svn.  Remove after next release?
-
-	pushd "plugins/org.eclipse.jsch.ui" > /dev/null
-	epatch "${PATCHDIR}/eclipse-jsch-api-update.patch"
-	popd > /dev/null
-
-	# Later we could produce a patch out of all these sed, but this is not the best solution
-	# since this would make a lot of patches (x86, x86_64...) and would be hard to revbump
-
-	# Following adds an additional classpath when building JSPs
-
-	sed -i '/<path id="@dot\.classpath">/ a\
-			<filelist dir="" files="${gentoo.jars}" />'  "plugins/org.eclipse.help.webapp/build.xml"
-
-	# Following allows the doc USE flag to be honored
-
-	sed -i -e '/<target name="generateJavadoc" depends="getJavadocPath"/ c\
-		<target name="generateJavadoc" depends="getJavadocPath" if="gentoo.javadoc">' \
-		-e '/<replace file="\${basedir}\/\${optionsFile}" token="@rt@" value="\${bootclasspath}/ c\
-		<replace file="${basedir}/${optionsFile}" token="@rt@" value="${bootclasspath}:${gentoo.classpath}" />' \
-		"plugins/org.eclipse.platform.doc.isv/buildDoc.xml"
-
-	# Following disables Tomcat entirely
-
-	sed -i '/plugins\/org\.eclipse\.tomcat"/{N;N;N;N;d;}' "features/org.eclipse.platform/build.xml"
-	sed -i '/org\.eclipse\.tomcat/{N;N;N;d;}' "plugins/org.eclipse.platform.source/build.xml"
-	sed -i '/<ant.*org\.eclipse\.tomcat/{N;N;d;}' "assemble.org.eclipse.sdk.linux.gtk.${eclipseArch}.xml"
-
-	# This allows to compile osgi.util and osgi.service, and fixes IPluginDescriptor.class which is present compiled
-
-	sed -i -e 's/<src path="\."/<src path="org"/' -e '/<include name="org\/"\/>/ d' \
-	-e '/<subant antfile="\${customBuildCallbacks}" target="pre\.gather\.bin\.parts" failonerror="false" buildpath="\.">/ { n;n;n; a\
-		<copy todir="${destination.temp.folder}/org.eclipse.osgi.services_3.1.200.v20070605" failonerror="true" overwrite="false"> \
-			<fileset dir="${build.result.folder}/@dot"> \
-				<include name="**"/> \
-			</fileset> \
-		</copy>
-}' "plugins/org.eclipse.osgi.services/build.xml"
-
-	sed -i -e 's/<src path="\."/<src path="org"/' -e '/<include name="org\/"\/>/ d' \
-	-e '/<subant antfile="\${customBuildCallbacks}" target="pre\.gather\.bin\.parts" failonerror="false" buildpath="\.">/ { n;n;n; a\
-		<copy todir="${destination.temp.folder}/org.eclipse.osgi.util_3.1.200.v20070605" failonerror="true" overwrite="false"> \
-			<fileset dir="${build.result.folder}/@dot"> \
-				<include name="**"/> \
-			</fileset> \
-		</copy>
-}' 	"plugins/org.eclipse.osgi.util/build.xml"
-
-	sed -i 	'/<mkdir dir="${temp\.folder}\/runtime_registry_compatibility\.jar\.bin"\/>/ a\
-		<mkdir dir="classes"/> \
-		<copy todir="classes" failonerror="true" overwrite="false"> \
-			<fileset dir="${build.result.folder}/../org.eclipse.core.runtime/@dot/" includes="**/IPluginDescriptor.class" > \
-			</fileset> \
-		</copy>' "plugins/org.eclipse.core.runtime.compatibility.registry/build.xml"
-
-	# This removes the copying operation for bundled jars
-
-	sed -i -e "s/<copy.*com\.jcraft\.jsch.*\/>//" -e "s/<copy.*com\.ibm\.icu.*\/>//" -e "s/<copy.*org\.apache\.commons\.el_.*\/>//" \
-		-e "s/<copy.*org\.apache\.commons\.logging_.*\/>//" -e "s/<copy.*javax\.servlet\.jsp_.*\/>//" -e "s/<copy.*javax\.servlet_.*\/>//" \
-		-e "s/<copy.*org\.apache\.lucene_.*\/>//" "package.org.eclipse.sdk.linux.gtk.${eclipseArch}.xml"
-
-	#  -e "s/<copy.*org\.apache\.lucene\.analysis_.*\/>//"
-}
-
-remove-bundled-stuff() {
-	# Remove pre-built eclipse binaries
-	find "${S}" -type f -name eclipse | xargs rm
-	# ...  .so libraries
-	find "${S}" -type f -name '*.so' | xargs rm
-	# ... .jar files
-	rm plugins/org.eclipse.swt/extra_jars/exceptions.jar plugins/org.eclipse.osgi/osgi/osgi*.jar \
-		plugins/org.eclipse.osgi/supplement/osgi/osgi.jar
-
-	rm -rf plugins/org.eclipse.swt.*
-	rm -rf plugins/org.apache.ant_*
-	rm plugins/org.apache.commons.*.jar
-	rm plugins/com.jcraft.jsch*
-	rm plugins/com.ibm.icu*
-	rm plugins/org.junit_*/*.jar
-	rm plugins/org.junit4*/*.jar
-	rm plugins/javax.*.jar
-	rm plugins/org.apache.lucene_*.jar
-
-	# Removing Tomcat stuff
-
-	rm -rf "plugins/org.eclipse.tomcat/"
-
-	# Remove bundled classes
-
-	rm -rf "plugins/org.eclipse.osgi.services/org"
-	unzip -q "plugins/org.eclipse.osgi.services/src.zip" -d "plugins/org.eclipse.osgi.services/"
-	rm -rf "plugins/org.eclipse.osgi.util/org"
-	unzip -q "plugins/org.eclipse.osgi.util/src.zip" -d "plugins/org.eclipse.osgi.util/"
-
-	rm -rf plugins/org.eclipse.jdt.core/scripts/*.class
-	rm -rf plugins/org.eclipse.core.runtime.compatibility.registry/classes
-}
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.3.1.1.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.3.1.1.ebuild
deleted file mode 100644
index 912cb8263567..000000000000
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.3.1.1.ebuild
+++ /dev/null
@@ -1,325 +0,0 @@
-# Copyright 2007-2008 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.3.1.1.ebuild,v 1.6 2008/04/08 16:07:51 caster Exp $
-
-# Tomcat is almost no longer needed in 3.3 and removed in 3.4.
-# See bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=173692
-# Currently we remove the Tomcat stuff entirely - potentially this can still break things.
-# We'll put it back if there is any bug report, which is unlikely.
-
-# To unbundle a jar, do the following:
-# 1) Rewrite the ebuild so it uses OSGi packaging
-# 2) Add the dependency and add it to gentoo_jars/system_jars
-# 3) Remove it from the build directory, and don't forget to modify the main Ant file
-# so that it does *NOT* copy the file at the end
-# 4) Install the symlink itself via java-pkg_jarfrom
-
-# Jetty, Tomcat-jasper and Lucene analysis (1.9.1) jars have to stay bundled for now, until someone does some work on them.
-# Hopefully, wltjr will soon package tomcat-jasper.
-
-# Current patches are hard to maintain when revbumping.
-# Two solutions:
-# 1) Split patches so that there is one per file
-# 2) Use sed, better solution I would say.
-
-EAPI="1"
-JAVA_PKG_IUSE="doc"
-inherit java-pkg-2 java-ant-2 check-reqs
-
-DMF="R-${PV}-200710231652"
-MY_A="eclipse-sourceBuild-srcIncluded-${PV/.0}.zip"
-
-DESCRIPTION="Eclipse Tools Platform"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_A}"
-
-SLOT="3.3"
-LICENSE="EPL-1.0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-S=${WORKDIR}
-PATCHDIR="${FILESDIR}/${SLOT}"
-FEDORA="${PATCHDIR}/fedora"
-ECLIPSE_DIR="/usr/lib/eclipse-${SLOT}"
-
-CDEPEND=">=dev-java/ant-eclipse-ecj-3.3
-	dev-java/ant-core
-	dev-java/ant-nodeps
-	=dev-java/junit-3*
-	dev-java/junit:4
-	<dev-java/swt-3.4_alpha:3
-	>=dev-java/jsch-0.1.36-r1
-	>=dev-java/icu4j-3.6.1
-	>=dev-java/commons-el-1.0-r2
-	>=dev-java/commons-logging-1.1-r6
-	>=dev-java/tomcat-servlet-api-5.5.25-r1:2.4
-	dev-java/lucene:1.9"
-
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.5
-	sys-apps/findutils
-	dev-java/cldc-api:1.1
-	app-arch/unzip
-	app-arch/zip
-	${CDEPEND}"
-
-JAVA_PKG_BSFIX="off"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	CHECKREQS_MEMORY="768"
-	check_reqs
-
-	eclipseArch=${ARCH}
-	use amd64 && eclipseArch="x86_64"
-}
-
-src_unpack() {
-	unpack ${A}
-	patch-apply
-	remove-bundled-stuff
-
-	# No warnings / Java 5 / all output should be directed to stdout
-	find "${S}" -type f -name '*.xml' -exec \
-		sed -r -e "s:(-encoding ISO-8859-1):\1 -nowarn:g" -e "s:(\"compilerArg\" value=\"):\1-nowarn :g" \
-		-e "s:(<property name=\"javacSource\" value=)\".*\":\1\"1.5\":g" \
-		-e "s:(<property name=\"javacTarget\" value=)\".*\":\1\"1.5\":g" -e "s:output=\".*(txt|log).*\"::g" -i {} \;
-
-	# JDK home
-	sed -r -e "s:^(JAVA_HOME =) .*:\1 $(java-config --jdk-home):" -e "s:gcc :gcc ${CFLAGS} :" \
-		-i plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile || die "sed Makefile failed"
-
-	while read line; do
-		java-ant_rewrite-classpath "$line" > /dev/null
-	done < <(find "${S}" -type f -name "build.xml" )
-}
-
-src_compile() {
-	# Figure out correct boot classpath
-	local bootClassPath=$(java-config --runtime)
-	einfo "Using boot classpath ${bootClassPath}"
-
-	java-pkg_force-compiler ecj-3.3
-
-	# system_jars will be used when compiling (javac)
-	# gentoo_jars will be used when building JSPs and other ant tasks (not javac)
-
-	local systemJars="$(java-pkg_getjars swt-3,icu4j,ant-core,jsch,ant-nodeps,junit-4,tomcat-servlet-api-2.4,lucene-1.9):$(java-pkg_getjars --build-only cldc-api-1.1)"
-	local gentooJars="$(java-pkg_getjars ant-core,icu4j,jsch,commons-logging,commons-el,tomcat-servlet-api-2.4)"
-	local options="-q -Dnobootstrap=true -Dlibsconfig=true -Dbootclasspath=${bootClassPath} -DinstallOs=linux \
-		-DinstallWs=gtk -DinstallArch=${eclipseArch} -Djava5.home=$(java-config --jdk-home)"
-
-	use doc && options="${options} -Dgentoo.javadoc=true"
-
-	ANT_OPTS=-Xmx1024M ANT_TASKS="ant-nodeps" eant ${options} -Dgentoo.classpath="${systemJars}" -Dgentoo.jars="${gentooJars//:/,}"
-}
-
-src_install() {
-	dodir /usr/lib
-
-	[[ -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}"
-
-	# Install startup script
-	dobin "${FILESDIR}/${SLOT}/eclipse-${SLOT}"
-
-	# Chmod the actual binary in the Eclipse dir
-	chmod +x "${D}/${ECLIPSE_DIR}/eclipse"
-
-	insinto "/etc" && doins "${FILESDIR}/${SLOT}/eclipserc"
-
-	make_desktop_entry eclipse-${SLOT} "Eclipse ${PV}" "${ECLIPSE_DIR}/icon.xpm"
-
-	cd "${D}/${ECLIPSE_DIR}"
-	install-link-system-jars
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Welcome to Eclipse-3.3 (Europa)!"
-	einfo
-	einfo "You can now install plugins via Update Manager without any"
-	einfo "tweaking. This is the recommended way to install new features for Eclipse."
-	einfo
-	einfo "Please read http://gentoo-wiki.com/Eclipse"
-	einfo "It contains a lot of useful information and help about Eclipse on Gentoo."
-}
-
-# -----------------------------------------------------------------------------
-#  Helper functions
-# -----------------------------------------------------------------------------
-
-install-link-system-jars() {
-
-	pushd plugins/ > /dev/null
-	java-pkg_jarfrom swt-3
-
-	mkdir "org.apache.ant"
-	mkdir "org.apache.ant/META-INF/"
-	mkdir "org.apache.ant/lib"
-	cp "${FILESDIR}/${SLOT}/ant-osgi-manifest.mf" "org.apache.ant/META-INF/MANIFEST.MF"
-	pushd org.apache.ant/lib > /dev/null
-	java-pkg_jarfrom ant-core
-	java-pkg_jarfrom ant-nodeps
-	popd > /dev/null
-
-	java-pkg_jarfrom icu4j
-	java-pkg_jarfrom jsch
-	java-pkg_jarfrom commons-el
-	java-pkg_jarfrom commons-logging
-	java-pkg_jarfrom lucene-1.9
-	java-pkg_jarfrom tomcat-servlet-api-2.4
-
-	popd > /dev/null
-
-	pushd plugins/org.junit_*/ > /dev/null
-	java-pkg_jarfrom junit
-	popd > /dev/null
-
-	pushd plugins/org.junit4*/ > /dev/null
-	java-pkg_jarfrom junit-4
-	popd > /dev/null
-}
-
-patch-apply() {
-	# Patch launcher source
-	mkdir launchertmp
-	unzip -qq -d launchertmp plugins/org.eclipse.platform/launchersrc.zip > /dev/null || die "unzip failed"
-	pushd launchertmp/ > /dev/null
-	epatch "${PATCHDIR}/launcher_double-free.diff"
-	sed -i "s/CFLAGS\ =\ -O\ -s\ -Wall/CFLAGS = ${CFLAGS}\ -Wall/" library/gtk/make_linux.mak \
-		|| die "Failed to tweak make_linux.mak"
-	zip -q -6 -r ../launchersrc.zip * >/dev/null || die "zip failed"
-	popd > /dev/null
-	mv launchersrc.zip plugins/org.eclipse.platform/launchersrc.zip
-	rm -rf launchertmp
-
-	# Disable SWT, JDT-Tool, JDK-6
-	epatch "${PATCHDIR}/disable-swt.diff"
-	epatch "${PATCHDIR}/disable-jdt-tool.diff"
-	epatch "${PATCHDIR}/disable-jdk6.diff"
-	epatch "${PATCHDIR}/set-java-home.diff" # this setups the java5 home variable
-
-	# Following are patches from Fedora - I did not investigate this yet
-
-	epatch "${FEDORA}/eclipse-libupdatebuild2.patch"
-
-	# Fedora does not apply this anymore because they checkout
-	# org.eclipse.equinox.initializer project from cvs. Untill a fix, we'll
-	# keep the old patch
-	pushd plugins/org.eclipse.core.runtime >/dev/null
-	epatch "${FEDORA}/eclipse-fileinitializer.patch"
-	popd >/dev/null
-
-	# Generic releng plugins that can be used to build plugins
-	# https://www.redhat.com/archives/fedora-devel-java-list/2006-April/msg00048.html
-	pushd plugins/org.eclipse.pde.build > /dev/null
-	# Patch 53
-	epatch "${FEDORA}/eclipse-pde.build-add-package-build.patch"
-	sed -e "s:@eclipse_base@:${ECLIPSE_DIR}:g" -i templates/package-build/build.properties
-	popd > /dev/null
-
-	# Gentoo patch to support jsch-0.1.36 - ali_bush
-	# Already fixed in upstream svn.  Remove after next release?
-
-	pushd "plugins/org.eclipse.jsch.ui" > /dev/null
-	epatch "${PATCHDIR}/eclipse-jsch-api-update.patch"
-	popd > /dev/null
-
-	# Later we could produce a patch out of all these sed, but this is not the best solution
-	# since this would make a lot of patches (x86, x86_64...) and would be hard to revbump
-
-	# Following adds an additional classpath when building JSPs
-
-	sed -i '/<path id="@dot\.classpath">/ a\
-			<filelist dir="" files="${gentoo.jars}" />'  "plugins/org.eclipse.help.webapp/build.xml"
-
-	# Following allows the doc USE flag to be honored
-
-	sed -i -e '/<target name="generateJavadoc" depends="getJavadocPath"/ c\
-		<target name="generateJavadoc" depends="getJavadocPath" if="gentoo.javadoc">' \
-		-e '/<replace file="\${basedir}\/\${optionsFile}" token="@rt@" value="\${bootclasspath}/ c\
-		<replace file="${basedir}/${optionsFile}" token="@rt@" value="${bootclasspath}:${gentoo.classpath}" />' \
-		"plugins/org.eclipse.platform.doc.isv/buildDoc.xml"
-
-	# Following disables Tomcat entirely
-
-	sed -i '/plugins\/org\.eclipse\.tomcat"/{N;N;N;N;d;}' "features/org.eclipse.platform/build.xml"
-	sed -i '/org\.eclipse\.tomcat/{N;N;N;d;}' "plugins/org.eclipse.platform.source/build.xml"
-	sed -i '/<ant.*org\.eclipse\.tomcat/{N;N;d;}' "assemble.org.eclipse.sdk.linux.gtk.${eclipseArch}.xml"
-
-	# This allows to compile osgi.util and osgi.service, and fixes IPluginDescriptor.class which is present compiled
-
-	sed -i -e 's/<src path="\."/<src path="org"/' -e '/<include name="org\/"\/>/ d' \
-	-e '/<subant antfile="\${customBuildCallbacks}" target="pre\.gather\.bin\.parts" failonerror="false" buildpath="\.">/ { n;n;n; a\
-		<copy todir="${destination.temp.folder}/org.eclipse.osgi.services_3.1.200.v20070605" failonerror="true" overwrite="false"> \
-			<fileset dir="${build.result.folder}/@dot"> \
-				<include name="**"/> \
-			</fileset> \
-		</copy>
-}' "plugins/org.eclipse.osgi.services/build.xml"
-
-	sed -i -e 's/<src path="\."/<src path="org"/' -e '/<include name="org\/"\/>/ d' \
-	-e '/<subant antfile="\${customBuildCallbacks}" target="pre\.gather\.bin\.parts" failonerror="false" buildpath="\.">/ { n;n;n; a\
-		<copy todir="${destination.temp.folder}/org.eclipse.osgi.util_3.1.200.v20070605" failonerror="true" overwrite="false"> \
-			<fileset dir="${build.result.folder}/@dot"> \
-				<include name="**"/> \
-			</fileset> \
-		</copy>
-}' 	"plugins/org.eclipse.osgi.util/build.xml"
-
-	sed -i 	'/<mkdir dir="${temp\.folder}\/runtime_registry_compatibility\.jar\.bin"\/>/ a\
-		<mkdir dir="classes"/> \
-		<copy todir="classes" failonerror="true" overwrite="false"> \
-			<fileset dir="${build.result.folder}/../org.eclipse.core.runtime/@dot/" includes="**/IPluginDescriptor.class" > \
-			</fileset> \
-		</copy>' "plugins/org.eclipse.core.runtime.compatibility.registry/build.xml"
-
-	# This removes the copying operation for bundled jars
-
-	sed -i -e "s/<copy.*com\.jcraft\.jsch.*\/>//" -e "s/<copy.*com\.ibm\.icu.*\/>//" -e "s/<copy.*org\.apache\.commons\.el_.*\/>//" \
-		-e "s/<copy.*org\.apache\.commons\.logging_.*\/>//" -e "s/<copy.*javax\.servlet\.jsp_.*\/>//" -e "s/<copy.*javax\.servlet_.*\/>//" \
-		-e "s/<copy.*org\.apache\.lucene_.*\/>//" "package.org.eclipse.sdk.linux.gtk.${eclipseArch}.xml"
-
-	#  -e "s/<copy.*org\.apache\.lucene\.analysis_.*\/>//"
-}
-
-remove-bundled-stuff() {
-	# Remove pre-built eclipse binaries
-	find "${S}" -type f -name eclipse | xargs rm
-	# ...  .so libraries
-	find "${S}" -type f -name '*.so' | xargs rm
-	# ... .jar files
-	rm plugins/org.eclipse.swt/extra_jars/exceptions.jar plugins/org.eclipse.osgi/osgi/osgi*.jar \
-		plugins/org.eclipse.osgi/supplement/osgi/osgi.jar
-
-	rm -rf plugins/org.eclipse.swt.*
-	rm -rf plugins/org.apache.ant_*
-	rm plugins/org.apache.commons.*.jar
-	rm plugins/com.jcraft.jsch*
-	rm plugins/com.ibm.icu*
-	rm plugins/org.junit_*/*.jar
-	rm plugins/org.junit4*/*.jar
-	rm plugins/javax.*.jar
-	rm plugins/org.apache.lucene_*.jar
-
-	# Removing Tomcat stuff
-
-	rm -rf "plugins/org.eclipse.tomcat/"
-
-	# Remove bundled classes
-
-	rm -rf "plugins/org.eclipse.osgi.services/org"
-	unzip -q "plugins/org.eclipse.osgi.services/src.zip" -d "plugins/org.eclipse.osgi.services/"
-	rm -rf "plugins/org.eclipse.osgi.util/org"
-	unzip -q "plugins/org.eclipse.osgi.util/src.zip" -d "plugins/org.eclipse.osgi.util/"
-
-	rm -rf plugins/org.eclipse.jdt.core/scripts/*.class
-	rm -rf plugins/org.eclipse.core.runtime.compatibility.registry/classes
-}
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.4-r2.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.4-r2.ebuild
index 3dab3987f431..da230e11d9a6 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.4-r2.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.4-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 2007-2008 Gentoo Foundation
+# Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.4-r2.ebuild,v 1.1 2008/08/05 08:07:53 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.4-r2.ebuild,v 1.2 2009/11/06 14:10:29 elvanor Exp $
 
 # To unbundle a jar, do the following:
 # 1) Rewrite the ebuild so it uses OSGi packaging
@@ -50,10 +50,9 @@ CDEPEND="dev-java/ant-eclipse-ecj:${SLOT}
 	>=dev-java/tomcat-servlet-api-5.5.25-r1:2.4
 	dev-java/lucene:1.9
 	>=dev-java/lucene-analyzers-1.9.1-r1:1.9"
-RDEPEND=">=virtual/jre-1.5
+RDEPEND=">=virtual/jre-1.6
 	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.5
-	java6? ( >=virtual/jdk-1.6 )
+DEPEND=">=virtual/jdk-1.6
 	dev-java/cldc-api:1.1
 	app-arch/unzip
 	app-arch/zip