Version bump. Fixes bug #278000 Instead of java6 flag, it builds most using 1.4 bytecode and only 1.6 specific parts with 1.6 bytecode, as upstream does. Adds local USE flag 'ant' enabled by default, which pulls the Ant adapter in PDEPEND.

Package-Manager: portage-2.2_rc48/cvs/Linux x86_64

5 files changed, 124 insertions, 4 deletions

diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
index a750961743ca..35f90be13d24 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,8 +1,11 @@
 AUX compiler-settings-3.3 282 RMD160 c5a6c8f8be8b4170032803e691a0a84ed2425cfa SHA1 5190a2fd42b1c23d329a537e6d5d5bd40ac93e5a SHA256 233f31f877115a0cd74dc08a3c7a9ac50a4ca707860c0f16c1de3dca77ce1f14
 AUX compiler-settings-3.4 290 RMD160 f52169a3a846bb476af305bdc28f9222a980a644 SHA1 da372b3bec065abb3c888a20a10ce7dfb19bd341 SHA256 e1d89a7314bf9ad8849e15fd376017d857f42d19f9d757b66d53a3776e2d2639
+AUX compiler-settings-3.5 290 RMD160 1f24b19791868ae164d943cdbc4ed081958a67ed SHA1 cb9a7c78c15603b72ee33ef8603b70a33440174d SHA256 42e5936eb8260d1e44b62e262adde4ab4a01166e01d949f0dbcdb56be6e027ee
 DIST ecjsrc-3.4.zip 1280774 RMD160 8d12a84b9ff2b8df252bdc06309558559ce91d2e SHA1 dbf3300205717c165a1b1ec36af4c3fd1e45888b SHA256 a6ce5f0682462e85e5e47229e5b16555f74c60188fa0bb17536beb1138c537b4
+DIST ecjsrc-3.5.1.zip 1297603 RMD160 3fd56790edc323fd10439eaf778b8489b641d637 SHA1 83b14c20a82079ff9dd3c42c4eee56db4c175723 SHA256 27639423e565c6b6ee5184f174447151aebdf5ef669c1bd73185e9b85515d4ee
 DIST ecjsrc.zip 1215250 RMD160 938320ae54050e322bbb98c78b0e86d241862153 SHA1 e08a27fd77e5ac7af8f2c84beed175cd3fdd0c60 SHA256 f41194a9580023afd11d18b82f6815b064af83c4f9ca407a40cd8d960bd112cc
 EBUILD ant-eclipse-ecj-3.3.0-r1.ebuild 1398 RMD160 a6a90e03b2f2a21471b7eb1eafdda273f576e897 SHA1 4ef8a30cf2e4209a0da134a1f964974883b65ac1 SHA256 869585beab6be32685b39644332dd723a5ac92520150f1ba40d66b7f8aa39194
 EBUILD ant-eclipse-ecj-3.4.ebuild 1383 RMD160 fbb6322db56d9a4ab8d0698696873e2794ae9ce3 SHA1 058827886c1452d54eba9b7c2cd6b9240cd66356 SHA256 4a47fdb1983d1b4fbc88399b263159ee7ae45e7cc7fc13b0e1d6dd1df1f1c9cd
-MISC ChangeLog 1993 RMD160 49d1206e9ae07e283d6ebfa360dbcf0ae081c978 SHA1 1150819cf7761986378d2f2c5a881bcc651ff014 SHA256 b8a9cbf24023319faa4815c99c59c8023a29ab54c023673d98d090dc7ce152fc
+EBUILD ant-eclipse-ecj-3.5.1.ebuild 1390 RMD160 a330fc29c2e9c8f134cb5466b42146ae04fac4bb SHA1 8a3b7ea4248412689b3fe7177d47d5e15b590d27 SHA256 2fc0b3d9d969e66b731b48b2efb5d84539b219a050e1df2baf9d0bd580f22d1b
+MISC ChangeLog 2181 RMD160 c3872a72650096eafd9de874441bde4e7c2d8cd8 SHA1 1e81151959c60c86b0b6d621adbe6dc887f2ed7c SHA256 ff272c040a426c39528aafacc37c3d9c2c4a54a79b8bf6ce0aa216660a0d51e5
 MISC metadata.xml 471 RMD160 a7f40a047de904e4e2f63fce4ae9377a36b66fa0 SHA1 c855f10cc8e043bcd1e59b48d570053304a66f49 SHA256 229f3cffb80ccec1b7c3ddff609d045bd11f8004724bcb9de5d3bf9104a37d20
diff --git a/dev-java/eclipse-ecj/ChangeLog b/dev-java/eclipse-ecj/ChangeLog
index 2412a3b1a851..d95efe9a2b8a 100644
--- a/dev-java/eclipse-ecj/ChangeLog
+++ b/dev-java/eclipse-ecj/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/eclipse-ecj
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.58 2009/11/04 17:50:42 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.59 2009/11/04 19:05:35 caster Exp $
+
+*eclipse-ecj-3.5.1 (04 Nov 2009)
+
+  04 Nov 2009; Vlastimil Babka <caster@gentoo.org>
+  +eclipse-ecj-3.5.1.ebuild, metadata.xml:
+  Version bump. Fixes bug #277998. Instead of java6 flag, it builds most
+  using 1.4 bytecode and only 1.6 specific parts with 1.6 bytecode, as
+  upstream does. Adds local USE flag 'ant' enabled by default, which pulls
+  the Ant adapter in PDEPEND.
 
   04 Nov 2009; Vlastimil Babka <caster@gentoo.org>
   -eclipse-ecj-3.2.2.ebuild, -files/ecj-3.3, -eclipse-ecj-3.3.0-r2.ebuild,
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 44bb00ef58ac..0bd3d33af15f 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -2,10 +2,12 @@ AUX compiler-settings-3.2 258 RMD160 40710ab16453db1f23433a9e74637662e917c159 SH
 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-3.5.1.zip 1297603 RMD160 3fd56790edc323fd10439eaf778b8489b641d637 SHA1 83b14c20a82079ff9dd3c42c4eee56db4c175723 SHA256 27639423e565c6b6ee5184f174447151aebdf5ef669c1bd73185e9b85515d4ee
 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 1932 RMD160 665b71bd83682d6091a656c903c2e483a5e4451f SHA1 516fbc0fa421645ab070b4fbcfbfdd37cef7a0f2 SHA256 88217e40f760e19a91d090eb72f75e8281fd8e0ea74e458c4f446e2309f919c9
 EBUILD eclipse-ecj-3.3.0-r3.ebuild 2120 RMD160 0a4afac8a965b827148b9a1b48ec82e66ddb17a0 SHA1 c28b9df069497cfd6459b98821c51fd60b63c60b SHA256 c1b36ffbe000bbae165da32a81f4eb6ea6c9ad1f123b4bb67905dc9aeff0917c
 EBUILD eclipse-ecj-3.4-r4.ebuild 2266 RMD160 7dc48632d92d7a96a21706cbe7025a879d6e473e SHA1 ad44fb68c7202b744250cacc2daa51d3d3d1a909 SHA256 c97a509f93055f74933daaff67e1e92b7e4b40c6d5559260ad1436ace321a27d
-MISC ChangeLog 8640 RMD160 dc1699a7bffb0798e8bd8c8428b2fce8495c0ec1 SHA1 ef01e7b5f2522ead6e31a146efbc61727e87abce SHA256 ea27e9d9ca4f7c269a267c27f54104bd22f94c32ea2968d4f8f9853f8a0f7d2b
-MISC metadata.xml 471 RMD160 08157ecf22a49769d6b1bd7f07f3ed2006033d7c SHA1 a703452dd08cbc95a192d27d3d79699309586082 SHA256 60e14a372db0a00cfa3f87152c20e658a55acc28b55a1d7888d2d44b847f6007
+EBUILD eclipse-ecj-3.5.1.ebuild 2780 RMD160 1b7c52fcd313a9eef41c62fe0d6b18a1f4c0d7b7 SHA1 1797985c4f76c48769428912f55cb1d944ac8e74 SHA256 737f58eeb7f47b46ed50f422c2bef3007505e725b18b2b7974410256d41556dd
+MISC ChangeLog 9018 RMD160 4dd3e83b28fb3bffeda9f1358454377261ae9175 SHA1 87151d485495fdd1734f3eadb629fafd1a3cf83c SHA256 859de9e7d4666c473d16e22c9777fe781f417fe1d8726cbd806d5a1da02d5bce
+MISC metadata.xml 570 RMD160 c3773d8e931a0e7a00eeb494f1f8f68cc1f799ed SHA1 71c2b881dc7b6733567777051b079745f3c2d70a SHA256 dd2a09440442264363911b455040196cbb42763fbacbb135c07b3f0de44a1e3a
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.5.1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.5.1.ebuild
new file mode 100644
index 000000000000..c2e9730b7053
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-3.5.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2009 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.5.1.ebuild,v 1.1 2009/11/04 19:05:35 caster Exp $
+
+EAPI=2
+
+inherit java-pkg-2
+
+MY_PN="ecj"
+DMF="R-${PV}-200909170800"
+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="+ant"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+SLOT="3.5"
+
+CDEPEND=">=app-admin/eselect-ecj-0.3"
+
+JAVA_PKG_WANT_SOURCE=1.4
+JAVA_PKG_WANT_TARGET=1.4
+
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.6
+	sys-apps/findutils"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.4"
+PDEPEND="ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# These have their own package.
+	rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java || die
+	rm -fr org/eclipse/jdt/internal/antadapter || die
+
+	# upstream build.xml excludes this
+	rm META-INF/eclipse.inf
+}
+
+src_compile() {
+	local javac_opts javac java jar
+
+	javac_opts="$(java-pkg_javac-args) -encoding ISO-8859-1"
+	javac="$(java-config -c)"
+	java="$(java-config -J)"
+	jar="$(java-config -j)"
+
+	find org/ -path org/eclipse/jdt/internal/compiler/apt -prune -o \
+		-path org/eclipse/jdt/internal/compiler/tool -prune -o -name '*.java' \
+		-print > sources-1.4
+	find org/eclipse/jdt/internal/compiler/{apt,tool} -name '*.java' > sources-1.6
+
+	mkdir -p bootstrap || die
+	cp -pPR org bootstrap || die
+	cd "${S}/bootstrap" || die
+
+	einfo "bootstrapping ${MY_PN} with ${javac} ..."
+	${javac} ${javac_opts} @../sources-1.4 || die
+	${javac} -encoding ISO-8859-1 -source 1.6 -target 1.6 @../sources-1.6 || 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 @sources-1.4 || die
+	${java} -classpath bootstrap/${MY_PN}.jar \
+		org.eclipse.jdt.internal.compiler.batch.Main \
+		-encoding ISO-8859-1 -source 1.6 -target 1.6 -nowarn @sources-1.6 || die
+
+	find org/ -name '*.class' -o -name '*.properties' -o -name '*.rsc' \
+		| xargs ${jar} cf ${MY_PN}.jar
+}
+
+src_install() {
+	java-pkg_dolauncher ${MY_PN}-${SLOT} --main \
+		org.eclipse.jdt.internal.compiler.batch.Main
+
+	# disable the class version verify, this has intentionally
+	# some classes with 1.6, but most is 1.4
+	JAVA_PKG_STRICT="" java-pkg_dojar ${MY_PN}.jar
+}
+
+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/metadata.xml b/dev-java/eclipse-ecj/metadata.xml
index cffcc6a6d958..2b50537a62dd 100644
--- a/dev-java/eclipse-ecj/metadata.xml
+++ b/dev-java/eclipse-ecj/metadata.xml
@@ -9,4 +9,7 @@ as a batch-compiler by running the ecj-3.x script, or it can be
 used with Ant by using the -lib option to and and setting
 -Dbuild.compiler=ecj
 </longdescription>
+<use>
+	<flag name="ant">Support using ecj in Ant builds via dev-java/ant-eclipse-ecj</flag>
+</use>
 </pkgmetadata>