Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/www-client/chromium
diff options
context:
space:
mode:
Diffstat (limited to 'www-client/chromium')
-rw-r--r--www-client/chromium/ChangeLog9
-rw-r--r--www-client/chromium/chromium-5.0.307.11.ebuild24
-rw-r--r--www-client/chromium/chromium-5.0.342.3.ebuild24
-rw-r--r--www-client/chromium/chromium-9999.ebuild24
4 files changed, 56 insertions, 25 deletions
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/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