New upstream release. Tentatively fixes #97347.

(Portage version: 2.0.51.19)

5 files changed, 462 insertions, 1 deletions

diff --git a/dev-util/eclipse-sdk/ChangeLog b/dev-util/eclipse-sdk/ChangeLog
index 3ddd3c281b2a..471770aab151 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.93 2005/06/01 14:15:30 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.94 2005/07/03 17:48:17 karltk Exp $
+
+*eclipse-sdk-3.1 (03 Jul 2005)
+
+  03 Jul 2005; Karl Trygve Kalleberg <karltk@gentoo.org>
+  +files/06-path-fixups.patch, +eclipse-sdk-3.1.ebuild:
+  New upstream release. Adapted ebuild submitted by Mikko Tiihonen
+  <mikko.tiihonen@hut.fi>. Tentatively fixes #97347.
 
   19 May 2005; Sven Wegener <swegener@gentoo.org>
   eclipse-sdk-3.1_pre6-r1.ebuild:
diff --git a/dev-util/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest
index 42bc721c3976..18fa16b8d7b2 100644
--- a/dev-util/eclipse-sdk/Manifest
+++ b/dev-util/eclipse-sdk/Manifest
@@ -2,6 +2,7 @@ MD5 b46f3362dcf17eebc979bc87c2581b49 eclipse-sdk-3.1_pre3.ebuild 16524
 MD5 5f47b5e1d82a19fafb466d830a509d01 eclipse-sdk-3.0.1.ebuild 11886
 MD5 a2d7d204d16c0363da6429bad390431a eclipse-sdk-3.0.0-r3.ebuild 12081
 MD5 d85a11c5e39f6591da5bcdc731b02761 eclipse-sdk-3.1_pre5.ebuild 17446
+MD5 9c74cca41f46a354c28e4c57b63ca445 eclipse-sdk-3.1.ebuild 10349
 MD5 819818fb9914fe0dccf2af4c89d94452 eclipse-sdk-3.0.1-r2.ebuild 14287
 MD5 a54adcd5de4bafa3a201ba0df24337f8 eclipse-sdk-3.1_pre7.ebuild 13621
 MD5 233b7bd25c8c68c658a37232777f4f61 eclipse-sdk-3.1_pre2.ebuild 16365
@@ -17,10 +18,12 @@ MD5 a68179074a5e152f35d52d03847abcd4 eclipse-sdk-3.1_rc1.ebuild 13818
 MD5 8de14dda7d318d8fb514fdbcecd4058b metadata.xml 782
 MD5 ab0f6620b4767e065bd533b06245b0fc files/01-distribute_ant_target-2.1.patch 1103
 MD5 69ee2069b0260e40c6fa93315ff759cc files/eclipse-3.1.desktop 226
+MD5 f5f405a0422b693cabbc485e889174e2 files/06-path-fixups.patch 4258
 MD5 6ac05b530442f845b10b830e624ffe04 files/eclipse-2.desktop 222
 MD5 c2e939c5ac99b36a6fd439fe179139cb files/digest-eclipse-sdk-3.1_pre6-r1 88
 MD5 a8bdecb6304c91da92a3b153e154f544 files/02-konqueror_help_browser-3.0.patch 1560
 MD5 3110e7ec528bc98ef251172c2d7e2956 files/05-mozilla-xpcom.patch 862
+MD5 0805c4d31f80b5ebb2f52456273d0d44 files/digest-eclipse-sdk-3.1 86
 MD5 0e815a2260dbd0153de35c6de26fbd05 files/digest-eclipse-sdk-3.0.0-r3 86
 MD5 486d232cbe9d4b75d915bb6bf8b5f0d2 files/digest-eclipse-sdk-3.0.1-r1 88
 MD5 486d232cbe9d4b75d915bb6bf8b5f0d2 files/digest-eclipse-sdk-3.0.1-r2 88
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.1.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.1.ebuild
new file mode 100644
index 000000000000..93eadad6dab3
--- /dev/null
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.1.ebuild
@@ -0,0 +1,362 @@
+# Copyright 1999-2005 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.ebuild,v 1.1 2005/07/03 17:48:17 karltk Exp $
+
+inherit eutils java-utils
+
+MY_A="eclipse-sourceBuild-srcIncluded-3.1.zip"
+DESCRIPTION="Eclipse Tools Platform"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/R-3.1-200506271435/${MY_A}"
+IUSE="gnome mozilla firefox gcj nosrc nodoc atk"
+SLOT="3.1"
+LICENSE="CPL-1.0"
+KEYWORDS="~x86 ~ppc ~amd64"
+
+RDEPEND="
+	>=virtual/jdk-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 )
+	gcj? ( >=sys-devel/gcc-4.0.0_beta20050305 )
+	gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* )"
+
+DEPEND="${RDEPEND}
+	>=dev-java/ant-1.6.2
+	>=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
+# - remove gcj IUSE because it most propably won't work
+# - ppc support not tested, but not explicitly broken either
+
+pkg_setup() {
+
+	einfo "Checking for sufficient physical RAM"
+	check-ram
+
+	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 build"
+	process-build
+
+	einfo "Patching makefiles"
+	process-makefiles
+
+	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
+
+	einfo "Compiling eclipse -- see compilelog.txt for details"
+	./build \
+		-os linux \
+		-arch ${eclipsearch} \
+		-ws gtk -compilelibs \
+		-bc "${bootclasspath}" \
+		|| die "Failed to compile eclipse code (gtk+)"
+
+	# The only mystery still to be solved: why the eclipe binary does not
+	# end up in result tar.gz
+	# rename the eclipse launcher to stay compatible with previous ebuilds
+	mv launchertmp/eclipse eclipse-gtk
+
+	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 process-build() {
+
+	local targetOptimization="1.4"
+	local ant_opts="-Xmx768M"
+
+# Eclipse has ~10 classes that do not yet compile with java 5.0
+#	if (java-utils_is-vm-version-ge 1 5 0) ; then
+#		targetOptimization="1.5"
+#	fi
+
+	einfo "Optimizing for Java ${targetOptimization} VM"
+
+	# Some sun JVM's have only server VM and no client VM. To speed up things
+	# use a same compiler threshold that client VM defaults to
+	if [ ! -z "`java-config --java-version | fgrep "Server VM"`" ] ; then
+		ant_opts="${ant_opts} -XX:CompileThreshold=1500"
+	fi
+
+	# Eclipse has started to respect global flags so patching the main build is enough
+	local properties="-DjavacTarget=${targetOptimization} \
+	 -DjavacSource=${targetOptimization} \
+	 -DjavacVerbose=false \
+	 -DjavacFailOnError=true \
+	 -DjavacDebugInfo=true \
+	 -DbuildId=\"Gentoo Linux ${PF}\""
+
+	sed \
+		-e "s/ant -q /ant -q ${properties} /" \
+		-e "s/ANT_OPTS=-Xmx1000M/ANT_OPTS=\"${ant_opts}\"/" \
+		-i build || die "Failed to patch build script"
+}
+
+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 recompile-with-gcj() {
+	:;
+}
diff --git a/dev-util/eclipse-sdk/files/06-path-fixups.patch b/dev-util/eclipse-sdk/files/06-path-fixups.patch
new file mode 100644
index 000000000000..ed07886a66e1
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/06-path-fixups.patch
@@ -0,0 +1,88 @@
+diff -ur eclipse.orig/plugins/org.eclipse.core.resources.linux/build.xml eclipse.fix/plugins/org.eclipse.core.resources.linux/build.xml
+--- eclipse.orig/plugins/org.eclipse.core.resources.linux/build.xml	2005-05-13 21:34:52.000000000 +0300
++++ eclipse.fix/plugins/org.eclipse.core.resources.linux/build.xml	2005-05-23 21:43:30.000000000 +0300
+@@ -57,10 +57,15 @@
+ 
+ 	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
+ 		<mkdir dir="${destination.temp.folder}/org.eclipse.core.resources.linux_3.1.0"/>
++          <exec dir="./src" executable="make">
++          </exec>
++	  <copy todir="os/linux/${basearch}" failonerror="true" overwrite="false">
++        	<fileset dir="src" includes="*.so"/>
++          </copy>
+ 		<copy todir="${destination.temp.folder}/org.eclipse.core.resources.linux_3.1.0" failonerror="true" overwrite="false">
+ 			<fileset dir="${basedir}" includes="os/,META-INF/,about.html"			/>
+ 		</copy>
+-		<chmod perm="755" dir="${destination.temp.folder}/org.eclipse.core.resources.linux_3.1.0" includes="os/linux/x86/*.so" /> 
++		<chmod perm="755" dir="${destination.temp.folder}/org.eclipse.core.resources.linux_3.1.0" includes="os/linux/${basearch}/*.so" /> 
+ 	</target>
+ 
+ 	<target name="build.zips" depends="init">
+diff -ur eclipse.orig/plugins/org.eclipse.update.core.linux/src/build.xml eclipse.fix/plugins/org.eclipse.update.core.linux/src/build.xml
+--- eclipse.orig/plugins/org.eclipse.update.core.linux/src/build.xml	2005-05-13 21:37:28.000000000 +0300
++++ eclipse.fix/plugins/org.eclipse.update.core.linux/src/build.xml	2005-05-23 21:43:30.000000000 +0300
+@@ -5,7 +5,7 @@
+   <!-- Set a meaningful default value for when it is not. -->
+   <property name="eclipse-home" value="${basedir}/../.."/>
+   <property name="jdk-path" value="${java.home}"/>  
+-  <property name="destination" value="${eclipse-home}/org.eclipse.update.core.linux/os/linux/x86/"/>
++  <property name="destination" value="${eclipse-home}/org.eclipse.update.core.linux/os/linux/${arch}/"/>
+   <property name="obj-path" value="${eclipse-home}/org.eclipse.update.core.linux/src/"/>
+   <property name="src-path" value="${eclipse-home}/org.eclipse.update.core.linux/src/"/>  
+   
+@@ -47,17 +47,17 @@
+     <property name="header-path" value="${jdk-path}/../include"/>
+     <property name="header-linux-path" value="${header-path}/linux" />
+ 
+-	<echo message="gcc -o  ${library-file} -shared -I${src-path} -I${header-linux-path} ${library-file} -static -lc"/>
++	<echo message="gcc -o  ${library-file} -shared -fPIC -I${src-path} -I${header-linux-path} ${library-file} -lc"/>
+ 
+     <apply executable="gcc" dest="${eclipse-home}/" parallel="false">
+       <arg value="-o"/>
+       <arg value="${library-file}"/>
+       <arg value="-shared"/>
++      <arg value="-fPIC"/>
+       <arg value="-I${src-path}"/>
+       <arg value="-I${header-path}"/>      
+       <arg value="-I${header-linux-path}"/>  
+ 	  <srcfile/>
+-	  <arg value="-static"/>           
+       <arg value="-lc"/>	  
+       <fileset dir="${src-path}" includes="*.c"/>
+       <mapper type="glob" from="*.c" to="*.o"/>
+diff -ur eclipse.orig/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh eclipse.fix/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
+--- eclipse.orig/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	2005-06-27 23:46:32.000000000 +0300
++++ eclipse.fix./plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	2005-06-27 23:51:09.000000000 +0300
+@@ -30,7 +30,9 @@
+ 				if [ "${JAVA_HOME}" = "" ]; then
+ 					JAVA_HOME=/bluebird/teamswt/swt-builddir/jdk1.5.0
+ 				fi
+-				AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64
++				if [ "${AWT_LIB_PATH}" = "" ]; then
++				    AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64
++				fi
+ 				XTEST_LIB_PATH=/usr/X11R6/lib64
+ 				if [ "${GECKO_SDK}" = "" ]; then
+ 					GECKO_SDK=/mozilla/mozilla/1.7/amd64/gtk2/mozilla/dist/sdk
+@@ -48,7 +50,9 @@
+ 				if [ "${JAVA_HOME}" = "" ]; then
+ 					JAVA_HOME=/bluebird/teamswt/swt-builddir/IBMJava2-141
+ 				fi
+-				AWT_LIB_PATH=$JAVA_HOME/jre/bin
++				if [ "${AWT_LIB_PATH}" = "" ]; then
++				    AWT_LIB_PATH=$JAVA_HOME/jre/bin
++				fi
+ 				XTEST_LIB_PATH=/usr/X11R6/lib
+ 				if [ "${GECKO_SDK}" = "" ]; then
+ 					GECKO_SDK=/mozilla/mozilla/1.4/linux_gtk2/mozilla/dist/sdk
+--- eclipse-sdk-3.1/plugins/org.eclipse.help.webapp/build.xml.orig	2005-07-02 23:53:29.888012464 +0000
++++ eclipse-sdk-3.1/plugins/org.eclipse.help.webapp/build.xml	2005-07-02 23:53:42.596080544 +0000
+@@ -165,7 +165,7 @@
+ 		<java
+ 			classname="org.apache.jasper.JspC"
+ 			fork="true"
+-			failonerror="false"
++			failonerror="true"
+ 			classpathref="jasper.classpath"
+ 			output="${temp.folder}/WEB-INF/lib/jsp.jar.bin.log">
+ 			<arg value="-v3" />
diff --git a/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.1 b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.1
new file mode 100644
index 000000000000..2e658fece335
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/digest-eclipse-sdk-3.1
@@ -0,0 +1 @@
+MD5 19ad65d52005da5eaa1d3687b3a50de2 eclipse-sourceBuild-srcIncluded-3.1.zip 66241870