Remove gecko-mediaplyer block, the plugin is blacklisted by upstream anyway, bug...

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

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index a6d282e6287fd729257d2a0239da2710ee080f7a..a6c156ab194dee3f117d4b9e89babd15092316bc 100644 (file)
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,11 @@
 # 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.138 2010/07/17 19:48:43 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.139 2010/07/18 11:49:53 phajdan.jr Exp $
+
+  18 Jul 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-5.0.375.99.ebuild:
+  Remove gecko-mediaplyer block, the plugin is blacklisted by upstream
+  anyway, bug #325867 by Ian Pickworth <ian@pickworth.me.uk>.
 
   17 Jul 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   chromium-6.0.466.0.ebuild, chromium-9999.ebuild:

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index ce64aa60b55d3ef76650a723525de5add5848b3a..1824e8e47752310c2196bacbe7db430077f36875 100644 (file)
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -7,9 +7,9 @@ AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a
 DIST chromium-5.0.375.99.tar.bz2 163269200 RMD160 0164f7b0fa099ac30279e3886d1d46ef5ed531c8 SHA1 6943978ea3262bf9ee913cbc36b03202774607ff SHA256 cfe592d252de04fd5051b6282740fe69dc7c8c86e13b419eeb1962b1a0ece82e
 DIST chromium-6.0.458.1.tar.bz2 123651881 RMD160 3422c4f7b58fc70fb6df66e85838a39f74ad6344 SHA1 5d50404c6004558bfe265f5c8c43471f73fa084d SHA256 7c9302240d75e36aa133b6d22b361ad5eea0c7b35d8c59c8e4d2970eeee44598
 DIST chromium-6.0.466.0.tar.bz2 123760791 RMD160 e9aed1c1b157d876783f5a281860618cd5555985 SHA1 2b95583e2d069b258b60996c72c7186829d32c7f SHA256 72719cd92ac5d2a313630fa6b808791585f9c7eb7775cbcbfa13cefd1f6a5dde
-EBUILD chromium-5.0.375.99.ebuild 5529 RMD160 1493ffc1c3a7c9fb3decd3e0e6ed9fec731ecdac SHA1 bab40e60d015598cc147d4c86363975206dbaa38 SHA256 b6b76232849e3b70ae03a254d58076de6b378cc3898c939c8a169dc8bfc4a47c
+EBUILD chromium-5.0.375.99.ebuild 5381 RMD160 18b82c91aa848061759f92b3c37f0f7da0bc7f3f SHA1 0cbed4ee5ae8b3b189a8d994cf982c5581f9be6a SHA256 2c67e43d3d407add70e1aa180d63bc1682ce742d3d4e2069e4bc5bb67eef3076
 EBUILD chromium-6.0.458.1.ebuild 6372 RMD160 d55f91e318a7a4e46b0ded28e779a453c802537c SHA1 20e0e149feae550e29849d018b50000e4842464e SHA256 1c536f70ac0d81ec131269078f7cd41ded347dfdd1646f381c0312edad7e689d
 EBUILD chromium-6.0.466.0.ebuild 6424 RMD160 2679258ff182fa595590b607ee297e9c5c1b8b0a SHA1 458cf570838180e000f37c7330651099c3b7ff14 SHA256 f23e421c30454b1797e70fcc05f123e54c29904d6294bb68bb2a72b48b721a9c
 EBUILD chromium-9999.ebuild 8068 RMD160 2abc72be9537bb6750b52425b6186421eaf344c1 SHA1 fedf4a0980f446e7a133c1b5a77f96e5b42fe2e1 SHA256 ec92818fbe1107bf132d9af3340d2ed8a433d6e5a34629d5a663541f30bfea83
-MISC ChangeLog 30622 RMD160 3ff686bece17e593403244de408071e7b272182b SHA1 2efef537489b209dde800ba72ce9ede0c024a656 SHA256 4f160f59e7fe31d3c593641c5c88555ccb1eb066282d1ed4fb9d3fb4e800c14e
+MISC ChangeLog 30841 RMD160 0d451c042aaa95debfb46bf15ef69ca43054674f SHA1 7f94708aa25bbf6f61bc20ab917e4e2918bf4615 SHA256 46e4a8bf8ac9e16190f6d72192707910d3ed68376d3a2990ee6e113d389eeff5
 MISC metadata.xml 378 RMD160 3309b2d1fb60157d0da1e22070ba3c448bd46b74 SHA1 0a8d13bb94e9836a14255b724b738c5df1f8ed7e SHA256 7d02fdca1b3c68d1202c720f1987713c28e38b1f9f3e30cbc3138c000572f08e

diff --git a/www-client/chromium/chromium-5.0.375.99.ebuild b/www-client/chromium/chromium-5.0.375.99.ebuild
index a2d0a688e129b6310c998daac2bb1129bff55412..15ec0c4e1623f4e36d239046c7ca8feda892a765 100644 (file)
--- a/www-client/chromium/chromium-5.0.375.99.ebuild
+++ b/www-client/chromium/chromium-5.0.375.99.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-5.0.375.99.ebuild,v 1.3 2010/07/06 19:04:58 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.375.99.ebuild,v 1.4 2010/07/18 11:49:53 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -45,13 +45,6 @@ RDEPEND+="
        x11-misc/xdg-utils
        virtual/ttf-fonts"
 
-# Incompatible system plugins:
-# www-plugins/gecko-mediaplayer, bug #309231.
-RDEPEND+="
-       plugins-symlink? (
-               !www-plugins/gecko-mediaplayer[gnome]
-       )"
-
 src_prepare() {
        # Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007
        epatch "${FILESDIR}"/${PN}-drop_sse2-r0.patch