Clean libgnome-keyring, rarian and udisks dependencies.

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

5 files changed, 30 insertions, 40 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/Manifest b/sys-apps/gnome-disk-utility/Manifest
index 359cd4bfb295..640171551c2b 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -7,25 +7,19 @@ AUX gnome-disk-utility-2.32.1-optional-avahi.patch 3271 RMD160 6e401303d5bfefa01
 AUX gnome-disk-utility-2.91.6-optional-avahi.patch 2665 RMD160 e6019f814f03ebacb7f4607dfd2e91f0a5bc3ced SHA1 131f04f14fa105712d555c617d699fc02fb18215 SHA256 2698b158a2552a9650d07634e478d6d15a26cd18c881f065cd14f81dadf5d867
 DIST gnome-disk-utility-2.32.1.tar.bz2 2216871 RMD160 d3572b44890e2aa89f2268ba684ba80732dd0ea1 SHA1 afd03dc2c59629d4789045e0b967bd17b71f70f2 SHA256 fb3f6c8962eca9706fd96e1f0b431c1284536298bc927e8413e763054c618e99
 DIST gnome-disk-utility-3.0.2.tar.xz 2002052 RMD160 7355f13be7c67f10f3fb337cccfe8bea7ec2e36d SHA1 61718232756657542c89a0b3355a4fdee78b7ffd SHA256 7983f12ba04e84f164d0cae54bb06ed9b3ebe6c0a1c606d63d067fc395aeb0a5
-EBUILD gnome-disk-utility-2.32.1-r1.ebuild 2043 RMD160 a92ba13b84fab2fe95a096f6006ddec376e4150c SHA1 d5b48e361893f9527f320a3b16e3379fd473700b SHA256 afe3043e4b657db9874f90d5014feea6723d20bb033a426dd5b1caa3657f21e4
-EBUILD gnome-disk-utility-2.32.1.ebuild 1893 RMD160 2d68d23e4583e77ab7b5bc233f41d1ecfd9f6837 SHA1 83848de6aeccb689d43d0511f451df44444e59ca SHA256 619d308a3125a821a0c4c56e45089e78dda2801b20b698a91db23c9920a89347
-EBUILD gnome-disk-utility-3.0.2.ebuild 1840 RMD160 297d8677f250ca194e3eb407ce8571722166ff5a SHA1 f0fc276fb82f3e6165e8fb7f50c6683f5361093e SHA256 013847c257b48457df9431e3ddb29de06f6c51147d925584b5da20ba48b23162
-MISC ChangeLog 8587 RMD160 15bfa9a796a41066bd0561195e9becebf4f62da3 SHA1 a00738a8f8b4c5635f0380c5f69de251a9ccaac6 SHA256 3e82655f671d8b83d5aaeaa658d6ad56d6bca7c4a3e2968ea104dda27359ac16
+EBUILD gnome-disk-utility-2.32.1-r1.ebuild 1976 RMD160 0c518d6a24cb90f7330ffd5cc0bb67353941fb65 SHA1 26ff3fcdc1fbf46cf94788cef1ea18724b356925 SHA256 288009cea70496a08b6fc5cf68c7ff49469a4c9f2a10de7e681729688c35927c
+EBUILD gnome-disk-utility-2.32.1.ebuild 1824 RMD160 be418360a42850747335794d6676383828296f19 SHA1 a21025bb4d10ae72ecc3a8029d03438541ff7280 SHA256 ebf42f5734a8f5fb45aea269121d49c65ad63170152c29d540d18157c489f5a4
+EBUILD gnome-disk-utility-3.0.2.ebuild 1772 RMD160 9d374e8d30ce805fc2b2a5c8532c37b7728d386f SHA1 9a633c524924c27edca136b079b9a7d009e5227b SHA256 2c4b9aa99e802a48f472034b565614b23055d348321d2bafafec19c9f49100ab
+MISC ChangeLog 8809 RMD160 3e29e06755fc33e96f6ae000cb7359a80db15103 SHA1 b6b940e85eda413184b325563aa05f978c83f04f SHA256 ab5d2712c9ed05ef20d2fb97e266554ef28a762aec61bfd101017ec850b85f93
 MISC metadata.xml 411 RMD160 a1c12c7620efc6350a471ec6dfa23c86603f4a63 SHA1 3a1d45a1c201852a8067b535b214777ad95754ab SHA256 194a3aa8e459cf8efd11f19a1368a0764877a356578aec429100ffd969cd34bf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOSRBkAAoJEO/kOhxWD91kBDkP/16AqZr+sZ98fhHYyMWZWI4Y
-dk88WoyEvlV1sSuFwVWclxR3gO5+uz38Tf7lqOzuHfJG0NpLZH8M84kiXtR4g9Y3
-g2YcwtZkfKw0m5knS9fY4Luo/i574kmb8JWovGROTiBBAy5Ee+fj4W09fYNKWy4W
-yfof3GwPyPQatm+W/Mz8aU2lrBWQCwsxCOGALJAoeC+WfxcnmqfboYjZuKpGTNJe
-E3ipb3jz+WR9DaTInsJgEmDg/Oj0bjiQPkJgr3rLjF7SpQ8A4CKwQ7k7MnMGPdf7
-Qp00sB3Ti4+Sp+OU0LBAerun0tj6np9o2jTy4GfdSwsKOJnk3jZEDNoiFo2Fjjzq
-hQ6wv3InlgsIOBW8AAndoafUEqpQbX/TyAlV5IxKVMzT4IS0LisSeLtMPG47TCjz
-QN+K18KhXr7LBfjrC2sguRRy0MZ4yhp59pBOiWYuSPGqq6cwf9vPeQ2OyxbTVi/j
-c7KMOmCYAwXN7VNN+bw4d21q9lGXzcBbncf2bq/GeqlwojsNBCy4LseTA0NNF6ai
-1BNkK8me8n1xB+d1NZBF0p3EpQvHwq6z7+C9e6/duFAcFRtcDP/ZaRmbusYV33la
-zHaqI/rG4zvMj+HfeJvFpEkSxHXpzKY/SeoImSVPEw3yEmPvm/Dqv0l8//fLhRlJ
-R8YAWsona0v0MI+XmWIK
-=y7Io
+iQEcBAEBAgAGBQJOh3vJAAoJEEdUh39IaPFNRGEH/j1BNrSfFTGb0I2oKk6MMK+N
+56DXoQAPpFI0TK+cSGxeY6kFdSnJvsMVxPhp11B1p2ZZZPMoPnjKvkiDJaDypiBU
+fxXwfdGkZnNboq+p/uw4/27bI1p/zr4NgXzAQzn48fDR1stBENpmTfN1zQ+ZKQ7L
++xv7AOGbX4sGw9wyq5jv5Hki944w2UovjLqjbK4M2kE8BcfBpzGXskPGVfV0JbqN
+HUmMQJNrx9DLSQGwY6J9xpX1o0QQT9uIG2B9xwz7BHpOWokP+xV1t6vajB+N+rVi
+d6pVnj9o7tMCbsDsmdrOQ836OdGGFtybZ9+KegTJ/Yo2KKfNrj7p3FhbwMunPSc=
+=jH9r
 -----END PGP SIGNATURE-----
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