Also run net_unittests in src_test (known issues: bug #361885, bug #361939). Add optional dependency on Kerberos for HTTP authentication.

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

5 files changed, 60 insertions, 17 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 32d1318d71c0..dcc397f68aac 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
 # 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.325 2011/04/03 16:51:10 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.326 2011/04/05 08:38:50 phajdan.jr Exp $
+
+  05 Apr 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/chromium-gssapi-heimdal-r0.patch, chromium-12.0.712.0-r1.ebuild,
+  chromium-9999-r1.ebuild:
+  Also run net_unittests in src_test (known issues: bug #361885, bug
+  #361939). Add optional dependency on Kerberos for HTTP authentication.
 
 *chromium-12.0.712.0-r1 (03 Apr 2011)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index e6ba8743470c..07b87c1a7992 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -6,6 +6,7 @@ AUX chromium-ffmpeg-build-r0.patch 774 RMD160 a11ebd15927195fb047a366b1f9ab412a3
 AUX chromium-ffmpeg-build-r1.patch 414 RMD160 5b390dc0a031b9ece9853ea8e81ea15b21c531e7 SHA1 9bf55e668fc41dacd87e6619a460ecd11f2f1298 SHA256 a4184ff5e7d079b5f918cd84fd46b958313db55815c9acc26b9bb29658575f99
 AUX chromium-gecko-mediaplayer-r0.patch 590 RMD160 8b01e801ef4a8d3aaa842ab217929e71ebb70a87 SHA1 916ecd1c7a405fc12de579538c07c42cd9e84ecc SHA256 491cfaa353ad965a0cbfe2fc6370e4df5d1cd55398698b838996053f9e46f12c
 AUX chromium-gecko-mediaplayer-r1.patch 591 RMD160 fbfa62e79687fb1d3939d34a21f1b6d4ac4a7d0a SHA1 145d3e50933e14e9213002bebf4a4b2c8d39b177 SHA256 8d822835c1f3b39ce77ad920003bc509e7e1ef85f03b4123a71ac1a00224fce0
+AUX chromium-gssapi-heimdal-r0.patch 447 RMD160 baecbff953216d236efd3c99dfbc218fe6d550a0 SHA1 a222e56b900b48cd094f8385eeec7fd49b97dac3 SHA256 49b178866cd45ad82f2d95ec84c2ae21ebd6c5993175561bc1695b986d8b1c82
 AUX chromium-launcher-r1.sh 680 RMD160 17fdc3576819c41d9320fab4b2dde3b8dc3c251b SHA1 5be5d25be14906458eb93cd7275c47f73c55fce4 SHA256 fa9cd53ee929ac77a52abc09eb65bb605b72b384533ba52fb90a905c72c3c208
 AUX chromium-launcher.sh 648 RMD160 d9331083750789d5c514c0fa1843037337ac476a SHA1 015efb2faacfc000c23644323c56795acfb7bc7e SHA256 3ae91f5bee0107adf3511205a062465901c7daaa13e3758ae970a6da4f0fa12c
 AUX chromium-system-flac-r0.patch 453 RMD160 5313955501e3d9c985169f5ab45c9c8dae4e1099 SHA1 9c25e31570277b134540a77352ab0910e4a8cfeb SHA256 973e538be539b13b17d99f812ce1bfa6bfdd524d182e5186b89148fbafda175f
@@ -29,15 +30,15 @@ DIST chromium-12.0.712.0.tar.bz2 147124521 RMD160 cabf5f7d4a1bbbc681a224d3a4f952
 EBUILD chromium-10.0.648.204.ebuild 9720 RMD160 3f344edbdd48b74003e7858fd6a83c483351481f SHA1 ee17071c94234ab4ada870ea91e98e8d7cee889d SHA256 4c4a1b754fd7bf5d8436a244e74bdf5576ac1426d85aa7d2e1c5aa385755dc5b
 EBUILD chromium-11.0.696.25.ebuild 9666 RMD160 62009d2442f2eab7b68d51047a8306b5814e5364 SHA1 36725a7a1561f6c2ad8da81b80fa11ce05b79b89 SHA256 4f6f7a69195b589b0302c1dabeaeeea9a413bf25b90d8e3edc5a1d6bd18eb472
 EBUILD chromium-11.0.696.28.ebuild 9770 RMD160 7b4e2bd68893cb6666d44705981356070b76a3a3 SHA1 ca0d4d34d90beb9e42a327f08095f5a3cfc928bb SHA256 15b29a0bccfe7ec64f23efcc7e9352f1130e9bf017e8cf12a4c668c0d78d1a76
-EBUILD chromium-12.0.712.0-r1.ebuild 9955 RMD160 a4c4122d46b2ceb6ea4946fdc6681a04d5da7419 SHA1 7e888f7a48f06455a89d61bde62d823224966b1e SHA256 f7327fa32f9e5a04b7781766907f9e576dad962f76717b156261155f553527c5
+EBUILD chromium-12.0.712.0-r1.ebuild 10607 RMD160 da67031727a0ed9b3609d19427d4ad0d5669428c SHA1 ca74bb8462fc236d9981a7a2c06ee6cd70d809a4 SHA256 f9eaefb9f2d91fb57727089b969f4da5d80272e7c0d3173f9bb2319bbfe562c3
 EBUILD chromium-12.0.712.0.ebuild 9952 RMD160 e3208eac78423e0fab9e29cae99a486397a81ccc SHA1 170202d2ebe8cee14eda635dd55a33fb6adfe178 SHA256 e3d9fae15f0d28095c5cb848b1f5b837ac53688eb873ce1cef0434380f281ea8
-EBUILD chromium-9999-r1.ebuild 12766 RMD160 7ae809a7e2895510c8959caa885aa17aae2dc50a SHA1 5dea1dd567917fb134c40b59e5a9319ba6ca13f9 SHA256 a1868e554904de8002a37a6d1d5790e79bc6bbc566ebc1b3d5d18cb31c924595
-MISC ChangeLog 72279 RMD160 a3a4f6038d52d52a4271f0a986e5eeeaa7dd5291 SHA1 412f4cba9f17fc430aacfc65f9d210859b375650 SHA256 52a741bbd565c55f49006383badf3b1f59ec96ae33eff489a02fed6e47f3f4d1
+EBUILD chromium-9999-r1.ebuild 13423 RMD160 49cd9631e646960fbf901752644483cde95ca66c SHA1 f78870676b10a220b48319d74bdb38f3c380d95a SHA256 f0e72b914ddbc3a6bbec58928a229e32eb6d165e0ca5f798f02fa68cdd6623ac
+MISC ChangeLog 72578 RMD160 df7986c1177a2e26a608158cc3744dc9136aa76e SHA1 45058764ca05dba70584501301afaccffa5f6165 SHA256 b12fcfb5d719a6333aa3b38b53f8e879adcc83765ef2bcbc2403fa8c9cce40ab
 MISC metadata.xml 392 RMD160 5fbc2d4aaba9b5262830ad7201bbb58d13b49787 SHA1 7834b589940775fae16e006524e4cbe808ad5cc7 SHA256 3022ab24c39c42b1bc53666fe4fc3da2305d69db5655ccf261cb521ecfb17282
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2YpYsACgkQuUQtlDBCeQJlWACfS/iEGAZ9CIbFC2eCgZnRUNEB
-nmAAnjNLgIIVwOrAgiAnRpNotVVShNc9
-=GORG
+iEYEARECAAYFAk2a1SoACgkQuUQtlDBCeQJMYQCcDVbGOGbX5iFf+6swaWmGhwhq
+gyEAniEAsMB2xQR3Y0TV22/VZofi+HJy
+=jjFT
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-12.0.712.0-r1.ebuild b/www-client/chromium/chromium-12.0.712.0-r1.ebuild
index 3512059ce47e..f8943355a284 100644
--- a/www-client/chromium/chromium-12.0.712.0-r1.ebuild
+++ b/www-client/chromium/chromium-12.0.712.0-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-12.0.712.0-r1.ebuild,v 1.1 2011/04/03 16:51:10 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-12.0.712.0-r1.ebuild,v 1.2 2011/04/05 08:38:50 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 ~arm ~x86"
-IUSE="cups gnome gnome-keyring"
+IUSE="cups gnome gnome-keyring kerberos"
 
 RDEPEND="app-arch/bzip2
 	dev-libs/dbus-glib
@@ -44,8 +44,10 @@ DEPEND="${RDEPEND}
 	>=dev-util/gperf-3.0.3
 	>=dev-util/pkgconfig-0.23
 	sys-devel/flex
-	>=sys-devel/make-3.81-r2"
+	>=sys-devel/make-3.81-r2
+	test? ( dev-python/simplejson dev-python/tlslite virtual/krb5 )"
 RDEPEND+="
+	kerberos? ( virtual/krb5 )
 	x11-misc/xdg-utils
 	virtual/ttf-fonts"
 
@@ -103,6 +105,9 @@ src_prepare() {
 	# Backport FFmpeg compatibility patch, bug #355405.
 	epatch "${FILESDIR}/${PN}-ffmpeg-build-r1.patch"
 
+	# Make Chromium recognize Gentoo's Heimdal, to be upstreamed.
+	epatch "${FILESDIR}/${PN}-gssapi-heimdal-r0.patch"
+
 	# Remove most bundled libraries. Some are still needed.
 	find third_party -type f \! -iname '*.gyp*' \
 		\! -path 'third_party/WebKit/*' \
@@ -128,6 +133,7 @@ src_prepare() {
 		\! -path 'third_party/openmax/*' \
 		\! -path 'third_party/ots/*' \
 		\! -path 'third_party/protobuf/*' \
+		\! -path 'third_party/pyftpdlib/*' \
 		\! -path 'third_party/skia/*' \
 		\! -path 'third_party/speex/speex.h' \
 		\! -path 'third_party/sqlite/*' \
@@ -230,8 +236,8 @@ src_compile() {
 	emake chrome chrome_sandbox BUILDTYPE=Release V=1 || die
 	pax-mark m out/Release/chrome
 	if use test; then
-		emake base_unittests BUILDTYPE=Release V=1 || die
-		pax-mark m out/Release/base_unittests
+		emake {base,net}_unittests BUILDTYPE=Release V=1 || die
+		pax-mark m out/Release/{base,net}_unittests
 	fi
 }
 
@@ -249,6 +255,13 @@ src_test() {
 	# For more info see bug #350347.
 	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \
 		'--gtest_filter=-ICUStringConversionsTest.*'
+
+	# DiskCache: we need net/data/cache_tests in the tarball (export_tarball.py)
+	# NetUtilTest: bug #361885.
+	# HTTPS/SSL: bug #361939.
+	# UDP: unstable, active development. We should revisit this later.
+	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/net_unittests virtualmake \
+		'--gtest_filter=-*DiskCache*:NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:*HTTPS*:*SSL*:*UDP*'
 }
 
 src_install() {
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 4973a0cfad0e..43fcc3ac67f8 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.12 2011/03/30 11:36:30 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.13 2011/04/05 08:38:50 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -17,7 +17,7 @@ EGCLIENT_REPO_URI="http://src.chromium.org/svn/trunk/src/"
 LICENSE="BSD"
 SLOT="live"
 KEYWORDS=""
-IUSE="cups gnome gnome-keyring"
+IUSE="cups gnome gnome-keyring kerberos"
 
 RDEPEND="app-arch/bzip2
 	dev-libs/dbus-glib
@@ -46,9 +46,11 @@ DEPEND="${RDEPEND}
 	>=dev-util/gperf-3.0.3
 	>=dev-util/pkgconfig-0.23
 	sys-devel/flex
-	>=sys-devel/make-3.81-r2"
+	>=sys-devel/make-3.81-r2
+	test? ( dev-python/simplejson dev-python/tlslite virtual/krb5 )"
 RDEPEND+="
 	!=www-client/chromium-9999
+	kerberos? ( virtual/krb5 )
 	x11-misc/xdg-utils
 	virtual/ttf-fonts"
 
@@ -147,6 +149,9 @@ src_prepare() {
 	# Make sure we don't use bundled libvpx headers.
 	epatch "${FILESDIR}/${PN}-system-vpx-r4.patch"
 
+	# Make Chromium recognize Gentoo's Heimdal, to be upstreamed.
+	epatch "${FILESDIR}/${PN}-gssapi-heimdal-r0.patch"
+
 	# Remove most bundled libraries. Some are still needed.
 	find third_party -type f \! -iname '*.gyp*' \
 		\! -path 'third_party/WebKit/*' \
@@ -172,6 +177,7 @@ src_prepare() {
 		\! -path 'third_party/openmax/*' \
 		\! -path 'third_party/ots/*' \
 		\! -path 'third_party/protobuf/*' \
+		\! -path 'third_party/pyftpdlib/*' \
 		\! -path 'third_party/skia/*' \
 		\! -path 'third_party/speex/speex.h' \
 		\! -path 'third_party/sqlite/*' \
@@ -274,8 +280,8 @@ src_compile() {
 	emake chrome chrome_sandbox BUILDTYPE=Release V=1 || die
 	pax-mark m out/Release/chrome
 	if use test; then
-		emake base_unittests BUILDTYPE=Release V=1 || die
-		pax-mark m out/Release/base_unittests
+		emake {base,net}_unittests BUILDTYPE=Release V=1 || die
+		pax-mark m out/Release/{base,net}_unittests
 	fi
 }
 
@@ -293,6 +299,13 @@ src_test() {
 	# For more info see bug #350347.
 	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \
 		'--gtest_filter=-ICUStringConversionsTest.*'
+
+	# DiskCache: we need net/data/cache_tests in the tarball (export_tarball.py)
+	# NetUtilTest: bug #361885.
+	# HTTPS/SSL: bug #361939.
+	# UDP: unstable, active development. We should revisit this later.
+	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/net_unittests virtualmake \
+		'--gtest_filter=-*DiskCache*:NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:*HTTPS*:*SSL*:*UDP*'
 }
 
 src_install() {
diff --git a/www-client/chromium/files/chromium-gssapi-heimdal-r0.patch b/www-client/chromium/files/chromium-gssapi-heimdal-r0.patch
new file mode 100644
index 000000000000..15ec98a620e4
--- /dev/null
+++ b/www-client/chromium/files/chromium-gssapi-heimdal-r0.patch
@@ -0,0 +1,10 @@
+--- net/http/http_auth_gssapi_posix.cc.orig	2011-04-05 08:25:52.000000000 +0200
++++ net/http/http_auth_gssapi_posix.cc	2011-04-05 08:26:32.000000000 +0200
+@@ -437,6 +437,7 @@
+ #else
+       "libgssapi_krb5.so.2",  // MIT Kerberos - FC, Suse10, Debian
+       "libgssapi.so.4",       // Heimdal - Suse10, MDK
++      "libgssapi.so.2",       // Heimdal - Gentoo
+       "libgssapi.so.1"        // Heimdal - Suse9, CITI - FC, MDK, Suse10
+ #endif
+     };