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

(Portage version: 2.1.11.50/cvs/Linux x86_64, unsigned Manifest commit)

7 files changed, 31 insertions, 14 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/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