Add app-admin/eselect-ecj support.

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

4 files changed, 165 insertions, 5 deletions

diff --git a/dev-java/eclipse-ecj/ChangeLog b/dev-java/eclipse-ecj/ChangeLog
index 67061ddb8299..9299ceaff458 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.42 2008/07/21 21:53:11 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.43 2008/07/21 22:07:25 betelgeuse Exp $
+
+*eclipse-ecj-3.3.0-r3 (21 Jul 2008)
+*eclipse-ecj-3.2.2-r1 (21 Jul 2008)
+
+  21 Jul 2008; Petteri Räty <betelgeuse@gentoo.org>
+  +eclipse-ecj-3.2.2-r1.ebuild, +eclipse-ecj-3.3.0-r3.ebuild:
+  Add app-admin/eselect-ecj support.
 
   21 Jul 2008; Petteri Räty <betelgeuse@gentoo.org>
   -eclipse-ecj-3.2.ebuild, -eclipse-ecj-3.3.0-r1.ebuild:
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 358671d199a4..0762ada16f2a 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -7,14 +7,16 @@ AUX eclipse-ecj-3.2-build-gentoo.patch 1877 RMD160 027003513593a3b880bff73a012f7
 AUX eclipse-ecj-3.3.0-gcj.patch 20084 RMD160 08944cef146676d9d7fddc46727bc172d75cdcb5 SHA1 900ccaaec2db0012defc016c65088f979a35e145 SHA256 6c5ffcefdc385305f01b63fcb7088b04698b5d1b8d9db54d058ffcf2252460e8
 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
-MISC ChangeLog 6260 RMD160 d64c1d634ee4fa9922b97ca83da553f0cc1841a2 SHA1 17ae63de5c34bc682365259dc7a49ffc22fd09e1 SHA256 c32ef464bfe8c5f8400e39a3e498143fead99436de9f8b709105b87268980bb4
+EBUILD eclipse-ecj-3.3.0-r3.ebuild 2126 RMD160 42f36a30477d8c2c3c3267df25b07df2fac1ecec SHA1 e9277bbbc9de8d9105b17c70e190f32ea5acd011 SHA256 46db80c32e4fed9635061f7b4e556432b1115eee13fdbe6c7ee75e86240b638c
+MISC ChangeLog 6486 RMD160 81422afb1e8adbe22d03c2c59cde3614c98f8f63 SHA1 e72af3bbd61d1829840cea469bf14f299ce3ad04 SHA256 337d35890de51140d3cd0127fd5603e34edc238791264f7dd8fa441aab339e7e
 MISC metadata.xml 471 RMD160 a7f40a047de904e4e2f63fce4ae9377a36b66fa0 SHA1 c855f10cc8e043bcd1e59b48d570053304a66f49 SHA256 229f3cffb80ccec1b7c3ddff609d045bd11f8004724bcb9de5d3bf9104a37d20
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiFBVEACgkQcxLzpIGCsLT79wCcDBD4byotYQlKdJzorCr6Y+kK
-W/MAn0n1kRIB7Nm4xql/z/c/PIlD3NYH
-=cvFQ
+iEYEARECAAYFAkiFCKQACgkQcxLzpIGCsLTstQCdEaDl1Yfetxp+NgqsxCurPSpR
+5GwAn2t2FT9HLkFzGhmU91koFgXuXplL
+=lq5j
 -----END PGP SIGNATURE-----
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.2.2-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.2.2-r1.ebuild
new file mode 100644
index 000000000000..dfddad74db57
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-3.2.2-r1.ebuild
@@ -0,0 +1,65 @@
+# 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.2.2-r1.ebuild,v 1.1 2008/07/21 22:07:25 betelgeuse Exp $
+
+inherit eutils java-pkg-2
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+SLOT="3.2"
+IUSE="doc"
+
+RDEPEND=">=virtual/jre-1.4
+	app-admin/eselect-ecj"
+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}/${PN}-${SLOT}-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_dojavadoc dist/doc/api
+
+	insinto /usr/share/java-config-2/compiler
+	newins "${FILESDIR}"/compiler-settings-${SLOT} ecj-${SLOT}
+}
+
+pkg_postinst() {
+	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/eclipse-ecj-3.3.0-r3.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.3.0-r3.ebuild
new file mode 100644
index 000000000000..6eb097273a66
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-3.3.0-r3.ebuild
@@ -0,0 +1,86 @@
+# 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.3.0-r3.ebuild,v 1.1 2008/07/21 22:07:25 betelgeuse Exp $
+
+inherit eutils java-pkg-2
+
+MY_PN="ecj"
+DMF="R-${PV}-200706251500"
+S="${WORKDIR}"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF/.0}/${MY_PN}src.zip"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+SLOT="3.3"
+IUSE=""
+
+COMMON_DEPEND="app-admin/eselect-ecj"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.4
+	sys-apps/findutils
+	app-arch/unzip
+	${COMMON_DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# own package
+	rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java
+	rm -fr org/eclipse/jdt/internal/antadapter
+
+	# what the heck...?! java6
+	rm -fr org/eclipse/jdt/internal/compiler/tool/ \
+		org/eclipse/jdt/internal/compiler/apt/
+
+	# gcj feature
+	epatch "${FILESDIR}"/${P}-gcj.patch
+}
+
+src_compile() {
+	local javac="javac" java="java" jar="jar"
+
+	mkdir -p bootstrap
+	cp -a org bootstrap
+
+	einfo "bootstrapping ${MY_PN} with javac"
+
+	cd "${S}"/bootstrap
+	${javac} $(find org/ -name '*.java') || die "${MY_PN} bootstrap failed!"
+
+	find org/ -name '*.class' -o -name '*.properties' -o -name '*.rsc' | \
+		xargs ${jar} cf ${MY_PN}.jar
+
+	einfo "build ${MY_PN} with bootstrapped ${MY_PN}"
+
+	cd "${S}"
+	${java} -classpath bootstrap/${MY_PN}.jar \
+		org.eclipse.jdt.internal.compiler.batch.Main -encoding ISO-8859-1 org \
+		|| die "${MY_PN} build failed!"
+	find org/ -name '*.class' -o -name '*.properties' -o -name '*.rsc' | \
+		xargs ${jar} cf ${MY_PN}.jar
+}
+
+src_install() {
+	java-pkg_dojar ${MY_PN}.jar
+	java-pkg_dolauncher ${MY_PN}-${SLOT} --main \
+		org.eclipse.jdt.internal.compiler.batch.Main
+}
+
+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
+}