version bump wrt #478686, remove old

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

15 files changed, 173 insertions, 779 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/Manifest b/net-voip/linphone/Manifest
index 556661ec9b66..deda0f0fac34 100644
--- a/net-voip/linphone/Manifest
+++ b/net-voip/linphone/Manifest
@@ -1,37 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX linphone-3.1.0-nls.patch 638 SHA256 1877610ef4e763ecbce2e80cc3d8305df1d57c8f85fde5cb618a79ae769f44fc SHA512 a043ac253ea3fe7a2a9b83ac2814e71bac010c89a09dc0ef3f5c72672c225b148752aaeefb53f5aba97fe6984af1fbaa3017022b35340ec941085b1b460ef3bb WHIRLPOOL 7852358f35196bc81dce6468c618df03d37f605d64e2ee6dee4f8384495655aa26a1c45ba476d6b82c87b44ca65fd2a7e0fd1f3e53dee76aa148601ddff3d1f5
-AUX linphone-3.1.1-external-mstreamer.patch 3480 SHA256 c0799270a91357ff319763ed649fee938ede52f908b782a655bcc11baaf058ce SHA512 00a1856771fcddd644b23169044672643c16c78ba0f5c923fee790596b983425cc4bf521dee1cf348422669a960e12645a5f3bc80d67f6299ae346bb8547b200 WHIRLPOOL 0b9b6478adca037a400cac2efcb5c0741e2e6e9d51e6bc8b57f0471aa73b484d8d4dfb2f53986ec5ea06f1708ff178399844998ba1906cc116339b124efb7637
-AUX linphone-3.2.1-external-mediastreamer.patch 3591 SHA256 884dc152cd3aaf6cbbeecb8fd0e0ff9522d834171e724deee87145b2966f87d5 SHA512 b51239f4da384b77601838b4d62855a50d20cdaa53c83673827c605e08ba08f1878bb51bc8ff2aa114f859ba5c9fe64bb26c6aa80a2411348ce6f41e824f78b3 WHIRLPOOL d2bbec8ced0efa9bcb00b58282e8fc2ce9a6f190601b53110251cccc7baeb4f8603d5edada0d5ba85519476c23bd869e5790f75dbdfc2f8d8b60f66c58f02ee0
-AUX linphone-3.2.1-linphone.desktop.patch 395 SHA256 016fc455b710a6d1d5781fb2a6f9d820beb0519b821c122830f831d922799272 SHA512 8325994b6d8342ea2286532fab34434f98520d1c37aede417427fef04ec371ea1775bc5a88a38f1df9aa8dd7f8ca7fbfa8a1d36f1b8b1b01efec6c1f74a748d0 WHIRLPOOL 166a8c56bf3f7d78c5a2be4499fc9d6e080c0937a501c61fa09f3408594814b6e9765c9f30c160dad259aef378e51c5fa12023d76badb56c1f6b8295ef9f6bff
-AUX linphone-3.2.1-log-window-crash.patch 514 SHA256 f0faa9d90aed4ea06fee608bc06785a757b8e6c25dea7ae6abdd954466a9759c SHA512 c662c2598983c05db36fd14723572e0b4f7adde387d4780eefbc51f7962e756326ed5983176b8f0e6c41579494c755b23c5e99fe7c80e4cb98a332a6ea1c98af WHIRLPOOL 8020a6f42ab3afb8fbfb28848c6b77a34e0e4f87597422bdb82f70952f8b29189f45ebdff5ac6bcfcc5f30d9d9d241c0e439312a1886d45d44a1ef1c10d2b110
-AUX linphone-3.2.1-nls.patch 426 SHA256 e35323e1166fcf826ac9c4e53db62fb522846a7b0316353edffc1fb74fd43758 SHA512 31f5840e367826f01cc0961ede881ca389adb462e9859fcdbb7db36898b798304eb28e843040a35de73131c95c7e513873c1c37e5b12ce69fe06ee97bdc17651 WHIRLPOOL ee9cb48da9cf4559b044b463a2b79284ac96d95fc78e718a949a3b973bd3c4927aeb174bae2ba7037a8ed9763fa48b344eae05b1e9ed513447b9dd67b41bd38a
-AUX linphone-3.2.99.1-external-mediastreamer.patch 3596 SHA256 65c8bfec4ad8761ff2fd170d5e3e583a3f0635c45a2ada6b9b1be06a55df3ae3 SHA512 cb13b49d7f3067e0af180094a98d591e32dc22083b729eea569bed6d69398b0a1dfbaebe6d7de8acdd1fd21a92e32e6a5168c71d11548d2925a920352d2f86f8 WHIRLPOOL f2656808eeace3c7f580e301978958143eec4cd183d929fb47e80e3734560d766f1b875109ef0bf09d417b6f7edc644cf953b0dc4dbc871bdd5ddf4291458d96
 AUX linphone-3.4.3-nls.patch 343 SHA256 703b4871cdada5631183a00013adc1871dc75994adf757202288495027ac08c5 SHA512 6a092dbefb0326d9664a0ca84cc7bcec40434d4c509fa00d4293c86021350dcb803fe9bd51ac48dd4bc5a3cbd4668f8312874ae27ba0d41dd24d3bc6626fc13a WHIRLPOOL 848519c0d66931f3d110e000d6d79fda38400a24dab9310e3d876c96fc7ac2e3e35d15260657bf70345e40331266359bc4adce73a97746bacd312a04e0ad5863
 AUX linphone-3.5.2-automake-1.13.patch 411 SHA256 2a22664f9afa25cc30a5f4720f166d2915cbb6d7165d5a2c0ca4cebb942dc19c SHA512 c01970d2e18efc5187695c25c0ae63f681c482769c078724a9805e47c6b8d4c5d69c401d673032062fe6137de582a6fd16c42cd4be6868c3bae86c958ba131b5 WHIRLPOOL 9d2e800736ecebcf0d74a0c76919f498fcc8a97cb5549ba6011909d29892d59ee2f2bb3adb48ed7746167b3097fc64e51e2ffd546dbadfc0e5f0f7474f7bf566
 AUX linphone-3.5.2-nls.patch 419 SHA256 122db264895c42d21aae55cd2297a5bb4e0098d043d77b0e14d6af69018e9776 SHA512 f0b7259c0fee65edbbe2df4a60f85ff738f78cb5002e7bdbbd6b0ff602419843fab32bd30e2797a4fa4cc662709336c44de5fdac56a8ce4b886095507061ef46 WHIRLPOOL 76e03094639e989cd95f26f91cad9e004d36db6905bf957923c7e51af9bfe3892f3229b7befb788f9d6dc13c2054666341bedeca315d3c97d5d082829134ca93
-DIST linphone-3.1.1.tar.gz 7809388 SHA256 d4f4cbf9da3c0437a9f2e181eea611adbefc6b4a7073cf8d8f3ac0fe795c8eff
-DIST linphone-3.2.1.tar.gz 7906185 SHA256 b34bf066e07895b4d7b51a4a64e2a7524ab1cb755c996ef208293228c7bc4e69
-DIST linphone-3.3.2.tar.gz 8262999 SHA256 a7ab17c91af41362b6667963d88b92b26db9a378df71f4e2d1e64bb18dc69d5e
+AUX linphone-3.6.1-nls.patch 401 SHA256 19fb515aeb3acfe9785df376aa9ad26ae4c8be205c6404791c3af2fd6300cdce SHA512 cec3043ca002b120907ab64177e5abed50109daae9f6bbcd6d4242667cb180bf33b2cc5a7a4f335c77fc3925736087de3f9e037daa909cc19257ca419f966820 WHIRLPOOL 97a1b216f29c654a8cd2406931ed179f90730d73895e7420c7774b4dbf65ef1e57e44c4f99f799717fbaf0dd5afdda00a878ce14e908e2014e12894a267ef95d
 DIST linphone-3.4.3.tar.gz 8174839 SHA256 92e7a0a01f2bb53bfaa4d7de4972e63ad528731154c36e05a9b6ba097e296692 SHA512 64aa4dd7b986a73d78f12264647469089c378bf4698455047f694376f3f65824fdc1d669600fb84b98d6c8659efbc69db86f44be86f22f4cc21bf622ba6ba216 WHIRLPOOL 84ca4219435b79086244382ac67486f5ac611b6ecbe35717bdada5a82a1da2cfe4453b6c588d4d3e51436a759c80963675b6adcb5de2acebedfc04684bf8d67d
 DIST linphone-3.5.2.tar.gz 8338517 SHA256 da37d5e539e3f8aaa44039aa52ed032ef372e7481d1b3ce68317bf79aa8a6020 SHA512 a45be141af3ee5fc37d314889b92246000810b2b5e129088a30e3ba9335f6cecd226b488a568953463d38806491471e3798be99eda7ceba9d421ff0fa7a995c9 WHIRLPOOL d3365a9d05ed7694bcd12237bd80a55a9ca7766b5e52362ca1c470e7ea748a9e50419ef05e9c79af156d364f8ec8f9a29bcf45361cd07bb8ee029a9e45f142c6
-EBUILD linphone-3.1.1.ebuild 3188 SHA256 0fce6de3eabffc27091ba3baf72c18b957ae0c9a3b71bb4d8fa1b3b53442467f SHA512 81e454cc8647ba29bffd03a035c58eadeae953585021895fb830930d2eb591b0c66a88ca9ab998bc310d1f1c57c43bafeb8e557b7b589344e01c06aaa0b07652 WHIRLPOOL 5588f1fe6490118a3691e8aa79e8249b5cb5b453d16cda514a78a06f7951fdd5ddc7b6d0ef48bb1b9fe27c7372d9ef9f7476a1c85136c5ae855232dfde63844f
-EBUILD linphone-3.2.1-r2.ebuild 3214 SHA256 821409369ddbfb362017710210362bc6a7aaedacab5b00facd85acb40862e97a SHA512 e9ad0e7a5a314cfc4d48a84c3e16c6124704cbd400836cdbe17047249810015960c37596af804107f21222311a6f93a04b3a370edad2c17aab05e2a147950018 WHIRLPOOL 27fda485ac1852f6b361ca4ed76d2122c5ad82aca89667952bcdba8d94ab4e1710283a9338083175c7895f225f2bc8ea3d401cf5c0d31933e1b00ac8183b413c
-EBUILD linphone-3.3.2.ebuild 3293 SHA256 b792a0e098071fd8f401b8af4e548d27023253119c3035e8b416c82dfa7a1420 SHA512 764b538e46a03664e55d424c0e380f178910371e1502e522b42d09250caeeb9c0835da7adb899f8da8ea8e26d20f03f0c72852000bc01794b9e52a3c8c7a75d5 WHIRLPOOL 54b92770dd0d012205f35aa1980d51d86f543f8520cbb7fe581586523ed3bb1922bacbd2377883fec5a98164bccda12022ab71d44c49ce10c25b6ffce694375e
+DIST linphone-3.6.1-exosip-4.patch 89376 SHA256 36e72e03bfc215b923b11f360b0435b1ba5df2b2ead4abce12a7b80a7a0fc367 SHA512 bdab74336cb8235b3396230278fd8eb465defac1175b00ff9cf273ef2dbc4e05f63d2574de599618e4d963b42ad17ac4f0c8c9013e40a497c99211041317313d WHIRLPOOL 8f74746447210a284677e6b203c14542bc9e4c9507d37f5adc860ffd4bf825112c9aba6a4dd9d34ca6152a9e0021ea815d14edd33774d6b75124f549d1d0dbc4
+DIST linphone-3.6.1.tar.gz 11458586 SHA256 05ba81223e9378c3bce8d33080213b9925af49bd9623cd9004eb3dd22ca9d2a0 SHA512 688ccfb333b2302ca20c2c77e38b20deee8b1c5f3c31f7a4b666d81114ea3e5cbe38bac6d88116d635ac3fcb7f38d013e35c7c076549cc3d7ae900456d51b5e4 WHIRLPOOL 3b76b6d3bbf1a9e2b06beae41e276abcd5223c5cf6f600c140ab27a60aae7b9c47c1c9da1f26587fac0d77f8a6114115b18d346d33f05b1e2a0a3a83fbf986b0
 EBUILD linphone-3.4.3-r1.ebuild 2836 SHA256 899e63844f040c30a6d6c8e030f9fee4104d89a12e3177b2a103eca998b37fd8 SHA512 372dfb5b02c4545c35edce75179581dd8cd0e846afe2ddd48be3f03a60590e32d8cc1b15dac4dd75eaa07ae3d6d6a706656031fc75efe7f3afcbda380c5b9caf WHIRLPOOL 241ad075190d92ca047e7d6053f0dc3922b5d5a8af0346b263c7f48065ed96b24e8adf08e7e403de87ae5d8939acc4dc6b4380126bb01db6afcdc2b73e8e7e6b
 EBUILD linphone-3.4.3.ebuild 2786 SHA256 77945296c1391aadaec1e1af564b5f5e3b1dceab25488ef0b1242ca8a6c91b42 SHA512 91d19ea2f0ffb7f88943933365bdac406ac589034d6b60f3e382b190cce99901b37cdff27008b63abfb6a18ead967020894417ddf135d55d741a49cd480205f3 WHIRLPOOL 093ddeecd12fd9a172ce557dd6970f7b23fac73d79b8b921e84a6d99a8cd19588300b6b01d275fb08ae182bebd1974070183d976696e3141a14a2c37c04374c9
 EBUILD linphone-3.5.2.ebuild 2994 SHA256 31bae8d60461bfe55af90a2ef5e2a62cec85066cbfdbd388875964857da4135a SHA512 f4c0459e563cdb5e904ab8624929432f2e6ceccb3d09cebf4ab6015265af165530801c12f724dfc75b0ec676cb8fe0c00663989256b6f3d200674cbe1eec0591 WHIRLPOOL 38558984890cfd983a2fdc3f4b33e5bc38433e406bcbccc88cdff63055e18d47a63ff41046651a05bc2e41694f8c8b20bf9bc26d89ffe5b0653d6b09a22e1603
-MISC ChangeLog 17409 SHA256 f6397f4d46ffdd6dc4a7afa96b4dc1593dede180c1875853d56ad49927241681 SHA512 d6a33700efd53e60a051609a4231966111678634f4895c86b22c5d6ea3d6a83fed574b208b85f7ee74f5cbce41d8474303c11c0a503944a8ccf743754f6cf760 WHIRLPOOL 345d4679c19788547e3b5ed36efb2eb08709d3929d0ba12425efc237fc0761dd2e0daba7d91df64f22591cdf866c33f2d1c8ccf8787fc6478683bb3a9a8c6967
-MISC metadata.xml 315 SHA256 2fd55a57dcbd4c0bf614c2c19f02bb227263756eab2d01fb4a7dfc1d21a18f8a SHA512 f476958494e739cd07c290928b4f2d85cae073eacbf990dcc94f66703f4c776aaf6dd1ceab89f4f32c8ce2875ead781c29a647a505ab6ca459d011915966d5e3 WHIRLPOOL 3a91ca5649031f031e25c50047827c3bd8f0c9ac4e5c6f62fd95bb26e8a98316d59d32ae7062f04c41af183fc4a1398e011758191f2ead5c5798de9dd147bbf8
+EBUILD linphone-3.6.1.ebuild 3126 SHA256 754cec393395df3b4e4652de1d578fcdb9acc4b19c6e8177a6d0fdd3328b6dce SHA512 e47f005d514739a934b507e465a59171322af6b2c3a6d9654d88f099c1a739ff4fb8ca83607d47e25f58ad5af87313fd74095a2395fa70796448e1eb07a75741 WHIRLPOOL 0741f86d29afd95b281068b326fd0a1b0fab3ed64e6d059320acb87f7c929ca77d31c09fa91d74fc2915112287c04e2d25c953c7d19f85424e3825ea0a01e051
+MISC ChangeLog 18008 SHA256 ad859a09969f384169e347ae868dcbf0dc53aeb5b98f46b5bdd701266d97615b SHA512 039928766e2149569d724f6d69b11aab343bde965110ab5a1ab3bf662d809e7208ecc86f3555ce659abeab0ba1c9eac73b2c1a739f7deed92d631d579fb384f8 WHIRLPOOL a249ec9c1dfd22c77c5cd59aad94158e2fc56617d658bac581a640a4e2a9dd7f95d52c3874cb643c8dccd29dd52fe9d6ea7533ad0be85434b82ea282cce377e3
+MISC metadata.xml 706 SHA256 4d4ee70d4fc833ec9a0d44001fca9b87acb17ab40dec03c6b5bdfc9605f2099a SHA512 99f91bdd54bd1757c827d9f50087493de5f5ce02a1ae069705951b9dd6a3c010727b97abf3b7eca3f2507624f2b780724d3c495d7d87530c563bc4e27de476ce WHIRLPOOL 606e840c33dde8e8b10baf1d46f4cc8294e7faf7bf64ed56ab84b8f018c9aa1107ac68441602c14244ac2bd3c4389e9fc8d39f5d902c48e9fbb7e6c53a3133aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSVZV7AAoJEFpvPKfnPDWzMwQIAKb4FfFWdIfam8eBmwuenHul
-ofbhQ/TcC2ZyuX95cQwOSQtt7LxGpr73z4xt91nBEwZ5InOdQpaKD3hXQeHtKMUi
-v5z1bZw79avVLeNVCBfJkxVBBJHpmW11eEu/pyg382IOGwzt5JQnRd0NHO6Bk8UX
-s8cANtO+O+NRuO70du/nEodETiEed3RsjszfkGMwI+KQSpCoACc9jNGMbyvueOvL
-GJ9o4Vq4BVGk36tkwiDYcUDz07KALtVBhlvQMbdlxGYtj9FUiIPsLtWH11Ap1d3Q
-GYGHxs2sjH2l9+htqfQyCHo60iAE0tdzzp8qBDgCKcLuQLQJvVoK3F0MVHPtkDI=
-=e3PT
+iQEcBAEBCAAGBQJSVadMAAoJEFpvPKfnPDWzhO0H/3oq5gqzOYzSrOxEGpPYxH11
+WBGsvePOP29oH/rX0wXf0BAQ5daSCryPnOBikel7XwFZ2CyoMkwt2J+oLz87PE8m
+1sZZCdsX/13Jq0eOlM5oK8pAN/9cUArgxLfmgFLrUNZNndhOawMBuBJWGtZKmlq4
+sAnIfijgq2PC38VAFd/kwqXmlKs8BWv2K5TVkqaxfN1WykD+XIU1LwxApy0WUrXn
+YCfxhdiNl/HX251UMxne9YmnckAFTJtv2h8OUENY9fEX2Iqi+GuqgMI3adJbXC9b
+UrfAuWgrS6K1shQtcPpB3uz4ed740rz4Fjhmasv0X5IDeP6mtheQjPmdC/OvJgc=
+=ila6
 -----END PGP SIGNATURE-----
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>