Move the compiler forcing before first eant call so that it works.

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

diff --git a/dev-util/eclipse-sdk/ChangeLog b/dev-util/eclipse-sdk/ChangeLog
index 4cb86938c46270e09628a57c59c34a0847800268..915743c96027f780b0f8e7c2d9d8f14c5cbb83de 100644 (file)
--- a/dev-util/eclipse-sdk/ChangeLog
+++ b/dev-util/eclipse-sdk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/eclipse-sdk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.156 2010/04/09 18:49:25 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.157 2010/04/13 08:46:55 caster Exp $
+
+  13 Apr 2010; Vlastimil Babka <caster@gentoo.org>
+  eclipse-sdk-3.5.1-r1.ebuild:
+  Move the compiler forcing before first eant call so that it works.
 
   09 Apr 2010; Vlastimil Babka <caster@gentoo.org>
   eclipse-sdk-3.5.1-r1.ebuild:

diff --git a/dev-util/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest
index b1f3d9a01d0cf5fe88abe83e3e41fbd982574159..4eacacd1473c426d79b59610321b038ba5fd35a1 100644 (file)
--- a/dev-util/eclipse-sdk/Manifest
+++ b/dev-util/eclipse-sdk/Manifest
@@ -31,7 +31,7 @@ DIST eclipse-R3_5_1-fetched-src.tar.bz2 79061683 RMD160 ba04a7e9a9521f01c0c97d9f
 DIST eclipse-build-R0_4_0.tar.gz 164001 RMD160 c110ad217473c002aed5791547d9c18f9f05547a SHA1 aefd9bf326b92ec1e01e080d802d1fa0aeb788f1 SHA256 87f159e0861b378b1ea13d3173d6066fbc141a350283b0f0278831a5097cbe1b
 DIST eclipse-sourceBuild-srcIncluded-3.4.zip 105671901 RMD160 91b93c4f1538efe98471c2f9ee9ccd6ff081816c SHA1 c3200eca6b51147e2c00f7da09ca1f45160fd08e SHA256 df829822473886aa62b15d9f95654f88e868634fb1b78ce0b12c550b85054e93
 EBUILD eclipse-sdk-3.4-r2.ebuild 12539 RMD160 12af53e986db8e3f54b443e59e0f7f86485e245d SHA1 c788d6c79f25b5d501433fb94d6e44bdfa44164a SHA256 00fef63546ffead238b27f62c6e1b4c86831f457e9091c2f82a30e26e80f4e87
-EBUILD eclipse-sdk-3.5.1-r1.ebuild 11123 RMD160 9bf5366c728921b79817daa01fef36eecc2cac9a SHA1 cba0a9d8691fa2cb1ac4585443625f56f3694292 SHA256 56a03c7e6c07ec00b7d3d82c4b40886a186e8dd6b16dc565693c4d6425e8955b
+EBUILD eclipse-sdk-3.5.1-r1.ebuild 11123 RMD160 7051f67bf2c19c56e239cc1b4c36049ea40784d9 SHA1 80ee85ad7fbdcd21925ab9bd625ebd83b206f499 SHA256 8ec1b6dc10c1819082a12b3b18321ee37e9831ff9e35189cb61dbd58ba4f8377
 EBUILD eclipse-sdk-3.5.1.ebuild 10826 RMD160 3204307eefc4f34439a9781525829f50e9f9dbc0 SHA1 a0901493e7795f6eaa0b51b39a99fbf2a025ca40 SHA256 2ed865dbd5a534db81d9b4b13c22dc6cb2324c608a7401f37b872850ce741009
-MISC ChangeLog 30707 RMD160 aca6ebc5d868367ab67d9e1ea7483b354556dd47 SHA1 b6a9deeb0d1dd9b556cb24d7752767edb02838e7 SHA256 01e7c7b5b4b8feb4121d2037a25866d2aa34d014f66522e12ea7cafa2e7b655d
+MISC ChangeLog 30859 RMD160 7a0f8038397f3e1f15117be5a1f80665d7bc128b SHA1 f14ce14525dc491753f653ff399b31e8d0928c9e SHA256 bdf37a3766dd7fa2060971b7c744b57f8724851b94fdd87634f16d00a30f017a
 MISC metadata.xml 800 RMD160 f97cc4ac78898369a7706331bb14bc838519cf21 SHA1 21cd52a15acb6510aa3b955f78fb28a73cf58234 SHA256 76e243573c28c3d705f54745cfbcedd85dae3233b6ed00e2f81a61ac9caeeeaa

diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.5.1-r1.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.5.1-r1.ebuild
index 70674ee933e3ed71db5f49c8280af924c99791ae..5bdb0e14a6122dfdd5fa2457f6771d79d0c25256 100644 (file)
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.5.1-r1.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.5.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.5.1-r1.ebuild,v 1.3 2010/04/09 18:49:25 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.5.1-r1.ebuild,v 1.4 2010/04/13 08:46:55 caster Exp $
 
 EAPI="2"
 WANT_ANT_TASKS="ant-nodeps"
@@ -87,6 +87,8 @@ src_unpack() {
        ln -s "${DISTDIR}/eclipse-${BUILD_ID}-fetched-src.tar.bz2" "${S}"/ || die
 
        cd "${S}"
+       # building with ecj fails for some reason (polluted classpath probably)
+       java-pkg_force-compiler javac
        eant unpack
 }
 
@@ -148,8 +150,6 @@ src_prepare() {
 }
 
 src_compile() {
-       # building with ecj fails for some reason (polluted classpath probably)
-       java-pkg_force-compiler javac
        ANT_OPTS='-Xmx512M' eant -DbuildArch=${arch}
 }