Don't force ecj compiler as requested in bug #145338. Go back to using 256m limit for amd64 and 128m for x86. Should now work that ANT_OPTS is exported.

Package-Manager: portage-2.1.2.7

3 files changed, 19 insertions, 23 deletions

diff --git a/net-p2p/azureus/ChangeLog b/net-p2p/azureus/ChangeLog
index 1e55df52d223..bf3993c0fa5c 100644
--- a/net-p2p/azureus/ChangeLog
+++ b/net-p2p/azureus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/azureus
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/ChangeLog,v 1.46 2007/04/08 00:50:38 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/ChangeLog,v 1.47 2007/05/20 23:22:39 caster Exp $
+
+  20 May 2007; Vlastimil Babka <caster@gentoo.org>
+  azureus-2.5.0.4-r1.ebuild:
+  Don't force ecj compiler as requested in bug #145338. Go back to using 256m
+  limit for amd64 and 128m for x86. Should now work that ANT_OPTS is exported.
 
   08 Apr 2007; Joseph Jezak <josejx@gentoo.org> azureus-2.5.0.4.ebuild,
   azureus-2.5.0.4-r1.ebuild:
diff --git a/net-p2p/azureus/Manifest b/net-p2p/azureus/Manifest
index f6e67228749b..a8ce32a2077b 100644
--- a/net-p2p/azureus/Manifest
+++ b/net-p2p/azureus/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX azureus-2.5.0.0-pre 1850 RMD160 c3741fe1f8218bc2aeee10aba517ded690e99d0a SHA1 1955762d9131521583797c89527856158849d92f SHA256 aae3963e55330eb292176052a2cd72b8a9c322fd63fb71bb0fe6456df7d329e5
 MD5 feedf8845d1ceea0e57dd6db478b3a69 files/azureus-2.5.0.0-pre 1850
 RMD160 c3741fe1f8218bc2aeee10aba517ded690e99d0a files/azureus-2.5.0.0-pre 1850
@@ -67,18 +64,18 @@ EBUILD azureus-2.5.0.0-r3.ebuild 4184 RMD160 277d02e306b6cdd8155340882b3927b4799
 MD5 e87dd370cac2f809a576da1d8015552a azureus-2.5.0.0-r3.ebuild 4184
 RMD160 277d02e306b6cdd8155340882b3927b479921234 azureus-2.5.0.0-r3.ebuild 4184
 SHA256 8b0556db47934c98302a3328cffeef97654fe4a04144a88e7ca623b010d71a4f azureus-2.5.0.0-r3.ebuild 4184
-EBUILD azureus-2.5.0.4-r1.ebuild 4314 RMD160 1500b8459cb65dd237e215b858df9668ac809408 SHA1 666441ebc2021c8adc50005a1feb107927d13c52 SHA256 c84ed3491fd59e8b716def4f49c55b1b3e183f950a911de58d2389a31a33676a
-MD5 ea1fdb400644835c6a3d84aec52f0904 azureus-2.5.0.4-r1.ebuild 4314
-RMD160 1500b8459cb65dd237e215b858df9668ac809408 azureus-2.5.0.4-r1.ebuild 4314
-SHA256 c84ed3491fd59e8b716def4f49c55b1b3e183f950a911de58d2389a31a33676a azureus-2.5.0.4-r1.ebuild 4314
+EBUILD azureus-2.5.0.4-r1.ebuild 4350 RMD160 6534cfe7231442f06e7610b1cef9a46302d8bb9e SHA1 454b4c70e87899869e4169294a14fea7a83ad890 SHA256 1c660cb5c1766ee4ab2e2bebb430ead8a444fb34bc734cf58a9e01f981fea30a
+MD5 cbc93c7c9c034dce0c1b3d85073846c2 azureus-2.5.0.4-r1.ebuild 4350
+RMD160 6534cfe7231442f06e7610b1cef9a46302d8bb9e azureus-2.5.0.4-r1.ebuild 4350
+SHA256 1c660cb5c1766ee4ab2e2bebb430ead8a444fb34bc734cf58a9e01f981fea30a azureus-2.5.0.4-r1.ebuild 4350
 EBUILD azureus-2.5.0.4.ebuild 4262 RMD160 0d0de16dd8e67ebc1f9b8350ff052b7caa98df4d SHA1 cf6a6cc23620eb2475b6f3cc48418ffbf99b3447 SHA256 f1777a793ffa2943f6353902a606eddc2cf1c7f9f68cd8025597a4bd37aa6af8
 MD5 a2fad719e1c8882f94f94196516d9ed8 azureus-2.5.0.4.ebuild 4262
 RMD160 0d0de16dd8e67ebc1f9b8350ff052b7caa98df4d azureus-2.5.0.4.ebuild 4262
 SHA256 f1777a793ffa2943f6353902a606eddc2cf1c7f9f68cd8025597a4bd37aa6af8 azureus-2.5.0.4.ebuild 4262
-MISC ChangeLog 9716 RMD160 5c5daf6ea5b1ac5d63ab37922a90a7f8106b9f9c SHA1 567ad105da7fa8418fe009503b6ae95e59cd3636 SHA256 78f98c45907bc2c459f5f0129918a83f89b13f760af6912330e0868155e56e2c
-MD5 a04589b163eb3e510bbd85cdb01ffc57 ChangeLog 9716
-RMD160 5c5daf6ea5b1ac5d63ab37922a90a7f8106b9f9c ChangeLog 9716
-SHA256 78f98c45907bc2c459f5f0129918a83f89b13f760af6912330e0868155e56e2c ChangeLog 9716
+MISC ChangeLog 9954 RMD160 b5dac9391ba75632187e7e68c38cdefb12b2429d SHA1 81da61fba5eff26eeb56f958202f5cb34524af04 SHA256 5c6e645656047fce5793d79242b2894c6f7db13a881766c6c7131f416b0a8ba2
+MD5 b8d5c00ea9d1e14a013dc1707612ecba ChangeLog 9954
+RMD160 b5dac9391ba75632187e7e68c38cdefb12b2429d ChangeLog 9954
+SHA256 5c6e645656047fce5793d79242b2894c6f7db13a881766c6c7131f416b0a8ba2 ChangeLog 9954
 MISC metadata.xml 295 RMD160 544181b2b7e8b0d688b57a7290a362f3d2686f58 SHA1 f3aea2718d0f8b93e91c9fddd328b5108ce2bf53 SHA256 a96064243aa67bd00e443fd98621e45910882d3790467f8b0a837b694a351307
 MD5 315f038f311b0cb987f793266b9f5f2a metadata.xml 295
 RMD160 544181b2b7e8b0d688b57a7290a362f3d2686f58 metadata.xml 295
@@ -92,10 +89,3 @@ SHA256 b1bf328abef9e68ee1df0a5087bffa4e54b5fcba2f2f7823a1980ddd4f952266 files/di
 MD5 5f9475c83b5dc85ff00804857bb5d525 files/digest-azureus-2.5.0.4-r1 262
 RMD160 3e3f22f5dc0512b8044a11f388a7e540fdebdddc files/digest-azureus-2.5.0.4-r1 262
 SHA256 b1bf328abef9e68ee1df0a5087bffa4e54b5fcba2f2f7823a1980ddd4f952266 files/digest-azureus-2.5.0.4-r1 262
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGGDxTcsIHjyDViGQRAvpSAKDiwqhmCjRm7wbS3fSgKoBm7O3GFwCfSH7H
-fv6bjFMdLINlwD/rOTkeEwY=
-=6PfK
------END PGP SIGNATURE-----
diff --git a/net-p2p/azureus/azureus-2.5.0.4-r1.ebuild b/net-p2p/azureus/azureus-2.5.0.4-r1.ebuild
index c18cc22301df..9981e0e2c0cc 100644
--- a/net-p2p/azureus/azureus-2.5.0.4-r1.ebuild
+++ b/net-p2p/azureus/azureus-2.5.0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/azureus-2.5.0.4-r1.ebuild,v 1.3 2007/04/08 00:50:38 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/azureus-2.5.0.4-r1.ebuild,v 1.4 2007/05/20 23:22:39 caster Exp $
 
 inherit eutils fdo-mime java-pkg-2 java-ant-2
 
@@ -27,7 +27,6 @@ DEPEND="${RDEPEND}
 	>=virtual/jdk-1.5
 	dev-util/desktop-file-utils
 	>=dev-java/ant-core-1.6.2
-	|| ( =dev-java/eclipse-ecj-3.2* =dev-java/eclipse-ecj-3.1* )
 	source? ( app-arch/zip )
 	>=app-arch/unzip-5.0"
 
@@ -63,8 +62,10 @@ src_unpack() {
 }
 
 src_compile() {
-	# javac likes to run out of memory during build... use ecj instead
-	java-pkg_force-compiler ecj-3.2 ecj-3.1
+	# we started to force ecj because -Xmx seemed to have no effect but that
+	# was because of ANT_OPTS not exported. Bug #145338
+	use x86 && export ANT_OPTS="-Xmx128m"
+	use amd64 && export ANT_OPTS="-Xmx256m"
 
 	eant ${ant_extra_opts} jar
 }