Fixes #65962.

4 files changed, 475 insertions, 1 deletions

diff --git a/dev-util/eclipse-sdk/ChangeLog b/dev-util/eclipse-sdk/ChangeLog
index b8ce3d7d08a0..3c8a41de9448 100644
--- a/dev-util/eclipse-sdk/ChangeLog
+++ b/dev-util/eclipse-sdk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/eclipse-sdk
 # Copyright 2003-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.70 2004/11/06 19:25:39 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.71 2004/11/16 19:03:18 karltk Exp $
+
+*eclipse-sdk-3.0.1-r2 (16 Nov 2004)
+
+  16 Nov 2004; <karltk@gentoo.org> +files/04-amd64-gtk.patch,
+  +eclipse-sdk-3.0.1-r2.ebuild:
+  Added amd64 patch from #65962, thanks to Dan <dan@intuitivelyobvious.net>.
 
 *eclipse-sdk-3.1_pre3 (06 Nov 2004)
 
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.0.1-r2.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.0.1-r2.ebuild
new file mode 100644
index 000000000000..865d827aac3a
--- /dev/null
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.0.1-r2.ebuild
@@ -0,0 +1,455 @@
+# Copyright 1999-2004 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-r2.ebuild,v 1.1 2004/11/16 19:03:18 karltk 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 mozilla"
+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 )
+		      )
+	      )
+	mozilla? ( >=net-www/mozilla-1.5 )
+	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
+
+	${use_gtk} && use mozilla && detect-mozilla
+
+	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
+
+	doman ${FILESDIR}/eclipse.1
+}
+
+# -----------------------------------------------------------------------------
+#  Helper functions
+# -----------------------------------------------------------------------------
+
+function detect-mozilla()
+{
+	if [ -f ${ROOT}/usr/lib/mozilla/libgtkembedmoz.so ] ; then
+		einfo "Compiling against net-www/mozilla"
+		mozilla_dir=/usr/lib/mozilla
+	elif [ -f ${ROOT}/usr/lib/MozillaFirefox/libgtkembedmoz.so ] ; then
+		einfo "Compiling against net-www/mozilla-firefox"
+		mozilla_dir=/usr/lib/MozillaFirefox
+	else
+		eerror "You need either Mozilla, compiled against gtk+ v2.0 or newer"
+		eerror "To merge it, do USE=\"gtk2\" emerge mozilla."
+		eerror "Otherwise, remove \"mozilla\" from use flags"
+		die "Need Mozilla compiled with gtk+-2.x support"
+	fi
+}
+
+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:/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_dir} -lgtkembedmoz:" \
+		-e "s:MOZILLACFLAGS = -O:MOZILLACFLAGS = -O -fPIC:" \
+		-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\$(MOZILLA_HOME)/lib -lembed_base_s:-L\$(MOZILLA_HOME):" \
+		-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
+		for x in /usr/kde/* ; do
+			insinto ${x}/share/applnk/Applications/
+			doins eclipse-${SLOT}.desktop
+		done
+	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
+
+	if use mozilla ; then
+		einfo "Building Mozilla component"
+		case $ARCH in
+			sparc|x86|ppc)
+				bash ./build.sh make_mozilla || die "Failed to build Mozilla support"
+				;;
+			amd64)
+				bash ./build64.sh make_mozilla || die "Failed to build Mozilla 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
+	)
+}
+
diff --git a/dev-util/eclipse-sdk/files/04-amd64-gtk.patch b/dev-util/eclipse-sdk/files/04-amd64-gtk.patch
new file mode 100644
index 000000000000..bcd186a284f2
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/04-amd64-gtk.patch
@@ -0,0 +1,12 @@
+*** eclipse-3.0.1.orig/plugins/platform-launcher/library/gtk/eclipseGtk.c  Thu Sep 16 17:46:23 2004
+--- eclipse-3.0.1/plugins/platform-launcher/library/gtk/eclipseGtk.c Sun Oct 17 21:06:47 2004
+***************
+*** 23,28 ****
+--- 23,29 ----
+  #include <stdio.h>
+  #include <string.h>
+  #include <locale.h>
++ #include <stdlib.h>
+
+  #include <gtk/gtk.h>
+  #include <gdk-pixbuf/gdk-pixbuf.h>
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
new file mode 100644
index 000000000000..df2af49b408d
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.0.1-r2
@@ -0,0 +1 @@
+MD5 c95561df899a47fc05261531ed0b9221 eclipse-sourceBuild-srcIncluded-3.0.1.zip 55618511