summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@gentoo.org>2010-03-06 21:43:59 +0000
committerNirbheek Chauhan <nirbheek@gentoo.org>2010-03-06 21:43:59 +0000
commit431dc6b9dd673d089894bcbeee0f1a12fa2078b6 (patch)
treef8b3287a88dd397f200f090e05bb004a6ee56707 /gnome-base/gnome
parentNo files should be compressed in the tree (diff)
downloadgentoo-2-431dc6b9dd673d089894bcbeee0f1a12fa2078b6.tar.gz
gentoo-2-431dc6b9dd673d089894bcbeee0f1a12fa2078b6.tar.bz2
gentoo-2-431dc6b9dd673d089894bcbeee0f1a12fa2078b6.zip
Fix bug 306431 by adding a dependency on gvfs[gdu]. Also move it to PDEPEND to prevent circular dependencies (gnome -> nautilus, gvfs[gdu] -> gnome-disk-utility[nautilus] -> nautilus)
(Portage version: 2.1.7.17/cvs/Linux i686)
Diffstat (limited to 'gnome-base/gnome')
-rw-r--r--gnome-base/gnome/ChangeLog7
-rw-r--r--gnome-base/gnome/gnome-2.28.2.ebuild7
2 files changed, 10 insertions, 4 deletions
diff --git a/gnome-base/gnome/ChangeLog b/gnome-base/gnome/ChangeLog
index cd2e4aa34be9..4d9b68b33c81 100644
--- a/gnome-base/gnome/ChangeLog
+++ b/gnome-base/gnome/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for gnome-base/gnome
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.374 2010/02/24 23:45:08 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.375 2010/03/06 21:43:59 nirbheek Exp $
+
+ 06 Mar 2010; Nirbheek Chauhan <nirbheek@gentoo.org> gnome-2.28.2.ebuild:
+ Fix bug 306431 by adding a dependency on gvfs[gdu]. Also move it to
+ PDEPEND to prevent circular dependencies (gnome -> nautilus, gvfs[gdu] ->
+ gnome-disk-utility[nautilus] -> nautilus)
*gnome-2.28.2 (24 Feb 2010)
diff --git a/gnome-base/gnome/gnome-2.28.2.ebuild b/gnome-base/gnome/gnome-2.28.2.ebuild
index 159cac3a12d9..c9aa7ad166db 100644
--- a/gnome-base/gnome/gnome-2.28.2.ebuild
+++ b/gnome-base/gnome/gnome-2.28.2.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.28.2.ebuild,v 1.1 2010/02/24 23:45:08 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.28.2.ebuild,v 1.2 2010/03/06 21:43:59 nirbheek Exp $
-EAPI="1"
+EAPI="2"
DESCRIPTION="Meta package for the GNOME desktop"
HOMEPAGE="http://www.gnome.org/"
@@ -58,7 +58,6 @@ RDEPEND="
>=gnome-base/gnome-settings-daemon-2.28.1
>=gnome-base/gnome-control-center-2.28.1
- >=gnome-base/gvfs-1.4.3
>=gnome-base/nautilus-2.28.4
>=media-libs/gstreamer-0.10.25
@@ -157,6 +156,8 @@ RDEPEND="
mono? (
>=dev-dotnet/gtk-sharp-2.12.9
>=app-misc/tomboy-1.0.1 )"
+DEPEND=""
+PDEPEND=">=gnome-base/gvfs-1.4.3[gdu]"
# Broken from assumptions of gnome-vfs headers being included in nautilus headers,
# which isn't the case with nautilus-2.22, bug #216019
# >=app-admin/gnome-system-tools-2.28.2