Always use ecj to compile on amd64 to prevent insufficient heap, fixes bug #312293.

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

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 738ae33109ed25e436afe5537fba8c8196d874eb..a442681aa6c19912b5e90529092c6e1220f74df5 100644 (file)
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.228 2010/03/29 21:40:34 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.229 2010/04/10 21:17:30 caster Exp $
+
+  10 Apr 2010; Vlastimil Babka <caster@gentoo.org> tomcat-6.0.26.ebuild:
+  Always use ecj to compile on amd64 to prevent insufficient heap, fixes bug
+  #312293.
 
   29 Mar 2010; Markus Meier <maekke@gentoo.org> tomcat-6.0.26.ebuild:
   amd64 stable, bug #303719

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index abe04a9aad51bfff046fde7f77e4ad2df696945a..3e17ea19e71ec6fc91e39c8ae15ddd9a23d8b77a 100644 (file)
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 5.5/26-main_tomcat_catalina_jasper_build_xml.patch 16573 RMD160 53f1deaa88a39459a584cf14c761cb411d68f2e6 SHA1 69b3ca39f9dbabe12c56865d47866c06dcb7c2e3 SHA256 99a2c1bb164d97407525305512a85e6139531d81a47aa2c25f5c2cfe50aee1f6
 AUX 5.5/5.5.27-dynamic-JSSE13Factory.patch 1853 RMD160 31d20202a3be06c156b0c13f0afb3b394b8ecf02 SHA1 d7e7640dd4f7b7b92b21ac51d1b508fe56691a81 SHA256 f7db0e692088ec25a4731a521c1da4a0075e747f68690235fde3ca93c6f2e19d
 AUX 5.5/catalina.policy 10897 RMD160 d6accc56803b132d0e82e163cc583464c38248ef SHA1 585f80e24cad7e5927f8c2c6ad03f668eb904cc1 SHA256 8188db94772eb00d44b28cb9b40e9ccf30803acf576c0af1be5844ebd35d763c
@@ -19,13 +16,6 @@ DIST apache-tomcat-6.0.26-src.tar.gz 3472211 RMD160 84f8ad4d894204a8930fa57633c3
 EBUILD tomcat-5.5.27-r4.ebuild 10058 RMD160 a235794b1e53760c35289566dcaff2446437f53d SHA1 a49fb2db00fbcab78ab8672cdb11a8b0404df671 SHA256 18b69fb66c088a621db636243823701504af0a1dcc16df378e018f1958ecfa01
 EBUILD tomcat-6.0.20-r1.ebuild 6899 RMD160 14a5a13cdb09935cc9ba353f5cf7eb761f655a1f SHA1 5fd5dbc255a61b5f19a0c4eae71e719a478010da SHA256 33046ec344113795237a5bdccf233e6cf4f8af0c887ff516ec74a58e5fb5d113
 EBUILD tomcat-6.0.20.ebuild 6790 RMD160 19b0a9b7ce9b0764ccf2e3f0355a11744bb6434b SHA1 8a2b1bd20a099b97bfb50d7658ed5db99a0482b8 SHA256 b8868770240026c71773b8e3d63469ee6a71fe621e1d0751e867f5c513d4b5f2
-EBUILD tomcat-6.0.26.ebuild 6890 RMD160 42e54c5c082c7b59b60c7c596c78ea28ac22b3e6 SHA1 59341406ce62e4b3e6cf800ace50a1d7ff73a730 SHA256 62903145fb0b452d85abf0a82ece53cd33131c6a5c9cdc2ad66a005e97059ab3
-MISC ChangeLog 58867 RMD160 cbd42b442c0ca7e8bc0c98cadc6ea9161789900c SHA1 15e8304f7f9bd10876d76b29910d3a247ac8352f SHA256 4311b12968a448e591be1a4b1c36136d964e502d8ec0a04c93dd0e21c284d413
+EBUILD tomcat-6.0.26.ebuild 6861 RMD160 38045bfd3921e366823b00061ee327fb17d21bbf SHA1 272759bcbf4744ec404e6c941c2aeac3852c58e8 SHA256 1d8198ae22485ffb11a87690f969f272c6446c3a83b4137bc14b7f1f8a62cba2
+MISC ChangeLog 59029 RMD160 99cdefde49503253a8ba1a83f2a3eabf7984b005 SHA1 247aa38ab5fe8364a11b76c881cc3d05f2e1d74d SHA256 0fbc1568fddf7694789f0bcfe61b9bab616b498c17e8371b6bede31b37f50151
 MISC metadata.xml 658 RMD160 db94c7bc6ba622acfe88f970aa7d2e6fa1718a2a SHA1 aa25178fefb68df9dee7d8fc0d925a2fbbb655dd SHA256 5ddc2743ca9e3ec0bef7983248a9c8eda9238425288efb3acdecc8a828714bd8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuxHhEACgkQkKaRLQcq0GJ3UACgqNXIYCtuoS2ap3bOsvKtCClh
-OMQAn19UatKZigbnTchv/nByWIwRgkmg
-=Fjfr
------END PGP SIGNATURE-----

diff --git a/www-servers/tomcat/tomcat-6.0.26.ebuild b/www-servers/tomcat/tomcat-6.0.26.ebuild
index 89996d2524937d6fb94cb8015f08bc332a3b77d5..536b6117fc705cea167b1766ae8287c4c6f9b792 100644 (file)
--- a/www-servers/tomcat/tomcat-6.0.26.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.26.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/www-servers/tomcat/tomcat-6.0.26.ebuild,v 1.5 2010/03/29 21:40:34 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild,v 1.6 2010/04/10 21:17:30 caster Exp $
 
 EAPI=2
 JAVA_PKG_IUSE="doc examples source test"
@@ -66,8 +66,8 @@ pkg_setup() {
 java_prepare() {
        rm -v webapps/examples/WEB-INF/lib/*.jar || die
 
-       # bug # 178980
-       if use amd64 && [[ "${GENTOO_VM}" = "sun-jdk-1.5" ]] ; then
+       # bug # 178980 and #312293
+       if use amd64; then
                java-pkg_force-compiler ecj-3.3
        fi