Rollback java-utils update, as java-config doesn't have -f yet.

2 files changed, 30 insertions, 7 deletions

diff --git a/dev-util/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest
index dd0179446194..bdc57bef269d 100644
--- a/dev-util/eclipse-sdk/Manifest
+++ b/dev-util/eclipse-sdk/Manifest
@@ -1,11 +1,11 @@
 MD5 b3b19f4cfd7196553190d19763ee482a ChangeLog 10440
 MD5 69cecfe6f58b8032c3e2520d32db2f58 eclipse-sdk-3.0.0_rc1.ebuild 10867
-MD5 593e72cef0cb6694faf8c951e57060a1 eclipse-sdk-3.0.0.ebuild 10895
-MD5 59a6ef2c2dcca30a5539193376cc167b eclipse-sdk-2.1.3-r4.ebuild 9246
+MD5 718572eb994afe8e7d48feb95015f162 eclipse-sdk-2.1.3-r4.ebuild 9248
 MD5 0991896a28c83192bdff31a038289a7e eclipse-sdk-3.0.0_pre9.ebuild 10592
 MD5 f2e1142f14509268baf54a10a8659983 eclipse-sdk-2.1.3-r3.ebuild 8820
 MD5 f919182142d51ed7e92e72e4f9a802a9 eclipse-sdk-3.0.0_rc2.ebuild 10613
 MD5 484e47ada6365a86df9f845308adc7ff eclipse-sdk-3.0.0_rc3.ebuild 10735
+MD5 22a8da58486fe12c944dac6d57435a40 eclipse-sdk-3.0.0.ebuild 10895
 MD5 9cc8d5162e981d7b7fc1ef9fa1ac0e65 metadata.xml 919
 MD5 6c2995197ef0a038015ffff1dee7ac72 files/00-refactor_rename.patch 59577
 MD5 0e815a2260dbd0153de35c6de26fbd05 files/digest-eclipse-sdk-3.0.0 86
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.0.0.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.0.0.ebuild
index 299b9bcd2739..1cbc4f37693f 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.0.0.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.0.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 2003-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.0.ebuild,v 1.4 2004/07/09 21:17:40 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.0.0.ebuild,v 1.5 2004/07/09 21:25:17 karltk Exp $
 
-inherit java-utils
+inherit eutils
 
 DESCRIPTION="Eclipse Tools Platform"
 HOMEPAGE="http://www.eclipse.org/"
@@ -31,9 +31,29 @@ DEPEND="${RDEPEND}
 	app-arch/unzip"
 
 pkg_setup() {
-	java-utils_ensure-jdk
-	java-utils_setup-vm
-#	java-utils_ensure-vm-version-ge 1 4 2
+	ewarn "This package is _highly_ experimental."
+	ewarn "If you are using Eclipse 2.1.x for any serious work, stop now."
+	ewarn "You cannot expect to be productive with this packaging of 3.0!"
+
+	# karltk: refactor, put in java-pkg.eclass?
+	local version="$(java-config --java-version | grep 'java version' | sed -r 's/java version \"(.*)\"/\1/')"
+	local ver_rx="([0-9]+)\.([0-9]+)\.([0-9]+)(.*)"
+	local major=$(echo ${version} | sed -r "s/${ver_rx}/\1/")
+	local minor=$(echo ${version} | sed -r "s/${ver_rx}/\2/")
+	local patch=$(echo ${version} | sed -r "s/${ver_rx}/\3/")
+	local extra=$(echo ${version} | sed -r "s/${ver_rx}/\4/")
+
+	if [ ${major} -ge 1 ] && [ ${minor} -gt 4 ] ; then
+		einfo "Detected JDK is sufficient to compile Eclipse (${version} >= 1.4.2)"
+	elif [ ${major} -ge 1 ] && [ ${minor} -ge 4 ] && [ ${patch} -ge 2 ] ; then
+		einfo "Detected JDK is sufficient to compile Eclipse (${version} >= 1.4.2)"
+	else
+		die "Detected JDK (${version}) is too old to compile Eclipse, need at least 1.4.2!"
+	fi
+
+	# Needed for the IBM JDK
+	addwrite "/proc/self/maps"
+	addwrite "/proc/cpuinfo"
 
 	set_dirs
 	use gtk && use_gtk='true' || use_gtk='false'
@@ -182,6 +202,9 @@ build_motif_frontend() {
 
 src_compile() {
 
+	addwrite "/proc/self/maps"
+	addwrite "/proc/cpuinfo"
+
 	# Figure out correct boot classpath
 	if [ ! -z "`java-config --java-version | grep IBM`" ] ; then
 		# IBM JRE