dev-java/ant-eclipse-ecj: fixed bug #378985

Package-Manager: portage-2.1.10.29/cvs/Linux x86_64

4 files changed, 65 insertions, 6 deletions

diff --git a/dev-java/ant-eclipse-ecj/ChangeLog b/dev-java/ant-eclipse-ecj/ChangeLog
index 1b4e38353ebb..218a8c5e72e1 100644
--- a/dev-java/ant-eclipse-ecj/ChangeLog
+++ b/dev-java/ant-eclipse-ecj/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/ant-eclipse-ecj
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-eclipse-ecj/ChangeLog,v 1.24 2011/10/19 18:22:29 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-eclipse-ecj/ChangeLog,v 1.25 2011/10/19 18:45:13 fordfrog Exp $
+
+*ant-eclipse-ecj-3.6-r1 (19 Oct 2011)
+
+  19 Oct 2011; Miroslav Šulc <fordfrog@gentoo.org> files/ecj-3.6,
+  +ant-eclipse-ecj-3.6-r1.ebuild:
+  Fixed compiler settings (bug #378985, thanks to William L. Thomson Jr.
+  <wlt@obsidian-studios.com> for the fix)
 
   19 Oct 2011; Miroslav Šulc <fordfrog@gentoo.org>
   -ant-eclipse-ecj-3.5.1.ebuild:
diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
index 7a869bc0428b..9e06734fb7b4 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,7 +1,7 @@
 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
-AUX ecj-3.6 290 RMD160 1f24b19791868ae164d943cdbc4ed081958a67ed SHA1 cb9a7c78c15603b72ee33ef8603b70a33440174d SHA256 42e5936eb8260d1e44b62e262adde4ab4a01166e01d949f0dbcdb56be6e027ee
+AUX ecj-3.6 290 RMD160 6d95d1f4082355a54d2d1cff6a2908a74962b00a SHA1 4f3771c9fda089952a945170f9af7d1ada964ecf SHA256 b016e59461466246a6a93229033f557caf7143af50475cd37c4e27889ff6696e
 DIST ecjsrc-3.4.zip 1280774 RMD160 8d12a84b9ff2b8df252bdc06309558559ce91d2e SHA1 dbf3300205717c165a1b1ec36af4c3fd1e45888b SHA256 a6ce5f0682462e85e5e47229e5b16555f74c60188fa0bb17536beb1138c537b4
 DIST ecjsrc-3.5.2.zip 1298691 RMD160 f6dc987418682dd9d776a692383a37497656fc04 SHA1 7d79ac9602ffa825f6f3ea8ab5a3387b687f5215 SHA256 4ae91449962b1e2781b70713e299f9fa16fb1ce25a4d2bb335c13b55c08d6d74
 DIST ecjsrc-3.6.zip 1310484 RMD160 82d9980aa4e6be1014d1bac396cceb2ab304cee3 SHA1 9bfda69c7c8528ecfe1b6cbcbe976b642069ca9c SHA256 bc2d624c5ca135d593c71a677674509f5801998ffe98c386749d15a46ee69242
@@ -9,6 +9,7 @@ DIST ecjsrc.zip 1215250 RMD160 938320ae54050e322bbb98c78b0e86d241862153 SHA1 e08
 EBUILD ant-eclipse-ecj-3.3.0-r1.ebuild 1398 RMD160 a6a90e03b2f2a21471b7eb1eafdda273f576e897 SHA1 4ef8a30cf2e4209a0da134a1f964974883b65ac1 SHA256 869585beab6be32685b39644332dd723a5ac92520150f1ba40d66b7f8aa39194
 EBUILD ant-eclipse-ecj-3.4.ebuild 1364 RMD160 d7068ec5e597f113a47534b0ad4d7466a6231dae SHA1 de73d77d5d9ec9f720723e18d9cc8ebb30cf8745 SHA256 dbe22feec7cd898a2d895ee498ce068e45410a653ce801f446df4791bcdc8d07
 EBUILD ant-eclipse-ecj-3.5.2.ebuild 1408 RMD160 a20186cef559ff90246b2cf1ef10c6c7c0c00a12 SHA1 bf9ad0810ec6301ea9d662b1e46029e8c07562c3 SHA256 67187dc085ea01a8cc417a1b60a494a560b5f97b566afd67f747cd3666159c42
+EBUILD ant-eclipse-ecj-3.6-r1.ebuild 1394 RMD160 46af7c06334a7b0a507e2e8ca4e72d594d2e6243 SHA1 31718c43914f697fef3ea1ffdcf324404b9c5678 SHA256 469dc8fdcb18e4c1dfc0fafaf2aad68dc91fb62d79faf15ff484b26da12df59c
 EBUILD ant-eclipse-ecj-3.6.ebuild 1411 RMD160 f94940d6716182a5ec8f15f6146b644431305e7e SHA1 1dfa3aa4358fcc980a2b51805b062525ac0d4b87 SHA256 102233218dcc835fa4642d78512660f42209a64d364262334be9e8d0e3745d11
-MISC ChangeLog 3612 RMD160 35c24aef06966e9007f2c7ff43ac8d39bf7c2555 SHA1 0a679b89a8b88c92b46e83f6d9f5a4be11b3514d SHA256 08b229da04a159d3fe3a659b421375f32cb1cfbc2d1b70a0722959567a0ef337
+MISC ChangeLog 3868 RMD160 b6f5a5db3b7444d821ba41bd5775d29fc75b42bf SHA1 1e8a7864503978a2e1e48cc48330c1c1cde17f47 SHA256 02af14205f9dca74903bc4364de415efaedce310cc9cd9a6e819c888087ce6b7
 MISC metadata.xml 471 RMD160 a7f40a047de904e4e2f63fce4ae9377a36b66fa0 SHA1 c855f10cc8e043bcd1e59b48d570053304a66f49 SHA256 229f3cffb80ccec1b7c3ddff609d045bd11f8004724bcb9de5d3bf9104a37d20
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-3.6-r1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-3.6-r1.ebuild
new file mode 100644
index 000000000000..f18b8650119c
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-3.6-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-3.6-r1.ebuild,v 1.1 2011/10/19 18:45:13 fordfrog Exp $
+
+EAPI=4
+
+inherit java-pkg-2
+
+DMF="R-${PV}-201006080911"
+S="${WORKDIR}"
+
+DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://archive.eclipse.org/eclipse/downloads/drops/${DMF/.0}/ecjsrc-${PV}.zip"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+SLOT="3.6"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4
+	~dev-java/eclipse-ecj-${PV}
+	>=dev-java/ant-core-1.7"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.4"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p src/org/eclipse/jdt/{core,internal}
+	cp org/eclipse/jdt/core/JDTCompilerAdapter.java \
+		src/org/eclipse/jdt/core || die
+	cp -r org/eclipse/jdt/internal/antadapter \
+		src/org/eclipse/jdt/internal || die
+	rm -fr about* org
+}
+
+src_compile() {
+	cd src
+	java-pkg_filter-compiler jikes
+	ejavac -classpath "$(java-pkg_getjars ant-core,eclipse-ecj-${SLOT})" \
+		$(find org/ -name '*.java') || die "ejavac failed!"
+	find org/ -name '*.class' -o -name '*.properties' | \
+			xargs jar cf "${S}/${PN}.jar" || die "jar failed!"
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	insinto /usr/share/java-config-2/compiler
+	doins "${FILESDIR}/ecj-${SLOT}"
+}
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-3.6 b/dev-java/ant-eclipse-ecj/files/ecj-3.6
index a15e7705d7a5..966b78449e90 100644
--- a/dev-java/ant-eclipse-ecj/files/ecj-3.6
+++ b/dev-java/ant-eclipse-ecj/files/ecj-3.6
@@ -1,7 +1,7 @@
-JAVAC="/usr/bin/ecj-3.5"
-PACKAGE="=dev-java/ant-eclipse-ecj-3.5*"
+JAVAC="/usr/bin/ecj-3.6"
+PACKAGE="=dev-java/ant-eclipse-ecj-3.6*"
 SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7"
 SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7"
 ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
-ANT_BUILD_COMPILER_DEPS="eclipse-ecj-3.5,ant-eclipse-ecj-3.5"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-3.6,ant-eclipse-ecj-3.6"
 GENERATION="2"