eclipse-ecj-3.4 bump.

Package-Manager: portage-2.1.4.4

4 files changed, 142 insertions, 12 deletions

diff --git a/dev-java/eclipse-ecj/ChangeLog b/dev-java/eclipse-ecj/ChangeLog
index 9299ceaff458..54a0c8b929d1 100644
--- a/dev-java/eclipse-ecj/ChangeLog
+++ b/dev-java/eclipse-ecj/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/eclipse-ecj
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.43 2008/07/21 22:07:25 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.44 2008/08/01 09:49:11 elvanor Exp $
+
+*eclipse-ecj-3.4-r2 (01 Aug 2008)
+
+  01 Aug 2008; Jean-Noël Rivasseau <elvanor@gentoo.org> +files/ecj-3.4,
+  +eclipse-ecj-3.4-r2.ebuild:
+  Bumping eclipse-ecj-3.4, moving from overlay to tree.
 
 *eclipse-ecj-3.3.0-r3 (21 Jul 2008)
 *eclipse-ecj-3.2.2-r1 (21 Jul 2008)
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 0762ada16f2a..aa7cd517de48 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,22 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX compiler-settings-3.2 258 RMD160 40710ab16453db1f23433a9e74637662e917c159 SHA1 28f78c5e169bfdc6f81441d96e3734c9eeed80db SHA256 ca705f626f3871697afc65b90f7844479b8846d8e969e4ead107615a0ef168e9
 AUX ecj-3.3 290 RMD160 2dfe9771f0b905052a9ae37a0dba84d0041288de SHA1 15167ae40c53c6a19fcce2f66502ebbf87509826 SHA256 d24c6dcd12a59ca9ba8d90cb7ff1f3dbc45fbef2ae1f277194465ebd063c8fa4
+AUX ecj-3.4 213 RMD160 ca988aa4ae8965b5f8c41e0dbcf87d3f7e86d07a SHA1 55a308d8deb46bfe05e49ee095776ba89ce23f3f SHA256 5e56e4bdda1f90000fe157fd82083d36b8affd7258c694e797f2c54b01eb6d53
 AUX eclipse-ecj-3.2-build-gentoo.patch 1877 RMD160 027003513593a3b880bff73a012f73959c674be5 SHA1 5e2a5f0b0f484e147665c48bb38e2df1401823e5 SHA256 086abbf990543dcbf511567a2f663e53f932e825c75600745771c7d3f5739bd3
 AUX eclipse-ecj-3.3.0-gcj.patch 20084 RMD160 08944cef146676d9d7fddc46727bc172d75cdcb5 SHA1 900ccaaec2db0012defc016c65088f979a35e145 SHA256 6c5ffcefdc385305f01b63fcb7088b04698b5d1b8d9db54d058ffcf2252460e8
+DIST ecjsrc-3.4.zip 1280774 RMD160 8d12a84b9ff2b8df252bdc06309558559ce91d2e SHA1 dbf3300205717c165a1b1ec36af4c3fd1e45888b SHA256 a6ce5f0682462e85e5e47229e5b16555f74c60188fa0bb17536beb1138c537b4
 DIST ecjsrc.zip 1215250 RMD160 938320ae54050e322bbb98c78b0e86d241862153 SHA1 e08a27fd77e5ac7af8f2c84beed175cd3fdd0c60 SHA256 f41194a9580023afd11d18b82f6815b064af83c4f9ca407a40cd8d960bd112cc
 DIST eclipse-ecj-3.2.2.tar.bz2 615226 RMD160 4dc422a8abe983293e07c10aac3dba97e6e0907f SHA1 a8ba6817e4e9d37cf6b9725f7fff229b7448eaac SHA256 81a61220d29aae92c124ca365c4d100e780c57279696e29193a8b92ebca0c2df
 EBUILD eclipse-ecj-3.2.2-r1.ebuild 1938 RMD160 1cc06ba577b62a9a2f209bb5a1922461f7a16889 SHA1 a80e7794c6f60d86386a54f5893a72e322eeb4c0 SHA256 1c14aa7f16b1cde6fec1dde4aaa67a36776dd9348a6e0656b268e57e57eff686
 EBUILD eclipse-ecj-3.2.2.ebuild 1748 RMD160 674dc05a876d7b1a5f747724073b14b2bafd2740 SHA1 5baadf0d4f942da73df50537cbf4671531093ec8 SHA256 ea0266803ab75a56bf686d05f4d7a25224149db2b58a0264fc7fff945deb15e5
 EBUILD eclipse-ecj-3.3.0-r2.ebuild 1900 RMD160 4ca7823028f4e2afbc9c62d1b3bdc82ddf01e9d7 SHA1 70e2a170c65d0868121ca6d825dd124a0728805e SHA256 5b7ff6c71169b9388f98a1e71a2f46084634ea068311e9e9023eeec63062b6e0
 EBUILD eclipse-ecj-3.3.0-r3.ebuild 2126 RMD160 42f36a30477d8c2c3c3267df25b07df2fac1ecec SHA1 e9277bbbc9de8d9105b17c70e190f32ea5acd011 SHA256 46db80c32e4fed9635061f7b4e556432b1115eee13fdbe6c7ee75e86240b638c
-MISC ChangeLog 6486 RMD160 81422afb1e8adbe22d03c2c59cde3614c98f8f63 SHA1 e72af3bbd61d1829840cea469bf14f299ce3ad04 SHA256 337d35890de51140d3cd0127fd5603e34edc238791264f7dd8fa441aab339e7e
+EBUILD eclipse-ecj-3.4-r2.ebuild 3271 RMD160 afdd549b2e912861597f3aab2afd1f4352e7f525 SHA1 1c173744489d5b2b67ceb490f94d2c3c6a20749c SHA256 99d106359b3c621ecc97fc8ff4c2e27fcb087de59f333a037339066c4a481cc0
+MISC ChangeLog 6678 RMD160 e37c1769a5dff6fd706b94848f292f4acceaa1cd SHA1 ac6b40da173cd97cef356b6571d58e66c9554dba SHA256 3cdb360980c0fcb56bbf0c6b40a64df870b3be6bca79f3308331c2e58c7e2891
 MISC metadata.xml 471 RMD160 a7f40a047de904e4e2f63fce4ae9377a36b66fa0 SHA1 c855f10cc8e043bcd1e59b48d570053304a66f49 SHA256 229f3cffb80ccec1b7c3ddff609d045bd11f8004724bcb9de5d3bf9104a37d20
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkiFCKQACgkQcxLzpIGCsLTstQCdEaDl1Yfetxp+NgqsxCurPSpR
-5GwAn2t2FT9HLkFzGhmU91koFgXuXplL
-=lq5j
------END PGP SIGNATURE-----
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.4-r2.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.4-r2.ebuild
new file mode 100644
index 000000000000..0b6123a21e80
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-3.4-r2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2008 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.4-r2.ebuild,v 1.1 2008/08/01 09:49:11 elvanor Exp $
+
+inherit java-pkg-2
+
+MY_PN="ecj"
+DMF="R-${PV}-200806172000"
+S="${WORKDIR}"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_PN}src-${PV}.zip"
+
+IUSE="gcj java6"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+SLOT="3.4"
+
+CDEPEND=">=app-admin/eselect-ecj-0.3
+	gcj? ( >=sys-devel/gcc-4.3.1 )"
+DEPEND="${CDEPEND}
+	!gcj? ( !java6? ( >=virtual/jdk-1.4 )
+		java6? ( >=virtual/jdk-1.6 ) )"
+RDEPEND="${CDEPEND}
+	!gcj? ( !java6? ( >=virtual/jre-1.4 )
+		java6? ( >=virtual/jre-1.6 ) )"
+
+pkg_setup() {
+	if use gcj ; then
+		if ! built_with_use sys-devel/gcc gcj ; then
+			eerror "Building with gcj requires that gcj was compiled as part of gcc.";
+			eerror "Please rebuild sys-devel/gcc with USE=\"gcj\"";
+			die "Rebuild sys-devel/gcc with gcj support"
+		fi
+	else
+		java-pkg-2_pkg_setup
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}" || die
+
+	# These have their own package.
+	rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java || die
+	rm -fr org/eclipse/jdt/internal/antadapter || die
+
+	if use gcj || ! use java6 ; then
+		rm -fr org/eclipse/jdt/internal/compiler/{apt,tool}/ || die
+	fi
+}
+
+src_compile() {
+	local javac_opts javac java jar
+
+	if use gcj ; then
+		local gccbin="$(gcc-config -B $(ls -1r /etc/env.d/gcc/${CHOST}-* | head -1) || die)"
+		local gcj="${gccbin}/gcj"
+		javac="${gcj} -C"
+		jar="${gccbin}/gjar"
+		java="${gccbin}/gij"
+	else
+		javac_opts="$(java-pkg_javac-args) -encoding ISO-8859-1"
+		javac="$(java-config -c)"
+		java="$(java-config -J)"
+		jar="$(java-config -j)"
+	fi
+
+	mkdir -p bootstrap || die
+	cp -a org bootstrap || die
+	cd "${S}/bootstrap" || die
+
+	einfo "bootstrapping ${MY_PN} with ${javac} ..."
+	${javac} ${javac_opts} $(find org/ -name '*.java') || die
+	find org/ -name '*.class' -o -name '*.properties' -o -name '*.rsc' |\
+		xargs ${jar} cf ${MY_PN}.jar
+
+	cd "${S}" || die
+	einfo "building ${MY_PN} with bootstrapped ${MY_PN} ..."
+	${java} -classpath bootstrap/${MY_PN}.jar \
+		org.eclipse.jdt.internal.compiler.batch.Main \
+		${javac_opts} -nowarn org || die
+	find org/ -name '*.class' -o -name '*.properties' -o -name '*.rsc' |\
+		xargs ${jar} cf ${MY_PN}.jar
+
+	if use gcj ; then
+		einfo "Building native ${MY_PN} binary ..."
+		${gcj} ${CFLAGS} -findirect-dispatch -Wl,-Bsymbolic -o native_${MY_PN}-${SLOT} \
+			--main=org.eclipse.jdt.internal.compiler.batch.Main ${MY_PN}.jar || die
+	fi
+}
+
+src_install() {
+	if use gcj ; then
+		dobin native_${MY_PN}-${SLOT}
+		newbin "${FILESDIR}/ecj-${SLOT}" ${MY_PN}-${SLOT}
+
+		# Don't complain when doing dojar below.
+		JAVA_PKG_WANT_SOURCE=1.4
+		JAVA_PKG_WANT_TARGET=1.4
+	else
+		java-pkg_dolauncher ${MY_PN}-${SLOT} --main \
+			org.eclipse.jdt.internal.compiler.batch.Main
+	fi
+
+	java-pkg_dojar ${MY_PN}.jar
+}
+
+pkg_postinst() {
+	einfo "To get the Compiler Adapter of ECJ for ANT..."
+	einfo " # emerge ant-eclipse-ecj"
+	echo
+	einfo "To select between slots of ECJ..."
+	einfo " # eselect ecj"
+
+	eselect ecj update ecj-${SLOT}
+}
+
+pkg_postrm() {
+	eselect ecj update
+}
diff --git a/dev-java/eclipse-ecj/files/ecj-3.4 b/dev-java/eclipse-ecj/files/ecj-3.4
new file mode 100755
index 000000000000..745391d325d4
--- /dev/null
+++ b/dev-java/eclipse-ecj/files/ecj-3.4
@@ -0,0 +1,8 @@
+#! /bin/sh
+#
+# Copyright (C) 2008 Andrew John Hughes
+#
+# Licensed under the GNU General Public License, v2
+
+LD_LIBRARY_PATH=$(gcc-config -L $(ls -1r /etc/env.d/gcc/*4.3.?|head -1)) /usr/bin/native_ecj-3.4 "${@}"
+