Version bump

(Portage version: 2.1.2-r5)

8 files changed, 107 insertions, 17 deletions

diff --git a/net-misc/linphone/ChangeLog b/net-misc/linphone/ChangeLog
index f4b96cd2877b..5f2ed806e4f6 100644
--- a/net-misc/linphone/ChangeLog
+++ b/net-misc/linphone/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/linphone
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/linphone/ChangeLog,v 1.20 2007/01/18 08:07:03 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/linphone/ChangeLog,v 1.21 2007/01/30 15:12:44 drizzt Exp $
+
+*linphone-1.6.0 (30 Jan 2007)
+
+  30 Jan 2007; Timothy Redaelli <drizzt@gentoo.org> metadata.xml,
+  linphone-1.1.0.ebuild, linphone-1.3.5.ebuild, linphone-1.5.1.ebuild,
+  +linphone-1.6.0.ebuild:
+  Version bump
 
   18 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
   linphone-1.3.5.ebuild:
diff --git a/net-misc/linphone/files/digest-linphone-1.1.0 b/net-misc/linphone/files/digest-linphone-1.1.0
index d5bee96a7149..dcabd221b4cd 100644
--- a/net-misc/linphone/files/digest-linphone-1.1.0
+++ b/net-misc/linphone/files/digest-linphone-1.1.0
@@ -1 +1,3 @@
 MD5 9f164b41c76ef1caca164909dea199a1 linphone-1.1.0.tar.gz 7334577
+RMD160 0bbadf7aed244aadae48e1880108d8f01144ca56 linphone-1.1.0.tar.gz 7334577
+SHA256 2bd35760ec2e7b9ac8e501ca16ccaacdb96f5e753477fa7b35842336a8597984 linphone-1.1.0.tar.gz 7334577
diff --git a/net-misc/linphone/files/digest-linphone-1.6.0 b/net-misc/linphone/files/digest-linphone-1.6.0
new file mode 100644
index 000000000000..dac887590160
--- /dev/null
+++ b/net-misc/linphone/files/digest-linphone-1.6.0
@@ -0,0 +1,3 @@
+MD5 fb345125e23c787df0818ff7caad5515 linphone-1.6.0.tar.gz 7720841
+RMD160 52a98387177da018c35b38fcb24e3f126b8dfb2e linphone-1.6.0.tar.gz 7720841
+SHA256 ba1c32207fd62d374c9397a81fb1247da93edb859e30d0d855dc65e5457f690b linphone-1.6.0.tar.gz 7720841
diff --git a/net-misc/linphone/linphone-1.1.0.ebuild b/net-misc/linphone/linphone-1.1.0.ebuild
index b84fc7feb012..8442f0b0b180 100644
--- a/net-misc/linphone/linphone-1.1.0.ebuild
+++ b/net-misc/linphone/linphone-1.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/linphone/linphone-1.1.0.ebuild,v 1.5 2006/07/07 06:49:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/linphone/linphone-1.1.0.ebuild,v 1.6 2007/01/30 15:12:44 drizzt Exp $
 
 inherit eutils
 
@@ -21,8 +21,8 @@ DEPEND="dev-libs/glib
 	>=media-libs/speex-1.1.6
 	x86? 	( xv? ( dev-lang/nasm ) )
 	gnome? 	( >=gnome-base/libgnome-2
-		  >=gnome-base/libgnomeui-2
-		  >=x11-libs/gtk+-2 )
+		>=gnome-base/libgnomeui-2
+		>=x11-libs/gtk+-2 )
 	alsa? 	( media-libs/alsa-lib )"
 
 src_unpack() {
diff --git a/net-misc/linphone/linphone-1.3.5.ebuild b/net-misc/linphone/linphone-1.3.5.ebuild
index a1b989d7b6c5..bdf49dba7664 100644
--- a/net-misc/linphone/linphone-1.3.5.ebuild
+++ b/net-misc/linphone/linphone-1.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/linphone/linphone-1.3.5.ebuild,v 1.11 2007/01/18 08:07:03 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/linphone/linphone-1.3.5.ebuild,v 1.12 2007/01/30 15:12:44 drizzt Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=latest
@@ -27,9 +27,9 @@ RDEPEND="dev-libs/glib
 	>=media-libs/speex-1.1.12
 	x86? ( xv? ( dev-lang/nasm ) )
 	gnome? ( >=gnome-base/gnome-panel-2
-		  >=gnome-base/libgnome-2
-		  >=gnome-base/libgnomeui-2
-		  >=x11-libs/gtk+-2 )
+		>=gnome-base/libgnome-2
+		>=gnome-base/libgnomeui-2
+		>=x11-libs/gtk+-2 )
 	alsa? ( media-libs/alsa-lib )
 	ilbc? ( dev-libs/ilbc-rfc3951 )"
 
diff --git a/net-misc/linphone/linphone-1.5.1.ebuild b/net-misc/linphone/linphone-1.5.1.ebuild
index 80db3ddc2462..3c2ee8809ad7 100644
--- a/net-misc/linphone/linphone-1.5.1.ebuild
+++ b/net-misc/linphone/linphone-1.5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/linphone/linphone-1.5.1.ebuild,v 1.2 2006/11/26 16:36:18 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/linphone/linphone-1.5.1.ebuild,v 1.3 2007/01/30 15:12:44 drizzt Exp $
 
 MY_DPV="${PV%.*}.x"
 
@@ -25,9 +25,9 @@ RDEPEND="dev-libs/glib
 	>=media-libs/speex-1.1.6
 	x86? ( xv? ( dev-lang/nasm ) )
 	gnome? ( >=gnome-base/gnome-panel-2
-		  >=gnome-base/libgnome-2
-		  >=gnome-base/libgnomeui-2
-		  >=x11-libs/gtk+-2 )
+		>=gnome-base/libgnome-2
+		>=gnome-base/libgnomeui-2
+		>=x11-libs/gtk+-2 )
 	alsa? ( media-libs/alsa-lib )
 	ilbc? ( dev-libs/ilbc-rfc3951 )
 	!novideo? ( >=media-libs/libsdl-1.2.9
diff --git a/net-misc/linphone/linphone-1.6.0.ebuild b/net-misc/linphone/linphone-1.6.0.ebuild
new file mode 100644
index 000000000000..350bf343c147
--- /dev/null
+++ b/net-misc/linphone/linphone-1.6.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/linphone/linphone-1.6.0.ebuild,v 1.1 2007/01/30 15:12:44 drizzt Exp $
+
+MY_DPV="${PV%.*}.x"
+
+WANT_AUTOCONF="2.5"
+WANT_AUTOMAKE="1.9"
+
+inherit eutils autotools
+
+DESCRIPTION="Linphone is a SIP phone with a GNOME interface."
+HOMEPAGE="http://www.linphone.org"
+SRC_URI="http://download.savannah.nongnu.org/releases/${PN}/${MY_DPV}/sources/${P}.tar.gz"
+SLOT=1
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="alsa gnome ilbc ipv6 novideo xv"
+
+RDEPEND="dev-libs/glib
+	dev-perl/XML-Parser
+	net-dns/bind-tools
+	>=net-libs/libosip-2.2.0
+	>=media-libs/speex-1.1.6
+	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 )
+	ilbc? ( dev-libs/ilbc-rfc3951 )
+	!novideo? ( >=media-libs/libsdl-1.2.9
+		media-video/ffmpeg
+		>=media-libs/libtheora-1.0_alpha7 )"
+#	portaudio? ( >=media-libs/portaudio-19_pre )"
+
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-1.5.1-pkgconfig.patch
+	./autogen.sh
+}
+
+src_compile() {
+	local withgnome myconf=""
+
+	use gnome && withgnome="yes" || withgnome="no"
+	use x86 && myconf="--enable-truespeech"
+
+	econf \
+		--libdir=/usr/$(get_libdir)/linphone \
+		--enable-gnome_ui=${withgnome} \
+		$(use_with ilbc) \
+		$(use_enable ipv6) \
+		$(use_enable alsa) \
+		$(use_enable !novideo video) \
+		--disable-portaudio \
+		${myconf} || die "Unable to configure"
+
+	emake || die "Unable to make"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "Failed to install"
+
+	dodoc ABOUT-NLS AUTHORS BUGS ChangeLog COPYING INSTALL NEWS README
+	dodoc README.arm TODO
+
+	# don't install ortp includes, docs and pkgconfig files
+	# to avoid conflicts with net-libs/ortp
+	rm -rf "${D}"/usr/include/ortp
+	rm -rf "${D}"/usr/share/gtk-doc/html/ortp
+	rm -rf "${D}"/usr/$(get_libdir)/linphone/pkgconfig
+}
diff --git a/net-misc/linphone/metadata.xml b/net-misc/linphone/metadata.xml
index c1d12ddea706..e2b0481cb839 100644
--- a/net-misc/linphone/metadata.xml
+++ b/net-misc/linphone/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 <herd>voip</herd>
 <maintainer>
-  <email>stkn@gentoo.org</email>
-  <name>Stefan Knoblich</name>
-  <description>voip herd will be taking care of this</description>
+	<email>stkn@gentoo.org</email>
+	<name>Stefan Knoblich</name>
+	<description>voip herd will be taking care of this</description>
 </maintainer>
 </pkgmetadata>