From 7245ab961679a4d14a2a3eac45a36e85d6c6e5dc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pawe=C5=82=20Hajdan?= Date: Sat, 13 Mar 2010 10:26:35 +0000 Subject: [PATCH] Add blocker for incompatible plugin (gecko-mediaplayer) when USE=plugins-symlink is enabled, bug #309231 by George Reitsma . Package-Manager: portage-2.1.7.17/cvs/Linux i686 --- www-client/chromium-bin/ChangeLog | 9 ++++++++- .../chromium-bin/chromium-bin-4.0.295.0_p35884.ebuild | 9 ++++++++- .../chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild | 9 ++++++++- www-client/chromium-bin/chromium-bin-9999.ebuild | 9 ++++++++- 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/www-client/chromium-bin/ChangeLog b/www-client/chromium-bin/ChangeLog index 8e20c041d1d9..bd0955045217 100644 --- a/www-client/chromium-bin/ChangeLog +++ b/www-client/chromium-bin/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for www-client/chromium-bin # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v 1.60 2010/03/10 17:57:29 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v 1.61 2010/03/13 10:26:35 phajdan.jr Exp $ + + 13 Mar 2010; Pawel Hajdan jr + chromium-bin-4.0.295.0_p35884.ebuild, + chromium-bin-5.0.308.0_p37385.ebuild, chromium-bin-9999.ebuild: + Add blocker for incompatible plugin (gecko-mediaplayer) when + USE=plugins-symlink is enabled, bug #309231 by George Reitsma + . 10 Mar 2010; Bernard Cafarelli chromium-bin-4.0.295.0_p35884.ebuild, diff --git a/www-client/chromium-bin/chromium-bin-4.0.295.0_p35884.ebuild b/www-client/chromium-bin/chromium-bin-4.0.295.0_p35884.ebuild index 76391812b2e6..5cfaf1829dcf 100644 --- a/www-client/chromium-bin/chromium-bin-4.0.295.0_p35884.ebuild +++ b/www-client/chromium-bin/chromium-bin-4.0.295.0_p35884.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-bin/chromium-bin-4.0.295.0_p35884.ebuild,v 1.8 2010/03/10 17:57:29 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-4.0.295.0_p35884.ebuild,v 1.9 2010/03/13 10:26:35 phajdan.jr Exp $ EAPI="2" inherit eutils multilib portability @@ -36,6 +36,13 @@ RDEPEND="app-arch/bzip2 x11-themes/xfce4-icon-theme )" +# Incompatible system plugins: +# www-plugins/gecko-mediaplayer, bug #309231. +RDEPEND+=" + plugins-symlink? ( + !www-plugins/gecko-mediaplayer + )" + S=${WORKDIR} QA_EXECSTACK="opt/chromium.org/chrome-linux/chrome" diff --git a/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild b/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild index 72ac1724fb8e..b7ce49ddb2f8 100644 --- a/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild +++ b/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.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-bin/chromium-bin-5.0.308.0_p37385.ebuild,v 1.6 2010/03/10 17:57:29 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild,v 1.7 2010/03/13 10:26:35 phajdan.jr Exp $ EAPI="2" inherit eutils multilib portability @@ -37,6 +37,13 @@ RDEPEND="app-arch/bzip2 x11-themes/xfce4-icon-theme )" +# Incompatible system plugins: +# www-plugins/gecko-mediaplayer, bug #309231. +RDEPEND+=" + plugins-symlink? ( + !www-plugins/gecko-mediaplayer + )" + S=${WORKDIR} QA_EXECSTACK="opt/chromium.org/chrome-linux/chrome" diff --git a/www-client/chromium-bin/chromium-bin-9999.ebuild b/www-client/chromium-bin/chromium-bin-9999.ebuild index c5a793412235..55417a599f17 100644 --- a/www-client/chromium-bin/chromium-bin-9999.ebuild +++ b/www-client/chromium-bin/chromium-bin-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-bin/chromium-bin-9999.ebuild,v 1.36 2010/03/10 17:57:29 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild,v 1.37 2010/03/13 10:26:35 phajdan.jr Exp $ EAPI="2" inherit eutils multilib portability @@ -31,6 +31,13 @@ RDEPEND="app-arch/bzip2 x11-themes/xfce4-icon-theme )" +# Incompatible system plugins: +# www-plugins/gecko-mediaplayer, bug #309231. +RDEPEND+=" + plugins-symlink? ( + !www-plugins/gecko-mediaplayer + )" + S=${WORKDIR} QA_EXECSTACK="opt/chromium.org/chrome-linux/chrome" -- 2.26.2