Version bump, drop old

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

10 files changed, 70 insertions, 693 deletions

diff --git a/net-voip/telepathy-haze/ChangeLog b/net-voip/telepathy-haze/ChangeLog
index 1021fd75bfa4..e7cb57ee86b8 100644
--- a/net-voip/telepathy-haze/ChangeLog
+++ b/net-voip/telepathy-haze/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-voip/telepathy-haze
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-haze/ChangeLog,v 1.43 2013/09/28 19:45:13 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-haze/ChangeLog,v 1.44 2013/10/04 18:47:22 pacho Exp $
+
+*telepathy-haze-0.8.0 (04 Oct 2013)
+
+  04 Oct 2013; Pacho Ramos <pacho@gentoo.org> +telepathy-haze-0.8.0.ebuild,
+  -files/001-handle_purple_account_request_password.patch,
+  -files/002-fix_resource_leakage.patch,
+  -files/003-fix_more_resource_leaks.patch, -telepathy-haze-0.7.0.ebuild:
+  Version bump, drop old
 
   28 Sep 2013; Pacho Ramos <pacho@gentoo.org> telepathy-haze-0.7.1.ebuild:
   Add missing PYTHON_DEPS
diff --git a/net-voip/telepathy-haze/Manifest b/net-voip/telepathy-haze/Manifest
index eefe7e7e84f6..e6dba0a77993 100644
--- a/net-voip/telepathy-haze/Manifest
+++ b/net-voip/telepathy-haze/Manifest
@@ -1,21 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 001-handle_purple_account_request_password.patch 8398 SHA256 e35c1525593b3c6cb66f197c39c2b8a332c01b86eb33b5ec34557e48194282ee SHA512 53569c79a0125bd6338003a41312a80ff41d7164d22d2218a83bccbed7b5b9c493cf1647060dce3932241b221dda6894926128a9e8baa633bb975346e5724648 WHIRLPOOL a836f7d37e8c970099fd10699e19c21c5bbc7834ae19538b4a828da64181792d4322c8d47650ca1dcd9160229a0b1c5e67dcd763a49b9fabb226d373c03c6d76
-AUX 002-fix_resource_leakage.patch 4526 SHA256 2597e4bae0e23090de4d7edc7c13495adf266aa8a774be9aa034679682b414ac SHA512 65890c988d860f8ce862a277b93a51fa0f6738f4dc44f466c661503f11c6fd4ea74e9136364ffa1b06538c560671b44c6223b39fec02e7f8cbf680d7b6de5909 WHIRLPOOL 8342d4bb2a155b5327b2aa2138c664ee1ad5426417ffd83a54e0ee2da322ae90c12fad1d49032e924fd866e3dc70aaef62bf360fddb288e0833a1d7a39a834c9
-AUX 003-fix_more_resource_leaks.patch 6663 SHA256 7423812e904da7600f25120ec4a428c917800cf7fa92f0c1aceb158f90c8bb9f SHA512 271533ecf415f4880675f68fa14c9057acefa95339b0e2cd2dfd10f39414a81f9dd1622b56ad8669b91f7f8f59ace3d9ba73499f66e4e937888d9b2a59e6d994 WHIRLPOOL 27a6cbe1adfbcc73eeaf02e0f9940425a34d8100a6deeaae0e642afcd930cc2ebda83a601e550f7ec3f218f0514dbe3061c825ddb392f6da8b65e46fe1f5eba2
 DIST telepathy-haze-0.6.0.tar.gz 558413 SHA256 e267c54aef8f85746899e365ae344fe9ec73c1aec04298bedad6a88732ab2fe3 SHA512 db87f7f1be4217ab464d3a3fdb33c6121931c286a102b6af7e3a06ece21b88606c41f3eabc1ad2453e58f5091f6a141dbf2369c7d277b135aebf9b0f37cbe2f0 WHIRLPOOL a8f29ee0aee83cddb386d55bbdbe7df2d77acfc936c1ce0e5786345c3e7a20d3d608e4df99b8e5ebc2fcd5644d7ecfa9641564561f9f538fc325259b0f31a52d
-DIST telepathy-haze-0.7.0.tar.gz 559037 SHA256 0b0143358af2435ec267cf62bd1c475e4d6e1f8e950e87bf7da3d288424152bd SHA512 9749ca9733f20b47da84412d35d7cc28d305fcfc8085450456914a6d7907de7cfb4de5e8f7c8e1b06e412feeed5dbc272c69ce889bedc0ac8598aae96beaf677 WHIRLPOOL e432ea9327ee2aa3b3a6a58b73eb916f9f4b45fee5518ce128dd03d705c82b9f3bc90ffd48e541170a28f688fc15f0675d44ce93f2f9e59b4aa37352e6fbc41b
 DIST telepathy-haze-0.7.1.tar.gz 577366 SHA256 2b9ad41af225cb997b1e7c719bf5a3990738b976bba49cb7ba74772453342c90 SHA512 3caeb86eaf2a71dcda0acdaaffa40c19282975dc0f43614f7954a2595ba836160047c483ee090c7cb265fb9eeb2ece2d94ff646458d76e1421a6dc33dad66fb3 WHIRLPOOL e8bee783cfafa5dd46dc2a0f34d73cffb6a2cfe700b684e796a13689772795e5815595c8a658c9f15c52dc82cc40f25054f191ed7bf8e2a856cf752f0007f777
+DIST telepathy-haze-0.8.0.tar.gz 580929 SHA256 3e76049c05f2cd5900c5c0c1cfebdf7ae79eec987a599f1090946673c5b8f9c9 SHA512 2739b37b1f95f0996b423c0883f369e1283363e39cb1b0566e2573f3cebdab0530ffd1d4d515202e300407029227b75b4e8c459167d584000405fda2d070699d WHIRLPOOL 671e6959c2c2584663ebc50cb5232f1c4d64fa26505fe0c83fb85f82143c43c40185c7c1c0a00ba8e65ab47bcadb45fdd502ffc0c9d86831196d55404c13739a
 EBUILD telepathy-haze-0.6.0.ebuild 983 SHA256 7d94ee2fe751c588615f518c3b621dad9a68e77b37043a41c52a68416dc14ffb SHA512 ba7c4b890c029b2c8af0c94c27f138f6d1dd02028f0b3694586c4359f9af440cef8428483f4c72d0f9c4e525ee7e44613c38199ef292a14576d5770106334c23 WHIRLPOOL 3ef77de410fbc465c40469b775bf46e0c8f87018d2a8bcbcaa19d29b82f57e7d46373459bb13616e44ebf5cede296c514162b9c5af30c12c5611084851707248
-EBUILD telepathy-haze-0.7.0.ebuild 1150 SHA256 737c55854a4547e2070edbe86a2ab846df6b65cc382136ce56c405b3e3ecfb15 SHA512 5c2c2866e9037590d599f8aa65fb49e5a6b25f64cf4419c16ccdb14c37e06df603b07b917ff862751b29aa1452f445a0c8de48fa7970860865bf183eaa97be8c WHIRLPOOL fc2704e2d745d4dbf347ddecbc8f0d2f8fe7fff0b08e5e49d9be745466f35d077909c007bb9d324cfa4e1be4dc1fecf50629659ca24d9102057e8288fbf4bb9e
 EBUILD telepathy-haze-0.7.1.ebuild 935 SHA256 f6297f45bd99294f99c30c3112b91776bb7cb47feea3c6838d6b577a0c1653c4 SHA512 397411224ab11ae317369483b6f987047913824d6be5ec4d8f8e739ef87cee9700f3ae421033d909cebfd93080dfe7771c85768a908200de82eb9eb77fe5aadf WHIRLPOOL 52bb5413f7dcca12f40a129e314d67ff28a702e0727c3172548e68dc1a743629780708bae4c2e1ac604fb0d1003b4034961ea09daa5983b969a4451094577d43
-MISC ChangeLog 5916 SHA256 a45c162a59d5c5bb3b713f9dea7ba06a15ceff22792dfbdd7c4569e1e48a71d7 SHA512 0f1bd1596c44b5829cf2ba0860304a87aa20f8e845b08d71b997355e90cb39b112548323bd3b129533152007edf5a2d650ef7fa6446555f38ebba692892733ab WHIRLPOOL 10e3dfeb2905dee9eaedcd6fae7211d86edccc232079d8ac9e30c48e251c1b09c0e42690c5baf1be9c8bd1861a12e3ef7194138f063aa81fb2b405fb2cdd860e
+EBUILD telepathy-haze-0.8.0.ebuild 928 SHA256 d5d868c06e672e95787ad62d70d5bc847d72b8268f635cdf1a64569a1c15321e SHA512 6c2712966a1645da3ac90846a3498488dd03bc687df38928a7ee5a9725b21258540b322ec62b41be794341c3a0150254e44cfdbb9301886ffa5454ecb86c8450 WHIRLPOOL 1b091cd4cf171f418396462d029116c7118939a4dfe2daff33eb7c074b2c62484ef1ed26754b5f141337a402c7e7d58ebc0242fedcedfa0635a0d888fc841553
+MISC ChangeLog 6229 SHA256 d8666e40eaf179aa6948e20611601c847cd3c30e1b42ab976eb623f4ab435666 SHA512 dedabb671ccf89dec5715da98463a23a58e67c6ced28609e492b70eba115268fb0f1e82550a132cb75f132384f590eb7c3ad4ce6d2101a4cb36151a1594444f8 WHIRLPOOL 9992356bb9e8181128d688bc6f88a369da0f4ea6f641f3d05f3393ee315d4fcec288ca69a1978adc018e5f6c7df0f5159268497148a773595c43e2f22cc88308
 MISC metadata.xml 322 SHA256 0658eb62f074a6ca6adf1c572753ae025b4c1e9048d3d4c0529f98cf2cb6bfa3 SHA512 b0d4a71235e1d7b0c53baae758153e624c4d324389700bbdb4ea8983f0a7f808727ea9821f88efd9058bb739a7c6e3c07cc24fbc496156fabb300b3e7312bea6 WHIRLPOOL 0ec9fb4d4e13f14f744a25ee5a025dd430b08a2ea85413fa02b616b853e602ffec00c24bafd5c0c65cef876b741956b4f11fe8f1681164a2bff3f95b44dc66b0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlJHMeAACgkQCaWpQKGI+9TDlgCfSnlVlzk7zW8duOvZfWJown93
-tb8An0v8DOqVV+aVWkwODjZ7TncV8PQ9
-=tqjp
+iEYEAREIAAYFAlJPDTsACgkQCaWpQKGI+9Td9ACbBLXIg9EyzDolXwqEgy5C9Eq2
+2L0AnigrxGeamXCAUlz+DEV4b26sGFnI
+=oZWj
 -----END PGP SIGNATURE-----
diff --git a/net-voip/telepathy-haze/files/001-handle_purple_account_request_password.patch b/net-voip/telepathy-haze/files/001-handle_purple_account_request_password.patch
deleted file mode 100644
index e53b378c0a31..000000000000
--- a/net-voip/telepathy-haze/files/001-handle_purple_account_request_password.patch
+++ /dev/null
@@ -1,269 +0,0 @@
-From 66b7fff2f65b65a5d298bf868bb8e21a32492a58 Mon Sep 17 00:00:00 2001
-From: Stefan Becker <chemobejk@gmail.com>
-Date: Tue, 09 Apr 2013 16:30:34 +0000
-Subject: request: handle purple_account_request_password()
-
-This is needed for libpurple plugins with optional password, e.g. SIPE
-since 1.14.1. That libpurple API call boils down to a
-purple_request_fields() call.
-
-The flagging for --enable-leaky-request-stubs was refactored so that
-this new code is always compiled in.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=63326
----
-diff --git a/src/connection.c b/src/connection.c
-index 0b272a9..6e9121d 100644
---- a/src/connection.c
-+++ b/src/connection.c
-@@ -42,6 +42,7 @@
- #include "connection-avatars.h"
- #include "connection-mail.h"
- #include "extensions/extensions.h"
-+#include "request.h"
- 
- #include "connection-capabilities.h"
- 
-@@ -138,6 +139,9 @@ struct _HazeConnectionPrivate
-     gchar *prpl_id;
-     PurplePluginProtocolInfo *prpl_info;
- 
-+    /* Set if purple_account_request_password() was called */
-+    gpointer password_request;
-+
-     /* Set if purple_account_disconnect has been called or is scheduled to be
-      * called, so should not be called again.
-      */
-@@ -446,6 +450,11 @@ _haze_connection_password_manager_prompt_cb (GObject *source,
-     {
-       DEBUG ("Simple password manager failed: %s", error->message);
- 
-+      if (priv->password_request)
-+        {
-+          haze_request_password_cb(priv->password_request, NULL);
-+        }
-+
-       if (base_conn->status != TP_CONNECTION_STATUS_DISCONNECTED)
-         {
-           tp_base_connection_disconnect_with_dbus_error (base_conn,
-@@ -454,7 +463,13 @@ _haze_connection_password_manager_prompt_cb (GObject *source,
-         }
- 
-       /* no need to call purple_account_disconnect because _connect
--       * was never called */
-+       * was never called ...
-+       * ... unless we had a dynamic password request */
-+      if (priv->password_request)
-+        {
-+          priv->disconnecting = TRUE;
-+          purple_account_disconnect (self->account);
-+        }
- 
-       g_error_free (error);
-       return;
-@@ -463,11 +478,17 @@ _haze_connection_password_manager_prompt_cb (GObject *source,
-   g_free (priv->password);
-   priv->password = g_strdup (password->str);
- 
--  purple_account_set_password (self->account, priv->password);
-+  if (priv->password_request)
-+    {
-+      haze_request_password_cb (priv->password_request, priv->password);
-+    } else
-+    {
-+      purple_account_set_password (self->account, priv->password);
- 
--  purple_account_set_enabled(self->account, UI_ID, TRUE);
--  purple_account_connect (self->account);
--  priv->connect_called = TRUE;
-+      purple_account_set_enabled(self->account, UI_ID, TRUE);
-+      purple_account_connect (self->account);
-+      priv->connect_called = TRUE;
-+    }
- }
- 
- static gboolean
-@@ -516,6 +537,20 @@ _haze_connection_start_connecting (TpBaseConnection *base,
-     return TRUE;
- }
- 
-+void haze_connection_request_password (PurpleAccount *account,
-+                                       void *user_data)
-+{
-+    HazeConnection *self = ACCOUNT_GET_HAZE_CONNECTION (account);
-+    HazeConnectionPrivate *priv = self->priv;
-+
-+    priv->password_request = user_data;
-+
-+    /* pop up auth channel */
-+    tp_simple_password_manager_prompt_async (self->password_manager,
-+                                             _haze_connection_password_manager_prompt_cb,
-+                                             self);
-+}
-+
- static void
- _haze_connection_shut_down (TpBaseConnection *base)
- {
-diff --git a/src/connection.h b/src/connection.h
-index c69a7c1..2e68935 100644
---- a/src/connection.h
-+++ b/src/connection.h
-@@ -111,6 +111,9 @@ const gchar *haze_get_fallback_group (void);
- const gchar **haze_connection_get_implemented_interfaces (void);
- const gchar **haze_connection_get_guaranteed_interfaces (void);
- 
-+void haze_connection_request_password (PurpleAccount *account,
-+                                       gpointer user_data);
-+
- G_END_DECLS
- 
- #endif /* #ifndef __HAZE_CONNECTION_H__*/
-diff --git a/src/main.c b/src/main.c
-index afa0a02..4cd171c 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -141,9 +141,7 @@ haze_ui_init (void)
-     purple_accounts_set_ui_ops (haze_get_account_ui_ops ());
-     purple_conversations_set_ui_ops (haze_get_conv_ui_ops ());
-     purple_connections_set_ui_ops (haze_get_connection_ui_ops ());
--#ifdef ENABLE_LEAKY_REQUEST_STUBS
-     purple_request_set_ui_ops (haze_request_get_ui_ops ());
--#endif
-     purple_notify_set_ui_ops (haze_notify_get_ui_ops ());
-     purple_privacy_set_ui_ops (haze_get_privacy_ui_ops ());
- }
-diff --git a/src/request.c b/src/request.c
-index 408678b..dae859d 100644
---- a/src/request.c
-+++ b/src/request.c
-@@ -18,6 +18,8 @@
-  *
-  */
- 
-+#include "config.h"
-+
- #include <glib-object.h>
- 
- #include <libpurple/account.h>
-@@ -25,7 +27,9 @@
- 
- #include "debug.h"
- #include "request.h"
-+#include "connection.h"
- 
-+#ifdef ENABLE_LEAKY_REQUEST_STUBS
- static gpointer
- haze_request_input (const char *title,
-                     const char *primary,
-@@ -95,6 +99,30 @@ haze_request_action (const char *title,
- 
-     return NULL;
- }
-+#endif
-+
-+struct password_data {
-+    PurpleRequestFields *fields;
-+    PurpleRequestField *password;
-+    GCallback ok_cb;
-+    GCallback cancel_cb;
-+    void *user_data;
-+};
-+
-+void haze_request_password_cb (gpointer user_data,
-+                               const gchar *password)
-+{
-+    struct password_data *pd = user_data;
-+
-+    if (password) {
-+        purple_request_field_string_set_value(pd->password, password);
-+        ((PurpleRequestFieldsCb)pd->ok_cb)(pd->user_data, pd->fields);
-+    } else {
-+        ((PurpleRequestFieldsCb)pd->cancel_cb)(pd->user_data, pd->fields);
-+    }
-+
-+    g_free(pd);
-+}
- 
- static gpointer
- haze_request_fields (const char *title,
-@@ -110,14 +138,36 @@ haze_request_fields (const char *title,
-                      PurpleConversation *conv,
-                      void *user_data)
- {
--    DEBUG ("ignoring request:");
--    DEBUG ("    title: %s", (title ? title : "(null)"));
--    DEBUG ("    primary: %s", (primary ? primary : "(null)"));
--    DEBUG ("    secondary: %s", (secondary ? secondary : "(null)"));
-+    /*
-+     * We must support purple_account_request_password() which boils down
-+     * to purple_request_fields() with certain parameters. I'm not sure
-+     * if this the best way of doing this, but it works.
-+     */
-+    if (purple_request_fields_exists(fields, "password") &&
-+        purple_request_fields_exists(fields, "remember")) {
-+        struct password_data *pd = g_new0(struct password_data, 1);
-+
-+        DEBUG ("triggering password request");
-+
-+        pd->fields    = fields;
-+        pd->password  = purple_request_fields_get_field(fields, "password");
-+        pd->ok_cb     = ok_cb;
-+        pd->cancel_cb = cancel_cb;
-+        pd->user_data = user_data;
-+
-+        haze_connection_request_password(account, pd);
-+
-+    } else {
-+        DEBUG ("ignoring request:");
-+        DEBUG ("    title: %s", (title ? title : "(null)"));
-+        DEBUG ("    primary: %s", (primary ? primary : "(null)"));
-+        DEBUG ("    secondary: %s", (secondary ? secondary : "(null)"));
-+    }
- 
-     return NULL;
- }
- 
-+#ifdef ENABLE_LEAKY_REQUEST_STUBS
- static gpointer
- haze_request_file (const char *title,
-                    const char *filename,
-@@ -152,7 +202,7 @@ haze_request_folder (const char *title,
- 
-     return NULL;
- }
--
-+#endif
- 
- /*
- 	void (*close_request)(PurpleRequestType type, void *ui_handle);
-@@ -160,12 +210,14 @@ haze_request_folder (const char *title,
- 
- static PurpleRequestUiOps request_uiops =
- {
-+#ifdef ENABLE_LEAKY_REQUEST_STUBS
-     .request_input = haze_request_input,
-     .request_choice = haze_request_choice,
-     .request_action = haze_request_action,
--    .request_fields = haze_request_fields,
-     .request_file = haze_request_file,
--    .request_folder = haze_request_folder
-+    .request_folder = haze_request_folder,
-+#endif
-+    .request_fields = haze_request_fields
- };
- 
- PurpleRequestUiOps *
-diff --git a/src/request.h b/src/request.h
-index d896cc6..cc572d6 100644
---- a/src/request.h
-+++ b/src/request.h
-@@ -20,4 +20,7 @@
- 
- #include <libpurple/request.h>
- 
-+void haze_request_password_cb (gpointer user_data,
-+                               const gchar *password);
-+
- PurpleRequestUiOps *haze_request_get_ui_ops (void);
---
-cgit v0.9.0.2-2-gbebe
diff --git a/net-voip/telepathy-haze/files/002-fix_resource_leakage.patch b/net-voip/telepathy-haze/files/002-fix_resource_leakage.patch
deleted file mode 100644
index ebf15dd6dc4c..000000000000
--- a/net-voip/telepathy-haze/files/002-fix_resource_leakage.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From eef971c3aeb61b9b60013f3b728f62e7ac5580bf Mon Sep 17 00:00:00 2001
-From: Stefan Becker <chemobejk@gmail.com>
-Date: Wed, 10 Apr 2013 13:13:04 +0000
-Subject: request: fix resource leakage
-
-It is the responsibility of the UI code to free the "fields" parameter
-after haze_request_fields() has been called. This has to be done with
-purple_request_close() and handled in the close_request() UI operation.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=63326
----
-diff --git a/src/request.c b/src/request.c
-index dae859d..db54317 100644
---- a/src/request.c
-+++ b/src/request.c
-@@ -101,7 +101,7 @@ haze_request_action (const char *title,
- }
- #endif
- 
--struct password_data {
-+struct fields_data {
-     PurpleRequestFields *fields;
-     PurpleRequestField *password;
-     GCallback ok_cb;
-@@ -109,21 +109,40 @@ struct password_data {
-     void *user_data;
- };
- 
-+static void haze_close_request(PurpleRequestType type, void *ui_handle)
-+{
-+    struct fields_data *fd = ui_handle;
-+
-+    purple_request_fields_destroy(fd->fields);
-+    g_free(fd);
-+}
-+
- void haze_request_password_cb (gpointer user_data,
-                                const gchar *password)
- {
--    struct password_data *pd = user_data;
-+    struct fields_data *fd = user_data;
- 
-     if (password) {
--        purple_request_field_string_set_value(pd->password, password);
--        ((PurpleRequestFieldsCb)pd->ok_cb)(pd->user_data, pd->fields);
-+        purple_request_field_string_set_value(fd->password, password);
-+        ((PurpleRequestFieldsCb)fd->ok_cb)(fd->user_data, fd->fields);
-     } else {
--        ((PurpleRequestFieldsCb)pd->cancel_cb)(pd->user_data, pd->fields);
-+        ((PurpleRequestFieldsCb)fd->cancel_cb)(fd->user_data, fd->fields);
-     }
- 
--    g_free(pd);
-+    purple_request_close(PURPLE_REQUEST_FIELDS, fd);
- }
- 
-+static gboolean haze_request_fields_destroy(gpointer user_data)
-+{
-+    purple_request_close(PURPLE_REQUEST_FIELDS, user_data);
-+    return FALSE;
-+}
-+
-+/*
-+ * We must support purple_account_request_password() which boils down
-+ * to purple_request_fields() with certain parameters. I'm not sure
-+ * if this the best way of doing this, but it works.
-+ */
- static gpointer
- haze_request_fields (const char *title,
-                      const char *primary,
-@@ -138,33 +157,34 @@ haze_request_fields (const char *title,
-                      PurpleConversation *conv,
-                      void *user_data)
- {
--    /*
--     * We must support purple_account_request_password() which boils down
--     * to purple_request_fields() with certain parameters. I'm not sure
--     * if this the best way of doing this, but it works.
--     */
-+    struct fields_data *fd = g_new0(struct fields_data, 1);
-+
-+    /* it is our responsibility to destroy this data */
-+    fd->fields = fields;
-+
-     if (purple_request_fields_exists(fields, "password") &&
-         purple_request_fields_exists(fields, "remember")) {
--        struct password_data *pd = g_new0(struct password_data, 1);
- 
-         DEBUG ("triggering password request");
- 
--        pd->fields    = fields;
--        pd->password  = purple_request_fields_get_field(fields, "password");
--        pd->ok_cb     = ok_cb;
--        pd->cancel_cb = cancel_cb;
--        pd->user_data = user_data;
-+        fd->password  = purple_request_fields_get_field(fields, "password");
-+        fd->ok_cb     = ok_cb;
-+        fd->cancel_cb = cancel_cb;
-+        fd->user_data = user_data;
- 
--        haze_connection_request_password(account, pd);
-+        haze_connection_request_password(account, fd);
- 
-     } else {
-         DEBUG ("ignoring request:");
-         DEBUG ("    title: %s", (title ? title : "(null)"));
-         DEBUG ("    primary: %s", (primary ? primary : "(null)"));
-         DEBUG ("    secondary: %s", (secondary ? secondary : "(null)"));
-+
-+	/* Avoid leaking of "fields" */
-+	g_idle_add(haze_request_fields_destroy, fd);
-     }
- 
--    return NULL;
-+    return fd;
- }
- 
- #ifdef ENABLE_LEAKY_REQUEST_STUBS
-@@ -204,10 +224,6 @@ haze_request_folder (const char *title,
- }
- #endif
- 
--/*
--	void (*close_request)(PurpleRequestType type, void *ui_handle);
--*/
--
- static PurpleRequestUiOps request_uiops =
- {
- #ifdef ENABLE_LEAKY_REQUEST_STUBS
-@@ -217,7 +233,8 @@ static PurpleRequestUiOps request_uiops =
-     .request_file = haze_request_file,
-     .request_folder = haze_request_folder,
- #endif
--    .request_fields = haze_request_fields
-+    .request_fields = haze_request_fields,
-+    .close_request  = haze_close_request
- };
- 
- PurpleRequestUiOps *
---
-cgit v0.9.0.2-2-gbebe
diff --git a/net-voip/telepathy-haze/files/003-fix_more_resource_leaks.patch b/net-voip/telepathy-haze/files/003-fix_more_resource_leaks.patch
deleted file mode 100644
index 380af23b2955..000000000000
--- a/net-voip/telepathy-haze/files/003-fix_more_resource_leaks.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-From 4068d8504b2155168b82144a4d45b138e0579ef2 Mon Sep 17 00:00:00 2001
-From: Stefan Becker <chemobejk@gmail.com>
-Date: Thu, 11 Apr 2013 12:45:34 +0000
-Subject: request: fix more resource leaks
-
-Triggered by Will's review comments.
-
-- check callback pointers to be non-NULL before calling them
-- call cancel_cb also in destroy idle callback
-- reset connection's password request field on closing
-- coding style cleanup
-
-https://bugs.freedesktop.org/show_bug.cgi?id=63326
----
-diff --git a/src/connection.c b/src/connection.c
-index 6e9121d..424802e 100644
---- a/src/connection.c
-+++ b/src/connection.c
-@@ -452,7 +452,7 @@ _haze_connection_password_manager_prompt_cb (GObject *source,
- 
-       if (priv->password_request)
-         {
--          haze_request_password_cb(priv->password_request, NULL);
-+          haze_request_password_cb (priv->password_request, NULL);
-         }
- 
-       if (base_conn->status != TP_CONNECTION_STATUS_DISCONNECTED)
-@@ -481,7 +481,8 @@ _haze_connection_password_manager_prompt_cb (GObject *source,
-   if (priv->password_request)
-     {
-       haze_request_password_cb (priv->password_request, priv->password);
--    } else
-+    }
-+  else
-     {
-       purple_account_set_password (self->account, priv->password);
- 
-@@ -537,8 +538,9 @@ _haze_connection_start_connecting (TpBaseConnection *base,
-     return TRUE;
- }
- 
--void haze_connection_request_password (PurpleAccount *account,
--                                       void *user_data)
-+void
-+haze_connection_request_password (PurpleAccount *account,
-+                                  void *user_data)
- {
-     HazeConnection *self = ACCOUNT_GET_HAZE_CONNECTION (account);
-     HazeConnectionPrivate *priv = self->priv;
-@@ -551,6 +553,15 @@ void haze_connection_request_password (PurpleAccount *account,
-                                              self);
- }
- 
-+void
-+haze_connection_cancel_password_request (PurpleAccount *account)
-+{
-+    HazeConnection *self = ACCOUNT_GET_HAZE_CONNECTION (account);
-+    HazeConnectionPrivate *priv = self->priv;
-+
-+    priv->password_request = NULL;
-+}
-+
- static void
- _haze_connection_shut_down (TpBaseConnection *base)
- {
-diff --git a/src/connection.h b/src/connection.h
-index 2e68935..7fc8668 100644
---- a/src/connection.h
-+++ b/src/connection.h
-@@ -113,6 +113,7 @@ const gchar **haze_connection_get_guaranteed_interfaces (void);
- 
- void haze_connection_request_password (PurpleAccount *account,
-                                        gpointer user_data);
-+void haze_connection_cancel_password_request (PurpleAccount *account);
- 
- G_END_DECLS
- 
-diff --git a/src/request.c b/src/request.c
-index db54317..8aa7bc9 100644
---- a/src/request.c
-+++ b/src/request.c
-@@ -102,39 +102,62 @@ haze_request_action (const char *title,
- #endif
- 
- struct fields_data {
-+    PurpleAccount *account;
-     PurpleRequestFields *fields;
-     PurpleRequestField *password;
--    GCallback ok_cb;
--    GCallback cancel_cb;
-+    PurpleRequestFieldsCb ok_cb;
-+    PurpleRequestFieldsCb cancel_cb;
-     void *user_data;
- };
- 
--static void haze_close_request(PurpleRequestType type, void *ui_handle)
-+static void
-+haze_close_request (PurpleRequestType type,
-+                    void *ui_handle)
- {
-     struct fields_data *fd = ui_handle;
- 
--    purple_request_fields_destroy(fd->fields);
--    g_free(fd);
-+    haze_connection_cancel_password_request (fd->account);
-+    purple_request_fields_destroy (fd->fields);
-+    g_slice_free (struct fields_data, fd);
- }
- 
--void haze_request_password_cb (gpointer user_data,
--                               const gchar *password)
-+void
-+haze_request_password_cb (gpointer user_data,
-+                          const gchar *password)
- {
-     struct fields_data *fd = user_data;
- 
--    if (password) {
--        purple_request_field_string_set_value(fd->password, password);
--        ((PurpleRequestFieldsCb)fd->ok_cb)(fd->user_data, fd->fields);
--    } else {
--        ((PurpleRequestFieldsCb)fd->cancel_cb)(fd->user_data, fd->fields);
--    }
--
--    purple_request_close(PURPLE_REQUEST_FIELDS, fd);
-+    if (password)
-+      {
-+        purple_request_field_string_set_value (fd->password, password);
-+        if (fd->ok_cb)
-+          {
-+            (fd->ok_cb) (fd->user_data, fd->fields);
-+          }
-+      }
-+    else
-+      {
-+        if (fd->cancel_cb)
-+          {
-+            (fd->cancel_cb) (fd->user_data, fd->fields);
-+          }
-+      }
-+
-+    purple_request_close (PURPLE_REQUEST_FIELDS, fd);
- }
- 
--static gboolean haze_request_fields_destroy(gpointer user_data)
-+static gboolean
-+haze_request_fields_destroy (gpointer user_data)
- {
--    purple_request_close(PURPLE_REQUEST_FIELDS, user_data);
-+    struct fields_data *fd = user_data;
-+
-+    if (fd->cancel_cb)
-+      {
-+        (fd->cancel_cb) (fd->user_data, fd->fields);
-+      }
-+
-+    purple_request_close (PURPLE_REQUEST_FIELDS, user_data);
-+
-     return FALSE;
- }
- 
-@@ -157,32 +180,36 @@ haze_request_fields (const char *title,
-                      PurpleConversation *conv,
-                      void *user_data)
- {
--    struct fields_data *fd = g_new0(struct fields_data, 1);
-+    struct fields_data *fd = g_slice_new0 (struct fields_data);
- 
-     /* it is our responsibility to destroy this data */
--    fd->fields = fields;
-+    fd->account   = account;
-+    fd->fields    = fields;
-+    fd->cancel_cb = (PurpleRequestFieldsCb) cancel_cb;
-+    fd->user_data = user_data;
- 
--    if (purple_request_fields_exists(fields, "password") &&
--        purple_request_fields_exists(fields, "remember")) {
-+    if (purple_request_fields_exists (fields, "password") &&
-+        purple_request_fields_exists (fields, "remember"))
-+      {
- 
-         DEBUG ("triggering password request");
- 
--        fd->password  = purple_request_fields_get_field(fields, "password");
--        fd->ok_cb     = ok_cb;
--        fd->cancel_cb = cancel_cb;
--        fd->user_data = user_data;
-+        fd->password = purple_request_fields_get_field (fields, "password");
-+        fd->ok_cb    = (PurpleRequestFieldsCb) ok_cb;
- 
--        haze_connection_request_password(account, fd);
-+        haze_connection_request_password (account, fd);
- 
--    } else {
-+      }
-+    else
-+      {
-         DEBUG ("ignoring request:");
-         DEBUG ("    title: %s", (title ? title : "(null)"));
-         DEBUG ("    primary: %s", (primary ? primary : "(null)"));
-         DEBUG ("    secondary: %s", (secondary ? secondary : "(null)"));
- 
--	/* Avoid leaking of "fields" */
--	g_idle_add(haze_request_fields_destroy, fd);
--    }
-+        /* Avoid leaking of "fields" and "user_data" */
-+        g_idle_add (haze_request_fields_destroy, fd);
-+      }
- 
-     return fd;
- }
---
-cgit v0.9.0.2-2-gbebe
diff --git a/net-voip/telepathy-haze/telepathy-haze-0.7.0.ebuild b/net-voip/telepathy-haze/telepathy-haze-0.8.0.ebuild
index d582bee74cef..e3649b0b1f87 100644
--- a/net-voip/telepathy-haze/telepathy-haze-0.7.0.ebuild
+++ b/net-voip/telepathy-haze/telepathy-haze-0.8.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-haze/telepathy-haze-0.7.0.ebuild,v 1.2 2013/09/05 19:02:49 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-haze/telepathy-haze-0.8.0.ebuild,v 1.1 2013/10/04 18:47:22 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )
 
-inherit eutils python-single-r1
+inherit python-single-r1
 
 DESCRIPTION="Telepathy connection manager providing libpurple supported protocols."
 HOMEPAGE="http://developer.pidgin.im/wiki/TelepathyHaze"
@@ -20,19 +20,12 @@ IUSE=""
 # Tests failing, see upstream: https://bugs.freedesktop.org/34577
 RESTRICT="test"
 
-RDEPEND="
+RDEPEND="${PYTHON_DEPS}
 	>=net-im/pidgin-2.7
 	>=net-libs/telepathy-glib-0.15.1[${PYTHON_USEDEP}]
-	>=dev-libs/glib-2.22:2
+	>=dev-libs/glib-2.30:2
 	>=dev-libs/dbus-glib-0.73
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 #	test? ( dev-python/twisted-words )"
-
-src_prepare() {
-	# Apply some upstream fixes
-	epatch "${FILESDIR}"/001-handle_purple_account_request_password.patch
-	epatch "${FILESDIR}"/002-fix_resource_leakage.patch
-	epatch "${FILESDIR}"/003-fix_more_resource_leaks.patch
-}
diff --git a/net-voip/telepathy-rakia/ChangeLog b/net-voip/telepathy-rakia/ChangeLog
index 9f96246c0e00..190e3ceeadc6 100644
--- a/net-voip/telepathy-rakia/ChangeLog
+++ b/net-voip/telepathy-rakia/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-voip/telepathy-rakia
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-rakia/ChangeLog,v 1.14 2013/09/28 19:06:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-rakia/ChangeLog,v 1.15 2013/10/04 18:50:33 pacho Exp $
+
+*telepathy-rakia-0.8.0 (04 Oct 2013)
+
+  04 Oct 2013; Pacho Ramos <pacho@gentoo.org> +telepathy-rakia-0.8.0.ebuild,
+  -telepathy-rakia-0.6.8.ebuild:
+  Version bump, drop old
 
 *telepathy-rakia-0.7.5 (28 Sep 2013)
 
diff --git a/net-voip/telepathy-rakia/Manifest b/net-voip/telepathy-rakia/Manifest
index be42d2b0456c..5dfc6d95e700 100644
--- a/net-voip/telepathy-rakia/Manifest
+++ b/net-voip/telepathy-rakia/Manifest
@@ -4,16 +4,16 @@ Hash: SHA256
 AUX telepathy-rakia-0.7.4-gio-linking.patch 984 SHA256 c233ed72b7b23372c69ad29581ee0786ce943a069d53d51a6e514e1fd3c225d5 SHA512 6e2860dab11314a98d8ad5aeb14b9ec87aaccd10825b134fe629097cc87933cf4a9c4667d7e5387d21aceac9cc2693ab4909ce2f4d385787e9cfedb1f9f2e765 WHIRLPOOL af1b1a412734cb07a51bb8c4ebfc50ce4b4ad7a90737a70d1435ca6b62a248d825362ad7a95398671bee17f7c6bf6cd5d7daa9470fc10ef8801825880e469adf
 DIST telepathy-rakia-0.7.4.tar.gz 640785 SHA256 ce3770e0f21f7b983ac7bd14a9515bd5da0e87ef3098adada93bce3070ab9585 SHA512 ed90d68b55fde28d01da5dd7beb6194adc9aca79ca63bf4b44aa09af2db2a9eac6f2643150270b9e908ae485442ae307b0e17bc2021b476725af10eebb696915 WHIRLPOOL f984633ec8449a8bdbce20d1500aeb211bc368a665eaac1480dee5a3889b27756e0fe246bdc2c75408e4f259eec0c8b1cbc61df8ad4ef67b37498c50a524db5b
 DIST telepathy-rakia-0.7.5.tar.gz 645713 SHA256 cebfda24f0bc4c0f0361bf3737fab951eeaf64958308f0eee0a8ef783cd19e55 SHA512 280211f073f6006d06cf89b06e21325a54b6e0adc3cf627f795285d819f8eb282d610e412c0d8fc1bfd7df6b8a153e4c23175d767e0a05f1bc640c4ad11e2e5c WHIRLPOOL 79be628588d2d1ba380a4ebc1806af02c7e5b5cf3ed7088961891110f67d1d844398c29e18ff6a295a3c6029163e4f67bc92aa17c497a1d90c3d8e5297d5ec9d
-DIST telepathy-sofiasip-0.6.8.tar.gz 601490 SHA256 4bcc46222d4a86b430cd89fde64ba868635ebd4e71afae034d5239e30de4053e SHA512 a1828c4f3c6f99cc966dae7274eb7c4667548cead8449db7e3d574d013ce4b81888a589e26c52c53585f6577003eb33b9cc9c52c0fb9273ab319573b4148dc61 WHIRLPOOL 1b0e2c772784cd33e512a09d92fe9dd0d205be4874824b22b2ee2f88b9ea41ba7acfdff56635a0815c0977a49157b97ab670693cf692d52f1692a2a6a19e9026
-EBUILD telepathy-rakia-0.6.8.ebuild 1104 SHA256 46b296779b3d7ed51de856f7d45158d1061233d2f1da0b631ab56dcb0fad6cbb SHA512 3505fb503cf1b6c6f12692925de79758cf0f1ff88c8444a63f323d3ea83c5e3e59104a3d98743b1f7f6a610ab0e797d219c598759ddbcf7561a1153b0f4d5f8c WHIRLPOOL a9d57c44a8ebe5a12e751160182b691d00c38f8f2b38a72afbfc84974a64d7b6f85d71472b0de4ef965185b329911c0c43915e13f0bd5b46aa5bf2874c0c950c
+DIST telepathy-rakia-0.8.0.tar.gz 659116 SHA256 1baebcd391e0ba199f2f6faa2c99b53ba03e732e80290827de5e42889473bda1 SHA512 5378e1a2909c4218cc9c6fecf0b01beff0b52fd40cc040a601090dbaae330b3506fc74dc5ae86e5f0c954dd3c41fd7ba4e5a294f8fc11d74aa6eb9025097e9ae WHIRLPOOL 43cab071e9df3a7428ce7d871e952f947584593063583615d10df0bdabafba00a8dc904aff22e7cff95a302d4b1eaf39f9dc6fd7df8b78b2dc9223a14fdcd35f
 EBUILD telepathy-rakia-0.7.4.ebuild 1194 SHA256 5e9ccafc78109215042a393365b78dd6ffe0454daf138a3049942b598da590a5 SHA512 bfbd1fde299697eac0604d69ac85a81614c099851ac52bba61dff158e0e6b7397197f44e3817fa8c1c48277507fcccf4281901ea247ab4008e75d124b4951733 WHIRLPOOL ef5bfc10cb652c8c0b43acc2d0084baf0e20720410458daa1f5af28e15c0a2d827e2d82e4be25d4eafd2d48ac7907a3a7e29008d148c6328f68d463a57e82aef
 EBUILD telepathy-rakia-0.7.5.ebuild 1057 SHA256 3055124354b5a86cd81a7684add01ed979fedbc66837e783eebaa598fd84a298 SHA512 1f8f94dc6d1fac136fe45eace18420b62991eca8df37c9c53d2c86b1db678d42c85a274b296cc730e73434e66824e9ce295fc2bdcb1a6a1e14de6aa9d6183dfa WHIRLPOOL 8a00c7b8b115d9b1c43840a0075b5591840ec9e9be1c8d1304212148c9032be649005545a7a38ea194b07b76b560b32adc2be5265cfa329d1765e806382d11b1
-MISC ChangeLog 2122 SHA256 b016f00c4ce3aa2d00fdc1264781701d67d25984c88688875a5ef031df882f9e SHA512 845a3f4fb4ebbf37a53edacdf86b54d9289ae01f993388faf83d8e295156c813d32da11b6e8f847ccec590089bc2e7072d1d6883da28270e7183a8746c24dabc WHIRLPOOL 4ecce5a99df848505eaa8e580e2946990238e9ab8bf8dc364f6d6f957b625dd102045187c0bdf58f6bcb0956275d4590f6d5f766e9b6b0e14c839243b43a1473
+EBUILD telepathy-rakia-0.8.0.ebuild 1057 SHA256 35c87248f36bdc239df62f37b97c9dd7e7ba8c59dc68fed3d172c5b17efa83f8 SHA512 3ff6ce4342387f62fea85403120a8655360acd5f4991760386d587564b3a127778b2b290f11f21dbae8fa1de5d9cc9da60e448e26daf0616730cf5e0fd259f98 WHIRLPOOL da4d15106ae1bb8f705554f9193212c9389ec1c7e08e1e480cdbb0d210effa366163f8004e5ca6d0341cf76be87368e874fb90353efea1096c48c44ba9e9fde9
+MISC ChangeLog 2296 SHA256 4d22500d1e344e920492075062807e35b8bda87a5ac4555dd2347425e13504ef SHA512 bbe56c6df245ef99eb95bad3f47e93344f4c387f1f4f022db9d1bec0279c6d645123c7feeadc95d220e77eed3749e4cad85215ac53b63866ec4edc27c026f22d WHIRLPOOL 1d7674f91a39d4c86aa8cf70260827c9de108efa18de7f518a03c494e69765a4666f4502c71b6989ef6e8499c6cde5a87b3a7fcfd8e5b319b1a732e475232d32
 MISC metadata.xml 176 SHA256 7171c06c776f88b059cc98de142970b0e1e079e36e2fd661bf5d72e79cbbabc7 SHA512 110b53fe14009504e524c3a9a934af026ddc583cbe63322653b9b9088fed46536a04a487f70d8b687309800df0586810bed98b8853e164e8ab96aecac9a30c15 WHIRLPOOL 2d4a326afb7ac635ad30dad560d0a105dc4eecf1bda680261a63cfd6f201f8a01bcf23769bd73281d580ac66b8ef59f5d8653e2a8389fc4774c923f0054d33e9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlJHKJ4ACgkQCaWpQKGI+9RH5wCfW2WJyM/bITwJSfqMhmPtnt2x
-OvYAoILmh7yE/GxnF4cReJNvSb/Q2mXy
-=2RCO
+iEYEAREIAAYFAlJPDfoACgkQCaWpQKGI+9QOiwCfStz2CoT476dPPlUBZQ3LGE6i
+vEIAn2IrxsBwy39ceITPH561BPL/sYdb
+=qkEH
 -----END PGP SIGNATURE-----
diff --git a/net-voip/telepathy-rakia/telepathy-rakia-0.6.8.ebuild b/net-voip/telepathy-rakia/telepathy-rakia-0.6.8.ebuild
deleted file mode 100644
index eed79abf3557..000000000000
--- a/net-voip/telepathy-rakia/telepathy-rakia-0.6.8.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-rakia/telepathy-rakia-0.6.8.ebuild,v 1.2 2013/08/03 09:45:49 mgorny Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-
-inherit python
-
-DESCRIPTION="A SIP connection manager for Telepathy based around the Sofia-SIP library"
-HOMEPAGE="http://telepathy.freedesktop.org/"
-MY_PN="telepathy-sofiasip"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="http://telepathy.freedesktop.org/releases/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-linux"
-IUSE="test"
-
-COMMON_DEPEND="dev-libs/dbus-glib
-	>=dev-libs/glib-2.16:2
-	>=net-libs/sofia-sip-1.12.11
-	>=net-libs/telepathy-glib-0.8.0
-	sys-apps/dbus"
-RDEPEND="${COMMON_DEPEND}
-	!net-voip/telepathy-sofiasip"
-# telepathy-rakia was formerly known as telepathy-sofiasip
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	test? ( dev-python/twisted-core )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs -r 2 .
-}
diff --git a/net-voip/telepathy-rakia/telepathy-rakia-0.8.0.ebuild b/net-voip/telepathy-rakia/telepathy-rakia-0.8.0.ebuild
new file mode 100644
index 000000000000..7eb0f31f7bc9
--- /dev/null
+++ b/net-voip/telepathy-rakia/telepathy-rakia-0.8.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-rakia/telepathy-rakia-0.8.0.ebuild,v 1.1 2013/10/04 18:50:33 pacho Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit python-single-r1
+
+DESCRIPTION="A SIP connection manager for Telepathy based around the Sofia-SIP library"
+HOMEPAGE="http://telepathy.freedesktop.org/"
+SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+IUSE="test"
+
+COMMON_DEPEND="
+	>=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.30:2
+	>=net-libs/sofia-sip-1.12.11
+	>=net-libs/telepathy-glib-0.17.6
+	>=sys-apps/dbus-0.60
+"
+RDEPEND="${COMMON_DEPEND}
+	!net-voip/telepathy-sofiasip
+"
+# telepathy-rakia was formerly known as telepathy-sofiasip
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	test? ( dev-python/twisted-core )
+"
+# eautoreconf requires: gtk-doc-am
+
+src_configure() {
+	econf --disable-fatal-warnings
+}