From: Paweł Hajdan <phajdan.jr@gentoo.org>
Date: Wed, 25 Mar 2015 20:31:26 +0000 (+0000)
Subject: Dev channel bump. Remove old.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=b0629e62052b4dfa09c254435ad14450c2db6d53;p=gentoo.git

Dev channel bump. Remove old.

Package-Manager: portage-2.2.14/cvs/Linux i686
Manifest-Sign-Key: 0x4F1A2555EA71991D!
---

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 938afed36574..91509ba6579c 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1212 2015/03/19 19:39:12 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1213 2015/03/25 20:31:13 phajdan.jr Exp $
+
+*chromium-43.0.2342.2 (25 Mar 2015)
+
+  25 Mar 2015; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-43.0.2327.5.ebuild, +chromium-43.0.2342.2.ebuild:
+  Dev channel bump. Remove old.
 
 *chromium-42.0.2311.50 (19 Mar 2015)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index febb8f8398f3..b7dd82f75f9b 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -15,31 +15,31 @@ AUX dot-gclient 174 SHA256 0ae6d69323d1d286de7ef1fa62c330536ada7280bda7564fefb5d
 DIST chromium-41.0.2272.76.tar.xz 301532460 SHA256 31e2ae88ad4604e79dbcf7258f66106bd51e88413ebda6a1b1d181967535cd8a SHA512 5a616183817fda9b0c403a648f6265f0ce2743e61af6bc0a848a7471a40ecf777693e527388259dcea86340f98b6021366bef7a0ce33717b063d2eaf1fa94bc0 WHIRLPOOL a7d7bfc320f3528fcd4934629f53e10252a217f3c8b9966621bd5adf6c2ba25a5a0ffe0ba1a87f49990671386aa0926e1b0eea696a6ec8c6ef2efb45e002e3e2
 DIST chromium-42.0.2311.15.tar.xz 305878804 SHA256 6615b8e57bf5f78dd30f214212ba9b4beaa4813f557adc9937966d09515305f1 SHA512 fda85fffdf0ee36f6d39d8b99eb7bc540b4289838a207feb215313637fed583104c6da855427a6af64b8ae20ad331d6dba7fc2d16aaa16d978c66b12cb302ce0 WHIRLPOOL 8b929c39b2ecfaf4522b262c2556fb157f81e20ed08e0a82c4e616c00eb943a025613001b1540da189e92f8df2362da19f8ef63ed3d7434053106afc958f259b
 DIST chromium-42.0.2311.50.tar.xz 306054284 SHA256 ad87ec1ed650fe9f6eb8cb8eb276cf6be96aa70911753bca1f2e36e6fa28294f SHA512 f70b6a36619cce10118d487178426c0b5f00d76870ed626e37c7a047bb7788391b43084e9fcb10ce6427186955e9e572da9ed13ce220c469b92160793d1f454a WHIRLPOOL 80c2ea673403322ee22e1fac7cd64799bb105b166ca593795910002840c2ba3d0091099dd67cc8c4604beb256195f3ae191d0a19a9e5f5537407b06d4e493efc
-DIST chromium-43.0.2327.5.tar.xz 306622640 SHA256 d69c08ff9a0371e432dd4bd16ba8edcbd6cde4187f9fe3ccfea31d1beabf324d SHA512 a4e9a631d191cef0eef1acc48ff947457bd9ff76d93424932b7c2779596fac3a89632eca9e60d4019d69fc51920d1266d3ffe30a99c72c5c4f51e9dd718a5f2b WHIRLPOOL d64025390d76615641c086371821718717788cab745cd441b6fb2d91b9c8b90a2badf5bab91cf5779e316f6f0f6b48dc85f12117f4ab356ce6118d0b0a2fa588
 DIST chromium-43.0.2334.0.tar.xz 307525440 SHA256 895b43d4ae72a3122f344f9f57ead2016c621ee84395eae96fa7c8cb8562da67 SHA512 c5a4aa3cbef35264382fb3c37cef67f23eb7521e12cf4254c1661014e46c6add327265e20cc5206e5b277b94981a85c7a4b73e37117a68c569d7bf8c7419faf8 WHIRLPOOL 42b8a0589b3ac9cbf758212a717fc83dd64437e002f268b89ce939ce9602bfe35db7f71d82147152755e593eb17c1ac950ca69f2d429bb5178c2eaaa2f71d5b6
+DIST chromium-43.0.2342.2.tar.xz 307953856 SHA256 d7353f22c298d095e84493b6e5c31091b3f80e4acbdd7cb8572907797ff29dee SHA512 ae66ed9e520adc0dd1e85c454daf074123d7f0297a8c4ddd5ecaa374eeb58f67173fc90b89996981a7b0cb3e80dafc050a57f84cad8599bef07121cef57180ea WHIRLPOOL 9a1bde81d48aa9a967db222ab7c8fe9c42b1e2cb868a25be590e847276f006670542aa60275885ef9b9721c24a2de3b163164aa1a7abd00bad761557d3b1e438
 EBUILD chromium-41.0.2272.76.ebuild 20137 SHA256 3bade947aee25e6f0935867f384399b55c0385b2044fd7ca6ddc8dd924dc63ad SHA512 e934b80809f410b6538e998cf03713378030c06611b29965673f1257c1013921860e342818812f90f73a902a53c6bcc2e7c57b419662f1017fbaa2b8dfecd9dd WHIRLPOOL 3479d4c37cbb8e23929040e173e0615c6566757a51ee6f3937b67cfdb8d68630b3b6cc97b873bc4c655f7669096902c0ab53ddf2861f47ff463aa1878f84b2e6
 EBUILD chromium-42.0.2311.15.ebuild 20379 SHA256 d0de3cb357233d2502fe87f769574acd45dd73c268b218ecdbd27942eb7c5ad3 SHA512 3dc39fbcb352cc237ecf10efac7e10d75345dc616c1616af22a4ca1944bb2ba2f4be58931ddaf74dbff69457a76d5d03127b5a6572506e9524a48291efbcc81f WHIRLPOOL 45f8129e5b65220199afdfa675a074f03e87d5d815d13e08708a8a046ecdf49a6f0045cfc4fe64ea675315d71b4f970e7680b81c8684655a111d366f94503fd5
 EBUILD chromium-42.0.2311.50.ebuild 20379 SHA256 0d075f30938cc0e975f4924738a869f8e5cf5866f1d5b291640ab80ff09177f6 SHA512 dea529a133c4586a0f79ae56fe9aaa3ae684d2cfe08715e6e98c2ad12f9c7e7171e49c33e249623a0404c7b663ec6e767b5c3a5e55461ea7dc2d03b3322e69f2 WHIRLPOOL 455f64e5521670263b25d4f69f55c910488c1d1e55d7432eb9c3286d498b330bc4620e7d00d3453d87551fb1505bedbc4c98d2a0b07b5498dd33c7f3de330809
-EBUILD chromium-43.0.2327.5.ebuild 20378 SHA256 4978a5a1b4507fb91769233dbbeba89fc8fef50098b0790144044c256fc20678 SHA512 35ae1428e1695a1c377aa3679e316ecb676003ea2bfb90d7ec4a28a6c519e539bc7ff4e082f1dcc52aa908a479eb2eef81fb5af5ae9b7fa7f65d7bdca93d283e WHIRLPOOL 8da45e007e502d07fb8485f1dca5b45e60ac2cdc66fe766cca7801f67c2eea8670d3ab2a8f8929faa82b08149d7fe48f8630bcc31134f40d1bb0e2e8224968fa
 EBUILD chromium-43.0.2334.0.ebuild 20105 SHA256 252ef24872a2f9b193b1c762d95cf37f88ec972e041d54294185852f321d586a SHA512 fa0486d42aaf41e578f2d0924328bb7961f5a7af475af99bd85845127c96a6f7fa41435d90edeb2ce22fdcd17b35004c5a44c0a4fcad39089a487590c11620fb WHIRLPOOL 23406a72e42482ca0fcfe0faa584fdb6ae101685ca5d4a0b8d42e31c933234a55bbe7d9fc8959ee568a66b79f4d215032729a80fdb9d827255b827c750cb38ad
-MISC ChangeLog 7105 SHA256 d68058b42749d9ef79df3022683e50ebed3e6cd9b9f5f3dce9202bf28923592e SHA512 0dc98641a8b737a5d653b69a0bf0fcb5798dfa14b160f121e13f3f41e9a41b682a7285a630b333c1be03dbf370cd22653503c080f132feb93cc1acb1cbb631af WHIRLPOOL 074b77c877dd1f4a5211817eedf2c68e2ed8a1e9a0d72fb79afc5e5234f72277018ad7992c2fd1a53926f51716c5d2b7cedee8a0672900058a66595fbf7d9b15
+EBUILD chromium-43.0.2342.2.ebuild 20102 SHA256 993d1f874c70293fed51fdb8cc93087ac429b1acb182e86a449214a4c1f29668 SHA512 3c5e0b5d1394efe0bd3fa4cd8760694cf8627c172b03d70989f94023e82aac55e541979cc5d8ce49c83f0e49761cf684217b13bac7d4d19b3c8537c69d88177f WHIRLPOOL 3885f0b489ec8fa377c978c30e455071b6dfc506460e9676eb7bc3558011eae26b018c80da5a32118970e817f2ddaaefbfa78f5c43088d8d7dc126e8440a4000
+MISC ChangeLog 7292 SHA256 57791dc07612f85475beed1731cc18294fbd4bcf0f038e90bf85b986ec1ee31d SHA512 f07c9447823a80e826c5e3ba583a5ef0e10fbb6f030436240b039c1c1da690c812e84e559516f1f0d36a5b66b069341ea40d9af7751800de20462aedf47068db WHIRLPOOL f4082ca27b34306cd25825510edd5b03b5918e7a7aef55cb6d4f6a289a13c4d6ce1afbef290472660febaf6334e90907823abd957228b4a185a40a2996f1bfa6
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC ChangeLog-2014 123105 SHA256 f67108708d3d21b4acfca327aca42ceb4cc31201772dff496babfacb50acc4eb SHA512 bf6464e7e6ccdee81a4c26949176ebfb705f99e85a0120eea77f52b862fa3b8142abb006462f31e5a9053777836d4d9fdb69926d2b01b49463553740aecdbc43 WHIRLPOOL 114181b4c8e700a56bdf76b4de2e94998436b1b27df9182348ab88afd352085938686359369ffa4af929936e9ad88305efc97e22afd3b4c50b0dcf9669286fea
 MISC metadata.xml 794 SHA256 325b937cabfd7753347c3c911fb8be689b4a7b021430fca37a92c26e7af35433 SHA512 079c7985283d160b85a8dcd53fd54538ee83b9b36fb99327f03aeff16eb3c6dcbb399a01a381094a67be901d970f3c8fa649b2ac156522df3156db2853b6566f WHIRLPOOL c110adec0f1dcb170e4ba52523109d340543d37027f4c6c9f6e6998744c2720177f03a963e7cd162512459c193e5107f0764b8e3dccf7278b008e7cb8a715b8f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVCyXnAAoJEE8aJVXqcZkdN9cQAIJorR0BTrS4vo5acQfldYXM
-Yd8akAI3E2h43HKEQ0YiHd4tcBluo13Z7pPVj34inP+72H2h4J3Tva36NZHy/vTS
-hRg65d1yu5wcSjPFOr4w/wN8lUPJU/iCo3MCzFQbBi/SGxacd6sG3p8ITwl78a1g
-R6wZNArOJLnazM6BAV6Ua7VDnEcde5lVbcxSuq9pgoQGQtycAqBF644qTdy63W7H
-EHI4ePPFLWamsaZyA//KNv3rKM92QGVm//uzQuHuj5gxb0hbQ6EaoncRGbpBhC6P
-0SkomKWBknh+auRbKF/7KgZX2DPhwYFV3RdcMMTpBUDWqDW+Rk6S/o6nqCcK3OHt
-wge6G8/RKC9QJhJ21qWQCtSNXHHLEUG1vsavNwFHApJJRODIqKulws2gm4vwky4w
-kh7rwM71zxGpnv+xlK/4fFChueUqI8n0ZLYQbIEsfCvQBSyhIXkKBOOiY55gjNm0
-GiyxRDAz18dmu60nid+4BJoIMwll9sQ5Bbr0ffvNUiyN6DQsukhevLsKd8I6S/+9
-oqZ+UcOs+m6rHEICVE3VSsk5Pipc3hiNfpNPI3wy/+jT6yiXWlfVPVNQMTqGB/kV
-JKdkrs+zmiMbBtE+iVpLu7gefhIgFs2foF3411D5GV34rvG50tl1DViXQ/ZuIGFU
-V+PXtpmboTHrqHwniL+R
-=53H/
+iQIcBAEBCAAGBQJVExsYAAoJEE8aJVXqcZkds9UP+gOKIj1Dc2C30gIGXNKAL0zD
+ViNvslitNMohPfRt/gh2X4MUmvIM0KO17iFxmV+6YlMogg51bpBI7FzBjGW6o6Tu
+KgoDnsbZIKunMq1y+W7DIuGswSyF5lOFtRr/xaz03xYtTpDT9k+PMTepahdh0zG9
+CDEs1oEsqNXaHadkFFqQhePzanFiQKlAumkdW5uT24o7C96zCQ2kb+b92wghXdry
+C7/K85a9zCxhdo57cuvHGYSYCCUzzr7zgMPRzATn77icGV7GBrw5oNafA6l7jBKP
+VZike3AhG7ziDf1qv7DizA2jYo4qbj8eQipKrfOUH7QOkn3C9IMhL3onKgJcejRL
+e8ihtCjyOcGps0ZplwGrwfhjaEjNTVpQx2FAzz0OnGuooNCMX7f6aVEsS4sW04cV
+9lWJ+4SMeBTc1X4lSo5jrywu3jEoWoX4lbqgd4lxwilCNYv1HN3YNpzQoE0KRbCi
+39gsKDF18Vnna4Baacn/xnBqCRCWzl1CLdNCbf4LDTTq925d8XEChYh7IyrstgrR
+66J9DOrkxhqqo6vIpqV8Hli6XmMqVKGbogPc7YGDtYrbyhAE82AEnisGZPpMzAfo
+YFXhLY5qBlTNTIBpa+TzJFWJKfuc588sc0KrBNaVZKmrYYd2UDkUsfHzYIrl6vZO
+7aKRm+1hPTL93w3c6cTn
+=Ln7u
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-43.0.2327.5.ebuild b/www-client/chromium/chromium-43.0.2342.2.ebuild
similarity index 96%
rename from www-client/chromium/chromium-43.0.2327.5.ebuild
rename to www-client/chromium/chromium-43.0.2342.2.ebuild
index 3a80448b8d8e..88e78a31ae02 100644
--- a/www-client/chromium/chromium-43.0.2327.5.ebuild
+++ b/www-client/chromium/chromium-43.0.2342.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-43.0.2327.5.ebuild,v 1.1 2015/03/12 13:10:53 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-43.0.2342.2.ebuild,v 1.1 2015/03/25 20:31:13 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -19,8 +19,8 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bindist cups gnome gnome-keyring hidpi kerberos neon pic pulseaudio selinux +tcmalloc widevine"
-RESTRICT="!bindist? ( bindist )"
+IUSE="cups gnome gnome-keyring hidpi kerberos neon pic proprietary-codecs pulseaudio selinux +tcmalloc widevine"
+RESTRICT="proprietary-codecs? ( bindist )"
 
 # Native Client binaries are compiled with different set of flags, bug #452066.
 QA_FLAGS_IGNORED=".*\.nexe"
@@ -181,12 +181,6 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 
 	chromium_suid_sandbox_check_kernel_config
-
-	if use bindist; then
-		elog "bindist enabled: H.264 video support will be disabled."
-	else
-		elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
-	fi
 }
 
 src_prepare() {
@@ -243,7 +237,7 @@ src_prepare() {
 		'third_party/cros_system_api' \
 		'third_party/cython/python_flags.py' \
 		'third_party/dom_distiller_js' \
-		'third_party/dom_distiller_js/package/proto_gen/third_party/dom_distiller_js' \
+		'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
 		'third_party/ffmpeg' \
 		'third_party/fips181' \
 		'third_party/flot' \
@@ -416,15 +410,8 @@ src_configure() {
 		-Dlinux_use_bundled_gold=0
 		-Dlinux_use_gold_flags=0"
 
-	# Always support proprietary codecs.
-	myconf+=" -Dproprietary_codecs=1"
-
-	ffmpeg_branding="Chromium"
-	if ! use bindist; then
-		# Enable H.264 support in bundled ffmpeg.
-		ffmpeg_branding="Chrome"
-	fi
-	myconf+=" -Dffmpeg_branding=${ffmpeg_branding}"
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}"
 
 	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
 	# Note: these are for Gentoo use ONLY. For your own distribution,