eclipse-sdk: removed old ebuilds and changed the memory limit for the newest one

from 3 times -Xmx value to 2.5 times -Xmx value.

5 files changed, 18 insertions, 835 deletions

diff --git a/dev-util/eclipse-sdk/ChangeLog b/dev-util/eclipse-sdk/ChangeLog
index aadff58..c1f0517 100644
--- a/dev-util/eclipse-sdk/ChangeLog
+++ b/dev-util/eclipse-sdk/ChangeLog
@@ -2,6 +2,20 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*eclipse-sdk-3.7.1-r5.ebuild (28 Feb 2012)
+
+  28.Feb.2012 Sven Eden <sven.eden@gmx.de> +eclise-sdk-3.7.1-r5.ebuild :
+  Changed the memory requirements from 1536M to 1280M, which is two and
+  a half times the set Xmx value for 512M instead of the previous three
+  times. The build works fine with this lower settings and allows users
+  with 1.5GB RAM to merge eclipse without manual tweaks.
+
+  28.Feb.2012 Sven Eden <sven.eden@gmx.de>
+  -eclipse-sdk-3.7.0-r5.ebuild,
+  -eclipse-sdk-3.7.1-r2.ebuild,
+  -eclipse-sdk-3.7.1-r4.ebuild :
+  Removed obsolete ebuilds
+
 *eclipse-sdk-3.7.1-r4.ebuild (20 Feb 2012)
 
   20.Feb.2012 Sven Eden <sven.eden@gmx.de> +eclise-sdk-3.7.1-r4.ebuild :
diff --git a/dev-util/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest
index ad696d8..d55a2b2 100644
--- a/dev-util/eclipse-sdk/Manifest
+++ b/dev-util/eclipse-sdk/Manifest
@@ -3,11 +3,7 @@ AUX 3.7/eclipserc-3.7 858 RMD160 f911438aa661be9ca8fc352dd372c9485d163ddb SHA1 a
 AUX 3.7/gtk_makefile.patch 1541 RMD160 39738d224c8d6aa9683b6898c773cd0f72f9bd70 SHA1 32b0cbaea2cba87191d3eb8cfa260f3419eea50a SHA256 5b33a3bb23856cdd46381a4de50100392858e9e37cbf814d2426589fa0bbdf58
 AUX 3.7/hamcrest-junit-lib.patch 1236 RMD160 f61fb1b274293c311366c463b9e8bd4fdca14c4f SHA1 8986d82583845dbf45469015ffde890f61eb16e2 SHA256 fbf4cf2b341e87b0e14be8e9794bee89b31e12af1fdf6e078d465d4d29bf09eb
 AUX 3.7/iterators.patch 2058 RMD160 a91238c61510f16bc48bc9559e9c6e341def6dd0 SHA1 f0fcc75ec4827a1f2dbc65af65940beb7274864b SHA256 cc2a1da26b8f63d9c4b75ededf10d7aa67a0d53dea390154eef882dc75e37f2b
-DIST eclipse-3.7.0-src.tar.bz2 67181722 RMD160 2863a0130c5b75c08cf0c1f1977be894ad8edf5e SHA1 361247f39eacdeffb2159e59f508a5ac889912c9 SHA256 a068bab6f06b7939e557be7432b59bcde6925d86edffaa6dc2c1a6eca0fadbb2
 DIST eclipse-3.7.1-src.tar.bz2 69243059 RMD160 a9213a5a9577722e22c82296228230c9a5c0ebbc SHA1 1c3d20ed4dab43a741606f4785bea895e52dc6cf SHA256 f3a87ff4408aeadc6823eb849330527df07d5706d6456af282170bb9bbbd31d6
-DIST eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5.tar.xz 276668 RMD160 346bcdd9e8d44ae865ae80380c54b7fd05a7dd04 SHA1 cb806a93b3f237aec2913d6f8b9068aeb1f9320b SHA256 1703ae2b9062e8692a2ab8aa589c91dc42fe90f6e3ba09ea2f69caf91d9b4865
 DIST eclipse-build-9e028fbc74e844e96a6fd944d7d4f68909283a5d.tar.bz2 267292 RMD160 67bb33d75570a066e0c0af22b2e2b6228f2daea5 SHA1 44ff5cacf9b8a955bca74b5c32d0dc4f7017fcce SHA256 38fbf55a846ab5be2215e67c5a8855aacc1cf26a7d66d0307dd01c26ea56333c
-EBUILD eclipse-sdk-3.7.0-r5.ebuild 14357 RMD160 59bccb0d80a254cb4a5524076367371b800fda06 SHA1 b8fe266985930c934cae9e298218ed3978991738 SHA256 8c1ec7b53b001a8886f0480eccfccfc47d8eaecb8049e827e7d6a7320428afa9
-EBUILD eclipse-sdk-3.7.1-r2.ebuild 14696 RMD160 b661cef037719748df71283808166f4eb5ab0210 SHA1 c4b01006e10a654592514eead2aeb360272df815 SHA256 abd1ad324b42386880d97102f4bf1940c1ddcfc1a90dd0acdb4a1bc159b024ef
-EBUILD eclipse-sdk-3.7.1-r4.ebuild 14582 RMD160 3a554a10ccb1104382451d44ddf4f6013dca275b SHA1 42dda363efd1f2dbeaf8ade0205d06a131a21664 SHA256 377169e974fef64b94a0b503cc69e96ee26d213c834c3c2d5f94d0f4a7fe565a
-MISC ChangeLog 3569 RMD160 e4b1dba7adcf6c5c6f7909deca372e99eccd5ead SHA1 f1703ed34babbd476526620f15417d51bc4e496e SHA256 9663af9937a8f4d16c1780475e5c1dc5441ba3ec3fdff5635bd0b3f843c70572
+EBUILD eclipse-sdk-3.7.1-r5.ebuild 14582 RMD160 d7185102ca8b5e3a0fcef0547a8360b25cf9e867 SHA1 fe8c031f7c19647a49d1af099abe86da54460ea8 SHA256 a0d470bed10d22bac3cbf949d7342d9bb3100d5d054774787796c104d4737286
+MISC ChangeLog 4128 RMD160 5b854753334f59aa37a6f214f5689a39068c1633 SHA1 cb2ebf4b7d3fbab30ea6e75c6cc733a7867b8357 SHA256 0f058ae6af1e9ae1d5b3bb2b3b85ff7e46a90a0efcf2bf7d45dde61f5a52bf56
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.7.0-r5.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.7.0-r5.ebuild
deleted file mode 100644
index 56377be..0000000
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.7.0-r5.ebuild
+++ /dev/null
@@ -1,411 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header$
-
-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_VER="3.7.0"
-BUILD_ID="I20110613-1736"
-BUILD_LABEL="${BUILD_VER}-${BUILD_ID}"
-ECLIPSE_BUILD_VER="5791c48513b4207ab1eec1e00bed4b2186f9aad5"
-S="${WORKDIR}/eclipse-build-${ECLIPSE_BUILD_VER}"
-
-DESCRIPTION="Eclipse SDK"
-HOMEPAGE="http://www.eclipse.org/eclipse/"
-BASE_URI="http://download.eclipse.org/technology/linuxtools/eclipse-build/3.7.x_Indigo/"
-SRC_URI="${BASE_URI}eclipse-${BUILD_VER}-src.tar.bz2 ${BASE_URI}eclipse-build-${ECLIPSE_BUILD_VER}.tar.xz"
-RESTRICT="mirror"
-
-LICENSE="EPL-1.0"
-SLOT="3.7"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gnome source"
-
-# ant dependencies should really be >=1.8.2
-CDEPEND=">=dev-java/swt-${PV%.0}_rc4:${SLOT}
-	>=dev-java/ant-1.8.1
-	>=dev-java/asm-3.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.4.2:4.4
-	>=dev-java/jsch-0.1.41
-	>=dev-java/junit-3.8.2:0
-	>=dev-java/junit-4.8.2:4
-	>=dev-java/lucene-2.9.1:2.9
-	>=dev-java/lucene-analyzers-2.9.1:2.9
-	>=dev-java/sat4j-core-2.3.0:2.3
-	>=dev-java/sat4j-pseudo-2.3.0:2.3
-	dev-java/tomcat-servlet-api:2.5
-	>=www-servers/tomcat-7:7
-	java-virtuals/jetty-server:6
-	x86? ( gnome? ( gnome-base/gconf ) )"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
-# ant dependencies should really be >=1.8.2
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	app-arch/xz-utils
-	app-arch/zip
-	>=dev-java/ant-antlr-1.8.1
-	>=dev-java/ant-apache-bcel-1.8.1
-	>=dev-java/ant-apache-bsf-1.8.1
-	>=dev-java/ant-apache-log4j-1.8.1
-	>=dev-java/ant-apache-oro-1.8.1
-	>=dev-java/ant-apache-regexp-1.8.1
-	>=dev-java/ant-apache-resolver-1.8.1
-	>=dev-java/ant-apache-xalan2-1.8.1
-	>=dev-java/ant-commons-logging-1.8.1
-	>=dev-java/ant-commons-net-1.8.1
-	>=dev-java/ant-core-1.8.1
-	>=dev-java/ant-javamail-1.8.1
-	>=dev-java/ant-jdepend-1.8.1
-	>=dev-java/ant-jmf-1.8.1
-	>=dev-java/ant-jsch-1.8.1
-	>=dev-java/ant-junit-1.8.1
-	>=dev-java/ant-junit4-1.8.1
-	>=dev-java/ant-swing-1.8.1
-	>=dev-java/ant-testutil-1.8.1
-	doc? ( >=dev-java/ant-nodeps-1.8.1 )
-	>=virtual/jdk-1.6"
-#	>=dev-java/ant-launcher-1.8.1
-
-OSGI_DEPENDENCIES=(
-	'com.ibm.icu - icu4j-4.4'
-	'com.jcraft.jsch - jsch'
-	'javax.servlet tomcat6-servlet-2.5-api tomcat-servlet-api-2.5 servlet-api'
-	'javax.servlet.jsp tomcat6-jsp-2.1-api tomcat-servlet-api-2.5 jsp-api'
-	'org.apache.commons.codec commons-codec commons-codec'
-	'org.apache.commons.el apache-commons-el-1.0 commons-el'
-	'org.apache.commons.httpclient jakarta-commons-httpclient-3.1 commons-httpclient-3'
-	'org.apache.commons.logging apache-commons-logging commons-logging'
-	'org.apache.jasper - tomcat-7 jasper jasper-el'
-	'org.apache.lucene.core lucene lucene-2.9'
-	'org.apache.lucene.analysis lucene-analyzers lucene-analyzers-2.9'
-	'org.hamcrest.core - hamcrest-core'
-	'org.mortbay.jetty.server jetty-6.1.26 jetty-6 jetty'
-	'org.mortbay.jetty.util jetty-util-6.1.26 jetty-6 jetty-util'
-	'org.objectweb.asm - asm-3'
-	'org.sat4j.core org.sat4j.core sat4j-core-2.3'
-	'org.sat4j.pb org.sat4j.pb sat4j-pseudo-2.3'
-)
-NONOSGI_DEPENDENCIES=(
-	'org.apache.ant ant-antlr'
-	'org.apache.ant ant-apache-bcel'
-	'org.apache.ant ant-apache-bsf'
-	'org.apache.ant ant-apache-log4j'
-	'org.apache.ant ant-apache-oro'
-	'org.apache.ant ant-apache-regexp'
-	'org.apache.ant ant-apache-resolver'
-	'org.apache.ant ant-apache-xalan2'
-	'org.apache.ant ant-commons-logging'
-	'org.apache.ant ant-commons-net'
-	'org.apache.ant ant-core ant ant-launcher'
-	'org.apache.ant ant-javamail'
-	'org.apache.ant ant-jdepend'
-	'org.apache.ant ant-jmf'
-	'org.apache.ant ant-jsch'
-	'org.apache.ant ant-junit'
-	'org.apache.ant ant-junit4'
-#	'org.apache.ant ant-launcher'
-	'org.apache.ant ant-swing'
-	'org.apache.ant ant-testutil'
-	'org.junit_3.8.2.v3 junit'
-	'org.junit4 junit-4 junit'
-	'org.junit_4.8.2.v4 junit-4 junit'
-)
-
-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_LABEL}-src"
-
-pkg_pretend() {
-	CHECKREQS_MEMORY="1536M"
-	if use doc ; then
-		CHECKREQS_DISK_BUILD="3072M"
-	else
-		CHECKREQS_DISK_BUILD="1536M"
-	fi
-	check-reqs_pkg_pretend
-}	 
-
-pkg_setup() {
-	CHECKREQS_MEMORY="1536M"
-	if use doc ; then
-		CHECKREQS_DISK_BUILD="3072M"
-	else
-		CHECKREQS_DISK_BUILD="1536M"
-	fi
-	check-reqs_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() {
-
-	#unpack "eclipse-build-${ECLIPSE_BUILD_VER}.tar.xz"
-	tar -xpJf "${DISTDIR}/eclipse-build-${ECLIPSE_BUILD_VER}.tar.xz"
-	ln -s "${DISTDIR}/eclipse-${BUILD_VER}-src.tar.bz2" "${S}/eclipse-${BUILD_LABEL}-src.tar.bz2" || die
-	cd "${S}"
-	# building with ecj fails for some reason (polluted classpath probably)
-	java-pkg_force-compiler javac
-	#sed -e 's/^\(label\|testsBuildLabel\)=.*$/\1='"${BUILD_LABEL}"'/' \
-	#		-e 's/^buildId=.*$/buildId='"${BUILD_ID}"'/' \
-	#		-i build.properties -i pdebuild.properties || die
-	eant unpack
-	cp -r "${S}/build/eclipse-${PV}-src/"* "${buildDir}/" || die "Copying sources failed"
-	rm -r "${S}/build/eclipse-${PV}-src" || die "Removing dir failed"
-	ln -s "eclipse-${BUILD_LABEL}-src" "${S}/build/eclipse-${PV}-src" || die "Creating link failed"
-
-}
-
-src_prepare() {
-	# 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
-
-	# we'll handle our own dependency symlinking, so disable eclipse-build helper
-	sed -e 's/,symlinkDeps,/,/' -i build.xml || die
-	sed_xml_element 'target' -e '/name="provision.sdk"/ s|<symlinkInstalled.*\(<echo \)|\1|' \
-			-i build.xml || die
-
-	# this unpacking step appears to be unnecessary (and it doesn't work)
-	sed_xml_element 'target' -e 's/\(depends="[^"]\+\),[^",]*nestedJars/\1/' \
-			-i "${buildDir}"/plugins/*/build.xml || die
-
-	# 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
-
-	ebegin 'Linking dependencies'
-	local dep ; for dep in "${OSGI_DEPENDENCIES[@]}" ; do
-		eclipse_create-osgi-dep ${dep}
-	done
-	local dep ; for dep in "${NONOSGI_DEPENDENCIES[@]}" ; do
-		eclipse_create-nonosgi-dep ${dep}
-	done
-	eend
-
-	cd "${buildDir}" || die
-	epatch "${FILESDIR}/${SLOT}/hamcrest-junit-lib.patch"
-	epatch "${FILESDIR}/${SLOT}/gtk_makefile.patch"
-	epatch "${FILESDIR}/${SLOT}/iterators.patch"
-}
-
-src_compile() {
-	addpredict "/dev/random"
-	ANT_OPTS='-Xmx512M' eant -DbuildArch="${arch}"
-
-	# remove stray symlink
-	rm "${buildDir}"/installation/plugins/junit4.jar
-}
-
-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
-
-	# redo symlinks
-	ebegin 'Relinking dependencies'
-	local dep ; for dep in "${OSGI_DEPENDENCIES[@]}" ; do
-		eclipse_relink-osgi-dep ${dep}
-	done
-	local dep ; for dep in "${NONOSGI_DEPENDENCIES[@]}" ; do
-		eclipse_relink-nonosgi-dep ${dep}
-	done
-	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
-}
-
-eclipse_create-osgi-dep() {
-	local bundle=${1} replace=${2} package=${3} ; shift 3
-	bundle=$(basename "${S}/dependencyManifests/${bundle}"_*.jar .jar) || die
-	[[ ${replace} == '-' ]] && replace=${bundle}
-	einfo "  ${bundle} => ${package}" "${@}"
-	mkdir -p "${buildDir}/plugins/${bundle}" || die
-	pushd "${buildDir}/plugins/${bundle}" > /dev/null || die
-	if (( ${#} )) ; then
-		local jar ; for jar in "${@}" ; do
-			java-pkg_jar-from "${package}" "${jar}.jar"
-		done
-	else
-		java-pkg_jar-from "${package}"
-	fi
-	mkdir META-INF || die
-	cp "${S}/dependencyManifests/${bundle}.jar/META-INF/MANIFEST.MF" META-INF/ || die
-	manifest_replace META-INF/MANIFEST.MF 'Bundle-ClassPath' "$(echo *.jar | tr ' ' ',')"
-	manifest_delete META-INF/MANIFEST.MF 'Name\|SHA1-Digest'
-	# replace classpath refs to this bundle with refs to system-installed jars
-	sed_xml_element 'pathelement' -e '/path="\([^"]\+\/\)\?'"${replace//./\.}"'\.jar"/c '"$(
-			for jar in *.jar ; do
-				echo -n '<pathelement path="'"$(readlink "${jar}")"'"/>'
-			done)" -i "${buildDir}"/plugins/*/build.xml || die
-	popd > /dev/null || die
-	# include unpacked bundle in copy to bootstrap plugins dir
-	sed_xml_element 'fileset' -e '/id="orbitDeps"/ s|</fileset>|<include name="'"${bundle}/"'"/>\0|' \
-			-i "${S}/pdebuild.xml" || die
-}
-
-eclipse_create-nonosgi-dep() {
-	local bundle=${1} package=${2} ; shift 2
-	local pdir=${buildDir}/plugins
-	local jar ; for jar in "${@:-${package}}" ; do
-		local dir=$(dirname "$(grep -ho "${bundle//./\.}"'\(_[^/=]*\)\?/\([^/=]*/\)*'"${jar}"'\.jar' \
-				"${S}"/{,jdt}nonosgidependencies.properties)") || die
-		einfo "  ${dir}/${jar}.jar => ${package}"
-		mkdir -p "${pdir}/${dir}" || die
-		java-pkg_jar-from --build-only "${package}" "${jar}.jar" "${pdir}/${dir}/${jar}.jar"
-		dir=${dir%%/*}
-		local manifest=${pdir}/${dir}/META-INF/MANIFEST.MF
-		[[ -f ${manifest} ]] && manifest_delete "${manifest}" 'Name\|SHA1-Digest'
-		rm -f "${pdir}/${dir}"/META-INF/ECLIPSEF.{RSA,SF}
-	done
-}
-
-eclipse_relink-osgi-dep() {
-	local bundle=${1} replace=${2} package=${3} ; shift 3
-	einfo "  ${bundle} => ${package}" "${@}"
-	pushd "${D}${destDir}/plugins/${bundle}"_* > /dev/null || die
-	if (( ${#} )) ; then
-		local jar ; for jar in "${@}" ; do
-			java-pkg_jar-from --build-only "${package}" "${jar}.jar"
-		done
-	else
-		java-pkg_jar-from --build-only "${package}"
-	fi
-	popd > /dev/null || die
-}
-
-eclipse_relink-nonosgi-dep() {
-	local bundle=${1} package=${2} ; shift 2
-	local pdir=${D}${destDir}/plugins
-	local jar ; for jar in "${@:-${package}}" ; do
-		local dir=$(dirname "$(grep -ho "${bundle//./\.}"'\(_[^/=]*\)\?/\([^/=]*/\)*'"${jar}"'\.jar' \
-				"${S}"/{,jdt}nonosgidependencies.properties)") || die
-		einfo "  ${dir}/${jar}.jar => ${package}"
-		mkdir -p "${pdir}/${dir}" || die
-		java-pkg_jar-from --build-only "${package}" "${jar}.jar" "${pdir}/${dir}/${jar}.jar"
-	done
-}
-
-# 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/eclipse-sdk-3.7.1-r2.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.7.1-r2.ebuild
deleted file mode 100644
index 8a812bc..0000000
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.7.1-r2.ebuild
+++ /dev/null
@@ -1,416 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header$
-
-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_VER="3.7.1"
-BUILD_ID="I20110909-1335"
-BUILD_LABEL="${BUILD_VER}-${BUILD_ID}"
-ECLIPSE_BUILD_VER="9e028fbc74e844e96a6fd944d7d4f68909283a5d"
-S="${WORKDIR}/org.eclipse.linuxtools.eclipse-build-${ECLIPSE_BUILD_VER}/eclipse-build"
-
-DESCRIPTION="Eclipse SDK"
-HOMEPAGE="http://www.eclipse.org/eclipse/"
-BASE_URI="http://download.eclipse.org/technology/linuxtools/eclipse-build/3.7.x_Indigo/"
-SRC_URI="${BASE_URI}eclipse-${BUILD_VER}-src.tar.bz2
-	http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.eclipse-build.git/snapshot/org.eclipse.linuxtools.eclipse-build-${ECLIPSE_BUILD_VER}.tar.bz2 -> eclipse-build-${ECLIPSE_BUILD_VER}.tar.bz2"
-#	${BASE_URI}eclipse-build-${ECLIPSE_BUILD_VER}.tar.xz"
-
-LICENSE="EPL-1.0"
-RESTRICT="mirror"
-SLOT="3.7"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gnome source"
-
-# ant dependencies should really be >=1.8.2
-CDEPEND=">=dev-java/swt-${PV%.0}_rc4:${SLOT}
-	>=dev-java/ant-1.8.1
-	>=dev-java/asm-3.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.4.2:4.4
-	>=dev-java/jsch-0.1.41
-	>=dev-java/junit-3.8.2:0
-	>=dev-java/junit-4.8.2:4
-	>=dev-java/lucene-2.9.1:2.9
-	>=dev-java/lucene-analyzers-2.9.1:2.9
-	>=dev-java/sat4j-core-2.3.0:2.3
-	>=dev-java/sat4j-pseudo-2.3.0:2.3
-	dev-java/tomcat-servlet-api:2.5
-	>=www-servers/tomcat-7:7
-	java-virtuals/jetty-server:6
-	x86? ( gnome? ( gnome-base/gconf ) )"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
-# ant dependencies should really be >=1.8.2
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	app-arch/xz-utils
-	app-arch/zip
-	>=dev-java/ant-antlr-1.8.1
-	>=dev-java/ant-apache-bcel-1.8.1
-	>=dev-java/ant-apache-bsf-1.8.1
-	>=dev-java/ant-apache-log4j-1.8.1
-	>=dev-java/ant-apache-oro-1.8.1
-	>=dev-java/ant-apache-regexp-1.8.1
-	>=dev-java/ant-apache-resolver-1.8.1
-	>=dev-java/ant-apache-xalan2-1.8.1
-	>=dev-java/ant-commons-logging-1.8.1
-	>=dev-java/ant-commons-net-1.8.1
-	>=dev-java/ant-core-1.8.1
-	>=dev-java/ant-javamail-1.8.1
-	>=dev-java/ant-jdepend-1.8.1
-	>=dev-java/ant-jmf-1.8.1
-	>=dev-java/ant-jsch-1.8.1
-	>=dev-java/ant-junit-1.8.1
-	>=dev-java/ant-junit4-1.8.1
-	>=dev-java/ant-swing-1.8.1
-	>=dev-java/ant-testutil-1.8.1
-	>=virtual/jdk-1.6"
-#	>=dev-java/ant-launcher-1.8.1
-
-OSGI_DEPENDENCIES=(
-	'com.ibm.icu - icu4j-4.4'
-	'com.jcraft.jsch - jsch'
-	'javax.servlet - tomcat-servlet-api-2.5 servlet-api'
-#	'javax.servlet tomcat6-servlet-2.5-api tomcat-servlet-api-2.5 servlet-api'
-	'javax.servlet.jsp - tomcat-servlet-api-2.5 jsp-api'
-#	'javax.servlet.jsp tomcat6-jsp-2.1-api tomcat-servlet-api-2.5 jsp-api'
-	'org.apache.commons.codec commons-codec commons-codec'
-	'org.apache.commons.el apache-commons-el-1.0 commons-el'
-	'org.apache.commons.httpclient - commons-httpclient-3'
-#	'org.apache.commons.httpclient jakarta-commons-httpclient-3.1 commons-httpclient-3'
-	'org.apache.commons.logging apache-commons-logging commons-logging'
-	'org.apache.jasper - tomcat-7 jasper jasper-el'
-	'org.apache.lucene.core - lucene-2.9'
-#	'org.apache.lucene.core lucene lucene-2.9'
-	'org.apache.lucene.analysis - lucene-analyzers-2.9'
-#	'org.apache.lucene.analysis lucene-analyzers lucene-analyzers-2.9'
-	'org.hamcrest.core - hamcrest-core'
-	'org.mortbay.jetty.server - jetty-6 jetty'
-#	'org.mortbay.jetty.server jetty-6.1.26 jetty-6 jetty'
-	'org.mortbay.jetty.util - jetty-6 jetty-util'
-#	'org.mortbay.jetty.util jetty-util-6.1.26 jetty-6 jetty-util'
-	'org.objectweb.asm - asm-3'
-	'org.sat4j.core - sat4j-core-2.3'
-#	'org.sat4j.core org.sat4j.core sat4j-core-2.3'
-	'org.sat4j.pb - sat4j-pseudo-2.3'
-#	'org.sat4j.pb org.sat4j.pb sat4j-pseudo-2.3'
-)
-NONOSGI_DEPENDENCIES=(
-	'org.apache.ant ant-antlr'
-	'org.apache.ant ant-apache-bcel'
-	'org.apache.ant ant-apache-bsf'
-	'org.apache.ant ant-apache-log4j'
-	'org.apache.ant ant-apache-oro'
-	'org.apache.ant ant-apache-regexp'
-	'org.apache.ant ant-apache-resolver'
-	'org.apache.ant ant-apache-xalan2'
-	'org.apache.ant ant-commons-logging'
-	'org.apache.ant ant-commons-net'
-	'org.apache.ant ant-core ant ant-launcher'
-	'org.apache.ant ant-javamail'
-	'org.apache.ant ant-jdepend'
-	'org.apache.ant ant-jmf'
-	'org.apache.ant ant-jsch'
-	'org.apache.ant ant-junit'
-	'org.apache.ant ant-junit4'
-#	'org.apache.ant ant-launcher'
-	'org.apache.ant ant-swing'
-	'org.apache.ant ant-testutil'
-	'org.junit_3.8.2.v3 junit'
-	'org.junit4 junit-4 junit'
-	'org.junit_4.8.2.v4 junit-4 junit'
-)
-
-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'
-
-pkg_pretend() {
-	CHECKREQS_MEMORY="1536M"
-	if use doc ; then
-		CHECKREQS_DISK_BUILD="3072M"
-	else
-		CHECKREQS_DISK_BUILD="1536M"
-	fi
-	check-reqs_pkg_pretend
-}
-
-buildDir="${S}/build/eclipse-${BUILD_VER}-src"
-
-pkg_setup() {
-	CHECKREQS_MEMORY="1536M"
-	if use doc ; then
-		CHECKREQS_DISK_BUILD="3072M"
-	else
-		CHECKREQS_DISK_BUILD="1536M"
-	fi
-
-	check-reqs_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() {
-	unpack "eclipse-build-${ECLIPSE_BUILD_VER}.tar.bz2"
-	#tar -xpJf "${DISTDIR}/eclipse-build-${ECLIPSE_BUILD_VER}.tar.xz"
-	ln -s "${DISTDIR}/eclipse-${BUILD_VER}-src.tar.bz2" "${S}/eclipse-${BUILD_VER}-src.tar.bz2" || die
-
-	cd "${S}"
-	# building with ecj fails for some reason (polluted classpath probably)
-	java-pkg_force-compiler javac
-	sed -e 's/^\(label\|testsBuildLabel\)=.*$/\1='"${BUILD_VER}"'/' \
-			-e 's/^buildId=.*$/buildId='"${BUILD_ID}"'/' \
-			-i build.properties -i pdebuild.properties || die
-	eant unpack
-}
-
-src_prepare() {
-	# 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
-
-	# we'll handle our own dependency symlinking, so disable eclipse-build helper
-	sed -e 's/,symlinkDeps,/,/' -i build.xml || die
-	sed_xml_element 'target' -e '/name="provision.sdk"/ s|<symlinkInstalled.*\(<echo \)|\1|' \
-			-i build.xml || die
-
-	# this unpacking step appears to be unnecessary (and it doesn't work)
-	sed_xml_element 'target' -e 's/\(depends="[^"]\+\),[^",]*nestedJars/\1/' \
-			-i "${buildDir}"/plugins/*/build.xml || die
-
-	# 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
-
-	ebegin 'Linking dependencies'
-	local dep ; for dep in "${OSGI_DEPENDENCIES[@]}" ; do
-		eclipse_create-osgi-dep ${dep}
-	done
-	local dep ; for dep in "${NONOSGI_DEPENDENCIES[@]}" ; do
-		eclipse_create-nonosgi-dep ${dep}
-	done
-	eend
-
-	cd "${buildDir}" || die
-	epatch "${FILESDIR}/${SLOT}/hamcrest-junit-lib.patch"
-	epatch "${FILESDIR}/${SLOT}/gtk_makefile.patch"
-	epatch "${FILESDIR}/${SLOT}/iterators.patch"
-}
-
-src_compile() {
-	ANT_OPTS='-Xmx512M' eant -DbuildArch="${arch}"
-
-	# remove stray symlink
-	rm "${buildDir}"/installation/plugins/junit4.jar
-}
-
-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
-
-	# redo symlinks
-	ebegin 'Relinking dependencies'
-	local dep ; for dep in "${OSGI_DEPENDENCIES[@]}" ; do
-		eclipse_relink-osgi-dep ${dep}
-	done
-	local dep ; for dep in "${NONOSGI_DEPENDENCIES[@]}" ; do
-		eclipse_relink-nonosgi-dep ${dep}
-	done
-	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
-}
-
-eclipse_create-osgi-dep() {
-	local bundle=${1} replace=${2} package=${3} ; shift 3
-	bundle=$(basename "${S}/dependencyManifests/${bundle}"_*.jar .jar) || die
-	[[ ${replace} == '-' ]] && replace=${bundle}
-	einfo "  ${bundle} => ${package}" "${@}"
-	mkdir -p "${buildDir}/plugins/${bundle}" || die
-	pushd "${buildDir}/plugins/${bundle}" > /dev/null || die
-	if (( ${#} )) ; then
-		local jar ; for jar in "${@}" ; do
-			java-pkg_jar-from "${package}" "${jar}.jar"
-		done
-	else
-		java-pkg_jar-from "${package}"
-	fi
-	mkdir META-INF || die
-	cp "${S}/dependencyManifests/${bundle}.jar/META-INF/MANIFEST.MF" META-INF/ || die
-	manifest_replace META-INF/MANIFEST.MF 'Bundle-ClassPath' "$(echo *.jar | tr ' ' ',')"
-	manifest_delete META-INF/MANIFEST.MF 'Name\|SHA1-Digest'
-	# replace classpath refs to this bundle with refs to system-installed jars
-	sed_xml_element 'pathelement' -e '/path="\([^"]\+\/\)\?'"${replace//./\.}"'\.jar"/c '"$(
-			for jar in *.jar ; do
-				echo -n '<pathelement path="'"$(readlink "${jar}")"'"/>'
-			done)" -i "${buildDir}"/plugins/*/build.xml || die
-	popd > /dev/null || die
-	# include unpacked bundle in copy to bootstrap plugins dir
-	sed_xml_element 'fileset' -e '/id="orbitDeps"/ s|</fileset>|<include name="'"${bundle}/"'"/>\0|' \
-			-i "${S}/pdebuild.xml" || die
-}
-
-eclipse_create-nonosgi-dep() {
-	local bundle=${1} package=${2} ; shift 2
-	local pdir=${buildDir}/plugins
-	local jar ; for jar in "${@:-${package}}" ; do
-		local dir=$(dirname "$(grep -ho "${bundle//./\.}"'\(_[^/=]*\)\?/\([^/=]*/\)*'"${jar}"'\.jar' \
-				"${S}"/{,jdt}nonosgidependencies.properties)") || die
-		einfo "  ${dir}/${jar}.jar => ${package}"
-		mkdir -p "${pdir}/${dir}" || die
-		java-pkg_jar-from --build-only "${package}" "${jar}.jar" "${pdir}/${dir}/${jar}.jar"
-		dir=${dir%%/*}
-		local manifest=${pdir}/${dir}/META-INF/MANIFEST.MF
-		[[ -f ${manifest} ]] && manifest_delete "${manifest}" 'Name\|SHA1-Digest'
-		rm -f "${pdir}/${dir}"/META-INF/ECLIPSEF.{RSA,SF}
-	done
-}
-
-eclipse_relink-osgi-dep() {
-	local bundle=${1} replace=${2} package=${3} ; shift 3
-	einfo "  ${bundle} => ${package}" "${@}"
-	pushd "${D}${destDir}/plugins/${bundle}"_* > /dev/null || die
-	if (( ${#} )) ; then
-		local jar ; for jar in "${@}" ; do
-			java-pkg_jar-from --build-only "${package}" "${jar}.jar"
-		done
-	else
-		java-pkg_jar-from --build-only "${package}"
-	fi
-	popd > /dev/null || die
-}
-
-eclipse_relink-nonosgi-dep() {
-	local bundle=${1} package=${2} ; shift 2
-	local pdir=${D}${destDir}/plugins
-	local jar ; for jar in "${@:-${package}}" ; do
-		local dir=$(dirname "$(grep -ho "${bundle//./\.}"'\(_[^/=]*\)\?/\([^/=]*/\)*'"${jar}"'\.jar' \
-				"${S}"/{,jdt}nonosgidependencies.properties)") || die
-		einfo "  ${dir}/${jar}.jar => ${package}"
-		mkdir -p "${pdir}/${dir}" || die
-		java-pkg_jar-from --build-only "${package}" "${jar}.jar" "${pdir}/${dir}/${jar}.jar"
-	done
-}
-
-# 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/eclipse-sdk-3.7.1-r4.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.7.1-r5.ebuild
index 2575817..6dc11e0 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.7.1-r4.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.7.1-r5.ebuild
@@ -139,7 +139,7 @@ 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'
 
 pkg_pretend() {
-	CHECKREQS_MEMORY="1536M"
+	CHECKREQS_MEMORY="1280M"
 	if use doc ; then
 		CHECKREQS_DISK_BUILD="3072M"
 	else
@@ -151,7 +151,7 @@ pkg_pretend() {
 buildDir="${S}/build/eclipse-${BUILD_VER}-src"
 
 pkg_setup() {
-	CHECKREQS_MEMORY="1536M"
+	CHECKREQS_MEMORY="1280M"
 	if use doc ; then
 		CHECKREQS_DISK_BUILD="3072M"
 	else