Keyworded ~amd64. Now forces use of ecj for compilation on amd64 to get around problems with running out of memory. Bug #141528

Package-Manager: portage-2.1.1_pre4

4 files changed, 24 insertions, 21 deletions

diff --git a/net-p2p/azureus/ChangeLog b/net-p2p/azureus/ChangeLog
index bda5c93361f8..2c54e8303e27 100644
--- a/net-p2p/azureus/ChangeLog
+++ b/net-p2p/azureus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/azureus
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/ChangeLog,v 1.18 2006/07/27 15:54:24 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/ChangeLog,v 1.19 2006/07/31 03:34:44 nichoj Exp $
+
+  31 Jul 2006; Joshua Nichols <nichoj@gentoo.org> azureus-2.4.0.2.ebuild:
+  Keyworded ~amd64. Now forces use of ecj for compilation on amd64 to get
+  around problems with running out of memory. Bug #141528
 
   27 Jul 2006; Joshua Nichols <nichoj@gentoo.org> files/azureus.png,
   azureus-2.4.0.2.ebuild:
diff --git a/net-p2p/azureus/Manifest b/net-p2p/azureus/Manifest
index d9efea9514da..12cf00c83501 100644
--- a/net-p2p/azureus/Manifest
+++ b/net-p2p/azureus/Manifest
@@ -46,27 +46,27 @@ AUX fedora/azureus-remove-win32-osx-platforms.patch 1205 RMD160 84682f22471425f7
 MD5 3c5862f1afbf48b4006a91247358e916 files/fedora/azureus-remove-win32-osx-platforms.patch 1205
 RMD160 84682f22471425f74dd5710d331f50341ef1a26d files/fedora/azureus-remove-win32-osx-platforms.patch 1205
 SHA256 babb97a8005b936b2ee127dd72f3534d47d33af803811a7041130fecd3fdbd3d files/fedora/azureus-remove-win32-osx-platforms.patch 1205
-DIST Azureus_2.3.0.6_source.zip 4773566
+DIST Azureus_2.3.0.6_source.zip 4773566 RMD160 c2c104c5f7dd172793e6bae6dbfbfa90c1cce7b1 SHA1 095c4f6bab1b0aeab07b1409cbcd6311d3ec8a42 SHA256 7244b8b379f6254d0adf3f43da240b415f982c496d63529a86eaf8e231ef120a
 DIST Azureus_2.4.0.2_source.zip 5188679 RMD160 60b260bc34ce06ace1ae16dad330548b2db3cea7 SHA1 d114b871bf8b1df2a5c6329798976fe68a77e244 SHA256 3c25d6560110b64acf7b395950f1b9b2553a365215a0e3fb6bce3d2414147099
 EBUILD azureus-2.3.0.6-r1.ebuild 3652 RMD160 a08653fa3a8ce890eea24908315e8ae6dfb5ed29 SHA1 d252b42ea0c232b25d5af9fdd94e5d586d64acc0 SHA256 8ba1f22c86534b15d13ba2ae3da6ee829e14403aea30bc6ae1775c7caa6ac9f9
 MD5 3a1933465346340106eb0867e426a40d azureus-2.3.0.6-r1.ebuild 3652
 RMD160 a08653fa3a8ce890eea24908315e8ae6dfb5ed29 azureus-2.3.0.6-r1.ebuild 3652
 SHA256 8ba1f22c86534b15d13ba2ae3da6ee829e14403aea30bc6ae1775c7caa6ac9f9 azureus-2.3.0.6-r1.ebuild 3652
-EBUILD azureus-2.4.0.2.ebuild 3524 RMD160 5fb3aafbc395bf85291cba3e9f2336e8a8c797d3 SHA1 515530b4a3d385726421878303233da71942bc3f SHA256 5690ff0d03e590a957c96909a3589cc89c3ce982c45a7331273c09b78a9c0248
-MD5 b6e5ab798ce804ac50ac4073ed46b372 azureus-2.4.0.2.ebuild 3524
-RMD160 5fb3aafbc395bf85291cba3e9f2336e8a8c797d3 azureus-2.4.0.2.ebuild 3524
-SHA256 5690ff0d03e590a957c96909a3589cc89c3ce982c45a7331273c09b78a9c0248 azureus-2.4.0.2.ebuild 3524
-MISC ChangeLog 3722 RMD160 c9fc61c2fd031a6dc35d27c14534976df32fc2d7 SHA1 fc86c5e5bc50ae65f9e23ae4180ac5155d92784c SHA256 d2f44e1e31ab38743139e3e02ab4e56e7e6063bfc7cc22d216842c46c5ce0541
-MD5 9dd542b1f8967dd4d786d5bbf7515765 ChangeLog 3722
-RMD160 c9fc61c2fd031a6dc35d27c14534976df32fc2d7 ChangeLog 3722
-SHA256 d2f44e1e31ab38743139e3e02ab4e56e7e6063bfc7cc22d216842c46c5ce0541 ChangeLog 3722
+EBUILD azureus-2.4.0.2.ebuild 3490 RMD160 f3996a790b8a1b35f6add543d24db76ba1af8d46 SHA1 1535841e214965503354b821761fe13a16ad3d38 SHA256 f056b1a4ddd33113adb1798da6906e2754b47aea62b2b2b30dfd828560b4c4df
+MD5 63fd8fa2699deaff86671a6fa7be4c40 azureus-2.4.0.2.ebuild 3490
+RMD160 f3996a790b8a1b35f6add543d24db76ba1af8d46 azureus-2.4.0.2.ebuild 3490
+SHA256 f056b1a4ddd33113adb1798da6906e2754b47aea62b2b2b30dfd828560b4c4df azureus-2.4.0.2.ebuild 3490
+MISC ChangeLog 3929 RMD160 f4067cd687df587fde3ffcc8de5f5d61786c7c08 SHA1 1d12366f2bead6c936886502096768d196aca7a3 SHA256 8826cf2304be2308f419093d2c628ba96bc10afadd42c7e3c3ccf2c6258e3770
+MD5 215cf8c0be7e8a5bfd0e08922905814e ChangeLog 3929
+RMD160 f4067cd687df587fde3ffcc8de5f5d61786c7c08 ChangeLog 3929
+SHA256 8826cf2304be2308f419093d2c628ba96bc10afadd42c7e3c3ccf2c6258e3770 ChangeLog 3929
 MISC metadata.xml 295 RMD160 544181b2b7e8b0d688b57a7290a362f3d2686f58 SHA1 f3aea2718d0f8b93e91c9fddd328b5108ce2bf53 SHA256 a96064243aa67bd00e443fd98621e45910882d3790467f8b0a837b694a351307
 MD5 315f038f311b0cb987f793266b9f5f2a metadata.xml 295
 RMD160 544181b2b7e8b0d688b57a7290a362f3d2686f58 metadata.xml 295
 SHA256 a96064243aa67bd00e443fd98621e45910882d3790467f8b0a837b694a351307 metadata.xml 295
-MD5 54e557185ba087a7b67c5fd0600fef12 files/digest-azureus-2.3.0.6-r1 72
-RMD160 fd89ad6e07f8785d2931a26e4f5a967d4efb1792 files/digest-azureus-2.3.0.6-r1 72
-SHA256 f8b40c44a57f3bbe25ba6a08e775be2383c07c0c28786f2d2ded3348c5155b1e files/digest-azureus-2.3.0.6-r1 72
+MD5 a25f09e3ab08da26e609ee36fc0d6d10 files/digest-azureus-2.3.0.6-r1 262
+RMD160 29a8b45d138065be1e61b15cf85a97f56d260e4c files/digest-azureus-2.3.0.6-r1 262
+SHA256 0b8c9b6cde8975ae52a9d2a12953b98003446eb65c91a666e7da6a0bd8c5731f files/digest-azureus-2.3.0.6-r1 262
 MD5 0865591e643067b5b233f5b8380a83fc files/digest-azureus-2.4.0.2 262
 RMD160 40649bc96d9c7d34abf348ec21c0511749e1a64f files/digest-azureus-2.4.0.2 262
 SHA256 5bec02bde87a6537da4ed830c90ffd5ab83ab5c35c0365f6dafb57ccd6275a63 files/digest-azureus-2.4.0.2 262
diff --git a/net-p2p/azureus/azureus-2.4.0.2.ebuild b/net-p2p/azureus/azureus-2.4.0.2.ebuild
index c87d4ceab92f..eac3fd9ba684 100644
--- a/net-p2p/azureus/azureus-2.4.0.2.ebuild
+++ b/net-p2p/azureus/azureus-2.4.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/azureus-2.4.0.2.ebuild,v 1.2 2006/07/27 15:54:24 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/azureus/azureus-2.4.0.2.ebuild,v 1.3 2006/07/31 03:34:44 nichoj Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://azureus.sourceforge.net/"
 SRC_URI="mirror://sourceforge/azureus/Azureus_${PV}_source.zip"
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="source"
 
@@ -22,6 +22,7 @@ RDEPEND=">=virtual/jre-1.4
 DEPEND=">=virtual/jdk-1.4
 	${RDEPEND}
 	>=dev-java/ant-core-1.6.2
+	amd64? ( =dev-java/eclipse-ecj-3.1* )
 	>=app-arch/unzip-5.0"
 
 S=${WORKDIR}/${PN}
@@ -61,12 +62,8 @@ src_compile() {
 		ant_extra_opts="-Dbootclasspath=$(java-config --jdk-home)/jre/lib/core.jar:$(java-config --jdk-home)/jre/lib/xml.jar:$(java-config --jdk-home)/jre/lib/graphics.jar"
 	fi
 
-	# Fails to build on amd64 or x86 without this
-	# Making this big  makes x86 machines with
-	# little memory fail...
-	if use amd64 || use x86; then
-		ANT_OPTS="${ANT_OPTS} -Xmx248m"
-	fi
+	# amd64 runs out of memory with javac... use ecj instead
+	use amd64  && java-pkg_force-compiler ecj-3.1
 
 	eant ${ant_extra_opts} jar
 }
diff --git a/net-p2p/azureus/files/digest-azureus-2.3.0.6-r1 b/net-p2p/azureus/files/digest-azureus-2.3.0.6-r1
index 82688fc1f438..13d4e4978fcf 100644
--- a/net-p2p/azureus/files/digest-azureus-2.3.0.6-r1
+++ b/net-p2p/azureus/files/digest-azureus-2.3.0.6-r1
@@ -1 +1,3 @@
 MD5 d02357ee2917482fee1174a0dc549c5e Azureus_2.3.0.6_source.zip 4773566
+RMD160 c2c104c5f7dd172793e6bae6dbfbfa90c1cce7b1 Azureus_2.3.0.6_source.zip 4773566
+SHA256 7244b8b379f6254d0adf3f43da240b415f982c496d63529a86eaf8e231ef120a Azureus_2.3.0.6_source.zip 4773566