Limit gclient sync to one job to prevent hangs. Consulted upstream before applying.

Package-Manager: portage-2.1.10.11/cvs/Linux i686

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index dfa67c1576e130f5cf3fac0503112cf453a91e24..f4779641731e98c7a48f86e9ac77f7747459e135 100644 (file)
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.514 2011/12/02 12:02:17 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.515 2011/12/02 12:53:45 phajdan.jr Exp $
+
+  02 Dec 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> chromium-9999-r1.ebuild:
+  Limit gclient sync to one job to prevent hangs. Consulted upstream before
+  applying.
 
 *chromium-16.0.912.59 (02 Dec 2011)
 

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 5927906326b9554b13e34414add4b19b6f8c56d6..4ef432430822e418dd95cdc8ede9c494b3123bc9 100644 (file)
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX chromium-browser.xml 407 RMD160 457374ff72561648d9777ffb3270ad10d864a6be SHA1 65543bfff7d0350d40ba258e61061b0c5579e1f2 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff
 AUX chromium-cups-r0.patch 726 RMD160 f3193ce9f987b6e5ad05a67d090ab4f9e1cb7b41 SHA1 8efd3479977e89429237d49fefbfcc63d250089e SHA256 800a669839ca7e033bb360b0cd9db92dde93505609c0b9184bf3901d2ec1535b
@@ -21,13 +21,13 @@ EBUILD chromium-16.0.912.41.ebuild 16605 RMD160 ca8a9ff4dbcc655d688e40ae4e4ff544
 EBUILD chromium-16.0.912.59.ebuild 16602 RMD160 2153ed3cce333e6fa7431349636d30afef2c8849 SHA1 a2bdccfeb524ca51ab746e55cbef34324dba7d52 SHA256 21860fa9b6eb3b341e2853bfd64f0b7822faab73e3deb9c00ec4c028d81e53f1
 EBUILD chromium-17.0.938.0.ebuild 17003 RMD160 5ae571ce471c21baa2cac4cc9ba9610f83719d1f SHA1 38a71d31060a41ed740b022bd42ddbbdaf5d517c SHA256 e405458afb479cf45c69cb8811bd8ced0b51f722577deb51981409a6c08ba4c9
 EBUILD chromium-17.0.942.0.ebuild 17001 RMD160 f4f99bf7b5589fd1fcf58daa5434715c4be80524 SHA1 403b244f947455751200969d7adc41c823566513 SHA256 ae031bd437e3977afe1dd2854392ccd5b5cb7d50d6b9f08fe85077e9f2864e69
-EBUILD chromium-9999-r1.ebuild 19079 RMD160 3e078ce4db6058934ea2ee8cda9771c186360644 SHA1 03b8c41c8781bcccb8569f28b15b6421c1f5d961 SHA256 66a49bd8f189bcc7852c55c3204fa087eda371b121073040bd943188a6af94a2
-MISC ChangeLog 111883 RMD160 dc22a7916268381af126af9308d7d1d5fcfbfcfe SHA1 499ef7d48132ea2ffb14cf7c38851fc8acf2d9f0 SHA256 a96f6a5e23c71f72a76a9aa9ac51fc672544a4811ac49cf02b624128ebb4968a
+EBUILD chromium-9999-r1.ebuild 19121 RMD160 ad1dd1ba567e31bdc7d121840c783069e9db5b63 SHA1 646a0474390dbaa54a600d8db09cbc11eb314a06 SHA256 cf98b0e44af9cf50fa4353dc8518000f15bf16d61d1e1d61b49f51a8a8320248
+MISC ChangeLog 112055 RMD160 c15571551af12f49a414461bc84bd5d5d2ac91e4 SHA1 31b3dc1c0094b9abfa62c1516d6b9817ee0ca9b7 SHA256 4eb196dbde8845ff561584afbe4d5efffa9a3d92d73444016812600b0cbf7676
 MISC metadata.xml 267 RMD160 3a166415fec415d539c1b7c32ed40b188488b9fb SHA1 5c3d71a9cea27175cbe8c98369b42b79c8643c6c SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk7YvlEACgkQC77qH+pIQ6RP/QD9HqMzuvptRm6wRRfr2XhWwcdF
-i4q0FJibMhPNbiuKaAcA/RMWdlngdYKBCpXMASHLP+g/HqnwX+lu6153hKKBfyXX
-=RPs7
+iEYEAREKAAYFAk7YyuEACgkQuUQtlDBCeQIDMwCcD0OnWJlWrp/an2XWngXzKdcJ
+pP0AnAwkSRLyYMi9GluEb9CQxTz2Qlz3
+=xtCk
 -----END PGP SIGNATURE-----

diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index c41f76bf03e302360f9f774d168f7c8bf4b497ef..e6ac45fdda961abd6394a0aa7d7c419a5b4288af 100644 (file)
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.81 2011/12/02 07:47:14 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.82 2011/12/02 12:53:45 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -80,7 +80,8 @@ gclient_config() {
 
 gclient_sync() {
        einfo "gclient sync -->"
-       "${WORKDIR}/depot_tools/gclient" sync --nohooks --jobs=16 \
+       # Only use a single job to prevent hangs.
+       "${WORKDIR}/depot_tools/gclient" sync --nohooks --jobs=1 \
                --delete_unversioned_trees || die
 }