ant-eclipse-ecj-3.4 version bump.

Package-Manager: portage-2.1.4.4

3 files changed, 63 insertions, 1 deletions

diff --git a/dev-java/ant-eclipse-ecj/ChangeLog b/dev-java/ant-eclipse-ecj/ChangeLog
index 9ca822b660e2..7117e2cf68c2 100644
--- a/dev-java/ant-eclipse-ecj/ChangeLog
+++ b/dev-java/ant-eclipse-ecj/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ant-eclipse-ecj
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-eclipse-ecj/ChangeLog,v 1.8 2008/03/22 00:54:20 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-eclipse-ecj/ChangeLog,v 1.9 2008/08/01 09:52:56 elvanor Exp $
+
+*ant-eclipse-ecj-3.4 (01 Aug 2008)
+
+  01 Aug 2008; Jean-Noël Rivasseau <elvanor@gentoo.org>
+  +files/compiler-settings-3.4, +ant-eclipse-ecj-3.4.ebuild:
+  Moving 3.4 to main tree from overlay.
 
   22 Mar 2008; Markus Meier <maekke@gentoo.org>
   ant-eclipse-ecj-3.3.0-r1.ebuild:
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-3.4.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-3.4.ebuild
new file mode 100644
index 000000000000..2dc15ab4b5dc
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-3.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-3.4.ebuild,v 1.1 2008/08/01 09:52:56 elvanor Exp $
+
+inherit java-pkg-2
+
+DMF="R-${PV}-200806172000"
+S="${WORKDIR}"
+
+DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF/.0}/ecjsrc-${PV}.zip"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+SLOT="3.4"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4
+	~dev-java/eclipse-ecj-${PV}
+	>=dev-java/ant-core-1.7"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.4
+	sys-apps/findutils"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p src/org/eclipse/jdt/{core,internal}
+	cp org/eclipse/jdt/core/JDTCompilerAdapter.java \
+		src/org/eclipse/jdt/core || die
+	cp -r org/eclipse/jdt/internal/antadapter \
+		src/org/eclipse/jdt/internal || die
+	rm -fr about* org
+}
+
+src_compile() {
+	cd src
+	ejavac -classpath "$(java-pkg_getjars ant-core,eclipse-ecj-${SLOT})" \
+		$(find org/ -name '*.java') || die "ejavac failed!"
+	find org/ -name '*.class' -o -name '*.properties' | \
+			xargs jar cf "${S}/${PN}.jar" || die "jar failed!"
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	insinto /usr/share/java-config-2/compiler
+	newins "${FILESDIR}/compiler-settings-${SLOT}" ecj-${SLOT}
+}
diff --git a/dev-java/ant-eclipse-ecj/files/compiler-settings-3.4 b/dev-java/ant-eclipse-ecj/files/compiler-settings-3.4
new file mode 100644
index 000000000000..543ab8c94fda
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/files/compiler-settings-3.4
@@ -0,0 +1,7 @@
+JAVAC="/usr/bin/ecj-3.4"
+PACKAGE="=dev-java/ant-eclipse-ecj-3.4*"
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-3.4,ant-eclipse-ecj-3.4"
+GENERATION="2"