Fixes #51953.

4 files changed, 329 insertions, 11 deletions

diff --git a/dev-util/eclipse-sdk/ChangeLog b/dev-util/eclipse-sdk/ChangeLog
index 7db4c58e792e..9e30e0831f72 100644
--- a/dev-util/eclipse-sdk/ChangeLog
+++ b/dev-util/eclipse-sdk/ChangeLog
@@ -1,7 +1,17 @@
 # ChangeLog for dev-util/eclipse-sdk
 # Copyright 2003-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.27 2004/05/19 13:55:37 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.28 2004/05/26 22:50:36 karltk Exp $
 
+*eclipse-sdk-3.0.0_pre8-r3 (26 May 2004)
+
+  26 May 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
+  eclipse-sdk-3.0.0_pre8-r3.ebuild eclipse-sdk-2.1.3-r3: Fixes #51953. Adds
+  initial sparc support to 2.1.3-r3, not added ~sparc yet.
+
+  25 May 2004; Karl Trygve Kalleberg <karltk@gentoo.org> 
+  eclipse-sdk-2.1.1.ebuild, eclipse-sdk-2.1.2-r1.ebuild, 
+  files/eclipse.desktop, eclipse-3.0.0_pre8-r2: Removed. 
+  
   19 May 2004; Luca Barbato <lu_zero@gentoo.org> eclipse-sdk-2.1.3-r3.ebuild:
   Marked ~ppc, added -o to unzip to avoid interactivity
 
diff --git a/dev-util/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest
index 6d359c51ce6b..8cc7805c2696 100644
--- a/dev-util/eclipse-sdk/Manifest
+++ b/dev-util/eclipse-sdk/Manifest
@@ -1,21 +1,23 @@
+MD5 02190610c61ac2cd710ae159e9051683 ChangeLog 6626
+MD5 9cc8d5162e981d7b7fc1ef9fa1ac0e65 metadata.xml 919
+MD5 bedd235dd2727bc69bdd673ba93589f5 eclipse-sdk-2.1.3-r3.ebuild 8718
+MD5 86515f8eeb63a7c344dbd9939329eabe eclipse-sdk-3.0.0_pre8-r3.ebuild 10103
+MD5 1599279350669a35135a2bb9b79a89b6 eclipse-sdk-2.1.1.ebuild 7553
+MD5 656106237184c56a9ed9f1e7b6a0cfee eclipse-sdk-2.1.2-r1.ebuild 8058
+MD5 c944ca7b28c95cf331240524f31aea56 eclipse-sdk-3.0.0_pre8-r2.ebuild 9786
+MD5 06d244ce5f95763470623f0e023314c8 files/eclipse-3 958
+MD5 5f6112279e73b13eeef579bb73f87249 files/digest-eclipse-sdk-3.0.0_pre8-r3 88
+MD5 a01c2dd64e43d4ee9dd96dbf0b4578c7 files/eclipse.desktop 213
 MD5 6c2995197ef0a038015ffff1dee7ac72 files/00-refactor_rename.patch 59577
 MD5 76c2f3ddbb548ca9d3f1522498f51bc0 files/digest-eclipse-sdk-2.1.1 88
-MD5 cc086062a18b18e0a241f27d0ed2de44 files/digest-eclipse-sdk-2.1.2-r1 88
 MD5 5f6112279e73b13eeef579bb73f87249 files/digest-eclipse-sdk-3.0.0_pre8-r2 88
-MD5 9b30c0b9d4af6ed66a09e216efadefe6 files/eclipse 1067
-MD5 a01c2dd64e43d4ee9dd96dbf0b4578c7 files/eclipse.desktop 213
-MD5 06d244ce5f95763470623f0e023314c8 files/eclipse-3 958
 MD5 429b757eb766856a6b29094b06402576 files/eclipse-3.desktop 222
 MD5 bfc0f8c0e74a36e0eeebf31cf6a7616c files/digest-eclipse-sdk-2.1.3-r3 88
+MD5 9b30c0b9d4af6ed66a09e216efadefe6 files/eclipse 1067
+MD5 cc086062a18b18e0a241f27d0ed2de44 files/digest-eclipse-sdk-2.1.2-r1 88
 MD5 b8ba4f69b9ab21292d05e00b1a854f32 files/eclipse-2 964
 MD5 6ac05b530442f845b10b830e624ffe04 files/eclipse-2.desktop 222
 MD5 ab0f6620b4767e065bd533b06245b0fc files/01-distribute_ant_target-2.1.patch 1103
 MD5 ed33fd609db26b85ef9b0c2a82a06b22 files/01-distribute_ant_target-3.0.patch 726
 MD5 59c18169fdf20b43544bb4891592dce4 files/02-konqueror_help_browser-2.1.patch 1013
 MD5 a8bdecb6304c91da92a3b153e154f544 files/02-konqueror_help_browser-3.0.patch 1560
-MD5 3fdca681a734c178e7d354be086ae19a ChangeLog 6214
-MD5 1599279350669a35135a2bb9b79a89b6 eclipse-sdk-2.1.1.ebuild 7553
-MD5 656106237184c56a9ed9f1e7b6a0cfee eclipse-sdk-2.1.2-r1.ebuild 8058
-MD5 c944ca7b28c95cf331240524f31aea56 eclipse-sdk-3.0.0_pre8-r2.ebuild 9786
-MD5 9cc8d5162e981d7b7fc1ef9fa1ac0e65 metadata.xml 919
-MD5 bfcf292f785fb71918f7f17f1448c1b2 eclipse-sdk-2.1.3-r3.ebuild 8725
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.0.0_pre8-r3.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.0.0_pre8-r3.ebuild
new file mode 100644
index 000000000000..996f403d4f75
--- /dev/null
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.0.0_pre8-r3.ebuild
@@ -0,0 +1,305 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.0.0_pre8-r3.ebuild,v 1.1 2004/05/26 22:50:36 karltk Exp $
+
+inherit eutils
+
+DESCRIPTION="Eclipse Tools Platform"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download.eclipse.org/downloads/drops/S-3.0M8-200403261517/eclipse-sourceBuild-srcIncluded-3.0M8.zip"
+IUSE="gtk motif gnome kde mozilla jikes"
+SLOT="3"
+LICENSE="CPL-1.0"
+KEYWORDS="~x86"
+
+RDEPEND=">=virtual/jdk-1.3
+	|| (
+		gtk? ( >=x11-libs/gtk+-2.2.4 )
+		kde? ( kde-base/kdelibs x11-libs/openmotif )
+		motif? ( x11-libs/openmotif )
+		>=x11-libs/gtk+-2.2.4
+		)
+	gnome? ( =gnome-base/gnome-vfs-2* )
+	"
+
+DEPEND="${RDEPEND}
+	>=dev-java/ant-1.5.3
+	>=sys-apps/findutils-4.1.7
+	>=app-shells/tcsh-6.11
+	mozilla? ( >=net-www/mozilla-1.5 )
+	app-arch/unzip"
+
+pkg_setup() {
+	ewarn "This package is _highly_ experimental."
+	ewarn "If you are using Eclipse 2.1.x for any serious work, stop now."
+	ewarn "You cannot expect to be productive with this packaging of 3.0!"
+}
+
+set_dirs() {
+	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/"
+			;;
+	esac
+}
+
+src_unpack() {
+	mkdir ${S}
+	cd ${S}
+	unpack ${A}
+
+	epatch ${FILESDIR}/01-distribute_ant_target-3.0.patch
+
+	if use kde ; then
+		epatch ${FILESDIR}/02-konqueror_help_browser-3.0.patch
+	fi
+
+	# Needed for the IBM JDK
+	addwrite "/proc/self/maps"
+
+	# 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
+
+	# Load environment varis for various directories
+	set_dirs
+
+	# Move around some source code that should have been handled by the build system
+	cd ${S}/"${gtk_swt_src_dir}" || die "Directory ${gtk_swt_src_dir} not found"
+	cp ${S}/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/* .
+	cp ${S}/plugins/org.eclipse.swt/Eclipse\ SWT\ Mozilla/common/library/* .
+	cp ${S}/plugins/org.eclipse.swt/Eclipse\ SWT\ Program/gnome/library/* .
+	cp ${S}/plugins/org.eclipse.swt/Eclipse\ SWT\ AWT/gtk/library/* .
+
+	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:/mozilla/mozilla/1.6/linux_gtk2/mozilla/dist:$MOZILLA_FIVE_HOME:" \
+		-e "s:/usr/lib/mozilla-1.6:$MOZILLA_FIVE_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:-L\$(MOZILLA_HOME)/lib -lembed_base_s:-L\$(MOZILLA_HOME):" \
+		-e "s:MOZILLACFLAGS = -O:MOZILLACFLAGS = -O -fPIC:" \
+		-e "s:\$(JAVA_HOME)/jre/bin:\$(JAVA_HOME)/jre/lib/i386:" \
+		-i make_gtk.mak
+
+	# Extra patching if the gtk+ installed is 2.4 or newer
+	# for users with the 2.3 series, they should upgrade, dunno which 2.3.x all this
+	#  stuff broke in anyway.
+	if pkg-config --atleast-version 2.4 gtk+-2.0 ; then
+		einfo "Applying gtk+-2.4 patches"
+		sed -r \
+			-e "s:#define GTK_DISABLE_DEPRECATED::g" \
+			-e "s:(^void gtk_progress_bar_set_bar_style.*):/* \1 */:" \
+			-i os.h
+	fi
+
+	cd ${S}/"${motif_swt_src_dir}"
+	cp ${S}/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/* .
+	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\$(MOZILLA_HOME)/lib -lembed_base_s:-L\$(MOZILLA_HOME):" \
+		-e "s:-L\$(JAVA_HOME)/jre/bin:-L\$(JAVA_HOME)/jre/lib/i386:" \
+		-i make_linux.mak
+
+	cd ${S}
+	find -type f -name about.mappings -exec sed -e "s/@build@/Gentoo Linux ${PF}/" -i \{\} \;
+}
+
+build_gtk_frontend() {
+
+	einfo "Building gtk+ SWT"
+
+	# Build the eclipse gtk binary
+	cd ${S}/plugins/platform-launcher/library/gtk
+	tcsh -f build.csh -output eclipse-gtk -arch $ARCH || die "Failed to build eclipse-gtk"
+
+	cd ${S}/"${gtk_swt_src_dir}"
+	make -f make_gtk.mak make_swt || die "Failed to build platform-independent SWT support"
+	make -f make_gtk.mak make_atk || die "Failed to build atk support"
+
+	if use gnome ; then
+		einfo "Building GNOME VFS support"
+		make -f make_gtk.mak make_gnome || die "Failed to build GNOME VFS support"
+	fi
+
+	if use mozilla ; then
+		einfo "Building Mozilla component"
+		make -f make_gtk.mak make_mozilla || die "Failed to build Mozilla support"
+	fi
+
+	# move the *.so files to the right path so eclipse can find them
+	mkdir -p ${S}/"${gtk_swt_dest_dir}"
+	mv *.so ${S}/"${gtk_swt_dest_dir}"
+}
+
+build_motif_frontend() {
+
+	# 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
+	mkdir -p ${S}/"${motif_swt_dest_dir}"
+	mv *.so ${S}/"${motif_swt_dest_dir}"
+}
+
+src_compile() {
+
+	addwrite "/proc/self/maps"
+
+	# Figure out correct boot classpath
+	if [ ! -z "`java-config --java-version | grep IBM`" ] ; then
+		# IBM JRE
+		ant_extra_opts="-Dbootclasspath=$(java-config --jdk-home)/jre/lib/core.jar"
+	else
+		# Sun derived JREs (Blackdown, Sun)
+		ant_extra_opts="-Dbootclasspath=$(java-config --jdk-home)/jre/lib/rt.jar"
+	fi
+
+	if use jikes ; then
+		ant_extra_opts="${ant_extra_opts} -Dbuild.compiler=jikes"
+	fi
+
+	export ANT_OPTS=-Xmx768m
+
+	set_dirs
+
+	# Build selected frontends
+	use gtk && build_gtk_frontend
+	use motif && build_motif_frontend
+
+	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}
+
+	# Build all java code -- default to gtk if neither of gtk, motif,
+	# kde are set
+	if ( use gtk || ! ( use gtk || use motif || use kde ) ); then
+		einfo "Building GTK+ frontend -- see compilelog.txt for details"
+		ant -q -q \
+			-buildfile build.xml \
+			-DinstallOs=linux \
+			-DinstallWs=gtk \
+			-DinstallArch=$ARCH \
+			${ant_extra_opts} compile install \
+			|| die "Failed to compile java code (gtk+)"
+	fi
+	if use motif ; then
+		einfo "Building Motif frontend -- see compilelog.txt for details"
+		ant -q -q \
+			-buildfile build.xml \
+			-DcollPlace="eclipse-${SLOT}" \
+			-DinstallOs=linux \
+			-DinstallWs=motif \
+			-DinstallArch=$ARCH \
+			${ant_extra_opts} compile install \
+			|| die "Failed to compile java code (Motif)"
+	fi
+
+	cat ${FILESDIR}/eclipse-${SLOT}.desktop | \
+		sed -e "s/@PV@/${PV}/" \
+		> eclipse-${SLOT}.desktop
+}
+
+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-gtk-${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 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
+		# karltk: should check for available kde version(s)
+		insinto /usr/kde/3.2/share/applnk/Applications/
+		doins eclipse-${SLOT}.desktop
+	fi
+
+}
diff --git a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.0.0_pre8-r3 b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.0.0_pre8-r3
new file mode 100644
index 000000000000..021eb35bc2e5
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.0.0_pre8-r3
@@ -0,0 +1 @@
+MD5 61e3c40be4c66d280aec95e786bb46dd eclipse-sourceBuild-srcIncluded-3.0M8.zip 56216059