empathy-2.x requires gcr-0, which only exists in gnome-keyring-2.x (bug #477394).

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

3 files changed, 19 insertions, 9 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index 7c89c26b662e..13e08c691f9e 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/empathy
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.129 2013/05/24 20:37:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.130 2013/07/23 01:08:37 tetromino Exp $
+
+  23 Jul 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  empathy-2.34.0-r2.ebuild:
+  empathy-2.x requires gcr-0, which only exists in gnome-keyring-2.x (bug
+  #477394).
 
 *empathy-3.8.3 (24 May 2013)
 
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index ab2060e63b4a..202fd3904b98 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -8,16 +8,20 @@ DIST empathy-2.34.0.tar.bz2 3361496 SHA256 6efa0ae3ac3580ac9600f889c92497f36983e
 DIST empathy-3.6.4.tar.xz 3447912 SHA256 db3f2529111febc9ec4f0d7a772a19786abf93364b9b0207dc7424767138250c SHA512 2d0b821da9ac172a212657f62ae70702a0a56b8b5acdec13b78cb27ed374b12f6c8f5851fb5b26c6e968b67f65c0d34fcea14dd0d174f90e83f38531fdeb9e8f WHIRLPOOL 69ea4aa7ccc6f83c34d9bbb7e7e3c39c10607eff2d75cc98aea4a273183e9718a97eb23c24bab6e35700f93fac04344951428a07d75b97231ffd8c4fbe8adf8b
 DIST empathy-3.8.2.tar.xz 4715052 SHA256 a3e92d317a1a4e9b49988ea48a144bcd6c0257c6331aae2603a544eedf1dc45c SHA512 d5d5bc4e8e69244a5f758b62d736e6866a28ec2cec486b13f7b8ff6921dd6693987597c4854a3c244c211d2cc9762fef1ca15ad8b14eaa2fb7b4397ee58ac472 WHIRLPOOL 294c54a311ba97dcbb016ee1cbe7dc5fe095e5b82cccbfd6dd6b5471719338ddbffdb5dd510398f2c28f936014c7db3ac2ad8102a27f8b6d663f577165a0aec6
 DIST empathy-3.8.3.tar.xz 4715672 SHA256 61e547c6f0929b3111219349482e2395a32f41bbd0852046405d835acba965c0 SHA512 3084c805b17a881cc8856fc91543e7454480e3a28d6b773e26549d7fbc920ae718939bf3a9d8f48718c779afa913cb7059f37c5175995635affb6183eed6091c WHIRLPOOL adf2f9eba0f14f814d36a9c635b48fc8a8eef3f27eddec23700fceb3ba24979853201d758582480a1f1d9fc56f47a2578a65fa8589b9b7e4aad5a734c1158c2c
-EBUILD empathy-2.34.0-r2.ebuild 3263 SHA256 4a37586f24b19bede46e2983de0a0647c9b9fc42da6e52a0c193b1af41448805 SHA512 a90faa742b02b8de4125f7bc0998e76d90394aea73f99b0b61e261a13d19efc18405f2a6518e43e60b29c24cb3c5721fed44db279a53c2007695d7e94a1f82c6 WHIRLPOOL 9d96b2f8e51d4bcd8e27230d038d3ed2849d7bc305e943e22d6582b5b17b24e6026621eba7a69b69ffc4fac85d714898811037b747c9f67cc7574fcfbb3d23ef
+EBUILD empathy-2.34.0-r2.ebuild 3292 SHA256 21a47c9d78fe823e2e28719921cf6f25c036ad71d4f9433fb752d147e03bc147 SHA512 7a1d749afea046a1f026f00d01f356f3f5dcf0b297b5793bab9a67cc1c12cb422622dd80f6296fbbfb77743d73f2798e1ccfdec83b8ff65fb57fa09b231af8bc WHIRLPOOL 378e467f28583bb4cdae02b561e113e0b51c0e1701158be973fc8af1eca48e11e8044a54bea61afe2cdb2bd76a2eb4fd4938f4a88aa93ba9f36a7307739586b3
 EBUILD empathy-3.6.4.ebuild 3254 SHA256 312034ad793dcb589137e4468535c3672e08c440396d5db070eb23a4c89c5790 SHA512 20b779bc97c8bcd55898c5eb26e5cb39e24d38d460860a92c618de9653ec2a7201507c5a157fa51140e5ce1ba2c33f0549fedfc3ae77693b05b385fe449e2266 WHIRLPOOL 35fba7d6161204c49f996e85f0e4aedec172a04dcae5bfeb943f3a542cf2e16ed68bb94a3b9659a11919e7fe0aa278390fa79bff5c4871baf2ef00de468dacb9
 EBUILD empathy-3.8.2.ebuild 3336 SHA256 271aeb168d7f1db8a1e351cb6014f584bd6ba7a583079532b8fd27c6ca4a9fd7 SHA512 9eb592661b4809cf24a1573ad2ca589846cd532885fa65a703a2e492604abf078c6f67908c7522bcb3420817e943ea55a60208654093209362457217ca2230be WHIRLPOOL 9e975e3bb0a10a0d460cc92a3074182012b5b8d26b82d5f48bba1e03528271df6ae1fbc89f1f2adf6ce9ad7b599234dcd960e6c8c4ef1c4717b743efe0b9d61d
 EBUILD empathy-3.8.3.ebuild 3336 SHA256 9b3e61d140977a25316a9f5605e91bf2e8cd2f87f848aed11c93947b6d7ad69e SHA512 8464cf4c2defb6fd0249b4f26681ad12a13a9762dcbbcb2ccfc9411a8cc8b91d12b72d5726459e698e9f47d174a301f686f3db741c27fbeaf0e87188fb86783b WHIRLPOOL a38da68e45e6980157fb92fdeacac129ab9b495de10d1660e56faa4cfeb2a3b5cdb5b3d01d56010be589a1efa389e352a486c8b92a663ec454ca5f46f68ed0ba
-MISC ChangeLog 22718 SHA256 8b694f7228e4262f26d19b5451fcfd2e001f16b717a2da61952271ad1476aab1 SHA512 a8d2bbcc63002d98788bea32db5013115ffc6eb1dd44a37c080aee0e45eb4d98b1741069ea737fb1c10dc430230d9c95c7e40923cb1558f562578c0311606b3c WHIRLPOOL 852da51df2888b7cb3e932e290fc73879cfdc4e40a80c9cccf7f31c91cf06be7f3b2f8a073e781c10b50562adf0d0a9dbc87db14758e3cfbcefc0712ec694578
+MISC ChangeLog 22896 SHA256 9a34a9efe248a9babe54dcdbb9bf5d0655b9e1d5fd838a36e8c2a3a12b2417ac SHA512 163dc96826a1b5d3d0428e05bbabfac2e46da1107448fe409a9bf75ff54833ab123cdfb63cb16324af0248f4442cee426cd36c2f103ec9c6d6c4b00c8a9c9899 WHIRLPOOL 3d36e4b88fc5b532c44c910cba45ddfd0461f3488a086bbd4f0a0ceb58e37d17abff291b59cd5faacedb5bbc44cb29ff04202806553f7a7bd2035379052eb10a
 MISC metadata.xml 1467 SHA256 b1fbccf18385402e0ac0ac63595f9b7b3a27fb61086e5bf503d11a858099c8ae SHA512 2a20c65b50aeee8f660277ffc57f4a223edb9989814c031e8ac7158a5133421ad393d35858e47e639b97a55c2cd6b589e0645d74e791e19967a7cba86a17521e WHIRLPOOL 50c817df40f507c5380bf4d53ef23f494c70a48032d0584210ade162fecae68d178c86e86b12412209443a0dd878c9670c934d3b2267328c9e9a8a9899781d01
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlGfz4IACgkQCaWpQKGI+9RBzQCdG7CPj5u3EJymfuLQna/3JyJ5
-uocAnRB1SfViYO7v8Xy7pmsh18ZfEyIb
-=A32T
+iQEcBAEBCAAGBQJR7decAAoJEJ0WA1zPCt1hTZQH/1b0TeWM8KlMcCSG/K9RyClU
+6cDTZEZQvTqvs8asDiFRmfWLLWENvvjnHRwiTgC4c7A28vSrCla4MuDJ0BywVKZX
+nTsSq3Nzp/iqOGEyZvXZqEwkJxOVvTkNLxR/YlB8H1t0QI+L4rnP0QlF2fUVF+RY
+lbqaJgzv+suzTeVmLhEJ0730EatqfhvIAPoOhafqyIbwnX105ecgeeF0fF2tpn7D
+mI9YterxyVflhSjAO6ctt1KSf7yl3KiJl9J8gbDkW0bEXZ9pdrFMRZK9XOCTDlgm
+YfG8J4EJfLnmhbXkby0i6gFSNXtqZHf7p7goRq7VArJ3hyW1aqab948mosphsis=
+=wZPl
 -----END PGP SIGNATURE-----
diff --git a/net-im/empathy/empathy-2.34.0-r2.ebuild b/net-im/empathy/empathy-2.34.0-r2.ebuild
index ac2cd9dda308..4e6381c0f16e 100644
--- a/net-im/empathy/empathy-2.34.0-r2.ebuild
+++ b/net-im/empathy/empathy-2.34.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.34.0-r2.ebuild,v 1.10 2012/12/05 22:37:16 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.34.0-r2.ebuild,v 1.11 2013/07/23 01:08:37 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -29,6 +29,7 @@ RDEPEND=">=dev-libs/glib-2.27.2:2
 	>=media-libs/libcanberra-0.4[gtk]
 	>=x11-libs/libnotify-0.7
 	>=gnome-base/gnome-keyring-2.26
+	<gnome-base/gnome-keyring-3
 	>=net-libs/gnutls-2.8.5
 	>=dev-libs/folks-0.4