Use EAPI 2 use dependencies for gcj.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686

3 files changed, 133 insertions, 5 deletions

diff --git a/dev-java/eclipse-ecj/ChangeLog b/dev-java/eclipse-ecj/ChangeLog
index 659c7295fd0a..f2950c3426d6 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.46 2008/09/27 11:53:45 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.47 2008/09/27 12:02:01 betelgeuse Exp $
+
+*eclipse-ecj-3.4-r3 (27 Sep 2008)
+
+  27 Sep 2008; Petteri Räty <betelgeuse@gentoo.org>
+  +eclipse-ecj-3.4-r3.ebuild:
+  Use EAPI 2 use dependencies for gcj.
 
   27 Sep 2008; Petteri Räty <betelgeuse@gentoo.org>
   eclipse-ecj-3.4-r2.ebuild:
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 9792e850d909..bf2ee2c8f5a3 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -14,12 +14,13 @@ EBUILD eclipse-ecj-3.2.2.ebuild 1748 RMD160 674dc05a876d7b1a5f747724073b14b2bafd
 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
 EBUILD eclipse-ecj-3.4-r2.ebuild 3380 RMD160 787b3c2ce66f0babfb54a7a160a358a332bdec73 SHA1 20b88632da839ad93ba0b995feba3b48b9771007 SHA256 eac8f5932b3e6f4d4c60f26d6620a3ef566cb8b3d33f41f02bee18f17e4c9b4e
-MISC ChangeLog 6919 RMD160 2bd555c8d2153aa832895dfbb27549ff25c38c8a SHA1 6112d5e23ca09d9da6a7629c651c202a077f937b SHA256 2f7d7c9231ab413a8236b983ea64fafdafd277977a33cbcaa9ebaa208627c167
+EBUILD eclipse-ecj-3.4-r3.ebuild 3144 RMD160 50e235ff70cbf7211e73d180c88baac4a0fcd3a0 SHA1 3b5ec060a0cbd0c49543ff2b9839c577d9cb1a5c SHA256 0205a119ee6441d26172ac301ae9df42ab00e23ec36a2b09c52ce1f5f90f97ea
+MISC ChangeLog 7077 RMD160 e4070cc49fedd5f650117dd31767067f37e10de6 SHA1 cb6d44768fa2343c7664b4ec3d07636a66670ff8 SHA256 a029b54c059772afeb23686b0ed8f4eafb78664c23d052327847becbd2f5bd32
 MISC metadata.xml 471 RMD160 a7f40a047de904e4e2f63fce4ae9377a36b66fa0 SHA1 c855f10cc8e043bcd1e59b48d570053304a66f49 SHA256 229f3cffb80ccec1b7c3ddff609d045bd11f8004724bcb9de5d3bf9104a37d20
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjeHtMACgkQcxLzpIGCsLSPJACfcOLY1eGUnTnFPWaUJ9XfE2Hq
-Q00AoJChsgmkICizUES0L604YxTGXYl8
-=8BeP
+iEYEARECAAYFAkjeIMIACgkQcxLzpIGCsLSoPgCfWvsq+B4O6/wIatIJCqBihblG
+pzYAnAofOxmsZu7r/cQH3SaqYQ/0c8XW
+=Q7k/
 -----END PGP SIGNATURE-----
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.4-r3.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.4-r3.ebuild
new file mode 100644
index 000000000000..b6c57d0c984f
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-3.4-r3.ebuild
@@ -0,0 +1,121 @@
+# 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-r3.ebuild,v 1.1 2008/09/27 12:02:01 betelgeuse Exp $
+
+EAPI=2
+
+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
+	sys-devel/gcc[gcj?]"
+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
+		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 -encoding ISO-8859-1"
+		jar="${gccbin}/gjar"
+		[[ -x ${jar} ]] || jar="${gccbin}/fastjar"
+		[[ -x ${jar} ]] || die "No jar found for gcc"
+		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
+}