Disabling mozilla support in 3.0.x for bug #137665

Package-Manager: portage-2.1.1_pre2-r2

6 files changed, 868 insertions, 5 deletions

diff --git a/dev-util/eclipse-sdk/ChangeLog b/dev-util/eclipse-sdk/ChangeLog
index 1bf37016d2c2..017723d3cd2b 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.110 2006/07/06 12:36:30 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.111 2006/07/06 14:07:37 nichoj Exp $
+
+*eclipse-sdk-3.0.2-r1 (06 Jul 2006)
+*eclipse-sdk-3.0.1-r3 (06 Jul 2006)
+
+  06 Jul 2006; Joshua Nichols <jnichols@gentoo.org>
+  +eclipse-sdk-3.0.1-r3.ebuild, +eclipse-sdk-3.0.2-r1.ebuild:
+  Disabling mozilla support in 3.0.x for bug #137665
 
   06 Jul 2006; Joshua Nichols <nichoj@gentoo.org>
   eclipse-sdk-3.0.1-r2.ebuild:
diff --git a/dev-util/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest
index cb4257c6977b..936ea635bcfa 100644
--- a/dev-util/eclipse-sdk/Manifest
+++ b/dev-util/eclipse-sdk/Manifest
@@ -59,6 +59,14 @@ EBUILD eclipse-sdk-3.0.1-r2.ebuild 14247 RMD160 cd91598eab97d4b4ff9f42283750e13a
 MD5 7858e5c3fd1c675c2b5662b9f2384ab8 eclipse-sdk-3.0.1-r2.ebuild 14247
 RMD160 cd91598eab97d4b4ff9f42283750e13ab1d3f9fe eclipse-sdk-3.0.1-r2.ebuild 14247
 SHA256 52c35cf9e1e31c92f4b5a5bc9e81fb8644df7d4c4836287295279cf9f1954e9d eclipse-sdk-3.0.1-r2.ebuild 14247
+EBUILD eclipse-sdk-3.0.1-r3.ebuild 13023 RMD160 76938e59fa39b82423a51571527ec01082db3a75 SHA1 4016c47955137faa6cf03a39421cace7a469799f SHA256 b7eee01b05ed544e96e022129c5029e16bc6921280ccc9979900d9c2e1c50dd2
+MD5 4ca16ee06d960938f7250595be7a0a92 eclipse-sdk-3.0.1-r3.ebuild 13023
+RMD160 76938e59fa39b82423a51571527ec01082db3a75 eclipse-sdk-3.0.1-r3.ebuild 13023
+SHA256 b7eee01b05ed544e96e022129c5029e16bc6921280ccc9979900d9c2e1c50dd2 eclipse-sdk-3.0.1-r3.ebuild 13023
+EBUILD eclipse-sdk-3.0.2-r1.ebuild 12563 RMD160 0b99c5268dcde8796957b5608676338afedcea58 SHA1 5bf6e8ea7cc34e37d41331b81fe592231b3867d0 SHA256 79af60dc9cda577219aa9d230756f52b53856fb21c6c51e912bf2987bc168f0d
+MD5 8e932d482bc2a8d8d5fdb740a93930a4 eclipse-sdk-3.0.2-r1.ebuild 12563
+RMD160 0b99c5268dcde8796957b5608676338afedcea58 eclipse-sdk-3.0.2-r1.ebuild 12563
+SHA256 79af60dc9cda577219aa9d230756f52b53856fb21c6c51e912bf2987bc168f0d eclipse-sdk-3.0.2-r1.ebuild 12563
 EBUILD eclipse-sdk-3.0.2.ebuild 13828 RMD160 0ff8c21197b594fbe05b01506a316990b533a67c SHA1 e7bea2249f846701cab2358ea4ed3cc8d0c48226 SHA256 01312d059ea42f34b6819306dc06b08098850e18ed1a64cb5d8b18349f9f7154
 MD5 d1b1a1ccb18e4977fb1548bb20e1de63 eclipse-sdk-3.0.2.ebuild 13828
 RMD160 0ff8c21197b594fbe05b01506a316990b533a67c eclipse-sdk-3.0.2.ebuild 13828
@@ -71,10 +79,10 @@ EBUILD eclipse-sdk-3.2.ebuild 9467 RMD160 1c5b06efce3b58f57f01d5ccafe433c7bdc756
 MD5 b1c5ef3ae89e8239d89765bd444834e2 eclipse-sdk-3.2.ebuild 9467
 RMD160 1c5b06efce3b58f57f01d5ccafe433c7bdc7561b eclipse-sdk-3.2.ebuild 9467
 SHA256 00c6f86a6f0bd7fd340e8e4ad7948d25b4794cc95899c74c64de91b1370413d2 eclipse-sdk-3.2.ebuild 9467
-MISC ChangeLog 21852 RMD160 9de54691a4f162353fb4a56e7e900f9ac323a772 SHA1 9406afb202e8596e58950727a5a2530129bbd5c8 SHA256 07e68220b83ccec14b55ec8ec20833a3da487e1a02a71382df717bbe9dd64df7
-MD5 ca2102d7b15e962cedb8f806f9e10ba7 ChangeLog 21852
-RMD160 9de54691a4f162353fb4a56e7e900f9ac323a772 ChangeLog 21852
-SHA256 07e68220b83ccec14b55ec8ec20833a3da487e1a02a71382df717bbe9dd64df7 ChangeLog 21852
+MISC ChangeLog 22093 RMD160 465596503efe5603de98ee13cca9c071a1467b4c SHA1 5f1487373d4a5fb11bc88f1c12a035e4b800ffff SHA256 75bdc4b1172b9e910d306bd84f7a0ce51314f2ccdd4da5e62e7a2b2480e7d43a
+MD5 9e8bf32b06debc20ef6bddb01822cb45 ChangeLog 22093
+RMD160 465596503efe5603de98ee13cca9c071a1467b4c ChangeLog 22093
+SHA256 75bdc4b1172b9e910d306bd84f7a0ce51314f2ccdd4da5e62e7a2b2480e7d43a ChangeLog 22093
 MISC metadata.xml 782 RMD160 5b8dc4f4b6bdd457da62f967ec176bee2ae7e5e4 SHA1 17bc63605d0a30dca27521cf908a69c0996eab07 SHA256 a1e6bbc5427799b8607d355e3e09ce7d4de98f2a365417ec158eb56f4f00746f
 MD5 8de14dda7d318d8fb514fdbcecd4058b metadata.xml 782
 RMD160 5b8dc4f4b6bdd457da62f967ec176bee2ae7e5e4 metadata.xml 782
@@ -82,9 +90,15 @@ SHA256 a1e6bbc5427799b8607d355e3e09ce7d4de98f2a365417ec158eb56f4f00746f metadata
 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 37cb08890933099f5dc691636c998299 files/digest-eclipse-sdk-3.0.1-r3 310
+RMD160 932beb8b050885d55923a99f873eeb060e202304 files/digest-eclipse-sdk-3.0.1-r3 310
+SHA256 0de94c0723ef302003eab0a95ab2a1c38869a827d50c01984f74d1dfd83eb203 files/digest-eclipse-sdk-3.0.1-r3 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 e4fe184225b61ac63ba71f1157e0bb4e files/digest-eclipse-sdk-3.0.2-r1 310
+RMD160 370ff7e60e462001598b2f8357b463b9389071b7 files/digest-eclipse-sdk-3.0.2-r1 310
+SHA256 da189a7c7ddd6b1661391f5e149d905d79779d4863502d4b769216b19a5fed42 files/digest-eclipse-sdk-3.0.2-r1 310
 MD5 0dd05cebf3928888ff566c433da96335 files/digest-eclipse-sdk-3.1.2-r3 310
 RMD160 dea902b88d52673c42f034ab9451e145bc52b30c files/digest-eclipse-sdk-3.1.2-r3 310
 SHA256 01187ce1cad8c9037d48c130cd9d98167d7c934e075d42c7c55f3adae8105749 files/digest-eclipse-sdk-3.1.2-r3 310
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.0.1-r3.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.0.1-r3.ebuild
new file mode 100644
index 000000000000..919efb2cc2c8
--- /dev/null
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.0.1-r3.ebuild
@@ -0,0 +1,429 @@
+# 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.1-r3.ebuild,v 1.1 2006/07/06 14:07:37 nichoj Exp $
+
+inherit eutils java-utils
+
+# karltk: Portage 2.0.51_pre13 needs this
+MY_A="eclipse-sourceBuild-srcIncluded-3.0.1.zip"
+DESCRIPTION="Eclipse Tools Platform"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download2.eclipse.org/downloads/drops/R-3.0.1-200409161125/${MY_A}"
+IUSE="gtk motif gnome kde"
+SLOT="3"
+LICENSE="CPL-1.0"
+KEYWORDS="x86 ppc ~amd64"
+
+RDEPEND="|| ( >=virtual/jdk-1.4.2 =dev-java/blackdown-jdk-1.4.2* )
+	gtk? ( >=x11-libs/gtk+-2.2.4 )
+	!gtk? (	kde? ( kde-base/kdelibs x11-libs/openmotif )
+		!kde? ( motif? ( x11-libs/openmotif )
+			!motif? ( >=x11-libs/gtk+-2.2.4 )
+		      )
+	      )
+	gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* )
+	!media-fonts/unifont"
+
+DEPEND="${RDEPEND}
+	>=dev-java/ant-1.5.3
+	>=sys-apps/findutils-4.1.7
+	>=app-shells/tcsh-6.11
+	app-arch/unzip
+	app-arch/zip"
+
+pkg_setup() {
+	java-pkg_pkg_setup
+
+	check-ram
+
+	java-utils_setup-vm
+
+	java-utils_ensure-vm-version-ge 1 4 2
+
+	setup-dir-vars
+
+	use gtk && use_gtk='true' || use_gtk='false'
+	use motif && use_motif='true' || use_motif='false'
+
+	# If gtk+ enabled, disable motif
+	${use_gtk} && use_motif='false'
+
+	# If neither enabled, default to gtk+
+	${use_gtk} || ${use_motif} || use_gtk='true'
+
+	# If both enabled, use gtk+ only
+	${use_gtk} && ${use_motif} && use_motif='false'
+
+	einfo "Compiling gtk+ frontend  : ${use_gtk}"
+	einfo "Compiling Motif frontend : ${use_motif}"
+
+}
+
+src_unpack() {
+	mkdir ${S}
+	cd ${S}
+	unpack ${MY_A} || die "Could not unpack ${MY_A}"
+
+	epatch ${FILESDIR}/03-motif-java1.5-build.patch
+	epatch ${FILESDIR}/04-amd64-gtk.patch
+
+	einfo "Setting up virtual machine"
+	java-utils_setup-vm
+
+	einfo "Patching build.xmls"
+	process-build-xmls
+
+	einfo "Cleaning out prebuilt code"
+	clean-prebuilt-code
+
+	einfo "Patching gtk+ frontend"
+	patch-gtk-frontend
+
+	einfo "Patching Motif frontend"
+	patch-motif-frontend
+
+	einfo "Set build version in Help->About"
+	find -type f -name about.mappings -exec sed -e "s/@build@/Gentoo Linux ${PF}/" -i \{\} \;
+}
+
+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 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
+		ant_extra_opts="-Dbootclasspath=$(java-config --jdk-home)/jre/lib/core.jar:$(java-config --jdk-home)/jre/lib/xml.jar:$(java-config --jdk-home)/jre/lib/graphics.jar"
+	else
+		# Sun derived JREs (Blackdown, Sun)
+		ant_extra_opts="-Dbootclasspath=$(java-config --jdk-home)/jre/lib/rt.jar"
+	fi
+
+	export ANT_OPTS=-Xmx768m
+
+	einfo "Building resources.core plugin"
+	cd ${S}/${core_src_dir}
+	make JDK_INCLUDE="`java-config -O`/include -I`java-config -O`/include/linux" || die "Failed to build resource.core plugin"
+	mkdir -p ${S}/"${core_dest_dir}"
+	mv *.so ${S}/"${core_dest_dir}"
+	cd ${S}
+
+	# Compile all Java code
+	${use_gtk} && build-gtk-java compile
+	${use_motif} && build-motif-java compile
+
+	# Build selected native frontend code
+	${use_gtk} && build-gtk-native
+	${use_motif} && build-motif-native
+
+	# Install all Java code
+	${use_gtk} && build-gtk-java install
+	${use_motif} && build-motif-java install
+
+	create-desktop-entry
+}
+
+src_install() {
+	eclipse_dir="/usr/lib/eclipse-${SLOT}"
+
+	dodir /usr/lib
+
+	einfo "Installing features and plugins"
+	if ${use_gtk} ; then
+		[ -f result/linux-gtk-${ARCH}-sdk.zip ] || die "gtk zip bundle was not build properly!"
+		unzip -o -q result/linux-gtk-${ARCH}-sdk.zip -d ${D}/usr/lib
+	fi
+	if ${use_motif} ; then
+		[ -f result/linux-motif-${ARCH}-sdk.zip ] || die "motif zip bundle was not build properly!"
+		unzip -o -q result/linux-motif-${ARCH}-sdk.zip -d ${D}/usr/lib
+	fi
+
+	mv ${D}/usr/lib/eclipse ${D}/${eclipse_dir}
+
+	insinto ${eclipse_dir}
+
+	# Install launchers and native code
+	exeinto ${eclipse_dir}
+	if ${use_gtk} ; then
+		einfo "Installing eclipse-gtk binary"
+		doexe plugins/platform-launcher/library/gtk/eclipse-gtk \
+			|| die "Failed to install eclipse-gtk"
+	fi
+	if ${use_motif} ; then
+		einfo "Installing eclipse-motif binary"
+		doexe plugins/platform-launcher/library/motif/eclipse-motif \
+			|| die "Failed to install eclipse-motif"
+	fi
+
+	doins plugins/org.eclipse.platform/{startup.jar,splash.bmp}
+
+	# Install startup script
+	exeinto /usr/bin
+	doexe ${FILESDIR}/eclipse-${SLOT}
+
+	install-desktop-entry
+
+	install-link-files
+
+
+	doman ${FILESDIR}/eclipse.1
+}
+
+# -----------------------------------------------------------------------------
+#  Helper functions
+# -----------------------------------------------------------------------------
+
+function setup-dir-vars() {
+	gtk_launcher_src_dir="plugins/platform-launcher/library/gtk"
+	motif_launch_src_dir="plugins/platform-launcher/library/motif"
+	gtk_swt_src_dir="plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
+	motif_swt_src_dir="plugins/org.eclipse.swt/Eclipse SWT PI/motif/library"
+
+	core_src_dir="plugins/org.eclipse.core.resources.linux/src"
+
+	case ${ARCH} in
+		sparc)
+			gtk_swt_dest_dir="plugins/org.eclipse.swt.gtk/os/solaris/sparc"
+			motif_swt_dest_dir="plugins/org.eclipse.swt.motif/os/solaris/sparc"
+			core_dest_dir="plugins/org.eclipse.core.resources.linux/os/solaris/sparc"
+			;;
+		x86)
+			gtk_swt_dest_dir="plugins/org.eclipse.swt.gtk/os/linux/x86"
+			motif_swt_dest_dir="plugins/org.eclipse.swt.motif/os/linux/x86"
+			core_dest_dir="plugins/org.eclipse.core.resources.linux/os/linux/x86"
+			;;
+		ppc)
+			gtk_swt_dest_dir="plugins/org.eclipse.swt.gtk/os/linux/ppc"
+			motif_swt_dest_dir="plugins/org.eclipse.swt.motif/os/linux/ppc"
+			core_dest_dir="plugins/org.eclipse.core.resources.linux/os/linux/ppc/"
+			;;
+		amd64)
+			gtk_swt_dest_dir="plugins/org.eclipse.swt.gtk64/os/linux/amd64"
+			motif_swt_dest_dir="plugins/org.eclipse.swt.motif/os/linux/amd64"
+			core_dest_dir="plugins/org.eclipse.core.resources.linux/os/linux/amd64"
+			;;
+	esac
+}
+
+function process-build-xmls() {
+
+	# Turn off verbose mode and on errors in all build.xml files
+	for x in $(find . -type f -name "build.xml") ; do
+		sed -i -r \
+			-e 's/failonerror="[^"]+"/failonerror="true"/' \
+			-e 's/verbose="[^"]+"/verbose="false"/' $x
+	done
+}
+
+function patch-gtk-frontend() {
+
+	# Move around some source code that should have been handled by the build system
+	local m="Failed to move native files for SWT gtk+"
+	cp ${S}/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/* ${S}/"${gtk_swt_src_dir}" || die ${m}
+	cp ${S}/plugins/org.eclipse.swt/Eclipse\ SWT\ Mozilla/common/library/* ${S}/"${gtk_swt_src_dir}" || die ${m}
+	cp ${S}/plugins/org.eclipse.swt/Eclipse\ SWT\ Program/gnome/library/* ${S}/"${gtk_swt_src_dir}" || die ${m}
+	cp ${S}/plugins/org.eclipse.swt/Eclipse\ SWT\ AWT/gtk/library/* ${S}/"${gtk_swt_src_dir}" || die ${m}
+
+	if use gnome ; then
+	    gnome_lib=`pkg-config --libs gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 | sed -e "s:-pthread:-lpthread:" -e "s:-Wl,--export:--export:"`
+	fi
+
+	if ${use_gtk} ; then
+		gtk_lib=`pkg-config --libs gtk+-2.0 gthread-2.0 | sed -e "s:-pthread:-lpthread:" -e "s:-Wl,--export:--export:"`
+		atk_lib=`pkg-config --libs atk gtk+-2.0 | sed -e "s:-Wl,--export:--export:"`
+	fi
+
+	sed -e "s:/bluebird/teamswt/swt-builddir/IBMJava2-141:$JAVA_HOME:" \
+		-e "s:/bluebird/teamswt/swt-builddir/jdk1.5.0:$JAVA_HOME:" \
+		-e "s:\`pkg-config --libs gtk+-2.0 gthread-2.0\`:${gtk_lib}:" \
+		-e "s:\`pkg-config --libs atk gtk+-2.0\`:${atk_lib}:" \
+		-e "s:\`pkg-config --libs gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0\`:${gnome_lib}:" \
+		-e "s:-I\$(JAVA_HOME)/include:-I\$(JAVA_HOME)/include -I\$(JAVA_HOME)/include/linux:" \
+		-e "s:-I\$(JAVA_HOME)\t:-I\$(JAVA_HOME)/include -I\$(JAVA_HOME)/include/linux:" \
+		-e "s:\$(JAVA_HOME)/jre/bin:\$(JAVA_HOME)/jre/lib/i386:" \
+		-i ${S}/"${gtk_swt_src_dir}"/make_gtk.mak || die "Failed to modify make_gtk.mak"
+
+}
+
+function patch-motif-frontend()
+{
+	cp plugins/org.eclipse.swt/Eclipse\ SWT/common/library/* "${motif_swt_src_dir}"
+	sed -e "s:/bluebird/teamswt/swt-builddir/IBMJava2-141:$JAVA_HOME:" \
+		-e "s:/bluebird/teamswt/swt-builddir/motif21:/usr/X11R6:" \
+		-e "s:/usr/lib/qt-3.1:/usr/qt/3:" \
+		-e "s:-lkdecore:-L\`kde-config --prefix\`/lib -lkdecore:" \
+		-e "s:-I/usr/include/kde:-I\`kde-config --prefix\`/include:" \
+		-e "s:-I\$(JAVA_HOME)/include:-I\$(JAVA_HOME)/include -I\$(JAVA_HOME)/include/linux:" \
+		-e "s:-I\$(JAVA_HOME)\t:-I\$(JAVA_HOME)/include -I\$(JAVA_HOME)/include/linux:" \
+		-e "s:-L\$(JAVA_HOME)/jre/bin:-L\$(JAVA_HOME)/jre/lib/i386:" \
+		-i "${motif_swt_src_dir}"/make_linux.mak || die "Failed to modify Motfit 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 build-gtk-java() {
+	local target=${1}
+
+	einfo "Building GTK+ frontend (${target}) -- see compilelog.txt for details"
+	ant -q -q  \
+		-buildfile build.xml \
+		-DinstallOs=linux \
+		-DinstallWs=gtk \
+		-DinstallArch=$ARCH \
+		${ant_extra_opts} ${target} \
+		|| die "Failed to ${target} Java code (gtk+)"
+}
+
+function build-motif-java() {
+	local target=${1}
+
+	einfo "Building Motif frontend (${target}) -- see compilelog.txt for details"
+	ant -q -q  \
+		-buildfile build.xml \
+		-DcollPlace="eclipse-${SLOT}" \
+		-DinstallOs=linux \
+		-DinstallWs=motif \
+		-DinstallArch=$ARCH \
+		${ant_extra_opts} ${target} \
+		|| die "Failed to ${target} java code (Motif)"
+}
+
+function install-desktop-entry() {
+
+	# Install GNOME .desktop file
+	if use gnome ; then
+		insinto /usr/share/gnome/apps/Development
+		doins eclipse-${SLOT}.desktop
+	fi
+
+	# Install KDE .desktop file
+	if use kde ; then
+		insinto /usr/share/applnk/Development
+		doins eclipse-${SLOT}.desktop
+	fi
+}
+
+function build-gtk-native() {
+
+	einfo "Building gtk+ SWT"
+
+	# kludge to allow patches to applied at unpack, but correct compilation
+	if [ ${ARCH} == "amd64" ] ; then
+		gtk_swt_src_dir="plugins/org.eclipse.swt.gtk64/src/Eclipse SWT PI/gtk/library"
+	fi
+
+	# Perpare destination directory
+	mkdir -p ${S}/"${gtk_swt_dest_dir}"
+
+	# Build the eclipse gtk binary
+	cd ${S}/plugins/platform-launcher/library/gtk
+	case ${ARCH} in
+		sparc|x86|ppc)
+			tcsh -f build.csh -output eclipse-gtk -arch $ARCH || die "Failed to build eclipse-gtk"
+			;;
+		amd64)
+			tcsh -f build64.csh -output eclipse-gtk -arch $ARCH || die "Failed to build eclipse-gtk"
+			;;
+	esac
+
+
+	cd ${S}/"${gtk_swt_src_dir}"
+	case ${ARCH} in
+		sparc|x86|ppc)
+			bash ./build.sh make_swt || die "Failed to build platform-independent SWT support"
+			bash ./build.sh make_atk || die "Failed to build atk support"
+			;;
+		amd64)
+			bash ./build64.sh make_swt || die "Failed to build platform-independent SWT support"
+			bash ./build64.sh make_atk || die "Failed to build atk support"
+			;;
+	esac
+
+	if use gnome ; then
+		einfo "Building GNOME VFS support"
+		case ${ARCH} in
+			sparc|x86|ppc)
+				bash ./build.sh make_gnome || die "Failed to build GNOME VFS support"
+				;;
+			amd64)
+				bash ./build64.sh make_gnome || die "Failed to build GNOME VFS support"
+				;;
+		esac
+	fi
+
+	# move the *.so files to the right path so eclipse can find them
+	# karltk: do this incrementally at each step above, with || die
+	mv *.so ${S}/"${gtk_swt_dest_dir}"
+	cd ${S}
+}
+
+function build-motif-native() {
+
+	# Prepare destination directory
+	mkdir -p ${S}/"${motif_swt_dest_dir}"
+
+	# Build eclipse motif binary
+	cd ${S}/plugins/platform-launcher/library/motif
+	tcsh -f build.csh -output eclipse-motif -arch $ARCH || die "Failed to build eclipse-motif"
+
+	cd ${S}/"${motif_swt_src_dir}"
+
+	make -f make_linux.mak make_swt || die "Failed to build Motif support"
+	if use kde ; then
+		make -f make_linux.mak make_kde || die "Failed to build KDE support"
+	fi
+
+	# move the *.so files to the right path so eclipse can find them
+	# karltk: do this incrementally at each step above, with || die
+	mv *.so ${S}/"${motif_swt_dest_dir}"
+	cd ${S}
+}
+
+
+
+function clean-prebuilt-code() {
+
+	# Clean up all pre-built code
+	ant -q -DinstallWs=gtk -DinstallOs=linux clean
+	ant -q -DinstallWs=motif -DinstallOs=linux clean
+	find ${S} -name '*.so' -exec rm -f {} \;
+	find ${S} -name '*.so.*' -exec rm -f {} \;
+	find ${S} -type f -name 'eclipse' -exec rm {} \;
+	rm -f eclipse
+
+}
+
+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 775669 ] &&
+		(
+		echo
+		ewarn "To build Eclipse, at least 768MB of RAM is recommended."
+		ewarn "Your machine has less RAM. Continuing anyway."
+		echo
+	)
+}
+
+function install-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=/usr/lib/eclipse-extensions-3" > ${D}/${eclipse_dir}/links/eclipse-extensions-3.link
+}
+
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.0.2-r1.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..6bc8123c1f79
--- /dev/null
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.0.2-r1.ebuild
@@ -0,0 +1,407 @@
+# 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-r1.ebuild,v 1.1 2006/07/06 14:07:37 nichoj Exp $
+
+inherit eutils java-utils
+
+# karltk: Portage 2.0.51_pre13 needs this
+MY_A="eclipse-sourceBuild-srcIncluded-3.0.2.zip"
+DESCRIPTION="Eclipse Tools Platform"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download.eclipse.org/downloads/drops/R-3.0.2-200503110845/${MY_A}"
+IUSE="gtk motif gnome kde"
+SLOT="3"
+LICENSE="CPL-1.0"
+KEYWORDS="~x86 ~ppc ~amd64"
+
+RDEPEND="|| ( >=virtual/jdk-1.4.2 =dev-java/blackdown-jdk-1.4.2* )
+	gtk? ( >=x11-libs/gtk+-2.2.4 )
+	!gtk? (	kde? ( kde-base/kdelibs x11-libs/openmotif )
+		!kde? ( motif? ( x11-libs/openmotif )
+			!motif? ( >=x11-libs/gtk+-2.2.4 )
+		      )
+	      )
+	gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* )
+	!media-fonts/unifont"
+
+DEPEND="${RDEPEND}
+	>=dev-java/ant-1.5.3
+	>=sys-apps/findutils-4.1.7
+	>=app-shells/tcsh-6.11
+	app-arch/unzip
+	app-arch/zip"
+
+pkg_setup() {
+
+	check-ram
+
+	java-utils_setup-vm
+
+	java-utils_ensure-vm-version-ge 1 4 2
+
+	setup-dir-vars
+
+	use gtk && use_gtk='true' || use_gtk='false'
+	use motif && use_motif='true' || use_motif='false'
+
+	# If gtk+ enabled, disable motif
+	${use_gtk} && use_motif='false'
+
+	# If neither enabled, default to gtk+
+	${use_gtk} || ${use_motif} || use_gtk='true'
+
+	# If both enabled, use gtk+ only
+	${use_gtk} && ${use_motif} && use_motif='false'
+
+	einfo "Compiling gtk+ frontend  : ${use_gtk}"
+	einfo "Compiling Motif frontend : ${use_motif}"
+
+}
+
+src_unpack() {
+	mkdir ${S}
+	cd ${S}
+	unpack ${MY_A} || die "Could not unpack ${MY_A}"
+
+	epatch ${FILESDIR}/03-motif-java1.5-build.patch
+	epatch ${FILESDIR}/04-amd64-gtk.patch
+	epatch ${FILESDIR}/05-mozilla-xpcom.patch
+
+	einfo "Setting up virtual machine"
+	java-utils_setup-vm
+
+	einfo "Patching build.xmls"
+	process-build-xmls
+
+	einfo "Cleaning out prebuilt code"
+	clean-prebuilt-code
+
+	einfo "Patching gtk+ frontend"
+	patch-gtk-frontend
+
+	einfo "Patching Motif frontend"
+	patch-motif-frontend
+
+	einfo "Set build version in Help->About"
+	find -type f -name about.mappings -exec sed -e "s/@build@/Gentoo Linux ${PF}/" -i \{\} \;
+}
+
+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 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
+		ant_extra_opts="-Dbootclasspath=$(java-config --jdk-home)/jre/lib/core.jar:$(java-config --jdk-home)/jre/lib/xml.jar:$(java-config --jdk-home)/jre/lib/graphics.jar"
+	else
+		# Sun derived JREs (Blackdown, Sun)
+		ant_extra_opts="-Dbootclasspath=$(java-config --jdk-home)/jre/lib/rt.jar"
+	fi
+
+	export ANT_OPTS=-Xmx768m
+
+	einfo "Building resources.core plugin"
+	cd ${S}/${core_src_dir}
+	make JDK_INCLUDE="`java-config -O`/include -I`java-config -O`/include/linux" || die "Failed to build resource.core plugin"
+	mkdir -p ${S}/"${core_dest_dir}"
+	mv *.so ${S}/"${core_dest_dir}"
+	cd ${S}
+
+	# Compile all Java code
+	${use_gtk} && build-gtk-java compile
+	${use_motif} && build-motif-java compile
+
+	# Build selected native frontend code
+	${use_gtk} && build-gtk-native
+	${use_motif} && build-motif-native
+
+	# Install all Java code
+	${use_gtk} && build-gtk-java install
+	${use_motif} && build-motif-java install
+
+	create-desktop-entry
+}
+
+src_install() {
+	eclipse_dir="/usr/lib/eclipse-${SLOT}"
+
+	dodir /usr/lib
+
+	einfo "Installing features and plugins"
+	if ${use_gtk} ; then
+		[ -f result/linux-gtk-${ARCH}-sdk.zip ] || die "gtk zip bundle was not build properly!"
+		unzip -o -q result/linux-gtk-${ARCH}-sdk.zip -d ${D}/usr/lib
+	fi
+	if ${use_motif} ; then
+		[ -f result/linux-motif-${ARCH}-sdk.zip ] || die "motif zip bundle was not build properly!"
+		unzip -o -q result/linux-motif-${ARCH}-sdk.zip -d ${D}/usr/lib
+	fi
+
+	mv ${D}/usr/lib/eclipse ${D}/${eclipse_dir}
+
+	insinto ${eclipse_dir}
+
+	# Install launchers and native code
+	exeinto ${eclipse_dir}
+	if ${use_gtk} ; then
+		einfo "Installing eclipse-gtk binary"
+		doexe plugins/platform-launcher/library/gtk/eclipse-gtk \
+			|| die "Failed to install eclipse-gtk"
+	fi
+	if ${use_motif} ; then
+		einfo "Installing eclipse-motif binary"
+		doexe plugins/platform-launcher/library/motif/eclipse-motif \
+			|| die "Failed to install eclipse-motif"
+	fi
+
+	doins plugins/org.eclipse.platform/{startup.jar,splash.bmp}
+
+	# Install startup script
+	exeinto /usr/bin
+	newexe ${FILESDIR}/eclipse-3.0.2 eclipse-${SLOT}
+
+	install-desktop-entry
+
+	install-link-files
+
+
+	doman ${FILESDIR}/eclipse.1
+}
+
+# -----------------------------------------------------------------------------
+#  Helper functions
+# -----------------------------------------------------------------------------
+
+function setup-dir-vars() {
+	gtk_launcher_src_dir="plugins/platform-launcher/library/gtk"
+	motif_launch_src_dir="plugins/platform-launcher/library/motif"
+	gtk_swt_src_dir="plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
+	motif_swt_src_dir="plugins/org.eclipse.swt/Eclipse SWT PI/motif/library"
+
+	core_src_dir="plugins/org.eclipse.core.resources.linux/src"
+
+	case ${ARCH} in
+		sparc)
+			gtk_swt_dest_dir="plugins/org.eclipse.swt.gtk/os/solaris/sparc"
+			motif_swt_dest_dir="plugins/org.eclipse.swt.motif/os/solaris/sparc"
+			core_dest_dir="plugins/org.eclipse.core.resources.linux/os/solaris/sparc"
+			;;
+		x86)
+			gtk_swt_dest_dir="plugins/org.eclipse.swt.gtk/os/linux/x86"
+			motif_swt_dest_dir="plugins/org.eclipse.swt.motif/os/linux/x86"
+			core_dest_dir="plugins/org.eclipse.core.resources.linux/os/linux/x86"
+			;;
+		ppc)
+			gtk_swt_dest_dir="plugins/org.eclipse.swt.gtk/os/linux/ppc"
+			motif_swt_dest_dir="plugins/org.eclipse.swt.motif/os/linux/ppc"
+			core_dest_dir="plugins/org.eclipse.core.resources.linux/os/linux/ppc/"
+			;;
+		amd64)
+			gtk_swt_dest_dir="plugins/org.eclipse.swt.gtk64/os/linux/amd64"
+			motif_swt_dest_dir="plugins/org.eclipse.swt.motif/os/linux/amd64"
+			core_dest_dir="plugins/org.eclipse.core.resources.linux/os/linux/amd64"
+			;;
+	esac
+}
+
+function process-build-xmls() {
+
+	# Turn off verbose mode and on errors in all build.xml files
+	for x in $(find . -type f -name "build.xml") ; do
+		sed -i -r \
+			-e 's/failonerror="[^"]+"/failonerror="true"/' \
+			-e 's/verbose="[^"]+"/verbose="false"/' $x
+	done
+}
+
+function patch-gtk-frontend() {
+
+	# Move around some source code that should have been handled by the build system
+	local m="Failed to move native files for SWT gtk+"
+	cp ${S}/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/* ${S}/"${gtk_swt_src_dir}" || die ${m}
+	cp ${S}/plugins/org.eclipse.swt/Eclipse\ SWT\ Mozilla/common/library/* ${S}/"${gtk_swt_src_dir}" || die ${m}
+	cp ${S}/plugins/org.eclipse.swt/Eclipse\ SWT\ Program/gnome/library/* ${S}/"${gtk_swt_src_dir}" || die ${m}
+	cp ${S}/plugins/org.eclipse.swt/Eclipse\ SWT\ AWT/gtk/library/* ${S}/"${gtk_swt_src_dir}" || die ${m}
+
+	if use gnome ; then
+	    gnome_lib=`pkg-config --libs gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 | sed -e "s:-pthread:-lpthread:" -e "s:-Wl,--export:--export:"`
+	fi
+
+	if ${use_gtk} ; then
+		gtk_lib=`pkg-config --libs gtk+-2.0 gthread-2.0 | sed -e "s:-pthread:-lpthread:" -e "s:-Wl,--export:--export:"`
+		atk_lib=`pkg-config --libs atk gtk+-2.0 | sed -e "s:-Wl,--export:--export:"`
+	fi
+
+	sed -e "s:/bluebird/teamswt/swt-builddir/IBMJava2-141:$JAVA_HOME:" \
+		-e "s:/bluebird/teamswt/swt-builddir/jdk1.5.0:$JAVA_HOME:" \
+		-i ${S}/"${gtk_swt_src_dir}"/build.sh || die "Failed to modify build.sh"
+
+	sed -e "s:-I\$(JAVA_HOME)/include:-I\$(JAVA_HOME)/include -I\$(JAVA_HOME)/include/linux:" \
+		-e "s:GECKO_SDK)/\([^/]*\)/include:GECKO_SDK)/include/\1:" \
+		-e "s:GECKO_SDK)/embedstring/bin -lembedstring:GECKO_SDK)/components -lembedcomponents:" \
+		-e "s:GECKO_SDK)/embed_base/bin -lembed_base_s:GECKO_SDK) -lgtkembedmoz:" \
+		-e "s:GECKO_SDK)/xpcom/bin -lxpcomglue_s -lxpcom:GECKO_SDK) -lxpcom:" \
+		-i ${S}/"${gtk_swt_src_dir}"/make_linux.mak || die "Failed to modify make_linux.mak"
+
+
+}
+
+function patch-motif-frontend()
+{
+	cp plugins/org.eclipse.swt/Eclipse\ SWT/common/library/* "${motif_swt_src_dir}"
+	sed -e "s:/bluebird/teamswt/swt-builddir/IBMJava2-141:$JAVA_HOME:" \
+		-e "s:/bluebird/teamswt/swt-builddir/motif21:/usr/X11R6:" \
+		-e "s:/usr/lib/qt-3.1:/usr/qt/3:" \
+		-e "s:-lkdecore:-L\`kde-config --prefix\`/lib -lkdecore:" \
+		-e "s:-I/usr/include/kde:-I\`kde-config --prefix\`/include:" \
+		-e "s:-I\$(JAVA_HOME)/include:-I\$(JAVA_HOME)/include -I\$(JAVA_HOME)/include/linux:" \
+		-e "s:-I\$(JAVA_HOME)\t:-I\$(JAVA_HOME)/include -I\$(JAVA_HOME)/include/linux:" \
+		-e "s:-L\$(JAVA_HOME)/jre/bin:-L\$(JAVA_HOME)/jre/lib/i386:" \
+		-i "${motif_swt_src_dir}"/make_linux.mak || die "Failed to modify Motfit 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 build-gtk-java() {
+	local target=${1}
+
+	einfo "Building GTK+ frontend (${target}) -- see compilelog.txt for details"
+	ant -q -q  \
+		-buildfile build.xml \
+		-DinstallOs=linux \
+		-DinstallWs=gtk \
+		-DinstallArch=$ARCH \
+		${ant_extra_opts} ${target} \
+		|| die "Failed to ${target} Java code (gtk+)"
+}
+
+function build-motif-java() {
+	local target=${1}
+
+	einfo "Building Motif frontend (${target}) -- see compilelog.txt for details"
+	ant -q -q  \
+		-buildfile build.xml \
+		-DcollPlace="eclipse-${SLOT}" \
+		-DinstallOs=linux \
+		-DinstallWs=motif \
+		-DinstallArch=$ARCH \
+		${ant_extra_opts} ${target} \
+		|| die "Failed to ${target} java code (Motif)"
+}
+
+function install-desktop-entry() {
+
+	# Install GNOME .desktop file
+	if use gnome ; then
+		insinto /usr/share/gnome/apps/Development
+		doins eclipse-${SLOT}.desktop
+	fi
+
+	# Install KDE .desktop file
+	if use kde ; then
+		insinto /usr/share/applnk/Development
+		doins eclipse-${SLOT}.desktop
+	fi
+}
+
+function build-gtk-native() {
+
+	einfo "Building gtk+ SWT"
+
+	# kludge to allow patches to applied at unpack, but correct compilation
+	if [ ${ARCH} == "amd64" ] ; then
+		gtk_swt_src_dir="plugins/org.eclipse.swt.gtk64/src/Eclipse SWT PI/gtk/library"
+	fi
+
+	# Perpare destination directory
+	mkdir -p ${S}/"${gtk_swt_dest_dir}"
+
+	# Build the eclipse gtk binary
+	cd ${S}/plugins/platform-launcher/library/gtk
+	bash build.sh -output eclipse-gtk -arch $ARCH || die "Failed to build eclipse-gtk"
+
+	cd ${S}/"${gtk_swt_src_dir}"
+	bash ./build.sh make_swt || die "Failed to build platform-independent SWT support"
+	bash ./build.sh make_atk || die "Failed to build atk support"
+
+	if use gnome ; then
+		einfo "Building GNOME VFS support"
+		bash ./build.sh make_gnome || die "Failed to build GNOME VFS support"
+	fi
+
+	# move the *.so files to the right path so eclipse can find them
+	# karltk: do this incrementally at each step above, with || die
+	mv *.so ${S}/"${gtk_swt_dest_dir}"
+	cd ${S}
+}
+
+function build-motif-native() {
+
+	# Prepare destination directory
+	mkdir -p ${S}/"${motif_swt_dest_dir}"
+
+	# Build eclipse motif binary
+	cd ${S}/plugins/platform-launcher/library/motif
+	tcsh -f build.csh -output eclipse-motif -arch $ARCH || die "Failed to build eclipse-motif"
+
+	cd ${S}/"${motif_swt_src_dir}"
+
+	make -f make_linux.mak make_swt || die "Failed to build Motif support"
+	if use kde ; then
+		make -f make_linux.mak make_kde || die "Failed to build KDE support"
+	fi
+
+	# move the *.so files to the right path so eclipse can find them
+	# karltk: do this incrementally at each step above, with || die
+	mv *.so ${S}/"${motif_swt_dest_dir}"
+	cd ${S}
+}
+
+
+
+function clean-prebuilt-code() {
+
+	# Clean up all pre-built code
+	ant -q -DinstallWs=gtk -DinstallOs=linux clean
+	ant -q -DinstallWs=motif -DinstallOs=linux clean
+	find ${S} -name '*.so' -exec rm -f {} \;
+	find ${S} -name '*.so.*' -exec rm -f {} \;
+	find ${S} -type f -name 'eclipse' -exec rm {} \;
+	rm -f eclipse
+
+}
+
+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 775669 ] &&
+		(
+		echo
+		ewarn "To build Eclipse, at least 768MB of RAM is recommended."
+		ewarn "Your machine has less RAM. Continuing anyway."
+		echo
+	)
+}
+
+function install-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=/usr/lib/eclipse-extensions-3" > ${D}/${eclipse_dir}/links/eclipse-extensions-3.link
+}
diff --git a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.0.1-r3 b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.0.1-r3
new file mode 100644
index 000000000000..183c809210df
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.0.1-r3
@@ -0,0 +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-r1 b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.0.2-r1
new file mode 100644
index 000000000000..94a883fe46af
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.0.2-r1
@@ -0,0 +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