version bump wrt #478686, remove old

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

14 files changed, 160 insertions, 757 deletions

diff --git a/net-voip/linphone/ChangeLog b/net-voip/linphone/ChangeLog
index e6909b1fd98b..f4db3d9453db 100644
--- a/net-voip/linphone/ChangeLog
+++ b/net-voip/linphone/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for net-voip/linphone
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.72 2013/10/09 17:42:15 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.73 2013/10/09 18:58:15 hasufell Exp $
+
+*linphone-3.6.1 (09 Oct 2013)
+
+  09 Oct 2013; Julian Ospald <hasufell@gentoo.org>
+  -files/linphone-3.1.0-nls.patch, -linphone-3.1.1.ebuild,
+  -files/linphone-3.1.1-external-mstreamer.patch, -linphone-3.2.1-r2.ebuild,
+  -files/linphone-3.2.1-external-mediastreamer.patch,
+  -files/linphone-3.2.1-linphone.desktop.patch,
+  -files/linphone-3.2.1-log-window-crash.patch,
+  -files/linphone-3.2.1-nls.patch,
+  -files/linphone-3.2.99.1-external-mediastreamer.patch,
+  -linphone-3.3.2.ebuild, +linphone-3.6.1.ebuild,
+  +files/linphone-3.6.1-nls.patch, metadata.xml:
+  version bump wrt #478686, remove old
 
   09 Oct 2013; Julian Ospald <hasufell@gentoo.org> linphone-3.5.2.ebuild:
   set max dep for net-libs/ortp
diff --git a/net-voip/linphone/files/linphone-3.1.0-nls.patch b/net-voip/linphone/files/linphone-3.1.0-nls.patch
deleted file mode 100644
index 13f421217ee2..000000000000
--- a/net-voip/linphone/files/linphone-3.1.0-nls.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Allow to disable localization.
-
-	# this patch removes need to gettext and intltool
-	# but intltool was needed for eautoreconf so I add m4_pattern_allow
-	# which is probably not the best way but it's working
-
-Patch by Arfrever Frehtes Taifersar Arahesis
-
---- configure.in
-+++ configure.in
-@@ -30,7 +30,11 @@
- AM_PROG_CC_STDC
- AC_HEADER_STDC
- dnl localization tools
--ifdef([IT_PROG_INTLTOOL],[IT_PROG_INTLTOOL],[AC_PROG_INTLTOOL])
-+AM_NLS
-+if test "$USE_NLS" != "no"; then
-+ m4_pattern_allow([AC_PROG_INTLTOOL])
-+	ifdef([IT_PROG_INTLTOOL],[IT_PROG_INTLTOOL],[AC_PROG_INTLTOOL])
-+fi
- dnl Initialize libtool
- AC_PROG_LIBTOOL
- AM_PROG_LIBTOOL
diff --git a/net-voip/linphone/files/linphone-3.1.1-external-mstreamer.patch b/net-voip/linphone/files/linphone-3.1.1-external-mstreamer.patch
deleted file mode 100644
index e31ced7d5372..000000000000
--- a/net-voip/linphone/files/linphone-3.1.1-external-mstreamer.patch
+++ /dev/null
@@ -1,115 +0,0 @@
---- configure.in.old	2009-04-23 18:32:59.000000000 -0400
-+++ configure.in	2009-04-23 18:49:01.000000000 -0400
-@@ -258,7 +258,26 @@
- 
- AC_SUBST(STRICT_OPTIONS)
- 
--AC_CONFIG_SUBDIRS( mediastreamer2 )
-+AC_ARG_ENABLE(external-mediastreamer,
-+      [  --enable-external-mediastreamer Use external mediastreamer library],
-+      [case "${enableval}" in
-+        yes) external_mediastreamer=true ;;
-+        no)  external_mediastreamer=false ;;
-+        *) AC_MSG_ERROR(bad value ${enableval} for --enable-external-mediastreamer) ;;
-+      esac],[external_mediastreamer=false])
-+
-+if test "$external_mediastreamer" = 'true'; then
-+	LP_CHECK_MSTREAMER
-+else
-+	AC_CONFIG_SUBDIRS( mediastreamer2 )
-+	MSTREAMER_CFLAGS="-I\$(top_srcdir)/mediastreamer2/include"
-+	MSTREAMER_LIBS="\$(top_builddir)/mediastreamer2/src/libmediastreamer.la"
-+fi
-+
-+AC_SUBST(MSTREAMER_CFLAGS)
-+AC_SUBST(MSTREAMER_LIBS)
-+
-+AM_CONDITIONAL(EXTERNAL_MSTREAMER, [test "$external_mediastreamer" = 'true'])
- 
- dnl check for db2html (docbook) to generate html user manual
- AC_CHECK_PROG(have_sgmltools,sgmltools, yes, no)
---- console/Makefile.am.old	2009-04-23 18:38:26.000000000 -0400
-+++ console/Makefile.am	2009-04-23 18:38:56.000000000 -0400
-@@ -7,7 +7,7 @@
- 	-I$(top_srcdir)/coreapi\
- 	$(ORTP_CFLAGS) \
- 	-I$(top_srcdir)/exosip \
--	-I$(top_srcdir)/mediastreamer2/include
-+	$(MSTREAMER_CFLAGS)
- 
- 
- 
-@@ -16,7 +16,7 @@
- linphonec_SOURCES = linphonec.c linphonec.h commands.c
- 
- linphonec_LDADD = $(top_builddir)/coreapi/liblinphone.la $(READLINE_LIBS)  \
--		$(top_builddir)/mediastreamer2/src/libmediastreamer.la \
-+		$(MSTREAMER_LIBS) \
- 		$(ORTP_LIBS) \
- 		$(SPEEX_LIBS) \
- 		$(OSIP_LIBS)
-@@ -26,7 +26,7 @@
- 
- sipomatic_LDADD= 	$(INTLLIBS)  \
- 			$(top_builddir)/coreapi/liblinphone.la \
--			$(top_builddir)/mediastreamer2/src/libmediastreamer.la \
-+			$(MSTREAMER_LIBS) \
- 			$(ORTP_LIBS) \
- 			$(SPEEX_LIBS) \
- 			$(OSIP_LIBS)
---- coreapi/Makefile.am.old	2009-04-23 18:41:10.000000000 -0400
-+++ coreapi/Makefile.am	2009-04-23 18:41:32.000000000 -0400
-@@ -7,7 +7,7 @@
- 
- INCLUDES = \
- 	-I$(top_srcdir)\
--	-I$(top_srcdir)/mediastreamer2/include
-+	$(MSTREAMER_CFLAGS)
- 
- 
- lib_LTLIBRARIES=liblinphone.la
-@@ -32,7 +32,7 @@
- 
- liblinphone_la_LIBADD= \
- 		$(EXOSIP_LIBS) \
--		$(top_builddir)/mediastreamer2/src/libmediastreamer.la 
-+		$(MSTREAMER_LIBS)
- 
- 
- AM_CFLAGS=$(STRICT_OPTIONS)  -DIN_LINPHONE \
---- m4/mstreamer.m4.old	1969-12-31 19:00:00.000000000 -0500
-+++ m4/mstreamer.m4	2009-04-23 19:36:12.000000000 -0400
-@@ -0,0 +1,11 @@
-+AC_DEFUN([LP_CHECK_MSTREAMER],[
-+
-+PKG_CHECK_MODULES([MSTREAMER], [mediastreamer >= 2.2.3], , [ms_failed=true])
-+
-+if test "$ms_failed" = "true"; then
-+	AC_MSG_ERROR("External mediastreamer library not found")
-+fi
-+
-+AC_SUBST([MSTREAMER_LIBS])
-+AC_SUBST([MSTREAMER_CFLAGS])
-+])
---- gtk-glade/Makefile.am.old	2009-04-26 10:46:48.000000000 -0400
-+++ gtk-glade/Makefile.am	2009-04-26 10:47:39.000000000 -0400
-@@ -37,8 +37,8 @@
- 			setupwizard.c\
- 			linphone.h
- 
--linphone_3_LDADD=$(top_builddir)/oRTP/src/libortp.la \
--		$(top_builddir)/mediastreamer2/src/libmediastreamer.la \
-+linphone_3_LDADD=$(ORTP_LIBS) \
-+		$(MSTREAMER_LIBS) \
- 		$(top_builddir)/coreapi/liblinphone.la \
- 			$(LIBGTK_LIBS) $(INTLLIBS) \
- 			$(LIBGLADE_LIBS)
-@@ -57,7 +57,7 @@
- 
- 
- AM_CFLAGS= -DIN_LINPHONE -I$(top_srcdir)/coreapi/ \
--		-I$(top_srcdir)/mediastreamer2/include/ \
-+		$(MSTREAMER_CFLAGS) \
- 		$(LIBGLADE_CFLAGS) $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS) \
- 		$(ORTP_CFLAGS) $(OSIP_CFLAGS) 
- 
diff --git a/net-voip/linphone/files/linphone-3.2.1-external-mediastreamer.patch b/net-voip/linphone/files/linphone-3.2.1-external-mediastreamer.patch
deleted file mode 100644
index de39bcf57740..000000000000
--- a/net-voip/linphone/files/linphone-3.2.1-external-mediastreamer.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-=== modified file 'configure.in'
---- configure.in	2010-02-11 15:15:20 +0000
-+++ configure.in	2010-02-11 15:15:24 +0000
-@@ -328,7 +328,26 @@
- 
- AC_SUBST(STRICT_OPTIONS)
- 
--AC_CONFIG_SUBDIRS( mediastreamer2 )
-+AC_ARG_ENABLE(external-mediastreamer,
-+      [  --enable-external-mediastreamer Use external mediastreamer library],
-+      [case "${enableval}" in
-+        yes) external_mediastreamer=true ;;
-+        no)  external_mediastreamer=false ;;
-+        *) AC_MSG_ERROR(bad value ${enableval} for --enable-external-mediastreamer) ;;
-+      esac],[external_mediastreamer=false])
-+
-+if test "$external_mediastreamer" = 'true'; then
-+	LP_CHECK_MSTREAMER
-+else
-+	AC_CONFIG_SUBDIRS( mediastreamer2 )
-+	MSTREAMER_CFLAGS="-I\$(top_srcdir)/mediastreamer2/include"
-+	MSTREAMER_LIBS="\$(top_builddir)/mediastreamer2/src/libmediastreamer.la"
-+fi
-+
-+AC_SUBST(MSTREAMER_CFLAGS)
-+AC_SUBST(MSTREAMER_LIBS)
-+
-+AM_CONDITIONAL(EXTERNAL_MSTREAMER, [test "$external_mediastreamer" = 'true'])
- 
- dnl check for db2html (docbook) to generate html user manual
- AC_CHECK_PROG(have_sgmltools,sgmltools, yes, no)
-
-=== modified file 'console/Makefile.am'
---- console/Makefile.am	2010-02-11 15:13:22 +0000
-+++ console/Makefile.am	2010-02-11 15:16:28 +0000
-@@ -9,7 +9,7 @@
- 	-I$(top_srcdir)/coreapi\
- 	$(ORTP_CFLAGS) \
- 	-I$(top_srcdir)/exosip \
--	-I$(top_srcdir)/mediastreamer2/include
-+	$(MSTREAMER_CFLAGS)
- 
- 
- 
-@@ -22,7 +22,7 @@
- linphonec_SOURCES = linphonec.c linphonec.h commands.c
- linphonec_CFLAGS=$(COMMON_CFLAGS) $(CONSOLE_FLAGS)
- linphonec_LDADD = $(top_builddir)/coreapi/liblinphone.la $(READLINE_LIBS)  \
--		$(top_builddir)/mediastreamer2/src/libmediastreamer.la \
-+		$(MSTREAMER_LIBS) \
- 		$(ORTP_LIBS) \
- 		$(SPEEX_LIBS) \
- 		$(OSIP_LIBS)
-@@ -41,7 +41,7 @@
- 
- sipomatic_LDADD= 	$(INTLLIBS)  \
- 			$(top_builddir)/coreapi/liblinphone.la \
--			$(top_builddir)/mediastreamer2/src/libmediastreamer.la \
-+			$(MSTREAMER_LIBS) \
- 			$(ORTP_LIBS) \
- 			$(SPEEX_LIBS) \
- 			$(OSIP_LIBS)
-
-=== modified file 'coreapi/Makefile.am'
---- coreapi/Makefile.am	2010-02-11 15:13:22 +0000
-+++ coreapi/Makefile.am	2010-02-11 15:18:19 +0000
-@@ -7,7 +7,7 @@
- 
- INCLUDES = \
- 	-I$(top_srcdir)\
--	-I$(top_srcdir)/mediastreamer2/include
-+	$(MSTREAMER_CFLAGS)
- 
- 
- lib_LTLIBRARIES=liblinphone.la
-@@ -33,7 +33,7 @@
- 
- liblinphone_la_LIBADD= \
- 		$(EXOSIP_LIBS) \
--		$(top_builddir)/mediastreamer2/src/libmediastreamer.la \
-+		$(MSTREAMER_LIBS) \
- 		$(ORTP_LIBS)
- 
- if BUILD_WIN32
-
-=== modified file 'gtk-glade/Makefile.am'
---- gtk-glade/Makefile.am	2010-02-11 15:13:22 +0000
-+++ gtk-glade/Makefile.am	2010-02-11 15:16:28 +0000
-@@ -47,8 +47,8 @@
- 			loginframe.c \
- 			linphone.h 
- 
--linphone_3_LDADD=$(top_builddir)/oRTP/src/libortp.la \
--		$(top_builddir)/mediastreamer2/src/libmediastreamer.la \
-+linphone_3_LDADD=$(ORTP_LIBS) \
-+		$(MSTREAMER_LIBS) \
- 		$(top_builddir)/coreapi/liblinphone.la \
- 			$(LIBGTK_LIBS) $(INTLLIBS) \
- 			$(LIBGLADE_LIBS)
-@@ -77,7 +77,7 @@
- 
- 
- AM_CFLAGS= -DIN_LINPHONE -I$(top_srcdir)/coreapi/ \
--		-I$(top_srcdir)/mediastreamer2/include/ \
-+		$(MSTREAMER_CFLAGS) \
- 		$(LIBGLADE_CFLAGS) $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS) \
- 		$(ORTP_CFLAGS) $(OSIP_CFLAGS) 
- 
-
-=== added file 'm4/mstreamer.m4'
---- m4/mstreamer.m4	1970-01-01 00:00:00 +0000
-+++ m4/mstreamer.m4	2010-02-11 15:16:28 +0000
-@@ -0,0 +1,11 @@
-+AC_DEFUN([LP_CHECK_MSTREAMER],[
-+
-+PKG_CHECK_MODULES([MSTREAMER], [mediastreamer >= 2.2.3], , [ms_failed=true])
-+
-+if test "$ms_failed" = "true"; then
-+	AC_MSG_ERROR("External mediastreamer library not found")
-+fi
-+
-+AC_SUBST([MSTREAMER_LIBS])
-+AC_SUBST([MSTREAMER_CFLAGS])
-+])
-
diff --git a/net-voip/linphone/files/linphone-3.2.1-linphone.desktop.patch b/net-voip/linphone/files/linphone-3.2.1-linphone.desktop.patch
deleted file mode 100644
index d3fb35d29cf0..000000000000
--- a/net-voip/linphone/files/linphone-3.2.1-linphone.desktop.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-=== modified file 'share/linphone.desktop'
---- share/linphone.desktop	2010-03-18 05:59:30 +0000
-+++ share/linphone.desktop	2010-03-18 05:58:45 +0000
-@@ -5,6 +5,6 @@
- Comment[de]=Linphone ist ein web-phone.
- Type=Application
- Exec=linphone-3
--Icon=linphone/linphone2.png
-+Icon=linphone2
- Terminal=false
--Categories=Application;Network;
-\ No newline at end of file
-+Categories=Network;Telephony;
-
diff --git a/net-voip/linphone/files/linphone-3.2.1-log-window-crash.patch b/net-voip/linphone/files/linphone-3.2.1-log-window-crash.patch
deleted file mode 100644
index 904a635b5187..000000000000
--- a/net-voip/linphone/files/linphone-3.2.1-log-window-crash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-=== modified file 'gtk-glade/log.glade'
---- gtk-glade/log.glade	2010-02-12 09:04:09 +0000
-+++ gtk-glade/log.glade	2010-02-12 09:04:42 +0000
-@@ -13,6 +13,7 @@
-     <property name="deletable">False</property>
-     <property name="has_separator">False</property>
-     <signal name="response" handler="gtk_widget_hide"/>
-+    <signal name="delete-event" handler="gtk_widget_hide"/>
-     <child internal-child="vbox">
-       <widget class="GtkVBox" id="dialog-vbox1">
-         <property name="visible">True</property>
-
diff --git a/net-voip/linphone/files/linphone-3.2.1-nls.patch b/net-voip/linphone/files/linphone-3.2.1-nls.patch
deleted file mode 100644
index ee8e5763d0be..000000000000
--- a/net-voip/linphone/files/linphone-3.2.1-nls.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-=== modified file 'configure.in'
---- configure.in	2010-02-11 15:13:22 +0000
-+++ configure.in	2010-02-11 15:14:08 +0000
-@@ -54,7 +54,10 @@
- AC_SUBST(GUI_FLAGS)
- 
- dnl localization tools
--ifdef([IT_PROG_INTLTOOL],[IT_PROG_INTLTOOL],[AC_PROG_INTLTOOL])
-+AM_NLS
-+if test "$USE_NLS" != "no"; then
-+	ifdef([IT_PROG_INTLTOOL],[IT_PROG_INTLTOOL],[AC_PROG_INTLTOOL])
-+fi
- dnl Initialize libtool
- AC_LIBTOOL_WIN32_DLL
- AC_PROG_LIBTOOL
-
diff --git a/net-voip/linphone/files/linphone-3.2.99.1-external-mediastreamer.patch b/net-voip/linphone/files/linphone-3.2.99.1-external-mediastreamer.patch
deleted file mode 100644
index f4403d76973b..000000000000
--- a/net-voip/linphone/files/linphone-3.2.99.1-external-mediastreamer.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-=== modified file 'configure.in'
---- configure.in	2010-04-09 04:05:31 +0000
-+++ configure.in	2010-04-09 04:10:45 +0000
-@@ -360,7 +360,26 @@
- 
- AC_SUBST(STRICT_OPTIONS)
- 
--AC_CONFIG_SUBDIRS( mediastreamer2 )
-+AC_ARG_ENABLE(external-mediastreamer,
-+      [  --enable-external-mediastreamer Use external mediastreamer library],
-+      [case "${enableval}" in
-+        yes) external_mediastreamer=true ;;
-+        no)  external_mediastreamer=false ;;
-+        *) AC_MSG_ERROR(bad value ${enableval} for --enable-external-mediastreamer) ;;
-+      esac],[external_mediastreamer=false])
-+
-+if test "$external_mediastreamer" = 'true'; then
-+	LP_CHECK_MSTREAMER
-+else
-+	AC_CONFIG_SUBDIRS( mediastreamer2 )
-+	MSTREAMER_CFLAGS="-I\$(top_srcdir)/mediastreamer2/include"
-+	MSTREAMER_LIBS="\$(top_builddir)/mediastreamer2/src/libmediastreamer.la"
-+fi
-+
-+AC_SUBST(MSTREAMER_CFLAGS)
-+AC_SUBST(MSTREAMER_LIBS)
-+
-+AM_CONDITIONAL(EXTERNAL_MSTREAMER, [test "$external_mediastreamer" = 'true'])
- 
- dnl check for db2html (docbook) to generate html user manual
- AC_CHECK_PROG(have_sgmltools,sgmltools, yes, no)
-
-=== modified file 'console/Makefile.am'
---- console/Makefile.am	2010-04-09 04:05:31 +0000
-+++ console/Makefile.am	2010-04-09 04:10:45 +0000
-@@ -9,7 +9,7 @@
- 	-I$(top_srcdir)/coreapi\
- 	$(ORTP_CFLAGS) \
- 	-I$(top_srcdir)/exosip \
--	-I$(top_srcdir)/mediastreamer2/include
-+	$(MSTREAMER_CFLAGS)
- 
- 
- 
-@@ -22,7 +22,7 @@
- linphonec_SOURCES = linphonec.c linphonec.h commands.c
- linphonec_CFLAGS=$(COMMON_CFLAGS) $(CONSOLE_FLAGS)
- linphonec_LDADD = $(top_builddir)/coreapi/liblinphone.la $(READLINE_LIBS)  \
--		$(top_builddir)/mediastreamer2/src/libmediastreamer.la \
-+		$(MSTREAMER_LIBS) \
- 		$(ORTP_LIBS) \
- 		$(SPEEX_LIBS) \
- 		$(OSIP_LIBS)
-@@ -41,7 +41,7 @@
- 
- sipomatic_LDADD= 	$(INTLLIBS)  \
- 			$(top_builddir)/coreapi/liblinphone.la \
--			$(top_builddir)/mediastreamer2/src/libmediastreamer.la \
-+			$(MSTREAMER_LIBS) \
- 			$(ORTP_LIBS) \
- 			$(SPEEX_LIBS) \
- 			$(OSIP_LIBS)
-
-=== modified file 'coreapi/Makefile.am'
---- coreapi/Makefile.am	2010-04-09 04:05:31 +0000
-+++ coreapi/Makefile.am	2010-04-09 04:10:45 +0000
-@@ -10,7 +10,7 @@
- 
- INCLUDES = \
- 	-I$(top_srcdir)\
--	-I$(top_srcdir)/mediastreamer2/include
-+	$(MSTREAMER_CFLAGS)
- 
- 
- lib_LTLIBRARIES=liblinphone.la
-@@ -41,7 +41,7 @@
- 
- liblinphone_la_LIBADD= \
- 		$(EXOSIP_LIBS) \
--		$(top_builddir)/mediastreamer2/src/libmediastreamer.la \
-+		$(MSTREAMER_LIBS) \
- 		$(ORTP_LIBS)
- 
- if BUILD_WIN32
-
-=== modified file 'gtk-glade/Makefile.am'
---- gtk-glade/Makefile.am	2010-04-09 04:05:31 +0000
-+++ gtk-glade/Makefile.am	2010-04-09 04:11:22 +0000
-@@ -47,8 +47,8 @@
- 			loginframe.c \
- 			linphone.h 
- 
--linphone_3_LDADD=$(top_builddir)/oRTP/src/libortp.la \
--		$(top_builddir)/mediastreamer2/src/libmediastreamer.la \
-+linphone_3_LDADD=$(ORTP_LIBS) \
-+		$(MSTREAMER_LIBS) \
- 		$(top_builddir)/coreapi/liblinphone.la \
- 			$(LIBGTK_LIBS) $(INTLLIBS) \
- 			$(LIBGLADE_LIBS)
-@@ -77,7 +77,7 @@
- 
- 
- AM_CFLAGS= -DIN_LINPHONE -I$(top_srcdir)/coreapi/ \
--		-I$(top_srcdir)/mediastreamer2/include/ \
-+		$(MSTREAMER_CFLAGS) \
- 		$(ORTP_CFLAGS) \
- 		$(LIBGLADE_CFLAGS) $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS) \
- 		$(OSIP_CFLAGS) 
-
-=== added file 'm4/mstreamer.m4'
---- m4/mstreamer.m4	1970-01-01 00:00:00 +0000
-+++ m4/mstreamer.m4	2010-02-11 15:16:28 +0000
-@@ -0,0 +1,11 @@
-+AC_DEFUN([LP_CHECK_MSTREAMER],[
-+
-+PKG_CHECK_MODULES([MSTREAMER], [mediastreamer >= 2.2.3], , [ms_failed=true])
-+
-+if test "$ms_failed" = "true"; then
-+	AC_MSG_ERROR("External mediastreamer library not found")
-+fi
-+
-+AC_SUBST([MSTREAMER_LIBS])
-+AC_SUBST([MSTREAMER_CFLAGS])
-+])
-
diff --git a/net-voip/linphone/files/linphone-3.6.1-nls.patch b/net-voip/linphone/files/linphone-3.6.1-nls.patch
new file mode 100644
index 000000000000..fb53aece8f64
--- /dev/null
+++ b/net-voip/linphone/files/linphone-3.6.1-nls.patch
@@ -0,0 +1,19 @@
+Author: hasufell <hasufell@gentoo.org>
+Date:   Sun Sep 29 20:19:39 2013 +0200
+
+    fix nls
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -79,7 +79,10 @@ AC_SUBST(CONSOLE_FLAGS)
+ AC_SUBST(GUI_FLAGS)
+ 
+ dnl localization tools
+-IT_PROG_INTLTOOL([0.40], [no-xml])
++AM_NLS
++if test "$USE_NLS" != "no"; then
++    IT_PROG_INTLTOOL([0.40], [no-xml])
++fi
+ 
+ AM_CONDITIONAL(BUILD_TESTS,test x$build_tests != xno)
+ 
diff --git a/net-voip/linphone/linphone-3.1.1.ebuild b/net-voip/linphone/linphone-3.1.1.ebuild
deleted file mode 100644
index 47ebf2cce5af..000000000000
--- a/net-voip/linphone/linphone-3.1.1.ebuild
+++ /dev/null
@@ -1,113 +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/linphone/linphone-3.1.1.ebuild,v 1.9 2013/03/06 13:20:30 chithanh Exp $
-
-EAPI="2"
-
-inherit eutils autotools multilib
-
-DESCRIPTION="Video softphone based on the SIP protocol"
-HOMEPAGE="http://www.linphone.org/"
-SRC_URI="http://download.savannah.nongnu.org/releases/${PN}/stable/sources/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc gtk ipv6 ncurses nls video"
-
-RDEPEND=">=media-libs/mediastreamer-2.2.3_p1[video?]
-	>=net-libs/libeXosip-3.0.2
-	>=net-libs/libosip-3.0.0
-	<net-libs/libosip-4
-	<net-libs/libeXosip-4
-	>=net-libs/ortp-0.15.0_p1
-	gtk? ( dev-libs/glib:2
-		>=gnome-base/libglade-2.4.0:2.0
-		>=x11-libs/gtk+-2.4.0:2 )
-	ncurses? ( sys-libs/readline
-		sys-libs/ncurses )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/sgmltools-lite )
-	nls? ( dev-util/intltool
-		sys-devel/gettext )"
-
-IUSE_LINGUAS="fr it de ja es pl cs nl sv pt_BR hu ru"
-
-for l in ${IUSE_LINGUAS}; do
-	IUSE="${IUSE} linguas_${l}"
-done
-
-# TODO:
-# update ortp ?
-# update mediastreamer ?
-
-# TODO:
-# run-time test for ipv6 : does it need mediastreamer[ipv6] ?
-
-pkg_setup() {
-	if ! use gtk && ! use ncurses; then
-		ewarn "gtk and ncurses are disabled."
-		ewarn "At least one of these use flags are needed to get a front-end."
-		ewarn "Only liblinphone is going to be installed."
-	fi
-
-	strip-linguas ${IUSE_LINGUAS}
-
-	if [[ -z "${LINGUAS}" ]]; then
-		# no linguas set, using the default one
-		LINGUAS=" "
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-external-mstreamer.patch
-
-	# this patch removes need to gettext and intltool
-	# but intltool was needed for eautoreconf so I add m4_pattern_allow
-	# which is probably not the best way but it's working
-	epatch "${FILESDIR}"/${PN}-3.1.0-nls.patch
-
-	# remove speex check, avoid bug when mediastreamer[-speex]
-	sed -i -e '/SPEEX/d' configure.in || die "patching configure.in failed"
-
-	# fix path to use lib64
-	sed -i -e "s:lib\(/liblinphone\):$(get_libdir)\1:" configure.in \
-		|| die "patching configure.in failed"
-
-	# removing bundled libs dir prevent them to be reconf
-	rm -rf mediastreamer2 oRTP || die "should not die"
-	# and references in Makefile.am
-	sed -i -e "s:oRTP::" -e "s:mediastreamer2::" Makefile.am \
-		|| die "patching Makefile.am failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	# strict: we don't want -Werror
-	# external-ortp,external-mediastreamer: prefer external libs
-	# truespeech: seems not used, TODO: ask in ml
-	# rsvp: breaking the build (not maintained anymore) --disable = --enable
-	# alsa, artsc and portaudio are used for bundled mediastreamer
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--disable-strict \
-		--enable-external-ortp \
-		--enable-external-mediastreamer \
-		--disable-truespeech \
-		--disable-dependency-tracking \
-		$(use_enable doc manual) \
-		$(use_enable gtk gtk_ui) \
-		$(use_enable ipv6) \
-		$(use_enable ncurses console_ui) \
-		$(use_enable nls) \
-		$(use_enable video)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS BUGS ChangeLog NEWS README README.arm TODO \
-		|| die "dodoc failed"
-}
diff --git a/net-voip/linphone/linphone-3.2.1-r2.ebuild b/net-voip/linphone/linphone-3.2.1-r2.ebuild
deleted file mode 100644
index 1a1695b1f02d..000000000000
--- a/net-voip/linphone/linphone-3.2.1-r2.ebuild
+++ /dev/null
@@ -1,105 +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/linphone/linphone-3.2.1-r2.ebuild,v 1.7 2013/03/06 13:20:30 chithanh Exp $
-
-EAPI="3"
-
-inherit eutils autotools multilib
-
-DESCRIPTION="Video softphone based on the SIP protocol"
-HOMEPAGE="http://www.linphone.org/"
-SRC_URI="http://download.savannah.nongnu.org/releases/${PN}/stable/sources/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~ppc-macos ~x86-macos"
-IUSE="doc gtk ipv6 ncurses nls video"
-
-RDEPEND=">=media-libs/mediastreamer-2.3.0[video?]
-	>=net-libs/libeXosip-3.0.2
-	>=net-libs/libosip-3.0.0
-	<net-libs/libosip-4
-	<net-libs/libeXosip-4
-	>=net-libs/ortp-0.16.1
-	gtk? ( dev-libs/glib:2
-		>=gnome-base/libglade-2.4.0:2.0
-		>=x11-libs/gtk+-2.4.0:2 )
-	ncurses? ( sys-libs/readline
-		sys-libs/ncurses )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/sgmltools-lite )
-	nls? ( dev-util/intltool
-		sys-devel/gettext )"
-
-IUSE_LINGUAS=" fr it de ja es pl cs nl sv pt_BR hu ru zh_CN"
-IUSE="${IUSE} ${IUSE_LINGUAS// / linguas_}"
-
-# TODO:
-# update ortp ?
-# update mediastreamer ?
-
-# TODO:
-# run-time test for ipv6 : does it need mediastreamer[ipv6] ?
-
-pkg_setup() {
-	if ! use gtk && ! use ncurses ; then
-		ewarn "gtk and ncurses are disabled."
-		ewarn "At least one of these use flags are needed to get a front-end."
-		ewarn "Only liblinphone is going to be installed."
-	fi
-
-	strip-linguas ${IUSE_LINGUAS}
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-external-mediastreamer.patch
-	epatch "${FILESDIR}"/${P}-nls.patch
-	epatch "${FILESDIR}"/${P}-log-window-crash.patch
-	epatch "${FILESDIR}"/${P}-linphone.desktop.patch
-
-	# remove speex check, avoid bug when mediastreamer[-speex]
-	sed -i -e '/SPEEX/d' configure.in || die "patching configure.in failed"
-
-	# fix path to use lib64
-	sed -i -e "s:lib\(/liblinphone\):$(get_libdir)\1:" configure.in \
-		|| die "patching configure.in failed"
-
-	# removing bundled libs dir prevent them to be reconf
-	rm -rf mediastreamer2 oRTP || die "should not die"
-	# and references in Makefile.am
-	sed -i -e "s:oRTP::" -e "s:mediastreamer2::" Makefile.am \
-		|| die "patching Makefile.am failed"
-
-	# make sure to use host libtool version
-	rm -f m4/libtool.m4 m4/lt*.m4 #282268
-	eautoreconf
-}
-
-src_configure() {
-	# strict: we don't want -Werror
-	# external-ortp,external-mediastreamer: prefer external libs
-	# truespeech: seems not used, TODO: ask in ml
-	# rsvp: breaking the build (not maintained anymore) --disable = --enable
-	# alsa, artsc and portaudio are used for bundled mediastreamer
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--disable-strict \
-		--enable-external-ortp \
-		--enable-external-mediastreamer \
-		--disable-truespeech \
-		--disable-dependency-tracking \
-		$(use_enable doc manual) \
-		$(use_enable gtk gtk_ui) \
-		$(use_enable ipv6) \
-		$(use_enable ncurses console_ui) \
-		$(use_enable nls) \
-		$(use_enable video)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dosym linphone-3 /usr/bin/linphone || die
-	dodoc AUTHORS BUGS ChangeLog NEWS README README.arm TODO || die
-	cp "${ED}/usr/share/pixmaps/"{linphone/linphone2.png,linphone2.png} || die
-}
diff --git a/net-voip/linphone/linphone-3.3.2.ebuild b/net-voip/linphone/linphone-3.3.2.ebuild
deleted file mode 100644
index da8c3ed4eb81..000000000000
--- a/net-voip/linphone/linphone-3.3.2.ebuild
+++ /dev/null
@@ -1,107 +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/linphone/linphone-3.3.2.ebuild,v 1.9 2013/03/06 13:20:30 chithanh Exp $
-
-EAPI="3"
-
-inherit eutils autotools multilib versionator
-
-DESCRIPTION="Video softphone based on the SIP protocol"
-HOMEPAGE="http://www.linphone.org/"
-SRC_URI="mirror://nongnu/${PN}/$(get_version_component_range 1-2).x/sources/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-macos"
-IUSE="doc gtk ipv6 ncurses nls video"
-
-RDEPEND=">=media-libs/mediastreamer-2.6.0[video?]
-	>=net-libs/libeXosip-3.0.2
-	>=net-libs/libosip-3.0.0
-	<net-libs/libosip-4
-	<net-libs/libeXosip-4
-	>=net-libs/ortp-0.16.2
-	gtk? ( dev-libs/glib:2
-		>=gnome-base/libglade-2.4.0:2.0
-		>=x11-libs/gtk+-2.4.0:2 )
-	ncurses? ( sys-libs/readline
-		sys-libs/ncurses )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/sgmltools-lite )
-	nls? ( dev-util/intltool
-		sys-devel/gettext )"
-
-IUSE_LINGUAS=" fr it de ja es pl cs nl sv pt_BR hu ru zh_CN"
-IUSE="${IUSE} ${IUSE_LINGUAS// / linguas_}"
-
-# TODO:
-# update ortp ?
-# update mediastreamer ?
-
-# TODO:
-# run-time test for ipv6 : does it need mediastreamer[ipv6] ?
-
-pkg_setup() {
-	if ! use gtk && ! use ncurses ; then
-		ewarn "gtk and ncurses are disabled."
-		ewarn "At least one of these use flags are needed to get a front-end."
-		ewarn "Only liblinphone is going to be installed."
-	fi
-
-	strip-linguas ${IUSE_LINGUAS}
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.2.99.1-external-mediastreamer.patch
-	epatch "${FILESDIR}"/${PN}-3.2.1-nls.patch
-
-	# remove speex check, avoid bug when mediastreamer[-speex]
-	sed -i -e '/SPEEX/d' configure.in || die "patching configure.in failed"
-
-	# fix path to use lib64
-	sed -i -e "s:lib\(/liblinphone\):$(get_libdir)\1:" configure.in \
-		|| die "patching configure.in failed"
-
-	# removing bundled libs dir prevent them to be reconf
-	rm -rf mediastreamer2 oRTP || die "should not die"
-	# and references in Makefile.am
-	sed -i -e "s:oRTP::;s:mediastreamer2::" Makefile.am \
-		|| die "patching Makefile.am failed"
-
-	# don't know why, but exosip macro references a non-existing framework
-	sed -i -e "s/-framework CFNetwork//" m4/exosip.m4 \
-		|| die "patching m4/exosip.m4 failed"
-
-	# make sure to use host libtool version
-	rm -f m4/libtool.m4 m4/lt*.m4 #282268
-	eautoreconf
-}
-
-src_configure() {
-	# strict: we don't want -Werror
-	# external-ortp,external-mediastreamer: prefer external libs
-	# truespeech: seems not used, TODO: ask in ml
-	# rsvp: breaking the build (not maintained anymore) --disable = --enable
-	# alsa, artsc and portaudio are used for bundled mediastreamer
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--disable-strict \
-		--enable-external-ortp \
-		--enable-external-mediastreamer \
-		--disable-truespeech \
-		--disable-dependency-tracking \
-		$(use_enable doc manual) \
-		$(use_enable gtk gtk_ui) \
-		$(use_enable ipv6) \
-		$(use_enable ncurses console_ui) \
-		$(use_enable nls) \
-		$(use_enable video)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dosym linphone-3 /usr/bin/linphone || die
-	dodoc AUTHORS BUGS ChangeLog NEWS README README.arm TODO || die
-	#cp "${ED}/usr/share/pixmaps/"{linphone/linphone2.png,linphone2.png} || die
-}
diff --git a/net-voip/linphone/linphone-3.6.1.ebuild b/net-voip/linphone/linphone-3.6.1.ebuild
new file mode 100644
index 000000000000..139878eb9fdf
--- /dev/null
+++ b/net-voip/linphone/linphone-3.6.1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/linphone-3.6.1.ebuild,v 1.1 2013/10/09 18:58:15 hasufell Exp $
+
+EAPI=5
+
+inherit autotools eutils multilib pax-utils versionator
+
+DESCRIPTION="Video softphone based on the SIP protocol"
+HOMEPAGE="http://www.linphone.org/"
+SRC_URI="mirror://nongnu/${PN}/$(get_version_component_range 1-2).x/sources/${P}.tar.gz
+	http://dev.gentoo.org/~hasufell/distfiles/${P}-exosip-4.patch"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# TODO: run-time test for ipv6: does it need mediastreamer[ipv6]?
+IUSE="assistant doc gsm-nonstandard gtk ipv6 libnotify ncurses nls sqlite ssl tools upnp video"
+
+RDEPEND="
+	>=media-libs/mediastreamer-2.9.0[video?,ipv6?]
+	>=net-libs/libeXosip-4.0.0
+	>=net-libs/libosip-4.0.0
+	>=net-libs/ortp-0.22.0
+	virtual/udev
+	gtk? (
+		dev-libs/glib:2
+		>=gnome-base/libglade-2.4.0:2.0
+		>=x11-libs/gtk+-2.4.0:2
+		assistant? ( >=net-libs/libsoup-2.26 )
+		libnotify? ( x11-libs/libnotify )
+	)
+	gsm-nonstandard? ( >=media-libs/mediastreamer-2.8.2[gsm] )
+	ncurses? (
+		sys-libs/readline
+		sys-libs/ncurses
+	)
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( dev-libs/openssl:0 )
+	tools? ( dev-libs/libxml2 )
+	upnp? ( net-libs/libupnp )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-text/sgmltools-lite )
+	nls? ( dev-util/intltool )"
+
+IUSE_LINGUAS=" fr it de he ja es pl cs nl sr sv pt_BR hu ru zh_CN"
+IUSE="${IUSE}${IUSE_LINGUAS// / linguas_}"
+
+pkg_setup() {
+	if ! use gtk && ! use ncurses ; then
+		ewarn "gtk and ncurses are disabled."
+		ewarn "At least one of these use flags are needed to get a front-end."
+		ewarn "Only liblinphone is going to be installed."
+	fi
+
+	strip-linguas ${IUSE_LINGUAS}
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-nls.patch \
+		"${DISTDIR}"/${P}-exosip-4.patch
+
+	# variable causes "command not found" warning and is not
+	# needed anyway
+	sed -i \
+		-e 's/$(ACLOCAL_MACOS_FLAGS)//' Makefile.am || die
+
+	# fix path to use lib64
+	sed -i \
+		-e "s:lib\(/liblinphone\):$(get_libdir)\1:" configure.ac \
+		|| die "patching configure.ac failed"
+
+	# removing bundled libs dir prevent them to be reconf
+	rm -r mediastreamer2 oRTP || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable doc manual)
+		$(use_enable nls)
+		--disable-static
+		$(use_enable ncurses console_ui)
+		$(use_enable tools)
+		$(use_enable upnp)
+		$(use_enable gtk gtk_ui)
+		$(use_enable libnotify notify)
+		$(use_enable ipv6)
+		--disable-truespeech
+		$(use_enable gsm-nonstandard nonstandard-gsm)
+		$(use_enable ssl)
+		--disable-speex
+		# seems not used, TODO: ask in ml
+		$(use_enable video)
+		--disable-zrtp
+		$(usex gtk "$(use_enable assistant)" "--disable-assistant")
+		# we don't want -Werror
+		--disable-strict
+		# don't bundle libs
+		--enable-external-mediastreamer
+		$(use_enable sqlite msg-storage)
+		--enable-external-ortp
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" pkgdocdir="/usr/share/doc/${PF}" install # 415161
+	dodoc AUTHORS BUGS ChangeLog NEWS README README.arm TODO
+	pax-mark m "${ED%/}/usr/bin/linphone"
+}
diff --git a/net-voip/linphone/metadata.xml b/net-voip/linphone/metadata.xml
index 70ed4e590cdd..2c43304025e0 100644
--- a/net-voip/linphone/metadata.xml
+++ b/net-voip/linphone/metadata.xml
@@ -2,8 +2,19 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>voip</herd>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>bircoph@gmail.com</email>
+		<name>Andrew Savchenko</name>
+		<description>Proxy maintainer. Assign bugs to him.</description>
+	</maintainer>
 	<use>
-		<flag name='gsm-nonstandard'>Support non-standard GSM frequencies</flag>
+		<flag name='assistant'>Turn on assistant compiling
+			(needs gtk enabled)</flag>
+		<flag name='gsm-nonstandard'>Support non-standard GSM frequencies
+		</flag>
+		<flag name='sqlite'>Turn on compilation of message storage</flag>
+		<flag name='tools'>Compile tools</flag>
 		<flag name='video'>Enable video support (display/capture)</flag>
 	</use>
 </pkgmetadata>