updated dependencies, linphone won't build with (only) libosip-2.x

5 files changed, 22 insertions, 18 deletions

diff --git a/net-im/linphone/ChangeLog b/net-im/linphone/ChangeLog
index 31a635627dda..4f16f38f5e10 100644
--- a/net-im/linphone/ChangeLog
+++ b/net-im/linphone/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/linphone
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/linphone/ChangeLog,v 1.11 2004/01/07 15:21:57 bazik Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/linphone/ChangeLog,v 1.12 2004/03/14 21:10:44 stkn Exp $
+
+  14 Mar 2004; Stefan Knoblich <stkn@gentoo.org> linphone-0.10.2.ebuild,
+  linphone-0.12.0.ebuild, linphone-0.12.1.ebuild:
+  updated depdendencies (linphone won't build with libosip-2.x)
 
   07 Jan 2004; Sven Blumenstein <bazik@gentoo.org> linphone-0.12.1.ebuild:
   Removed KEYWORD's of untested archs again. 
diff --git a/net-im/linphone/Manifest b/net-im/linphone/Manifest
index 965bcf666ace..1f14488ca498 100644
--- a/net-im/linphone/Manifest
+++ b/net-im/linphone/Manifest
@@ -1,9 +1,9 @@
-MD5 6be2c00ef13608ce5ba3bc3d51f2fcb5 linphone-0.12.1.ebuild 1466
-MD5 dc68cb5fe46889b9370bf5714f87c5c5 linphone-0.10.2.ebuild 1303
-MD5 c080dafd89702dfddd2a31bf7c61351b linphone-0.12.0.ebuild 1297
-MD5 c1725ebd7d8d70f158f0d2fbce978a38 ChangeLog 2134
+MD5 f824284728992cb84f4bb010e4b9dd61 ChangeLog 2320
+MD5 3cbbdbad97e949778ecda114ba45c80e linphone-0.10.2.ebuild 1294
+MD5 5772d28bc43b842b90eb28f621fc32f3 linphone-0.12.0.ebuild 1295
+MD5 592f6a501a72617f5cf1a9d36194a7db linphone-0.12.1.ebuild 1463
 MD5 bf329e2b298c08082a3ff4dfe6c236b3 metadata.xml 315
-MD5 46308c2e3cfc6d89910a2daf60d6f988 files/linphone-0.12.1-include-fix.diff 419
-MD5 29e56d450d4aa47d230872e2b18eae40 files/digest-linphone-0.10.2 68
 MD5 f271139e66524e42ff3a35b3b442dc87 files/digest-linphone-0.12.0 68
 MD5 e2202a3f070f209dfe4baa6b7410ebbc files/digest-linphone-0.12.1 68
+MD5 46308c2e3cfc6d89910a2daf60d6f988 files/linphone-0.12.1-include-fix.diff 419
+MD5 29e56d450d4aa47d230872e2b18eae40 files/digest-linphone-0.10.2 68
diff --git a/net-im/linphone/linphone-0.10.2.ebuild b/net-im/linphone/linphone-0.10.2.ebuild
index e289843d9e7c..b5416f0c4a18 100644
--- a/net-im/linphone/linphone-0.10.2.ebuild
+++ b/net-im/linphone/linphone-0.10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/linphone/linphone-0.10.2.ebuild,v 1.9 2004/01/03 02:10:56 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/linphone/linphone-0.10.2.ebuild,v 1.10 2004/03/14 21:10:44 stkn Exp $
 
 IUSE="doc gnome gtk2 gtk nls xv alsa"
 
@@ -13,14 +13,14 @@ LICENSE="GPL-2"
 KEYWORDS="x86"
 
 DEPEND="dev-libs/glib
-	>=net-libs/libosip-0.9.6
+	<net-libs/libosip-2.0.0
 	dev-util/pkgconfig
 	x86? ( xv? ( dev-lang/nasm ) )
 	gtk? ( =x11-libs/gtk+-1.2* )
 	gtk2? ( >=x11-libs/gtk+-2 )
 	gnome? ( gnome-base/gnome-panel
-	gnome-base/libgnome
-	gnome-base/libgnomeui )
+		gnome-base/libgnome
+		gnome-base/libgnomeui )
 	alsa? ( >media-libs/alsa-lib-0.5 )
 	doc? ( dev-util/gtk-doc )"
 
@@ -32,10 +32,10 @@ src_compile() {
 	then
 	    use gtk2 && myconf="${myconf} --enable-platform-gnome-2"
 	else
-	    use gnome || myconf="${myconf}--enable-gnome_ui=no"
+	    use gnome || myconf="${myconf} --enable-gnome_ui=no"
 	fi
 
-	if use gtk && use doc
+	if use doc
 	then
 		myconf="${myconf} --enable-gtk-doc"
 	else
diff --git a/net-im/linphone/linphone-0.12.0.ebuild b/net-im/linphone/linphone-0.12.0.ebuild
index efa62dcdcc7b..2534dfb4caf0 100644
--- a/net-im/linphone/linphone-0.12.0.ebuild
+++ b/net-im/linphone/linphone-0.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/linphone/linphone-0.12.0.ebuild,v 1.3 2004/01/03 02:10:56 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/linphone/linphone-0.12.0.ebuild,v 1.4 2004/03/14 21:10:44 stkn Exp $
 
 IUSE="doc gnome gtk2 gtk nls xv alsa"
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 KEYWORDS="~x86"
 
 DEPEND="dev-libs/glib
-	>=net-libs/libosip-0.9.6
+	<net-libs/libosip-2.0.0
 	dev-util/pkgconfig
 	x86? ( xv? ( dev-lang/nasm ) )
 	gtk? ( =x11-libs/gtk+-1.2* )
diff --git a/net-im/linphone/linphone-0.12.1.ebuild b/net-im/linphone/linphone-0.12.1.ebuild
index efb2ba929c23..57ec21c31fdb 100644
--- a/net-im/linphone/linphone-0.12.1.ebuild
+++ b/net-im/linphone/linphone-0.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/linphone/linphone-0.12.1.ebuild,v 1.2 2004/01/07 15:21:57 bazik Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/linphone/linphone-0.12.1.ebuild,v 1.3 2004/03/14 21:10:44 stkn Exp $
 
 IUSE="doc gnome nls xv alsa ipv6"
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 KEYWORDS="~x86"
 
 DEPEND="dev-libs/glib
-	>=net-libs/libosip-0.9.6
+	<net-libs/libosip-2.0.0
 	dev-util/pkgconfig
 	x86? (
 		xv? ( dev-lang/nasm )