Version bump for dev channel release. Remove old.

(Portage version: 2.1.10.49/cvs/Linux i686)

4 files changed, 30 insertions, 10 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/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