Version bump, also fixes building with eds-3.6

Package-Manager: portage-2.1.11.60/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 617 insertions, 4 deletions

diff --git a/app-mobilephone/gnome-phone-manager/ChangeLog b/app-mobilephone/gnome-phone-manager/ChangeLog
index 7b37bdfdfafc..cb7d91164d0c 100644
--- a/app-mobilephone/gnome-phone-manager/ChangeLog
+++ b/app-mobilephone/gnome-phone-manager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-mobilephone/gnome-phone-manager
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnome-phone-manager/ChangeLog,v 1.47 2012/05/02 20:10:08 jdhore Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnome-phone-manager/ChangeLog,v 1.48 2013/04/07 07:51:43 pacho Exp $
+
+*gnome-phone-manager-0.69 (07 Apr 2013)
+
+  07 Apr 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/0001-Adapt-to-Evolution-Data-Server-API-changes.patch,
+  +gnome-phone-manager-0.69.ebuild:
+  Version bump, also fixes building with eds-3.6
 
   02 May 2012; Jeff Horelick <jdhore@gentoo.org>
   gnome-phone-manager-0.66.ebuild, gnome-phone-manager-0.68.ebuild:
@@ -226,4 +233,3 @@
   +files/gnome-phone-manager-0.4-gcc3.patch, +metadata.xml,
   +gnome-phone-manager-0.4.ebuild:
   Initial import from bug #54448.
-
diff --git a/app-mobilephone/gnome-phone-manager/Manifest b/app-mobilephone/gnome-phone-manager/Manifest
index d9aa8e1bd569..35a992194f13 100644
--- a/app-mobilephone/gnome-phone-manager/Manifest
+++ b/app-mobilephone/gnome-phone-manager/Manifest
@@ -1,6 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX 0001-Adapt-to-Evolution-Data-Server-API-changes.patch 19486 SHA256 31b6ed0cf43f13d958462ee9eacbcfdce9f86b89cb4b397bef19c3fa604b7d64 SHA512 87f8a33e53a07d18329a89a01b85e780c2d1b34c5921a9f5f5bb129b68946febb22072f8032603e78541f255fc9edbcce6ec980c6c83721ab9b937976ffe2ade WHIRLPOOL d6635cb8413b2df9fb89eb17771308f3045bd474f505dbf8254846334bf46326b569f3333c39c570a24d1924acf4a950e1942d05486589def7b46bb8d6808ea6
 DIST gnome-phone-manager-0.66.tar.bz2 444437 SHA256 a4a389b1086e59acf5771cce5b560510d633326053dae83c20d86c2d53164c35 SHA512 777ce6ee0a0e894175ca7bc3012fa0a337465b916c8cec525ff2601e9d4699ade5a7fecd1e82fb8ca73eb2d565f5e1c888e1b6a407ef685cbe0116d07caa0e6a WHIRLPOOL 5fefaf36884c5527fcbee05ba3e58b436054e8b4ded0c6e11c69cee15577b21cf42375a52411dc02e682a50ce8a679f21f11e6cd5d007b27728e266f4f6ea0f5
 DIST gnome-phone-manager-0.68.tar.xz 380568 SHA256 3777b62ee36492274532ece965f4688600457014f17a6f21dd01fb63bbb77f8f SHA512 757b2a424ce67682ff0ac897583297fa4d24d616b4521b7845ae062c0132028f19e222628b86aa8bb533851da80fd28a813c22b5a5488bfb55d099e4d8536d71 WHIRLPOOL 755f5c3019112bf6b7000bc5827f3fbc07389dbc4c84cb5a3a68294f52ce1a9877fdc5e90107d41d002baf480624428a99081150df1e59e0f88d95dd1bbcad19
+DIST gnome-phone-manager-0.69.tar.xz 393916 SHA256 35e038ea3afaacdf451046e87af876096cf1520efc04fc3f5b63ea22e0297175 SHA512 fa12ef3bc2d94fd91c6f680a5b47cba16a56c2fdf324da958503a7c4f7eb1fedc7aeaced567f2ed1ad8c25da4f994b709018e95bb7ec4a8a2248521a3453970d WHIRLPOOL 24750a91bc06dff68b8ca6e1cc1b4212fced6347bcc923d59764b540a2dde0cdfe5f14ac4e7f2816bc640912f26824e6b23c4c5df87e87951f75ac81bbb11aab
 EBUILD gnome-phone-manager-0.66.ebuild 1245 SHA256 d3630b181a161721f7e54fa126778d7bc30210e58eaa2434e802b1b53dad3e11 SHA512 f96da09c90e3481a1a060188220e48ce538dcc5379e1bdfab602971a33a12019ec8b4859e044b006fea21cc97d94d302ad6bbeb2f096e069665c53de83edc83e WHIRLPOOL 68b73719bb4137bf8c83caeb03b60193378fb5854b01943c7c42bcf94601b15b636242a7461792b26d98a463c9b67685296d3ccaa83c24a5b643a0a68dcc1abc
 EBUILD gnome-phone-manager-0.68.ebuild 1224 SHA256 ad8c88e703c311f5fb023e55b08a469fd9c7e214d37224a757662b830db72343 SHA512 8144f6907b0bb427a5062d9012daa2e90557dc06a1ea62fdd651a1484efea7c6e824d69215ed24f1600cd561878f5c761c57255339c9cb51fd6c75bdf97d2cb9 WHIRLPOOL 6ed2793883c2bba1568ff8fb8d24b7f786403e5beda8355517fce61b3978f3b6337070b4e7812ec4f223eff0246f66eb451b241a4adf07f75154cd6cb0cd9ad0
-MISC ChangeLog 7730 SHA256 dd68fd1fd51e21bfe4b7abf9f7514fd1e547bbe0eafef5d25c9c733e4a66cf2c SHA512 676cc42b2a731f65b2eef7d327a238dda8dee6d34521809b59d25ac415b8af0294f65b508518bce138c19d84f4fce3a435dbf07118f4646fc50ca063c696d88d WHIRLPOOL 14000c251da3dba34eb9607ff901c565ed395124b759f377391d1eb980add83a42cb7ed0287a11ac276eb9cb7a68ff8304be7295b28fdc38c1a954cc37c3e684
+EBUILD gnome-phone-manager-0.69.ebuild 1417 SHA256 59fe96e8df91b0384205b06bbd95b99af921f21393a34d4923a8eb532fb18347 SHA512 148c66c0f83aa42a5c6825aeed238ee154b4842661e9d6d69c711c4e9aa71a48ca7efbb914305c47b75b4886a99fa047a4dc664d9c9ede707681d9387678d115 WHIRLPOOL a0f7c245c25caf8f35a6e32f0519687b8c19383df90adb36487a5d3b83a454ca878bb01e67a4be5ac7fd1c20ddc8997c15f1d84165130d95776685ec7d7ecb3e
+MISC ChangeLog 7965 SHA256 ff72ff8acc87fc3b0ac8080f63f2458312f99534520bbceb9ec69766f5c23893 SHA512 0f497ccb947451bcfcaa86fb2a58d7805fa2138a78b9555106e980196518eed012b1dd7869feeef5ab4cb61989bd1e97ceae7fe07ce95e87a34564516b5693a2 WHIRLPOOL 6f2c11b3dcfe3e9149be9917db50f30dc3922c20ecbec8a2ba85643dbd3f366fc640fac6fab6c642a98d6a900db37d6f9fe8db7f15a55e10839460ba6aa9a3c9
 MISC metadata.xml 735 SHA256 6432a2d6b381e076ef9aa857b86ee4d4d76a72b81307e17267cc5c33cfb81583 SHA512 9d85c713915c6b704ee6e6ac408a8f630e5dac9631d893c762da9b720a81e781b04d518264fe13f5b6e91493ad9791ed806e9bef6cc46c9b3930ed47e7c9d30a WHIRLPOOL 1c86003174c21c96f48b903dc8eacd4f0995cffd41976b5db88c2303f3e89a0cd7302bceb2220c043debb8ff4867aa8bffc31e4bae8e8d3fe6e41c4bcb390e12
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlFhJZAACgkQCaWpQKGI+9SZDwCeNyGrDjlnqPLizgrtTby6ZVwq
+CAgAn3mYPrVe8KoPyGC7coeA/wSX3qyZ
+=1e99
+-----END PGP SIGNATURE-----
diff --git a/app-mobilephone/gnome-phone-manager/files/0001-Adapt-to-Evolution-Data-Server-API-changes.patch b/app-mobilephone/gnome-phone-manager/files/0001-Adapt-to-Evolution-Data-Server-API-changes.patch
new file mode 100644
index 000000000000..b375b8f0f400
--- /dev/null
+++ b/app-mobilephone/gnome-phone-manager/files/0001-Adapt-to-Evolution-Data-Server-API-changes.patch
@@ -0,0 +1,541 @@
+From 091f0e00bae058d384fbc9834a402192bbf192a6 Mon Sep 17 00:00:00 2001
+From: Matthew Barnes <mbarnes@redhat.com>
+Date: Sat, 29 Dec 2012 21:14:51 +0100
+Subject: [PATCH] Adapt to Evolution-Data-Server API changes
+
+    Closes: https://bugzilla.gnome.org/show_bug.cgi?id=680927
+---
+ configure.in                                  |   2 +-
+ cut-n-paste/e-contact-entry/e-contact-entry.c | 168 +++++++++++---------------
+ cut-n-paste/e-contact-entry/e-contact-entry.h |   8 +-
+ libgsm/phonemgr-utils.c                       |   2 +-
+ src/e-phone-entry.c                           |  38 +++---
+ 5 files changed, 96 insertions(+), 122 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index be5e729..73e7aec 100644
+--- a/configure.in
++++ b/configure.in
+@@ -47,7 +47,7 @@ PKG_CHECK_MODULES(LIBGSM, glib-2.0 gobject-2.0 $GNOKII_REQS gthread-2.0 bluez $e
+ 
+ PKG_CHECK_MODULES(PHONEMGR, gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0
+ 	libcanberra-gtk3 gconf-2.0
+-	$GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0
++	$GNOME_BLUETOOTH_REQS $evo_pc_file libedataserver-1.2 >= 3.6
+ 	gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1
+ )
+ 
+diff --git a/cut-n-paste/e-contact-entry/e-contact-entry.c b/cut-n-paste/e-contact-entry/e-contact-entry.c
+index dc8e2e3..bbd4e6a 100644
+--- a/cut-n-paste/e-contact-entry/e-contact-entry.c
++++ b/cut-n-paste/e-contact-entry/e-contact-entry.c
+@@ -1,4 +1,4 @@
+-/* 
++/*
+  * Copyright (C) 2004 Ross Burton <ross@burtonini.com
+  *
+  * e-contact-entry.c
+@@ -38,11 +38,6 @@
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ 
+-#include <libedataserver/e-source.h>
+-#include <libebook/e-book.h>
+-#include <libebook/e-book-view.h>
+-#include <libebook/e-contact.h>
+-
+ #include "e-contact-entry.h"
+ #include "econtactentry-marshal.h"
+ 
+@@ -59,7 +54,7 @@ static int signals[LAST_SIGNAL] = { 0 };
+ /* Properties */
+ enum {
+   PROP_0, /* TODO: why? */
+-  PROP_SOURCE_LIST,
++  PROP_REGISTRY,
+   PROP_COMPLETE_LENGTH,
+ };
+ 
+@@ -70,7 +65,7 @@ enum {
+ struct EContactEntryPriv {
+   GtkEntryCompletion *completion;
+   GtkListStore *store;
+-  ESourceList *source_list;
++  ESourceRegistry *registry;
+   /* A list of EntryLookup structs we are searching */
+   GList *lookup_entries;
+   /* Number of characters to start searching at */
+@@ -227,7 +222,7 @@ e_contact_entry_display_func (EContact *contact)
+   emails = e_contact_get (contact, E_CONTACT_EMAIL);
+   for (l = emails; l != NULL; l = l->next) {
+     item = g_new0 (EContactEntyItem, 1);
+-    item->identifier = item->identifier = g_strdup (l->data);
++    item->identifier = g_strdup (l->data);
+     item->display_string = g_strdup_printf ("%s <%s>", (char*)e_contact_get_const (contact, E_CONTACT_NAME_OR_ORG), item->identifier);
+ 
+     items = g_list_prepend (items, item);
+@@ -276,22 +271,13 @@ view_contacts_added_cb (EBook *book, GList *contacts, gpointer user_data)
+       return;
+ 
+     photo = e_contact_get (contact, E_CONTACT_PHOTO);
+-#ifndef HAVE_ECONTACTPHOTOTYPE
+-    if (photo) {
+-#else
+     if (photo && photo->type == E_CONTACT_PHOTO_TYPE_INLINED) {
+-#endif
+       GdkPixbufLoader *loader;
+ 
+       loader = gdk_pixbuf_loader_new ();
+ 
+-#ifndef HAVE_ECONTACTPHOTOTYPE
+-      if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data,
+-			      photo->length, NULL))
+-#else
+       if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data.inlined.data,
+ 			      photo->data.inlined.length, NULL))
+-#endif
+         pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
+ 
+       if (pixbuf) {
+@@ -339,16 +325,15 @@ view_contacts_added_cb (EBook *book, GList *contacts, gpointer user_data)
+  * The query on the EBookView has completed.
+  */
+ static void
+-view_completed_cb (EBookView *book_view, EBookViewStatus status, gpointer user_data)
++view_completed_cb (EBookView *book_view, EBookViewStatus status, const gchar *message, gpointer user_data)
+ {
+   EntryLookup *lookup;
+   g_return_if_fail (user_data != NULL);
+-  /* TODO: handle status != OK */
+-  g_return_if_fail (status == E_BOOK_ERROR_OK);
+   g_return_if_fail (book_view != NULL);
+ 
+   lookup = (EntryLookup*)user_data;
+   g_object_unref (lookup->bookview);
++  lookup->bookview = NULL;
+ }
+ 
+ /**
+@@ -361,9 +346,9 @@ bookview_cb (EBook *book, EBookStatus status, EBookView *book_view, gpointer clo
+   /* TODO: handle status != OK */
+   g_return_if_fail (status == E_BOOK_ERROR_OK);
+   g_return_if_fail (closure != NULL);
+-  
++
+   lookup = (EntryLookup*)closure;
+-  
++
+   g_object_ref (book_view);
+   /* This shouldn't happen of course */
+   if (lookup->bookview) {
+@@ -372,10 +357,10 @@ bookview_cb (EBook *book, EBookStatus status, EBookView *book_view, gpointer clo
+   }
+   lookup->bookview = book_view;
+   g_object_add_weak_pointer ((GObject*)book_view, (gpointer*)&lookup->bookview);
+-  
+-  g_signal_connect (book_view, "contacts_added", (GCallback)view_contacts_added_cb, lookup);
+-  g_signal_connect (book_view, "sequence_complete", (GCallback)view_completed_cb, lookup);
+-  
++
++  g_signal_connect (book_view, "contacts-added", (GCallback)view_contacts_added_cb, lookup);
++  g_signal_connect (book_view, "view_complete", (GCallback)view_completed_cb, lookup);
++
+   e_book_view_start (book_view);
+ }
+ 
+@@ -396,9 +381,10 @@ entry_changed_cb (GtkEditable *editable, gpointer user_data)
+       if (lookup->bookview) {
+         e_book_view_stop (lookup->bookview);
+         g_object_unref (lookup->bookview);
++        lookup->bookview = NULL;
+       }
+     }
+-    
++
+     gtk_list_store_clear (entry->priv->store);
+ 
+     query = create_query (entry, gtk_editable_get_chars (editable, 0, -1));
+@@ -409,8 +395,8 @@ entry_changed_cb (GtkEditable *editable, gpointer user_data)
+       /* If the book isn't open yet, skip this source */
+       if (!lookup->open)
+         continue;
+-      
+-      if (e_book_async_get_book_view (lookup->book, query, NULL, 11, (EBookBookViewCallback)bookview_cb, lookup) != 0) {
++
++      if (e_book_async_get_book_view (lookup->book, query, NULL, MAX_ENTRIES, (EBookBookViewCallback)bookview_cb, lookup) == FALSE) {
+         g_signal_emit (entry, signals[ERROR], 0, _("Cannot create searchable view."));
+       }
+     }
+@@ -441,7 +427,7 @@ book_opened_cb (EBook *book, EBookStatus status, gpointer data)
+         return;
+       }
+     }
+-    
++
+     g_signal_emit (lookup->entry, signals[STATE_CHANGE], 0, FALSE);
+     g_signal_emit (lookup->entry, signals[ERROR], 0, stringify_ebook_error (status));
+     return;
+@@ -458,11 +444,12 @@ book_opened_cb (EBook *book, EBookStatus status, gpointer data)
+  */
+ 
+ void
+-e_contact_entry_set_source_list (EContactEntry *entry,
+-    				  ESourceList *source_list)
++e_contact_entry_set_registry (EContactEntry *entry,
++                              ESourceRegistry *registry)
+ {
++  GList *list, *link;
++  const gchar *extension_name;
+   GError *error = NULL;
+-  GSList *list, *l;
+ 
+   g_return_if_fail (E_IS_CONTACT_ENTRY (entry));
+ 
+@@ -471,58 +458,48 @@ e_contact_entry_set_source_list (EContactEntry *entry,
+     g_list_foreach (entry->priv->lookup_entries, (GFunc)lookup_entry_free, NULL);
+     g_list_free (entry->priv->lookup_entries);
+   }
+-  if (entry->priv->source_list) {
+-    g_object_unref (entry->priv->source_list);
++  if (entry->priv->registry) {
++    g_object_unref (entry->priv->registry);
+   }
+ 
+   /* If we have no new sources, disable and return here */
+-  if (source_list == NULL) {
++  if (registry == NULL) {
+     g_signal_emit (entry, signals[STATE_CHANGE], 0, FALSE);
+-    entry->priv->source_list = NULL;
++    entry->priv->registry = NULL;
+     entry->priv->lookup_entries = NULL;
+     return;
+   }
+ 
+-  entry->priv->source_list = source_list;
+-  /* So that the list isn't going away underneath us */
+-  g_object_ref (entry->priv->source_list);
++  entry->priv->registry = registry;
++  /* So that the registry isn't going away underneath us */
++  g_object_ref (entry->priv->registry);
+ 
+-  /* That gets us a list of ESourceGroup */
+-  list = e_source_list_peek_groups (source_list);
+   entry->priv->lookup_entries = NULL;
+ 
+-  for (l = list; l != NULL; l = l->next) {
+-    ESourceGroup *group = l->data;
+-    GSList *sources = NULL, *m;
+-    /* That should give us a list of ESource */
+-    sources = e_source_group_peek_sources (group);
+-    for (m = sources; m != NULL; m = m->next) {
+-      ESource *source = m->data;
+-      ESource *s = e_source_copy (source);
+-      EntryLookup *lookup;
+-      char *uri;
++  extension_name = E_SOURCE_EXTENSION_ADDRESS_BOOK;
++  list = e_source_registry_list_sources (registry, extension_name);
+ 
+-      uri = g_strdup_printf("%s/%s", e_source_group_peek_base_uri (group), e_source_peek_relative_uri (source));
+-      e_source_set_absolute_uri (s, uri);
+-      g_free (uri);
++  for (link = list; link != NULL; link = g_list_next (link)) {
++    ESource *source = E_SOURCE (link->data);
++    EntryLookup *lookup;
+ 
+-      /* Now add those to the lookup entries list */
+-      lookup = g_new0 (EntryLookup, 1);
+-      lookup->entry = entry;
+-      lookup->status = E_BOOK_ERROR_OK;
+-      lookup->open = FALSE;
++    /* Now add those to the lookup entries list */
++    lookup = g_new0 (EntryLookup, 1);
++    lookup->entry = entry;
++    lookup->status = E_BOOK_ERROR_OK;
++    lookup->open = FALSE;
+ 
+-      if ((lookup->book = e_book_new (s, &error)) == NULL) {
+-        /* TODO handle this better, fire the error signal I guess */
++    if ((lookup->book = e_book_new (source, &error)) == NULL) {
++      /* TODO handle this better, fire the error signal I guess */
++      if (error) {
+         g_warning ("%s", error->message);
+-	g_error_free (error);
+-	g_free (lookup);
+-      } else {
+-        entry->priv->lookup_entries = g_list_append (entry->priv->lookup_entries, lookup);
+-	e_book_async_open(lookup->book, TRUE, (EBookCallback)book_opened_cb, lookup);
++        g_error_free (error);
++        error = NULL;
+       }
+-
+-      g_object_unref (s);
++      g_free (lookup);
++    } else {
++      entry->priv->lookup_entries = g_list_append (entry->priv->lookup_entries, lookup);
++      e_book_async_open(lookup->book, TRUE, (EBookCallback)book_opened_cb, lookup);
+     }
+   }
+ 
+@@ -530,12 +507,12 @@ e_contact_entry_set_source_list (EContactEntry *entry,
+     g_signal_emit (entry, signals[STATE_CHANGE], 0, FALSE);
+ }
+ 
+-ESourceList *
+-e_contact_entry_get_source_list (EContactEntry *entry)
++ESourceRegistry *
++e_contact_entry_get_registry (EContactEntry *entry)
+ {
+   g_return_val_if_fail (E_IS_CONTACT_ENTRY (entry), NULL);
+ 
+-  return entry->priv->source_list;
++  return entry->priv->registry;
+ }
+ 
+ void
+@@ -552,7 +529,7 @@ int
+ e_contact_entry_get_complete_length (EContactEntry *entry)
+ {
+   g_return_val_if_fail (E_IS_CONTACT_ENTRY (entry), 3); /* TODO: from paramspec? */
+-  
++
+   return entry->priv->lookup_length;
+ }
+ 
+@@ -564,7 +541,7 @@ e_contact_entry_set_display_func (EContactEntry *entry, EContactEntryDisplayFunc
+   if (entry->priv->display_destroy) {
+     entry->priv->display_destroy (entry->priv->display_func);
+   }
+-  
++
+   entry->priv->display_func = func;
+   entry->priv->display_data = func_data;
+   entry->priv->display_destroy = destroy;
+@@ -596,13 +573,13 @@ static void
+ e_contact_entry_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
+ {
+   EContactEntry *entry;
+-  
++
+   g_return_if_fail (E_IS_CONTACT_ENTRY (object));
+   entry = E_CONTACT_ENTRY (object);
+-  
++
+   switch (property_id) {
+-  case PROP_SOURCE_LIST:
+-    e_contact_entry_set_source_list (entry, g_value_get_object (value));
++  case PROP_REGISTRY:
++    e_contact_entry_set_registry (entry, g_value_get_object (value));
+     break;
+   case PROP_COMPLETE_LENGTH:
+     e_contact_entry_set_complete_length (entry, g_value_get_int (value));
+@@ -618,10 +595,10 @@ e_contact_entry_get_property (GObject *object, guint property_id, GValue *value,
+   EContactEntry *entry;
+   g_return_if_fail (E_IS_CONTACT_ENTRY (object));
+   entry = E_CONTACT_ENTRY (object);
+-  
++
+   switch (property_id) {
+-  case PROP_SOURCE_LIST:
+-    g_value_set_object (value, e_contact_entry_get_source_list (entry));
++  case PROP_REGISTRY:
++    g_value_set_object (value, e_contact_entry_get_registry (entry));
+     break;
+   case PROP_COMPLETE_LENGTH:
+     g_value_set_int (value, e_contact_entry_get_complete_length (entry));
+@@ -644,7 +621,7 @@ e_contact_entry_finalize (GObject *object)
+     g_list_free (entry->priv->lookup_entries);
+     g_object_unref (entry->priv->completion);
+     g_object_unref (entry->priv->store);
+-    g_object_unref (entry->priv->source_list);
++    g_object_unref (entry->priv->registry);
+ 
+     if (entry->priv->display_destroy) {
+       entry->priv->display_destroy (entry->priv->display_func);
+@@ -657,7 +634,7 @@ e_contact_entry_finalize (GObject *object)
+ static void
+ reset_search_fields (EContactEntry *entry)
+ {
+-  EContactField fields[] = { E_CONTACT_FULL_NAME, E_CONTACT_EMAIL, E_CONTACT_NICKNAME, E_CONTACT_ORG, 0 };
++  EContactField fields[] = { E_CONTACT_FULL_NAME, E_CONTACT_EMAIL, E_CONTACT_NICKNAME, 0 };
+ 
+   g_free (entry->priv->search_fields);
+   entry->priv->search_fields = g_new0 (EContactField, G_N_ELEMENTS (fields));
+@@ -707,23 +684,23 @@ static void
+ e_contact_entry_class_init (EContactEntryClass *klass)
+ {
+   GObjectClass *object_class;
+-  
++
+   object_class = (GObjectClass *) klass;
+-  
++
+   /* GObject */
+   object_class->set_property = e_contact_entry_set_property;
+   object_class->get_property = e_contact_entry_get_property;
+   object_class->finalize = e_contact_entry_finalize;
+ 
+   /* Properties */
+-  g_object_class_install_property (object_class, PROP_SOURCE_LIST,
+-                                   g_param_spec_object ("source-list", "Source List", "The source list to search for contacts.",
+-                                                        E_TYPE_SOURCE_LIST, G_PARAM_READWRITE));
+-  
++  g_object_class_install_property (object_class, PROP_REGISTRY,
++                                   g_param_spec_object ("registry", "Registry", "Data source registry.",
++                                                        E_TYPE_SOURCE_REGISTRY, G_PARAM_READWRITE));
++
+   g_object_class_install_property (object_class, PROP_COMPLETE_LENGTH,
+                                    g_param_spec_int ("complete-length", "Complete length", "Number of characters to start a search on.",
+                                                      2, 99, 3, G_PARAM_READWRITE));
+-  
++
+   /* Signals */
+   signals[CONTACT_SELECTED] = g_signal_new ("contact-selected",
+                                             G_TYPE_FROM_CLASS (object_class),
+@@ -732,7 +709,7 @@ e_contact_entry_class_init (EContactEntryClass *klass)
+                                             NULL, NULL,
+                                             econtactentry_marshal_VOID__OBJECT_STRING,
+                                             G_TYPE_NONE, 2, E_TYPE_CONTACT, G_TYPE_STRING);
+-  
++
+   signals[ERROR] = g_signal_new ("error",
+                                  G_TYPE_FROM_CLASS (object_class),
+                                  G_SIGNAL_RUN_LAST,
+@@ -771,6 +748,7 @@ lookup_entry_free (EntryLookup *lookup)
+   if (lookup->bookview) {
+     g_warning("EBookView still around");
+     g_object_unref (lookup->bookview);
++    lookup->bookview = NULL;
+   }
+   if (lookup->book) {
+     g_object_unref (lookup->book);
+@@ -789,11 +767,11 @@ split_query_string (const gchar *str)
+   GArray *parts = g_array_sized_new (FALSE, FALSE, sizeof (char *), 2);
+   PangoLogAttr *attrs;
+   guint str_len = strlen (str), word_start = 0, i;
+-  
+-  attrs = g_new0 (PangoLogAttr, str_len + 1);  
++
++  attrs = g_new0 (PangoLogAttr, str_len + 1);
+   /* TODO: do we need to specify a particular language or is NULL ok? */
+   pango_get_log_attrs (str, -1, -1, NULL, attrs, str_len + 1);
+-  
++
+   for (i = 0; i < str_len + 1; i++) {
+     char *start_word, *end_word, *word;
+     if (attrs[i].is_word_end) {
+diff --git a/cut-n-paste/e-contact-entry/e-contact-entry.h b/cut-n-paste/e-contact-entry/e-contact-entry.h
+index bf6b39b..6fedef7 100644
+--- a/cut-n-paste/e-contact-entry/e-contact-entry.h
++++ b/cut-n-paste/e-contact-entry/e-contact-entry.h
+@@ -23,10 +23,8 @@
+ #ifndef CONTACT_ENTRY_H
+ #define CONTACT_ENTRY_H
+ 
+-#include <libedataserver/e-source-group.h>
+-#include <libedataserver/e-source-list.h>
+-#include <libebook/e-contact.h>
+ #include <gtk/gtk.h>
++#include <libebook/libebook.h>
+ 
+ G_BEGIN_DECLS
+ 
+@@ -71,8 +69,8 @@ GType e_contact_entry_get_type (void);
+ 
+ GtkWidget *e_contact_entry_new (void);
+ 
+-void e_contact_entry_set_source_list (EContactEntry *entry, ESourceList *list);
+-ESourceList *e_contact_entry_get_source_list (EContactEntry *entry);
++void e_contact_entry_set_registry (EContactEntry *entry, ESourceRegistry *registry);
++ESourceRegistry *e_contact_entry_get_registry (EContactEntry *entry);
+ 
+ void e_contact_entry_set_complete_length(EContactEntry *entry, int length);
+ int e_contact_entry_get_complete_length(EContactEntry *entry);
+diff --git a/libgsm/phonemgr-utils.c b/libgsm/phonemgr-utils.c
+index 4e62e10..baef34f 100644
+--- a/libgsm/phonemgr-utils.c
++++ b/libgsm/phonemgr-utils.c
+@@ -27,7 +27,7 @@
+ #include <glib.h>
+ #include <glib/gstdio.h>
+ #include <glib-object.h>
+-#include <libebook/e-contact.h>
++#include <libebook/libebook.h>
+ #include <gnokii.h>
+ 
+ #include <bluetooth/bluetooth.h>
+diff --git a/src/e-phone-entry.c b/src/e-phone-entry.c
+index 5d25622..5c10155 100644
+--- a/src/e-phone-entry.c
++++ b/src/e-phone-entry.c
+@@ -1,5 +1,5 @@
+ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+-/* 
++/*
+  * Copyright (C) 2005 Bastien Nocera <hadess@hadess.net>
+  *
+  * e-phone-entry.c
+@@ -31,8 +31,6 @@
+ 
+ #include <gtk/gtk.h>
+ #include <string.h>
+-#include <libedataserver/e-source-list.h>
+-#include <libedataserverui/e-client-utils.h>
+ #include "e-phone-entry.h"
+ 
+ #define CONTACT_FORMAT "%s (%s)"
+@@ -181,25 +179,25 @@ e_phone_entry_finalize (GObject *object)
+ }
+ 
+ static void
+-add_sources (EContactEntry *entry)
+-{
+-	ESourceList *source_list;
+-
+-	if (e_client_utils_get_sources (&source_list,
+-					E_CLIENT_SOURCE_TYPE_CONTACTS,
+-					NULL)) {
+-		e_contact_entry_set_source_list (E_CONTACT_ENTRY (entry),
+-						 source_list);
+-		g_object_unref (source_list);
+-	}
+-}
+-
+-static void
+ e_phone_entry_init (EPhoneEntry *entry)
+ {
+ 	EContactField fields[] = { E_CONTACT_FULL_NAME, E_CONTACT_NICKNAME, E_CONTACT_ORG, E_CONTACT_PHONE_MOBILE, 0 };
++	ESourceRegistry *registry;
++	GError *error = NULL;
++
++	/* XXX This call blocks while a D-Bus connection is made, possibly
++	 *     requiring activation.  Might be better to create the registry
++	 *     in main(), pass it to ui_init(), and have e_phone_entry_new()
++	 *     take it as an argument.  Calling this from main() means if it
++	 *     fails you can abort cleanly with a console error message. */
++	registry = e_source_registry_new_sync (NULL, &error);
++	if (registry == NULL) {
++		g_error ("%s: %s", G_STRFUNC, error->message);
++		g_assert_not_reached ();
++	}
++	e_contact_entry_set_registry (E_CONTACT_ENTRY (entry), registry);
++	g_object_unref (registry);
+ 
+-	add_sources (E_CONTACT_ENTRY (entry));
+ 	e_contact_entry_set_search_fields (E_CONTACT_ENTRY (entry), (const EContactField *)fields);
+ 	e_contact_entry_set_display_func (E_CONTACT_ENTRY (entry), test_display_func, NULL, NULL);
+ 	g_signal_connect (G_OBJECT (entry), "contact_selected",
+@@ -212,9 +210,9 @@ static void
+ e_phone_entry_class_init (EPhoneEntryClass *klass)
+ {
+   GObjectClass *object_class;
+-  
++
+   object_class = (GObjectClass *) klass;
+-  
++
+   /* GObject */
+   object_class->finalize = e_phone_entry_finalize;
+ 
+-- 
+1.8.0.2
+
diff --git a/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.69.ebuild b/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.69.ebuild
new file mode 100644
index 000000000000..890c2395c05f
--- /dev/null
+++ b/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.69.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.69.ebuild,v 1.1 2013/04/07 07:51:43 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="A program created to allow you to control aspects of your mobile phone from your GNOME desktop"
+HOMEPAGE="http://live.gnome.org/PhoneManager"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gnome"
+# telepathy support is considered experimental
+
+RDEPEND=">=dev-libs/glib-2.31.0:2
+	>=x11-libs/gtk+-3:3
+	>=gnome-base/orbit-2
+	>=gnome-base/gconf-2:2
+	>=gnome-extra/evolution-data-server-3.6
+	media-libs/libcanberra[gtk3]
+	>=app-mobilephone/gnokii-0.6.28[bluetooth]
+	net-wireless/bluez
+	dev-libs/dbus-glib
+	dev-libs/openobex
+	media-libs/libcanberra[gtk]
+	>=x11-themes/gnome-icon-theme-2.19.1
+	>=net-wireless/gnome-bluetooth-3.3:2"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35.5
+	virtual/pkgconfig
+	gnome-base/gnome-common"
+# gnome-common needed for eautoreconf
+
+src_prepare() {
+	# Fix eds-3.6 building, upstream bug #680927
+	epatch "${FILESDIR}"/0001-Adapt-to-Evolution-Data-Server-API-changes.patch
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable gnome bluetooth-plugin) \
+		--disable-telepathy \
+		--disable-static
+}