eclipse-3.4M7 bump.

svn path=/java-overlay/; revision=6244

5 files changed, 67 insertions, 34 deletions

diff --git a/dev-util/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest
index 10a4c35f..d62d1088 100644
--- a/dev-util/eclipse-sdk/Manifest
+++ b/dev-util/eclipse-sdk/Manifest
@@ -1,8 +1,9 @@
-AUX 3.4/eclipse_String.compareTo.diff 538 RMD160 82dd221047852bde15c1a8e8a851ec57abe153f2 SHA1 a049cd547b4acfdd76beab141d444d572c2714b4 SHA256 92e1959f5bfc2e4611ac9ed0654488d16f4e7ef18fa411d37bf5ce0401340c86
+AUX 3.4/eclipse_String.compareTo.diff 1227 RMD160 840fcdc963af06e69dcb503a4c08f997eae3d7b5 SHA1 0d2492acaefd2ca9a9173ac178d457f83fd9fe8d SHA256 0d88008ad347c75e371f4838b503543c3eba04b557280b5c30055935ee93d784
+AUX 3.4/eclipse_buildfix-pde.diff 470 RMD160 f5868f6da880e6e930051893cba3e4277e927fb5 SHA1 f6ca5a75a40cff1d132af2b0d32367de744d4c62 SHA256 99450b348f6d41a489adfd51e1132f640eb8c43dfc4e9dd8e026aec66b41e30a
 AUX 3.4/eclipserc 858 RMD160 f911438aa661be9ca8fc352dd372c9485d163ddb SHA1 abb1c369326be455d16bc42cf0a1b035aa145dc0 SHA256 0aea733c968ca064ad5ca95d5895778ecf7387826198b512e98d0cbb7dd353f1
-AUX 3.4/fedora/eclipse-libupdatebuild2.patch 783 RMD160 cea490ebf47998ddf960f53672be79a1e13c7459 SHA1 32a99ff5562dbe5dcfc23cfb7cd406f61fd1ee88 SHA256 40c81d4b4929ace444b2c39424a5b4e4367432a4c5a93faa67dd75da602ee0a6
+AUX 3.4/fedora/eclipse-libupdatebuild2.patch 820 RMD160 f693dee78e7f7793441d9ce2a178b24d8f8a0f22 SHA1 6741775619f24c1b38dc3fced80c00dea6812092 SHA256 8c8ddd65c791acce04f2915dadf1f66fb38ca7005870bef54bfcbfddc930042e
 AUX 3.4/fedora/eclipse-pde.build-add-package-build.patch 11604 RMD160 ba63781fa77452e4c36eae7e07d81b7d39f5ec29 SHA1 7ee30f8fc2732125e1f2ba01038922d995b21456 SHA256 d361930896c940c09a7faf41f2c8d7843d56be9b90391e91538890062e5d7803
 AUX 3.4/how_to_loose_sanity_on_freaky_env_vars_argh.diff 577 RMD160 18d68ba06abfd7d5d74bc9db21692b1aa61f560e SHA1 aeab7a75a3caddaa16202d6fb90af213997b516a SHA256 bb8869578c4140ec7e980b030d85cead00eaa26b3f508aab84b189ca2e77c7b8
 AUX eclipse-3.4 1515 RMD160 fc6207052300c4cee3b1d2b9b1919b0be7ee8916 SHA1 1c9254729ede1b855a8b99b015e7738a67fa1b08 SHA256 ab745957d3a352ae0cc361709e78748cc7440aebaae0efef981c38a3d88d87a6
-DIST eclipse-sourceBuild-srcIncluded-3.4M6.zip 101854689 RMD160 8eebb63a1c4bfc51872b044492010d0d0640641c SHA1 d033efe63bb16727a33ec8f626a6bf745e871181 SHA256 d258ee46e2b4fb603d71666452e3c5e6277dbc17cd7b90cf234b0aa9c89d5329
-EBUILD eclipse-sdk-3.4_pre6.ebuild 14377 RMD160 8ee3d1a6d227393bd439ad13e9eaa63b9e1db1a7 SHA1 a1816471a6949de1452dca38e15bbe6fb5b2fbdc SHA256 965b4ee8f7614e159df86746cec503f917815971c58ad41ac6add0fe2166f31c
+DIST eclipse-sourceBuild-srcIncluded-3.4M7.zip 102855601 RMD160 4f01e4fae8beda5dc9b41ddab696ce0a32bd84a3 SHA1 2f7fb6968f861d5829652eca2255842564fd5f74 SHA256 92c96e5295aeb1fae6753e00687596082eb73b2faa224a388eee6612f5c4f046
+EBUILD eclipse-sdk-3.4_pre7.ebuild 14643 RMD160 aa1a332479969ae860b4a7df8968c637e08ce23e SHA1 b750bab8042b0c99a7fb022e7de635b3ef07f336 SHA256 0cb0ee1ead4458aa17f3ee03ba455699cae6c22654e73166aa51d4c67d7e647c
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.4_pre6.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.4_pre7.ebuild
index 20a99273..2c3afc17 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.4_pre6.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.4_pre7.ebuild
@@ -30,7 +30,7 @@ JAVA_PKG_IUSE="doc"
 inherit java-pkg-2 java-ant-2 check-reqs
 
 MY_PV="${PV/_pre/M}"
-DMF="S-${MY_PV}-200803301350"
+DMF="S-${MY_PV}-200805020100"
 MY_A="eclipse-sourceBuild-srcIncluded-${MY_PV}.zip"
 
 DESCRIPTION="Eclipse Tools Platform"
@@ -39,7 +39,7 @@ SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_A}"
 
 SLOT="3.4"
 LICENSE="EPL-1.0"
-IUSE=""
+IUSE="java6"
 KEYWORDS="~amd64 ~ppc ~x86"
 
 S=${WORKDIR}
@@ -59,11 +59,11 @@ CDEPEND="dev-java/ant-eclipse-ecj:${SLOT}
 	>=dev-java/tomcat-servlet-api-5.5.25-r1:2.4
 	dev-java/lucene:1.9
 	dev-java/lucene-analyzers:1.9"
-
 RDEPEND=">=virtual/jre-1.5
+	java6? ( >=virtual/jre-1.6 )
 	${CDEPEND}"
-
 DEPEND=">=virtual/jdk-1.5
+	java6? ( >=virtual/jdk-1.6 )
 	dev-java/ant-nodeps
 	dev-java/cldc-api:1.1
 	sys-apps/findutils
@@ -112,12 +112,11 @@ src_compile() {
 
 	# system_jars will be used when compiling (javac)
 	# gentoo_jars will be used when building JSPs and other ant tasks (not javac)
-
 	local system_jars="$(java-pkg_getjars swt-${SLOT},icu4j,ant-core,jsch,junit-4,tomcat-servlet-api-2.4,lucene-1.9,lucene-analyzers-1.9):$(java-pkg_getjars --build-only ant-nodeps,cldc-api-1.1)"
 	local gentoo_jars="$(java-pkg_getjars ant-core,icu4j,jsch,commons-logging,commons-el,tomcat-servlet-api-2.4)"
 	local options="-q -Dnobootstrap=true -Dlibsconfig=true -Dbootclasspath=${bootclasspath} -DinstallOs=linux \
 		-DinstallWs=gtk -DinstallArch=${eclipsearch} -Djava5.home=$(java-config --jdk-home)"
-
+	use java6 && options="${options} -DJavaSE-1.6=${bootclasspath}"
 	use doc && options="${options} -Dgentoo.javadoc=true"
 
 	ANT_OPTS=-Xmx512M ANT_TASKS="ant-nodeps" \
@@ -208,7 +207,7 @@ patch-apply() {
 	mv launchersrc.zip plugins/org.eclipse.platform/launchersrc.zip
 	rm -rf launchertmp
 
-	# disable swt, jdt-tool, jdk6
+	# disable swt, jdk6
 	# use sed where possible -> ease revbump :)
 	sed -e "/..\/..\/plugins\/org.eclipse.ui.win32/,/<\/ant>/d" \
 		-i features/org.eclipse.platform/build.xml
@@ -220,26 +219,30 @@ patch-apply() {
 	sed -e "/name=\"swtlibs\"/,/<\/move>/d" \
 		-i build.xml
 
-	sed -e "/..\/..\/plugins\/org.eclipse.jdt.apt.pluggable.core/,/<\/ant>/d" \
-		-e "/..\/..\/plugins\/org.eclipse.jdt.compiler.apt/,/<\/ant>/d" \
-		-e "/..\/..\/plugins\/org.eclipse.jdt.compiler.tool/,/<\/ant>/d" \
-		-i features/org.eclipse.jdt/build.xml
-
-	sed -e "/id=\"org.eclipse.jdt.apt.pluggable.core\"/,/<plugin/d" \
-		-e "/id=\"org.eclipse.jdt.compiler.apt\"/,/<plugin/d" \
-		-e "/id=\"org.eclipse.jdt.compiler.tool\"/,/<plugin/d" \
-		-i features/org.eclipse.jdt/feature.xml
-
-	sed -e "/dir=\"plugins\/org.eclipse.jdt.apt.pluggable.core\"/d" \
-		-e "/dir=\"plugins\/org.eclipse.jdt.compiler.apt/d" \
-		-e "/dir=\"plugins\/org.eclipse.jdt.compiler.tool\"/d" \
-		-e "/dir=\"plugins\/org.eclipse.swt.gtk.linux.${eclipsearch}/d" \
-		-e "/value=\"org.eclipse.jdt.apt.pluggable.core/,/eclipse.plugins/d" \
-		-e "/value=\"org.eclipse.jdt.compiler.apt/,/eclipse.plugins/d" \
-		-e "/value=\"org.eclipse.jdt.compiler.tool/,/eclipse.plugins/d" \
+	sed -e "/dir=\"plugins\/org.eclipse.swt.gtk.linux.${eclipsearch}/d" \
 		-e "/value=\"org.eclipse.swt.gtk.linux.${eclipsearch}/,/eclipse.plugins/d" \
 		-i assemble.org.eclipse.sdk.linux.gtk.${eclipsearch}.xml
 
+	if ! use java6; then
+		sed -e "/..\/..\/plugins\/org.eclipse.jdt.apt.pluggable.core/,/<\/ant>/d" \
+			-e "/..\/..\/plugins\/org.eclipse.jdt.compiler.apt/,/<\/ant>/d" \
+			-e "/..\/..\/plugins\/org.eclipse.jdt.compiler.tool/,/<\/ant>/d" \
+			-i features/org.eclipse.jdt/build.xml
+
+		sed -e "/id=\"org.eclipse.jdt.apt.pluggable.core\"/,/<plugin/d" \
+			-e "/id=\"org.eclipse.jdt.compiler.apt\"/,/<plugin/d" \
+			-e "/id=\"org.eclipse.jdt.compiler.tool\"/,/<plugin/d" \
+			-i features/org.eclipse.jdt/feature.xml
+
+		sed -e "/dir=\"plugins\/org.eclipse.jdt.apt.pluggable.core\"/d" \
+			-e "/dir=\"plugins\/org.eclipse.jdt.compiler.apt/d" \
+			-e "/dir=\"plugins\/org.eclipse.jdt.compiler.tool\"/d" \
+			-e "/value=\"org.eclipse.jdt.apt.pluggable.core/,/eclipse.plugins/d" \
+			-e "/value=\"org.eclipse.jdt.compiler.apt/,/eclipse.plugins/d" \
+			-e "/value=\"org.eclipse.jdt.compiler.tool/,/eclipse.plugins/d" \
+			-i assemble.org.eclipse.sdk.linux.gtk.${eclipsearch}.xml
+	fi
+
 	sed -e "/plugins\/javax.servlet.source_/d" \
 		-e "/plugins\/javax.servlet.jsp.source_/d" \
 		-e "/plugins\/org.apache.jasper.source_/d" \
@@ -261,6 +264,7 @@ patch-apply() {
 	# waaaaahhhhhhk !!!!11oneone
 	epatch ${PATCHDIR}/how_to_loose_sanity_on_freaky_env_vars_argh.diff
 	epatch ${PATCHDIR}/eclipse_String.compareTo.diff
+	epatch ${PATCHDIR}/eclipse_buildfix-pde.diff
 
 	# JNI
 	epatch ${FEDORA}/eclipse-libupdatebuild2.patch
diff --git a/dev-util/eclipse-sdk/files/3.4/eclipse_String.compareTo.diff b/dev-util/eclipse-sdk/files/3.4/eclipse_String.compareTo.diff
index 16a9315d..7133cba6 100644
--- a/dev-util/eclipse-sdk/files/3.4/eclipse_String.compareTo.diff
+++ b/dev-util/eclipse-sdk/files/3.4/eclipse_String.compareTo.diff
@@ -9,3 +9,14 @@
  			}
  		});		
  				
+--- plugins/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/DeltaReportConversionTask.java.orig	2008-05-05 21:35:49.000000000 +0200
++++ plugins/org.eclipse.pde.api.tools/src_ant/org/eclipse/pde/api/tools/internal/tasks/DeltaReportConversionTask.java	2008-05-05 21:36:16.000000000 +0200
+@@ -243,7 +243,7 @@
+ 			public int compare(Object o1, Object o2) {
+ 				Map.Entry entry1 = (Map.Entry) o1;
+ 				Map.Entry entry2 = (Map.Entry) o2;
+-				return ((String) entry1.getKey()).compareTo(entry2.getKey());
++				return ((String)entry1.getKey()).compareTo((String)entry2.getKey());
+ 			}
+ 		});
+ 		for (Iterator iterator = allEntries.iterator(); iterator.hasNext(); ) {
diff --git a/dev-util/eclipse-sdk/files/3.4/eclipse_buildfix-pde.diff b/dev-util/eclipse-sdk/files/3.4/eclipse_buildfix-pde.diff
new file mode 100644
index 00000000..12965873
--- /dev/null
+++ b/dev-util/eclipse-sdk/files/3.4/eclipse_buildfix-pde.diff
@@ -0,0 +1,11 @@
+--- features/org.eclipse.pde/build.xml.orig	2008-05-05 21:45:14.000000000 +0200
++++ features/org.eclipse.pde/build.xml	2008-05-05 21:45:31.000000000 +0200
+@@ -69,7 +69,7 @@
+ 	<target name="update.feature" depends="init">
+ 	</target>
+ 
+-	<target name="all.children" depends="init,all.features,all.plugins,update.feature">
++	<target name="all.children" depends="init,all.plugins,all.features,update.feature">
+ 	</target>
+ 
+ 	<target name="children" if="include.children">
diff --git a/dev-util/eclipse-sdk/files/3.4/fedora/eclipse-libupdatebuild2.patch b/dev-util/eclipse-sdk/files/3.4/fedora/eclipse-libupdatebuild2.patch
index b570a024..f755eddb 100644
--- a/dev-util/eclipse-sdk/files/3.4/fedora/eclipse-libupdatebuild2.patch
+++ b/dev-util/eclipse-sdk/files/3.4/fedora/eclipse-libupdatebuild2.patch
@@ -1,11 +1,17 @@
---- plugins/org.eclipse.update.core.linux/src/build.xml.orig	2006-01-27 15:35:35.000000000 -0500
-+++ plugins/org.eclipse.update.core.linux/src/build.xml	2006-01-27 15:36:07.000000000 -0500
-@@ -5,7 +5,7 @@
+--- plugins/org.eclipse.update.core.linux/src/build.xml.orig	2008-05-05 16:48:06.000000000 +0200
++++ plugins/org.eclipse.update.core.linux/src/build.xml	2008-05-05 16:48:15.000000000 +0200
+@@ -5,7 +5,6 @@
    <!-- 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/${installArch}/"/>
+   <property name="jdk-path" value="${java.home}"/>
+-  <property name="installArch" value="x86" />
+   <property name="destination" value="${eclipse-home}/org.eclipse.update.core.linux/os/linux/${installArch}/"/>
    <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/"/>  
+@@ -67,4 +66,4 @@
+   </target>
    
+   
+-</project>
+\ Kein Zeilenumbruch am Dateiende.
++</project>