Use java-pkg_dolauncher instead of the hand written wrapper script.

Package-Manager: portage-2.1.3.7

4 files changed, 105 insertions, 5 deletions

diff --git a/dev-java/eclipse-ecj/ChangeLog b/dev-java/eclipse-ecj/ChangeLog
index ab611004f524..d93a65ca25d8 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.20 2007/07/27 13:01:38 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.21 2007/09/07 17:24:44 betelgeuse Exp $
+
+*eclipse-ecj-3.3.0-r1 (07 Sep 2007)
+
+  07 Sep 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +eclipse-ecj-3.3.0-r1.ebuild:
+  Use java-pkg_dolauncher instead of the hand written wrapper script.
 
 *eclipse-ecj-3.3.0 (27 Jul 2007)
 
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 44ce25a030cf..8fe23efa695c 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX compiler-settings-3.1 250 RMD160 792c32526acd6a97de81658d92900f497ebbd8f8 SHA1 fceea4fef976ac6a7fe0b535ef3dee7fa16cc5a7 SHA256 3ebf7bd017cc9325b4bfd0e135aab42a53f820645b104e3ef95a73e09888ae98
 MD5 c62798c8bf723668a59ad0d51739cb9a files/compiler-settings-3.1 250
 RMD160 792c32526acd6a97de81658d92900f497ebbd8f8 files/compiler-settings-3.1 250
@@ -34,14 +37,18 @@ EBUILD eclipse-ecj-3.2.ebuild 1732 RMD160 85a96c7184e26068dd5df59cc728cb256f593d
 MD5 4c09a7ade5ebeb6d57ba01ca7a362d85 eclipse-ecj-3.2.ebuild 1732
 RMD160 85a96c7184e26068dd5df59cc728cb256f593dc1 eclipse-ecj-3.2.ebuild 1732
 SHA256 c019e85e5e7b84124dfd3fd2b1b807212eb800ffaff727d0da7e56f6dd0e3040 eclipse-ecj-3.2.ebuild 1732
+EBUILD eclipse-ecj-3.3.0-r1.ebuild 1879 RMD160 311cd55710dc18d43ab367c8042f376234aca013 SHA1 dd2ad4f292890fc9483c917e165f8da4b3653f6e SHA256 c8d395678113b03c69f6c9d5a69abe890d9e865c045ae45f2540ddf3628ff0c2
+MD5 04935fa81c055422da90c0e9992619a4 eclipse-ecj-3.3.0-r1.ebuild 1879
+RMD160 311cd55710dc18d43ab367c8042f376234aca013 eclipse-ecj-3.3.0-r1.ebuild 1879
+SHA256 c8d395678113b03c69f6c9d5a69abe890d9e865c045ae45f2540ddf3628ff0c2 eclipse-ecj-3.3.0-r1.ebuild 1879
 EBUILD eclipse-ecj-3.3.0.ebuild 1817 RMD160 d7dc161a6a505b9f40e619a357bc1ada538de1ec SHA1 28f0eb916a9c8468730e16564ad65951f73b990a SHA256 6d7e15e0a0f666da41d2e29e9a8fe6f27c0c9e3a9d2aee8cced80ccdc4a75dd8
 MD5 8426e80ba8836f07b22dbdb4db9d6af9 eclipse-ecj-3.3.0.ebuild 1817
 RMD160 d7dc161a6a505b9f40e619a357bc1ada538de1ec eclipse-ecj-3.3.0.ebuild 1817
 SHA256 6d7e15e0a0f666da41d2e29e9a8fe6f27c0c9e3a9d2aee8cced80ccdc4a75dd8 eclipse-ecj-3.3.0.ebuild 1817
-MISC ChangeLog 3439 RMD160 4197244a6833ea1e402f47e24c2e11d10b3c60cc SHA1 8d1ab1f17c936b8a53cd5a56d68bea58df2d1d5c SHA256 a4023d36f5fcd66a950ef4885bce38dbfb0e4d0d0f387a6fe535302cb742f441
-MD5 cf7ab8ac0cf04455d6dc1e1a3ace2f11 ChangeLog 3439
-RMD160 4197244a6833ea1e402f47e24c2e11d10b3c60cc ChangeLog 3439
-SHA256 a4023d36f5fcd66a950ef4885bce38dbfb0e4d0d0f387a6fe535302cb742f441 ChangeLog 3439
+MISC ChangeLog 3636 RMD160 c4131cc6c8689097b6056e867d039bd44fd58197 SHA1 ecef9c24f15bf5ebaaa8c4d4c72a7c58d6e607e6 SHA256 ea3a2da07495d8f3b4bcb3c3888664dcd6fcbd8adb94032ab824c4dd12d150f6
+MD5 af5523523aba17964e234e5034622bb7 ChangeLog 3636
+RMD160 c4131cc6c8689097b6056e867d039bd44fd58197 ChangeLog 3636
+SHA256 ea3a2da07495d8f3b4bcb3c3888664dcd6fcbd8adb94032ab824c4dd12d150f6 ChangeLog 3636
 MISC metadata.xml 471 RMD160 a7f40a047de904e4e2f63fce4ae9377a36b66fa0 SHA1 c855f10cc8e043bcd1e59b48d570053304a66f49 SHA256 229f3cffb80ccec1b7c3ddff609d045bd11f8004724bcb9de5d3bf9104a37d20
 MD5 72aec5cc8f858a54713b987b28f0ac4c metadata.xml 471
 RMD160 a7f40a047de904e4e2f63fce4ae9377a36b66fa0 metadata.xml 471
@@ -58,3 +65,13 @@ SHA256 7c4948679bc9fbeef1580da27e0ef64f7ea2d504a96f19812f84b9ccabfc2567 files/di
 MD5 d24114889ec7171b5b7d4514cb41980d files/digest-eclipse-ecj-3.3.0 214
 RMD160 8823cfec079d8b8251d97fdb04384f9277ec474b files/digest-eclipse-ecj-3.3.0 214
 SHA256 4452c6318ed1afe80cea4a27493f1b63c80b776686cb986e4eed9d272436040b files/digest-eclipse-ecj-3.3.0 214
+MD5 d24114889ec7171b5b7d4514cb41980d files/digest-eclipse-ecj-3.3.0-r1 214
+RMD160 8823cfec079d8b8251d97fdb04384f9277ec474b files/digest-eclipse-ecj-3.3.0-r1 214
+SHA256 4452c6318ed1afe80cea4a27493f1b63c80b776686cb986e4eed9d272436040b files/digest-eclipse-ecj-3.3.0-r1 214
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFG4YmfcxLzpIGCsLQRAu9iAJ4470jUddUQUESCKv1VKh5FIl3X2ACeJAU9
+SbdDrhnL5xEq5cze0IZuXS4=
+=9AY1
+-----END PGP SIGNATURE-----
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.3.0-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.3.0-r1.ebuild
new file mode 100644
index 000000000000..81e157210f50
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-3.3.0-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2007 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-r1.ebuild,v 1.1 2007/09/07 17:24:44 betelgeuse Exp $
+
+inherit eutils java-utils-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 ~ppc ~x86"
+SLOT="3.3"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+	sys-apps/findutils
+	app-arch/unzip"
+
+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() {
+	ewarn "to get the compiler adapter of ecj for ant do"
+	ewarn "	# emerge ant-eclipse-ecj"
+}
diff --git a/dev-java/eclipse-ecj/files/digest-eclipse-ecj-3.3.0-r1 b/dev-java/eclipse-ecj/files/digest-eclipse-ecj-3.3.0-r1
new file mode 100644
index 000000000000..d8f2e5bbad7a
--- /dev/null
+++ b/dev-java/eclipse-ecj/files/digest-eclipse-ecj-3.3.0-r1
@@ -0,0 +1,3 @@
+MD5 9e1fc1c86c85e72df5e141069b82041d ecjsrc.zip 1215250
+RMD160 938320ae54050e322bbb98c78b0e86d241862153 ecjsrc.zip 1215250
+SHA256 f41194a9580023afd11d18b82f6815b064af83c4f9ca407a40cd8d960bd112cc ecjsrc.zip 1215250