Version bump for beta channel release.

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

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index d8c039f3ba8d2baf4b3cd4e8ef036c69c94db132..69656369994a7a9fb09953718d9867cd0f278f47 100644 (file)
--- 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.448 2011/09/18 21:32:36 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.449 2011/09/24 23:28:13 phajdan.jr Exp $
+
+*chromium-15.0.874.21 (24 Sep 2011)
+
+  24 Sep 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-15.0.874.12.ebuild, +chromium-15.0.874.21.ebuild:
+  Version bump for beta channel release.
 
   18 Sep 2011; Thomas Kahle <tomka@gentoo.org> chromium-14.0.835.163.ebuild:
   x86 stable per bug 383251

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index e50badee4186b7049c8550f15d57431b70cab9e7..a66787858757121a25287a809dad1a868e3809d1 100644 (file)
--- 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
@@ -25,21 +25,21 @@ DIST chromium-13.0.782.215.tar.bz2 155299563 RMD160 c77f45f3740414d1debd7404d476
 DIST chromium-13.0.782.220.tar.bz2 155301680 RMD160 c5f70e66cd6d6463f8696b117008fa7759266e2b SHA1 271ddd7e8722d8c57d56d9f1fee42811dd358470 SHA256 ef7bf0abe264299235659b2ee3fc2008c6c9cf22d53118fad5891a30a15dbacd
 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.15.tar.bz2 151033498 RMD160 0aafe1e3c62262c6d76efdd8d575307c6d243dcf SHA1 4b1a27a8dd24fd1449e51cfe11564085a3a30314 SHA256 63a37537069c1599741c745a11d79235bf94873fb7a9612656e9e4d6c3a0a7c8
+DIST chromium-15.0.874.21.tar.bz2 151111765 RMD160 5b6ea3b2666279436e9da96f450d55680cc61e9f SHA1 402d665c2823b2a099ee8d131878930c3aa3ef6a SHA256 37ba97e42c140cf33cf489afc6c2559dff5daa7f732050dbe917c573bfeb977a
 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 13690 RMD160 517fe75786dabe160892afa24d3e0f38cf485a6d SHA1 6670def7f3058d06cedf10f2a0e955c145786eb5 SHA256 fe6c30231eae1b79e4a3aee376e84bd65c4dae77bdc7f77394bec970cfc2f314
-EBUILD chromium-15.0.874.12.ebuild 13884 RMD160 b97d6ab78ad3feeb2f9dd6ae13f70fe33f43f3c0 SHA1 fc0f75346af9931e533f009511239e6e12eb7606 SHA256 5d9b16edc4a89b5b277e84466e06e3b47c9ef24025a415a1d04d46a3e21ac810
 EBUILD chromium-15.0.874.15.ebuild 14066 RMD160 a9a633e0c69d10def0e4fa9b5b24b243a83e7a5d SHA1 20b313a3bc24f143a387a8cc45c169ad7366a5a9 SHA256 a983db355f72d76b9396df8a4751c1b0d94fb548f1f8e2f8d94ba015b1fd02fb
+EBUILD chromium-15.0.874.21.ebuild 14069 RMD160 4815764356b9d3635e321a92d350b310481433a3 SHA1 00d034231ba33bb43f8f2d6245c429eeb3647f60 SHA256 c85e18151374f7322fe6a9d5d0420f0afc972bb3f997269657dfa47bdc463564
 EBUILD chromium-9999-r1.ebuild 16651 RMD160 77d0c708ea3729d78f3344be783d79bd2dee46d8 SHA1 b707a400622bf548e3d883eb5c0e4e55b5da47a7 SHA256 6ff63c2455a1ee708c76ba30f448e08c38f97d61572ea3b9a3430422ddeab867
-MISC ChangeLog 99117 RMD160 a873a348dbb3624973d76f981fd254111c60a515 SHA1 3bae80464a5aca95cf31e57b93e2f4806e3108ce SHA256 aad65695e1422f02cea8ccfd5920979cb69dcd9d178ca07c84092b57a8a93e3a
+MISC ChangeLog 99318 RMD160 80d0f15495e5c9b483faa516c00352ee88ce4b96 SHA1 525e7769c108524ba7045496ba9470cac599b8bb SHA256 4814bcad55588913578240de4fbf36891e031b1f4a67ed96b1c17193fbd9b805
 MISC metadata.xml 495 RMD160 91f2c4344cde85374523c8c16f5987ad0320b607 SHA1 5e97c7979fac0de374958532e38fcbca1191963b SHA256 375fb24d5d647728a58b3a7d0d552bf7d8eb5f26eef3c249dcf9a2dcb9e5bb37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk52Y4YACgkQodBTJSDyo66cLwD/aP2VIzpxQW0ig9P+XeCi9u7V
-rfCPlsguqOOesMlpHHcA/iiOMlaTsBNDT/l0N3WhcUUBlTZaySMo+Om6tUu4br28
-=pLLI
+iEYEAREKAAYFAk5+Z5gACgkQuUQtlDBCeQKF9gCdEnjrb8CB1DqqfrfnrPXL5DAD
+w0wAn3wA8sa4FCf52mju3crRNK/lVWw7
+=7zcK
 -----END PGP SIGNATURE-----

diff --git a/www-client/chromium/chromium-15.0.874.12.ebuild b/www-client/chromium/chromium-15.0.874.21.ebuild
similarity index 97%
rename from www-client/chromium/chromium-15.0.874.12.ebuild
rename to www-client/chromium/chromium-15.0.874.21.ebuild
index 41a1874d79829e962ef9a5b708eebeaf998bf2f7..f29bb1ae05858b7ba89649830a16e5ea32bcaf32 100644 (file)
--- a/www-client/chromium/chromium-15.0.874.12.ebuild
+++ b/www-client/chromium/chromium-15.0.874.21.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.12.ebuild,v 1.3 2011/09/15 21:33:59 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-15.0.874.21.ebuild,v 1.1 2011/09/24 23:28:13 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -124,6 +124,11 @@ pkg_setup() {
 src_prepare() {
        cp "${FILESDIR}/nacl.gypi" chrome/ || die
 
+       # zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
+       sed -i '1i#define OF(x) x' \
+               third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.c \
+               chrome/common/zip.cc || die
+
        epatch_user
 
        # Remove most bundled libraries. Some are still needed.
@@ -206,13 +211,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.