Version bump for dev channel release. Added experimental support for ChromeDriver, bug #376147 by Judson and patches by chutzpath. Made support for PulseAudio optional, bug #377847 by octoploid. Fixed bug #379487 by Mike Gilbert and bug #380331 by Julien Sanchez. Removed old.

(Portage version: 2.1.10.3/cvs/Linux i686)

6 files changed, 90 insertions, 15 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 473db9962f73..f61142787a5b 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,17 @@
 # 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.421 2011/08/24 19:09:13 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.422 2011/08/26 20:56:05 phajdan.jr Exp $
+
+*chromium-15.0.861.0 (26 Aug 2011)
+
+  26 Aug 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/chromium-kerberos-r0.patch, -chromium-15.0.849.0.ebuild,
+  +chromium-15.0.861.0.ebuild, chromium-9999-r1.ebuild, +files/nacl.gypi,
+  metadata.xml:
+  Version bump for dev channel release. Added experimental support for
+  ChromeDriver, bug #376147 by Judson and patches by chutzpath. Made support
+  for PulseAudio optional, bug #377847 by octoploid. Fixed bug #379487 by Mike
+  Gilbert and bug #380331 by Julien Sanchez. Removed old.
 
 *chromium-14.0.835.109 (24 Aug 2011)
 
diff --git a/www-client/chromium/chromium-15.0.849.0.ebuild b/www-client/chromium/chromium-15.0.861.0.ebuild
index feaac1236e10..991d106aa9cd 100644
--- a/www-client/chromium/chromium-15.0.849.0.ebuild
+++ b/www-client/chromium/chromium-15.0.861.0.ebuild
@@ -1,6 +1,6 @@
 # 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-15.0.849.0.ebuild,v 1.1 2011/08/12 23:29:22 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-15.0.861.0.ebuild,v 1.1 2011/08/26 20:56:05 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ SRC_URI="http://build.chromium.org/official/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="cups gnome gnome-keyring kerberos"
+IUSE="chromedriver cups gnome gnome-keyring kerberos pulseaudio"
 
 # en_US is ommitted on purpose from the list below. It must always be available.
 LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr
@@ -40,6 +40,7 @@ RDEPEND="app-arch/bzip2
 	media-libs/libpng
 	>=media-libs/libwebp-0.1.2
 	media-libs/speex
+	pulseaudio? ( media-sound/pulseaudio )
 	cups? (
 		dev-libs/libgcrypt
 		>=net-print/cups-1.3.11
@@ -48,7 +49,8 @@ RDEPEND="app-arch/bzip2
 	x11-libs/gtk+:2
 	x11-libs/libXinerama
 	x11-libs/libXScrnSaver
-	x11-libs/libXtst"
+	x11-libs/libXtst
+	kerberos? ( virtual/krb5 )"
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	>=dev-util/gperf-3.0.3
@@ -59,10 +61,8 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-python/pyftpdlib
 		dev-python/simplejson
-		virtual/krb5
 	)"
 RDEPEND+="
-	kerberos? ( virtual/krb5 )
 	x11-misc/xdg-utils
 	virtual/ttf-fonts"
 
@@ -119,6 +119,11 @@ src_prepare() {
 	# Fix build with system libevent, to be upstreamed.
 	epatch "${FILESDIR}/${PN}-system-libevent-r1.patch"
 
+	# Backport upstream fix for using system Kerberos header.
+	epatch "${FILESDIR}/${PN}-kerberos-r0.patch"
+
+	cp "${FILESDIR}/nacl.gypi" chrome/ || die
+
 	# Remove most bundled libraries. Some are still needed.
 	find third_party -type f \! -iname '*.gyp*' \
 		\! -path 'third_party/WebKit/*' \
@@ -134,11 +139,13 @@ src_prepare() {
 		\! -path 'third_party/iccjpeg/*' \
 		\! -path 'third_party/launchpad_translations/*' \
 		\! -path 'third_party/leveldb/*' \
+		\! -path 'third_party/leveldatabase/*' \
 		\! -path 'third_party/libjingle/*' \
 		\! -path 'third_party/libphonenumber/*' \
 		\! -path 'third_party/libvpx/*' \
 		\! -path 'third_party/mesa/*' \
 		\! -path 'third_party/modp_b64/*' \
+		\! -path 'third_party/mongoose/*' \
 		\! -path 'third_party/npapi/*' \
 		\! -path 'third_party/openmax/*' \
 		\! -path 'third_party/ots/*' \
@@ -150,6 +157,8 @@ src_prepare() {
 		\! -path 'third_party/tcmalloc/*' \
 		\! -path 'third_party/tlslite/*' \
 		\! -path 'third_party/undoview/*' \
+		\! -path 'third_party/v8-i18n/*' \
+		\! -path 'third_party/webdriver/*' \
 		\! -path 'third_party/webgl_conformance/*' \
 		\! -path 'third_party/webrtc/*' \
 		\! -path 'third_party/yasm/*' \
@@ -195,11 +204,14 @@ src_configure() {
 		-Duse_system_zlib=1"
 
 	# Optional dependencies.
+	# TODO: linux_link_kerberos
 	myconf+="
 		$(gyp_use cups use_cups)
 		$(gyp_use gnome use_gconf)
 		$(gyp_use gnome-keyring use_gnome_keyring)
-		$(gyp_use gnome-keyring linux_link_gnome_keyring)"
+		$(gyp_use gnome-keyring linux_link_gnome_keyring)
+		$(gyp_use kerberos use_kerberos)
+		$(gyp_use pulseaudio use_pulseaudio)"
 
 	# Enable sandbox.
 	myconf+="
@@ -245,6 +257,9 @@ src_configure() {
 src_compile() {
 	emake chrome chrome_sandbox BUILDTYPE=Release V=1 || die
 	pax-mark m out/Release/chrome
+	if use chromedriver; then
+		emake chromedriver BUILDTYPE=Release V=1 || die
+	fi
 	if use test; then
 		emake {base,crypto,googleurl,net}_unittests BUILDTYPE=Release V=1 || die
 		pax-mark m out/Release/{base,crypto,googleurl,net}_unittests
@@ -283,10 +298,14 @@ src_test() {
 
 src_install() {
 	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
+	doexe out/Release/chrome || die
 	doexe out/Release/chrome_sandbox || die
 	fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
 
+	if use chromedriver; then
+		doexe out/Release/chromedriver || die
+	fi
+
 	# Install Native Client files on platforms that support it.
 	# insinto "${CHROMIUM_HOME}"
 	# case "$(tc-arch)" in
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 47dfd3c42512..e9c93d8aa24b 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-9999-r1.ebuild,v 1.44 2011/08/12 23:29:22 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.45 2011/08/26 20:56:05 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -16,7 +16,7 @@ ESVN_REPO_URI="http://src.chromium.org/svn/trunk/tools/depot_tools"
 LICENSE="BSD"
 SLOT="live"
 KEYWORDS=""
-IUSE="cups gnome gnome-keyring kerberos"
+IUSE="chromedriver cups gnome gnome-keyring kerberos pulseaudio"
 
 # en_US is ommitted on purpose from the list below. It must always be available.
 LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr
@@ -41,6 +41,7 @@ RDEPEND="app-arch/bzip2
 	media-libs/libpng
 	>=media-libs/libwebp-0.1.2
 	media-libs/speex
+	pulseaudio? ( media-sound/pulseaudio )
 	cups? (
 		dev-libs/libgcrypt
 		>=net-print/cups-1.3.11
@@ -49,7 +50,8 @@ RDEPEND="app-arch/bzip2
 	x11-libs/gtk+:2
 	x11-libs/libXinerama
 	x11-libs/libXScrnSaver
-	x11-libs/libXtst"
+	x11-libs/libXtst
+	kerberos? ( virtual/krb5 )"
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	>=dev-util/gperf-3.0.3
@@ -60,11 +62,9 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-python/pyftpdlib
 		dev-python/simplejson
-		virtual/krb5
 	)"
 RDEPEND+="
 	!=www-client/chromium-9999
-	kerberos? ( virtual/krb5 )
 	x11-misc/xdg-utils
 	virtual/ttf-fonts"
 
@@ -160,11 +160,13 @@ src_prepare() {
 		\! -path 'third_party/iccjpeg/*' \
 		\! -path 'third_party/launchpad_translations/*' \
 		\! -path 'third_party/leveldb/*' \
+		\! -path 'third_party/leveldatabase/*' \
 		\! -path 'third_party/libjingle/*' \
 		\! -path 'third_party/libphonenumber/*' \
 		\! -path 'third_party/libvpx/*' \
 		\! -path 'third_party/mesa/*' \
 		\! -path 'third_party/modp_b64/*' \
+		\! -path 'third_party/mongoose/*' \
 		\! -path 'third_party/npapi/*' \
 		\! -path 'third_party/openmax/*' \
 		\! -path 'third_party/ots/*' \
@@ -176,6 +178,8 @@ src_prepare() {
 		\! -path 'third_party/tcmalloc/*' \
 		\! -path 'third_party/tlslite/*' \
 		\! -path 'third_party/undoview/*' \
+		\! -path 'third_party/v8-i18n/*' \
+		\! -path 'third_party/webdriver/*' \
 		\! -path 'third_party/webgl_conformance/*' \
 		\! -path 'third_party/webrtc/*' \
 		\! -path 'third_party/yasm/*' \
@@ -221,11 +225,14 @@ src_configure() {
 		-Duse_system_zlib=1"
 
 	# Optional dependencies.
+	# TODO: linux_link_kerberos
 	myconf+="
 		$(gyp_use cups use_cups)
 		$(gyp_use gnome use_gconf)
 		$(gyp_use gnome-keyring use_gnome_keyring)
-		$(gyp_use gnome-keyring linux_link_gnome_keyring)"
+		$(gyp_use gnome-keyring linux_link_gnome_keyring)
+		$(gyp_use kerberos use_kerberos)
+		$(gyp_use pulseaudio use_pulseaudio)"
 
 	# Enable sandbox.
 	myconf+="
@@ -271,6 +278,9 @@ src_configure() {
 src_compile() {
 	emake chrome chrome_sandbox BUILDTYPE=Release V=1 || die
 	pax-mark m out/Release/chrome
+	if use chromedriver; then
+		emake chromedriver BUILDTYPE=Release V=1 || die
+	fi
 	if use test; then
 		emake {base,crypto,googleurl,net}_unittests BUILDTYPE=Release V=1 || die
 		pax-mark m out/Release/{base,crypto,googleurl,net}_unittests
@@ -309,10 +319,14 @@ src_test() {
 
 src_install() {
 	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
+	doexe out/Release/chrome || die
 	doexe out/Release/chrome_sandbox || die
 	fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
 
+	if use chromedriver; then
+		doexe out/Release/chromedriver || die
+	fi
+
 	# Install Native Client files on platforms that support it.
 	# insinto "${CHROMIUM_HOME}"
 	# case "$(tc-arch)" in
diff --git a/www-client/chromium/files/chromium-kerberos-r0.patch b/www-client/chromium/files/chromium-kerberos-r0.patch
new file mode 100644
index 000000000000..b38748b1b74d
--- /dev/null
+++ b/www-client/chromium/files/chromium-kerberos-r0.patch
@@ -0,0 +1,18 @@
+Index: net/http/http_auth.cc
+diff --git a/net/http/http_auth.cc b/net/http/http_auth.cc
+index 23e26637f95242fab9b8858776c8135163fa8ffc..2e42b064a4fd707a087fa31dc327ce6c8febe706 100644
+--- a/net/http/http_auth.cc
++++ b/net/http/http_auth.cc
+@@ -9,10 +9,8 @@
+ #include "base/basictypes.h"
+ #include "base/string_util.h"
+ #include "net/base/net_errors.h"
+-#include "net/http/http_auth_handler_basic.h"
+-#include "net/http/http_auth_handler_digest.h"
+-#include "net/http/http_auth_handler_negotiate.h"
+-#include "net/http/http_auth_handler_ntlm.h"
++#include "net/http/http_auth_handler.h"
++#include "net/http/http_auth_handler_factory.h"
+ #include "net/http/http_request_headers.h"
+ #include "net/http/http_response_headers.h"
+ #include "net/http/http_util.h"
diff --git a/www-client/chromium/files/nacl.gypi b/www-client/chromium/files/nacl.gypi
new file mode 100644
index 000000000000..05638d6bfc61
--- /dev/null
+++ b/www-client/chromium/files/nacl.gypi
@@ -0,0 +1,8 @@
+{
+  'targets': [
+    {
+      'target_name': 'nacl',
+      'type': 'static_library',
+    },
+  ],
+}
diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml
index 47002a437f00..fd83d1cc69c2 100644
--- a/www-client/chromium/metadata.xml
+++ b/www-client/chromium/metadata.xml
@@ -3,4 +3,9 @@
 <pkgmetadata>
 	<herd>chromium</herd>
 	<longdescription>Chromium is the open-source web browser project behind Google Chrome</longdescription>
+	<use>
+		<flag name="chromedriver">Also build and install ChromeDriver, a tool that
+		can control the browser using automation proxy framework. This is mostly
+		intended for automated testing of web applications.</flag>
+	</use>
 </pkgmetadata>