removed old linphone-0.9, added linphone-0.12.1, updated copyright headers for 2004

9 files changed, 106 insertions, 58 deletions

diff --git a/net-im/linphone/ChangeLog b/net-im/linphone/ChangeLog
index 7a673de79229..fc91f1da6b4a 100644
--- a/net-im/linphone/ChangeLog
+++ b/net-im/linphone/ChangeLog
@@ -1,6 +1,14 @@
 # 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.9 2003/12/31 04:21:04 bazik Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/linphone/ChangeLog,v 1.10 2004/01/03 02:10:56 stkn Exp $
+
+*linphone-0.12.1 (03 Jan 2004)
+
+  03 Jan 2004; Stefan Knoblich <stkn@gentoo.org> linphone-0.10.2.ebuild,
+  linphone-0.12.0.ebuild, linphone-0.12.1.ebuild, linphone-0.9.0-r1.ebuild,
+  linphone-0.12.1-include-fix.diff:
+  removed old linphone-0.9, copyright header updated for 2004, added
+  linphone-0.12.1
 
   31 Dec 2003; Sven Blumenstein <bazik@gentoo.org> linphone-0.10.2.ebuild,
   linphone-0.12.0.ebuild, linphone-0.9.0-r1.ebuild:
diff --git a/net-im/linphone/Manifest b/net-im/linphone/Manifest
index 89d5fe5a6738..0117430d9383 100644
--- a/net-im/linphone/Manifest
+++ b/net-im/linphone/Manifest
@@ -1,8 +1,9 @@
-MD5 8d2c0ddae8a5ad396175fb8653cc2565 linphone-0.10.2.ebuild 1304
-MD5 59b7e02cba6fbc5f4aed01685c45b22f linphone-0.12.0.ebuild 1304
-MD5 447033db7e2ef0ec79f806d4d75fe54d linphone-0.9.0-r1.ebuild 992
-MD5 7f2e3d3335d0956e886ded5241b4f624 ChangeLog 1510
+MD5 b1c57407b1212087710acd3512e972b6 ChangeLog 1815
+MD5 dc68cb5fe46889b9370bf5714f87c5c5 linphone-0.10.2.ebuild 1303
+MD5 c080dafd89702dfddd2a31bf7c61351b linphone-0.12.0.ebuild 1297
 MD5 bf329e2b298c08082a3ff4dfe6c236b3 metadata.xml 315
-MD5 a0232ab5ebf0e61290df410da9561c26 files/digest-linphone-0.9.0-r1 67
+MD5 0f48b24909aff800cbc5f7963358fee9 linphone-0.12.1.ebuild 1501
 MD5 29e56d450d4aa47d230872e2b18eae40 files/digest-linphone-0.10.2 68
 MD5 f271139e66524e42ff3a35b3b442dc87 files/digest-linphone-0.12.0 68
+MD5 46308c2e3cfc6d89910a2daf60d6f988 files/linphone-0.12.1-include-fix.diff 419
+MD5 e2202a3f070f209dfe4baa6b7410ebbc files/digest-linphone-0.12.1 68
diff --git a/net-im/linphone/files/digest-linphone-0.12.1 b/net-im/linphone/files/digest-linphone-0.12.1
new file mode 100644
index 000000000000..d003ff904f39
--- /dev/null
+++ b/net-im/linphone/files/digest-linphone-0.12.1
@@ -0,0 +1 @@
+MD5 62e94ca8e3a95297175ee0c3c6de13b1 linphone-0.12.1.tar.gz 8296534
diff --git a/net-im/linphone/files/digest-linphone-0.9.0-r1 b/net-im/linphone/files/digest-linphone-0.9.0-r1
deleted file mode 100644
index 0a9d56343a92..000000000000
--- a/net-im/linphone/files/digest-linphone-0.9.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 696986d6fd133efda2cee98fe7230513 linphone-0.9.0.tar.gz 1845011
diff --git a/net-im/linphone/files/linphone-0.12.1-include-fix.diff b/net-im/linphone/files/linphone-0.12.1-include-fix.diff
new file mode 100644
index 000000000000..a5b47f9eae32
--- /dev/null
+++ b/net-im/linphone/files/linphone-0.12.1-include-fix.diff
@@ -0,0 +1,16 @@
+--- linphone-0.12.1/coreapi/linphonecore.c.orig	2003-12-07 18:29:04.000000000 +0000
++++ linphone-0.12.1/coreapi/linphonecore.c	2003-12-07 18:30:42.000000000 +0000
+@@ -34,9 +34,11 @@
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ 
+-#ifdef INET6  
++/* 
++   shoot me if this breaks, stkn
++   (at least it compiles now, w/o use="ipv6")
++*/
+ #include <netdb.h>  
+-#endif
+ 
+ #define MAX_IF 20
+ const double bandwidths[5]=
diff --git a/net-im/linphone/linphone-0.10.2.ebuild b/net-im/linphone/linphone-0.10.2.ebuild
index 74d5dd94fe42..e289843d9e7c 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-2003 Gentoo Technologies, Inc.
+# 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.8 2003/12/31 04:21:04 bazik Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/linphone/linphone-0.10.2.ebuild,v 1.9 2004/01/03 02:10:56 stkn Exp $
 
 IUSE="doc gnome gtk2 gtk nls xv alsa"
 
diff --git a/net-im/linphone/linphone-0.12.0.ebuild b/net-im/linphone/linphone-0.12.0.ebuild
index 800a35761d57..efa62dcdcc7b 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-2003 Gentoo Technologies, Inc.
+# 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.2 2003/12/31 04:21:04 bazik Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/linphone/linphone-0.12.0.ebuild,v 1.3 2004/01/03 02:10:56 stkn Exp $
 
 IUSE="doc gnome gtk2 gtk nls xv alsa"
 
@@ -19,8 +19,8 @@ DEPEND="dev-libs/glib
 	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.1.ebuild b/net-im/linphone/linphone-0.12.1.ebuild
new file mode 100644
index 000000000000..040185b79886
--- /dev/null
+++ b/net-im/linphone/linphone-0.12.1.ebuild
@@ -0,0 +1,66 @@
+# 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.1 2004/01/03 02:10:56 stkn Exp $
+
+IUSE="doc gnome nls xv alsa ipv6"
+
+DESCRIPTION="Linphone is a Web phone with a GNOME interface."
+HOMEPAGE="http://www.linphone.org/?lang=us"
+SRC_URI="http://simon.morlat.free.fr/download/${PV}/source/${P}.tar.gz"
+
+SLOT="1"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
+
+DEPEND="dev-libs/glib
+	>=net-libs/libosip-0.9.6
+	dev-util/pkgconfig
+	x86? (
+		xv? ( dev-lang/nasm )
+	     )
+	gnome? (
+		 >=gnome-base/gnome-panel-2
+		 >=gnome-base/libgnome-2
+		 >=gnome-base/libgnomeui-2
+		 >=x11-libs/gtk+-2
+		)
+	alsa? ( >media-libs/alsa-lib-0.5 )
+	doc? ( dev-util/gtk-doc )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-include-fix.diff
+}
+
+src_compile() {
+
+	local myconf
+
+	if [ `use gnome` ]
+	then
+		einfo "Building with Gnome gui"
+		myconf="${myconf} --enable-gnome_ui=yes"
+		myconf="${myconf} --enable-platform-gnome-2"
+	else
+		einfo "Building without Gnome gui"
+		myconf="${myconf} --enable-gnome_ui=no"
+	fi
+
+	use doc \
+		&& myconf="${myconf} --enable-gtk-doc" \
+		|| myconf="${myconf} --disable-gtk-doc"
+
+	econf \
+		`use_enable alsa` \
+		`use_enable nls` \
+		`use_enable ipv6` \
+		${myconf} || die
+	emake || die
+}
+
+src_install () {
+	dodoc ABOUT-NLS COPYING README AUTHORS BUGS INSTALL NEWS ChangeLog TODO
+	einstall PIXDESTDIR=${D} || die
+}
diff --git a/net-im/linphone/linphone-0.9.0-r1.ebuild b/net-im/linphone/linphone-0.9.0-r1.ebuild
deleted file mode 100644
index e062f6504096..000000000000
--- a/net-im/linphone/linphone-0.9.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/linphone/linphone-0.9.0-r1.ebuild,v 1.5 2003/12/31 04:21:04 bazik Exp $
-
-IUSE="doc gtk nls xv alsa"
-
-DESCRIPTION="Linphone is a Web phone with a GNOME interface."
-HOMEPAGE="http://www.linphone.org/?lang=us"
-SRC_URI="http://www.linphone.org/download/${P}.tar.gz"
-
-SLOT="1"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-DEPEND="dev-libs/glib
-	=net-libs/libosip-0.8.8
-	=gnome-base/gnome-panel-1.4.1
-	x86? ( xv? ( dev-lang/nasm ) )
-	gtk? ( =x11-libs/gtk+-1.2* )
-	alsa? ( >media-libs/alsa-lib-0.5 )"
-
-src_compile() {
-
-	local myconf
-
-	if use gtk && use doc
-	then
-		myconf="--enable-gtk-doc"
-	else
-		myconf="${myconf} --disable-gtk-doc"
-	fi
-
-	econf \
-		`use_enable alsa` \
-		`use_enable nls` \
-		${myconf} || die
-	emake || die
-}
-
-src_install () {
-	dodoc ABOUT-NLS COPYING README AUTHORS BUGS INSTALL NEWS ChangeLog TODO
-	einstall PIXDESTDIR=${D} || die
-}