added the xml.jar from the jre/lib (ibm-jdk-bin) so it compiles on ppc

5 files changed, 34 insertions, 23 deletions

diff --git a/dev-util/eclipse-sdk/ChangeLog b/dev-util/eclipse-sdk/ChangeLog
index 321947b4105e..ea0cc48c818d 100644
--- a/dev-util/eclipse-sdk/ChangeLog
+++ b/dev-util/eclipse-sdk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/eclipse-sdk
 # Copyright 2003-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.53 2004/07/30 12:45:34 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.54 2004/07/30 13:41:19 sejo Exp $
+
+  30 Jul 2004; <SeJo@gentoo.org> eclipse-sdk-3.0.0-r2.ebuild,
+  eclipse-sdk-3.0.0-r3.ebuild, eclipse-sdk-3.0.0.ebuild:
+  added the xml.jar for ppc to bootclasspath
 
 *eclipse-sdk-3.0.0-r3 30 Jul 2004
 
diff --git a/dev-util/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest
index 6b6213f34e8f..fe579351d048 100644
--- a/dev-util/eclipse-sdk/Manifest
+++ b/dev-util/eclipse-sdk/Manifest
@@ -1,27 +1,28 @@
-MD5 c542ab6f252aaad0790739a1f6702201 eclipse-sdk-2.1.3-r4.ebuild 9258
-MD5 95e089bb8159cc3e364478997eda1038 eclipse-sdk-3.0.0-r3.ebuild 11654
+MD5 6cf73ae57bdb8ffda8f4666ae56c409e ChangeLog 11243
 MD5 e8c9ed23291e8884deb225cb53db53dc eclipse-sdk-2.1.3-r3.ebuild 8828
-MD5 22a8da58486fe12c944dac6d57435a40 eclipse-sdk-3.0.0.ebuild 10895
-MD5 f9b3a0143f6462f3d6d705629a35b22b eclipse-sdk-3.0.0-r2.ebuild 11869
 MD5 f56783d776609a3d62dbcf74f27aa726 eclipse-sdk-2.1.3-r5.ebuild 9286
-MD5 6cf73ae57bdb8ffda8f4666ae56c409e ChangeLog 11243
+MD5 54f3402e192ea659191bb9b88c293805 javacore.20040730.153247.5280.txt 439788
 MD5 9cc8d5162e981d7b7fc1ef9fa1ac0e65 metadata.xml 919
 MD5 42a080f04ed8e559d4876f2f31062534 eclipse-sdk-3.0.0-r1.ebuild 11840
-MD5 ab0f6620b4767e065bd533b06245b0fc files/01-distribute_ant_target-2.1.patch 1103
+MD5 5fa4805abef4b43f6e9c504193481139 eclipse-sdk-3.0.0-r2.ebuild 11911
+MD5 c542ab6f252aaad0790739a1f6702201 eclipse-sdk-2.1.3-r4.ebuild 9258
+MD5 4d2278d246c11808b57a89ab64bcb30c eclipse-sdk-3.0.0.ebuild 10864
+MD5 5fa4805abef4b43f6e9c504193481139 eclipse-sdk-3.0.0-r3.ebuild 11911
 MD5 6c2995197ef0a038015ffff1dee7ac72 files/00-refactor_rename.patch 59577
-MD5 6ac05b530442f845b10b830e624ffe04 files/eclipse-2.desktop 222
-MD5 a8bdecb6304c91da92a3b153e154f544 files/02-konqueror_help_browser-3.0.patch 1560
-MD5 0e815a2260dbd0153de35c6de26fbd05 files/digest-eclipse-sdk-3.0.0-r1 86
-MD5 0e815a2260dbd0153de35c6de26fbd05 files/digest-eclipse-sdk-3.0.0-r2 86
-MD5 0e815a2260dbd0153de35c6de26fbd05 files/digest-eclipse-sdk-3.0.0-r3 86
-MD5 0e815a2260dbd0153de35c6de26fbd05 files/digest-eclipse-sdk-3.0.0 86
+MD5 ab0f6620b4767e065bd533b06245b0fc files/01-distribute_ant_target-2.1.patch 1103
 MD5 ed33fd609db26b85ef9b0c2a82a06b22 files/01-distribute_ant_target-3.0.patch 726
+MD5 59c18169fdf20b43544bb4891592dce4 files/02-konqueror_help_browser-2.1.patch 1013
+MD5 a8bdecb6304c91da92a3b153e154f544 files/02-konqueror_help_browser-3.0.patch 1560
 MD5 bfc0f8c0e74a36e0eeebf31cf6a7616c files/digest-eclipse-sdk-2.1.3-r3 88
-MD5 bfc0f8c0e74a36e0eeebf31cf6a7616c files/digest-eclipse-sdk-2.1.3-r4 88
 MD5 bfc0f8c0e74a36e0eeebf31cf6a7616c files/digest-eclipse-sdk-2.1.3-r5 88
-MD5 429b757eb766856a6b29094b06402576 files/eclipse-3.desktop 222
-MD5 8f66a016be8f50dc8f57353c8207c669 files/03-motif-java1.5-build.patch 1848
-MD5 59c18169fdf20b43544bb4891592dce4 files/02-konqueror_help_browser-2.1.patch 1013
+MD5 0e815a2260dbd0153de35c6de26fbd05 files/digest-eclipse-sdk-3.0.0-r1 86
+MD5 0e815a2260dbd0153de35c6de26fbd05 files/digest-eclipse-sdk-3.0.0-r2 86
 MD5 8ddebeb4f299a5fe8d69270538037f14 files/eclipse-2 956
+MD5 6ac05b530442f845b10b830e624ffe04 files/eclipse-2.desktop 222
 MD5 59dd8f6412f3150438363ffe94892db7 files/eclipse-3 950
+MD5 429b757eb766856a6b29094b06402576 files/eclipse-3.desktop 222
 MD5 32be5292ce0af7ff9c1866c1f59e1859 files/eclipse.1 2607
+MD5 8f66a016be8f50dc8f57353c8207c669 files/03-motif-java1.5-build.patch 1848
+MD5 bfc0f8c0e74a36e0eeebf31cf6a7616c files/digest-eclipse-sdk-2.1.3-r4 88
+MD5 0e815a2260dbd0153de35c6de26fbd05 files/digest-eclipse-sdk-3.0.0 86
+MD5 0e815a2260dbd0153de35c6de26fbd05 files/digest-eclipse-sdk-3.0.0-r3 86
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.0.0-r2.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.0.0-r2.ebuild
index 5a65feeb27ff..b488d7dc085d 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.0.0-r2.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.0.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-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-r2.ebuild,v 1.1 2004/07/27 21:56:04 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.0.0-r2.ebuild,v 1.2 2004/07/30 13:41:19 sejo Exp $
 
 inherit eutils java-utils
 
@@ -232,7 +232,7 @@ src_compile() {
 	# Figure out correct boot classpath
 	if [ ! -z "`java-config --java-version | grep IBM`" ] ; then
 		# IBM JRE
-		ant_extra_opts="-Dbootclasspath=$(java-config --jdk-home)/jre/lib/core.jar"
+		ant_extra_opts="-Dbootclasspath=$(java-config --jdk-home)/jre/lib/core.jar:$(java-config --jdk-home)/jre/lib/xml.jar"
 	else
 		# Sun derived JREs (Blackdown, Sun)
 		ant_extra_opts="-Dbootclasspath=$(java-config --jdk-home)/jre/lib/rt.jar"
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.0.0-r3.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.0.0-r3.ebuild
index 87cd4d6efb01..2acb67cb6177 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.0.0-r3.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.0.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-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-r3.ebuild,v 1.1 2004/07/30 12:45:34 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.0.0-r3.ebuild,v 1.2 2004/07/30 13:41:19 sejo Exp $
 
 inherit eutils java-utils
 
@@ -230,7 +230,13 @@ src_compile() {
 	addwrite "/proc/cpuinfo"
 
 	# Figure out correct boot classpath
-	ant_extra_opts="-Dbootclasspath=$(java-config --classpath)"
+	if [ ! -z "`java-config --java-version | grep IBM`" ] ; then
+		# IBM JRE
+		ant_extra_opts="-Dbootclasspath=$(java-config --jdk-home)/jre/lib/core.jar:$(java-config --jdk-home)/jre/lib/xml.jar"
+	else
+		# Sun derived JREs (Blackdown, Sun)
+		ant_extra_opts="-Dbootclasspath=$(java-config --jdk-home)/jre/lib/rt.jar"
+	fi
 
 	# karltk: jikes doesn't work as a compiler for Eclipse currently.
 #	if use jikes ; then
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 1cbc4f37693f..d3ad2129d425 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.0.0.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.0.0.ebuild
@@ -1,6 +1,6 @@
 # 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.5 2004/07/09 21:25:17 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.0.0.ebuild,v 1.6 2004/07/30 13:41:19 sejo Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SLOT="3"
 LICENSE="CPL-1.0"
 KEYWORDS="~x86"
 
-RDEPEND="|| ( >=virtual/jdk-1.4.2 =dev-java/blackdown-jdk-1.4.2* )
+RDEPEND="|| ( >=virtual/jdk-1.4.2 )
 	|| (
 		gtk? ( >=x11-libs/gtk+-2.2.4 )
 		kde? ( kde-base/kdelibs x11-libs/openmotif )