summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2009-12-22 20:51:11 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2009-12-22 20:51:11 +0000
commitc41158bd8501b23b508289f4b905b7ea3a6387eb (patch)
tree57e90611814f6e8cda0c65066a2c8f2335bf9509
parentUse emake -j1 for install, bug #297947. (diff)
downloadgentoo-2-c41158bd8501b23b508289f4b905b7ea3a6387eb.tar.gz
gentoo-2-c41158bd8501b23b508289f4b905b7ea3a6387eb.tar.bz2
gentoo-2-c41158bd8501b23b508289f4b905b7ea3a6387eb.zip
Allow other icon themes (xfce4 and tango) to satisfy icon theme
dependency for chromium. Thanks to Oleksandr Kovalenko <alx.kovalenko@gmail.com> in bug #292201. (Portage version: 2.1.6.13/cvs/Linux i686)
-rw-r--r--www-client/chromium/chromium-4.0.249.43.ebuild8
-rw-r--r--www-client/chromium/chromium-4.0.251.0.ebuild8
-rw-r--r--www-client/chromium/chromium-4.0.260.0.ebuild8
-rw-r--r--www-client/chromium/chromium-4.0.266.0.ebuild8
-rw-r--r--www-client/chromium/chromium-9999.ebuild8
5 files changed, 30 insertions, 10 deletions
diff --git a/www-client/chromium/chromium-4.0.249.43.ebuild b/www-client/chromium/chromium-4.0.249.43.ebuild
index c6f4391f2924..bc7598d84ea4 100644
--- a/www-client/chromium/chromium-4.0.249.43.ebuild
+++ b/www-client/chromium/chromium-4.0.249.43.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.249.43.ebuild,v 1.1 2009/12/20 09:00:10 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.249.43.ebuild,v 1.2 2009/12/22 20:51:11 phajdan.jr Exp $
EAPI="2"
inherit eutils multilib toolchain-funcs
@@ -27,7 +27,11 @@ RDEPEND="app-arch/bzip2
ffmpeg? ( >=media-video/ffmpeg-0.5_p19787 )
sys-libs/zlib
>=x11-libs/gtk+-2.14.7
- x11-themes/gnome-icon-theme"
+ || (
+ x11-themes/gnome-icon-theme
+ x11-themes/tango-icon-theme
+ x11-themes/xfce4-icon-theme
+ )"
# dev-db/sqlite:3
DEPEND="${RDEPEND}
>=dev-util/gperf-3.0.3
diff --git a/www-client/chromium/chromium-4.0.251.0.ebuild b/www-client/chromium/chromium-4.0.251.0.ebuild
index d79abb3d99e3..abf80f1ce7ad 100644
--- a/www-client/chromium/chromium-4.0.251.0.ebuild
+++ b/www-client/chromium/chromium-4.0.251.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.251.0.ebuild,v 1.4 2009/11/24 10:41:12 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.251.0.ebuild,v 1.5 2009/12/22 20:51:11 phajdan.jr Exp $
EAPI="2"
inherit eutils multilib toolchain-funcs
@@ -28,7 +28,11 @@ RDEPEND="app-arch/bzip2
ffmpeg? ( >=media-video/ffmpeg-0.5_p19787 )
sys-libs/zlib
>=x11-libs/gtk+-2.14.7
- x11-themes/gnome-icon-theme"
+ || (
+ x11-themes/gnome-icon-theme
+ x11-themes/tango-icon-theme
+ x11-themes/xfce4-icon-theme
+ )"
# dev-db/sqlite:3
DEPEND="${RDEPEND}
>=dev-util/gperf-3.0.3
diff --git a/www-client/chromium/chromium-4.0.260.0.ebuild b/www-client/chromium/chromium-4.0.260.0.ebuild
index 0848a822dec7..7fffd6101e2e 100644
--- a/www-client/chromium/chromium-4.0.260.0.ebuild
+++ b/www-client/chromium/chromium-4.0.260.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.260.0.ebuild,v 1.3 2009/12/02 17:14:31 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.260.0.ebuild,v 1.4 2009/12/22 20:51:11 phajdan.jr Exp $
EAPI="2"
inherit eutils multilib toolchain-funcs
@@ -28,7 +28,11 @@ RDEPEND="app-arch/bzip2
ffmpeg? ( >=media-video/ffmpeg-0.5_p19787 )
sys-libs/zlib
>=x11-libs/gtk+-2.14.7
- x11-themes/gnome-icon-theme"
+ || (
+ x11-themes/gnome-icon-theme
+ x11-themes/tango-icon-theme
+ x11-themes/xfce4-icon-theme
+ )"
# dev-db/sqlite:3
DEPEND="${RDEPEND}
>=dev-util/gperf-3.0.3
diff --git a/www-client/chromium/chromium-4.0.266.0.ebuild b/www-client/chromium/chromium-4.0.266.0.ebuild
index 1a2b9c3bbe0a..e2e65dcd13ce 100644
--- a/www-client/chromium/chromium-4.0.266.0.ebuild
+++ b/www-client/chromium/chromium-4.0.266.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.266.0.ebuild,v 1.2 2009/12/15 14:05:25 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.266.0.ebuild,v 1.3 2009/12/22 20:51:11 phajdan.jr Exp $
EAPI="2"
inherit eutils multilib toolchain-funcs
@@ -28,7 +28,11 @@ RDEPEND="app-arch/bzip2
ffmpeg? ( >=media-video/ffmpeg-0.5_p19787 )
sys-libs/zlib
>=x11-libs/gtk+-2.14.7
- x11-themes/gnome-icon-theme"
+ || (
+ x11-themes/gnome-icon-theme
+ x11-themes/tango-icon-theme
+ x11-themes/xfce4-icon-theme
+ )"
# dev-db/sqlite:3
DEPEND="${RDEPEND}
>=dev-util/gperf-3.0.3
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index 2ce7d0423d7e..ab456450ab44 100644
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 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.12 2009/12/15 14:05:25 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.13 2009/12/22 20:51:11 phajdan.jr Exp $
EAPI="2"
inherit eutils multilib toolchain-funcs subversion
@@ -29,7 +29,11 @@ RDEPEND="app-arch/bzip2
ffmpeg? ( >=media-video/ffmpeg-0.5_p19787 )
sys-libs/zlib
>=x11-libs/gtk+-2.14.7
- x11-themes/gnome-icon-theme"
+ || (
+ x11-themes/gnome-icon-theme
+ x11-themes/tango-icon-theme
+ x11-themes/xfce4-icon-theme
+ )"
# dev-db/sqlite:3
DEPEND="${RDEPEND}
>=dev-util/gperf-3.0.3