Does not build against libeXosip-4.0.0, bug #460490.

Package-Manager: portage-2.1.11.50/cvs/Linux x86_64

8 files changed, 38 insertions, 31 deletions

diff --git a/net-voip/linphone/ChangeLog b/net-voip/linphone/ChangeLog
index 1a486ebcf68e..16b0bb6baefd 100644
--- a/net-voip/linphone/ChangeLog
+++ b/net-voip/linphone/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-voip/linphone
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.69 2012/12/16 14:59:47 pacho Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.70 2013/03/06 13:20:30 chithanh Exp $
+
+  06 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  linphone-3.1.1.ebuild, linphone-3.2.1-r2.ebuild, linphone-3.3.2.ebuild,
+  linphone-3.4.3-r1.ebuild, linphone-3.4.3.ebuild, linphone-3.5.2.ebuild:
+  Does not build against libeXosip-4.0.0, bug #460490.
 
   16 Dec 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due retirement, #260683
diff --git a/net-voip/linphone/Manifest b/net-voip/linphone/Manifest
index 0cacdcd531b3..eb5c5b4ad372 100644
--- a/net-voip/linphone/Manifest
+++ b/net-voip/linphone/Manifest
@@ -1,6 +1,3 @@
------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
@@ -15,18 +12,11 @@ DIST linphone-3.2.1.tar.gz 7906185 SHA256 b34bf066e07895b4d7b51a4a64e2a7524ab1cb
 DIST linphone-3.3.2.tar.gz 8262999 SHA256 a7ab17c91af41362b6667963d88b92b26db9a378df71f4e2d1e64bb18dc69d5e
 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 3142 SHA256 72c6621596e2116540419a3a16ef6617adfb40fb62e8b398b48747cbce826d47 SHA512 cadb8b677de7a90d1d1b41bd8e0ed908ba3de674876b8906d82e766ae5a422cc853f0bc63cbb060f9a5ec3785946b50657c7ba4fdb1683a503e6f2585f6d6a6b WHIRLPOOL 4ba87608a36c69e96bbef94437c2b1bed7704e021357f488fc5a3de46b08ddcd7641b6085b3c922c0671833add04918a66e509942c66f12420004707f90a12ca
-EBUILD linphone-3.2.1-r2.ebuild 3168 SHA256 8fdbebda9b3a5d9a69e35ca50861054240138bb7b31147ca6a7eec2858e79009 SHA512 f37b902cc923cd88ec9ec92e832bb35cbea68e3fc34d7292007c3a7159b69f35461399830a6ceb2539f2f8a8f410e01ff40eb87e03fc04e560fe77a5cfda806a WHIRLPOOL dfdd3f3ec3cb849314ab78f8694326510a67c514fe604c39077ec6822fc87753f5473432132c15bf9b13a35992c31f7bd1822a4130343217c1be6919f22975b7
-EBUILD linphone-3.3.2.ebuild 3247 SHA256 c25dbd878253ed33355d0a334adf5f8d71c85beccaf6c4315f3ebdc8f0941726 SHA512 1f8a3d46060c4a77fcae6b7cfa56dc7e11c179d27ffd908d10e7a1688f0776120d3a4bef9c387dfdf7dc90dd4d40e7aabe651d686df03dbd9b301f6632edf986 WHIRLPOOL f5cc991e3f123def5297206d135fdadbd1a74b9b587784dba341f46f5e1fddced0e98dba7b6b0ac1570b2324ced60fd1eb88732982825fc9c2dcb8c8298a7d45
-EBUILD linphone-3.4.3-r1.ebuild 2790 SHA256 a86da438f0c8270a9394b4dc8e4a92b0117dd00670b73ee306f6cb5ea6b9176a SHA512 4b9370c1158622ad81df20558903cc398b7f6efbf7a1ee9989401609c5e16517d073482ccb61092750212b7d07c2ecd5e1d44b72769c39ad535ef7cc251b122a WHIRLPOOL 51c92365fbe3c23164510aab30a5959cda76afd347db0fe914b0b8da88171bc3d26593da07864baf5f923b575fa1b82b9adac5cb3158c07e7f4c17302ba358e1
-EBUILD linphone-3.4.3.ebuild 2740 SHA256 bbfb06947bbb300d0061e3b51efe7761f1731644dceba0c98c3db8f7bd12ac0b SHA512 6a7e203009f8556e34e788ac1d950c15dafc247334a568c71b84831d9104b634191efc45cf7908b3f4bee0b7416477e36ea4a1055a57e099a38fd02d9b8451b2 WHIRLPOOL d0d283f535243e2a34213b6cd461a71cdcadbc416ea5eafc59df8b96a1f01aeb7e8e659d96fa1a8894ea33784d26d400436bc2502dabe54f580d30f556d58e0a
-EBUILD linphone-3.5.2.ebuild 2749 SHA256 0cc764ce8e4bfde9a9c5931018b678350977876ebfd2258637d749e354d2c257 SHA512 8cba4f5cab06497b4100901e20cb2b1efeaec87fd4069a3281bcbdd69c63882f65810078e2b878c23d631679237e69c7bcb5a3044593ad1b6e1be4356ccd19e3 WHIRLPOOL cca31810cd2969e2a4567e0e3e46eed7b80a49d099f241fd536f5003a07a1d0d4b94234ed41fb0fd1b3b40f850a9d395aa100197b437aaa0fd3b111c317d001b
-MISC ChangeLog 16865 SHA256 e635787f1379a807b963edc275d5d7bbd74b801005100e3fa884da36c84a6059 SHA512 9f380a639c648065e04ccf03a01c76417a3fba26e35360f2f64b1124c981db98ccfb7f0560aed5b5485a1eaddccbcc61e78e6bade7a4b93aa7cebee2c2e26c81 WHIRLPOOL ec5f118dbd1375af6b23f3f509d0af72622a6f357d526a37137fea69e98feb4edb067ca2b731c28b46dc362b5acf3fc3b096c5c1d4516349cb941339c38191f8
+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
+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 2795 SHA256 68c7ac98597194dca2c928cdf1215c750c8a70f8a99e2c9c13c61be46f5e2556 SHA512 1372a29466031ad111b3ca1682290f6e77f53200d329a10ed8303bc3172c2abe09c79ea4a689b3a367dc2f63b472825a7cbd74a4355e08efac1e11ef43f547e8 WHIRLPOOL 58d05691dfe4d7fdaecd73d7e1b5bc80875fb468266826fb0a5aad4397174d14596abd8dc7b714ea787874fa66df7a1a6a6df9f2fd192c2972381e05ce56102a
+MISC ChangeLog 17141 SHA256 00712ebdc29e6b54c16b1d9e366fac29c240e814dad3ea1ac20f85bfa3fd46c4 SHA512 66719affc30d2c925848348a0c770de14dbe488e739ecc9149c5ed9b0e87daddae4bf976b8db834acbda28ae30accccdba0ecb38a804ad53676e0d3f0ea0ca0e WHIRLPOOL 8e66a4a5574da6d0ff526c4d96bf0e38726aa39b507581ab0fc7681ad70ffea345c1b3afde657e4c6fa88418535c8834c0303965450945e15714282f99cdc042
 MISC metadata.xml 315 SHA256 2fd55a57dcbd4c0bf614c2c19f02bb227263756eab2d01fb4a7dfc1d21a18f8a SHA512 f476958494e739cd07c290928b4f2d85cae073eacbf990dcc94f66703f4c776aaf6dd1ceab89f4f32c8ce2875ead781c29a647a505ab6ca459d011915966d5e3 WHIRLPOOL 3a91ca5649031f031e25c50047827c3bd8f0c9ac4e5c6f62fd95bb26e8a98316d59d32ae7062f04c41af183fc4a1398e011758191f2ead5c5798de9dd147bbf8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlDN4eQACgkQCaWpQKGI+9QNqQCfeo0oYsTkK594LtK6z7+76h5F
-EdkAoIMu4temu8g6+x+BLceAMwWaSpBp
-=GevQ
------END PGP SIGNATURE-----
diff --git a/net-voip/linphone/linphone-3.1.1.ebuild b/net-voip/linphone/linphone-3.1.1.ebuild
index 7fec0b74eb0f..47ebf2cce5af 100644
--- a/net-voip/linphone/linphone-3.1.1.ebuild
+++ b/net-voip/linphone/linphone-3.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.8 2012/05/03 07:27:47 jdhore Exp $
+# $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"
 
@@ -18,6 +18,8 @@ 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
diff --git a/net-voip/linphone/linphone-3.2.1-r2.ebuild b/net-voip/linphone/linphone-3.2.1-r2.ebuild
index 278f9acf46b3..1a1695b1f02d 100644
--- a/net-voip/linphone/linphone-3.2.1-r2.ebuild
+++ b/net-voip/linphone/linphone-3.2.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.6 2012/05/03 07:27:47 jdhore Exp $
+# $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"
 
@@ -18,6 +18,8 @@ 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
diff --git a/net-voip/linphone/linphone-3.3.2.ebuild b/net-voip/linphone/linphone-3.3.2.ebuild
index df8286f8a22e..da8c3ed4eb81 100644
--- a/net-voip/linphone/linphone-3.3.2.ebuild
+++ b/net-voip/linphone/linphone-3.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.8 2012/05/03 07:27:47 jdhore Exp $
+# $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"
 
@@ -18,6 +18,8 @@ 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
diff --git a/net-voip/linphone/linphone-3.4.3-r1.ebuild b/net-voip/linphone/linphone-3.4.3-r1.ebuild
index f06fac414942..dc8de756ffc4 100644
--- a/net-voip/linphone/linphone-3.4.3-r1.ebuild
+++ b/net-voip/linphone/linphone-3.4.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.6 2012/05/03 07:27:47 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/linphone-3.4.3-r1.ebuild,v 1.7 2013/03/06 13:20:30 chithanh Exp $
 
 EAPI="4"
 
@@ -19,6 +19,8 @@ IUSE="doc gtk ipv6 ncurses nls video"
 RDEPEND=">=media-libs/mediastreamer-2.7.3[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
diff --git a/net-voip/linphone/linphone-3.4.3.ebuild b/net-voip/linphone/linphone-3.4.3.ebuild
index d8f09a796183..aaf27f2c10dd 100644
--- a/net-voip/linphone/linphone-3.4.3.ebuild
+++ b/net-voip/linphone/linphone-3.4.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.ebuild,v 1.8 2012/05/03 07:27:47 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/linphone-3.4.3.ebuild,v 1.9 2013/03/06 13:20:30 chithanh Exp $
 
 EAPI="4"
 
@@ -19,6 +19,8 @@ IUSE="doc gtk ipv6 ncurses nls video"
 RDEPEND=">=media-libs/mediastreamer-2.7.3[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
diff --git a/net-voip/linphone/linphone-3.5.2.ebuild b/net-voip/linphone/linphone-3.5.2.ebuild
index 996994e45f42..0ab85713c04b 100644
--- a/net-voip/linphone/linphone-3.5.2.ebuild
+++ b/net-voip/linphone/linphone-3.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.5.2.ebuild,v 1.1 2012/11/19 21:33:29 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/linphone-3.5.2.ebuild,v 1.2 2013/03/06 13:20:30 chithanh Exp $
 
 EAPI="4"
 
@@ -19,6 +19,8 @@ IUSE="doc gsm-nonstandard gtk ipv6 ncurses nls ssl video"
 RDEPEND=">=media-libs/mediastreamer-2.8.2[video?,ipv6?]
 	>=net-libs/libeXosip-3.0.2
 	>=net-libs/libosip-3.0.0
+	<net-libs/libosip-4
+	<net-libs/libeXosip-4
 	>=net-libs/libsoup-2.26
 	>=net-libs/ortp-0.20.0
 	gtk? ( dev-libs/glib:2