Version bump for dev channel release. Remove old.

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

3 files changed, 18 insertions, 9 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index ebcac92fbef4..b5742a0af7dd 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
 # 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.271 2011/02/02 10:07:14 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.272 2011/02/02 12:54:02 phajdan.jr Exp $
+
+*chromium-10.0.648.11 (02 Feb 2011)
+
+  02 Feb 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-10.0.642.2-r1.ebuild, +chromium-10.0.648.11.ebuild:
+  Version bump for dev channel release. Remove old.
 
 *chromium-9.0.597.84 (02 Feb 2011)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 9934aae523df..7d8fc70f66a9 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -16,16 +16,16 @@ AUX extract_v8_version.py 731 RMD160 71b134c9b88902259cb20ec232b8da6c3d8a15de SH
 AUX flac.gyp 416 RMD160 5af2709cae77ba139b32b0f22bca347a87170e0b SHA1 cdb2f5404c21ca8375ce9b753577df1df6a9cb78 SHA256 a4f24205b691e21d6208876a7f56859b9c3fc22eb39ec29fb2d0e3d067894932
 AUX speex.gyp 434 RMD160 6111f912450ece1cb016f3800e1a22f135cc68ff SHA1 23c1917b8bc7a4b395a8b5c1b91b6661d73f3df3 SHA256 34b977ccf3092a3af963c6ec1dc79a1f26bf5114571e3dfd2e94c2a6633537b9
 AUX v8.gyp 2602 RMD160 2949c9e2d8e2297182130e5984fb5f114c260a81 SHA1 7d32a04a7a921f30b0c3ed33a5593f1059832c96 SHA256 bc5342501d71754f23bd87914bb11841a7487330ba2f0462611dd1b0f99a2a43
-DIST chromium-10.0.642.2.tar.bz2 144176687 RMD160 3a937028fee3d26907c34852371507325c851564 SHA1 05772a19d2983984fb5df4229055abbb73195e59 SHA256 fa9a6d0a4d22493f359f8393a103e8c6bb585dce0766be853469de90bdd088d4
+DIST chromium-10.0.648.11.tar.bz2 144166353 RMD160 f49b38a6b078f1ac1ff17b9ebd70317d11ea19f2 SHA1 1d12f39c511850b6d282ab23d4a6f6d15f3b4e22 SHA256 0bb00c5ab77b60a7b2ceb39aec3bd82fdeb1efaf31ae60b7750b6b13a02a3d9a
 DIST chromium-10.0.648.6.tar.bz2 144142132 RMD160 2b89ba556a46257ea2504944f67a16d6af5f9833 SHA1 e3a729739b843ac6b8330d10361710bb0ad2f4bf SHA256 28df6b6620fe4b054e64fd2e9c257adec55703df25b2c5351891c15bada1f4d5
 DIST chromium-8.0.552.237.tar.bz2 135425078 RMD160 9d95b45a2a509b407a5c43ae3b4b6ede3c69923a SHA1 d604e8d6605b0d4feed6eaf464aa45541114ff07 SHA256 81270b40f8b223be24f6c15c884bd7feb0aa00db74583fd0f840594b88a2af3d
 DIST chromium-9.0.597.83.tar.bz2 140806165 RMD160 26f3a1533eef15b7f0562cded048e770b64d417d SHA1 eee3a943df4a107d2c5cdfacea19222c69bbb0e1 SHA256 6e48665841d09b62f03323b1648cac27b6065dfefae86a4fa5ea6de6739b51af
 DIST chromium-9.0.597.84.tar.bz2 140811549 RMD160 aa83d6d64464a56b8c33b989019b02c9964fbf28 SHA1 1a4e7a658ca669c9c626e12fe43c35612119bcb7 SHA256 2c319dfd925fc7ea5c76700a8d413c7ba36757d09b78f15165733b416a142d11
-EBUILD chromium-10.0.642.2-r1.ebuild 10390 RMD160 84ed5e976254bca07b10a982739a4e161329365b SHA1 dd5a63c49a5174480b5b4fa21499df886c809bd0 SHA256 035e8685cf13e357239518517fefb043bb6bc10a700e683c89f909ed3da10291
+EBUILD chromium-10.0.648.11.ebuild 10451 RMD160 fe57eadec6ff0c8ff0c7333f0e1687a39b046b20 SHA1 960f38776c19f193d089d3d43b4ec462c514947d SHA256 4b3b429b472702aab2d8e0fd4995cb83a3017879dccdca85c67fed1421b55586
 EBUILD chromium-10.0.648.6.ebuild 10449 RMD160 721b32de5687b650f6828c1c7f848c0a36ca7508 SHA1 04fcb26f85f4de283173aac64d4a3fa384163c60 SHA256 d01562683edb9f0c615cc8692f20110d888b5f2a2d97a0b489706bd04c572652
 EBUILD chromium-8.0.552.237.ebuild 8634 RMD160 eebed932e6c888ca9a9484e829d2512b2e864552 SHA1 78fce537dac9b8a20a1c4bc2377db4327a83d497 SHA256 f9e16d58a299288182b9085b2a421d8553b263f48de17f1a073e661ae952c577
 EBUILD chromium-9.0.597.83.ebuild 9406 RMD160 f855da978eefe6c849417eb25266d8c0a90865cf SHA1 4d4015329fb69b508d7d0fbf2769f00d3ce448c8 SHA256 922663bcadcf2599d037401ed95f391daba03f76d3312cd9adbaf9f05eb9b797
 EBUILD chromium-9.0.597.84.ebuild 9406 RMD160 c947c18540444e11195b3064800c52ca411d3b86 SHA1 d622424248f32ce4f0b4c94fccf01c602b050870 SHA256 afa81191b6e1adbc6990d9d6d2987b49731f66acfb0b056562eabaaa6528ef44
 EBUILD chromium-9999.ebuild 11484 RMD160 ba97e45ba8ce1eb682e5120f3da8647906f8368b SHA1 5227647634c08252a8cf452762f559cb4a582e93 SHA256 75f8636d6de74747a9e90d2dc6bcddbd5c8984a0aa9f2aa5703867433bdf05ac
-MISC ChangeLog 60145 RMD160 76fb7a5b06271271a38927b2f7fb7d35ec2a6cfd SHA1 202b7cd5a7310bbfc1adc2d4181a4b0092e94d6d SHA256 a606d1e8d2a21334e4b5940ed538810c5e362a67e6fc3d6673660c302bdf7d59
+MISC ChangeLog 60354 RMD160 ae028d40e4a864632f62165c7417ce47606fc01d SHA1 987ef7006c2eec43b8a78da61e51592e12eeec64 SHA256 158525c5a8148f0f7d719fb41894863b6ceace99711eebc39946ef1329ca0a2b
 MISC metadata.xml 607 RMD160 98f163b667c92c149e6ad82352ff5a1ea076361f SHA1 0d7d96013e31288c37a0e245cf2b538af1a46eaf SHA256 1d94b496c34342ce43cf7b1c6887d90930c0531e903e512d2d132e79e1d0d27d
diff --git a/www-client/chromium/chromium-10.0.642.2-r1.ebuild b/www-client/chromium/chromium-10.0.648.11.ebuild
index 2d18a2ab7b6a..7ca8d3c791ac 100644
--- a/www-client/chromium/chromium-10.0.642.2-r1.ebuild
+++ b/www-client/chromium/chromium-10.0.648.11.ebuild
@@ -1,10 +1,10 @@
 # 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-10.0.642.2-r1.ebuild,v 1.1 2011/01/22 16:18:21 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-10.0.648.11.ebuild,v 1.1 2011/02/02 12:54:02 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
-V8_DEPEND="3.0.7"
+V8_DEPEND="3.0.12"
 
 inherit eutils flag-o-matic multilib pax-utils portability python \
 	toolchain-funcs versionator virtualx
@@ -107,12 +107,12 @@ src_prepare() {
 	# Make sure we don't use bundled libvpx headers.
 	epatch "${FILESDIR}"/${PN}-system-vpx-r2.patch
 
-	# Make sure we don't use bundled xdg-utils.
-	epatch "${FILESDIR}"/${PN}-system-xdg-utils-r0.patch
-
 	# Make sure we don't use bundled FLAC.
 	epatch "${FILESDIR}"/${PN}-system-flac-r0.patch
 
+	# Fix build, http://crbug.com/70606.
+	epatch "${FILESDIR}"/${PN}-webkit-version.patch
+
 	# Remove most bundled libraries. Some are still needed.
 	find third_party -type f \! -iname '*.gyp*' \
 		\! -path 'third_party/WebKit/*' \
@@ -266,6 +266,9 @@ src_configure() {
 	# the build to fail because of that.
 	myconf+=" -Dwerror="
 
+	# Avoid a build error with -Os, bug #352457.
+	replace-flags "-Os" "-O2"
+
 	egyp ${myconf} || die
 }