Non-maintainer commit: fix building with glib-2.32 (bug #417765, thanks to Petr Gregor) and compatibility with pjsip-1.14.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

7 files changed, 786 insertions, 9 deletions

diff --git a/net-voip/sflphone/ChangeLog b/net-voip/sflphone/ChangeLog
index 932fb4119760..33f6647faf6f 100644
--- a/net-voip/sflphone/ChangeLog
+++ b/net-voip/sflphone/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-voip/sflphone
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/sflphone/ChangeLog,v 1.11 2012/03/02 14:58:32 elvanor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/sflphone/ChangeLog,v 1.12 2012/08/11 22:31:59 tetromino Exp $
+
+*sflphone-1.0.1-r1 (11 Aug 2012)
+
+  11 Aug 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +sflphone-1.0.1-r1.ebuild, +files/sflphone-1.0.1-glib-2.32-headers-1.patch,
+  +files/sflphone-1.0.1-glib-2.32-headers-2.patch,
+  +files/sflphone-1.0.1-glib-2.32-headers-3.patch,
+  +files/sflphone-1.0.1-pjsip-1.14.patch:
+  Non-maintainer commit: fix building with glib-2.32 (bug #417765, thanks to
+  Petr Gregor) and compatibility with pjsip-1.14.
 
   02 Mar 2012;  <elvanor@gentoo.org> sflphone-1.0.1.ebuild:
   Fixed bug #396707.
diff --git a/net-voip/sflphone/Manifest b/net-voip/sflphone/Manifest
index ebe58167bc1c..666bd3aa82e8 100644
--- a/net-voip/sflphone/Manifest
+++ b/net-voip/sflphone/Manifest
@@ -1,8 +1,27 @@
-AUX sflphone-0.9.12-libnotify-0.7.patch 1196 RMD160 26f6061983dc7cb4c9db1969ac9821fc9be6cde0 SHA1 a1086804168a07908786f4d3f059abb3239c9725 SHA256 6947d55e7c5fc273262d97accc4d8d48518645f3a80ac15f7818b3eeb44d0509
-AUX sflphone-0.9.8.4-libnotify-0.7.patch 1178 RMD160 35e1c268d71908c4ec2264a8e8f654c713e8499f SHA1 6da41c27e77a291492fc80598d0a8223b77f36eb SHA256 68a00825842b3f307f5c62e66de2e29d54afb73127954acf076d9aa22c086472
-DIST sflphone-0.9.8.4.tar.gz 7191853 RMD160 b42af5a80c851b34b0362cbc920241345b795b8a SHA1 a29ec6febb2c1b2c78ab70019ada17fb5fe65e0e SHA256 db31e642e77543099325a18c3c1f2e7e1ef83615c9d4d27c2a21c5abfb0253a4
-DIST sflphone-1.0.1.tar.gz 4536759 RMD160 619deaa2dcf548a83da6566bb304ef3d2aa54b8a SHA1 c9b1c6822c27b1bdf185a8b3cac680605e19d7b6 SHA256 210abdc040cb9caaab652572e39b1ec7d70f750fa70d2721f459ccc2e7653751
-EBUILD sflphone-0.9.8.4.ebuild 3872 RMD160 1fb06b4f013d9bf04d453239d2cb94f6b01180a4 SHA1 a1790d82192c64eb666c52454f98d1f6adb1173e SHA256 0a2efc336622c6d29e4d2b40db0246931b134227df4cf6264a5476b9db088ed0
-EBUILD sflphone-1.0.1.ebuild 3962 RMD160 9a05b363b4c966877e27b1b24f12ec634d08be65 SHA1 4cb0a5be1af2065b609c5b798c0f6ae0e01ef0b4 SHA256 f69d1f5ea62c6fe54e84e5011766d3fa76ce3929c32fa6566412e97768ab4e0a
-MISC ChangeLog 1604 RMD160 d263806a34a78392a1536eae3eb3dce2c2f3db82 SHA1 061b36a3fa97994df57f52c8eba9a29c4c11c2bf SHA256 cb88737d0eebec53cceb5c6ba3d0ed446804673dbc3ebcfb8724188ce9969947
-MISC metadata.xml 657 RMD160 d7f4ca8913b771302472ba24669f639667f49d30 SHA1 9bbccab98460659c53adc115d64bb368e06e3035 SHA256 472c5a01f8ea3d27cea072d1401a1ab7932e7e476e738f0ce1078397f5225f50
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX sflphone-0.9.12-libnotify-0.7.patch 1196 SHA256 6947d55e7c5fc273262d97accc4d8d48518645f3a80ac15f7818b3eeb44d0509 SHA512 0d522619f33bc04da05f497f1e358133b3252b5acc717560723aab094bc4c5227f4bb64e535f92f3720238b8bba57a8144b7a9e73a01c7f9ba3a93cb512c05ad WHIRLPOOL ab84a412aeb7a295182da96a66b3d04066709b5ed12693d0d45978ce24c9a843caafdb5333d859fe2d8c401fd569e5a6987511800634d47b9d82c1420c119c60
+AUX sflphone-0.9.8.4-libnotify-0.7.patch 1178 SHA256 68a00825842b3f307f5c62e66de2e29d54afb73127954acf076d9aa22c086472 SHA512 9ddd0c09b4a4245a8619ce2eb7565f5a393f767271b8bc9ca89d93f7536b6442c4438ccd2f0b9635d76e3cd5b3c76a5006960f1a6586a993b0dc0d00cf6f03d7 WHIRLPOOL 940f4c433180e7508e72e65a7d952f823528b4bdecae65bdb62d3c48df5a154c2364c1f8d50b28c01b7734ea6df62d316cfc91dda0055616bec2315e52a9bae5
+AUX sflphone-1.0.1-glib-2.32-headers-1.patch 739 SHA256 e0aa86c35f8bd8395d39d2e3cf4530c94e419319b34d772a63ab503209c2ba96 SHA512 54606d7a469e3e0ba7b3937d697807f8ed8ce7f5093ec805067a4d6c879a8471101548db1ad332b75620165ae14868890d6b1caaefba577a6d36d294b91a0211 WHIRLPOOL ef260643fb565536bff8c8ce8c9b5b517de3f3bec185a5a5c49206fd446a2017298d99df53456116f3657d51c5effc7d4cea3da97e9e27636ac7a91391c22c00
+AUX sflphone-1.0.1-glib-2.32-headers-2.patch 3936 SHA256 dd7295323f6bfe5ed7ad2343d62461ba590dc0597017586038d88d7a608b15f8 SHA512 0b59516f624bec470061d4a6bc5d81c587f952d8e5bb9926708b4776b839161a0b6798b5c2623cca8515182d2dc500ea8fa5e05a28bf9024f3c1beaf3fcfd7d9 WHIRLPOOL eca48a3dbd2b84883b5c85437e096f3c8dd703c20bd42111fde283a6e556ef0abc3bbaf25f88ae55afbac78985d7541e7f5b4da81bdc38bb2c49d479514b602c
+AUX sflphone-1.0.1-glib-2.32-headers-3.patch 9145 SHA256 8cd9164589f11179ea5262661a6e4b52b046f4efd6c8a159aec3a6db36ce6c25 SHA512 a1fec41fe098ca1beafc02b1b1e0fe9d36ec67448a775a2c9c16e40dbae6c0c9c2623f73051ce42ee4e98b14769073be4a4cc052e980c7616e553d30c7efa353 WHIRLPOOL 1c1abdaf790bac6eccd10a5cc03b5f3d4715ad556545e1204e169b67cbb30f39ef49004dab3037dae43680f21f4dc110fb53c196a5041b3baae9025d813abd32
+AUX sflphone-1.0.1-pjsip-1.14.patch 4206 SHA256 56a5f544cfb5d0b1020caa5056c7ec81cca3c029414014f2b6aa242837c92f29 SHA512 0206f83d0a2547062701337e59f27d8a2cd97a83e7794eebda8037c75b071427f1898efcb474511013bb3936033f6b4c60db2efa3eb6cbfd84e555db6e2a5a72 WHIRLPOOL 724e24d334914bf8de46e07ea6aa0ac033f597f51b30e3dcab50fbc71e957769b525b48edb8ca204991457e4d26dbec883a1b02023707806fb0545bf73e37e7e
+DIST sflphone-0.9.8.4.tar.gz 7191853 SHA256 db31e642e77543099325a18c3c1f2e7e1ef83615c9d4d27c2a21c5abfb0253a4
+DIST sflphone-1.0.1.tar.gz 4536759 SHA256 210abdc040cb9caaab652572e39b1ec7d70f750fa70d2721f459ccc2e7653751 SHA512 854282176a0df4ea3800220cbe80883aa8491b4f9d7a16e9ec680e3fc28ad65145292c7e8268e637d2cab53c562dcb7fe4a50d0ddf919ffd2fbb9a6fd74e29c5 WHIRLPOOL f6f578e0b441e5a34f2ab472f2ec23dc6fd227e52da1f781df72df074ee740aec3e9e411c6dfe379839929aa8266d082f44aa080baa52a22126f0db2fbfb6480
+EBUILD sflphone-0.9.8.4.ebuild 3872 SHA256 0a2efc336622c6d29e4d2b40db0246931b134227df4cf6264a5476b9db088ed0 SHA512 964d713948457e875a2e2387dd979ac79621c1c7b6d3fb8fbcb1b6071612c6943bdf66ec6e1d8b4b5731cde8118ee638fc1093444b844197f8d815fec877f0c7 WHIRLPOOL 348d8ec92fd70e59016d6e6869c72c0e2834d1d5c585f3e020541aacc774c118c5c0de4f662f010b787f565118597a60478a2da04acfc8f09176a72f5fb60bbf
+EBUILD sflphone-1.0.1-r1.ebuild 4145 SHA256 44d389cc6d387e25bd84861db8a0a21392eadfba9676143f8558b288a85d448f SHA512 e5e3ce8aee34df893a14e105f6e54b2e39c3c8d4adf407737c4ae08b478dce980d6d5b02854d760b5b9c808aadd5b2c4b547cf37235336847fc9be42732612b0 WHIRLPOOL a039458883e55c2cebc9b2a3eeec48660f72c28ff067d070c22703ee2a8fa39528d0adb7a393fab9aab516ccd349050cf1f116485934dc3288e0e50a34d33a17
+EBUILD sflphone-1.0.1.ebuild 3962 SHA256 f69d1f5ea62c6fe54e84e5011766d3fa76ce3929c32fa6566412e97768ab4e0a SHA512 3a16b09c3de043be0115267d2546d96969fc7df1cc51b1e07534fbde4c986830cdca61b869da4b00877cb68fe0c2893cb283fdda78b207b4aa579752d96389db WHIRLPOOL eddfaedf507b4091af46d3980cbd123adb382d1177891223887af9c6bc0a6bca3b4deba473404b1aee51a7fd34e4360583bbb191e6fe995bc1e913223986d2b4
+MISC ChangeLog 2049 SHA256 3c0c9d8a6b9cf0e0724ad0f829cc01db3988ca1427e3e12c265ff1ce7e84fc34 SHA512 05265f8e55907a9910ba220e5850f9fc43cbda39a7f783dc04810d15a86b9e03f50d17ce9bf33f43949f17ffd36aefe6fd27329ea97d2a9714cd821f59d3294a WHIRLPOOL 8103b1dd019521e896beffa477a67fadb150cfedc46f372a5ef96f7546054e8bb9513c5b713998a9ece904984612d34c3c9a02c520eca0c6afbfbd36ea910c95
+MISC metadata.xml 657 SHA256 472c5a01f8ea3d27cea072d1401a1ab7932e7e476e738f0ce1078397f5225f50 SHA512 42186df2cea677af71a30c6585c1a570330866c1e4b819f8379c1b66cd0a024f31ea3e137c059cadb1d7e381b72e1555d30cf672866e4e0b613047536ecaeba3 WHIRLPOOL 8f8d1c32e61de42ece72485430f0ab551b824adabd2fd8b7edb88939165b296c2a3bf3d4c30afef1172de4ca642f4845371320921ba7477aef1bbf0072d6aa92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQJt1lAAoJEJ0WA1zPCt1hW1gIAKwxUTM5aoJ+HpYLImfvauew
+TYP2b4ZaZwTkFWD62OVzzkSJD9UnZZ53B48w8a3K9E3GfQCWx4HocfZ11UCXAZtI
+gA14zs6zT1nSd4+L0iJc50Y+mV+Ax7TijJ+LWdSMGbml8bUOPBIrGurYGbZaLsTA
+BLaL5KvnuTYSByuXSRSuu9vO/zdymJSiMp+oBpqROoKE/GOUPglJAhjCVdJ22T4i
+h03o5M8hz9T8eOuFV/edWRl5BfKniBoavSsyddc/n4NJIFv/rQYUtR0coQIxroci
+RJgMQDrzfm+LkY/TmrvNf+v3Ceqyr+I4m6tsDvkG3O0Uq1IEffDcuMUXhOsEkvA=
+=aNzE
+-----END PGP SIGNATURE-----
diff --git a/net-voip/sflphone/files/sflphone-1.0.1-glib-2.32-headers-1.patch b/net-voip/sflphone/files/sflphone-1.0.1-glib-2.32-headers-1.patch
new file mode 100644
index 000000000000..683bd9a29c68
--- /dev/null
+++ b/net-voip/sflphone/files/sflphone-1.0.1-glib-2.32-headers-1.patch
@@ -0,0 +1,26 @@
+From 3ed300124a425d43ee627ff35b35aa1168ba01d0 Mon Sep 17 00:00:00 2001
+From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
+Date: Tue, 6 Mar 2012 10:19:59 -0500
+Subject: [PATCH] * #9144: Fixes "Only <glib.h> can be included directly"
+ error
+
+---
+ plugins/addressbook/evolution/eds.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/plugins/addressbook/evolution/eds.h b/plugins/addressbook/evolution/eds.h
+index 0ce1783..5bbf71e 100644
+--- a/plugins/addressbook/evolution/eds.h
++++ b/plugins/addressbook/evolution/eds.h
+@@ -38,7 +38,7 @@
+ #ifndef __EDS_H__
+ #define __EDS_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ #include <libebook/e-book.h>
+ 
+-- 
+1.7.8.6
+
diff --git a/net-voip/sflphone/files/sflphone-1.0.1-glib-2.32-headers-2.patch b/net-voip/sflphone/files/sflphone-1.0.1-glib-2.32-headers-2.patch
new file mode 100644
index 000000000000..aa6645ab3987
--- /dev/null
+++ b/net-voip/sflphone/files/sflphone-1.0.1-glib-2.32-headers-2.patch
@@ -0,0 +1,138 @@
+From 585ee2588599e295273721418db3bf4d54dd053a Mon Sep 17 00:00:00 2001
+From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
+Date: Tue, 6 Mar 2012 10:55:47 -0500
+Subject: [PATCH] * #9145: fix "only <glib.h>" can be included error in gnome
+ client
+
+---
+ gnome/src/actions.c                   |    2 +-
+ gnome/src/conference_obj.h            |    2 +-
+ gnome/src/config/addressbook-config.h |    2 +-
+ gnome/src/config/hooks-config.h       |    2 +-
+ gnome/src/config/shortcuts-config.h   |    2 +-
+ gnome/src/eel-gconf-extensions.c      |    2 +-
+ gnome/src/eel-gconf-extensions.h      |    2 +-
+ gnome/src/sflphone_const.h            |    2 +-
+ gnome/src/uimanager.c                 |    2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/gnome/src/actions.c b/gnome/src/actions.c
+index 0520be8..abdbddd 100644
+--- a/gnome/src/actions.c
++++ b/gnome/src/actions.c
+@@ -36,7 +36,7 @@
+ #else
+ #include <gdk/gdkkeysyms.h>
+ #endif
+-#include <glib/gprintf.h>
++#include <glib.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/types.h>
+diff --git a/gnome/src/conference_obj.h b/gnome/src/conference_obj.h
+index e7f0e3a..0e17bad 100644
+--- a/gnome/src/conference_obj.h
++++ b/gnome/src/conference_obj.h
+@@ -32,7 +32,7 @@
+ #define __CONFERENCE_OBJ_H__
+ 
+ #include <gtk/gtk.h>
+-#include <glib/gprintf.h>
++#include <glib.h>
+ #include <stdlib.h>
+ #include <time.h>
+ 
+diff --git a/gnome/src/config/addressbook-config.h b/gnome/src/config/addressbook-config.h
+index cb10260..cd7a9ac 100644
+--- a/gnome/src/config/addressbook-config.h
++++ b/gnome/src/config/addressbook-config.h
+@@ -32,7 +32,7 @@
+ #define _ADDRESS_BOOK_CONFIG
+ 
+ #include <gtk/gtk.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ #include "addressbook.h"
+ #include "actions.h"
+diff --git a/gnome/src/config/hooks-config.h b/gnome/src/config/hooks-config.h
+index 6f51be9..e35a5b9 100644
+--- a/gnome/src/config/hooks-config.h
++++ b/gnome/src/config/hooks-config.h
+@@ -32,7 +32,7 @@
+ #define _HOOKS_CONFIG
+ 
+ #include <gtk/gtk.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ #include "actions.h"
+ #include "utils.h"
+diff --git a/gnome/src/config/shortcuts-config.h b/gnome/src/config/shortcuts-config.h
+index abcb424..123cb9c 100644
+--- a/gnome/src/config/shortcuts-config.h
++++ b/gnome/src/config/shortcuts-config.h
+@@ -32,7 +32,7 @@
+ #define _SHORTCUTS_CONFIG
+ 
+ #include <gtk/gtk.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ #include "actions.h"
+ #include <utils.h>
+diff --git a/gnome/src/eel-gconf-extensions.c b/gnome/src/eel-gconf-extensions.c
+index c1947f2..4631981 100644
+--- a/gnome/src/eel-gconf-extensions.c
++++ b/gnome/src/eel-gconf-extensions.c
+@@ -29,7 +29,7 @@
+ #include <gconf/gconf-client.h>
+ #include <gconf/gconf.h>
+ #include <gtk/gtk.h>
+-#include <glib/gi18n.h>
++#include <glib.h>
+ 
+ static GConfClient *global_gconf_client = NULL;
+ 
+diff --git a/gnome/src/eel-gconf-extensions.h b/gnome/src/eel-gconf-extensions.h
+index 0068b15..d380387 100644
+--- a/gnome/src/eel-gconf-extensions.h
++++ b/gnome/src/eel-gconf-extensions.h
+@@ -25,7 +25,7 @@
+ #ifndef EEL_GCONF_EXTENSIONS_H
+ #define EEL_GCONF_EXTENSIONS_H
+ 
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include <gconf/gconf.h>
+ #include <gconf/gconf-client.h>
+ 
+diff --git a/gnome/src/sflphone_const.h b/gnome/src/sflphone_const.h
+index 3766562..e642e0a 100644
+--- a/gnome/src/sflphone_const.h
++++ b/gnome/src/sflphone_const.h
+@@ -32,7 +32,7 @@
+ #define __SFLPHONE_CONST_H
+ 
+ #include <libintl.h>
+-#include <glib/gi18n.h>
++#include <glib.h>
+ 
+ /* @file sflphone_const.h
+  * @brief Contains the global variables for the client code
+diff --git a/gnome/src/uimanager.c b/gnome/src/uimanager.c
+index 36eb623..2953156 100644
+--- a/gnome/src/uimanager.c
++++ b/gnome/src/uimanager.c
+@@ -36,7 +36,7 @@
+ #include "assistant.h"
+ #include <gtk/gtk.h>
+ #include <string.h>
+-#include <glib/gprintf.h>
++#include <glib.h>
+ 
+ #include "uimanager.h"
+ #include "statusicon.h"
+-- 
+1.7.8.6
+
diff --git a/net-voip/sflphone/files/sflphone-1.0.1-glib-2.32-headers-3.patch b/net-voip/sflphone/files/sflphone-1.0.1-glib-2.32-headers-3.patch
new file mode 100644
index 000000000000..4eb8c86c9e49
--- /dev/null
+++ b/net-voip/sflphone/files/sflphone-1.0.1-glib-2.32-headers-3.patch
@@ -0,0 +1,317 @@
+From 733be9d1efbd5b146ed9d48df31561dcfc1379c9 Mon Sep 17 00:00:00 2001
+From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
+Date: Fri, 9 Mar 2012 16:48:34 -0500
+Subject: [PATCH] * #9145: fix missing <glib/gi18n.h> includes
+
+---
+ gnome/src/accountlist.c                    |    1 +
+ gnome/src/actions.c                        |    1 +
+ gnome/src/callable_obj.c                   |    1 +
+ gnome/src/config/accountconfigdialog.c     |    1 +
+ gnome/src/config/accountlistconfigdialog.c |    1 +
+ gnome/src/config/addressbook-config.c      |    1 +
+ gnome/src/config/assistant.c               |    2 +-
+ gnome/src/config/audioconf.c               |    2 +-
+ gnome/src/config/hooks-config.c            |    1 +
+ gnome/src/config/preferencesdialog.c       |    1 +
+ gnome/src/config/shortcuts-config.c        |    1 +
+ gnome/src/config/tlsadvanceddialog.c       |    2 +-
+ gnome/src/config/zrtpadvanceddialog.c      |    8 ++++----
+ gnome/src/contacts/searchbar.c             |    1 +
+ gnome/src/dbus/dbus.c                      |    2 +-
+ gnome/src/eel-gconf-extensions.c           |    3 ++-
+ gnome/src/main.c                           |    1 +
+ gnome/src/mainwindow.c                     |    1 +
+ gnome/src/sflnotify.c                      |    2 ++
+ gnome/src/sliders.c                        |    1 +
+ gnome/src/statusicon.c                     |    1 +
+ gnome/src/uimanager.c                      |    3 ++-
+ 22 files changed, 28 insertions(+), 10 deletions(-)
+
+diff --git a/gnome/src/accountlist.c b/gnome/src/accountlist.c
+index 662c7bc..803e3d3 100644
+--- a/gnome/src/accountlist.c
++++ b/gnome/src/accountlist.c
+@@ -29,6 +29,7 @@
+  *  as that of the covered work.
+  */
+ 
++#include <glib/gi18n.h>
+ #include "accountlist.h"
+ #include "actions.h"
+ #include "unused.h"
+diff --git a/gnome/src/actions.c b/gnome/src/actions.c
+index abdbddd..29dca07 100644
+--- a/gnome/src/actions.c
++++ b/gnome/src/actions.c
+@@ -29,6 +29,7 @@
+  *  as that of the covered work.
+  */
+ 
++#include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+ /* Backward compatibility for gtk < 2.22.0 */
+ #if GTK_CHECK_VERSION(2,22,0)
+diff --git a/gnome/src/callable_obj.c b/gnome/src/callable_obj.c
+index 83449c6..c16d951 100644
+--- a/gnome/src/callable_obj.c
++++ b/gnome/src/callable_obj.c
+@@ -32,6 +32,7 @@
+ #include "codeclist.h"
+ #include "sflphone_const.h"
+ #include <time.h>
++#include <glib/gi18n.h>
+ #include "contacts/calltab.h"
+ #include "contacts/calltree.h"
+ #include "dbus.h"
+diff --git a/gnome/src/config/accountconfigdialog.c b/gnome/src/config/accountconfigdialog.c
+index c623595..7c2de3f 100644
+--- a/gnome/src/config/accountconfigdialog.c
++++ b/gnome/src/config/accountconfigdialog.c
+@@ -31,6 +31,7 @@
+  *  as that of the covered work.
+  */
+ 
++#include <glib/gi18n.h>
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+ #include <net/if.h>
+diff --git a/gnome/src/config/accountlistconfigdialog.c b/gnome/src/config/accountlistconfigdialog.c
+index aa8db7a..151f067 100644
+--- a/gnome/src/config/accountlistconfigdialog.c
++++ b/gnome/src/config/accountlistconfigdialog.c
+@@ -38,6 +38,7 @@
+ #include "utils.h"
+ #include "unused.h"
+ #include "logger.h"
++#include <glib/gi18n.h>
+ #include <string.h>
+ 
+ static const int CONTEXT_ID_REGISTRATION = 0;
+diff --git a/gnome/src/config/addressbook-config.c b/gnome/src/config/addressbook-config.c
+index 4c56da2..8e9c64e 100644
+--- a/gnome/src/config/addressbook-config.c
++++ b/gnome/src/config/addressbook-config.c
+@@ -34,6 +34,7 @@
+ #include "logger.h"
+ #include "searchbar.h"
+ #include "contacts/addrbookfactory.h"
++#include <glib/gi18n.h>
+ #include <string.h>
+ #include <stdlib.h>
+ 
+diff --git a/gnome/src/config/assistant.c b/gnome/src/config/assistant.c
+index 8ca0021..202767e 100644
+--- a/gnome/src/config/assistant.c
++++ b/gnome/src/config/assistant.c
+@@ -29,7 +29,7 @@
+  */
+ 
+ #include <string.h>
+-
++#include <glib/gi18n.h>
+ #include "unused.h"
+ #include "assistant.h"
+ #include "logger.h"
+diff --git a/gnome/src/config/audioconf.c b/gnome/src/config/audioconf.c
+index c7dfe38..3bfbad9 100644
+--- a/gnome/src/config/audioconf.c
++++ b/gnome/src/config/audioconf.c
+@@ -28,7 +28,7 @@
+  *  as that of the covered work.
+  */
+ 
+-
++#include <glib/gi18n.h>
+ #include "audioconf.h"
+ #include "utils.h"
+ #include "logger.h"
+diff --git a/gnome/src/config/hooks-config.c b/gnome/src/config/hooks-config.c
+index 2b3e9e8..8a2b419 100644
+--- a/gnome/src/config/hooks-config.c
++++ b/gnome/src/config/hooks-config.c
+@@ -28,6 +28,7 @@
+  *  as that of the covered work.
+  */
+ 
++#include <glib/gi18n.h>
+ #include "hooks-config.h"
+ #include "dbus.h"
+ 
+diff --git a/gnome/src/config/preferencesdialog.c b/gnome/src/config/preferencesdialog.c
+index 3bd5057..10b11ca 100644
+--- a/gnome/src/config/preferencesdialog.c
++++ b/gnome/src/config/preferencesdialog.c
+@@ -32,6 +32,7 @@
+  *  as that of the covered work.
+  */
+ 
++#include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+diff --git a/gnome/src/config/shortcuts-config.c b/gnome/src/config/shortcuts-config.c
+index caa354a..f77b2e0 100644
+--- a/gnome/src/config/shortcuts-config.c
++++ b/gnome/src/config/shortcuts-config.c
+@@ -28,6 +28,7 @@
+  *  as that of the covered work.
+  */
+ 
++#include <glib/gi18n.h>
+ #include <gdk/gdk.h>
+ #include "shortcuts-config.h"
+ #include "shortcuts.h"
+diff --git a/gnome/src/config/tlsadvanceddialog.c b/gnome/src/config/tlsadvanceddialog.c
+index 3d6c118..59052ea 100644
+--- a/gnome/src/config/tlsadvanceddialog.c
++++ b/gnome/src/config/tlsadvanceddialog.c
+@@ -32,7 +32,7 @@
+ #include <sflphone_const.h>
+ #include <utils.h>
+ #include <dbus.h>
+-
++#include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+ #include <math.h>
+ 
+diff --git a/gnome/src/config/zrtpadvanceddialog.c b/gnome/src/config/zrtpadvanceddialog.c
+index e50898a..fe4589b 100644
+--- a/gnome/src/config/zrtpadvanceddialog.c
++++ b/gnome/src/config/zrtpadvanceddialog.c
+@@ -28,11 +28,11 @@
+  *  as that of the covered work.
+  */
+ 
+-#include <zrtpadvanceddialog.h>
+-#include <sflphone_const.h>
+-#include <utils.h>
+-
++#include <glib/gi18n.h>
+ #include <gtk/gtk.h>
++#include <zrtpadvanceddialog.h>
++#include "sflphone_const.h"
++#include "utils.h"
+ 
+ void show_advanced_zrtp_options(GHashTable * properties)
+ {
+diff --git a/gnome/src/contacts/searchbar.c b/gnome/src/contacts/searchbar.c
+index e48efaf..1ac515b 100644
+--- a/gnome/src/contacts/searchbar.c
++++ b/gnome/src/contacts/searchbar.c
+@@ -31,6 +31,7 @@
+  *  as that of the covered work.
+  */
+ 
++#include <glib/gi18n.h>
+ #include "searchbar.h"
+ #include "calltree.h"
+ #include "calltab.h"
+diff --git a/gnome/src/dbus/dbus.c b/gnome/src/dbus/dbus.c
+index 91241f5..957ae5a 100644
+--- a/gnome/src/dbus/dbus.c
++++ b/gnome/src/dbus/dbus.c
+@@ -30,7 +30,7 @@
+  *  as that of the covered work.
+  */
+ #include "config.h"
+-
++#include <glib/gi18n.h>
+ #include "logger.h"
+ #include "calltab.h"
+ #include "callmanager-glue.h"
+diff --git a/gnome/src/eel-gconf-extensions.c b/gnome/src/eel-gconf-extensions.c
+index 4631981..c24251a 100644
+--- a/gnome/src/eel-gconf-extensions.c
++++ b/gnome/src/eel-gconf-extensions.c
+@@ -22,8 +22,9 @@
+    Authors: Ramiro Estrugo <ramiro@eazel.com>
+ */
+ 
+-#include <stdlib.h>
+ #include "config.h"
++#include <glib/gi18n.h>
++#include <stdlib.h>
+ #include "eel-gconf-extensions.h"
+ 
+ #include <gconf/gconf-client.h>
+diff --git a/gnome/src/main.c b/gnome/src/main.c
+index 7af5078..8a08c4e 100644
+--- a/gnome/src/main.c
++++ b/gnome/src/main.c
+@@ -36,6 +36,7 @@
+ #include "mainwindow.h"
+ #include "statusicon.h"
+ #include "eel-gconf-extensions.h"
++#include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+ #include <stdlib.h>
+ 
+diff --git a/gnome/src/mainwindow.c b/gnome/src/mainwindow.c
+index 3b14c6a..e41def4 100644
+--- a/gnome/src/mainwindow.c
++++ b/gnome/src/mainwindow.c
+@@ -50,6 +50,7 @@
+ 
+ #include "eel-gconf-extensions.h"
+ 
++#include <glib/gi18n.h>
+ #include <sys/stat.h>
+ #include <gtk/gtk.h>
+ 
+diff --git a/gnome/src/sflnotify.c b/gnome/src/sflnotify.c
+index 8dd5ed0..44eee7e 100644
+--- a/gnome/src/sflnotify.c
++++ b/gnome/src/sflnotify.c
+@@ -29,6 +29,8 @@
+  */
+ 
+ #include "config.h"
++#include <glib.h>
++#include <glib/gi18n.h>
+ #include "eel-gconf-extensions.h"
+ #include "sflnotify.h"
+ #include "logger.h"
+diff --git a/gnome/src/sliders.c b/gnome/src/sliders.c
+index 4a2fdd8..ab3e40f 100644
+--- a/gnome/src/sliders.c
++++ b/gnome/src/sliders.c
+@@ -28,6 +28,7 @@
+  *  as that of the covered work.
+  */
+ 
++#include <glib/gi18n.h>
+ #include "sliders.h"
+ #include "dbus/dbus.h"
+ #include "actions.h"
+diff --git a/gnome/src/statusicon.c b/gnome/src/statusicon.c
+index 2fe79ee..b94864c 100644
+--- a/gnome/src/statusicon.c
++++ b/gnome/src/statusicon.c
+@@ -29,6 +29,7 @@
+  *  as that of the covered work.
+  */
+ 
++#include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+ #include "actions.h"
+ #include "mainwindow.h"
+diff --git a/gnome/src/uimanager.c b/gnome/src/uimanager.c
+index 2953156..0ddac4b 100644
+--- a/gnome/src/uimanager.c
++++ b/gnome/src/uimanager.c
+@@ -34,9 +34,10 @@
+ #include "dbus/dbus.h"
+ #include "mainwindow.h"
+ #include "assistant.h"
++#include <glib.h>
++#include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+ #include <string.h>
+-#include <glib.h>
+ 
+ #include "uimanager.h"
+ #include "statusicon.h"
+-- 
+1.7.8.6
+
diff --git a/net-voip/sflphone/files/sflphone-1.0.1-pjsip-1.14.patch b/net-voip/sflphone/files/sflphone-1.0.1-pjsip-1.14.patch
new file mode 100644
index 000000000000..aa16bcab29fe
--- /dev/null
+++ b/net-voip/sflphone/files/sflphone-1.0.1-pjsip-1.14.patch
@@ -0,0 +1,110 @@
+From 0d66570e26c6bd728d00d251e592a4154c0c9d1c Mon Sep 17 00:00:00 2001
+From: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
+Date: Mon, 30 Jul 2012 12:12:45 -0400
+Subject: [PATCH] #13961: Fix cipher handling to be compatible with pjsip
+ 1.14.2
+
+[Alexandre Rostovtsev <tetromino@gentoo.org>: backport to 1.0.1]
+---
+ daemon/src/sip/sipaccount.cpp |   24 ++++++++++++++++++++----
+ daemon/src/sip/sipaccount.h   |    7 +++++++
+ 2 files changed, 27 insertions(+), 4 deletions(-)
+
+diff --git a/daemon/src/sip/sipaccount.cpp b/daemon/src/sip/sipaccount.cpp
+index fdd4634..44d169f 100644
+--- a/daemon/src/sip/sipaccount.cpp
++++ b/daemon/src/sip/sipaccount.cpp
+@@ -55,6 +55,7 @@ SIPAccount::SIPAccount(const std::string& accountID)
+     , transportType_(PJSIP_TRANSPORT_UNSPECIFIED)
+     , cred_(NULL)
+     , tlsSetting_()
++    , ciphers(100)
+     , stunServerName_()
+     , stunPort_(0)
+     , dtmfType_(OVERRTP)
+@@ -145,7 +146,7 @@ void SIPAccount::serialize(Conf::YamlEmitter *emitter)
+     Conf::ScalarNode tlsport(portstr.str());
+     Conf::ScalarNode certificate(tlsCertificateFile_);
+     Conf::ScalarNode calist(tlsCaListFile_);
+-    Conf::ScalarNode ciphers(tlsCiphers_);
++    Conf::ScalarNode ciphersNode(tlsCiphers_);
+     Conf::ScalarNode tlsenabled(tlsEnable_);
+     Conf::ScalarNode tlsmethod(tlsMethod_);
+     Conf::ScalarNode timeout(tlsNegotiationTimeoutSec_);
+@@ -207,7 +208,7 @@ void SIPAccount::serialize(Conf::YamlEmitter *emitter)
+     tlsmap.setKeyValue(tlsPortKey, &tlsport);
+     tlsmap.setKeyValue(certificateKey, &certificate);
+     tlsmap.setKeyValue(calistKey, &calist);
+-    tlsmap.setKeyValue(ciphersKey, &ciphers);
++    tlsmap.setKeyValue(ciphersKey, &ciphersNode);
+     tlsmap.setKeyValue(tlsEnableKey, &tlsenabled);
+     tlsmap.setKeyValue(methodKey, &tlsmethod);
+     tlsmap.setKeyValue(timeoutKey, &timeout);
+@@ -586,6 +587,18 @@ pjsip_ssl_method SIPAccount::sslMethodStringToPjEnum(const std::string& method)
+ 
+ void SIPAccount::initTlsConfiguration()
+ {
++    pj_status_t status;
++    unsigned cipherNum;
++
++    // Determine the cipher list supported on this machine
++    cipherNum = PJ_ARRAY_SIZE(ciphers);
++    status = pj_ssl_cipher_get_availables(&ciphers.front(), &cipherNum);
++    if (status != PJ_SUCCESS) {
++        ERROR("Could not determine cipher list on this system");
++    }
++
++    ciphers.resize(cipherNum);
++
+     // TLS listener is unique and should be only modified through IP2IP_PROFILE
+     tlsListenerPort_ = tlsPort_;
+ 
+@@ -596,8 +609,8 @@ void SIPAccount::initTlsConfiguration()
+     pj_cstr(&tlsSetting_.privkey_file, tlsPrivateKeyFile_.c_str());
+     pj_cstr(&tlsSetting_.password, tlsPassword_.c_str());
+     tlsSetting_.method = sslMethodStringToPjEnum(tlsMethod_);
+-    pj_cstr(&tlsSetting_.ciphers, tlsCiphers_.c_str());
+-    pj_cstr(&tlsSetting_.server_name, tlsServerName_.c_str());
++    tlsSetting_.ciphers_num = ciphers.size();
++    tlsSetting_.ciphers = &ciphers.front();
+ 
+     tlsSetting_.verify_server = tlsVerifyServer_ ? PJ_TRUE: PJ_FALSE;
+     tlsSetting_.verify_client = tlsVerifyClient_ ? PJ_TRUE: PJ_FALSE;
+@@ -605,6 +618,9 @@ void SIPAccount::initTlsConfiguration()
+ 
+     tlsSetting_.timeout.sec = atol(tlsNegotiationTimeoutSec_.c_str());
+     tlsSetting_.timeout.msec = atol(tlsNegotiationTimeoutMsec_.c_str());
++
++    tlsSetting_.qos_type = PJ_QOS_TYPE_BEST_EFFORT;
++    tlsSetting_.qos_ignore_error = PJ_TRUE;
+ }
+ 
+ void SIPAccount::initStunConfiguration()
+diff --git a/daemon/src/sip/sipaccount.h b/daemon/src/sip/sipaccount.h
+index 076fe60..7c2af13 100644
+--- a/daemon/src/sip/sipaccount.h
++++ b/daemon/src/sip/sipaccount.h
+@@ -43,6 +43,8 @@
+ #include "pjsip-ua/sip_regc.h"
+ #include "noncopyable.h"
+ 
++typedef std::vector<pj_ssl_cipher> CipherArray;
++
+ namespace Conf {
+ class YamlEmitter;
+ class MappingNode;
+@@ -478,6 +480,11 @@ class SIPAccount : public Account {
+         // a sip transport.
+         pjsip_tls_setting tlsSetting_;
+ 
++        /**
++         * Allocate a static array to be used by pjsip to store the supported ciphers on this system.
++         */
++        CipherArray ciphers;
++
+         // The STUN server name, if applicable for internal use only
+         pj_str_t stunServerName_;
+ 
+-- 
+1.7.8.6
+
diff --git a/net-voip/sflphone/sflphone-1.0.1-r1.ebuild b/net-voip/sflphone/sflphone-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..571a94911c00
--- /dev/null
+++ b/net-voip/sflphone/sflphone-1.0.1-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-voip/sflphone/sflphone-1.0.1-r1.ebuild,v 1.1 2012/08/11 22:31:59 tetromino Exp $
+
+EAPI="3"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="SFLphone is a robust standards-compliant enterprise softphone, for desktop and embedded systems."
+HOMEPAGE="http://www.sflphone.org/"
+SRC_URI="http://www.elvanor.net/files/gentoo/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doxygen gnome gsm networkmanager speex static-libs"
+
+# USE="-iax" does not work. Upstream problem.
+
+CDEPEND="dev-cpp/commoncpp2
+	dev-libs/dbus-c++
+	dev-libs/expat
+	dev-libs/openssl
+	dev-libs/libpcre
+	dev-libs/libyaml
+	media-libs/alsa-lib
+	media-libs/celt
+	media-libs/libsamplerate
+	media-sound/pulseaudio
+	net-libs/ccrtp
+	net-libs/iax
+	net-libs/libzrtpcpp
+	>=net-libs/pjsip-1.8.10
+	sys-apps/dbus
+	gsm? ( media-sound/gsm )
+	speex? ( media-libs/speex )
+	networkmanager? ( net-misc/networkmanager )
+	gnome? ( dev-libs/atk
+		dev-libs/check
+		dev-libs/log4c
+		gnome-base/libgnomeui
+		gnome-base/orbit:2
+		gnome-extra/evolution-data-server
+		media-libs/fontconfig
+		media-libs/freetype
+		media-libs/libart_lgpl
+		net-libs/libsoup:2.4
+		net-libs/webkit-gtk:3
+		x11-libs/cairo
+		x11-libs/libICE
+		x11-libs/libnotify
+		x11-libs/libSM )"
+
+DEPEND="${CDEPEND}
+		>=dev-util/astyle-1.24
+		doxygen? ( app-doc/doxygen )
+		gnome? ( app-text/gnome-doc-utils )"
+
+RDEPEND="${CDEPEND}"
+
+src_prepare() {
+	# Compilation with glib-2.32, bug #427544
+	epatch "${FILESDIR}/${P}-glib-2.32-headers-"{1,2,3}.patch
+	# Compilation with pjsip-1.14
+	epatch "${FILESDIR}/${P}-pjsip-1.14.patch"
+
+	if ! use gnome; then
+		ewarn
+		ewarn "No clients selected. Use USE=gnome to get the gnome client."
+		ewarn "See"
+		ewarn "https://projects.savoirfairelinux.com/repositories/browse/sflphone/tools/pysflphone"
+		ewarn "for a python command line client."
+		ewarn
+	fi
+
+	sed -i -e 's/unpad=paren/unpad-paren/' astylerc || die "sed failed."
+	cd daemon
+	#remove "target" from lib-names, remove dep to shipped pjsip
+	sed -i -e 's/-$(target)//' \
+		-e '/^\t\t\t-L/ d' \
+		-e 's!-I$(src)/libs/pjproject!-I/usr/include!' \
+		globals.mak || die "sed failed."
+	#respect CXXFLAGS
+	sed -i -e 's/CXXFLAGS="-g/CXXFLAGS="-g $CXXFLAGS /' \
+		configure.ac || die "sed failed."
+	rm -r libs/pjproject
+	eautoreconf
+
+	#TODO: remove shipped utilspp (from curlpp), use system one, see #55185
+
+	if use gnome; then
+		cd ../gnome
+		#fix as-needed
+		sed -i -e "s/X11_LIBS)/X11_LIBS) -lebook-1.2/" src/Makefile.am || die "sed failed."
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	cd daemon
+	# $(use_with iax iax2) won't work (compilation failure)
+	econf --disable-dependency-tracking $(use_with debug) \
+		$(use_with gsm) $(use_with networkmanager) $(use_with speex) $(use_enable static-libs static) $(use_enable doxygen)
+
+	if use gnome; then
+		cd ../gnome
+		econf $(use_enable static-libs static)
+	fi
+}
+
+src_compile() {
+	cd daemon
+	emake || die "emake failed."
+
+	if use gnome; then
+		cd ../gnome
+		emake || die "emake failed."
+	fi
+}
+
+src_install() {
+	cd daemon
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+	dodoc test/sflphonedrc-sample
+
+	if use gnome; then
+		cd ../gnome
+		gnome2_src_install
+	fi
+}
+
+pkg_postinst() {
+	elog
+	elog "You need to restart dbus, if you want to access"
+	elog "sflphoned through dbus."
+	elog
+	elog
+	elog "If you use the command line client"
+	elog "(https://projects.savoirfairelinux.com/repositories/browse/sflphone/tools/pysflphone)"
+	elog "extract /usr/share/doc/${PF}/${PN}drc-sample to"
+	elog "~/.config/${PN}/${PN}drc for example config."
+	elog
+	elog
+	elog "For calls out of your browser have a look in sflphone-callto"
+	elog "and sflphone-handler. You should consider to install"
+	elog "the \"Telify\" Firefox addon. See"
+	elog "https://projects.savoirfairelinux.com/repositories/browse/sflphone/tools"
+	elog
+	if use gnome; then
+		gnome2_pkg_postinst
+		elog
+		elog "sflphone-client-gnome: To manage your contacts you need"
+		elog "mail-client/evolution or access to an evolution-data-server"
+		elog "connected backend."
+		elog
+	fi
+}