Version bump for beta channel release.

Package-Manager: portage-2.2.0_alpha73/cvs/Linux x86_64

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index fff82464a51c7eb305cff4742f8f3d5b212f0aff..770f7721935efdba74213020ac1ec62583ce5d52 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.499 2011/11/11 15:46:22 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.500 2011/11/11 17:44:49 floppym Exp $
+
+*chromium-16.0.912.36 (11 Nov 2011)
+
+  11 Nov 2011; Mike Gilbert <floppym@gentoo.org> +chromium-16.0.912.36.ebuild,
+  -chromium-16.0.912.21.ebuild:
+  Version bump for beta channel release.
 
   11 Nov 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   chromium-16.0.912.32.ebuild, chromium-17.0.932.0.ebuild,

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index f996b664630e1ce3f57b102f5b78b162a3859b56..9912a40d91cf87b27585daf0f36404c024957cc0 100644 (file)
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX chromium-browser.xml 407 RMD160 457374ff72561648d9777ffb3270ad10d864a6be SHA1 65543bfff7d0350d40ba258e61061b0c5579e1f2 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff
 AUX chromium-cups-r0.patch 726 RMD160 f3193ce9f987b6e5ad05a67d090ab4f9e1cb7b41 SHA1 8efd3479977e89429237d49fefbfcc63d250089e SHA256 800a669839ca7e033bb360b0cd9db92dde93505609c0b9184bf3901d2ec1535b
@@ -12,22 +12,22 @@ AUX dot-gclient 253 RMD160 a768770d8e6f5b73395451277beea1cc9240fc3a SHA1 3eaf207
 AUX extract_v8_version.py 731 RMD160 71b134c9b88902259cb20ec232b8da6c3d8a15de SHA1 3dc5d6f9437f4b0ffb584395e19663450384b53a SHA256 4011f1e2f44bd18ad1266dffc1d3fbc13a6430afade2b19240b31ee9437dcbda
 AUX nacl.gypi 98 RMD160 fa4806fbc8c2e19763c1905a3bc431022b247825 SHA1 df4cee39e1d49e10f9c075f5e6e9db28e8260926 SHA256 25bddd2eee7821e18ddda06f6e69552c359e1c04a10971ac3985556c3d8ef059
 DIST chromium-15.0.874.120.tar.bz2 151131909 RMD160 97a453d189116336b5fb291b1efa8354f3297c29 SHA1 ba1df188fc786334cee8d623b3d6123599a802f7 SHA256 bdfc4533708249b50743acaae4f49772e56c8070ea2fc4af114694c40d8ed929
-DIST chromium-16.0.912.21.tar.bz2 154072311 RMD160 d212ca36c9aabd622276e53777b93316f900c175 SHA1 809a1a6e0d2c8b036b8f7eb97c3fdf18e8af68cd SHA256 09417a33e9e620331f93c5e0904e3dbd8c4ca76a2766556702533b38aa4bd577
 DIST chromium-16.0.912.32.tar.bz2 154126364 RMD160 be1928af8c0095f76a58a618f66b3b06f7e1ca6e SHA1 8d1fe0ab8bf8fa2d6332ef4ad0c2a3f255367f0c SHA256 e2cdff16e68a6b60e54c3f519e8af3256497192fe6d98400369906c915d06713
+DIST chromium-16.0.912.36.tar.bz2 154332411 RMD160 74818d192905f00d5642b7b8388d74f3ece5b8fa SHA1 bc350d95d502aa07438ea1bbe598aac1bc0bbdde SHA256 75871833a9552f27e52f585411b514844e67b6328aba9535c9ec53b754e03541
 DIST chromium-17.0.928.0.tar.bz2 150539755 RMD160 306d46186a497c81461f539500f3c88e67fc5c85 SHA1 129b14bcd60121f32d5264e224535a867384a524 SHA256 471e7b96aa37aba4121f34db2a77de87fa3a6774e1376cc42ce7403cdb2f59ea
 DIST chromium-17.0.932.0.tar.bz2 156649015 RMD160 5ad608f601cec211343595b68f34ccc8dbe181b7 SHA1 d7414b0666aaf55cfa096e739bf539c4de3cf392 SHA256 61dabec8f17559de3b2ee6a537265850ccfaa8c36eb41e9cc4f135461e3f5b78
 EBUILD chromium-15.0.874.120.ebuild 14144 RMD160 f1771e74345fb39d4bcffe8c35aaaf6694473ed6 SHA1 92005b4245be841b0e320848c9fc00db553740b1 SHA256 2d4371ea7325caf115f24f49341f8aec0b978738334a2e1272569b5ea04d8ff4
-EBUILD chromium-16.0.912.21.ebuild 16515 RMD160 d728f26b57f2dd94066e64a8d0f3d90abd0b1512 SHA1 713ae33ba1e0353bb629984d2a954daccd6eef85 SHA256 b4051a317e5743363c2730a27a645dc9892d8c37a8719cc9112f41ee9aee5aba
 EBUILD chromium-16.0.912.32.ebuild 16605 RMD160 8b44e2d0d9c3a2b727c71fcc58cf1484a2da8244 SHA1 2f3822c574d8aea66d886aafd4f3f37c049e42d0 SHA256 729077a41821a5be15398eb47d9c45fe2d9ea482886a21272128c1e815a59cd1
+EBUILD chromium-16.0.912.36.ebuild 16602 RMD160 43bb9f4f7b9704c62054c069d880e618310faddd SHA1 80ff09e23789cb6611a270c2a10e80be4d5d575f SHA256 f2f4827a02fe7d72b411cc8a185fb4ce533858e0b32405df384a690605ca4290
 EBUILD chromium-17.0.928.0.ebuild 16551 RMD160 49104ce7304db68e7dca90f9610dd48ed3d8a5d4 SHA1 a002a02641d3b39054073f1dba7dbd64a989f4f2 SHA256 ebef48e9a561c86ed67ee9d36480e04baad3c50f76f85a1fbfb79334ac65cf92
 EBUILD chromium-17.0.932.0.ebuild 17048 RMD160 9d5e6bd5f553e3e6ca1929b0026d1a7791bdf59f SHA1 26bf74d03461bd395e4c63487dba4fbdd10c2e41 SHA256 a3bab0b389ad36f3b3855348158c45b60817522125b3a2813b0b79f91fdd8902
 EBUILD chromium-9999-r1.ebuild 19045 RMD160 2b22ca1b4280fa5e73c87182f6342bef5e0c78a1 SHA1 91f1db370c8257829f9bbdb0b24b5f2a705d0f7e SHA256 dd2c4480732ec61b84537dcf1bbec8820b18eaf90faaca6d213a7d4e4263f452
-MISC ChangeLog 109203 RMD160 44f7934d3b7f38ca2d5a6992c6203057092c64dc SHA1 e3223f0802090942924b5f83b3f4ba8bec578819 SHA256 7243717b7be0af2634f8e09cd4b324532661a1bd138dc208c6a8139e9661ee6e
+MISC ChangeLog 109390 RMD160 92bb924c8ff10c3ca27350fec3c802309a894d9c SHA1 a55e0a60b9cddbaa5a97bfae5e3fffba558dab4e SHA256 455ec4c769be749d8d7848c8338c0e7c340424443900c83e5fe82a50684d6e65
 MISC metadata.xml 267 RMD160 3a166415fec415d539c1b7c32ed40b188488b9fb SHA1 5c3d71a9cea27175cbe8c98369b42b79c8643c6c SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk69Q1YACgkQuUQtlDBCeQLzvACbBOqeze3q8CV8/r4OZPksNnwY
-6q8AnRPXrfxQZgf6BS0BUS7jaTRogiNW
-=/Cqs
+iF4EAREIAAYFAk69XxkACgkQC77qH+pIQ6R7sgD/edtD7J8nC78cfIOJi7M5QjlQ
+5oWWH+j2VIYfBsRbNSkBAJVzFhRX0gl1yu773AUrO+/vhjBPSlGwh3ib5zNY23Y3
+=UtvR
 -----END PGP SIGNATURE-----

diff --git a/www-client/chromium/chromium-16.0.912.21.ebuild b/www-client/chromium/chromium-16.0.912.36.ebuild
similarity index 98%
rename from www-client/chromium/chromium-16.0.912.21.ebuild
rename to www-client/chromium/chromium-16.0.912.36.ebuild
index a471dde16eeb486f982b3adedeb0e94e14e77747..66a0dcf08e8b10e92fafd6ff346bf00a45f608ac 100644 (file)
--- a/www-client/chromium/chromium-16.0.912.21.ebuild
+++ b/www-client/chromium/chromium-16.0.912.36.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-16.0.912.21.ebuild,v 1.3 2011/11/04 14:49:03 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-16.0.912.36.ebuild,v 1.1 2011/11/11 17:44:49 floppym Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="bindist gnome gnome-keyring kerberos pulseaudio"
+IUSE="bindist 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
@@ -26,12 +26,15 @@ for lang in ${LANGS}; do
 done
 
 RDEPEND="app-arch/bzip2
+       cups? (
+               dev-libs/libgcrypt
+               >=net-print/cups-1.3.11
+       )
        >=dev-lang/v8-3.6.5.1
        dev-libs/dbus-glib
        dev-libs/elfutils
        >=dev-libs/icu-4.4.1
        >=dev-libs/libevent-1.4.13
-       dev-libs/libgcrypt
        dev-libs/libxml2[icu]
        dev-libs/libxslt
        >=dev-libs/nss-3.12.3
@@ -43,7 +46,6 @@ RDEPEND="app-arch/bzip2
        media-libs/libpng
        >=media-libs/libwebp-0.1.2
        media-libs/speex
-       >=net-print/cups-1.3.11
        pulseaudio? ( media-sound/pulseaudio )
        sys-libs/zlib
        x11-libs/gtk+:2
@@ -98,17 +100,6 @@ get_installed_v8_version() {
        best_version dev-lang/v8 | sed -e 's@dev-lang/v8-@@g'
 }
 
-pkg_pretend() {
-       if [[ "${MERGE_TYPE}" == "source" || "${MERGE_TYPE}" == "binary" ]]; then
-               # Fail if the kernel doesn't support features needed for sandboxing,
-               # bug #363907.
-               ERROR_PID_NS="PID_NS is required for sandbox to work"
-               ERROR_NET_NS="NET_NS is required for sandbox to work"
-               CONFIG_CHECK="~PID_NS ~NET_NS"
-               check_extra_config
-       fi
-}
-
 if ! has chromium-pkg_die ${EBUILD_DEATH_HOOKS}; then
        EBUILD_DEATH_HOOKS+=" chromium-pkg_die";
 fi
@@ -160,6 +151,15 @@ pkg_setup() {
        python_set_active_version 2
        python_pkg_setup
 
+       if [[ "${MERGE_TYPE}" == "source" || "${MERGE_TYPE}" == "binary" ]]; then
+               # Fail if the kernel doesn't support features needed for sandboxing,
+               # bug #363907.
+               ERROR_PID_NS="PID_NS is required for sandbox to work"
+               ERROR_NET_NS="NET_NS is required for sandbox to work"
+               CONFIG_CHECK="~PID_NS ~NET_NS"
+               check_extra_config
+       fi
+
        if use bindist; then
                elog "bindist enabled: H.264 video support will be disabled."
        else
@@ -176,6 +176,8 @@ src_prepare() {
                third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.c \
                chrome/common/zip.cc || die
 
+       epatch "${FILESDIR}/${PN}-cups-r0.patch"
+
        epatch_user
 
        # Remove most bundled libraries. Some are still needed.
@@ -271,6 +273,7 @@ src_configure() {
        # 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)
@@ -317,8 +320,9 @@ src_configure() {
        # the build to fail because of that.
        myconf+=" -Dwerror="
 
-       # Avoid a build error with -Os, bug #352457.
+       # Avoid CFLAGS problems, bug #352457, bug #390147.
        replace-flags "-Os" "-O2"
+       strip-flags
 
        egyp ${myconf} || die
 }