Fixes #50759.

4 files changed, 94 insertions, 95 deletions

diff --git a/dev-util/eclipse-sdk/ChangeLog b/dev-util/eclipse-sdk/ChangeLog
index 25045c5997c1..9f400cc32258 100644
--- a/dev-util/eclipse-sdk/ChangeLog
+++ b/dev-util/eclipse-sdk/ChangeLog
@@ -1,9 +1,13 @@
 # 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.22 2004/05/12 08:52:26 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.23 2004/05/14 01:55:58 karltk Exp $
 
 *eclipse-sdk-2.1.3-r2 (10 May 2004)
 
+  14 May 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
+  eclipse-sdk-2.1.3-r2.ebuild: Added pauldv's build patches. Fixes #50759.
+  Can not be safely compiled with jikes at the moment.
+
   10 May 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
   eclipse-sdk-3.0.0_pre8-r1.ebuild: Added -fPIC when compiling xpcom.o
   thanks to lu_zero.
diff --git a/dev-util/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest
index 35e0a1ae79be..1a5a91af2dec 100644
--- a/dev-util/eclipse-sdk/Manifest
+++ b/dev-util/eclipse-sdk/Manifest
@@ -1,30 +1,32 @@
-MD5 505269a3ec7077a134d0314bed1d7f1c eclipse-sdk-3.0.0_pre8-r1.ebuild 10377
+MD5 ec201e8719e56a250d929836ae063f87 ChangeLog 4948
+MD5 1b3d0712db8c4a4d345f6f4744acc496 eclipse-sdk-2.1.ebuild 82878
 MD5 1599279350669a35135a2bb9b79a89b6 eclipse-sdk-2.1.1.ebuild 7553
-MD5 005ac1f796bbcd631db64c907369c7e6 eclipse-sdk-2.1.3-r1.ebuild 8972
-MD5 ecb312b5736947c1d7151e98676f11eb eclipse-sdk-2.1.3.ebuild 7825
-MD5 350c669042cb9f5cb0e3030d52c75bfd eclipse-sdk-3.0.0_pre8.ebuild 10038
+MD5 9cc8d5162e981d7b7fc1ef9fa1ac0e65 metadata.xml 919
+MD5 73a24177312856eafbb6430e4ece2578 eclipse-sdk-2.1.3-r2.ebuild 8509
 MD5 656106237184c56a9ed9f1e7b6a0cfee eclipse-sdk-2.1.2-r1.ebuild 8058
-MD5 98c827d4c23fe349b30e507705eeb077 eclipse-sdk-3.0.0_pre5.ebuild 8992
 MD5 1b7dd5acbe8da5ca6f3a967eb7a63916 eclipse-sdk-2.1.2.ebuild 7619
-MD5 66666cd86adc52903843e52177f1af5b ChangeLog 4760
-MD5 8f5227d7b75e69e47dbf195d206b471e eclipse-sdk-2.1.3-r2.ebuild 9883
-MD5 9cc8d5162e981d7b7fc1ef9fa1ac0e65 metadata.xml 919
-MD5 1b3d0712db8c4a4d345f6f4744acc496 eclipse-sdk-2.1.ebuild 82878
+MD5 ecb312b5736947c1d7151e98676f11eb eclipse-sdk-2.1.3.ebuild 7825
+MD5 98c827d4c23fe349b30e507705eeb077 eclipse-sdk-3.0.0_pre5.ebuild 8992
+MD5 f1b17cb6314c39afde105351709639ee foz2 7021244
+MD5 005ac1f796bbcd631db64c907369c7e6 eclipse-sdk-2.1.3-r1.ebuild 8972
+MD5 6d4381a897d4b4be3eef763913127b57 eclipse-sdk-3.0.0_pre8-r1.ebuild 10635
+MD5 350c669042cb9f5cb0e3030d52c75bfd eclipse-sdk-3.0.0_pre8.ebuild 10038
+MD5 5bea1174eca3d2e368ad728e5086b24a files/digest-eclipse-sdk-2.1 86
+MD5 06d244ce5f95763470623f0e023314c8 files/eclipse-3 958
+MD5 76c2f3ddbb548ca9d3f1522498f51bc0 files/digest-eclipse-sdk-2.1.1 88
+MD5 cc086062a18b18e0a241f27d0ed2de44 files/digest-eclipse-sdk-2.1.2 88
 MD5 6c2995197ef0a038015ffff1dee7ac72 files/00-refactor_rename.patch 59577
+MD5 cc086062a18b18e0a241f27d0ed2de44 files/digest-eclipse-sdk-2.1.2-r1 88
+MD5 9613d7a4f2ef2deb91c83738ea882570 files/digest-eclipse-sdk-3.0.0_pre5 88
+MD5 429b757eb766856a6b29094b06402576 files/eclipse-3.desktop 222
 MD5 8dc3a7de4ee006aefd719ce19342468c files/20eclipse-3.0m7 84
+MD5 bfc0f8c0e74a36e0eeebf31cf6a7616c files/digest-eclipse-sdk-2.1.3-r1 88
 MD5 9b30c0b9d4af6ed66a09e216efadefe6 files/eclipse 1067
-MD5 6ac05b530442f845b10b830e624ffe04 files/eclipse-2.desktop 222
 MD5 a01c2dd64e43d4ee9dd96dbf0b4578c7 files/eclipse.desktop 213
-MD5 5bea1174eca3d2e368ad728e5086b24a files/digest-eclipse-sdk-2.1 86
-MD5 76c2f3ddbb548ca9d3f1522498f51bc0 files/digest-eclipse-sdk-2.1.1 88
-MD5 cc086062a18b18e0a241f27d0ed2de44 files/digest-eclipse-sdk-2.1.2 88
 MD5 bfc0f8c0e74a36e0eeebf31cf6a7616c files/digest-eclipse-sdk-2.1.3 88
-MD5 9613d7a4f2ef2deb91c83738ea882570 files/digest-eclipse-sdk-3.0.0_pre5 88
-MD5 5f6112279e73b13eeef579bb73f87249 files/digest-eclipse-sdk-3.0.0_pre8 88
 MD5 5f6112279e73b13eeef579bb73f87249 files/digest-eclipse-sdk-3.0.0_pre8-r1 88
-MD5 cc086062a18b18e0a241f27d0ed2de44 files/digest-eclipse-sdk-2.1.2-r1 88
-MD5 bfc0f8c0e74a36e0eeebf31cf6a7616c files/digest-eclipse-sdk-2.1.3-r1 88
-MD5 bfc0f8c0e74a36e0eeebf31cf6a7616c files/digest-eclipse-sdk-2.1.3-r2 88
-MD5 429b757eb766856a6b29094b06402576 files/eclipse-3.desktop 222
 MD5 b8ba4f69b9ab21292d05e00b1a854f32 files/eclipse-2 964
-MD5 06d244ce5f95763470623f0e023314c8 files/eclipse-3 958
+MD5 6ac05b530442f845b10b830e624ffe04 files/eclipse-2.desktop 222
+MD5 5f6112279e73b13eeef579bb73f87249 files/digest-eclipse-sdk-3.0.0_pre8 88
+MD5 bfc0f8c0e74a36e0eeebf31cf6a7616c files/digest-eclipse-sdk-2.1.3-r2 88
+MD5 ab0f6620b4767e065bd533b06245b0fc files/eclipse-sdk-2.1.3-build.patch 1103
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-2.1.3-r2.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-2.1.3-r2.ebuild
index d0a8ff01a8a3..e4af81f48fca 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-2.1.3-r2.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-2.1.3-r2.ebuild
@@ -1,11 +1,11 @@
 # 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-2.1.3-r2.ebuild,v 1.2 2004/05/10 21:10:21 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-2.1.3-r2.ebuild,v 1.3 2004/05/14 01:55:58 karltk Exp $
 
 DESCRIPTION="Eclipse Tools Platform"
 HOMEPAGE="http://www.eclipse.org/"
 SRC_URI="http://download.eclipse.org/downloads/drops/R-2.1.3-200403101828/eclipse-sourceBuild-srcIncluded-2.1.3.zip"
-IUSE="gtk motif gnome kde mozilla jikes"
+IUSE="gtk motif gnome kde jikes"
 SLOT="2"
 LICENSE="CPL-1.0"
 KEYWORDS="~x86"
@@ -65,8 +65,11 @@ src_unpack() {
 	cd ${S}
 	unpack ${A}
 
-	# karltk: Is this really needed?
-#	addwrite "/proc/self/maps"
+	# Patch build script
+	epatch ${FILESDIR}/${PN}-${PV}-build.patch
+
+	# This one required for the IBM JDK
+	addwrite "/proc/self/maps"
 
 	# Clean up all pre-built code
 	ant -q -Dws=gtk -Dos=linux clean
@@ -82,10 +85,8 @@ src_unpack() {
 	# 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/* .
 
+	# Configure libraries for GNOME and GTK+
 	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
@@ -94,7 +95,6 @@ src_unpack() {
 		gthread_lib=`pkg-config --libs gtk+-2.0 gthread-2.0 | sed -e "s:-pthread:-lpthread:" -e "s:-Wl,--export:--export:"`
 	fi
 
-
 	sed -e "s:/bluebird/teamswt/swt-builddir/ive:$JAVA_HOME:" \
 		-e "s:JAVA_JNI=\$(IVE_HOME)/bin/include:JAVA_JNI=\$(IVE_HOME)/include:" \
 		-e "s:\`pkg-config --libs gthread-2.0\`:${gthread_lib}:" \
@@ -112,6 +112,7 @@ src_unpack() {
 			-i swt.c
 	fi
 
+	# Some fixups for the motif compilation
 	cd ${S}/"${motif_swt_src_dir}"
 	cp ${S}/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/* .
 
@@ -125,8 +126,10 @@ src_unpack() {
 		-e "s:-I/usr/include/kde:-I\`kde-config --prefix\`/include:" \
 	-i make_linux.mak
 
+	# Patch in package version into the build info
 	cd ${S}
-	find -type f -name about.mappings -exec sed -e "s/@build@/Gentoo Linux ${PV}/" -i \{\} \;
+	find -type f -name about.mappings -exec sed -e "s/@build@/Gentoo Linux ${PF}/" -i \{\} \;
+
 }
 
 build_gtk_frontend() {
@@ -139,15 +142,6 @@ build_gtk_frontend() {
 
 	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}"
@@ -177,11 +171,12 @@ build_motif_frontend() {
 
 src_compile() {
 
-#	addwrite "/proc/self/maps"
+	addwrite "/proc/self/maps"
 
 	# Figure out correct boot classpath
 	if [ ! -z "`java-config --java-version | grep IBM`" ] ; then
 		# IBM JRE
+		einfo "Using the IBM JDK"
 		ant_extra_opts="-Dbootclasspath=$(java-config --jdk-home)/jre/lib/core.jar"
 	else
 		# Sun derived JREs (Blackdown, Sun)
@@ -196,9 +191,23 @@ src_compile() {
 
 	set_dirs
 
+	# Build resources
+	einfo "Building resources.core plugin"
+	cd ${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}"
+
+
+	# Build selected frontends
+	cd ${S}
+	use gtk && build_gtk_frontend
+	use motif && build_motif_frontend
+
+	# Build java code
 	# karltk: Do we really need to rebuild all of this if both motif and
 	# gtk are specified?
-
+	cd ${S}
 	if ( use gtk || ! ( use gtk || use motif || use kde ) ); then
 		einfo "Building platform suited for the GTK+ frontend"
 		ant -q \
@@ -206,7 +215,7 @@ src_compile() {
 			-Dos=linux \
 			-Dws=gtk \
 			-DinstallArch=$ARCH \
-			${ant_extra_opts} compile || die "Failed to compile java code (gtk+)"
+			${ant_extra_opts} compile distribute || die "Failed to compile java code (gtk+)"
 	fi
 	if use motif ; then
 		einfo "Building platform suited for the Motif frontend"
@@ -215,39 +224,9 @@ src_compile() {
 			-Dos=linux \
 			-Dws=motif \
 			-DinstallArch=$ARCH \
-			${ant_extra_opts} compile || die "Failed to compile java code (Motif)"
+			${ant_extra_opts} compile distribute || die "Failed to compile java code (Motif)"
 	fi
 
-	einfo "Building resources.core plugin"
-	cd ${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 selected frontends
-	use gtk && build_gtk_frontend
-	use motif && build_motif_frontend
-
-}
-
-generate_filelist() {
-	local findopts
-	if [ "$1" == "dirs" ] ; then
-		findopts="-type d"
-	elif [ "$1" == "files" ] ; then
-		findopts="-type f"
-	else
-		die "Incorrect param to generate_filelist"
-	fi
-	find plugins ${findopts} | \
-		egrep -v ".*\.(java|c|h|o|mak)$" | \
-		egrep -v "(/|\.)(carbon|solaris|win32|hpux|aix|photon|macosx|gtk64)" | \
-		egrep -v ".*src.zip$" | \
-		egrep -v "/src(-|_|new)" | \
-		egrep -v "/src/" | \
-		grep -v "build.xml"
 }
 
 src_install() {
@@ -255,38 +234,26 @@ src_install() {
 
 	# Create basic directories
 	dodir ${eclipse_dir}
-	insinto ${eclipse_dir}
-	doins plugins/org.eclipse.platform/.eclipseproduct
-
-	# Install features
-	dodir ${eclipse_dir}/features
-	einfo "Copying features"
-	cp -dpR features/org.eclipse.{jdt,platform,team.extras}-feature ${D}/${eclipse_dir}/features/
-	if use gtk ; then
-		cp -dpR features/org.eclipse.{platform,sdk}.linux.gtk-feature ${D}/${eclipse_dir}/features/
-	fi
-	if use motif ; then
-		cp -dpR features/org.eclipse.{platform,sdk}.linux.motif-feature ${D}/${eclipse_dir}/features/
-	fi
 
-	# Install plugins
-	einfo "Creating directory structure"
-	generate_filelist dirs | xargs -n 1 -i@ dodir ${eclipse_dir}/@ || die "Failed to create plugin directory structure"
-	einfo "Copying plugins"
-	generate_filelist files | xargs -n 1 -i@ cp @ ${D}/${eclipse_dir}/@ || die "Failed to copy plugins"
+	einfo "Installing features and plugins"
+	find features \
+		-name "*.bin.dist.zip" \
+		-exec unzip -q \{\} -d ${D}/${eclipse_dir} \;
 
 	# Install launchers and native code
+	exeinto ${eclipse_dir}
 	if use gtk ; then
 		einfo "Installing eclipse-gtk binary"
-		mv  ${D}/${eclipse_dir}/plugins/platform-launcher/library/gtk/eclipse-gtk \
-			${D}/${eclipse_dir}/eclipse-gtk || die "Failed to install eclipse-gtk"
+		doexe plugins/platform-launcher/library/gtk/eclipse-gtk || die "Failed to install eclipse-gtk"
 	fi
 	if use motif ; then
 		einfo "Installing eclipse-motif binary"
-		mv  ${D}/${eclipse_dir}/plugins/platform-launcher/library/motif/eclipse-motif \
-			${D}/${eclipse_dir}/eclipse-motif || die "Failed to install eclipse-motif"
+		doexe plugins/platform-launcher/library/motif/eclipse-motif || die "Failed to install eclipse-gtk"
 	fi
 
+	# Installing misc files
+	insinto ${eclipse_dir}
+	doins plugins/org.eclipse.platform/.eclipseproduct
 	doins plugins/org.eclipse.platform/{startup.jar,splash.bmp}
 	doins plugins/platform-launcher/bin/linux/gtk/icon.xpm
 
diff --git a/dev-util/eclipse-sdk/files/eclipse-sdk-2.1.3-build.patch b/dev-util/eclipse-sdk/files/eclipse-sdk-2.1.3-build.patch
new file mode 100644
index 000000000000..7becab088cc6
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/eclipse-sdk-2.1.3-build.patch
@@ -0,0 +1,26 @@
+diff -urN eclipse.orig/build.xml eclipse/build.xml
+--- eclipse.orig/build.xml	2003-11-03 14:29:23.000000000 +0100
++++ eclipse/build.xml	2004-01-14 20:27:03.777314290 +0100
+@@ -8,6 +8,13 @@
+ 	
+ 	<!--  sourcepath setting for rt.jar in javadoc scripts in org.eclipse.platform.doc.isv and org.eclipse.jdt.doc.isv  -->
+ 	<property name="rt" value="${bootclasspath}" />
++
++	<!--  target for making a set of distribution zipfiles -->
++        <target name="distribute" depends="init">
++                <antcall target="allElements">
++                        <param name="target" value="zip.distribution"/>
++                </antcall>
++        </target>
+ 	
+ 	<!--  default target that runs complete build  -->
+ 	<target name="run" depends="compile,buildDoc,install" />
+@@ -28,7 +35,7 @@
+ 		  Compiles jars for all sdk plugins, and generates javadoc.
+ 		  Deletes previously compiled jars first.
+ 	-->
+-	<target name="compile" depends="init,clean">
++	<target name="compile" depends="init">
+ 		<record name="compilelog.txt" action="start" />
+ 		<antcall target="compileSwt" />
+   		<antcall target="allElements">