Do not apply a patch already applied upstream, bug #324675 by nixtrian <nixtrian...

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

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index e94a692711e4b5d16d1877dd7627ac0cc4db300c..8b564f0531a84f3d98d4e464629245978d016080 100644 (file)
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.117 2010/06/19 16:12:26 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.118 2010/06/19 16:19:19 phajdan.jr Exp $
+
+  19 Jun 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> chromium-9999.ebuild:
+  Do not apply a patch already applied upstream, bug #324675 by nixtrian
+  <nixtrian@gmail.com>
 
   19 Jun 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   chromium-6.0.437.1.ebuild, chromium-9999.ebuild:

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index e13be68b5d9a1fd53ff5451011aa2120345e924f..d4eddb7932d929f05925f0471a09e4b049a94477 100644 (file)
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -13,6 +13,6 @@ DIST chromium-6.0.437.1.tar.bz2 124160031 RMD160 80ac4d434de50a923f11aebaf7755c9
 EBUILD chromium-5.0.375.70.ebuild 5653 RMD160 accd9bebc41a61e8544e2d2073bfa8eb558cb8cc SHA1 c48b195937ea1c65bde66fdf9be0dabba470644c SHA256 68904b0221796b90cbf779d107dd81c7f31bcab12068e27fe22d24c38977133a
 EBUILD chromium-6.0.427.0.ebuild 5869 RMD160 3db0e8f2a551247e1bf370dcc09f22af48dbb628 SHA1 7499494a3540b3e802dd5cbc75f857d7075c9e1d SHA256 caf0867efaa0c786653342e0e0b62b52f49f3ac705590bac62b978d80963883c
 EBUILD chromium-6.0.437.1.ebuild 6257 RMD160 dfcac562b59569258eb9559ed12e5babebd9c8ad SHA1 8c67b8a10afea8a2964894bce26453b71f12958f SHA256 6b856bb0f44e1fc4e0bbeb6614a1fc62ea67d603080cdd95c6dc0166267a0448
-EBUILD chromium-9999.ebuild 8010 RMD160 f90397cdaacda01db398b76cd1a57e9b90abf9f1 SHA1 286e30b1d3aeef7523ff10bd8f41849afd6ea30a SHA256 73aac6b6d87ffa1241f4f9f06b823ac03ce8e7b0b90ddfed468ab67129105bce
-MISC ChangeLog 26483 RMD160 0e224a524c9fc5f0ed5cb0eedb6ffb91e1d85f26 SHA1 8a7460b1d2b01d015ee119023d14e8e4c0d1f00a SHA256 67430050d68daf9dbd2e97bc61e189e46017eb047d279f63b3b6d81eb78d9bc5
+EBUILD chromium-9999.ebuild 7897 RMD160 12b5bceb2c85b834e47d40f3dbc1cbb0e1eb732b SHA1 655ec0e7b9faeadd8be7db13cbac3c7fcd3d2e2c SHA256 79ad3f731ef9111af14e7ec0054557d036210e46c0d09a79052d37e1e734c2d6
+MISC ChangeLog 26657 RMD160 659654ddcec4f8201bd5dfc5fca41fe7925a5a5c SHA1 ea06048265b60365ee218e4b75b3ff06c33d8464 SHA256 40bfe9a07fab753a8e7211b7e15f0a45484f2669d94a102e04c1c567a36d1fb1
 MISC metadata.xml 572 RMD160 458a635f4040d8552b46256c8437099608041b99 SHA1 6ed49919f57f709065cf06c148f1df68119a3b3f SHA256 4a433c3dadf06af7e3dca492ffaa3f26a6c4419de61a044609e2d528891e09a5

diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index cb20a13945bf42527ce810692f4e3821053dcd4a..7cd3b1003b0a4dd7b507545720208d4d4c70e57e 100644 (file)
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.59 2010/06/19 16:12:26 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.60 2010/06/19 16:19:19 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -108,9 +108,6 @@ src_prepare() {
        # Make dependency on cups optional, bug #324105.
        epatch "${FILESDIR}"/${PN}-optional-cups-r1.patch
 
-       # Fix gyp files to correctly support system-provided libraries.
-       epatch "${FILESDIR}"/${PN}-gyp-fixes-r2.patch
-
        remove_bundled_lib "third_party/bzip2"
        remove_bundled_lib "third_party/libevent"
        remove_bundled_lib "third_party/libjpeg"