Version bump for dev channel release. Remove old.

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

5 files changed, 38 insertions, 17 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 22b7afaf1b04..bad0684137cc 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.656 2012/06/09 11:31:59 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.657 2012/06/12 13:53:14 phajdan.jr Exp $
+
+*chromium-21.0.1171.0 (12 Jun 2012)
+
+  12 Jun 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/chromium-ppapi-r0.patch, -chromium-21.0.1155.2.ebuild,
+  +chromium-21.0.1171.0.ebuild, chromium-9999-r1.ebuild:
+  Version bump for dev channel release. Remove old.
 
 *chromium-20.0.1132.27-r1 (09 Jun 2012)
 *chromium-19.0.1084.56-r1 (09 Jun 2012)
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index bae58fbfd250..0ee6a5c2144d 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -8,6 +8,7 @@ AUX chromium-glib-r0.patch 451 RMD160 8b410994406b930c6befc3aed0f4dc958ddf5609 S
 AUX chromium-gyp-settings-r0.patch 383 RMD160 f063758554ef289f6ef2ac1e8af5266cc3b2e4d3 SHA1 c42a38f6572000e76ada5fd65a6d355f7c61850e SHA256 709e4c8937d7f839f0dd16db905e1834a502bc2cf192329d720b508ef006cfc6
 AUX chromium-launcher-r2.sh 940 RMD160 7a64e597998a8f95a7e3d1c26377842ff8106f89 SHA1 9630a36af707a810cbd646f3bac5deba984439f6 SHA256 842e121bbfa33513ca964744f0ba8401401946e672cd6a0a95bc80a28212e87e
 AUX chromium-media-no-sse-r0.patch 519 RMD160 8ef93ccacc63e22aa508b5a6a5fe82c48ce29617 SHA1 a7739564580e455278ba5f6725095a77e3ef06ce SHA256 71751bf5913da1eec3c88c433044224c869b0abd5a29172cf239bddbb4eff761
+AUX chromium-ppapi-r0.patch 422 RMD160 9cc64129919114162a753ac64dd7f01b16f90c94 SHA1 c07d63888e5b72ecb598e45645cdd5c05d8e0c89 SHA256 1f4b57670d317959bc2dc60e5d2a44aa8fc6028f7ed540cdb502fa0aa99c81bd
 AUX chromium-revert-jpeg-swizzle-r2.patch 2233 RMD160 b9347dd8a95b6972621779d97f27b35f6dba57fd SHA1 7b1d39243de3ae30dd99cf9b640f4a6ae0118ed6 SHA256 d99162aa6bae562f116a42347254bbec3752464f0a3e4d8675e2b287b2a838a2
 AUX chromium-selinux-r0.patch 411 RMD160 76227dd5270a2bd49dd099709db6d43dbd5d59b3 SHA1 acf0b7b14a963447d5ab716927135ab7a1876580 SHA256 f6ea97bbbc36579a74790338aebea8d090a0729a3f3cfc36086338007a4f9545
 AUX chromium-svnversion-r0.patch 480 RMD160 0f6d600cb813427ca1848f7ac10547e84c169465 SHA1 605bfaa4c9cc6c908591a4bd84550756a7a6c2ae SHA256 f265a9ea756810f623289523d58b0c58b4ea1a001a693321b9cec4810fdc46de
@@ -21,23 +22,23 @@ AUX dot-gclient 253 RMD160 a768770d8e6f5b73395451277beea1cc9240fc3a SHA1 3eaf207
 DIST chromium-19.0.1084.52.tar.bz2 184040348 RMD160 1393cb8c423eb7af14d42df40f2bf8afcf4860aa SHA1 e27acc2cdef9f47b0d8a136b3c5867d86e9317b6 SHA256 e725d4aa7608c9975b8989188d85d38846956db2f480a1a217bcab06419dab72
 DIST chromium-19.0.1084.56.tar.bz2 184089352 RMD160 316b908ecdb55714ba544b99f6ece98bfeae5465 SHA1 9a0521fe26fd54f0942ceaef0a767e7854461e13 SHA256 c33a2cac35a3dd6ef359d8dee47dc405732f9e0865c82cffb876f5d936ec1418
 DIST chromium-20.0.1132.27.tar.bz2 185120793 RMD160 aea3c02993878bc2b49ef828fee29d3c50b9ecf2 SHA1 7e5838cc808a5299650d7b2f5a768279439e83fa SHA256 ff9813a6cc8a623eba8d104766d828c1ad8e91ed6496888d5ca0a8b4836b3453
-DIST chromium-21.0.1155.2.tar.bz2 191277883 RMD160 cb009d4aed04f1aeb0e1c261211a85b5f79ecbbf SHA1 7858fb6f6d2010aec30e2d6dea43b50d92ec3d6f SHA256 1624d617b9d3eeeb6a302d85db23dd43d611d0ca558a48a1156119390953838d
 DIST chromium-21.0.1163.0.tar.bz2 192046119 RMD160 59091e5c8ff30210d1cf60196787231058199322 SHA1 8f99f6de0b28a28c53b96391c98093f35724ca2c SHA256 9fa17f1ab2b6fba1039897e23c6bf2e33c567a846cb3a6c29f66bd6a485c4bb7
+DIST chromium-21.0.1171.0.tar.bz2 190680094 RMD160 e1a4dc926b5a34526a30447391dd971fcb700024 SHA1 c91c9139c3d6a9eab4ebb90faf875192f3959b84 SHA256 3fd9b2d8895750a4435a585b9c2dc7d34b583c6470ba67eb6ea6c2579f126377
 EBUILD chromium-19.0.1084.52.ebuild 13752 RMD160 79c5fe77b5de2bce24a561026bac90d86a45a2ba SHA1 eb97ed369b296dc1370c45227c155b433c0b4658 SHA256 995e3f107ac808952d1d850e9eec1d8b63c47073e6a1debf865111d8721a721c
 EBUILD chromium-19.0.1084.56-r1.ebuild 13856 RMD160 e4f09405242759b1a903951f1d0758c1aa9e35b5 SHA1 b1f8943af6d33a67451ed6e900c84c78d790c9a2 SHA256 2001f6bc1273226ac82b5b5a139ce5c23a75ebe4c4e47071efe744937fcb0b47
 EBUILD chromium-19.0.1084.56.ebuild 13754 RMD160 0dcb9219459c9ed8db5c69ed3dff29480b88324c SHA1 4b24ac02e3b8d8db530cc519c227a320fec99637 SHA256 ca483b67b11cac3ec1da82954b8437db65ed053ea76c2f6f4b1c26cded0965fd
 EBUILD chromium-20.0.1132.27-r1.ebuild 13707 RMD160 c4dc720c52e70de66a4abdef5cb8f53bcf98c12c SHA1 bfcc108cae0b5a10bbfff1dd2b171967028cac17 SHA256 91d896097ed14084ad197fdaf9378bed87a62d3211665ebb9c11b95c9253bd0c
 EBUILD chromium-20.0.1132.27.ebuild 13605 RMD160 4c0c26cf0505d2b23e67f70e4c830c4dea0f122a SHA1 32632777467bad71d151103acb0795bdb4e781a0 SHA256 ad865e2c709baf8a0fd3b186f7454c0cbbac530db04484c7a8488c26e3ee9c92
-EBUILD chromium-21.0.1155.2.ebuild 13636 RMD160 a095f768fd290243414466d4b900c734380ba2ba SHA1 3d9ffaed95ed917d0889128c2a9cb76c03afdb1d SHA256 fa6f40ff25e9067c029414ca52d5161054d6ca00ebaf4c731932044f77187d4c
 EBUILD chromium-21.0.1163.0.ebuild 13636 RMD160 7fb78faa7520acc65401a6e15a1b63f2bc63e83a SHA1 2d670ea8eef8d82920b4dac3e89488bfd47108c0 SHA256 984379fd59705c75e888dbb65892571185bf0b682a6b6190055e671a9c6ccdcc
-EBUILD chromium-9999-r1.ebuild 15217 RMD160 a593fa6c56feeb298714fd112e48a952435eb2aa SHA1 42bd9d3147a8cc4ebc2e2a09941be25581e14c98 SHA256 296abb38fbc6c8b66d9b27163f4032aa51631ea4b36d5faec04d4f08a4bb934e
-MISC ChangeLog 26164 RMD160 2183d8ca843d0b3b77f79377c1e089f21f65b5a5 SHA1 288e8d14108c4ee607609000a8890e251d6bec25 SHA256 6f1c035c9fad403f746379abbd3492506a1ea0f91adff7b02f36aeec61e31f9e
+EBUILD chromium-21.0.1171.0.ebuild 13752 RMD160 d0f5f1c9b0f1e87070f879b01dd402a096d1490a SHA1 96fa1f1a462d37940a6e2f9a85416bb0d7af0622 SHA256 b9abab5667835933ef2900f7c4ca0c891dbad9c2cd910a6510b321a2d5ca4965
+EBUILD chromium-9999-r1.ebuild 15303 RMD160 f25fa5cedba0b953c7484106498483128bb87243 SHA1 47884059a5a1a01bd09c6fa605c5c6746808e2ed SHA256 ac9919093dbf89631944fc12c64d90c107297ded9c7b91f0ab561a0e7a4f71ca
+MISC ChangeLog 26430 RMD160 6aa241903b82baa5614117b8546dad4aaa72403c SHA1 65d5e139b959cc20810698d49de468c2ae9d450f SHA256 fdf09fbf32ee01b11c40c356ee448dd0dfeb4ddb3bfd1b9e9e465f952c515766
 MISC ChangeLog-2011 114031 RMD160 819d2187b876e03ba1a5f23369eca56e554bcfe6 SHA1 c449259648a4f2633b8812e7761e8cdeaea7f948 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54
 MISC metadata.xml 267 RMD160 3a166415fec415d539c1b7c32ed40b188488b9fb SHA1 5c3d71a9cea27175cbe8c98369b42b79c8643c6c SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk/TNDsACgkQuUQtlDBCeQK8nACfVPRd+L9/bZ4W1hWnuhFOCLso
-ZAIAniTjdjknZxR/QTqThH4PCQPBR+/1
-=9/XR
+iEYEAREKAAYFAk/XSl4ACgkQuUQtlDBCeQLGBACeNKdlfqlp9MQogcHAQcKZCVnd
+ZmIAn0Hsn7cTfrHK0A5Ot2hJqG2Der/H
+=e2OA
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-21.0.1155.2.ebuild b/www-client/chromium/chromium-21.0.1171.0.ebuild
index 8caaf49fcaf4..c890bcb35c91 100644
--- a/www-client/chromium/chromium-21.0.1155.2.ebuild
+++ b/www-client/chromium/chromium-21.0.1171.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-21.0.1155.2.ebuild,v 1.3 2012/06/09 10:26:17 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-21.0.1171.0.ebuild,v 1.1 2012/06/12 13:53:14 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -41,7 +41,6 @@ RDEPEND="app-arch/bzip2
 	media-libs/flac
 	>=media-libs/libjpeg-turbo-1.2.0-r1
 	media-libs/libpng
-	>=media-libs/libwebp-0.1.3
 	media-libs/speex
 	pulseaudio? ( media-sound/pulseaudio )
 	sys-fs/udev
@@ -110,8 +109,8 @@ src_prepare() {
 	sed -i '1i#define OF(x) x' \
 		third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.h || die
 
-	# Unbundle expat, bug #384773.
-	epatch "${FILESDIR}/${PN}-expat-r0.patch"
+	# Fix build without NaCl glibc toolchain.
+	epatch "${FILESDIR}/${PN}-ppapi-r0.patch"
 
 	epatch_user
 
@@ -136,6 +135,7 @@ src_prepare() {
 		\! -path 'third_party/libsrtp/*' \
 		\! -path 'third_party/libusb/libusb.h' \
 		\! -path 'third_party/libvpx/*' \
+		\! -path 'third_party/libwebp/*' \
 		\! -path 'third_party/libxml/chromium/*' \
 		\! -path 'third_party/libyuv/*' \
 		\! -path 'third_party/lss/*' \
@@ -204,6 +204,8 @@ src_configure() {
 	# TODO: use_system_ssl (http://crbug.com/58087).
 	# TODO: use_system_sqlite (http://crbug.com/22208).
 	# TODO: use_system_vpx
+	# TODO: use_system_webp (https://chromiumcodereview.appspot.com/10496016
+	#       needs to become part of webp release)
 	myconf+="
 		-Duse_system_bzip2=1
 		-Duse_system_flac=1
@@ -212,7 +214,6 @@ src_configure() {
 		-Duse_system_libjpeg=1
 		-Duse_system_libpng=1
 		-Duse_system_libusb=1
-		-Duse_system_libwebp=1
 		-Duse_system_libxml=1
 		-Duse_system_speex=1
 		-Duse_system_v8=1
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index a5f26223eea5..20a65d02b9e6 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.119 2012/06/09 10:26:17 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.120 2012/06/12 13:53:14 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -29,6 +29,7 @@ RDEPEND="app-arch/bzip2
 	>=dev-lang/v8-3.10.2.1
 	dev-libs/dbus-glib
 	dev-libs/elfutils
+	dev-libs/expat
 	>=dev-libs/icu-49.1.1-r1
 	>=dev-libs/libevent-1.4.13
 	dev-libs/libxml2[icu]
@@ -40,7 +41,6 @@ RDEPEND="app-arch/bzip2
 	media-libs/flac
 	>=media-libs/libjpeg-turbo-1.2.0-r1
 	media-libs/libpng
-	>=media-libs/libwebp-0.1.3
 	media-libs/speex
 	pulseaudio? ( media-sound/pulseaudio )
 	sys-fs/udev
@@ -173,7 +173,6 @@ src_prepare() {
 		\! -path 'third_party/angle/*' \
 		\! -path 'third_party/cacheinvalidation/*' \
 		\! -path 'third_party/cld/*' \
-		\! -path 'third_party/expat/*' \
 		\! -path 'third_party/ffmpeg/*' \
 		\! -path 'third_party/flac/flac.h' \
 		\! -path 'third_party/gpsd/*' \
@@ -189,6 +188,7 @@ src_prepare() {
 		\! -path 'third_party/libsrtp/*' \
 		\! -path 'third_party/libusb/libusb.h' \
 		\! -path 'third_party/libvpx/*' \
+		\! -path 'third_party/libwebp/*' \
 		\! -path 'third_party/libxml/chromium/*' \
 		\! -path 'third_party/libyuv/*' \
 		\! -path 'third_party/lss/*' \
@@ -257,6 +257,8 @@ src_configure() {
 	# TODO: use_system_ssl (http://crbug.com/58087).
 	# TODO: use_system_sqlite (http://crbug.com/22208).
 	# TODO: use_system_vpx
+	# TODO: use_system_webp (https://chromiumcodereview.appspot.com/10496016
+	#       needs to become part of webp release)
 	myconf+="
 		-Duse_system_bzip2=1
 		-Duse_system_flac=1
@@ -265,7 +267,6 @@ src_configure() {
 		-Duse_system_libjpeg=1
 		-Duse_system_libpng=1
 		-Duse_system_libusb=1
-		-Duse_system_libwebp=1
 		-Duse_system_libxml=1
 		-Duse_system_speex=1
 		-Duse_system_v8=1
diff --git a/www-client/chromium/files/chromium-ppapi-r0.patch b/www-client/chromium/files/chromium-ppapi-r0.patch
new file mode 100644
index 000000000000..fb7e160c29c9
--- /dev/null
+++ b/www-client/chromium/files/chromium-ppapi-r0.patch
@@ -0,0 +1,11 @@
+--- ppapi/ppapi_untrusted.gyp.orig	2012-06-12 10:20:16.000000000 +0200
++++ ppapi/ppapi_untrusted.gyp	2012-06-12 10:20:52.000000000 +0200
+@@ -80,7 +80,7 @@
+         ],
+       },
+       'conditions': [
+-        ['target_arch!="arm"', {
++        ['target_arch!="arm" and disable_glibc==0', {
+           'variables': {
+             'build_glibc': 1,
+             # NOTE: Use /lib, not /lib64 here; it is a symbolic link which