Dev channel bump - aura is no longer optional. Remove old.

(Portage version: 2.2.8-r1/cvs/Linux i686, signed Manifest commit with key 0x4F1A2555EA71991D!)

2 files changed, 20 insertions, 15 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 65a028bc7030..4d275855739d 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1047 2014/03/21 23:23:30 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1048 2014/03/30 08:31:12 phajdan.jr Exp $
+
+*chromium-35.0.1912.2 (30 Mar 2014)
+
+  30 Mar 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +chromium-35.0.1912.2.ebuild, -chromium-35.0.1870.2.ebuild:
+  Dev channel bump - aura is no longer optional. Remove old.
 
 *chromium-34.0.1847.76 (21 Mar 2014)
 
diff --git a/www-client/chromium/chromium-35.0.1870.2.ebuild b/www-client/chromium/chromium-35.0.1912.2.ebuild
index e283a7f3b86a..b476d2d06e7e 100644
--- a/www-client/chromium/chromium-35.0.1870.2.ebuild
+++ b/www-client/chromium/chromium-35.0.1912.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-35.0.1870.2.ebuild,v 1.2 2014/03/18 16:29:13 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-35.0.1912.2.ebuild,v 1.1 2014/03/30 08:31:12 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -20,7 +20,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+aura bindist cups gnome gnome-keyring kerberos neon pulseaudio selinux +tcmalloc"
+IUSE="bindist cups gnome gnome-keyring kerberos neon pulseaudio selinux +tcmalloc"
 
 # Native Client binaries are compiled with different set of flags, bug #452066.
 QA_FLAGS_IGNORED=".*\.nexe"
@@ -53,7 +53,6 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
 	>=media-libs/libjpeg-turbo-1.2.0-r1:=
 	media-libs/libpng:0=
 	>=media-libs/libwebp-0.4.0:=
-	media-libs/opus:=
 	media-libs/speex:=
 	pulseaudio? ( media-sound/pulseaudio:= )
 	sys-apps/dbus:=
@@ -93,15 +92,11 @@ RDEPEND+="
 # Python dependencies. The DEPEND part needs to be kept in sync
 # with python_check_deps.
 DEPEND+=" $(python_gen_any_dep '
-	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
-	dev-python/ply[${PYTHON_USEDEP}]
 	dev-python/simplejson[${PYTHON_USEDEP}]
 	test? ( dev-python/pyftpdlib[${PYTHON_USEDEP}] )
 ')"
 python_check_deps() {
-	has_version ">=dev-python/jinja-2.7[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/simplejson[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/simplejson[${PYTHON_USEDEP}]" && \
 		{ ! use test || has_version "dev-python/pyftpdlib[${PYTHON_USEDEP}]"; }
 }
 
@@ -162,10 +157,7 @@ src_prepare() {
 	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
 	# fi
 
-	epatch "${FILESDIR}/${PN}-system-jinja-r5.patch"
-	epatch "${FILESDIR}/${PN}-gn-r2.patch"
-	epatch "${FILESDIR}/${PN}-cups-r0.patch"
-	epatch "${FILESDIR}/${PN}-arm-r0.patch"
+	epatch "${FILESDIR}/${PN}-system-zlib-r0.patch"
 
 	epatch_user
 
@@ -191,11 +183,13 @@ src_prepare() {
 		'third_party/cacheinvalidation' \
 		'third_party/cld' \
 		'third_party/cros_system_api' \
+		'third_party/dom_distiller_js' \
 		'third_party/ffmpeg' \
 		'third_party/flot' \
 		'third_party/hunspell' \
 		'third_party/iccjpeg' \
 		'third_party/icu' \
+		'third_party/jinja2' \
 		'third_party/jstemplate' \
 		'third_party/khronos' \
 		'third_party/leveldatabase' \
@@ -211,13 +205,16 @@ src_prepare() {
 		'third_party/libyuv' \
 		'third_party/lss' \
 		'third_party/lzma_sdk' \
+		'third_party/markupsafe' \
 		'third_party/mesa' \
 		'third_party/modp_b64' \
 		'third_party/mt19937ar' \
 		'third_party/npapi' \
 		'third_party/nss.isolate' \
+		'third_party/opus' \
 		'third_party/ots' \
 		'third_party/polymer' \
+		'third_party/ply' \
 		'third_party/protobuf' \
 		'third_party/pywebsocket' \
 		'third_party/qcms' \
@@ -271,6 +268,7 @@ src_configure() {
 	# TODO: use_system_libsrtp (bug #459932).
 	# TODO: use_system_libvpx (http://crbug.com/347823).
 	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
 	# TODO: use_system_protobuf (bug #503084).
 	# TODO: use_system_ssl (http://crbug.com/58087).
 	# TODO: use_system_sqlite (http://crbug.com/22208).
@@ -288,7 +286,6 @@ src_configure() {
 		-Duse_system_minizip=1
 		-Duse_system_nspr=1
 		-Duse_system_openssl=1
-		-Duse_system_opus=1
 		-Duse_system_re2=1
 		-Duse_system_snappy=1
 		-Duse_system_speex=1
@@ -304,7 +301,6 @@ src_configure() {
 	# Optional dependencies.
 	# TODO: linux_link_kerberos, bug #381289.
 	myconf+="
-		$(gyp_use aura)
 		$(gyp_use cups)
 		$(gyp_use gnome use_gconf)
 		$(gyp_use gnome-keyring use_gnome_keyring)
@@ -334,6 +330,9 @@ src_configure() {
 		-Dlinux_use_gold_binary=0
 		-Dlinux_use_gold_flags=0"
 
+	# TODO: enable mojo after fixing compile failures.
+	myconf+=" -Duse_mojo=0"
+
 	# Always support proprietary codecs.
 	myconf+=" -Dproprietary_codecs=1"