Revbump

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

5 files changed, 364 insertions, 2 deletions

diff --git a/dev-util/eclipse-sdk/ChangeLog b/dev-util/eclipse-sdk/ChangeLog
index a9cadbbf6343..b712258a18ee 100644
--- a/dev-util/eclipse-sdk/ChangeLog
+++ b/dev-util/eclipse-sdk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/eclipse-sdk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.152 2010/03/03 08:50:52 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.153 2010/03/05 17:22:59 ali_bush Exp $
+
+*eclipse-sdk-3.5.1-r1 (05 Mar 2010)
+
+  05 Mar 2010; Alistair Bush <ali_bush@gentoo.org>
+  +files/3.5/gtk_makefile.patch, +eclipse-sdk-3.5.1-r1.ebuild,
+  +files/3.5/hamcrest-junit-lib.patch:
+  Revbump with fixes for #296796, #296298 and #296796
 
   03 Mar 2010; Alistair Bush <ali_bush@gentoo.org> files/3.5/eclipse-3.5:
   Make shell script POSIX compliant. Thanks for patch from Michał Górny
diff --git a/dev-util/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest
index 20f24d57eeb2..4b89ac7f4423 100644
--- a/dev-util/eclipse-sdk/Manifest
+++ b/dev-util/eclipse-sdk/Manifest
@@ -22,6 +22,8 @@ AUX 3.4/fedora/eclipse-libupdatebuild2.patch 722 RMD160 6baa55ab7545f02e808ed05c
 AUX 3.4/fedora/eclipse-pde.build-add-package-build.patch 11604 RMD160 ba63781fa77452e4c36eae7e07d81b7d39f5ec29 SHA1 7ee30f8fc2732125e1f2ba01038922d995b21456 SHA256 d361930896c940c09a7faf41f2c8d7843d56be9b90391e91538890062e5d7803
 AUX 3.5/eclipse-3.5 1541 RMD160 f0625c1244ef52395d0f6e6fa9d30b4b7f5e647d SHA1 e553e7cff17cbd00e736ff2b5ff5ec36ca2b3121 SHA256 487cd70af50cefc7efd96f97168e87f525fb03e4483af95a24d939c4a209ba6d
 AUX 3.5/eclipserc-3.5 858 RMD160 f911438aa661be9ca8fc352dd372c9485d163ddb SHA1 abb1c369326be455d16bc42cf0a1b035aa145dc0 SHA256 0aea733c968ca064ad5ca95d5895778ecf7387826198b512e98d0cbb7dd353f1
+AUX 3.5/gtk_makefile.patch 1574 RMD160 4250a89d4411e155294ee82d39f0d5b2e800794f SHA1 e46689bb64ad1c50817eecb0aa745c24963c58da SHA256 f7d2a62a4e4507868a06d221c14c7d62254eb115730d8f29e8cf77b28ba7db4a
+AUX 3.5/hamcrest-junit-lib.patch 1120 RMD160 90af5f96e04c3425c52777a27efa5c827dfbe93f SHA1 db42685eea17ad9a1530fcd8bbc90db2b9296849 SHA256 8098854a080ce5286aa362fc419d1121e3bab5422ab117239b9b69a627f4d903
 AUX 3.5/jvmarg.patch 425 RMD160 89398d74090b98533733048b487d957f5ea2c843 SHA1 fe3e6fefbcfadac1c07765ab62bee9b910493962 SHA256 d7f71fb8415232c8a3d681244a5c78e858044e52398ded0062645a9e1ebdf335
 AUX eclipse-3.2 1152 RMD160 6d7a2d67e1aa0fd011d056d2b287dc7196528b44 SHA1 3562c650d4e41f5186b396d31630c2faa7c132a9 SHA256 5f10f1cbae578c394e98b5d380c0d4f362620e7ff87fa3bde226e5533d34b8cf
 AUX eclipse-3.2-r1 1604 RMD160 ebc7ff4eb6b776e653d23fc7934690f1c782185e SHA1 e538c6d2454b977acf2b706636ac3db77b06b1ee SHA256 35ff6dc5124e8f868ae5fd9493fcb3c75d5f52fda30d5c50238dfc42e3ecbc7a
@@ -29,6 +31,7 @@ DIST eclipse-R3_5_1-fetched-src.tar.bz2 79061683 RMD160 ba04a7e9a9521f01c0c97d9f
 DIST eclipse-build-R0_4_0.tar.gz 164001 RMD160 c110ad217473c002aed5791547d9c18f9f05547a SHA1 aefd9bf326b92ec1e01e080d802d1fa0aeb788f1 SHA256 87f159e0861b378b1ea13d3173d6066fbc141a350283b0f0278831a5097cbe1b
 DIST eclipse-sourceBuild-srcIncluded-3.4.zip 105671901 RMD160 91b93c4f1538efe98471c2f9ee9ccd6ff081816c SHA1 c3200eca6b51147e2c00f7da09ca1f45160fd08e SHA256 df829822473886aa62b15d9f95654f88e868634fb1b78ce0b12c550b85054e93
 EBUILD eclipse-sdk-3.4-r2.ebuild 12539 RMD160 12af53e986db8e3f54b443e59e0f7f86485e245d SHA1 c788d6c79f25b5d501433fb94d6e44bdfa44164a SHA256 00fef63546ffead238b27f62c6e1b4c86831f457e9091c2f82a30e26e80f4e87
+EBUILD eclipse-sdk-3.5.1-r1.ebuild 11022 RMD160 cc445b099786f633c5cca73faa9227d07913c093 SHA1 17f3ae2c9be0a386312364ddfb910dc330dd5d8b SHA256 be781d924682eed32b3635e5efe87f17d2295e013926ffe16a3420db6eb06cc7
 EBUILD eclipse-sdk-3.5.1.ebuild 10826 RMD160 3204307eefc4f34439a9781525829f50e9f9dbc0 SHA1 a0901493e7795f6eaa0b51b39a99fbf2a025ca40 SHA256 2ed865dbd5a534db81d9b4b13c22dc6cb2324c608a7401f37b872850ce741009
-MISC ChangeLog 30051 RMD160 f538f35140bf9ef714d7cefea4e83698274e4528 SHA1 08a50f538e62f946e3aec24ad5db2351f2f41c80 SHA256 86a2ff946ceaa26709abe21840406b78d7cc7ac96e9d30c31b5ecc0230080669
+MISC ChangeLog 30296 RMD160 c16cbade5389e7e55ce84c4149e82feb1c594963 SHA1 d4ebe994513b72aa5262f7ceb0b4de78c5d3199e SHA256 8f5383d469b599d2566c83e807b824e46595e2fbb561de4a62dba6698b0f038e
 MISC metadata.xml 800 RMD160 f97cc4ac78898369a7706331bb14bc838519cf21 SHA1 21cd52a15acb6510aa3b955f78fb28a73cf58234 SHA256 76e243573c28c3d705f54745cfbcedd85dae3233b6ed00e2f81a61ac9caeeeaa
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.5.1-r1.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.5.1-r1.ebuild
new file mode 100644
index 000000000000..c701879dffb7
--- /dev/null
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.5.1-r1.ebuild
@@ -0,0 +1,302 @@
+# Copyright 1999-2010 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.5.1-r1.ebuild,v 1.1 2010/03/05 17:22:59 ali_bush Exp $
+
+EAPI="2"
+WANT_ANT_TASKS="ant-nodeps"
+
+# eclipse-build is too complicated for automatic fixing
+# if there are any fixes we should create patches
+# and push them upstream
+JAVA_PKG_BSFIX="off"
+
+inherit java-pkg-2 java-ant-2 check-reqs
+
+BUILD_ID="R3_5_1"
+ECLIPSE_BUILD_VER="R0_4_0"
+S="${WORKDIR}/eclipse-build-${ECLIPSE_BUILD_VER}"
+
+DESCRIPTION="Eclipse SDK"
+HOMEPAGE="http://www.eclipse.org/eclipse/"
+SRC_URI="http://download.eclipse.org/technology/linuxtools/eclipse-build/eclipse-${BUILD_ID}-fetched-src.tar.bz2
+	http://download.eclipse.org/technology/linuxtools/eclipse-build/eclipse-build-${ECLIPSE_BUILD_VER}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="3.5"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gnome source"
+
+CDEPEND=">=dev-java/swt-${PV}:${SLOT}
+	>=dev-java/ant-1.7.1
+	>=dev-java/ant-core-1.7.1
+	>=dev-java/asm-3.1:3
+	>=dev-java/commons-codec-1.3
+	>=dev-java/commons-el-1.0
+	>=dev-java/commons-httpclient-3.1:3
+	>=dev-java/commons-logging-1.0.4
+	>=dev-java/hamcrest-core-1.1
+	>=dev-java/icu4j-4.0.1:4
+	>=dev-java/jsch-0.1.41
+	>=dev-java/junit-3.8.2:0
+	>=dev-java/junit-4.5:4
+	>=dev-java/lucene-1.9.1:1.9
+	>=dev-java/lucene-analyzers-1.9.1:1.9
+	>=dev-java/sat4j-core-2.1:2
+	>=dev-java/sat4j-pseudo-2.1:2
+	dev-java/tomcat-servlet-api:2.5
+	x86? ( gnome? ( gnome-base/gconf ) )
+	dev-java/ant-nodeps"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	app-arch/zip
+	>=virtual/jdk-1.6"
+
+ALL_OS='aix hpux linux macosx qnx solaris win32'
+ALL_WS='carbon cocoa gtk motif photon win32 wpf'
+ALL_ARCH='alpha arm ia64 mips mipsel PA_RISC ppc ppc64 s390 s390x sparc sparc64 x86 x86_64'
+
+buildDir="${S}/build/eclipse-${BUILD_ID}-fetched-src"
+
+pkg_setup() {
+	ws='gtk'
+	if use x86 ; then os='linux' ; arch='x86'
+	elif use amd64 ; then os='linux' ; arch='x86_64'
+	fi
+
+	java-pkg-2_pkg_setup
+
+	if use doc ; then
+		ewarn "Having the 'doc' USE flag enabled greatly increases the build time."
+		ewarn "You might want to disable it for ${PN} if you don't need it."
+	fi
+}
+
+src_unpack() {
+	CHECKREQS_MEMORY="1536"
+	if use doc || use source ; then
+		CHECKREQS_DISK_BUILD="3072"
+	else
+		CHECKREQS_DISK_BUILD="1536"
+	fi
+	check_reqs
+
+	unpack "eclipse-build-${ECLIPSE_BUILD_VER}.tar.gz"
+	mv "${WORKDIR}/eclipse-build-0_4_RC6" "${S}" || die
+	ln -s "${DISTDIR}/eclipse-${BUILD_ID}-fetched-src.tar.bz2" "${S}"/ || die
+
+	cd "${S}"
+	eant unpack
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/3.5/jvmarg.patch" || die
+
+	# apply patches before we start cleaning junk out
+	eant applyPatches
+
+	# fix up hardcoded runtime class paths
+	sed -e 's|/usr/lib/jvm/java/jre/lib/rt\.jar:.*$|'"$(java-config --runtime)"'|' \
+			-i {,pde}build.properties || die
+
+	# fix up arch specifications if we're x86_64
+	if use amd64 ; then
+		sed -e 's/x86/\0_64/' -i "${buildDir}"/buildConfigs/eclipse-build-config/build.properties || die
+	fi
+
+	# disable building of libgnomeproxy on x86 if USE=-gnome
+	if ! use gnome ; then
+		sed_xml_element 'condition' -e '/property="build\.libgnomeproxy"/d' -i build.xml || die
+	fi
+
+	# skip compilation of SWT native libraries (we use the system-installed copies)
+	sed_xml_element 'ant' -e '/swt/d' -i build.xml || die
+
+	ebegin 'Removing plugins of irrelevant platforms'
+	local remove_os=" ${ALL_OS} " ; remove_os=${remove_os/ ${os} / }
+	remove_os=${remove_os# } ; remove_os=${remove_os% } ; remove_os=${remove_os// /'\|'}
+	local remove_ws=" ${ALL_WS} " ; remove_ws=${remove_ws/ ${ws} / }
+	remove_ws=${remove_ws# } ; remove_ws=${remove_ws% } ; remove_ws=${remove_ws// /'\|'}
+	local remove_arch=" ${ALL_ARCH} " ; remove_arch=${remove_arch/ ${arch} / }
+	remove_arch=${remove_arch# } ; remove_arch=${remove_arch% } ; remove_arch=${remove_arch// /'\|'}
+	sed_xml_element 'includes\|plugin' \
+			-e '/id="org\.eclipse\.\(core\.net\.linux\.x86\|update\.core\.linux\)"/b' \
+			-e '/os="'"${remove_os}"'"/d' -e '/ws="'"${remove_ws}"'"/d' -e '/arch="'"${remove_arch}"'"/d' \
+			-i "${buildDir}"/features/*/feature.xml "${S}"/eclipse-build-feature/feature.xml \
+		|| die 'remove irrelevant platforms failed'
+	eend
+
+	if ! use doc ; then
+		ebegin 'Removing documentation plugins'
+		rm -rf "${buildDir}"/plugins/*.doc{,.*}
+		eclipse_delete-plugins '.*\.doc\(\..*\|\)'
+		eend
+	fi
+
+	if ! use source ; then
+		ebegin 'Removing source plugins'
+		rm -rf "${buildDir}"/plugins/*.source{,_*}
+		eclipse_delete-plugins '.*\.source'
+		eend
+	fi
+
+	unbundle "${buildDir}"/plugins
+	cd ${buildDir} || die
+	epatch "${FILESDIR}/${SLOT}/hamcrest-junit-lib.patch"
+	epatch "${FILESDIR}/${SLOT}/gtk_makefile.patch"
+}
+
+src_compile() {
+	ANT_OPTS='-Xmx512M' eant -DbuildArch=${arch}
+}
+
+src_install() {
+	local destDir="/usr/$(get_libdir)/eclipse-${SLOT}"
+
+	insinto "${destDir}"
+	shopt -s dotglob
+	doins -r "${buildDir}"/installation/* || die
+	shopt -u dotglob
+	chmod +x "${D}${destDir}"/eclipse
+	rm -f "${D}${destDir}"/libcairo-swt.so  # use the system-installed SWT libraries
+
+	ebegin 'Unbundling dependencies'
+	unbundle "${D}${destDir}"
+	eend
+
+	# Install Gentoo wrapper and config
+	dobin "${FILESDIR}/${SLOT}/eclipse-${SLOT}" || die
+	insinto /etc
+	doins "${FILESDIR}/${SLOT}/eclipserc-${SLOT}" || die
+
+	# Create desktop entry
+	make_desktop_entry "eclipse-${SLOT}" "Eclipse ${PV}" "${destDir}/icon.xpm" || die
+}
+
+unbundle() {
+	pushd "${1}" > /dev/null || die
+	eclipse_unbundle-dir plugins/org.apache.ant_* ant-core,ant-nodeps lib
+	eclipse_unbundle-dir plugins/org.junit_* junit
+	eclipse_unbundle-dir plugins/org.junit4_* junit-4
+	eclipse_unbundle-jar plugins/com.ibm.icu_*.jar icu4j-4
+	eclipse_unbundle-jar plugins/com.jcraft.jsch_*.jar jsch
+	eclipse_unbundle-jar plugins/javax.servlet_*.jar tomcat-servlet-api-2.5 servlet-api
+	eclipse_unbundle-jar plugins/javax.servlet.jsp_*.jar tomcat-servlet-api-2.5 jsp-api
+	eclipse_unbundle-jar plugins/org.apache.commons.codec_*.jar commons-codec
+	eclipse_unbundle-jar plugins/org.apache.commons.el_*.jar commons-el
+	eclipse_unbundle-jar plugins/org.apache.commons.httpclient_*.jar commons-httpclient-3
+	eclipse_unbundle-jar plugins/org.apache.commons.logging_*.jar commons-logging
+	#eclipse_unbundle-jar plugins/org.apache.jasper_*.jar tomcat-jasper
+	eclipse_unbundle-jar plugins/org.apache.lucene_*.jar lucene-1.9
+	eclipse_unbundle-jar plugins/org.apache.lucene.analysis_*.jar lucene-analyzers-1.9
+	eclipse_unbundle-jar plugins/org.eclipse.swt."${ws}.${os}.${arch}"_*.jar swt-${SLOT}
+	eclipse_unbundle-jar plugins/org.hamcrest.core_*.jar hamcrest-core
+	#eclipse_unbundle-jar plugins/org.mortbay.jetty_*.jar jetty
+	eclipse_unbundle-jar plugins/org.objectweb.asm_*.jar asm-3
+	eclipse_unbundle-jar plugins/org.sat4j.core_*.jar sat4j-core-2
+	eclipse_unbundle-jar plugins/org.sat4j.pb_*.jar sat4j-pseudo-2
+	popd > /dev/null
+}
+
+# Replaces the bundled jars in plugin dir ${1} with links to the jars from
+# java-config package ${2}. If ${3} is given, the jars are linked in ${1}/${3}.
+eclipse_unbundle-dir() {
+	local bundle=${1} package=${2} into=${3}
+	local basename=$(basename "${bundle}")
+	local barename=${basename%_*}
+
+	if [[ -d "${bundle}" ]] ; then
+		einfo "  ${barename} => ${package}"
+
+		pushd "${bundle}" > /dev/null || die
+		local classpath=$(manifest_get META-INF/MANIFEST.MF 'Bundle-ClassPath')
+		manifest_delete META-INF/MANIFEST.MF 'Name\|SHA1-Digest'
+		rm -f ${classpath//,/ } META-INF/ECLIPSEF.{RSA,SF}
+		java-pkg_jar-from ${into:+--into "${into}"} "${package}"
+		popd > /dev/null
+	fi
+}
+
+# Converts plugin jar ${1} into a plugin dir, creates symbolic links to the
+# jars of java-config package ${2} in that dir, and updates artifacts.xml and
+# bundles.info to reflect the fact that the plugin is now a dir.
+eclipse_unbundle-jar() {
+	local bundle=${1} package=${2} jar=${3}
+	local basename=$(basename "${bundle}" .jar)
+	local barename=${basename%_*}
+
+	if [[ -f "${bundle}" ]] ; then
+		einfo "  ${barename} => ${package}"
+
+		mkdir "${bundle%.jar}"
+		pushd "${bundle%.jar}" > /dev/null || die
+		"$(java-config --jar)" -xf "../${basename}.jar" plugin.properties META-INF/MANIFEST.MF || die
+		java-pkg_jar-from "${package}" ${jar:+"${jar}.jar"}
+		local classpath=$(find . -type l -name '*.jar' -print0 | tr '\0' ',')
+		classpath=${classpath%,} ; classpath=${classpath//.\/}
+		manifest_delete META-INF/MANIFEST.MF 'Name\|SHA1-Digest'
+		manifest_replace META-INF/MANIFEST.MF 'Bundle-ClassPath' "${classpath}"
+		popd > /dev/null || die
+		rm "${bundle}"
+
+		sed_xml_element 'artifact' \
+				-e '/id='\'"${barename//./\.}"\''/s|</artifact>|  <repositoryProperties size='\'1\''>\n        <property name='\'artifact.folder\'' value='\'true\''/>\n      </repositoryProperties>\n    \0|' \
+				-i artifacts.xml || die
+		sed -e 's|'"${bundle//./\.}"'|'"${bundle%.jar}"'/|' \
+			-i configuration/org.eclipse.equinox.simpleconfigurator/bundles.info || die
+	fi
+}
+
+# Removes feature.xml references to plugins matching ${1}.
+eclipse_delete-plugins() {
+	sed_xml_element 'includes\|plugin' -e '/id="'"${1}"'"/d' \
+			-i "${buildDir}"/features/*/feature.xml "${S}"/eclipse-build-feature/feature.xml \
+		|| die 'eclipse_delete-plugins failed'
+}
+
+# Prints the first value from manifest file ${1} whose key matches regex ${2},
+# unfolding as necessary.
+manifest_get() {
+	sed -n -e '/^\('"${2}"'\): /{h;:A;$bB;n;/^ /!bB;H;bA};d;:B;g;s/^[^:]*: //;s/\n //g;p;q' "${1}" \
+		|| die 'manifest_get failed'
+}
+
+# Deletes values from manifest file ${1} whose keys match regex ${2}, taking
+# into account folding.
+manifest_delete() {
+	sed -n -e ':A;/^\('"${2}"'\): /{:B;n;/^ /!{bA};bB};p' -i "${1}" \
+		|| die 'manifest_delete failed'
+}
+
+# Replaces the value for key ${2} in the first section of manifest file ${1}
+# with ${3}, or adds the key-value pair to that section if the key was absent.
+manifest_replace() {
+	LC_ALL='C' awk -v key="${2}" -v val="${3}" '
+function fold(s,  o, l, r) {
+	o = 2 ; l = length(s) - 1 ; r = substr(s, 1, 1)
+	while (l > 69) { r = r substr(s, o, 69) "\n " ; o += 69 ; l -= 69 }
+	return r substr(s, o)
+}
+BEGIN { FS = ": " }
+f { print ; next }
+i { if ($0 !~ "^ ") { f = 1 ; print } ; next }
+$1 == key { print fold(key FS val) ; i = 1 ; next }
+/^\r?$/ { print fold(key FS val) ; print ; f = 1 ; next }
+{ print }
+END { if (!f) { print fold(key FS val) } }
+' "${1}" > "${1}-" && mv "${1}"{-,} || die 'manifest_replace failed'
+}
+
+# Executes sed over each XML element with a name matching ${1}, rather than
+# over each line. The entire element (and its children) may be removed with the
+# 'd' command, or they may be edited using all the usual sed foo. Basically,
+# the script argument will be executed only for elements matching ${1}, and the
+# sed pattern space will consist of the entire element, including any nested
+# elements. Note that this is not perfect and requires no more than one XML
+# element per line to be reliable.
+sed_xml_element() {
+	local elem="${1}" ; shift
+	sed -e '/<\('"${elem}"'\)\([> \t]\|$\)/{:_1;/>/!{N;b_1};/\/>/b_3' \
+			-e ':_2;/<\/\('"${elem}"'\)>/!{N;b_2};b_3};b;:_3' "${@}"
+}
diff --git a/dev-util/eclipse-sdk/files/3.5/gtk_makefile.patch b/dev-util/eclipse-sdk/files/3.5/gtk_makefile.patch
new file mode 100644
index 000000000000..6c1e68420505
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/3.5/gtk_makefile.patch
@@ -0,0 +1,39 @@
+--- features/org.eclipse.equinox.executable/library/gtk/make_linux.mak	2010-03-06 01:16:49.000000000 +1300
++++ features/org.eclipse.equinox.executable/library/gtk/make_linux.mak	2010-03-06 01:31:15.000000000 +1300
+@@ -27,14 +27,14 @@
+   PROGRAM_OUTPUT=eclipse
+ endif
+ 
+-PROGRAM_LIBRARY=$(PROGRAM_OUTPUT)_$(LIB_VERSION).so
++PROGRAM_SONAME=$(PROGRAM_OUTPUT)_$(LIB_VERSION)
++PROGRAM_LIBRARY=$(PROGRAM_SONAME).so
+ 
+ ifeq ($(DEFAULT_JAVA),)
+   DEFAULT_JAVA=DEFAULT_JAVA_JNI
+ endif
+ 
+ # Define the object modules to be compiled and flags.
+-CC=gcc
+ MAIN_OBJS = eclipseMain.o
+ COMMON_OBJS = eclipseConfig.o eclipseCommon.o eclipseGtkCommon.o eclipseGtkInit.o
+ DLL_OBJS	= eclipse.o eclipseGtk.o eclipseUtil.o eclipseJNI.o eclipseMozilla.o eclipseShm.o eclipseNix.o
+@@ -44,8 +44,8 @@
+ #LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0 -lpthread -ldl
+ LIBS = -lpthread -ldl
+ GTK_LIBS = -DGTK_LIB="\"libgtk-x11-2.0.so.0\"" -DGDK_LIB="\"libgdk-x11-2.0.so.0\"" -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\""
+-LFLAGS = -shared -fpic -Wl,--export-dynamic 
+-CFLAGS = -g -s -Wall\
++LFLAGS = -shared -Wl,-soname=$(PROGRAM_SONAME) -fpic -Wl,--export-dynamic 
++CFLAGS += -Wall\
+ 	-fpic \
+ 	-DLINUX \
+ 	-DMOZILLA_FIX \
+@@ -98,7 +98,7 @@
+ 	$(CC) -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
+ 	
+ $(DLL): $(DLL_OBJS) $(COMMON_OBJS)
+-	$(CC) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS)
++	$(CC) $(LDFLAGS) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS)
+ 
+ install: all
+ 	cp $(EXEC) $(OUTPUT_DIR)
diff --git a/dev-util/eclipse-sdk/files/3.5/hamcrest-junit-lib.patch b/dev-util/eclipse-sdk/files/3.5/hamcrest-junit-lib.patch
new file mode 100644
index 000000000000..f76f540b9b5e
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/3.5/hamcrest-junit-lib.patch
@@ -0,0 +1,11 @@
+--- ./plugins/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/BuildPathSupport.java.old	2010-03-04 07:29:04.000000000 +1300
++++ ./plugins/org.eclipse.jdt.junit/src/org/eclipse/jdt/internal/junit/buildpath/BuildPathSupport.java	2010-03-04 07:29:28.000000000 +1300
+@@ -139,7 +139,7 @@
+ 			"org.junit4", new VersionRange("[4.5.0,5.0.0)"), "junit.jar", "org.junit4.source", "junitsrc.zip", JUnitPreferencesConstants.JUNIT4_JAVADOC); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ 	
+ 	private static final JUnitPluginDescription HAMCREST_CORE_PLUGIN= new JUnitPluginDescription(
+-			"org.hamcrest.core", new VersionRange("[1.1.0,2.0.0)"), null, "org.hamcrest.core.source", "source-bundle/", JUnitPreferencesConstants.HAMCREST_CORE_JAVADOC); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
++			"org.hamcrest.core", new VersionRange("[1.1.0,2.0.0)"), "hamcrest-core.jar", "org.hamcrest.core.source", "source-bundle/", JUnitPreferencesConstants.HAMCREST_CORE_JAVADOC); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ 
+ 	/**
+ 	 * @return the JUnit3 classpath container