Version bump, thanks to Caster.

(Portage version: 2.1.1_pre4-r4)

5 files changed, 126 insertions, 1 deletions

diff --git a/dev-java/eclipse-ecj/ChangeLog b/dev-java/eclipse-ecj/ChangeLog
index c1b8a0ea1bbd..03c6b6eed2c0 100644
--- a/dev-java/eclipse-ecj/ChangeLog
+++ b/dev-java/eclipse-ecj/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/eclipse-ecj
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.8 2006/08/07 12:05:34 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.9 2006/08/10 00:54:11 nichoj Exp $
+
+*eclipse-ecj-3.2 (10 Aug 2006)
+
+  10 Aug 2006; Joshua Nichols <nichoj@gentoo.org>
+  +files/compiler-settings-3.2, +files/eclipse-ecj-3.2-build-gentoo.patch,
+  +eclipse-ecj-3.2.ebuild:
+  Version bump, thanks to Caster.
 
   07 Aug 2006; Krzysiek Pawlik <nelchael@gentoo.org>
   eclipse-ecj-3.1-r13.ebuild:
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.2.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.2.ebuild
new file mode 100644
index 000000000000..b907adb0fd1a
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-3.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/eclipse-ecj-3.2.ebuild,v 1.1 2006/08/10 00:54:11 nichoj Exp $
+
+inherit eutils java-pkg-2
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://dev.gentoo.org/~nichoj/distfiles/${P}.tar.bz2"
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="3.2"
+
+IUSE="doc"
+
+RDEPEND=">=virtual/jre-1.4"
+
+DEPEND="${RDEPEND}
+	>=virtual/jdk-1.4
+	dev-java/ant-core"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# remove unzip, add javadoc target, put final ecj.jar and javadocs in dist/ and not ../
+	epatch "${FILESDIR}/${P}-build-gentoo.patch"
+}
+
+src_compile() {
+	# we don't use eant because the compile*.xml files specifically set -source -target and used compiler
+
+	# bootstrap build with JDK's javac
+	ant -f compilejdtcorewithjavac.xml || die "Failed to bootstrap build with javac"
+
+	local ant_flags=""
+
+	# for some weird reason, with kaffe it fails the build.xml's check for ecj.jar present (which it is)
+	# which if successful sets this property, then checks if it was set and fails if not
+	java-pkg_current-vm-matches kaffe && ant_flags="-Dbuild.compiler=org.eclipse.jdt.core.JDTCompilerAdapter"
+
+	# recompile with ecj.jar made in first step, to get dist/ecj.jar 
+	ant ${ant_flags} -lib ecj.jar -f compilejdtcore.xml compile $(use_doc) || die "Failed to rebuild with ecj"
+}
+
+src_install() {
+	java-pkg_dojar dist/ecj.jar
+
+	java-pkg_dolauncher ecj-${SLOT} --main org.eclipse.jdt.internal.compiler.batch.Main
+
+	use doc && java-pkg_dohtml -r dist/doc/api
+
+	insinto /usr/share/java-config-2/compiler
+	newins ${FILESDIR}/compiler-settings-${SLOT} ecj-${SLOT}
+}
+
diff --git a/dev-java/eclipse-ecj/files/compiler-settings-3.2 b/dev-java/eclipse-ecj/files/compiler-settings-3.2
new file mode 100644
index 000000000000..ea7091ae9049
--- /dev/null
+++ b/dev-java/eclipse-ecj/files/compiler-settings-3.2
@@ -0,0 +1,7 @@
+JAVAC="/usr/bin/ecj-3.2"
+PACKAGE="=dev-java/eclipse-ecj-3.2*"
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-3.2"
+GENERATION="2"
diff --git a/dev-java/eclipse-ecj/files/digest-eclipse-ecj-3.2 b/dev-java/eclipse-ecj/files/digest-eclipse-ecj-3.2
new file mode 100644
index 000000000000..8993cf6c606f
--- /dev/null
+++ b/dev-java/eclipse-ecj/files/digest-eclipse-ecj-3.2
@@ -0,0 +1,3 @@
+MD5 63e4e6dfb13175ba2534fa3b9b1f1936 eclipse-ecj-3.2.tar.bz2 612611
+RMD160 eefd1e27e5709e0ba828f3d01c5c10b1f7b98104 eclipse-ecj-3.2.tar.bz2 612611
+SHA256 29406455d247a2067f1c2cf4c9139a6f9cc5cf90882daa2b6ae8972bb712a967 eclipse-ecj-3.2.tar.bz2 612611
diff --git a/dev-java/eclipse-ecj/files/eclipse-ecj-3.2-build-gentoo.patch b/dev-java/eclipse-ecj/files/eclipse-ecj-3.2-build-gentoo.patch
new file mode 100644
index 000000000000..c60a6591fc4d
--- /dev/null
+++ b/dev-java/eclipse-ecj/files/eclipse-ecj-3.2-build-gentoo.patch
@@ -0,0 +1,52 @@
+diff -Naur eclipse-ecj-3.2/compilejdtcorewithjavac.xml eclipse-ecj-3.2-mod/compilejdtcorewithjavac.xml
+--- eclipse-ecj-3.2/compilejdtcorewithjavac.xml	2006-06-30 01:20:00.000000000 +0200
++++ eclipse-ecj-3.2-mod/compilejdtcorewithjavac.xml	2006-07-28 01:35:06.000000000 +0200
+@@ -6,7 +6,6 @@
+ 		<tstamp/>
+ 		<property name="srcdir" value="src" />
+ 		<property name="destdir" value="compiler" />
+-   	    <unzip src="${srcdir}/ecj.zip" dest="${srcdir}"/>
+ 	</target>
+ 
+ 	<target name="compile" depends="init">
+diff -Naur eclipse-ecj-3.2/compilejdtcore.xml eclipse-ecj-3.2-mod/compilejdtcore.xml
+--- eclipse-ecj-3.2/compilejdtcore.xml	2006-06-30 01:20:00.000000000 +0200
++++ eclipse-ecj-3.2-mod/compilejdtcore.xml	2006-07-29 03:22:07.000000000 +0200
+@@ -5,7 +5,9 @@
+ 	<target name="init">
+ 		<tstamp/>
+ 		<property name="destdir" value="compiler2" />
+-        <property name="srcdir" value="src" />
++		<property name="srcdir" value="src" />
++		<property name="distdir" value="dist" />
++		<property name="javadocdir" value="${distdir}/doc/api" />
+ 	</target>
+ 
+ 	<target name="compile" depends="init">
+@@ -13,6 +15,7 @@
+ 		<echo message="TARGET: ${destdir}" />
+ 		<delete dir="${destdir}"/>
+ 		<mkdir dir="${destdir}"/>
++		<mkdir dir="${distdir}"/>
+ 
+                 <condition property="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter">
+                         <available file="ecj.jar" />
+@@ -57,9 +60,17 @@
+                         </fileset>
+                         </copy>
+ 
+-                <jar jarfile="../ecj.jar">
++                <jar jarfile="${distdir}/ecj.jar">
+                         <fileset dir="${destdir}"/>
+                 </jar>
+ 
+ 	</target>
++	
++	<target name="javadoc" depends="init">
++	    <mkdir dir="${javadocdir}"/>
++	    <javadoc destdir="${javadocdir}">
++		<fileset dir="${srcdir}"/>
++	    </javadoc>
++	</target>
++	
+ </project>