Version bump for dev channel release. Remove old.

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

3 files changed, 58 insertions, 33 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 7bb2dcf04938..412090c385ed 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.363 2011/05/13 22:09:26 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.364 2011/05/18 09:12:09 phajdan.jr Exp $
+
+*chromium-13.0.767.1 (18 May 2011)
+
+  18 May 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-11.0.696.65.ebuild, +chromium-13.0.767.1.ebuild:
+  Version bump for dev channel release. Remove old.
 
   13 May 2011; Markos Chandras <hwoarang@gentoo.org>
   chromium-11.0.696.68.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 581c59ccd7a0..52f67dc1aef4 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX chromium-browser.xml 407 RMD160 457374ff72561648d9777ffb3270ad10d864a6be SHA1 65543bfff7d0350d40ba258e61061b0c5579e1f2 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff
 AUX chromium-cups-r0.patch 1237 RMD160 601fc9a46027580a1817a77abfb47b2b59e212ca SHA1 9826e90746229c7c12d767bb3b6cbdbc5c300041 SHA256 594af80456d977a19949909a7c79cae706964f7ced47634c9c9b19478dc089a2
@@ -10,33 +10,23 @@ AUX chromium-system-vpx-r4.patch 476 RMD160 ff7feff7dff9de28bdc4c80b43c9574d7769
 AUX chromium-system-zlib-r0.patch 1318 RMD160 2debfc4f179a57119d5022305134307f4cbbe04d SHA1 036e7573b04046ee0275abcb99a7e7a8b490e47b SHA256 79668fbf6206cd958db328798298a0514d3a95683b41affd3a607a0ac95453e3
 AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a
 AUX dot-gclient 253 RMD160 a768770d8e6f5b73395451277beea1cc9240fc3a SHA1 3eaf2074da58cfe4f2af3d08f59b27a16fe13dad SHA256 8c5750251ff681044cc584ef3768fe39c56c7877ade5fb9107298734126e62cf
-DIST chromium-11.0.696.65.tar.bz2 145320860 RMD160 f0e69a54fb96742d0ae0325a72b2640dab275700 SHA1 fcfac4ea7eeeac31f22c8d871f4ddf74f8ce97fd SHA256 041e21135481042565ef7a1bccaf35632fd70b3c7da5c4c787d324cde1a17587
 DIST chromium-11.0.696.68.tar.bz2 145325318 RMD160 93d1de5976c8ee4f05c8e8129ccbc20639df30fe SHA1 188124c0faae0073a2af70a0060abf2f4eaaa1f6 SHA256 e6e143415e3a1dc12722f41c747152435009a5a85e603caf61119edcf736e542
 DIST chromium-12.0.742.21.tar.bz2 150264103 RMD160 7df6bd5ebccfe19af8ca0a8f81b6e6e75fb9bd45 SHA1 9f3f64ee132787052fa4789472d77e8790f6ba6b SHA256 09061e607598d16b97947f3f771b044df6a4ef3ec79ef6fc9990f3513578ecd4
 DIST chromium-12.0.742.53.tar.bz2 150946597 RMD160 9fedf96d58e6a3f027d1f5fdb2485fa9b55f75bb SHA1 a464d41e9c2bfae7d633d3a34c011731550af8cc SHA256 623dc514a08ac2bdbbb2271a94a612316ddef13f72dfef49b70ca3aad6d33644
 DIST chromium-13.0.761.0.tar.bz2 151379921 RMD160 89b57af4865d858a59adcf6172310230d47439a7 SHA1 10ac2c102bb212100cc50bdde6d1d6deaea13ed7 SHA256 04da3defe85879ef2d8e5944e99b5181b3d4fad0d38549ab1605273ffb73264a
-EBUILD chromium-11.0.696.65.ebuild 10572 RMD160 d42ce63e522ad9343f05f4154dcee15cf7ced734 SHA1 8b8285c3308c4b832b07181b17c649694c3a698a SHA256 c5d985befdbb6678716201d05506ae9937452b2b838ce22abd2f578c41577d10
+DIST chromium-13.0.767.1.tar.bz2 151086612 RMD160 bcbe8d4cf59a99457733fd582c69c5275115cb28 SHA1 2cfbb716d97a92371ddb1448833decc42128e3a5 SHA256 0185ff5fcc160abef1d8fd963f5e4b42d5ff3777f89b1064bf9430b4cd4d57c8
 EBUILD chromium-11.0.696.68.ebuild 10572 RMD160 35baff1d94d3df36cf5b5bec13338dd871b9ca80 SHA1 ffcffa5cb54d5d843dc78ec8ceed568f2b3f7364 SHA256 ec10d6904e7ffd103f9b34fcec045bc57a28efa8bef57098b6e18571621bade9
 EBUILD chromium-12.0.742.21.ebuild 11560 RMD160 1112ef7c1c4f37310d16a6baff1bb8cfa2854c8a SHA1 9853fcaff0f05be501200732ad1820e43120c4b1 SHA256 b04df3126c66de70ccf5db75d3030794eae27a1559e67956e6e9a01267fb0895
 EBUILD chromium-12.0.742.53.ebuild 11560 RMD160 869dccfc36744a5f7c7b3364857562a6439f1ea7 SHA1 353a5312199a1aec2e7a92905478bc8622319107 SHA256 26acca2905dd617843e4e38d4ac2836dc65da2f8470405fefa519251a2fcaff6
 EBUILD chromium-13.0.761.0.ebuild 11459 RMD160 9885283b28123d1fb9fddd611118577f860bdaab SHA1 7bfbee7bb4bdc21dc6b584a698c6cc75d91d80b0 SHA256 e508a0d461e7d3162912fa702dd9b0015e438da1071727783934208a06ab512d
+EBUILD chromium-13.0.767.1.ebuild 11459 RMD160 88943a47c84c9cd1dcb6ff2a3dc45c1903f9bbf7 SHA1 6816979245f3e7eab30fcc58f7bc5cc1b77e112e SHA256 b591019a78d54c167e63e37d5c1c50e90f0586b0b1f2371612b293af6bf8a060
 EBUILD chromium-9999-r1.ebuild 13504 RMD160 5be86ce3f9bf156be69d09085da28283e1a18b2c SHA1 646b3763d1663efecc70e14b4eb9c5eabd44cd6e SHA256 fd41f42e34ead2c4dc657027d40622103c387d9c927a107f8058deb63858d833
-MISC ChangeLog 80745 RMD160 ee77d5ba801b509fa920cacc844482555ea93656 SHA1 bbc7bbb2421b6754911014aa6b560e0bd205bd7a SHA256 948db73fa0147e9e5aabd3b5f040f89afc1d4fb077aedb5481ee480eb8d45ce7
+MISC ChangeLog 80952 RMD160 1386e24aac8b8d89d0609b6a30e28d7810be3937 SHA1 dcc422c0c941983aed051576505acf0058be57ab SHA256 54694129d8f3362fc86fd6343aa00fb980916eef555d7767e0c97f691dd5517a
 MISC metadata.xml 267 RMD160 3a166415fec415d539c1b7c32ed40b188488b9fb SHA1 5c3d71a9cea27175cbe8c98369b42b79c8643c6c SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNzaxLAAoJEPqDWhW0r/LCdBMP/2V7yOR3wVazFsY8NAA4cC4G
-JbcWnfC2bWTB+Nmi1Fr+vVeH3cnqswzSFABy797bS+x2XxATpA/ddfSebBwJ5XJU
-4jgRzvsCvjHEwWXZcPkQL4aLM5gl9FhSuXyVc/7+EqHSQDNv2ejapL7AcEYWHqTi
-RLqYu0QLz1WfVMSHzOJ7NNNLhb1HNn+PUrksm7u2ExOp5cwS2kCh0AK/UVZXwnSc
-NEESzbNQCS/kLrAbcHZq1UtesMcH9Bx/+jBUjX8vwWSU7Y/I6RKzL1BJglmpKb0r
-xYsF4n+LGzgWCHlCWhl5mSsYoA41AYDto99XE5rdL9/wCOWwP1bfNcoSGREtQ+j2
-lQekABE3IbHA99Nw2Ylvr/ePJ4fiGlVCd0nNHxvmbFAO2032e0ayL9vbGk5mpUkg
-k7lHEGzW5c3Ep88F8/gvsXairh+rj7YLvEg6jiDGhJnzVibWMdva1qjgMoTdpWvB
-3HwmluGEqrwobmKZA3J7d33HItrLlLY9ycI6bZwK9mZlXxMpfCmNTN70Aljsg9d3
-htZJO67egRjg10nMVPBaUa0ykMNvbRaeSM08auzHNGyh2JXC0Lcbfw6JNyburFuV
-kj+8LtKMskmqj36SM7W40vRm+jqrP84ta/s/6pM8pi/AExc5jXOY5oUYRIbfSKct
-2oMMPO9WKGHBlV5ee3Vg
-=UfZp
+iEYEARECAAYFAk3TjXUACgkQuUQtlDBCeQIr+gCcCxdS8UZjUbS1wxdym3pbfnXq
++JQAn2QpNJUzCrWY+9Ldwthp6IOFjt4E
+=s35j
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-11.0.696.65.ebuild b/www-client/chromium/chromium-13.0.767.1.ebuild
index 9c4216f8666b..7090573c61e2 100644
--- a/www-client/chromium/chromium-11.0.696.65.ebuild
+++ b/www-client/chromium/chromium-13.0.767.1.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-11.0.696.65.ebuild,v 1.3 2011/05/08 20:56:13 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-13.0.767.1.ebuild,v 1.1 2011/05/18 09:12:09 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -14,8 +14,8 @@ SRC_URI="http://build.chromium.org/official/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="cups gnome gnome-keyring"
+KEYWORDS="~amd64 ~x86"
+IUSE="cups gnome gnome-keyring kerberos xinerama"
 
 RDEPEND="app-arch/bzip2
 	dev-libs/dbus-glib
@@ -31,11 +31,12 @@ RDEPEND="app-arch/bzip2
 	virtual/jpeg
 	media-libs/libpng
 	>=media-libs/libvpx-0.9.5
+	>=media-libs/libwebp-0.1.2
 	media-libs/speex
-	>=media-video/ffmpeg-0.6_p25767[threads]
 	cups? ( >=net-print/cups-1.3.11 )
 	sys-libs/pam
 	sys-libs/zlib
+	>=virtual/ffmpeg-0.6.90[threads]
 	x11-libs/gtk+:2
 	x11-libs/libXScrnSaver
 	x11-libs/libXtst"
@@ -44,8 +45,16 @@ 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
+	x11-libs/libXinerama
+	test? (
+		dev-python/pyftpdlib
+		dev-python/simplejson
+		virtual/krb5
+	)"
 RDEPEND+="
+	kerberos? ( virtual/krb5 )
+	xinerama? ( x11-libs/libXinerama )
 	x11-misc/xdg-utils
 	virtual/ttf-fonts"
 
@@ -105,10 +114,7 @@ pkg_setup() {
 
 src_prepare() {
 	# Make sure we don't use bundled libvpx headers.
-	epatch "${FILESDIR}/${PN}-system-vpx-r3.patch"
-
-	# Backport FFmpeg compatibility patch, bug #355405.
-	epatch "${FILESDIR}/${PN}-ffmpeg-build-r0.patch"
+	epatch "${FILESDIR}/${PN}-system-vpx-r4.patch"
 
 	# Remove most bundled libraries. Some are still needed.
 	find third_party -type f \! -iname '*.gyp*' \
@@ -124,10 +130,11 @@ src_prepare() {
 		\! -path 'third_party/hunspell/*' \
 		\! -path 'third_party/iccjpeg/*' \
 		\! -path 'third_party/launchpad_translations/*' \
+		\! -path 'third_party/leveldb/*' \
 		\! -path 'third_party/libjingle/*' \
+		\! -path 'third_party/libphonenumber/*' \
 		\! -path 'third_party/libsrtp/*' \
 		\! -path 'third_party/libvpx/libvpx.h' \
-		\! -path 'third_party/libwebp/*' \
 		\! -path 'third_party/mesa/*' \
 		\! -path 'third_party/modp_b64/*' \
 		\! -path 'third_party/npapi/*' \
@@ -138,6 +145,7 @@ src_prepare() {
 		\! -path 'third_party/speex/speex.h' \
 		\! -path 'third_party/sqlite/*' \
 		\! -path 'third_party/tcmalloc/*' \
+		\! -path 'third_party/tlslite/*' \
 		\! -path 'third_party/undoview/*' \
 		\! -path 'third_party/zlib/contrib/minizip/*' \
 		-delete || die
@@ -154,6 +162,9 @@ src_configure() {
 	# additions, bug #336871.
 	myconf+=" -Ddisable_sse2=1"
 
+	# Temporarily disable Native Client, bug #366413.
+	myconf+=" -Ddisable_nacl=1"
+
 	# Use system-provided libraries.
 	# TODO: use_system_hunspell (upstream changes needed).
 	# TODO: use_system_ssl (http://crbug.com/58087).
@@ -166,6 +177,7 @@ src_configure() {
 		-Duse_system_libevent=1
 		-Duse_system_libjpeg=1
 		-Duse_system_libpng=1
+		-Duse_system_libwebp=1
 		-Duse_system_libxml=1
 		-Duse_system_speex=1
 		-Duse_system_vpx=1
@@ -194,9 +206,18 @@ src_configure() {
 	# for Chromium.
 	myconf+=" -Dproprietary_codecs=1"
 
-	# Use target arch detection logic from bug #296917.
-	local myarch="$ABI"
-	[[ $myarch = "" ]] && myarch="$ARCH"
+	# Use target arch detection logic from bug #354601.
+	case ${CHOST} in
+		i?86-*) myarch=x86 ;;
+		x86_64-*)
+			if [[ $ABI = "" ]] ; then
+				myarch=amd64
+			else
+				myarch="$ABI"
+			fi ;;
+		arm*-*) myarch=arm ;;
+		*) die "Unrecognized CHOST: ${CHOST}"
+	esac
 
 	if [[ $myarch = amd64 ]] ; then
 		myconf+=" -Dtarget_arch=x64"
@@ -227,8 +248,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,crypto,googleurl,net}_unittests BUILDTYPE=Release V=1 || die
+		pax-mark m out/Release/{base,crypto,googleurl,net}_unittests
 	fi
 }
 
@@ -246,6 +267,14 @@ src_test() {
 	# For more info see bug #350347.
 	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \
 		'--gtest_filter=-ICUStringConversionsTest.*'
+
+	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/crypto_unittests virtualmake
+	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/googleurl_unittests virtualmake
+
+	# NetUtilTest: bug #361885.
+	# UDP: unstable, active development. We should revisit this later.
+	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/net_unittests virtualmake \
+		'--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:*UDP*'
 }
 
 src_install() {