Adjust deps to latest nautilus-sendto

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

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index 720dbfb5f2884fc3ff7e72824cf2254d285a2ff8..278b8c8735ac31b221eec16d93f2419a5ab3a6d6 100644 (file)
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/empathy
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.56 2010/06/16 09:08:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.57 2010/06/21 19:27:38 pacho Exp $
+
+  21 Jun 2010; Pacho Ramos <pacho@gentoo.org> empathy-2.30.1.1.ebuild:
+  Adjust deps to latest nautilus-sendto
 
   16 Jun 2010; Pacho Ramos <pacho@gentoo.org> empathy-2.30.1.1.ebuild,
   +files/empathy-2.30.1.1-init-gerror.patch:

diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index b988bbc8545b531b230eaa1d00f2f9f722320236..dda3cbbe3dd05ee2295b1d85e502fe4530bd8373 100644 (file)
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -11,13 +11,13 @@ EBUILD empathy-2.24.1.ebuild 1899 RMD160 cec86f7a9e92da7799aac0eb64b24ac01882304
 EBUILD empathy-2.26.2.ebuild 2458 RMD160 22232403dabf5b43f872ab0e4d19f25139a7002e SHA1 d176af1eae77dc6fb5afccfc3fa72dfa30b50e31 SHA256 540af849275cf1107df562e964c3092a279f858217e838cad20847417c9f0e28
 EBUILD empathy-2.28.2-r1.ebuild 3082 RMD160 a0e7d0c8b372de8af58bb18012b31a6abc4f3956 SHA1 eec7628d6c7a84770bd0ef159eeaab973c911a90 SHA256 052a59e324fd6464786640c79ac232ef5af2ba0f7c5175c89f3150c09d17f2cc
 EBUILD empathy-2.28.2.ebuild 2995 RMD160 5ac841b2c410fcfb060048d96845bc9ad484435e SHA1 a208d1aac8c4e38b8382b1223ae823f2fcb6e200 SHA256 380004301610861a5dd6aa035ad269673dbc88b243e8108469a3afd289272708
-EBUILD empathy-2.30.1.1.ebuild 2723 RMD160 70cfd0e065a2a1cd3ee32b50453a8b6fb0b226e0 SHA1 7e556198eef06b418acac05c60fe38243d4eea33 SHA256 ec3f90c8708e2422aba2880119c18bcaec0fe9f7155d300c7de8053f675d976a
-MISC ChangeLog 10660 RMD160 7ff7a1fd5b4277a3f744eaad2d2851f2b856e5c9 SHA1 7161136dbffc3a4b1d91eff3bdf34ece705bb98a SHA256 775aa03b05fd9722f27bc51c71310693c66d6629ba8d816e4690e89570d3c332
+EBUILD empathy-2.30.1.1.ebuild 2775 RMD160 f296812003a196ee69c9836a6b942195a3196c47 SHA1 e11a5d9e519f1ae456c575b4bce5266c56906d87 SHA256 4100700ed2ec7c1336c271526e4e9cb4ae2a5292d1d9b5aa97823d73a18ab7ac
+MISC ChangeLog 10772 RMD160 214ce72b5d2dfd7152f60fc3527be8f45b4ae6d2 SHA1 a9ae1944c1557912f8cae6bb6dda9039256f4b8f SHA256 36442ce83e38f0f1e74006e2429935f97770a0ae9e67946b44b7e22851acf5cf
 MISC metadata.xml 937 RMD160 69906d677ab5c5d05d39a04caef2b617a25889c7 SHA1 1d6d3d10666fff0e5e937f1626a5f9ef0660cf54 SHA256 ac3b78a9174587a123a573709a0ea9e66e7ca9f7f0f05aa4ff1bf0f262b3f912
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwYlIsACgkQCaWpQKGI+9SlOQCeOBSjCnueNxjIqYocw+BhseZs
-WmMAn1gnLXDGnLUTugwZSnxBhWL9oTyR
-=A7PQ
+iEYEARECAAYFAkwfvTYACgkQCaWpQKGI+9QxEACcDMEm8nIExT18x2JBRIMHetxb
+QvsAnRJCt/uZKxk29tmE9tB3t0qetZir
+=2ywY
 -----END PGP SIGNATURE-----

diff --git a/net-im/empathy/empathy-2.30.1.1.ebuild b/net-im/empathy/empathy-2.30.1.1.ebuild
index 9cd86886ea9f5662b43be1a90c59a312ac1d89e7..9832fa8804b79dd1fb60eb2dba0fb73588825c21 100644 (file)
--- a/net-im/empathy/empathy-2.30.1.1.ebuild
+++ b/net-im/empathy/empathy-2.30.1.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/net-im/empathy/empathy-2.30.1.1.ebuild,v 1.3 2010/06/16 09:08:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.30.1.1.ebuild,v 1.4 2010/06/21 19:27:38 pacho Exp $
 
 EAPI="2"
 
@@ -35,7 +35,10 @@ RDEPEND=">=dev-libs/glib-2.22.0
        x11-libs/libX11
        net-voip/telepathy-connection-managers
 
-       nautilus? ( >=gnome-extra/nautilus-sendto-2.28.1[-empathy] )
+       nautilus? ( || (
+               >=gnome-extra/nautilus-sendto-2.28.1[-empathy]
+               >=gnome-extra/nautilus-sendto-2.28.4-r1 ) )
+
        networkmanager? ( >=net-misc/networkmanager-0.7 )
        spell? (
                app-text/enchant