Version bump for dev channel release. Remove old.

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

3 files changed, 18 insertions, 19 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 2dbda94c20f5..f3e4d313534a 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.93 2010/05/04 11:15:54 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.94 2010/05/04 14:51:53 phajdan.jr Exp $
+
+*chromium-5.0.375.29 (04 May 2010)
+
+  04 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-5.0.375.9.ebuild, +chromium-5.0.375.29.ebuild:
+  Version bump for dev channel release. Remove old.
 
   04 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> chromium-9999.ebuild:
   Do not apply the libpng-1.4 patch, it has been applied upstream. Bug
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index c672aee8cd36..0078f99b982a 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -10,10 +10,10 @@ AUX chromium-supported-media-mime-types.patch 1016 RMD160 9b3fad22b90e4bea62e343
 AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a
 DIST chromium-5.0.342.9.tar.bz2 155586284 RMD160 5ab3df8b19383c21d6279a96aa2e0c20074d58a2 SHA1 1823e1932fd68414042a3b5fc4537107ed3998bc SHA256 89a8072fc738afb7d6c5136f91deeeaa39de3d5285f3f471014af95038681903
 DIST chromium-5.0.375.23.tar.bz2 161814334 RMD160 139573ba251c4e1a99b0649091b0d52b9553322e SHA1 78bdf22b065bc7da56534f1f0d5d1356694fb260 SHA256 145341c01f81bd64f6ff3e9f762c1aff46206f714d81b3fab7ef8bd178e00140
-DIST chromium-5.0.375.9.tar.bz2 248611435 RMD160 5fdf9ed277f0464ec4b925b3047658cca4d2120a SHA1 3277a872eb8ffe04b61f301136c9600671be15e7 SHA256 13cf5a64a414c2b3cec33735efbac0c23131607fcd37d5b9bb9ec1c9ec8481bd
+DIST chromium-5.0.375.29.tar.bz2 161965067 RMD160 fcdc113d014f2a58e6ba40d7e352db0dce42bdf3 SHA1 1484a1295853e7a021278e897b11f845603e5e04 SHA256 26616b68fb69257216d8d229669246704c8401c97409e5e5b13394a50f4e3f1b
 EBUILD chromium-5.0.342.9.ebuild 6548 RMD160 abb9d41541d252a60a61641ea76f6f7b1298bbcf SHA1 7f4e1c7f970b8f7a50247f27ca89bda3f064bb2a SHA256 6845b8905a1376ba8ec24ea09276d05b89d3b3c4da136d385260a4170b9e9d29
 EBUILD chromium-5.0.375.23.ebuild 6436 RMD160 d0d01d6761e605408d9d3bc07f66b33dc3f4407b SHA1 2eda56005b7f6b465497f62f548ab251d2a41f6b SHA256 504816c00293dab6da66b27740a7710fcb0328f6a0162176dd68757e0a773721
-EBUILD chromium-5.0.375.9.ebuild 6589 RMD160 1888aebc34e494b2bd640a970dbad4da615f4613 SHA1 3e1b189006d98fbfb677cad8db0da5743ff82180 SHA256 5bcc45d7f187ab3cc5ac247f4d2e6d604ce80f7069b71e2e0467a9fab7797f3a
+EBUILD chromium-5.0.375.29.ebuild 6436 RMD160 189b59588b8be4b9cc73f17843f565f31533e071 SHA1 eda8acc93eae49d8748cac49fcbf8f55203c8243 SHA256 72220d7c31cd7c378e0e3113c379519d35ac7cd1ade061b61c284598755db65e
 EBUILD chromium-9999.ebuild 8092 RMD160 bf2161a03364ac1c4bacc9f08b942b51bfbe7e0d SHA1 e7f46c1b95f7bc082b3a4c9b62ede48378677c77 SHA256 abfd215a095dabd4ea18056bf7ae2b7045d656f6ea3f3e64c3411ca595f49ad6
-MISC ChangeLog 21347 RMD160 1aa14b0fbeabb99f56befde2002d381a81c8eb07 SHA1 82af56c9a02e1e5852c383e1bea13c59e71bfcff SHA256 581c700f644a573e508e02dace89bc0d7601a5a262f95b4f91a0ab55a16d04dc
+MISC ChangeLog 21550 RMD160 2aef42641bde56f5299079e578d6ce7f72de5636 SHA1 4180568929782ac3190c0df371a06681b0399ad0 SHA256 d66efd61450c2a6d8627c4fba7c57c9160d72da48a3a39b1f0744d3721f93223
 MISC metadata.xml 572 RMD160 458a635f4040d8552b46256c8437099608041b99 SHA1 6ed49919f57f709065cf06c148f1df68119a3b3f SHA256 4a433c3dadf06af7e3dca492ffaa3f26a6c4419de61a044609e2d528891e09a5
diff --git a/www-client/chromium/chromium-5.0.375.9.ebuild b/www-client/chromium/chromium-5.0.375.29.ebuild
index d19368deaf8f..e537341fb037 100644
--- a/www-client/chromium/chromium-5.0.375.9.ebuild
+++ b/www-client/chromium/chromium-5.0.375.29.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.375.9.ebuild,v 1.3 2010/04/20 07:55:14 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.375.29.ebuild,v 1.1 2010/05/04 14:51:53 phajdan.jr Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib portability toolchain-funcs
@@ -74,13 +74,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# The 375 branch tarballs have redundant src directory, which makes
-	# our patches apply in the wrong directory.
-	rm -r src || die "rm src failed"
-
-	# Changing this in ~/include.gypi does not work
-	sed -i "s/'-Werror'/''/" build/common.gypi || die "Werror sed failed"
-
 	# Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007
 	epatch "${FILESDIR}"/${PN}-drop_sse2-r0.patch
 
@@ -89,11 +82,6 @@ src_prepare() {
 
 	# Fix build failure with libpng-1.4, bug 310959.
 	epatch "${FILESDIR}"/${PN}-libpng-1.4.patch
-
-	# Disable prefixing to allow linking against system zlib
-	sed -e '/^#include "mozzconf.h"$/d' \
-		-i third_party/zlib/zconf.h \
-		|| die "zlib sed failed"
 }
 
 src_configure() {
@@ -111,8 +99,8 @@ src_configure() {
 	fi
 
 	# CFLAGS/LDFLAGS
-	mkdir -p "${S}"/.gyp
-	cat << EOF > "${S}"/.gyp/include.gypi
+	mkdir -p "${S}"/.gyp || die "cflags mkdir failed"
+	cat << EOF > "${S}"/.gyp/include.gypi || die "cflags cat failed"
 {
 	'target_defaults': {
 		'cflags': [ '${CFLAGS// /','}' ],
@@ -152,6 +140,11 @@ EOF
 		myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
 	fi
 
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf="${myconf} -Dwerror="
+
 	build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die "gyp failed"
 }