Fix bugs 504268, 519798 and some QA issues. Remove old.

Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
Package-Manager: portage-2.2.18/cvs/Linux i686
Manifest-Sign-Key: 0x565953B95372756C

5 files changed, 31 insertions, 132 deletions

diff --git a/net-voip/linphone/ChangeLog b/net-voip/linphone/ChangeLog
index 5026461bf4d4..4e6c4c9b5396 100644
--- a/net-voip/linphone/ChangeLog
+++ b/net-voip/linphone/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-voip/linphone
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.79 2015/04/28 08:01:48 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.80 2015/04/28 08:20:02 bircoph Exp $
+
+  28 Apr 2015; Andrew Savchenko <bircoph@gentoo.org> -linphone-3.4.3-r1.ebuild,
+  linphone-3.6.1.ebuild, -files/linphone-3.4.3-nls.patch:
+  Fix dependencies on mediastreamer, bugs 504268, 519798.
+  Remove old version.
 
   28 Apr 2015; Andrew Savchenko <bircoph@gentoo.org> linphone-3.5.2.ebuild:
   Linphone-3.5 works only with mediastreamer-2.8, bug 545196.
diff --git a/net-voip/linphone/Manifest b/net-voip/linphone/Manifest
index a50bd8c2d851..5e814e6c540b 100644
--- a/net-voip/linphone/Manifest
+++ b/net-voip/linphone/Manifest
@@ -1,33 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-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
 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
 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 2832 SHA256 8935472d825230d354f2b5c5c1a2d987ad3076484be4f6e16976ae84434ef4b5 SHA512 ad8918b036ac3c6b42da61b907f95cead0f360fddfca903dc888d72799eaf0cf36044e7407e30e972aca6fd80636ba1aa6129a0a126fca83c38eb475b91873e4 WHIRLPOOL 0b3f7e47fd78f0ef85881b99089ca2b5d843dcb48ee45e90e0f3a0442bd627a80537de1f7fe38c7776f389a28bc8074cbc6a40bef80fa7826c886ed95e7842b6
 EBUILD linphone-3.5.2.ebuild 3004 SHA256 979f36b9b02ca4a9c232963c4f89e651fe91d5c8b98e4d579edbc7a692c578e2 SHA512 2c507f4e3172bb465cd9ff49bd5f7fe2525b3fb41a0193260ca8919d04680322b23215f85cc1a1b2c3dfde53409b9247fcee8ba5f374645858c131525b089f32 WHIRLPOOL 6f3950d503e6da3628e34b14d92a53368958945e1a079b121e752c4852eb58d865fc0fed55f5651e8fa00b31387a1a376bc2241cd92649fa07fb1dc9ae0fa960
-EBUILD linphone-3.6.1.ebuild 3126 SHA256 754cec393395df3b4e4652de1d578fcdb9acc4b19c6e8177a6d0fdd3328b6dce SHA512 e47f005d514739a934b507e465a59171322af6b2c3a6d9654d88f099c1a739ff4fb8ca83607d47e25f58ad5af87313fd74095a2395fa70796448e1eb07a75741 WHIRLPOOL 0741f86d29afd95b281068b326fd0a1b0fab3ed64e6d059320acb87f7c929ca77d31c09fa91d74fc2915112287c04e2d25c953c7d19f85424e3825ea0a01e051
-MISC ChangeLog 18852 SHA256 93c762d73fc22d21cc196521b5f8acd0f7f2d458509d9660b849bce5b0bf1246 SHA512 41047efd7ed3550fba05b5dd51a7364b10f45e011c442fbdfde9c0993f3cf8014a0fc71fc36e31a4d58d14f707506f3270aeb85949b8fc8521bd08f60ec0cf58 WHIRLPOOL ce67d4c3bb1221647a331d39792298b594efb52949b476b432afdc594005ab6d7803c5ec268d5f57640dde8283cb03eb0d18acbfa2b22624705a6f0c3a059a4f
+EBUILD linphone-3.6.1.ebuild 3185 SHA256 067114c83be27a2149676b9f3e51aa7d529a18a5fcee7f1b762d1b3ce0bca3f9 SHA512 b6182bcf0d29e618675034b26bd3c22a9548c51c23cdcc22d5548eab896ad6e08d7f477404769ded8c5411c5cdf5b22ab95f220a81a1b2b08689faa2ee05dd52 WHIRLPOOL 27b12e170a53e4f4443da84b2cc04883b85033761cfce835b9e74483805cc2537893ca802f13457c64d93a9760000653b40bca868218d3ec28a32062e65f46ae
+MISC ChangeLog 19071 SHA256 e35db154de39081ebe44ed44d355308d40876b6ae37ae9c58215951078fe402e SHA512 def4d63cb157f14573613a3b4df49af150b6ec055a4b0979a0438bfafaab3a41c1f8d0260de02e666f18f31ff6720adba7081eb922fc6eb6b8ef3567b3c4a27f WHIRLPOOL 486c43ea7270dba23fb0dfde0155aaf18007c7f26346b9b6ce784f75b27c215f0fdf3929dbea1e83265092acda04fa562962a5cfd24345b9911e28ed2d0f6b86
 MISC metadata.xml 589 SHA256 935ead2b11d0894040e9268130a3f8353c33fdfd21f8200848d46ca946c4629a SHA512 3386b4f612b41f761660c3623d9fed4eb32dceeec884defc909bad028ded5665f514cde27b7230d0cd67cbb9905ae1ec50220e7273d9a1c22add523bc805d35a WHIRLPOOL 34d351d2dd92601270572eeea7a7522927c727ff6ae24e9bdc280c01337bf51e0539f3a126c58c3b1bbc5a3a8337a3d1f004dd922711e6e920a40baee3c7aa0e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVPz54AAoJEPZTWjO6HuSNS+QQAIGZ4VfgrAAe7X5SLDlAHib+
-SoShTQpcC6gX4VAnl7+4X1SUVjcd2SiX+InWeefbryDo8jMmM/OFnMxEFXMnAoSK
-8YoyH7gFiVG3GfpyIFflBDWVdWvKqNETywd/1Ph0MdwuNAB0N/ibLmHUM5TCI5sN
-LqmBJO9Lwf589gGdGGEvRF8zJHN/AhBAftTP9Y1T/iU0D4mr4KK1LiV1NgMIe4/L
-WOp/CDgE711swMYRKX3qAJecoE3mHaZNtqz72xs8Z4ga//Y8DwOJ1AES0jf0zcHb
-FaITZuJsePo60uelum1CRpJ/IIKP9VOAmU0tlKaFFfthXMzMhFTbSyUwOhw4O4H6
-+jc1RR2Knv9vg05kEtqGyxpuC5wKCljLCCdTk6GIOfvZpSSYBHHPt4SkdMO5lbUM
-9Q6Sg1pjsyfenmFD1FJj4AJYTCSjmmVG6owwmyP1IIufoNLgeHlD69dG+Jr9AWaF
-uvDsjJXSD2JvOEYDtf8/s8cEiTRHMmG2S2hJeDTRcb5cKpu2fRLAPmkYCrIGSOor
-WYhJAhWBq+KbhXpyVLIQcKa2CQL5bS1arsLcX2ADjQmSvKRhM8psx4LyivBXryJm
-2fUQGotPZkDbaWMKxA2BQKExEErTht36q4pIKRsiHU2JtB63LkC3L/JiusVigV28
-fxxBJvMdh1+vtfuZcbnn
-=Zbig
+iQIcBAEBCAAGBQJVP0KzAAoJEPZTWjO6HuSNG2MP/1f9FHPKIZHd6p1LccpWOb0a
+HjLIZ8AFYoqWoS/HsSgKfVQKGJ0y2BYlPBITY85WqXrygJu+fYjTUI6D1mKgjDVN
+DP6TMHLsn2ENvJO98VvBO71wAn/z6zAzzGgeun2wkUqpOBTY2JkPQGhZA+s6FXmd
+7xdPem2h+JZWz4MP/iPDPD0e3vS+RggcXsYpwwvPb+q4MPnEMhGJ0tR5ZVXwp0xS
+DRlQjHE+VuCrwbn3FeV8IqTMiHsC7O2YdS9I77aGkgn8u+Xy4tUjlViktXcwVkHg
+1MvhgnIIdEWWOeAEgL2oS8fvgQYt85nf6jPsFkeq+O/j1NwxNhHviRL6Gg0aAqMv
+v6zXaZjlrgX2NHzv0bC/glaTLnwQ7gWXprYKuaLOzRSHXu2Q4F7FRaxgaEHu9pDT
+BHGAOdIF/7YSBEYl3FELvXl2ZktHsvohhUgQE8tKX2vZt/BpTd56WHaQkh5U9HZK
+ZQK8A8mDRimRLctEra7BeN+ZRZSqpRGpKWW7sywuQsTIgmnhG0IQchOZ8b+KAHGt
+/8pelWXYOlD95sCimflkM8Rd40TjZhXtBgJ2CmcwLtkx8EehR04bcf8h+aaNSfEZ
+C3Xz7g4i0WB9l/mavuHpzeUSKGInQaHK+4zLiUOXNyE/iias9HIOtf66jPhtQTD6
+xAwWljXOOnDbmgzCb2dh
+=zics
 -----END PGP SIGNATURE-----
diff --git a/net-voip/linphone/files/linphone-3.4.3-nls.patch b/net-voip/linphone/files/linphone-3.4.3-nls.patch
deleted file mode 100644
index 302ea6f44862..000000000000
--- a/net-voip/linphone/files/linphone-3.4.3-nls.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.ac	2011-02-11 13:24:11.000000000 +0300
-+++ configure.ac	2011-03-01 12:39:43.061643811 +0300
-@@ -69,7 +69,10 @@ 
- 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
- 
- dnl Initialize libtool
- AC_LIBTOOL_WIN32_DLL
diff --git a/net-voip/linphone/linphone-3.4.3-r1.ebuild b/net-voip/linphone/linphone-3.4.3-r1.ebuild
deleted file mode 100644
index 954ec36dcaea..000000000000
--- a/net-voip/linphone/linphone-3.4.3-r1.ebuild
+++ /dev/null
@@ -1,92 +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.4.3-r1.ebuild,v 1.9 2013/10/14 12:31:05 pinkbyte Exp $
-
-EAPI="4"
-
-inherit eutils autotools multilib versionator pax-utils
-
-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"
-# TODO: run-time test for ipv6: does it need mediastreamer[ipv6]?
-IUSE="doc gtk ipv6 ncurses nls video"
-
-RDEPEND="<media-libs/mediastreamer-2.8[video?,ipv6?]
-	>=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.3
-	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_}"
-
-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.4.3-nls.patch
-	# remove speex check, avoid bug when mediastreamer[-speex]
-	sed -i -e '/SPEEX/d' configure.ac || die "patching configure.ac failed"
-
-	# 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 -rf mediastreamer2 oRTP || die "should not die"
-	sed -i -e "s:oRTP::;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 \
-		$(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
-	dodoc AUTHORS BUGS ChangeLog NEWS README README.arm TODO
-	pax-mark m "${ED}usr/bin/linphone"
-}
diff --git a/net-voip/linphone/linphone-3.6.1.ebuild b/net-voip/linphone/linphone-3.6.1.ebuild
index 139878eb9fdf..2eafa5fd92c2 100644
--- a/net-voip/linphone/linphone-3.6.1.ebuild
+++ b/net-voip/linphone/linphone-3.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/linphone-3.6.1.ebuild,v 1.2 2015/04/28 08:20:02 bircoph Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="assistant doc gsm-nonstandard gtk ipv6 libnotify ncurses nls sqlite ssl tools upnp video"
 
 RDEPEND="
-	>=media-libs/mediastreamer-2.9.0[video?,ipv6?]
+	>=media-libs/mediastreamer-2.9.0[ipv6?,upnp?,video?]
 	>=net-libs/libeXosip-4.0.0
 	>=net-libs/libosip-4.0.0
 	>=net-libs/ortp-0.22.0
@@ -30,19 +30,22 @@ RDEPEND="
 		assistant? ( >=net-libs/libsoup-2.26 )
 		libnotify? ( x11-libs/libnotify )
 	)
-	gsm-nonstandard? ( >=media-libs/mediastreamer-2.8.2[gsm] )
+	gsm-nonstandard? ( >=media-libs/mediastreamer-2.9.0[gsm] )
 	ncurses? (
-		sys-libs/readline
+		sys-libs/readline:0
 		sys-libs/ncurses
 	)
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? ( dev-libs/openssl:0 )
 	tools? ( dev-libs/libxml2 )
-	upnp? ( net-libs/libupnp )"
+	upnp? ( net-libs/libupnp )
+	video? ( >=media-libs/mediastreamer-2.9.0[v4l] )
+"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-text/sgmltools-lite )
-	nls? ( dev-util/intltool )"
+	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_}"