Version bump for dev channel release. Remove old.

(Portage version: 2.1.9.42/cvs/Linux i686)

2 files changed, 24 insertions, 8 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index e93ab3ee8f6a..e748431f5c74 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.327 2011/04/05 13:06:08 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.328 2011/04/06 10:19:58 phajdan.jr Exp $
+
+*chromium-12.0.725.0 (06 Apr 2011)
+
+  06 Apr 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-12.0.712.0.ebuild, +chromium-12.0.725.0.ebuild:
+  Version bump for dev channel release. Remove old.
 
 *chromium-11.0.696.34 (05 Apr 2011)
 
diff --git a/www-client/chromium/chromium-12.0.712.0.ebuild b/www-client/chromium/chromium-12.0.725.0.ebuild
index b242eefce5c1..f36fda8d456c 100644
--- a/www-client/chromium/chromium-12.0.712.0.ebuild
+++ b/www-client/chromium/chromium-12.0.725.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-12.0.712.0.ebuild,v 1.3 2011/04/02 13:28:38 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-12.0.725.0.ebuild,v 1.1 2011/04/06 10:19:58 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"
 
@@ -100,8 +102,8 @@ src_prepare() {
 	# Make sure we don't use bundled libvpx headers.
 	epatch "${FILESDIR}/${PN}-system-vpx-r4.patch"
 
-	# Backport FFmpeg compatibility patch, bug #355405.
-	epatch "${FILESDIR}/${PN}-ffmpeg-build-r0.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*' \
@@ -128,6 +130,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 +233,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 +252,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() {