Version bump for dev channel release. Remove old.

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

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index f41c349f3f49ae7aadb20063e02dad1ea10a2f95..04b9e1df52896399153e7c43f2de164a936dd098 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.506 2011/11/18 10:32:18 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.507 2011/11/18 19:20:04 phajdan.jr Exp $
+
+*chromium-17.0.942.0 (18 Nov 2011)
+
+  18 Nov 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-17.0.932.0.ebuild, +chromium-17.0.942.0.ebuild:
+  Version bump for dev channel release. Remove old.
 
   18 Nov 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   -chromium-15.0.874.120.ebuild, chromium-15.0.874.121.ebuild:

diff --git a/www-client/chromium/chromium-17.0.932.0.ebuild b/www-client/chromium/chromium-17.0.942.0.ebuild
similarity index 99%
rename from www-client/chromium/chromium-17.0.932.0.ebuild
rename to www-client/chromium/chromium-17.0.942.0.ebuild
index e436228254fec812254fb167e4352a070a3c5dcc..5d5437cd032b055223eedf1a00a02a9a33db87ed 100644 (file)
--- a/www-client/chromium/chromium-17.0.932.0.ebuild
+++ b/www-client/chromium/chromium-17.0.942.0.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-17.0.932.0.ebuild,v 1.3 2011/11/11 15:46:22 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-17.0.942.0.ebuild,v 1.1 2011/11/18 19:20:04 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -175,9 +175,7 @@ src_prepare() {
        # 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 "${FILESDIR}/${PN}-cups-r0.patch"
+               chrome/common/zip*.cc || die
 
        epatch_user