Version bump for dev channel release. Link with Kerberos if requested instead of dlopen. Remove old.

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

5 files changed, 65 insertions, 21 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index f61142787a5b..91872510d63d 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,14 @@
 # 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.422 2011/08/26 20:56:05 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.423 2011/08/30 18:49:22 phajdan.jr Exp $
+
+*chromium-15.0.865.0 (30 Aug 2011)
+
+  30 Aug 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/chromium-kerberos-r1.patch, -chromium-15.0.854.0.ebuild,
+  +chromium-15.0.865.0.ebuild, chromium-9999-r1.ebuild:
+  Version bump for dev channel release. Link with Kerberos if requested instead
+  of dlopen. Remove old.
 
 *chromium-15.0.861.0 (26 Aug 2011)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 9c651b1070fe..177d33b6dcf1 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -7,6 +7,7 @@ AUX chromium-ffmpeg-build-r0.patch 774 RMD160 a11ebd15927195fb047a366b1f9ab412a3
 AUX chromium-glibc-2.14-r0.patch 1508 RMD160 6f8e88858cb02b825e512d1f030e681dbe1699b3 SHA1 c70e6dc5379f934ce726aa9ee46cd9db1ffefbbb SHA256 c434606b1599a47d8905d33c22dd65dd950d322108860572c55532189434a8ee
 AUX chromium-icu-compatibility-r0.patch 1659 RMD160 5d1fcc18d27b96f0c1b4f14b24dd8ab40ce917ca SHA1 517155769d0f421a4a81bffbcac39d17fa099956 SHA256 f70d99472d56e0aa7398b5638412d440d22943eb2c5962957f973e90992fdc99
 AUX chromium-kerberos-r0.patch 756 RMD160 24531a656e2a745d6961f806b62324d076628a8e SHA1 d66ea3176cc5a9ea1201950dd7797b077313ec03 SHA256 7e911e82ba80d94bcefc413dff82b076d6f0215abe883bd1f4a9cc71fd223b13
+AUX chromium-kerberos-r1.patch 905 RMD160 cb57cfe2db38bcba60bf83f43f15ca1d9a59b1fa SHA1 c552daea570cf3e3c29f762d383fb56ef6547e8f SHA256 2582f7f08f41b6f3c3ff4a0f74f372366eec767ac2701cb23c53b1a3e1806ed9
 AUX chromium-launcher-r1.sh 680 RMD160 17fdc3576819c41d9320fab4b2dde3b8dc3c251b SHA1 5be5d25be14906458eb93cd7275c47f73c55fce4 SHA256 fa9cd53ee929ac77a52abc09eb65bb605b72b384533ba52fb90a905c72c3c208
 AUX chromium-launcher-r2.sh 940 RMD160 7a64e597998a8f95a7e3d1c26377842ff8106f89 SHA1 9630a36af707a810cbd646f3bac5deba984439f6 SHA256 842e121bbfa33513ca964744f0ba8401401946e672cd6a0a95bc80a28212e87e
 AUX chromium-libgcrypt-r0.patch 436 RMD160 855ecc89bd61f95378dc5aa5726b48cac7ede92c SHA1 3346e667a6581f7f62020ebc16fbf608c3a47cb6 SHA256 a81c598f544278a5638f3707db8a2fab85173e93b9a3ff097648babe58b665b0
@@ -23,22 +24,20 @@ AUX nacl.gypi 98 RMD160 fa4806fbc8c2e19763c1905a3bc431022b247825 SHA1 df4cee39e1
 DIST chromium-13.0.782.215.tar.bz2 155299563 RMD160 c77f45f3740414d1debd7404d4761ad738277338 SHA1 00664c5682e7e8e448f447096797ab78e6152ebb SHA256 2108a5f6c9bbcb2d5e3a6f3f1cac1362f7e3161025ceffafd685942c50d60aa5
 DIST chromium-14.0.835.109.tar.bz2 160757799 RMD160 94c6e8da49b6fdc12a0e3ba44459504c78275811 SHA1 0877cde3976a1de9c5682a8e0c1da9f3f4e5b61e SHA256 9dfc8cc2f4b14bfe2e0ca0e4819643711e54c6ed63aa23542fd2818374f775d9
 DIST chromium-14.0.835.94.tar.bz2 160412115 RMD160 71cad024796accb58f1dac3a1eac0f179a983873 SHA1 78a597bfe053c1d3e5fe1c5b2784d8275812cc64 SHA256 2bedef7518e5e209dcdc640e4b4a993a78aeade426356901cbef2caa9fa5ecbb
-DIST chromium-15.0.854.0.tar.bz2 155858758 RMD160 06635f96cf4a67e23f25efef814380a2f59020b1 SHA1 6e20f291423a36cfb2430cf71ef069add348640f SHA256 f1bb97f6ad21847110b021c4224c06fcc550ce6a765fcd463d845760af7582c0
 DIST chromium-15.0.861.0.tar.bz2 155429954 RMD160 208c36ba1da31e742bc50c44d9844669ca5fcdec SHA1 b4834135992bc14579eec7a4d3a7851479c4d3c8 SHA256 1809d35b778eceda1c6c14353ad7d7d978f6f9aaa3face428a59c3056ee95126
+DIST chromium-15.0.865.0.tar.bz2 150072791 RMD160 07208ec0421669b8e3de91e6693304408854b656 SHA1 8c84218308fd886c4f338af47f5ffe0347651cdb SHA256 d4679e26639422d3f9aa73db0e04f8a86f68c63a6793b7e79e97143f38027923
 EBUILD chromium-13.0.782.215.ebuild 13227 RMD160 12c182f7a8075fd11f178e3453554c2ec622531a SHA1 e8b346b5fb66361d46226192bdbdffdc601498f5 SHA256 254756e4d874889efb4d46d712dd821d28fb816b117cf574031fa3ebd3dc66a0
 EBUILD chromium-14.0.835.109.ebuild 13182 RMD160 65d12c9dd3950c39f501113806ff26a2a2390588 SHA1 7eef8f5ef61eeecad437b5f9fb47d09235bcfdfc SHA256 3c12442575cca76611a17900159865b18797dc949254f2bcbc5a15b1a1888c4d
 EBUILD chromium-14.0.835.94.ebuild 13181 RMD160 96edd70db1ae17b49992bc77bb428e001e477274 SHA1 798675014fdb734a4d8aaf01b7b1dee904798765 SHA256 282f3fa36035387afafec19e0ef11c326dbe5a93e4a2bae2c513133810cebd73
-EBUILD chromium-15.0.854.0.ebuild 13155 RMD160 f319decfbcaa75e7a3c635a578bd0f6b430addd6 SHA1 7595c33c8ba6815846fbedacfd38eb71a89b5667 SHA256 30212a9b629bbb05004c0a6896176a64284a49906e1a3106f34cba47d1a324c2
 EBUILD chromium-15.0.861.0.ebuild 13774 RMD160 988860d0a6d6b2506402ace556ecce9fc6fadaee SHA1 7a7dfcb1b774616936d19eb45de940b5eafcec39 SHA256 d03f44c0c388c87fccc0fc894c9efe1cdbe8ace6ebba86400762541d93a1825d
-EBUILD chromium-9999-r1.ebuild 15647 RMD160 68841a710b5057c09e9ac3721aade173a0d4793d SHA1 72c23e071e0fd6688db4042ca1144ecf428b58a0 SHA256 27d613c803e490b9312845b79375fb6d82a38286aef7b34f63bd4d96ce16c46a
-MISC ChangeLog 94367 RMD160 7597c860221641e5a6ec12689a8739d7da733874 SHA1 8aa4697d5897e58c8c4b0e19ea46701403aa5b07 SHA256 37daacf2a865333ba0bb99fed261e524bfa1294b225ef71428ab42dcb50f98cf
-MISC chromium-9999-r1.ebuild.orig 15178 RMD160 20e0b7b94effbc429d07129d7cc0a7a5efb78ac5 SHA1 799254ee747ab0de9bf08da6736ee1ee4a00ca74 SHA256 8eab76ae1c786f34670dc7418c89a68210cdb5011a8d8b63a50ec7fb4fc15f18
-MISC chromium-9999-r1.ebuild.rej 1667 RMD160 46a0bd6a1df534c553544d8db3846624c6ab9b69 SHA1 dd9f13a7c09aab29599a046ab3d07146671ab95d SHA256 633d6643c4c8cbd92d914329d0bc7095612fa53774d04b97c49b74f0c6aff817
+EBUILD chromium-15.0.865.0.ebuild 13673 RMD160 53a3db1ad759069195a6811c240b0af96299a36c SHA1 7dff3d16da781c9c445f7b09f96bf0ae0a64601d SHA256 3104f5dc400862cffee9a200bb474c7d63037cf3b7e981910b386b05f1d59a86
+EBUILD chromium-9999-r1.ebuild 15660 RMD160 b351c786b6acd376f95d7bca44d951c9682865d7 SHA1 c535349f0af0c5d78597c10ce309cfea39144154 SHA256 a00bda2bc5112bb847b5760483e62b9f605a21faede1a5c4ca4b0ab4c4208d73
+MISC ChangeLog 94686 RMD160 ce330ec14b63259793019b730ca20274eeff3889 SHA1 7a2d6d6c18c7a9b11bf6c201c38a609d9db775ed SHA256 3ed2eae4dd904d7b2b1e1b0b5a0f02881bcc125da6ce123807c3917c429f640a
 MISC metadata.xml 495 RMD160 91f2c4344cde85374523c8c16f5987ad0320b607 SHA1 5e97c7979fac0de374958532e38fcbca1191963b SHA256 375fb24d5d647728a58b3a7d0d552bf7d8eb5f26eef3c249dcf9a2dcb9e5bb37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk5YCHAACgkQuUQtlDBCeQJwQQCfSPG7NxKBpicHNUHUd4eszRUe
-+5IAniR+7RaMlIQ4Bx4r/aS86ml7eK2d
-=Uvfb
+iEYEAREKAAYFAk5dMMEACgkQuUQtlDBCeQIXMwCbBLmtw4Okq2YgN/abQshUheRc
+sgcAn2ZyMOUG1gCNI9P6ZY5YKwTMPDwj
+=59yP
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-15.0.854.0.ebuild b/www-client/chromium/chromium-15.0.865.0.ebuild
index c2b73765fa8f..96419a47a4ca 100644
--- a/www-client/chromium/chromium-15.0.854.0.ebuild
+++ b/www-client/chromium/chromium-15.0.865.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.854.0.ebuild,v 1.1 2011/08/17 23:32:49 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-15.0.865.0.ebuild,v 1.1 2011/08/30 18:49:22 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"
 
@@ -116,8 +116,10 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Fix build with system libevent, to be upstreamed.
-	epatch "${FILESDIR}/${PN}-system-libevent-r1.patch"
+	# Backport upstream fix for using system Kerberos.
+	epatch "${FILESDIR}/${PN}-kerberos-r1.patch"
+
+	cp "${FILESDIR}/nacl.gypi" chrome/ || die
 
 	# Remove most bundled libraries. Some are still needed.
 	find third_party -type f \! -iname '*.gyp*' \
@@ -134,11 +136,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 +154,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/*' \
@@ -199,7 +205,10 @@ src_configure() {
 		$(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 kerberos linux_link_kerberos)
+		$(gyp_use pulseaudio use_pulseaudio)"
 
 	# Enable sandbox.
 	myconf+="
@@ -245,6 +254,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 +295,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 e9c93d8aa24b..d6eaa151a7d0 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.45 2011/08/26 20:56:05 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.46 2011/08/30 18:49:22 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -225,13 +225,13 @@ 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 kerberos use_kerberos)
+		$(gyp_use kerberos linux_link_kerberos)
 		$(gyp_use pulseaudio use_pulseaudio)"
 
 	# Enable sandbox.
diff --git a/www-client/chromium/files/chromium-kerberos-r1.patch b/www-client/chromium/files/chromium-kerberos-r1.patch
new file mode 100644
index 000000000000..ebe6bb3c6a54
--- /dev/null
+++ b/www-client/chromium/files/chromium-kerberos-r1.patch
@@ -0,0 +1,21 @@
+Index: net/http/http_auth_gssapi_posix.cc
+diff --git a/net/http/http_auth_gssapi_posix.cc b/net/http/http_auth_gssapi_posix.cc
+index cc27e70b18af1375bdb7fcd28d83fb3339a122cf..37b28df8f845cd2a597b887377bd0703f93c52c1 100644
+--- a/net/http/http_auth_gssapi_posix.cc
++++ b/net/http/http_auth_gssapi_posix.cc
+@@ -17,7 +17,6 @@
+ #include "net/base/net_errors.h"
+ #include "net/base/net_util.h"
+ 
+-#if defined(DLOPEN_KERBEROS)
+ // These are defined for the GSSAPI library:
+ // Paraphrasing the comments from gssapi.h:
+ // "The implementation must reserve static storage for a
+@@ -63,7 +62,6 @@ gss_OID GSS_C_NT_HOSTBASED_SERVICE_X = &GSS_C_NT_HOSTBASED_SERVICE_X_VAL;
+ gss_OID GSS_C_NT_HOSTBASED_SERVICE = &GSS_C_NT_HOSTBASED_SERVICE_VAL;
+ gss_OID GSS_C_NT_ANONYMOUS = &GSS_C_NT_ANONYMOUS_VAL;
+ gss_OID GSS_C_NT_EXPORT_NAME = &GSS_C_NT_EXPORT_NAME_VAL;
+-#endif  // defined(DLOPEN_KERBEROS)
+ 
+ namespace net {
+