summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2010-06-19 16:30:14 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2010-06-19 16:30:14 +0000
commit795f1210321ec23d7d15d6a03b72e975dd86833c (patch)
tree213dc75b0f8742aeb06e3094bf07e12e0865502b /www-client/chromium
parentalpha/ia64/sparc stable wrt #319711 (diff)
downloadgentoo-2-795f1210321ec23d7d15d6a03b72e975dd86833c.tar.gz
gentoo-2-795f1210321ec23d7d15d6a03b72e975dd86833c.tar.bz2
gentoo-2-795f1210321ec23d7d15d6a03b72e975dd86833c.zip
Move gnome-keyring from RDEPEND to DEPEND. According to http://crbug.com/12351 it's a compile-time-only dependency.
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'www-client/chromium')
-rw-r--r--www-client/chromium/ChangeLog7
-rw-r--r--www-client/chromium/chromium-6.0.437.1.ebuild4
-rw-r--r--www-client/chromium/chromium-9999.ebuild4
3 files changed, 10 insertions, 5 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 8b564f0531a8..f5dd8a1a584b 100644
--- 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.118 2010/06/19 16:19:19 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.119 2010/06/19 16:30:14 phajdan.jr Exp $
+
+ 19 Jun 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ chromium-6.0.437.1.ebuild, chromium-9999.ebuild:
+ Move gnome-keyring from RDEPEND to DEPEND. According to
+ http://crbug.com/12351 it's a compile-time-only dependency.
19 Jun 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> chromium-9999.ebuild:
Do not apply a patch already applied upstream, bug #324675 by nixtrian
diff --git a/www-client/chromium/chromium-6.0.437.1.ebuild b/www-client/chromium/chromium-6.0.437.1.ebuild
index 93019c7f7884..e0c957dc6a57 100644
--- a/www-client/chromium/chromium-6.0.437.1.ebuild
+++ b/www-client/chromium/chromium-6.0.437.1.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-6.0.437.1.ebuild,v 1.3 2010/06/19 16:12:26 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.437.1.ebuild,v 1.4 2010/06/19 16:30:14 phajdan.jr Exp $
EAPI="2"
@@ -21,7 +21,6 @@ RDEPEND="app-arch/bzip2
dev-libs/libxslt
>=dev-libs/nss-3.12.3
>=gnome-base/gconf-2.24.0
- >=gnome-base/gnome-keyring-2.28.2
>=media-libs/alsa-lib-1.0.19
media-libs/jpeg:0
media-libs/libpng
@@ -34,6 +33,7 @@ DEPEND="${RDEPEND}
dev-lang/perl
>=dev-util/gperf-3.0.3
>=dev-util/pkgconfig-0.23
+ >=gnome-base/gnome-keyring-2.28.2
sys-devel/flex"
RDEPEND+="
|| (
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index 7cd3b1003b0a..ffc519980720 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.60 2010/06/19 16:19:19 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.61 2010/06/19 16:30:14 phajdan.jr Exp $
EAPI="2"
@@ -23,7 +23,6 @@ RDEPEND="app-arch/bzip2
dev-libs/libxslt
>=dev-libs/nss-3.12.3
>=gnome-base/gconf-2.24.0
- >=gnome-base/gnome-keyring-2.28.2
>=media-libs/alsa-lib-1.0.19
media-libs/jpeg:0
media-libs/libpng
@@ -36,6 +35,7 @@ DEPEND="${RDEPEND}
dev-lang/perl
>=dev-util/gperf-3.0.3
>=dev-util/pkgconfig-0.23
+ >=gnome-base/gnome-keyring-2.28.2
sys-devel/flex"
RDEPEND+="
|| (