Version bump for dev channel release. Fixed bug #381289 by Thomas Beinicke (temporarily disabled linux_link_kerberos. Removed old.

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

4 files changed, 36 insertions, 14 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 5be393fe3bc1..8093560caf94 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,14 @@
 # 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.444 2011/09/15 21:33:59 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.445 2011/09/16 18:18:37 phajdan.jr Exp $
+
+*chromium-15.0.874.15 (16 Sep 2011)
+
+  16 Sep 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-15.0.874.5.ebuild, +chromium-15.0.874.15.ebuild,
+  chromium-9999-r1.ebuild:
+  Version bump for dev channel release. Fixed bug #381289 by Thomas Beinicke
+  (temporarily disabled linux_link_kerberos. Removed old.
 
   15 Sep 2011; Mike Gilbert <floppym@gentoo.org> chromium-14.0.835.163.ebuild,
   chromium-15.0.874.12.ebuild, chromium-9999-r1.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 6a7edd877588..123328a424f4 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX chromium-browser.xml 407 RMD160 457374ff72561648d9777ffb3270ad10d864a6be SHA1 65543bfff7d0350d40ba258e61061b0c5579e1f2 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff
 AUX chromium-cups-r0.patch 1237 RMD160 601fc9a46027580a1817a77abfb47b2b59e212ca SHA1 9826e90746229c7c12d767bb3b6cbdbc5c300041 SHA256 594af80456d977a19949909a7c79cae706964f7ced47634c9c9b19478dc089a2
@@ -26,20 +26,21 @@ DIST chromium-13.0.782.220.tar.bz2 155301680 RMD160 c5f70e66cd6d6463f8696b117008
 DIST chromium-14.0.835.162.tar.bz2 155871784 RMD160 9f77bf399303d2a1d66cd71cf45961287d49e498 SHA1 8149c15393f4b388ed2ef3f42ccb9b90a13e86df SHA256 8c6a4edc7a2c711a8684ef512ea29f75c2f2b82768f5a09b2703c1a9f0f2fc1a
 DIST chromium-14.0.835.163.tar.bz2 155868619 RMD160 36009ea3db7270a90ffe9d77ba3a52d86d5d5a84 SHA1 f38e8835f4c12a61734eb99ee0a16d1386e2726d SHA256 2a16908fce65fda294448c43ec16dbbe3ff07603f0695126e5e845f727c6b5aa
 DIST chromium-15.0.874.12.tar.bz2 151010362 RMD160 b5451a1e2c23998067d8af38871419f78c4f38d9 SHA1 ab88e682f656066fc2c76e57e4863fef24a2a83a SHA256 fa6bf05cb6789439d51646fc266a3f0ce0f394391c2c6643698bd01da7fc3fcf
-DIST chromium-15.0.874.5.tar.bz2 150744444 RMD160 cd23c93ee7c8ee1c37eefe73caf63f2fe517df82 SHA1 44cc0cfc3184b2aa77417df1725c2ea63f567df1 SHA256 1513a217ec17712197660c348866d310c04fbb1d506f983b9785fb88239e7f08
+DIST chromium-15.0.874.15.tar.bz2 151033498 RMD160 0aafe1e3c62262c6d76efdd8d575307c6d243dcf SHA1 4b1a27a8dd24fd1449e51cfe11564085a3a30314 SHA256 63a37537069c1599741c745a11d79235bf94873fb7a9612656e9e4d6c3a0a7c8
 EBUILD chromium-13.0.782.215.ebuild 13227 RMD160 12c182f7a8075fd11f178e3453554c2ec622531a SHA1 e8b346b5fb66361d46226192bdbdffdc601498f5 SHA256 254756e4d874889efb4d46d712dd821d28fb816b117cf574031fa3ebd3dc66a0
 EBUILD chromium-13.0.782.220.ebuild 13227 RMD160 4a50e648c6d826f76e75d97e8422a771f2f77b68 SHA1 d08d6027fa2f381d9e7b6507831e5a836c708835 SHA256 d4f3703ee8ad6c814fc2648fdc649442875b7c85b6ebf4f1b7c371fd06aa40a5
 EBUILD chromium-14.0.835.162.ebuild 13179 RMD160 953ee6bd24599f27194859050fe65ad34211a347 SHA1 1d1afeee082a5eeac1ecc5104cf5720f0d58742d SHA256 dd2330d7a2befef68637810bdbc1549d04e890a35118416fa801d6a3fab4ed88
 EBUILD chromium-14.0.835.163.ebuild 13513 RMD160 cede77da61eb15c2b1b5bd4a6ed923fc7a75dc14 SHA1 14be5c0ed2c85b49c0b7a9a9dfbd5d03bf11fbc6 SHA256 7dfe3ede6cc7abfc7826a5ca888427f082a968d48539f28622997436b66e6708
 EBUILD chromium-15.0.874.12.ebuild 13884 RMD160 b97d6ab78ad3feeb2f9dd6ae13f70fe33f43f3c0 SHA1 fc0f75346af9931e533f009511239e6e12eb7606 SHA256 5d9b16edc4a89b5b277e84466e06e3b47c9ef24025a415a1d04d46a3e21ac810
-EBUILD chromium-15.0.874.5.ebuild 13552 RMD160 15f1a04a5da4805cc4ca9786bb49e28ba3ea7288 SHA1 ea408155a8f0892b41ab20b8370903677adc9b17 SHA256 3d2aeaa23a2ad41836947356379fbd7b81535307dc4ffad7a46f6bb12badaa26
-EBUILD chromium-9999-r1.ebuild 16469 RMD160 b1aaf4e721b8a9bc567c11a81cae62debe04f46d SHA1 6bb6113f799761a8176849c84740950e8649cdcb SHA256 4904a9f49fd9311e2b3f6c94451a649f734737377dff256b89c550f813d2752c
-MISC ChangeLog 98355 RMD160 75ccceb71d047c068e94f39980d8fb5878c91424 SHA1 2b4709e9efbe842e9e99aed5599afdcd33d70564 SHA256 be7f06db217139d42fe990c5b0bc4ef2cb50cdfa9fb83f6cc62ea4fa3e50516f
+EBUILD chromium-15.0.874.15.ebuild 13888 RMD160 b9ce3ae57b01df804995125b90bea14a132980d9 SHA1 315d01cb6ecf5aab80cbe48ff5e71878b20d0015 SHA256 90c2ab023002fc94877b9504ffd309304b5f67e670a4cf6a6f02436abd850b1d
+EBUILD chromium-9999-r1.ebuild 16473 RMD160 ab7639c0ffb5cc27c060e31a52cd5af38e6bfea0 SHA1 8654c727a534fb4f379d98aad897afdd696cf2ba SHA256 f9533b8dd81e0c34143d5ec0600751cae50263c8345e39959314104ab87dfb9b
+MISC ChangeLog 98674 RMD160 cde90e81e4f03278e69ec76246bfed1ae4f766c8 SHA1 010b170face32800d7c66e39bab8f8415f2f373d SHA256 7b429782291b7d9d76f5af1e7f65ed42cb2c9b808972cf6702467cc8119d2e7c
+MISC chromium-9999-r1.ebuild.orig 16469 RMD160 b1aaf4e721b8a9bc567c11a81cae62debe04f46d SHA1 6bb6113f799761a8176849c84740950e8649cdcb SHA256 4904a9f49fd9311e2b3f6c94451a649f734737377dff256b89c550f813d2752c
 MISC metadata.xml 495 RMD160 91f2c4344cde85374523c8c16f5987ad0320b607 SHA1 5e97c7979fac0de374958532e38fcbca1191963b SHA256 375fb24d5d647728a58b3a7d0d552bf7d8eb5f26eef3c249dcf9a2dcb9e5bb37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk5yb1EACgkQC77qH+pIQ6TmZgD+Ks/FbFtdzFHcFXFfZ1C9kPAC
-RtIAVFWMxpHAtdVYsNwA/19RWwteRsF7R/oNt2ohoQa2VVprMSVzVqVH13KrPUr0
-=mMh/
+iEYEAREKAAYFAk5zkwoACgkQuUQtlDBCeQI+MwCeIPCIHpRWPEzLlMTBTjb6Pfx3
+9A0AnjOhTHu7bQ38f4U8g0jtPYZUL/tk
+=zofv
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-15.0.874.5.ebuild b/www-client/chromium/chromium-15.0.874.15.ebuild
index 10f49648e434..c244964a6a27 100644
--- a/www-client/chromium/chromium-15.0.874.5.ebuild
+++ b/www-client/chromium/chromium-15.0.874.15.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-15.0.874.5.ebuild,v 1.1 2011/09/09 19:56:58 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-15.0.874.15.ebuild,v 1.1 2011/09/16 18:18:37 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 ~x86"
-IUSE="chromedriver cups gnome gnome-keyring kerberos pulseaudio"
+IUSE="bindist chromedriver cups gnome gnome-keyring kerberos pulseaudio"
 
 # en_US is ommitted on purpose from the list below. It must always be available.
 LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr
@@ -113,11 +113,19 @@ pkg_setup() {
 	# bug #363907.
 	CONFIG_CHECK="~PID_NS ~NET_NS"
 	check_extra_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() {
 	cp "${FILESDIR}/nacl.gypi" chrome/ || die
 
+	epatch_user
+
 	# Remove most bundled libraries. Some are still needed.
 	find third_party -type f \! -iname '*.gyp*' \
 		\! -path 'third_party/WebKit/*' \
@@ -198,13 +206,13 @@ src_configure() {
 		-Duse_system_zlib=1"
 
 	# Optional dependencies.
+	# TODO: linux_link_kerberos, bug #381289.
 	myconf+="
 		$(gyp_use cups 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 use_kerberos)
-		$(gyp_use kerberos linux_link_kerberos)
 		$(gyp_use pulseaudio use_pulseaudio)"
 
 	# Enable sandbox.
@@ -222,6 +230,11 @@ src_configure() {
 	# for Chromium.
 	# myconf+=" -Dproprietary_codecs=1"
 
+	if ! use bindist; then
+		# Enable H.624 support in bundled ffmpeg.
+		myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome"
+	fi
+
 	local myarch="$(tc-arch)"
 	if [[ $myarch = amd64 ]] ; then
 		myconf+=" -Dtarget_arch=x64"
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index eba29060a8f3..ab7bc828e557 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.53 2011/09/15 21:33:59 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.54 2011/09/16 18:18:37 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -257,13 +257,13 @@ src_configure() {
 		-Duse_system_zlib=1"
 
 	# Optional dependencies.
+	# TODO: linux_link_kerberos, bug #381289.
 	myconf+="
 		$(gyp_use cups 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 use_kerberos)
-		$(gyp_use kerberos linux_link_kerberos)
 		$(gyp_use pulseaudio use_pulseaudio)"
 
 	# Enable sandbox.