Add 3.1.2, fixes Bug 120723, also regenerate some of digest-files with RMD160 and SHA256 digests and update copyright

(Portage version: 2.1_pre7-r5)

10 files changed, 468 insertions, 12 deletions

diff --git a/dev-util/eclipse-sdk/ChangeLog b/dev-util/eclipse-sdk/ChangeLog
index b1b0ab742efa..b4cf1085f5d8 100644
--- a/dev-util/eclipse-sdk/ChangeLog
+++ b/dev-util/eclipse-sdk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/eclipse-sdk
-# Copyright 2003-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.101 2005/11/12 00:29:48 axxo Exp $
+# Copyright 2003-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.102 2006/04/17 14:52:11 centic Exp $
+
+*eclipse-sdk-3.1.2 (17 Apr 2006)
+
+  17 Apr 2006; Dominik Stadler <centic@gentoo.org>
+  +eclipse-sdk-3.1.2.ebuild:
+  Add 3.1.2, fixes Bug 120723, also regenerate some of digest-files with
+  RMD160 and SHA256 digests and update copyright
 
   12 Nov 2005; Thomas Matthijs <axxo@gentoo.org> -eclipse-sdk-3.1.ebuild:
   remove broken ebuild
diff --git a/dev-util/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest
index 9710203b918b..c251a825c6ed 100644
--- a/dev-util/eclipse-sdk/Manifest
+++ b/dev-util/eclipse-sdk/Manifest
@@ -1,29 +1,93 @@
 MD5 72d8273a11cc1fc71efc2aaa3efc8977 ChangeLog 19933
+RMD160 00e6bbca7802fef73d2619ec07d0d7b74c71d93d ChangeLog 19933
+SHA256 f32d6022c44f7d838344f79a98a8d9ff3728c0dde2cdc0b5a64f15a0e2bcb547 ChangeLog 19933
 MD5 784f7f8fdf82be12bba512c56169050e eclipse-sdk-2.1.3-r5.ebuild 9905
+RMD160 c4c052548ad75e997b2ecb6246773e4cdea6c925 eclipse-sdk-2.1.3-r5.ebuild 9905
+SHA256 6357db93f7dfb6937db14f5a0f13ace7af42bc9ff2570b74f6f1688993c8c7b1 eclipse-sdk-2.1.3-r5.ebuild 9905
 MD5 a2d7d204d16c0363da6429bad390431a eclipse-sdk-3.0.0-r3.ebuild 12081
+RMD160 14159478163eb8da6a6559921c93c757cdc6bd94 eclipse-sdk-3.0.0-r3.ebuild 12081
+SHA256 d69978ef5669705dac2d96b89351a2bbc808f9f8baeb34c5035855e1fdaa8918 eclipse-sdk-3.0.0-r3.ebuild 12081
 MD5 819818fb9914fe0dccf2af4c89d94452 eclipse-sdk-3.0.1-r2.ebuild 14287
-MD5 b7835429b6a12c387636babaedc3aaa9 eclipse-sdk-3.0.2.ebuild 13831
+RMD160 35f7ff67930ebe4a65ed3520b61bdef3a076d1bd eclipse-sdk-3.0.1-r2.ebuild 14287
+SHA256 b27b0266a767263a5eddf98ab3fb36dbfb6d378d334dedbb189610b7c6b72d25 eclipse-sdk-3.0.1-r2.ebuild 14287
+MD5 3f8f3fc3f545a80e3c137af4131b2e68 eclipse-sdk-3.0.2.ebuild 13831
+RMD160 6ef696c282b54cd0b95798e3f4eaa999f146ba17 eclipse-sdk-3.0.2.ebuild 13831
+SHA256 4560b29a935ee9c22ef8b188dd7761041f15c1208a207918ddee9c82444f07d5 eclipse-sdk-3.0.2.ebuild 13831
 MD5 d4bd64b3abb0e431031bf7d8766a0f0e eclipse-sdk-3.1-r1.ebuild 10418
+RMD160 cca83414ca5b6ac0bfaafa37037caf31192a7680 eclipse-sdk-3.1-r1.ebuild 10418
+SHA256 e6fb525198e777c7d87893dd04b225b9cd7a92b5afb51ef41e0a6eed8f801a19 eclipse-sdk-3.1-r1.ebuild 10418
 MD5 e56bed895cd713529b60cb5dc49e4b0a eclipse-sdk-3.1.1.ebuild 10393
+RMD160 9b5c6e089102ee34a8fb05a4a8164213065a195e eclipse-sdk-3.1.1.ebuild 10393
+SHA256 6432c3d38373ad2f472b7a002312a3c64dcb24ab5a4a16dc85cdb39efaa50058 eclipse-sdk-3.1.1.ebuild 10393
+MD5 23bcb28095b378259d940642986748d0 eclipse-sdk-3.1.2.ebuild 10288
+RMD160 fc821401275dbd0acdf30cc1c761cd5ab90302b5 eclipse-sdk-3.1.2.ebuild 10288
+SHA256 f9f19fe597c5173343d5ec71b261cf523dbc94e334e8d0eaed387372cf3484f5 eclipse-sdk-3.1.2.ebuild 10288
 MD5 ab0f6620b4767e065bd533b06245b0fc files/01-distribute_ant_target-2.1.patch 1103
+RMD160 b1e41e2a202fcd91135b9df0573b3611c27bc046 files/01-distribute_ant_target-2.1.patch 1103
+SHA256 98b71329db9aae0bbeef88613939c68a9220764e8c207f4301f38a9087e72cd3 files/01-distribute_ant_target-2.1.patch 1103
 MD5 ed33fd609db26b85ef9b0c2a82a06b22 files/01-distribute_ant_target-3.0.patch 726
+RMD160 3e95ebeb60bd16a584945aca923a5edc7cd82156 files/01-distribute_ant_target-3.0.patch 726
+SHA256 11248e25b16ac86634c6da2fd0d33dbff10c31d663aa92ec6db8e29bb111d300 files/01-distribute_ant_target-3.0.patch 726
 MD5 59c18169fdf20b43544bb4891592dce4 files/02-konqueror_help_browser-2.1.patch 1013
+RMD160 4785681bd4c970b344fb163d42d19dd8682ebef7 files/02-konqueror_help_browser-2.1.patch 1013
+SHA256 56212dbd6e8e2ba9ced67e70b04e4b0111acfd7198021ae939286198db7dd244 files/02-konqueror_help_browser-2.1.patch 1013
 MD5 8f66a016be8f50dc8f57353c8207c669 files/03-motif-java1.5-build.patch 1848
+RMD160 274af67bdbfccb89ae4cf6b2ff431f8821c1aeac files/03-motif-java1.5-build.patch 1848
+SHA256 3bd0d4812b95070a807c51c36c4bfd3cf9d1b509484b43b25ea9080e33269707 files/03-motif-java1.5-build.patch 1848
 MD5 79d8cfcfc342234eac01538827998fa2 files/04-amd64-gtk.patch 388
+RMD160 ce337c9a8cd13dd104bdb7f01d1a46aeb966e090 files/04-amd64-gtk.patch 388
+SHA256 f2a492ccc0a24fec3af54e64594ea06814267e6849b0d7d9a31ee80cbdcea67b files/04-amd64-gtk.patch 388
 MD5 3110e7ec528bc98ef251172c2d7e2956 files/05-mozilla-xpcom.patch 862
+RMD160 307f83c9751c7f58a805026a3dff53ff98d26788 files/05-mozilla-xpcom.patch 862
+SHA256 aa188e120d350c55b333cbdcde7fed0a79015d4608a424d48ffcf1735c494648 files/05-mozilla-xpcom.patch 862
 MD5 a9f983102fa1b491ad4c4f154123d509 files/06-path-fixups.patch 4707
-MD5 21bde556ac55c5e22578cf4998135913 files/digest-eclipse-sdk-2.1.3-r5 176
-MD5 0e815a2260dbd0153de35c6de26fbd05 files/digest-eclipse-sdk-3.0.0-r3 86
-MD5 486d232cbe9d4b75d915bb6bf8b5f0d2 files/digest-eclipse-sdk-3.0.1-r2 88
-MD5 35725caa2b42f4ca3ee05c49b03d47ea files/digest-eclipse-sdk-3.0.2 88
-MD5 0805c4d31f80b5ebb2f52456273d0d44 files/digest-eclipse-sdk-3.1-r1 86
-MD5 cffbffb2d9d08ac2123a1a393df33aa7 files/digest-eclipse-sdk-3.1.1 88
+RMD160 9870d6a1c6278d37f1dbbfaf966aef3604fae4e4 files/06-path-fixups.patch 4707
+SHA256 f031191538783d91e8370832ac7b712e47d2d32515d3979bdc409ac46567a4ca files/06-path-fixups.patch 4707
+MD5 d8d4a0abfd4d492b2bcc67cc9c4f3a39 files/digest-eclipse-sdk-2.1.3-r5 620
+RMD160 37c3854ad6c477cf5cd9f497a0d2a247012e3b4b files/digest-eclipse-sdk-2.1.3-r5 620
+SHA256 538d3166d33276e92a37b9ad63a783afd3b40064da660ae00d38f685da3025cf files/digest-eclipse-sdk-2.1.3-r5 620
+MD5 4a50fa14058e92993733cf88c5ad3b42 files/digest-eclipse-sdk-3.0.0-r3 304
+RMD160 9ffc2c961f91994a8cbf0a7fee0ca06be15b1d2a files/digest-eclipse-sdk-3.0.0-r3 304
+SHA256 549bc0a50055b260a71d25f57fccddce0f4d5fd1f7163be403f45cb905444606 files/digest-eclipse-sdk-3.0.0-r3 304
+MD5 37cb08890933099f5dc691636c998299 files/digest-eclipse-sdk-3.0.1-r2 310
+RMD160 932beb8b050885d55923a99f873eeb060e202304 files/digest-eclipse-sdk-3.0.1-r2 310
+SHA256 0de94c0723ef302003eab0a95ab2a1c38869a827d50c01984f74d1dfd83eb203 files/digest-eclipse-sdk-3.0.1-r2 310
+MD5 e4fe184225b61ac63ba71f1157e0bb4e files/digest-eclipse-sdk-3.0.2 310
+RMD160 370ff7e60e462001598b2f8357b463b9389071b7 files/digest-eclipse-sdk-3.0.2 310
+SHA256 da189a7c7ddd6b1661391f5e149d905d79779d4863502d4b769216b19a5fed42 files/digest-eclipse-sdk-3.0.2 310
+MD5 909ae2ff15ca1bfea0ec7dd4b62db08e files/digest-eclipse-sdk-3.1-r1 304
+RMD160 237b4ca74b0c334bf16911f05cc9fe40d381ba8f files/digest-eclipse-sdk-3.1-r1 304
+SHA256 6d7604d43e4d856247546d63161499eeebeb1522125cf36357b86eb363e0db2b files/digest-eclipse-sdk-3.1-r1 304
+MD5 c454bb3e92bf261318547a39e200aff3 files/digest-eclipse-sdk-3.1.1 310
+RMD160 76c28eb81b46bbc3e6e19430b4971fde3a96df38 files/digest-eclipse-sdk-3.1.1 310
+SHA256 09ea2b8127d9a07e069e7f7f6f9e2c77f716793032ea01e2f5fe2416db6f8fbe files/digest-eclipse-sdk-3.1.1 310
+MD5 0dd05cebf3928888ff566c433da96335 files/digest-eclipse-sdk-3.1.2 310
+RMD160 dea902b88d52673c42f034ab9451e145bc52b30c files/digest-eclipse-sdk-3.1.2 310
+SHA256 01187ce1cad8c9037d48c130cd9d98167d7c934e075d42c7c55f3adae8105749 files/digest-eclipse-sdk-3.1.2 310
 MD5 de999f62aa03505bfd16a01f7e1a28a3 files/eclipse-2 956
+RMD160 0045f44e9e47f4e3b80535c3a25de590c7ab92e2 files/eclipse-2 956
+SHA256 a842d3ee3f135d695e659811598340bc2b3b42222d44bf3d2155c9c59ac4e778 files/eclipse-2 956
 MD5 6ac05b530442f845b10b830e624ffe04 files/eclipse-2.desktop 222
+RMD160 f917e558668067fd4b481791e669c9770286d90a files/eclipse-2.desktop 222
+SHA256 c04d6a484462828a7c90bd4dd95bed35ff2a7f8357b4fb46964922c15b5b9b66 files/eclipse-2.desktop 222
 MD5 a158c2a70562122805ec2ffa055a8271 files/eclipse-3 950
+RMD160 ff77a8f8d7e27b6aa7827bb3c1cbc3cee057393f files/eclipse-3 950
+SHA256 9c405120446850935d5bbb7a9415a5bf0d55e3e5fc046f3efb9d386c4ac49f58 files/eclipse-3 950
 MD5 21b43df02155628b0aeeacd7caddaf2a files/eclipse-3.0.2 1051
+RMD160 3760c96e67435fd702d74530f8645a9c5c7164d4 files/eclipse-3.0.2 1051
+SHA256 af39426e34a8d210d989532188d745a2e91f5a87947f469b6abc4606ce4dc803 files/eclipse-3.0.2 1051
 MD5 e4ee97056b94052240fb360db6ffaef9 files/eclipse-3.1 1438
+RMD160 181c221f8cbb077d864dd8e76d0b43b85fa6f938 files/eclipse-3.1 1438
+SHA256 27f57889f7eac436b42e863b7c91cd650c0605d9d7267d0f36d490fa22a36db7 files/eclipse-3.1 1438
 MD5 69ee2069b0260e40c6fa93315ff759cc files/eclipse-3.1.desktop 226
+RMD160 073d2f45236fa31d61ffac2b80b36d48baa413f6 files/eclipse-3.1.desktop 226
+SHA256 2988739e9cdcad6da8f6f6b97703618c895aa4a522e03b4659e709c85f09f418 files/eclipse-3.1.desktop 226
 MD5 429b757eb766856a6b29094b06402576 files/eclipse-3.desktop 222
+RMD160 b5a2a69d1cb9df3d1f7664e26ad6b3f213067fc7 files/eclipse-3.desktop 222
+SHA256 5ed393cde49d6b2ff11a798cc35593128a2e5b883d5727f541a7701805081291 files/eclipse-3.desktop 222
 MD5 32be5292ce0af7ff9c1866c1f59e1859 files/eclipse.1 2607
+RMD160 06aaeb02a7c7720c8d8b26d9d1252095b6098a25 files/eclipse.1 2607
+SHA256 5165b07f736763eab05decb39397be0be8ae03b77f614ba3794eff71d411537b files/eclipse.1 2607
 MD5 8de14dda7d318d8fb514fdbcecd4058b metadata.xml 782
+RMD160 5b8dc4f4b6bdd457da62f967ec176bee2ae7e5e4 metadata.xml 782
+SHA256 a1e6bbc5427799b8607d355e3e09ce7d4de98f2a365417ec158eb56f4f00746f metadata.xml 782
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.0.2.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.0.2.ebuild
index 7cfa9d1f3cf4..5e38aa089601 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.0.2.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.0.2.ebuild,v 1.2 2005/04/09 02:11:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.0.2.ebuild,v 1.3 2006/04/17 14:52:11 centic Exp $
 
 inherit eutils java-utils
 
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.1.2.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.1.2.ebuild
new file mode 100644
index 000000000000..b5cf2556af5d
--- /dev/null
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.1.2.ebuild
@@ -0,0 +1,370 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.1.2.ebuild,v 1.1 2006/04/17 14:52:11 centic Exp $
+
+inherit eutils java-utils
+
+MY_A="eclipse-sourceBuild-srcIncluded-3.1.2.zip"
+DESCRIPTION="Eclipse Tools Platform"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/R-3.1.2-200601181600/${MY_A}"
+IUSE="gnome mozilla firefox jikes nosrc nodoc atk"
+SLOT="3.1"
+LICENSE="CPL-1.0"
+KEYWORDS="~x86 ~ppc ~amd64"
+
+RDEPEND=">=virtual/jre-1.4.2
+	>=x11-libs/gtk+-2.2.4
+	mozilla? ( >=www-client/mozilla-1.7 )
+	atk? ( >=dev-libs/atk-1.6 )
+	firefox? ( >=www-client/mozilla-firefox-1.0.2 )
+	gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* )"
+
+DEPEND="${RDEPEND}
+	>=virtual/jdk-1.4.2
+	jikes? ( >=dev-java/jikes-1.21 )
+	>=dev-java/ant-1.6.2
+	>=dev-java/ant-core-1.6.2-r4
+	>=sys-apps/findutils-4.1.7
+	app-arch/unzip
+	app-arch/zip"
+
+# TODO:
+# - use CFLAGS from make.conf when building native libraries
+#   - must patch eclipse build files
+#   - also submit patch to bugs.eclipse
+# - intergration to eclipse plugin ebuilds most likely broken
+# - ppc support not tested, but not explicitly broken either
+
+pkg_setup() {
+
+	einfo "Checking for sufficient physical RAM"
+	check-ram
+	check-cflags
+
+	java-utils_setup-vm
+
+	java-utils_ensure-vm-version-ge 1 4 2
+
+	# all other gentoo archs match in eclipse build system except amd64
+	if [ ${ARCH} == 'amd64' ] ; then
+		eclipsearch=x86_64
+	else
+		eclipsearch=${ARCH}
+	fi
+
+	# all other gentoo archs match in sun jdk library patch except x86
+	if [ ${ARCH} == 'x86' ] ; then
+		jvmarch=i386
+	else
+		jvmarch=${ARCH}
+	fi
+}
+
+src_unpack() {
+
+	mkdir ${S}
+	cd ${S}
+	unpack ${MY_A} || die "Could not unpack ${MY_A}"
+
+	epatch ${FILESDIR}/06-path-fixups.patch
+
+	einfo "Setting up virtual machine"
+	java-utils_setup-vm
+
+	einfo "Cleaning out prebuilt code"
+	clean-prebuilt-code
+
+	einfo "Patching makefiles"
+	process-makefiles
+
+	patch_amd64_ibm_jvm
+
+}
+
+src_compile() {
+
+	# karltk: this should be handled by the java-pkg eclass in setup-vm 
+	addwrite "/proc/self/maps"
+	addwrite "/proc/cpuinfo"
+	addwrite "/dev/random"
+
+	# Figure out VM, set up ant classpath and native library paths
+	setup-jvm-opts
+
+	${use_gtk} && use mozilla && setup-mozilla-opts
+
+	use jikes && bootstrap_ant_opts="-Dbuild.compiler=jikes"
+
+	einfo "Bootstrapping bootstrap ecj"
+	ant ${bootstrap_ant_opts} -q -f jdtcoresrc/compilejdtcorewithjavac.xml || die "Failed to bootstrap ecj"
+
+	einfo "Bootstrapping ecj"
+	ant -lib jdtcoresrc/ecj.jar -q -f jdtcoresrc/compilejdtcore.xml || die "Failed to bootstrap ecj"
+
+	einfo "Compiling Eclipse -- see ${S}/compilelog.txt for details"
+	ANT_OPTS="-Xmx1024M" \
+		ant -lib jdtcoresrc/ecj.jar -q -f build.xml \
+		-DinstallOs=linux \
+		-DinstallWs=gtk \
+		-DinstallArch=${eclipsearch} \
+		-Dbootclasspath=${bootclasspath} \
+		-Dlibsconfig=true \
+		-DjavacTarget=1.4 \
+		-DjavacSource=1.4 \
+		-DjavacVerbose=false \
+		-DjavacFailOnError=true \
+		-DjavacDebugInfo=true \
+		-DbuildId="Gentoo Linux ${PF}" \
+		|| die "Failed to compile Eclipse"
+
+	cp launchertmp/eclipse eclipse-gtk || die "Cannot find eclipse binary"
+
+	einfo "Creating .desktop entry"
+	create-desktop-entry
+}
+
+src_install() {
+
+	eclipse_dir="/usr/lib/eclipse-${SLOT}"
+
+	dodir /usr/lib
+
+	einfo "Installing features and plugins"
+
+	[ -f result/linux-gtk-${eclipsearch}-sdk.tar.gz ] || die "tar.gz bundle was not built properly!"
+	tar zxf result/linux-gtk-${eclipsearch}-sdk.tar.gz -C ${D}/usr/lib || die "Failed to extract the built package"
+
+
+	mv ${D}/usr/lib/eclipse ${D}/${eclipse_dir}
+
+	insinto ${eclipse_dir}
+
+	# Install launchers and native code
+	exeinto ${eclipse_dir}
+
+	einfo "Installing eclipse-gtk binary"
+	doexe eclipse-gtk || die "Failed to install eclipse binary"
+
+	if use nosrc ; then
+		einfo "Stripping away source code"
+		strip-src
+	fi
+
+	if use nodoc ; then
+		einfo "Stripping away documentation"
+		strip-docs
+	fi
+
+	# Install startup script
+	exeinto /usr/bin
+	doexe ${FILESDIR}/eclipse-${SLOT}
+
+	install-desktop-entry
+
+	doman ${FILESDIR}/eclipse.1
+
+	install-link-files
+}
+
+# -----------------------------------------------------------------------------
+#  Helper functions
+# -----------------------------------------------------------------------------
+
+function setup-mozilla-opts()
+{
+	mozilla_dir="--mozdir-unset---"
+
+	if [ -f ${ROOT}/usr/lib/MozillaFirefox/libgtkembedmoz.so ] ; then
+		einfo "Compiling against www-client/mozilla-firefox"
+		mozilla_dir=/usr/lib/MozillaFirefox
+	elif [ -f ${ROOT}/usr/lib/mozilla/libgtkembedmoz.so ] ; then
+		einfo "Compiling against www-client/mozilla"
+		mozilla_dir=/usr/lib/mozilla
+	else
+		eerror "You have enabled the embedded mozilla component, but no suitable"
+		eerror "provider was found. You need Mozilla or Firefox compiled against"
+		eerror "gtk+ v2.0 or newer."
+		eerror "To merge it, execute 'USE=\"gtk2\" emerge mozilla' as root."
+		eerror "To disable embedded mozilla, remove \"mozilla\" from your USE flags."
+		die "Need Mozilla compiled with gtk+-2.x support"
+	fi
+
+	export GECKO_SDK="${mozilla_dir}"
+	export GECKO_INCLUDES="-include ${GECKO_SDK}/include/mozilla-config.h \
+		-I${GECKO_SDK}/include/nspr \
+		-I${GECKO_SDK}/include/nspr \
+		-I${GECKO_SDK}/include/xpcom \
+		-I${GECKO_SDK}/include/string \
+		-I${GECKO_SDK}/include/embed_base \
+		-I${JAVA_HOME}/include/linux"
+	export GECKO_LIBS="-L${GECKO_SDK} -lgtkembedmoz"
+}
+
+function build-native() {
+	sh features/org.eclipse.platform.launchers/library/gtk/build.sh \
+		-os linux -ws gtk \
+		-arch ${eclipsearch} || die "Failed to build launcher"
+}
+
+function process-makefiles() {
+
+	# Comment out hard-coded JAVA_HOME
+	sed -i 's/^JAVA_HOME/#JAVA_HOME/' plugins/org.eclipse.core.resources.linux/src/Makefile || die "Failed to patch Makefile"
+
+	# Select the set of native libraries to compile
+	local libs="make_swt make_awt make_atk"
+
+	if use gnome ; then
+		einfo "Building GNOME VFS support"
+		libs="${libs} make_gnome"
+	fi
+
+	if use mozilla ; then
+		einfo "Building Mozilla embed support"
+		libs="${libs} make_mozilla"
+	fi
+
+	if use atk ; then
+		einfo "Building ATK support"
+		libs="${libs} make_atk"
+	fi
+
+	sed -i "s/^all:.*/all: ${libs}/" "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak" || die "Failed to patch make_linux.mak"
+}
+
+function create-desktop-entry() {
+
+	cat ${FILESDIR}/eclipse-${SLOT}.desktop | \
+		sed -e "s/@PV@/${PV}/" \
+		> eclipse-${SLOT}.desktop || die "Failed to create desktop entry"
+}
+
+function install-desktop-entry() {
+
+	dodir /usr/share/applications
+	insinto /usr/share/applications
+	doins eclipse-${SLOT}.desktop
+}
+
+function clean-prebuilt-code() {
+
+	find ${S} -type f \( -name '*.class' -o -name '*.so' -o -name '*.so.*' -o -name 'eclipse' \) | xargs rm -f
+}
+
+function get-memory-total() {
+	cat /proc/meminfo | grep MemTotal | sed -r "s/[^0-9]*([0-9]+).*/\1/"
+}
+
+function check-ram() {
+
+	local mem=$(get-memory-total)
+	[ $(get-memory-total) -lt 775000 ] &&
+		(
+		echo
+		ewarn "To build Eclipse, at least 768MB of RAM is recommended."
+		ewarn "Your machine has less RAM. Continuing anyway. If the build"
+		ewarn "stops with an error about invalid memory, increase your swap."
+		echo
+		)
+}
+
+function install-link-files() {
+
+	einfo "Installing link files"
+
+	dodir /usr/lib/eclipse-${SLOT}/links
+
+	echo "path=/opt/eclipse-extensions-3" > ${D}/${eclipse_dir}/links/eclipse-binary-extensions-3.link
+	echo "path=/opt/eclipse-extensions-3.1" > ${D}/${eclipse_dir}/links/eclipse-binary-extensions-3.1.link
+
+	echo "path=/usr/lib/eclipse-extensions-3" > ${D}/${eclipse_dir}/links/eclipse-extensions-3.link
+	echo "path=/usr/lib/eclipse-extensions-3.1" > ${D}/${eclipse_dir}/links/eclipse-extensions-3.1.link
+}
+
+function patch_amd64_ibm_jvm() {
+	# the ibm jdk ebuild should have fixed headers, but until then
+	# we just fix the compiling here (see bug #97421)
+	if [ ${ARCH} == 'amd64' ]; then
+	    if [ ! -z "`java-config --java-version | grep IBM`" ] ; then
+		einfo "Fixing IBM jdk header problem"
+		find plugins -name "make_linux.mak" -print0 | xargs -0 sed -i -e 's/^CFLAGS =/CFLAGS = -D_JNI_IMPORT_OR_EXPORT_= /'
+	    fi
+	fi
+}
+
+function setup-jvm-opts() {
+
+	# Figure out correct boot classpath
+	# karltk: this should be handled by the java-pkg eclass in setup-vm
+	if [ ! -z "`java-config --java-version | grep IBM`" ] ; then
+		# IBM JRE
+		local bp="$(java-config --jdk-home)/jre/lib"
+		bootclasspath="${bp}/core.jar:${bp}/xml.jar:${bp}/graphics.jar:${bp}/security.jar:${bp}/server.jar"
+	        JAVA_LIB_DIR="$(java-config --jdk-home)/jre/bin"
+	else
+		# Sun derived JREs (Blackdown, Sun)
+		local bp="$(java-config --jdk-home)/jre/lib"
+		bootclasspath="${bp}/rt.jar:${bp}/jsse.jar"
+	        JAVA_LIB_DIR="$(java-config --jdk-home)/jre/lib/${jvmarch}"
+	fi
+	einfo "Using bootclasspath ${bootclasspath}"
+	einfo "Using JVM library path ${JAVA_LIB_DIR}"
+
+	if [ ! -f ${JAVA_LIB_DIR}/libawt.so ] ; then
+	    die "Could not find libawt.so native library"
+	fi
+
+	export AWT_LIB_PATH=${JAVA_LIB_DIR}
+}
+
+function strip-src() {
+
+	local bp=${D}/${eclipse_dir}
+
+	rm -rf ${bp}/plugins/org.eclipse.pde.source_3*
+	rm -rf ${bp}/plugins/org.eclipse.jdt.source_3*
+	rm -rf ${bp}/plugins/org.eclipse.platform.source.linux.*
+	rm -rf ${bp}/plugins/org.eclipse.platform.source_3*
+
+	rm -rf ${bp}/features/org.eclipse.jdt.source_3*/
+	rm -rf ${bp}/features/org.eclipse.pde.source_3*/
+	rm -rf ${bp}/features/org.eclipse.platform.source_3*/
+}
+
+function strip-docs() {
+	local bp=${D}/${eclipse_dir}
+
+	rm -rf ${bp}/plugins/org.eclipse.platform.doc.*
+	rm -rf ${bp}/plugins/org.eclipse.jdt.doc.*
+	rm -rf ${bp}/plugins/org.eclipse.pde.doc.*
+}
+
+function check-cflags() {
+
+	einfo "Checking for bad CFLAGS"
+
+	local badflags="-fomit-frame-pointer -msse2"
+	local error=false
+
+	for x in ${badflags} ; do
+		if [ ! -z "$(echo ${CFLAGS} | grep -- $x)" ] ; then
+			ewarn "Found offending option $x in your CFLAGS"
+			error=true
+		fi
+	done
+	if [ ${error} == "true" ]; then
+		echo
+		ewarn "One or more potentially gruesome CFLAGS detected. When you run into trouble,"
+		ewarn "please edit /etc/make.conf and remove all offending flags, then recompile"
+		ewarn "Eclipse and all its dependencies before submitting a bug report."
+		echo
+		ewarn "In particular, gtk+ is extremely sensitive to which which flags it was"
+		ewarn "compiled with."
+		echo
+		einfo "Tip: use equery depgraph \"=${PF}\" to list all dependencies."
+		echo
+		ebeep
+	fi
+}
+
diff --git a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-2.1.3-r5 b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-2.1.3-r5
index 2591bac39c0d..74b799064fcb 100644
--- a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-2.1.3-r5
+++ b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-2.1.3-r5
@@ -1,2 +1,6 @@
-MD5 cd8132138afbd252bf35bb83546534dc eclipse-sourceBuild-srcIncluded-2.1.3.zip 45066815
 MD5 6d82d2f019e1af7bd5b52cfe68e16c06 eclipse-sdk-2.1.3_00-refactor-rename.patch.gz 5569
+RMD160 68593bda81fb0cc2cf13c50b2f63f680d0853c44 eclipse-sdk-2.1.3_00-refactor-rename.patch.gz 5569
+SHA256 1b278641d48ffdb1889d481269a0970a261c77d78078be8307fb287606f8bde6 eclipse-sdk-2.1.3_00-refactor-rename.patch.gz 5569
+MD5 cd8132138afbd252bf35bb83546534dc eclipse-sourceBuild-srcIncluded-2.1.3.zip 45066815
+RMD160 56653379f4933971923b8ec456621cd7cec29599 eclipse-sourceBuild-srcIncluded-2.1.3.zip 45066815
+SHA256 a9e53db27d975eade2da1899a875c18fe344c7fbe968577ae40b9fff54b5e8eb eclipse-sourceBuild-srcIncluded-2.1.3.zip 45066815
diff --git a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.0.0-r3 b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.0.0-r3
index bf2206268605..ca7fd4418d21 100644
--- a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.0.0-r3
+++ b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.0.0-r3
@@ -1 +1,3 @@
 MD5 962a41fe062f0ddc809ca956687c7e01 eclipse-sourceBuild-srcIncluded-3.0.zip 55140382
+RMD160 fc5fe60435df153f1add7c4e724ab9b93c2897ef eclipse-sourceBuild-srcIncluded-3.0.zip 55140382
+SHA256 f0f151da4fba363668aef55ff9f445795a99c9fc72792f2535961fc39d0aacc7 eclipse-sourceBuild-srcIncluded-3.0.zip 55140382
diff --git a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.0.1-r2 b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.0.1-r2
index df2af49b408d..183c809210df 100644
--- a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.0.1-r2
+++ b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.0.1-r2
@@ -1 +1,3 @@
 MD5 c95561df899a47fc05261531ed0b9221 eclipse-sourceBuild-srcIncluded-3.0.1.zip 55618511
+RMD160 fba01eb0f019a888e9d9deb57ad7b284f218e783 eclipse-sourceBuild-srcIncluded-3.0.1.zip 55618511
+SHA256 5f6eb496d3db940b1085032a807337dbc477a0da9877a7cea50d39d32dfde050 eclipse-sourceBuild-srcIncluded-3.0.1.zip 55618511
diff --git a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.0.2 b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.0.2
index 30919a8cb619..94a883fe46af 100644
--- a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.0.2
+++ b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.0.2
@@ -1 +1,3 @@
 MD5 1e2e595469af58245781f17075495389 eclipse-sourceBuild-srcIncluded-3.0.2.zip 55945573
+RMD160 57f0b11c24a8e9982e6d446d14b4782112e5b1a7 eclipse-sourceBuild-srcIncluded-3.0.2.zip 55945573
+SHA256 0c9e961fbf11d782b0c8c743122e5cc8567f3b06f48f38d6b40a8a78ead567d9 eclipse-sourceBuild-srcIncluded-3.0.2.zip 55945573
diff --git a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.1-r1 b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.1-r1
index 2e658fece335..e6f820af5967 100644
--- a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.1-r1
+++ b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.1-r1
@@ -1 +1,3 @@
 MD5 19ad65d52005da5eaa1d3687b3a50de2 eclipse-sourceBuild-srcIncluded-3.1.zip 66241870
+RMD160 ea38b1c8d0933aafcf1286a5c5160e2cffccb6d2 eclipse-sourceBuild-srcIncluded-3.1.zip 66241870
+SHA256 5af7804d1629dbb3e6c8e2809b846966178e2f626d03395cceac488397ee9c79 eclipse-sourceBuild-srcIncluded-3.1.zip 66241870
diff --git a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.1.2 b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.1.2
new file mode 100644
index 000000000000..f22ddffd2fd5
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.1.2
@@ -0,0 +1,3 @@
+MD5 f2c8066151de14c5ccdf420266ce9f39 eclipse-sourceBuild-srcIncluded-3.1.2.zip 66630673
+RMD160 ffe59352fe02b4a47be3e9a6daad3a5501f196b0 eclipse-sourceBuild-srcIncluded-3.1.2.zip 66630673
+SHA256 31233332f205a197a42aafdc4f15a4f38eb5e4be19ac8a7192492ab8a21324a4 eclipse-sourceBuild-srcIncluded-3.1.2.zip 66630673