Clean libgnome-keyring, rarian and udisks dependencies.

(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)

4 files changed, 18 insertions, 22 deletions

diff --git a/sys-apps/gnome-disk-utility/ChangeLog b/sys-apps/gnome-disk-utility/ChangeLog
index d823459053de..02cd29d89748 100644
--- a/sys-apps/gnome-disk-utility/ChangeLog
+++ b/sys-apps/gnome-disk-utility/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/gnome-disk-utility
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.53 2011/08/15 12:26:09 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.54 2011/10/01 20:44:18 ssuominen Exp $
+
+  01 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
+  gnome-disk-utility-2.32.1.ebuild, gnome-disk-utility-2.32.1-r1.ebuild,
+  gnome-disk-utility-3.0.2.ebuild:
+  Clean libgnome-keyring, rarian and udisks dependencies.
 
 *gnome-disk-utility-3.0.2 (15 Aug 2011)
 
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1-r1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1-r1.ebuild
index 500fb0f97fd6..3dedbc771c13 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1-r1.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1-r1.ebuild,v 1.5 2011/08/13 18:23:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1-r1.ebuild,v 1.6 2011/10/01 20:44:18 ssuominen Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -24,20 +24,17 @@ CDEPEND="
 	>=dev-libs/libatasmart-0.14
 	>=x11-libs/libnotify-0.6.1
 	avahi? ( >=net-dns/avahi-0.6.25[gtk] )
-	gnome-keyring? ( || (
-		gnome-base/libgnome-keyring
-		<gnome-base/gnome-keyring-2.29.4 ) )
+	gnome-keyring? ( gnome-base/libgnome-keyring )
 	nautilus? ( >=gnome-base/nautilus-2.24 )
 "
 RDEPEND="${CDEPEND}
 	x11-misc/xdg-utils
-	fat? ( sys-fs/dosfstools )
-	!!sys-apps/udisks"
+	fat? ( sys-fs/dosfstools )"
 DEPEND="${CDEPEND}
 	sys-devel/gettext
 	gnome-base/gnome-common
 	app-text/docbook-xml-dtd:4.1.2
-	app-text/scrollkeeper
+	app-text/rarian
 	app-text/gnome-doc-utils
 
 	>=dev-util/pkgconfig-0.9
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1.ebuild
index 849ecf7b1523..6d9a0036302b 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1.ebuild,v 1.11 2011/04/29 17:42:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1.ebuild,v 1.12 2011/10/01 20:44:18 ssuominen Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -24,20 +24,17 @@ CDEPEND="
 	>=dev-libs/libatasmart-0.14
 	>=x11-libs/libnotify-0.6.1
 	avahi? ( >=net-dns/avahi-0.6.25[gtk] )
-	gnome-keyring? ( || (
-		gnome-base/libgnome-keyring
-		<gnome-base/gnome-keyring-2.29.4 ) )
+	gnome-keyring? ( gnome-base/libgnome-keyring )
 	nautilus? ( >=gnome-base/nautilus-2.24 )
 "
 RDEPEND="${CDEPEND}
 	x11-misc/xdg-utils
-	fat? ( sys-fs/dosfstools )
-	!!sys-apps/udisks"
+	fat? ( sys-fs/dosfstools )"
 DEPEND="${CDEPEND}
 	sys-devel/gettext
 	gnome-base/gnome-common
 	app-text/docbook-xml-dtd:4.1.2
-	app-text/scrollkeeper
+	app-text/rarian
 	app-text/gnome-doc-utils
 
 	>=dev-util/pkgconfig-0.9
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2.ebuild
index c4c81f211f4f..230b1b0a9b43 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2.ebuild,v 1.1 2011/08/15 12:26:09 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2.ebuild,v 1.2 2011/10/01 20:44:18 ssuominen Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -26,20 +26,17 @@ CDEPEND="
 	>=x11-libs/libnotify-0.6.1
 
 	avahi? ( >=net-dns/avahi-0.6.25[gtk3] )
-	gnome-keyring? ( || (
-		gnome-base/libgnome-keyring
-		<gnome-base/gnome-keyring-2.29.4 ) )
+	gnome-keyring? ( gnome-base/libgnome-keyring )
 	nautilus? ( >=gnome-base/nautilus-2.91.0 )
 "
 RDEPEND="${CDEPEND}
 	x11-misc/xdg-utils
-	fat? ( sys-fs/dosfstools )
-	!!sys-apps/udisks"
+	fat? ( sys-fs/dosfstools )"
 DEPEND="${CDEPEND}
 	sys-devel/gettext
 	gnome-base/gnome-common
 	app-text/docbook-xml-dtd:4.1.2
-	app-text/scrollkeeper
+	app-text/rarian
 	app-text/gnome-doc-utils
 
 	>=dev-util/pkgconfig-0.9