Dev channel bump. Remove old.

Package-Manager: portage-2.2.1/cvs/Linux i686
Manifest-Sign-Key: 0x30427902

3 files changed, 38 insertions, 18 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 07a2d6d9017c..92e22c8ce2ff 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.994 2013/12/03 18:59:46 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.995 2013/12/04 04:20:00 phajdan.jr Exp $
+
+*chromium-33.0.1726.0 (04 Dec 2013)
+
+  04 Dec 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-33.0.1707.0.ebuild, +chromium-33.0.1726.0.ebuild:
+  Dev channel bump. Remove old.
 
   03 Dec 2013; Mike Gilbert <floppym@gentoo.org> chromium-31.0.1650.57.ebuild,
   chromium-32.0.1700.19.ebuild, chromium-33.0.1711.3.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 9303ca8abd6e..14f788326e85 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -23,22 +23,22 @@ DIST chromium-32.0.1700.14-testdata.tar.xz 112140768 SHA256 e36056a1d2bda2447aac
 DIST chromium-32.0.1700.14.tar.xz 177159364 SHA256 26a88b0df0160bf99988ef04bb7b357777a352469d97043960958a357f065d74 SHA512 a5e39b12138000b984a71239956178a52288ece10ff2d3db2cb08295a2bdcd635fbb20bcbd56a490130b7a0c1ae4da520f15d038a7a042a68db359e5c922ccd9 WHIRLPOOL 4f98346a2763a2591e6dd90b6ed378438e0e79d43be34c6ec465a6dc7a6b3bbd6786a2eeb206a70e4f50e70120be557d53522ba8696635809b5d01959bf2e187
 DIST chromium-32.0.1700.19-testdata.tar.xz 112139100 SHA256 459b16cc254ac4206b93750a44a1dda7fc8e5c72bcf69293f372b53b641b37c1 SHA512 bed3cda8be8408ea85ce84afff8cd4a86b4fd6ccb16e8e912ef2e17f9f6465e3045071c58bad570d04b70c7c0bb8beba235c07c3b53a8e3059998fd770cf3886 WHIRLPOOL 4028b4f6b0ec8052db5ba50434d2c96959085c0dc68dac23f025b51699ede14fc15f791bdd4a6e8a69c5ef9a04c9c90acb956558ccde558ed5f10a1e769898c3
 DIST chromium-32.0.1700.19.tar.xz 177174300 SHA256 4510e628f51aa79bbb9723359b3484f82660cfec6f1035c521cf5f60827f1334 SHA512 415ac663e0c90dc04cb87075de4d7399fa4eeae6f4f0ba81cfb13b7f4337277a75feb39ab74c719ead6b0f8ab81bee35157ea980d788d93735a9a76ab9222150 WHIRLPOOL d8c979c225d6ffaa98ebcf2f0d514b54b8054cfbb78e02c66dd8319311300ce086c50a5e48ee5ac4177f2b35b3569c7108c7c8ffa06cf4296ac15db629cb20a9
-DIST chromium-33.0.1707.0-lite.tar.xz 154007504 SHA256 3dafd652ddc1c49f5d0594fe72502e8d5772b6065e53b100f2b2d126313f17f0 SHA512 b0b4e793e0752946543a09313d43f008ea43527f96d7527f8beaf2073227fcee2758ecc32d476017cf752aaabe8e653d7ebdb55a3ecd4458793e2d6c312ee3f4 WHIRLPOOL f1c647a07039e0a5bdf2b886348298ebbadaf7900c8bde2543677af0ffc617f3ff99cd10a98aa2fddba990bcfbaab372b70c16ef06f83bea3a153f1079291518
-DIST chromium-33.0.1707.0-testdata.tar.xz 112156276 SHA256 f36782ffd0c56dcc00f316b8267471e40afa72a37be1fa306a7ee20f5b9b4485 SHA512 dffe4cd94a32de09774abfdb3d46da401446416f0846a3498043951ffb7cc7f7279b11be67d2f300c109f3f7337a5c61f2558b4639e9a19b78a54bd375629e83 WHIRLPOOL d6d404a91c7a5118a8f61fe29c9677655cb411b27df38a8b7d450160161adfc39fffb1ff0755b8d3347147d3e30016f9bad8a2857b908d4d176bb1e3e1bdedb1
 DIST chromium-33.0.1711.3-lite.tar.xz 154323924 SHA256 bf87201a4a1e5fa751137af379b81c10dbc8a99a0bc4a47138f6dcdaaccf8fa8 SHA512 78aa4ac3a183caa4f3530ed3771bf381ca59f80bd2e272f2c8b7afaec4d1b6f00ba0f5e07c5282ec773cc55b4b25df78e41c8371f0e1bbea55ab76a7cacf2dd7 WHIRLPOOL 5da3217a895aac4fc1eb0e3edac2dc0c33b177fd450f74d63959e47a48d43c4608d0afde69e86a6e144685b0ffb2ab943538c36c6db4a784c521caacf9bd2502
 DIST chromium-33.0.1711.3-testdata.tar.xz 112144684 SHA256 0f2403405ed53669c4f9af19883f392ee44e90cdcf048d4be8bcf6d08f32b1a0 SHA512 c801ff9ed47fbe1d63d4bc6361e806904e17335eea32164c937e31d6f5313153fc23455bc28dcf98cc519b93cf07fbbd8c746b99b77961b21c2df16f4347b93d WHIRLPOOL ae7120e8debc4aa9e7f3fc09af85840a520f674fb807351067b6bce6d5d4c92a20e479bbafadf037a49619ef2b2e339382e98a69add818e286917acf9f96bfc6
+DIST chromium-33.0.1726.0-lite.tar.xz 155194308 SHA256 5d177fec9e03a4ef9c6945f913c8b2aeabba2647007b4a4a628dda5041b13dba SHA512 c26d0b85f7787e8ffa22ba4f9dffe5555350205008fe11937189ae888609e238c55d4c107f7b0815db792925fa65ae9e6b7a58f84f7fa891cb052ad73291d54e WHIRLPOOL e789d083db046f3d580da41385ba020d48b84c350318f628f7f6dc305304fd2468dbb7e9aa1d72e2801370031806aed3e21a5929f7d92a1309eae0565e792272
+DIST chromium-33.0.1726.0-testdata.tar.xz 112192764 SHA256 f44d2ec4cbbac7c6e97af3097d2b1f7ccf178dce8bdbfcb8ec854165662011d8 SHA512 4ec9701a993a9f7c850945ffee4bc40f1c262737b8253a99455ae3bc3b454f5aff1364ba4726287fd40658506b4133e251a77d94091819e59cf0a8382f2ebe74 WHIRLPOOL b277b3005f48c0eeb4146452cde5a98018a37011cad5b734ea415bf290978b8c3bfaa6c1a0e16ff764d61bbd1e747dc3b797c9e92245bce74bb511be7d0d7865
 EBUILD chromium-31.0.1650.57.ebuild 17363 SHA256 320d5496086f266f862c642ffc328244cea7c22e2048b042a44c9811c1505f88 SHA512 21b92b2b94d7ed5a2faa0d2f8316374477a8f05fd1bd4e780a2f44c1d530571eb90f9f19c9d01373af72c23adfe453f8c2f23765822de3abdc13b8a75f3ae51e WHIRLPOOL 196d93fa85673b428261116c2792fc9f1d46cd793a3081df11ddfdf21d7b5d15e2795a3acf3c1782da56e05908cf993b12e70cd8e20412deff9953584f986b6e
 EBUILD chromium-32.0.1700.14.ebuild 18274 SHA256 d378995c718f4a7fc1d63d36d8c626e551700767d337f0286a6426fe66a13d6f SHA512 7db7451380e7a912251e711e8cabfc886381a604ba66fb3ae3481c412d4594f2d7913a93dd13afdcec9c887aa1ca9988fa6b68240c81c9f5f81d280dfcca941b WHIRLPOOL a2864f142599682c1ed67bcf1d82c40b7bd288451c4ae6ad7dca2918cf6397f2511c4dbd483b6e80e733dee870ccb18dded57559386584271082c56a94bbdd41
 EBUILD chromium-32.0.1700.19.ebuild 18582 SHA256 c67000dbd68138e4388869b91ca9c215a96b19c24f2f6a8a1e95f8468b692710 SHA512 8391e25976844254228c65d46c02d38a0c29d877ea9ba459bf4574fd88b609f2be1ae40f099a8943dec4fcc1678268ac7715ecdf82feb4f2c2ebade3b6e631d6 WHIRLPOOL 9a2a9e60ce67f2d22ddf1722f1dbc7bdaea8b86aac58eb92d923ee858e876594cfe66721f590abc0db9e122e537bbb33d670156885bb5ba36bcaf72b3136f309
-EBUILD chromium-33.0.1707.0.ebuild 18306 SHA256 9ed9b87566184676750e6e84fa19edc32a2b7a2814ad38f4235a0286eeadd28a SHA512 e6c9586268162b3c9ef9eb2c9a5a9b4b2e14d2859703618ea354e1a3f144f5d8066c5aec9846225583b0be412e590a2b4eb62c793cbb210b1fddd94436c8bd9f WHIRLPOOL 3432e6f2522a98b282049f0fb00b52c4e3bdc60e22d8af930341dedd6db198bc997f035777078bfecc9e49cf8b216e3240409088047789e483da57f6e357a58c
 EBUILD chromium-33.0.1711.3.ebuild 18635 SHA256 89ced062c7d6f743ff7e1599b9d682f0e6c6fa60881ebacc9bb5559d13f8d6c6 SHA512 0d5795be19634da082803e3e58e69a4516d0c3bef3e0d5e98b619c7a7ad6010fa3839abcd2317f899598804930e1eb2ca61c1df85043e0f74c4b7b42c60e8454 WHIRLPOOL 4d10541786d6ac4d3209a587f339dae04978c463583c5a9d6a36d4d9e3d3ed28e209ca4757c791f2cc1831464c3d379e94252b8f9316ebb5523564a77814a51e
-MISC ChangeLog 91541 SHA256 0d1a78602aec6068fc80e562b60c2798a3ed83e402894e5d6bfc895658c16448 SHA512 a3b290968f44bcf976e00ace3f5ac7f6186fab2321aa8d9c5bddd0c584c90c3403fcdd081b2797237a8dd573cba9d06a92d3a01d557f21020d57ac9ed24ec92d WHIRLPOOL 30418c23ac7fceba2c99325ea2248cc8c1a8862b3f1e4c0c1e0770aaccb85909e9b298207b876d4c10cdf552838fd978a20152364d675f18e6e6cdb89ceadc4a
+EBUILD chromium-33.0.1726.0.ebuild 18702 SHA256 0d83fe6a2ee0eac30ba2188af34bd5cbcce1b019bac475f412f0cd6a977d3b67 SHA512 b9d10f91df24e4caf232ae9b1a892fc86ccd6508e59e38f7bb094811fab0792b7669070b37af8eb2c9a17f03e5febf416fc943f49829acb334720a8e577eb5e8 WHIRLPOOL 7670f0b619025378cc31eca7f31aa0aa7ea523b767adc4a10fa5b70cb12314758c57809d2391582d65b7c1ee90b54ff2f081e80c245e94203d32376eb6cb5c4e
+MISC ChangeLog 91731 SHA256 6a75c48408209a5e6b29eb33c473c8b7211f85b16a652fdfd7d3d53065bd0979 SHA512 b8bf30bd4fc70a1615d653cf391b0636c8025af5fd8dd75c8f4a0925a04968a228d3c3cf2e3b94810a6e7c9afaf2f45f6f8b313de5293953ee850a3509f21e0c WHIRLPOOL 7eeef29cc11fd074d83ad91ae4d33d6e62c0bbea09e2c50a5ac882590336810e3e904446f58a3b16c24b0677ac1366038a9507060fab0f358f3031654c6709da
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC metadata.xml 786 SHA256 12e03b633076f7fdf1fb7b3a3a2c10c0a4210566511101d6df5e18d962680c6d SHA512 cc2fdf94c85a24d528d921890d1828341b173b5b2daba820b1ddcf973890ee950e2fe9e096d81106196e9ca761908141b0aac88330b68b536a8b39bf29c1c868 WHIRLPOOL 101c01d630f4460c1f23ea9e2334e9509839cc2c968af254f40489680dffd59942e21f6040fc4d127abc6cae82ece031bbbb3f08b325a8e8835f80c322c2948c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlKeKigACgkQC77qH+pIQ6SrAQEAmPOVO4h4ndmRQW8dv3uZ3GXm
-NQ7upQFHU9ELKdgfioYA/RN1p5i6G+0Rbay3FERgHcJGoD6LCJWcDcafriggT0tL
-=rBVP
+iEYEAREIAAYFAlKerXoACgkQuUQtlDBCeQKVLACfUuyAgwNeimMY18dMk2mDOtDj
+cfkAoIUxyAtdDB0cf0pIGyoZItzXpK/P
+=SZRT
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-33.0.1707.0.ebuild b/www-client/chromium/chromium-33.0.1726.0.ebuild
index 7943a925c386..a83a873692ff 100644
--- a/www-client/chromium/chromium-33.0.1707.0.ebuild
+++ b/www-client/chromium/chromium-33.0.1726.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-33.0.1707.0.ebuild,v 1.4 2013/11/17 17:36:38 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-33.0.1726.0.ebuild,v 1.1 2013/12/04 04:20:00 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -20,7 +20,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bindist cups gnome gnome-keyring kerberos neon pulseaudio selinux system-sqlite tcmalloc"
+IUSE="aura bindist cups gnome gnome-keyring kerberos neon pulseaudio selinux system-sqlite +tcmalloc"
 
 # Native Client binaries are compiled with different set of flags, bug #452066.
 QA_FLAGS_IGNORED=".*\.nexe"
@@ -90,10 +90,12 @@ DEPEND="${RDEPEND}
 		dev-libs/openssl:0
 		dev-python/pyftpdlib
 	)"
+# For nvidia-drivers blocker, see bug #413637 .
 RDEPEND+="
 	!=www-client/chromium-9999
 	x11-misc/xdg-utils
-	virtual/ttf-fonts"
+	virtual/ttf-fonts
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"
 
 if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
 	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
@@ -153,7 +155,6 @@ src_prepare() {
 	# fi
 
 	epatch "${FILESDIR}/${PN}-system-jinja-r2.patch"
-	epatch "${FILESDIR}/${PN}-gnome-keyring-r0.patch"
 	epatch "${FILESDIR}/${PN}-build_ffmpeg-r0.patch"
 
 	epatch_user
@@ -185,6 +186,7 @@ src_prepare() {
 		'third_party/jstemplate' \
 		'third_party/khronos' \
 		'third_party/leveldatabase' \
+		'third_party/libaddressinput' \
 		'third_party/libjingle' \
 		'third_party/libphonenumber' \
 		'third_party/libsrtp' \
@@ -204,6 +206,7 @@ src_prepare() {
 		'third_party/polymer' \
 		'third_party/pywebsocket' \
 		'third_party/qcms' \
+		'third_party/readability' \
 		'third_party/sfntly' \
 		'third_party/skia' \
 		'third_party/smhasher' \
@@ -230,10 +233,6 @@ src_configure() {
 	# additions, bug #336871.
 	myconf+=" -Ddisable_sse2=1"
 
-	# Optional tcmalloc. Note it causes problems with e.g. NVIDIA
-	# drivers, bug #413637.
-	myconf+=" $(gyp_use tcmalloc linux_use_tcmalloc)"
-
 	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
 	myconf+=" -Ddisable_nacl=1"
 
@@ -290,12 +289,14 @@ src_configure() {
 	# Optional dependencies.
 	# TODO: linux_link_kerberos, bug #381289.
 	myconf+="
+		$(gyp_use aura)
 		$(gyp_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)
-		$(gyp_use pulseaudio)"
+		$(gyp_use pulseaudio)
+		$(gyp_use tcmalloc linux_use_tcmalloc)"
 
 	if use system-sqlite; then
 		elog "Enabling system sqlite. WebSQL - http://www.w3.org/TR/webdatabase/"
@@ -330,6 +331,12 @@ src_configure() {
 	# Always support proprietary codecs.
 	myconf+=" -Dproprietary_codecs=1"
 
+	# Set python version and libdir so that python_arch.sh can find libpython.
+	# Bug 492864.
+	myconf+="
+		-Dpython_ver=${EPYTHON#python}
+		-Dsystem_libdir=$(get_libdir)"
+
 	if ! use bindist; then
 		# Enable H.264 support in bundled ffmpeg.
 		myconf+=" -Dffmpeg_branding=Chrome"
@@ -346,10 +353,13 @@ src_configure() {
 	local myarch="$(tc-arch)"
 	if [[ $myarch = amd64 ]] ; then
 		target_arch=x64
+		ffmpeg_target_arch=x64
 	elif [[ $myarch = x86 ]] ; then
 		target_arch=ia32
+		ffmpeg_target_arch=ia32
 	elif [[ $myarch = arm ]] ; then
 		target_arch=arm
+		ffmpeg_target_arch=$(usex neon arm-neon arm)
 		# TODO: re-enable NaCl (NativeClient).
 		local CTARGET=${CTARGET:-${CHOST}}
 		if [[ $(tc-is-softfloat) == "no" ]]; then
@@ -398,10 +408,14 @@ src_configure() {
 	export CXX_host=$(tc-getBUILD_CXX)
 	export LD_host=${CXX_host}
 
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -m 755 "${TMPDIR}" || die
+
 	# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
 	einfo "Configuring bundled ffmpeg..."
 	pushd third_party/ffmpeg > /dev/null || die
-	chromium/scripts/build_ffmpeg.sh linux ${target_arch} "${PWD}" config-only || die
+	chromium/scripts/build_ffmpeg.sh linux ${ffmpeg_target_arch} "${PWD}" config-only || die
 	chromium/scripts/copy_config.sh || die
 	popd > /dev/null || die