Take a lot of java stuff from the migration overlay on gentooexperimental. This includes a new eclipse ebuild for rc7

svn path=/trunk/overlay/; revision=4

6 files changed, 351 insertions, 83 deletions

diff --git a/dev-util/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest
index 1398759..411485c 100644
--- a/dev-util/eclipse-sdk/Manifest
+++ b/dev-util/eclipse-sdk/Manifest
@@ -1,24 +1,22 @@
-AUX 07-eclipse-3.2.patch 2480 RMD160 776471d2426011339eda7a446ca32aab0e98f023 SHA1 9eb43f2245e434a1f1df949c819211b0709b954a SHA256 c7cf00d96f2b36d8d5f155a8711fbd472badff32c0d652a93c832b2607a16981
-MD5 a50777be585361c3353f6ffc896597b6 files/07-eclipse-3.2.patch 2480
-RMD160 776471d2426011339eda7a446ca32aab0e98f023 files/07-eclipse-3.2.patch 2480
-SHA256 c7cf00d96f2b36d8d5f155a8711fbd472badff32c0d652a93c832b2607a16981 files/07-eclipse-3.2.patch 2480
-AUX eclipse-3.2 1587 RMD160 c5d618ae81c2fb94e0a2279108945481623794f1 SHA1 42e79ecbf587459ecd3f4ec1033280efd2c55fb6 SHA256 2acea18cf92a0e9997718fb7b6e6d21de0344591c83d113975d06ad25b5f7b3f
-MD5 fdf7fdf48f5851a666ab0b0c8d1e190e files/eclipse-3.2 1587
-RMD160 c5d618ae81c2fb94e0a2279108945481623794f1 files/eclipse-3.2 1587
-SHA256 2acea18cf92a0e9997718fb7b6e6d21de0344591c83d113975d06ad25b5f7b3f files/eclipse-3.2 1587
-AUX eclipse-3.2.desktop 226 RMD160 7dec133c198d1487302ad94daff4fe22efe03c9b SHA1 2854afccba994ed3042dc1b70101b2738db7cf06 SHA256 3640ba9a6aa4ee96a84ade83c46a059f91f8da53721916f2b933cbdc02e953ac
-MD5 26c40f43c7646520e01ad4fa0562b11f files/eclipse-3.2.desktop 226
-RMD160 7dec133c198d1487302ad94daff4fe22efe03c9b files/eclipse-3.2.desktop 226
-SHA256 3640ba9a6aa4ee96a84ade83c46a059f91f8da53721916f2b933cbdc02e953ac files/eclipse-3.2.desktop 226
+AUX eclipse-3.2 1145 RMD160 141c5d412c50dcb106654b4078cbaf379b468130 SHA1 6c317e42b7697d849bbd5616519642be345c74f3 SHA256 920b48ed98bc18f6e90769fe084eced46304c4c1a8b3999c5644297f437b1cbd
+MD5 f6ff94ca35dee12929539c1c6936d7c9 files/eclipse-3.2 1145
+RMD160 141c5d412c50dcb106654b4078cbaf379b468130 files/eclipse-3.2 1145
+SHA256 920b48ed98bc18f6e90769fe084eced46304c4c1a8b3999c5644297f437b1cbd files/eclipse-3.2 1145
 AUX eclipse.1 2607 RMD160 06aaeb02a7c7720c8d8b26d9d1252095b6098a25 SHA1 c00e291630b69fee7187decb050411d428fc2f13 SHA256 5165b07f736763eab05decb39397be0be8ae03b77f614ba3794eff71d411537b
 MD5 32be5292ce0af7ff9c1866c1f59e1859 files/eclipse.1 2607
 RMD160 06aaeb02a7c7720c8d8b26d9d1252095b6098a25 files/eclipse.1 2607
 SHA256 5165b07f736763eab05decb39397be0be8ae03b77f614ba3794eff71d411537b files/eclipse.1 2607
+DIST eclipse-sdk-3.2_rc7-patches.tar.bz2 24935 RMD160 88423e6e04eda1b5d1d87ffded8c91f2034c45ad SHA1 ba1d82b143e2e33a91994e483651b6eb070d5055 SHA256 7c204cef97110f8018fd13212ddf48f915bed7fea7b95e11b40ff1e8a4c528d8
 DIST eclipse-sourceBuild-srcIncluded-3.2RC5.zip 83458655 RMD160 86da05a76ea190b70a04218cebb720d56ff6bad9 SHA1 c91908f1c9a405b007214dbdd36651d415f34618 SHA256 00f028da5f3e481fc2cc12c753ded40c90ec1a95989c813797d83893163bf020
+DIST eclipse-sourceBuild-srcIncluded-3.2RC7.zip 82030272 RMD160 1e7e6107f791d023dc9c2a6ba8c1f3d6d0cfaf80 SHA1 903cb5ee695e6b071eb859666dc09a25d506518e SHA256 fbf6956fef7223e770e8362d7d388a99a9ff209f3c9ec6e0143d70c38a99ef1c
 EBUILD eclipse-sdk-3.2_rc5.ebuild 8772 RMD160 5e6f30d1f44d0458127e156bceb0572dc7c73e6f SHA1 6700134f1ca9cc0b549d853dcd9e9fd09499e237 SHA256 4813814d60e5062a001669e7e1f1cafb504c4d303a596a3f050300f54d7fbe6a
 MD5 892e54e495ea8e58785d62cbfb11b05d eclipse-sdk-3.2_rc5.ebuild 8772
 RMD160 5e6f30d1f44d0458127e156bceb0572dc7c73e6f eclipse-sdk-3.2_rc5.ebuild 8772
 SHA256 4813814d60e5062a001669e7e1f1cafb504c4d303a596a3f050300f54d7fbe6a eclipse-sdk-3.2_rc5.ebuild 8772
+EBUILD eclipse-sdk-3.2_rc7.ebuild 10392 RMD160 6f5f7124e2f7e21ffa3b7c0617b75f2e2914951c SHA1 163e4041e499d20901cd273e7f377ce510bea1d5 SHA256 e4d0ba04f2018c41763030cb7bc6c130e8d833172ae02f494b4f8c1bf5dea997
+MD5 92237f03d5e270010fa5711a7b57c712 eclipse-sdk-3.2_rc7.ebuild 10392
+RMD160 6f5f7124e2f7e21ffa3b7c0617b75f2e2914951c eclipse-sdk-3.2_rc7.ebuild 10392
+SHA256 e4d0ba04f2018c41763030cb7bc6c130e8d833172ae02f494b4f8c1bf5dea997 eclipse-sdk-3.2_rc7.ebuild 10392
 MISC NOTES 88 RMD160 17d0a1de81a98536b861d08c042380db79f4505d SHA1 69d9245b7b5d9dc29a8c929a755d4d69c13ebcb3 SHA256 a0d5585d446af9859a74ed5a3a6f84b1cb8882a4d4cce8cd07573e32e8a1f024
 MD5 794ce3d84a68356de7c1b45a10d7f896 NOTES 88
 RMD160 17d0a1de81a98536b861d08c042380db79f4505d NOTES 88
@@ -26,3 +24,6 @@ SHA256 a0d5585d446af9859a74ed5a3a6f84b1cb8882a4d4cce8cd07573e32e8a1f024 NOTES 88
 MD5 f89deb41d369bff477b21f7dacfe9eda files/digest-eclipse-sdk-3.2_rc5 313
 RMD160 4cbfe556a59254bc098914c29f7b172bfa9eaed9 files/digest-eclipse-sdk-3.2_rc5 313
 SHA256 f25ee3f9a8b49f7fab25ce512459266ab80576dcc37e28b889161266f2c8c4cf files/digest-eclipse-sdk-3.2_rc5 313
+MD5 ca95a16c25dfafa7204b484ed0ca4a6c files/digest-eclipse-sdk-3.2_rc7 596
+RMD160 f53c12c324b0a7b274cbb4852573a517c8266e8d files/digest-eclipse-sdk-3.2_rc7 596
+SHA256 375e1c95876b190e6db32b13b6337b3a1a57c59777b09aa74d7b8a5b9e7a6f6b files/digest-eclipse-sdk-3.2_rc7 596
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.2_rc7.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.2_rc7.ebuild
new file mode 100644
index 0000000..2b79dd1
--- /dev/null
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.2_rc7.ebuild
@@ -0,0 +1,327 @@
+# 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.1 2006/04/20 13:49:19 nichoj Exp $
+
+inherit eutils java-pkg-2 flag-o-matic check-reqs
+
+MY_PV=${PV/_rc/RC}
+DATESTAMP=200606021317
+MY_A="eclipse-sourceBuild-srcIncluded-${MY_PV}.zip"
+DESCRIPTION="Eclipse Tools Platform"
+HOMEPAGE="http://www.eclipse.org/"
+#SRC_URI="http://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/S-${MY_PV}-${DATESTAMP}/${MY_A}"
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/S-${MY_PV}-${DATESTAMP}/${MY_A}
+http://dev.gentoo.org/~nichoj/distfiles/${P}-patches.tar.bz2"
+IUSE="nogecko-sdk 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
+	!nogecko-sdk? ( net-libs/gecko-sdk )
+	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 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
+
+	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}
+
+	debug-print "Installing eclipse-gtk binary"
+	doexe eclipse || die "Failed to install eclipse binary"
+	# need to rename inf file to eclipse-gtk.ini, see bug #128128
+	newins eclipse.ini eclipse-gtk.ini
+
+	# 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 nogecko-sdk ; 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() {
+	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"
+}
+
+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/07-eclipse-3.2.patch b/dev-util/eclipse-sdk/files/07-eclipse-3.2.patch
deleted file mode 100644
index c76458e..0000000
--- a/dev-util/eclipse-sdk/files/07-eclipse-3.2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- plugins/org.eclipse.core.runtime.compatibility.registry/build.xml	2006-04-18 07:54:25.000000000 +0300
-+++ plugins/org.eclipse.core.runtime.compatibility.registry/build.xml.fixed	2006-04-18 07:54:01.000000000 +0300
-@@ -79,6 +79,7 @@
- 			<pathelement path="${build.result.folder}/../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.equinox.registry/bin/"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.equinox.registry/@dot"/>
-+			<pathelement path="../org.eclipse.core.runtime/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.osgi/bin/"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.osgi/@dot"/>
- 			<pathelement path="${build.result.folder}/../org.eclipse.core.jobs/bin/"/>
---- plugins/org.eclipse.update.core.linux/src/build.xml~	2006-04-29 12:43:49.000000000 +0300
-+++ plugins/org.eclipse.update.core.linux/src/build.xml	2006-04-29 12:43:17.000000000 +0300
-@@ -5,7 +5,7 @@
-   <!-- Set a meaningful default value for when it is not. -->
-   <property name="eclipse-home" value="${basedir}/../.."/>
-   <property name="jdk-path" value="${java.home}"/>  
--  <property name="destination" value="${eclipse-home}/org.eclipse.update.core.linux/os/linux/x86/"/>
-+  <property name="destination" value="${eclipse-home}/org.eclipse.update.core.linux/os/linux/${arch}/"/>
-   <property name="obj-path" value="${eclipse-home}/org.eclipse.update.core.linux/src/"/>
-   <property name="src-path" value="${eclipse-home}/org.eclipse.update.core.linux/src/"/>  
-   
-@@ -47,17 +47,17 @@
-     <property name="header-path" value="${jdk-path}/../include"/>
-     <property name="header-linux-path" value="${header-path}/linux" />
- 
--	<echo message="gcc -o  ${library-file} -shared -I${src-path} -I${header-linux-path} ${library-file} -static -lc"/>
-+	<echo message="gcc -o  ${library-file} -shared -fPIC -I${src-path} -I${header-linux-path} ${library-file} -lc"/>
- 
-     <apply executable="gcc" dest="${eclipse-home}/" parallel="false">
-       <arg value="-o"/>
-       <arg value="${library-file}"/>
-       <arg value="-shared"/>
-+      <arg value="-fPIC"/>
-       <arg value="-I${src-path}"/>
-       <arg value="-I${header-path}"/>      
-       <arg value="-I${header-linux-path}"/>  
- 	  <srcfile/>
--	  <arg value="-static"/>           
-       <arg value="-lc"/>	  
-       <fileset dir="${src-path}" includes="*.c"/>
-       <mapper type="glob" from="*.c" to="*.o"/>
-
diff --git a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.2_rc7 b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.2_rc7
new file mode 100644
index 0000000..6650416
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.2_rc7
@@ -0,0 +1,6 @@
+MD5 d5f9df81a83b9844c1a7ffeafb6c48d9 eclipse-sdk-3.2_rc7-patches.tar.bz2 24935
+RMD160 88423e6e04eda1b5d1d87ffded8c91f2034c45ad eclipse-sdk-3.2_rc7-patches.tar.bz2 24935
+SHA256 7c204cef97110f8018fd13212ddf48f915bed7fea7b95e11b40ff1e8a4c528d8 eclipse-sdk-3.2_rc7-patches.tar.bz2 24935
+MD5 9fa62b56c209713a32296f3ac65cf1d0 eclipse-sourceBuild-srcIncluded-3.2RC7.zip 82030272
+RMD160 1e7e6107f791d023dc9c2a6ba8c1f3d6d0cfaf80 eclipse-sourceBuild-srcIncluded-3.2RC7.zip 82030272
+SHA256 fbf6956fef7223e770e8362d7d388a99a9ff209f3c9ec6e0143d70c38a99ef1c eclipse-sourceBuild-srcIncluded-3.2RC7.zip 82030272
diff --git a/dev-util/eclipse-sdk/files/eclipse-3.2 b/dev-util/eclipse-sdk/files/eclipse-3.2
index 557d8d6..b8dfc7b 100644
--- a/dev-util/eclipse-sdk/files/eclipse-3.2
+++ b/dev-util/eclipse-sdk/files/eclipse-3.2
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
 #
 # Tiny startup wrapper for the Eclipse 3.2.x series
 #
@@ -8,25 +8,10 @@
 # Licensed under the GNU General Public License, version 2
 #
 
-if [ -f $HOME/.eclipserc ] ; then
-	. $HOME/.eclipserc
-fi
-
-if [ -z "${ECLIPSE_HOME}" ] ; then
-	ECLIPSE_HOME=/usr/lib/eclipse-3.2
-fi
+[[ -f $HOME/.eclipserc ]] && $HOME/.eclipserc
 
-if [ "${PREFERRED_FRONTEND}" == "gtk" ] && [ -x ${ECLIPSE_HOME}/eclipse-gtk ] ; then
-	ECLIPSE_BIN=${ECLIPSE_HOME}/eclipse-gtk
-elif [ "${PREFERRED_FRONTEND}" == "motif" ] && [ -x ${ECLIPSE_HOME}/eclipse-motif ] ; then
-	ECLIPSE_BIN=${ECLIPSE_HOME}/eclipse-motif
-else
-	if [ -x ${ECLIPSE_HOME}/eclipse-gtk ] ; then
-		ECLIPSE_BIN=${ECLIPSE_HOME}/eclipse-gtk
-	elif [ -x ${ECLIPSE_HOME}/eclipse-motif ] ; then
-		ECLIPSE_BIN=${ECLIPSE_HOME}/eclipse-motif
-	fi
-fi
+ECLIPSE_HOME=${ECLIPSE_HOME:="/usr/lib/eclipse-3.2"}
+ECLIPSE_BIN="${ECLIPSE_HOME}/eclipse"
 
 if [ ! -x ${ECLIPSE_BIN} ] ; then
 	echo "Failed to find executable '${ECLIPSE_BIN}'" > /dev/stderr
@@ -44,7 +29,7 @@ if [ $(whoami) == "root" ] ; then
 	echo "!!!  3) 'emerge eclipse-sdk'"
 fi
 
-if [ -d /usr/lib/gecko-sdk/lib/ ] && [ -f /usr/lib/gecko-sdk/lib/libgtkembedmoz.so ] ; then
+if [[ -d /usr/lib/gecko-sdk/lib/ ]] && [[ -f /usr/lib/gecko-sdk/lib/libgtkembedmoz.so ]] ; then
     export MOZILLA_FIVE_HOME="/usr/lib/gecko-sdk/lib/"
 fi
 
diff --git a/dev-util/eclipse-sdk/files/eclipse-3.2.desktop b/dev-util/eclipse-sdk/files/eclipse-3.2.desktop
deleted file mode 100644
index 92a72c1..0000000
--- a/dev-util/eclipse-sdk/files/eclipse-3.2.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Eclipse @PV@
-Comment=A Java Development Environment
-Icon=/usr/lib/eclipse-3.2/icon.xpm
-Exec=/usr/bin/eclipse-3.2
-Terminal=false
-Type=Application
-Categories=GNOME;Application;Development
-StartupNotify=true