Add blocker for incompatible plugin (gecko-mediaplayer) when

USE=plugins-symlink is enabled, bug #309231 by George Reitsma
<g.p.reitsma@ieee.org>. Also clean up DEPEND vs. RDEPEND a bit.
Package-Manager: portage-2.1.7.17/cvs/Linux i686

6 files changed, 66 insertions, 33 deletions

diff --git a/www-client/chromium-bin/Manifest b/www-client/chromium-bin/Manifest
index b741d61fa908..fb85819920df 100644
--- a/www-client/chromium-bin/Manifest
+++ b/www-client/chromium-bin/Manifest
@@ -3,8 +3,8 @@ DIST chromium-bin-amd64-35884.zip 23005383 RMD160 ac472aa28ab42245bc3415d8edc068
 DIST chromium-bin-amd64-37385.zip 23694303 RMD160 ac6311220b977d6c386a68d76cb4e4f4932e9f14 SHA1 97f1313d772a75456fbe281a38cc2437166f4d57 SHA256 aedbcf87d7749d1b51f33b2e878178f5aa967fb6a58d739262ee52d0c53efbf3
 DIST chromium-bin-x86-35884.zip 22214326 RMD160 baf50cac0b74f4afff1940c3bb75b4183f2ee6f1 SHA1 9e69041c9e45f6590c3c72c08f660077fbe2b462 SHA256 6bb7fe923c0aa0e73e62c069ffc9dcc091e12db72515be44fffee031d1c3b196
 DIST chromium-bin-x86-37385.zip 22934874 RMD160 007189f02689f76924db4043c74f0241c90b7f78 SHA1 038f8771a3fb5d7b220ad243f1a0d1b6b8c003c9 SHA256 2b2e99ec12656670dce8e43ca9156cd978a7701c556a5e64dba190eea35c704b
-EBUILD chromium-bin-4.0.295.0_p35884.ebuild 4359 RMD160 9e0857aa19981825b0452d32f7af7e1016ce3e9b SHA1 10555601f816dfd7af28ffa69b33a35a9fce7af8 SHA256 ae6fa1ccf19d56042a6d08ebf9db55a5c521ec5150afd00bf135a683605848f2
-EBUILD chromium-bin-5.0.308.0_p37385.ebuild 4491 RMD160 1299f984f5739dbc8e7c8048e137f3ee52263d50 SHA1 7e3284801f403f330e74c30cc5fe02e5ec1cdda7 SHA256 c06e10a7f4d6f1c94ce28ba078683043b9dcec47e49bb5d7978f6e2251b21e4b
-EBUILD chromium-bin-9999.ebuild 4527 RMD160 64730f1d1f15995d98c1cf62d3fcd2e5587e3827 SHA1 a6c1e5eebd0ee4070e15e6c56f91442fb3eec25c SHA256 0ca0cb5b37756d7e2a459f37a9122a681c5ed0a5a7ea62f702806caebe9bc83b
-MISC ChangeLog 14022 RMD160 8d3257ba4934f4f6e252cf287342f56c4d13e0c6 SHA1 2d24b9989e216f57bbc2606dce33d302d1286732 SHA256 993b238c296425ddcfeece81ccc3843e7bc8a827842dd5527b1448d83479b16e
+EBUILD chromium-bin-4.0.295.0_p35884.ebuild 4507 RMD160 e04a2027cff62d77c16f193f144ee70ee4911733 SHA1 f041470967172402596c9aeb620ce03edf15aad0 SHA256 abd58bacc6de7898dde1dc50e8f91e133179728af5048d615884d27f4d5b9416
+EBUILD chromium-bin-5.0.308.0_p37385.ebuild 4639 RMD160 2c7069cfa12ce0d92ede06d830899ebc18a2e394 SHA1 12f8998096567df33512a87e8474ea2cf4129c7a SHA256 a2e988f16fc617eb7269525160f0106e99d3f2ecf8aa866a477a43805990fd79
+EBUILD chromium-bin-9999.ebuild 4675 RMD160 c66eccf46a38d9729664ce9585e9392423e93a43 SHA1 a6621c8e113e98844c8e55948af632540e1decf5 SHA256 7354a60142ce0a4aeb86a1f5bae54d59b74fe7436353c759eeffb0204a27f8d6
+MISC ChangeLog 14339 RMD160 88943d9f98e3dabd9e58eb8d11d5caaf25f905cf SHA1 664db0a0e77109dc22688440b5781e564522d05c SHA256 fe4d9ca7aff577d3bac7a2f655f439c4fc9feab20782c2d3c9a55291b35541b8
 MISC metadata.xml 630 RMD160 e9abef5d7ffcbd062f0f93013cc6a9676abc0329 SHA1 c56feb0fd92457e49720a25e50df732078b1dfc8 SHA256 0b723daf2cdb3658db7de722c8901abcfab9b0124d108e7770ff7c33606c66c8
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 0dc917747738..d39fa5a30eef 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,13 @@
 # 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.65 2010/03/12 09:08:53 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.66 2010/03/13 10:21:54 phajdan.jr Exp $
+
+  13 Mar 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-5.0.307.11.ebuild, chromium-5.0.342.3.ebuild,
+  chromium-9999.ebuild:
+  Add blocker for incompatible plugin (gecko-mediaplayer) when
+  USE=plugins-symlink is enabled, bug #309231 by George Reitsma
+  <g.p.reitsma@ieee.org>. Also clean up DEPEND vs. RDEPEND a bit.
 
 *chromium-5.0.342.3 (12 Mar 2010)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 36167ddfebdf..03cdc78730c4 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -7,10 +7,12 @@ DIST chromium-5.0.307.11.tar.bz2 153145874 RMD160 2e8820fae4bd2ca0b6e7c4c3f0d10e
 DIST chromium-5.0.307.9.tar.bz2 145145238 RMD160 9184b6f8f863c28beec0bac499ec447fcfa0a247 SHA1 7b332148ca72d3c789dc9339e428f9b3674a24ba SHA256 afaf8a84dbd30362b5d7b1a04aa53c98a0c78bad8459a0e56258dbeef861606c
 DIST chromium-5.0.342.1.tar.bz2 155567577 RMD160 66bedd73724406aaa6125e15f3ca40ec8ba19ded SHA1 d388742f86f466450259367ef9bae97142db8977 SHA256 5408bce1a9b0820dfd227600611f1ca75164b8ace0b825dd04022b683448ab16
 DIST chromium-5.0.342.3.tar.bz2 155595842 RMD160 8926db91cafd389c2cb1ae24728409e0c9ca4dc1 SHA1 87d0efe88e6c2f43490929bb321a1a6916991b74 SHA256 5d31867ad4bc1e7b10b9d42c136ba254dadd34faf144b1ab65267b950dd991e5
-EBUILD chromium-5.0.307.11.ebuild 5976 RMD160 562edf408011bb22401ebd8e20776e0e9c7c17fa SHA1 b226767ac13f58b3389f3d25e6dfb192b9799853 SHA256 6cde32f0ce480499d7277ae6cc153026300d56138ec5910fc8ad97fb3cc06f02
+EBUILD chromium-5.0.307.11.ebuild 6134 RMD160 260d30499d51c4f879f78bc19eb885703d9e3242 SHA1 9d86848ad6f59f59f84e9cd4b46581b0850ae47c SHA256 e3d309cfedd8ea05a46e38a3419ca6e4fa09b8bafc061467cb9074986ba1fcb3
 EBUILD chromium-5.0.307.9.ebuild 5924 RMD160 9224ac0227fe0c1363c2dbe48c8e490cd8b5652d SHA1 47b83b8671a7a8d390006d920f8c77ae4aa9b7ba SHA256 80d9ef52210c0c003c436a51618c372eaa364878da2074bdd36927a6d97e6505
 EBUILD chromium-5.0.342.1.ebuild 6286 RMD160 ee86594b57aae36c1ed64957fc2e8e3528a9d4e9 SHA1 35b5ee736c797f01512f6c5a764863201759a808 SHA256 7404fd24454eaaba38fed09f4383bd28488d2bafc895ea4e7982e17036639aed
-EBUILD chromium-5.0.342.3.ebuild 6286 RMD160 14dcdacacbfc5af9cc1de977f36e06227a453c8b SHA1 d769a1c81f75091c072982f0008c0986b2c365ef SHA256 a22c93b6df429a6ccc60cab750579694a86ad079a3a36e18fa56b2fa3f724ad9
-EBUILD chromium-9999.ebuild 8039 RMD160 0d5701ed65da0c9bdd4b2a452c0574734e4ec7d7 SHA1 ff11f39e0c4f7fc6cb990ac12fc275172aa171f6 SHA256 c578fa603f9adabd0cd961bfa9941b1eabe525e7fec36fef3341a87577763801
-MISC ChangeLog 14932 RMD160 b6ce98f4eee8dd9687cca3a574989dd570a277db SHA1 e251bc3fad215ed316f3ef02e2df7ecce08448d6 SHA256 00273d8e02ce4f5c79be75880aee59bc193abd855896762b2085400e5ff0837b
+EBUILD chromium-5.0.342.3.ebuild 6444 RMD160 fbf925b709c9ab9447c97a45996c3d1ed4943a54 SHA1 a9080d2b0d9d635b3c91f38fece4367361cb9128 SHA256 3a79530ffa7a503f60eed483750ddbc8288b518914311e0dc09d5e2639aaef18
+EBUILD chromium-9999.ebuild 8197 RMD160 d3006cc18a2171dbe42d3ae1be21ca2d8cb1b1a1 SHA1 a45ee47474be0094e491448fc974669928ccb6bc SHA256 2e97d46a216175a9d8317b6c24347f76e91beb4cce5bf59600b8398fa06a1248
+MISC ChangeLog 15262 RMD160 968f2edc6a2f741f2347a81f24935bf11777ead5 SHA1 38613625d2394941e60417344aecda9336956bc2 SHA256 a7563b11c2fde690ba86d72fa2fdb8cf6c0e0dbc594ea1bbd39e17d44c75b6d2
+MISC chromium-5.0.307.11.ebuild.orig 5976 RMD160 562edf408011bb22401ebd8e20776e0e9c7c17fa SHA1 b226767ac13f58b3389f3d25e6dfb192b9799853 SHA256 6cde32f0ce480499d7277ae6cc153026300d56138ec5910fc8ad97fb3cc06f02
+MISC chromium-5.0.342.3.ebuild.orig 6286 RMD160 14dcdacacbfc5af9cc1de977f36e06227a453c8b SHA1 d769a1c81f75091c072982f0008c0986b2c365ef SHA256 a22c93b6df429a6ccc60cab750579694a86ad079a3a36e18fa56b2fa3f724ad9
 MISC metadata.xml 674 RMD160 5904280e3a216e0d322f1649e14f52f68cd00a39 SHA1 c2310be724a3345e36f644b53b8cfa02d3abdbed SHA256 e05422220666ef456f98ada2f42078b37400b538a452c1e3cee2945d7769dc5c
diff --git a/www-client/chromium/chromium-5.0.307.11.ebuild b/www-client/chromium/chromium-5.0.307.11.ebuild
index b41c52caee15..82e360a6a950 100644
--- a/www-client/chromium/chromium-5.0.307.11.ebuild
+++ b/www-client/chromium/chromium-5.0.307.11.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.307.11.ebuild,v 1.2 2010/03/01 10:26:59 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.307.11.ebuild,v 1.3 2010/03/13 10:21:54 phajdan.jr Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib portability toolchain-funcs
@@ -27,18 +27,26 @@ RDEPEND="app-arch/bzip2
 	ffmpeg? ( >=media-video/ffmpeg-0.5_p19787 )
 	sys-libs/zlib
 	>=x11-libs/gtk+-2.14.7
-	x11-libs/libXScrnSaver
-	x11-misc/xdg-utils
-	|| (
-		x11-themes/gnome-icon-theme
-		x11-themes/tango-icon-theme
-		x11-themes/xfce4-icon-theme
-	)"
+	x11-libs/libXScrnSaver"
 #	dev-db/sqlite:3
 DEPEND="${RDEPEND}
 	>=dev-util/gperf-3.0.3
 	>=dev-util/pkgconfig-0.23
 	sys-devel/flex"
+RDEPEND+="
+	|| (
+		x11-themes/gnome-icon-theme
+		x11-themes/tango-icon-theme
+		x11-themes/xfce4-icon-theme
+	)
+	x11-misc/xdg-utils"
+
+# Incompatible system plugins:
+# www-plugins/gecko-mediaplayer, bug #309231.
+RDEPEND+="
+	plugins-symlink? (
+		!www-plugins/gecko-mediaplayer
+	)"
 
 pkg_setup() {
 	if [[ "${ROOT}" == "/" ]]; then
diff --git a/www-client/chromium/chromium-5.0.342.3.ebuild b/www-client/chromium/chromium-5.0.342.3.ebuild
index 750a11109335..7623438b1ea8 100644
--- a/www-client/chromium/chromium-5.0.342.3.ebuild
+++ b/www-client/chromium/chromium-5.0.342.3.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.342.3.ebuild,v 1.1 2010/03/12 09:08:53 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.342.3.ebuild,v 1.2 2010/03/13 10:21:54 phajdan.jr Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib portability toolchain-funcs
@@ -26,18 +26,26 @@ RDEPEND="app-arch/bzip2
 	ffmpeg? ( >=media-video/ffmpeg-0.5_p21602 )
 	sys-libs/zlib
 	>=x11-libs/gtk+-2.14.7
-	x11-libs/libXScrnSaver
-	x11-misc/xdg-utils
-	|| (
-		x11-themes/gnome-icon-theme
-		x11-themes/tango-icon-theme
-		x11-themes/xfce4-icon-theme
-	)"
+	x11-libs/libXScrnSaver"
 #	dev-db/sqlite:3
 DEPEND="${RDEPEND}
 	>=dev-util/gperf-3.0.3
 	>=dev-util/pkgconfig-0.23
 	sys-devel/flex"
+RDEPEND+="
+	|| (
+		x11-themes/gnome-icon-theme
+		x11-themes/tango-icon-theme
+		x11-themes/xfce4-icon-theme
+	)
+	x11-misc/xdg-utils"
+
+# Incompatible system plugins:
+# www-plugins/gecko-mediaplayer, bug #309231.
+RDEPEND+="
+	plugins-symlink? (
+		!www-plugins/gecko-mediaplayer
+	)"
 
 pkg_setup() {
 	if [[ "${ROOT}" == "/" ]]; then
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index 2c60634ce556..a0c15d709fd0 100644
--- 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.32 2010/03/03 17:57:17 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.33 2010/03/13 10:21:54 phajdan.jr Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib portability subversion toolchain-funcs
@@ -28,18 +28,26 @@ RDEPEND="app-arch/bzip2
 	ffmpeg? ( >=media-video/ffmpeg-0.5_p21602 )
 	sys-libs/zlib
 	>=x11-libs/gtk+-2.14.7
-	x11-libs/libXScrnSaver
-	x11-misc/xdg-utils
-	|| (
-		x11-themes/gnome-icon-theme
-		x11-themes/tango-icon-theme
-		x11-themes/xfce4-icon-theme
-	)"
+	x11-libs/libXScrnSaver"
 #	dev-db/sqlite:3
 DEPEND="${RDEPEND}
 	>=dev-util/gperf-3.0.3
 	>=dev-util/pkgconfig-0.23
 	sys-devel/flex"
+RDEPEND+="
+	|| (
+		x11-themes/gnome-icon-theme
+		x11-themes/tango-icon-theme
+		x11-themes/xfce4-icon-theme
+	)
+	x11-misc/xdg-utils"
+
+# Incompatible system plugins:
+# www-plugins/gecko-mediaplayer, bug #309231.
+RDEPEND+="
+	plugins-symlink? (
+		!www-plugins/gecko-mediaplayer
+	)"
 
 pkg_setup() {
 	if [[ "${ROOT}" == "/" ]]; then