Prevent the make build from filling entire disk space on some systems, bug 297273.

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

6 files changed, 40 insertions, 8 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index d7ba7971744b..9ca104a08c10 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.57 2010/02/18 16:14:04 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.58 2010/02/19 15:27:51 phajdan.jr Exp $
+
+  19 Feb 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-5.0.307.9.ebuild, chromium-5.0.322.2.ebuild,
+  chromium-9999.ebuild, +files/chromium-fix-make-build.patch:
+  Prevent the make build from filling entire disk space on some systems, bug
+  297273.
 
 *chromium-5.0.307.9 (18 Feb 2010)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 8b755d7da9ae..dcc0aaae2bae 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,6 @@
 AUX chromium-20100122-ubuntu-html5-video-mimetypes.patch 1228 RMD160 69157e703e14138cc838ae26191ef42116f3f614 SHA1 f9bac7a6840c060c921119051cd724b7b53ff2fd SHA256 d6f8e5dabf8b55c3fb9ae58920807758e5d1aa76f536efc6f53949208a567566
 AUX chromium-drop_sse2.patch 1560 RMD160 285a13c5a0d73b8cdadf8012adfb182a85392af8 SHA1 1aa9701b329d970db00726ba883d7dd5448ba372 SHA256 2da9ffbbaff5d00045b49ae75658df3c9f536543d388caff7a18ff093a0b1cd6
+AUX chromium-fix-make-build.patch 677 RMD160 b0dd0057d6f28e5d79b0bd9fd45b8e7cb79cbfcf SHA1 c7a7bf5fe81349f077a15458d66d53e1aa523f33 SHA256 8de8636ceedcbf0dc4f8494f48fd78baf261ef9334efe359d7e99bc668193c9e
 AUX chromium-launcher.sh 602 RMD160 e01a871fbe36224aa24b6c448cdad8eb3c3b3f22 SHA1 b35dae7032a2967a1be5814cb442a245a9a166e7 SHA256 a9aa84e924e592b85e58a3ce5b245f34637180000f52ef3b615dd4e9a56a602b
 AUX chromium-use_system_libevent-1.4.13.patch 6919 RMD160 1417a38ad95afb61bf90ffab289caebb9de5dd81 SHA1 0337132b42377ccac9ce5b3f9270f26cab2666a7 SHA256 39878315ead10c3b08c5285c7a87a227280b6847d4342ec94c09ec8b8223effa
 AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a
@@ -9,8 +10,8 @@ DIST chromium-5.0.307.9.tar.bz2 145145238 RMD160 9184b6f8f863c28beec0bac499ec447
 DIST chromium-5.0.322.2.tar.bz2 147189476 RMD160 3f4cb014d6c0c75b0318aa83c3b7ce6cb74297ad SHA1 cd19087d3abd4919bd93552c06dc8d8ed5666f33 SHA256 fa61a980ea021bc83c6c88970b833d5b4b15a72b7d377ed16b4240cbbd28306b
 EBUILD chromium-5.0.307.5.ebuild 5786 RMD160 61a2bed81f5cc122a1e10899ab4c77d1564c8da1 SHA1 7c7a7e2d997904b37929359d121407e35b1bf7b3 SHA256 15450c87c1d59535cf6a911c4277b26f9c20c691fe2f3b69c05804a4cf48d3d1
 EBUILD chromium-5.0.307.7.ebuild 5786 RMD160 eb13f7869f316d923031521d813cd90889b29a0a SHA1 eff5b132de524a900615c002f4eef4666513ac39 SHA256 99f62591873eaccbd6988f0bae9e4dc84c2f86e2c2cb19a1b730ae2d2e2ed302
-EBUILD chromium-5.0.307.9.ebuild 5784 RMD160 1acc11e97d9ca2f4b8441d49c41c1b382868d571 SHA1 25d1ce687769bff6a6d7ccf47cb5adac4a7215a7 SHA256 6687eeccd39ba0c4bc016ac662e2fd42cd2e640bc452ace2cdb320778bb0f939
-EBUILD chromium-5.0.322.2.ebuild 5786 RMD160 346cb78e41e94f074e6723871c6275e82051cae0 SHA1 6baf02469f424e30a8aca09a67a4290070b010de SHA256 e8b012748e5de878b7dda23039f822b61d16090c68fc3313695c42d18c4418ae
-EBUILD chromium-9999.ebuild 7499 RMD160 6e98b0ad82861ce9188032d5df5b9c66a07190af SHA1 8e812e4cd8207e67321ab3d27033c0c6e6bb6336 SHA256 cc8ae6b02c59b98dc3c7ebe550fbc3863590ba2ce286e4629a92bd74e29b13ed
-MISC ChangeLog 13161 RMD160 b47f1d511e23678adce0486d0f89a40a3cf7b433 SHA1 70d9b18395a5dbc78846c96768ac86534f8ae987 SHA256 81066748d27b04d94610855355b8dff35bf8849b9737fff16df97fff457ebeec
+EBUILD chromium-5.0.307.9.ebuild 5924 RMD160 9224ac0227fe0c1363c2dbe48c8e490cd8b5652d SHA1 47b83b8671a7a8d390006d920f8c77ae4aa9b7ba SHA256 80d9ef52210c0c003c436a51618c372eaa364878da2074bdd36927a6d97e6505
+EBUILD chromium-5.0.322.2.ebuild 5924 RMD160 f2b4e9d86939d6693c5ce07d8b604c3ead67add8 SHA1 0c4b918d566a921acf01fe80c68c321cd3d4a360 SHA256 de7a9493e34507cda840fdbe0005e55d40d37bf9c276b6caf2faffbbe7e6cac3
+EBUILD chromium-9999.ebuild 7637 RMD160 02a544adaa644f39f94b8ce370019562a3050232 SHA1 5868eb71169f100f5210d348cceb563b60cf6946 SHA256 916b9a36606045ee277b4ca264cb3ef8b1ad8c3ecd4554d60efcca8650db6225
+MISC ChangeLog 13424 RMD160 1cc462c310cdd09b17aac7104f0eab2eb3123843 SHA1 f51c710428f3cc265736efff2ae41bebb5313bbf SHA256 c69d30e3448d1bfeae2866ff998ab9bbad0448588bd82d6624274337891df322
 MISC metadata.xml 674 RMD160 5904280e3a216e0d322f1649e14f52f68cd00a39 SHA1 c2310be724a3345e36f644b53b8cfa02d3abdbed SHA256 e05422220666ef456f98ada2f42078b37400b538a452c1e3cee2945d7769dc5c
diff --git a/www-client/chromium/chromium-5.0.307.9.ebuild b/www-client/chromium/chromium-5.0.307.9.ebuild
index 8d64a39c9870..92e21aef6a24 100644
--- a/www-client/chromium/chromium-5.0.307.9.ebuild
+++ b/www-client/chromium/chromium-5.0.307.9.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-client/chromium/chromium-5.0.307.9.ebuild,v 1.1 2010/02/18 16:14:04 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.307.9.ebuild,v 1.2 2010/02/19 15:27:51 phajdan.jr Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib portability toolchain-funcs
@@ -73,6 +73,9 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-drop_sse2.patch
 	# Allow use of MP3/MPEG-4 audio/video tags with our system ffmpeg
 	epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch
+	# Prevent the make build from filling entire disk space on some systems,
+	# bug 297273.
+	epatch "${FILESDIR}"/${PN}-fix-make-build.patch
 
 	# Disable prefixing to allow linking against system zlib
 	sed -e '/^#include "mozzconf.h"$/d' \
diff --git a/www-client/chromium/chromium-5.0.322.2.ebuild b/www-client/chromium/chromium-5.0.322.2.ebuild
index 588e72eb3be1..7bdf04afb389 100644
--- a/www-client/chromium/chromium-5.0.322.2.ebuild
+++ b/www-client/chromium/chromium-5.0.322.2.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-client/chromium/chromium-5.0.322.2.ebuild,v 1.2 2010/02/16 12:21:55 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.322.2.ebuild,v 1.3 2010/02/19 15:27:51 phajdan.jr Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib portability toolchain-funcs
@@ -73,6 +73,9 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-drop_sse2.patch
 	# Allow use of MP3/MPEG-4 audio/video tags with our system ffmpeg
 	epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch
+	# Prevent the make build from filling entire disk space on some systems,
+	# bug 297273.
+	epatch "${FILESDIR}"/${PN}-fix-make-build.patch
 
 	# Disable prefixing to allow linking against system zlib
 	sed -e '/^#include "mozzconf.h"$/d' \
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index fa10b453050f..e74380140a16 100644
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.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-client/chromium/chromium-9999.ebuild,v 1.28 2010/02/16 12:21:55 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.29 2010/02/19 15:27:51 phajdan.jr Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib portability subversion toolchain-funcs
@@ -117,6 +117,9 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-drop_sse2.patch
 	# Allow use of MP3/MPEG-4 audio/video tags with our system ffmpeg
 	epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch
+	# Prevent the make build from filling entire disk space on some systems,
+	# bug 297273.
+	epatch "${FILESDIR}"/${PN}-fix-make-build.patch
 
 	# Disable prefixing to allow linking against system zlib
 	sed -e '/^#include "mozzconf.h"$/d' \
diff --git a/www-client/chromium/files/chromium-fix-make-build.patch b/www-client/chromium/files/chromium-fix-make-build.patch
new file mode 100644
index 000000000000..675a158989ce
--- /dev/null
+++ b/www-client/chromium/files/chromium-fix-make-build.patch
@@ -0,0 +1,16 @@
+diff -ru ../chromium-5.0.322.2/tools/gyp/pylib/gyp/generator/make.py ./tools/gyp/pylib/gyp/generator/make.py
+--- ../chromium-5.0.322.2/tools/gyp/pylib/gyp/generator/make.py	2010-01-25 23:04:11.000000000 +0100
++++ ./tools/gyp/pylib/gyp/generator/make.py	2010-02-19 00:48:45.381303499 +0100
+@@ -148,9 +148,9 @@
+ define fixup_dep
+ sed -i -e "s|^$(notdir $@)|$@|" $(depfile).tmp
+ sed -e "s|^[^:]*: *||" -e "s| *\\\\$$||" -e 's|^ *||' \
+-    -e "/./s|$$|:|" $(depfile).tmp >> $(depfile).tmp
+-cat $(depfile).tmp >> $(depfile)
+-rm -f $(depfile).tmp
++    -e "/./s|$$|:|" $(depfile).tmp > $(depfile).tmpXXX
++cat $(depfile).tmpXXX >> $(depfile)
++rm -f $(depfile).tmpXXX
+ endef
+ """
+ """