Fix gnome-base/libgnome-keyring dependencies.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/gnome-base/gnome-mount/ChangeLog b/gnome-base/gnome-mount/ChangeLog
index 6ac60633c50f949d9cf78a3eb1d7af9edc731c8f..df87bee8dd20718967a89d5a15094622826d14f5 100644 (file)
--- a/gnome-base/gnome-mount/ChangeLog
+++ b/gnome-base/gnome-mount/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-mount
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-mount/ChangeLog,v 1.72 2010/03/22 21:54:35 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-mount/ChangeLog,v 1.73 2010/06/19 16:57:08 pacho Exp $
+
+  19 Jun 2010; Pacho Ramos <pacho@gentoo.org> gnome-mount-0.8-r1.ebuild:
+  Depend on gnome-base/libgnome-keyring when needed instead of recent
+  gnome-base/gnome-keyring versions per bug #324695 (by Arttu Valo)
 
   22 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org>
   -gnome-mount-0.6.ebuild, -gnome-mount-0.7.ebuild, -gnome-mount-0.8.ebuild:

diff --git a/gnome-base/gnome-mount/Manifest b/gnome-base/gnome-mount/Manifest
index 0d871094f182cebd1536c55f2a538b74b361e8ab..817be7c34946b465695d878f15745f57867361c8 100644 (file)
--- a/gnome-base/gnome-mount/Manifest
+++ b/gnome-base/gnome-mount/Manifest
@@ -7,13 +7,13 @@ AUX gnome-mount-0.8-fstablock.patch 3281 RMD160 7b0d5f5f4ba4bed2776488425a732708
 AUX gnome-mount-0.8-libnotify-automagic.patch 2369 RMD160 41a76ca7bb97ad6117b2d8391d9fba29c04ca505 SHA1 9bb3dadb23c20c37331a39e56cfc7a469565a955 SHA256 add3dbfe0b7b4a7b3a80eb39feb6856a0ce468bfe12a7d99e8ddeecc2c31c4d5
 AUX gnome-mount-0.8-vfat-defaults.patch 706 RMD160 cbbf337ea1598e11f43aebe8505b9ce5ec2b21fc SHA1 387dc0976b2f08db1376f0af63c840f72d332650 SHA256 37f80a8c37507e5ebd6b4f75610ef39c0e66c1363fe554ab0aeda8a526dd21c2
 DIST gnome-mount-0.8.tar.gz 505788 RMD160 003800eda3edb7747714b1002bd1a1b50ea44fe9 SHA1 846ba178cf9009f3e32c7f55f912b3ca6b9ecedb SHA256 44ca6b78b49a4181435e489c7b7d416c8f26442dcecdc01ec4b981274ed957e2
-EBUILD gnome-mount-0.8-r1.ebuild 1608 RMD160 a7151dacb976f40510ccd5f82cc9e996cc4795ff SHA1 0e4512d9cb1c4008ea6469ab5f602e3c1f688d93 SHA256 f5296558f1195311fc3e5f5dbf25daff6882f408f6d7906feea69604506e857a
-MISC ChangeLog 9904 RMD160 09f23079cf9b80ede9cebf0b365380c375a39f75 SHA1 32c5f69639c5fe2000ec2839fa0a67c985a558e3 SHA256 52de6f6358715ae7e99f57fdcc8b53f3bd4e75a7a97c56996870cc5707bc6388
+EBUILD gnome-mount-0.8-r1.ebuild 1646 RMD160 0f0d0a37bc035b1f9b7659123ab5920438af8e6a SHA1 f673d0765548af63f205d17226b56a281e2d0f8a SHA256 4deecd57e7bd3924f11cc36f366ac5bd16070ccade6ed7b89764b67feb09f46a
+MISC ChangeLog 10118 RMD160 40211c27a2ae4a12085998e6faff2c53ce6d05ea SHA1 05fc3e0fe68a76fa04ccb46377182443f08b561a SHA256 968e5ad64753a694c4fa50a9b90220100fde6c20569b0135cf5dcf8854606e8d
 MISC metadata.xml 254 RMD160 6a737fb45f6f2fd20426f7b0bbaece103a1cf891 SHA1 5320b8e2ae1cdee69cc65091497d9e100c364e64 SHA256 f9d82c574f40e1436601a877ad0895aff511f02edd3656608279ccad35650a31
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkun5zMACgkQ1fmVwcYIWAa5ygCbBYaM4VqjQFzpvtzMJkgyCIM+
-1JcAoMPmiuiliqeyLZxparK6VPaUotzV
-=03DM
+iEYEARECAAYFAkwc9uoACgkQCaWpQKGI+9S72wCfYSi2jrwCN/V4+xC5IRqDpF2k
+KFoAn3FNu55IjZsSZaO6gXXiQ7Bl0YN0
+=8Qbc
 -----END PGP SIGNATURE-----

diff --git a/gnome-base/gnome-mount/gnome-mount-0.8-r1.ebuild b/gnome-base/gnome-mount/gnome-mount-0.8-r1.ebuild
index b7757ec5a315e7015871ba99d0e208115fa0caca..1a27597e0d2ec24f377952b367ddc2dd0df9cc0f 100644 (file)
--- a/gnome-base/gnome-mount/gnome-mount-0.8-r1.ebuild
+++ b/gnome-base/gnome-mount/gnome-mount-0.8-r1.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/gnome-base/gnome-mount/gnome-mount-0.8-r1.ebuild,v 1.10 2010/01/17 23:57:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-mount/gnome-mount-0.8-r1.ebuild,v 1.11 2010/06/19 16:57:08 pacho Exp $
 
 inherit autotools eutils gnome2
 
@@ -16,7 +16,7 @@ IUSE="libnotify nautilus kernel_FreeBSD"
 RDEPEND=">=dev-libs/glib-2.15.0
        >=x11-libs/gtk+-2.8
        >=sys-apps/hal-0.5.8.1
-       >=gnome-base/gnome-keyring-2.20
+       || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 )
        >=gnome-base/gconf-2
        libnotify? ( >=x11-libs/libnotify-0.3 )
        nautilus? (