linphone version bump, remove from package.mask

svn path=/trunk/; revision=624

5 files changed, 13 insertions, 95 deletions

diff --git a/net-voip/linphone/ChangeLog b/net-voip/linphone/ChangeLog
index 9f5e5f0..c7cc21b 100644
--- a/net-voip/linphone/ChangeLog
+++ b/net-voip/linphone/ChangeLog
@@ -275,6 +275,10 @@
 	  trunk/net-misc/zaptel/zaptel-1.2.0_beta1.ebuild:
 	  Initial import of private gentoo-voip repos
 
+  14 Dec 2007; Chi-Thanh Christopher Nguyen <chithanh@cs.tu-berlin.de>
+  -linphone-1.7.1.ebuild, -linphone-1.99.0.ebuild, +linphone-2.0.1.ebuild:
+  Version bump. Remove obsolete versions.
+
   18 Nov 2007; Chi-Thanh Christopher Nguyen <chithanh@cs.tu-berlin.de>
   +files/linphone-1.99.0-core-amd64.patch, +linphone-1.99.0.ebuild:
   Version bump
diff --git a/net-voip/linphone/Manifest b/net-voip/linphone/Manifest
index 1a189bf..df403b7 100644
--- a/net-voip/linphone/Manifest
+++ b/net-voip/linphone/Manifest
@@ -1,7 +1,5 @@
 AUX linphone-1.6.0-call.patch 344 RMD160 887c83861aec5e71914ebcca5c3bdff56e8ac513 SHA1 2a84da9c99154c68147c161f373a6b962ca2e7ce SHA256 7d1a5789adb3d2f02eaf0970acf567ae5901b2a61f84a94c2116e354a44aa822
 AUX linphone-1.99.0-core-amd64.patch 647 RMD160 be7ad209c0f9c8432d60f55d0c271f72a4923da6 SHA1 f286ac3f95e5b6305b15c9a00c66f7a8843f93e8 SHA256 4b95455a0ffda2ea5d87eeadae64a227d644eb8e0c5433690d8a5e5d24765523
-DIST linphone-1.7.1.tar.gz 7537415 RMD160 da5959e3b79c0eeb48b72481b1390e98e7cdadfd SHA1 3134e38b00d82155219f88e38e5ff9199fea1976 SHA256 3a3c606e2313f9871f07e41dfbeb87f6edb404f7927f7737fc22ab1a59a59e48
-DIST linphone-1.99.0.tar.gz 7632438 RMD160 ea6f76c3358071c3d1df55a43c7ab33187ba3c18 SHA1 9e9ca1fe2265b0506b83981a403255e5513f5cdb SHA256 ac42725b6ff74c26f8999d9ba900396d619e34b7e23341ca7484ebf73190fd00
-EBUILD linphone-1.7.1.ebuild 2114 RMD160 09904621657aee3b373394ab3fbb40757438faae SHA1 e7c2f165f3d6b94e172d04f48dcc90ee2ee5a7cf SHA256 55823bd27c43a9198ffdadc8bae402efe663dea357e441c199545fb42372b0b8
-EBUILD linphone-1.99.0.ebuild 2408 RMD160 af5159d1cecbff863a36e05347d3654f3e4e2c38 SHA1 d660b5448089ee3978a859f60f5f1a7ee05f32ac SHA256 a2a42551544325d41b3e07bb3aa047e2d045a7b0afb31513fb95392ed725678d
-MISC ChangeLog 14972 RMD160 ed6e5be59688e85b88ce72cd19b3cdd57379a97e SHA1 6022cdfeff13ece2962a8a1c09f7c413d211bfe1 SHA256 faa77ba9b11972ca56c1aa955e194576a697e477f0f72dd26f762eda2deb1315
+DIST linphone-2.0.1.tar.gz 7638627 RMD160 89c120e5118c931daf9f58d1d988185a28bbcf05 SHA1 a8020c4643e7ca05aefe83e9c25e3ac8c3661574 SHA256 33f9e17eba38c55c6b2260e02c98db642dd47d3c38677478a05caa0ae702d16f
+EBUILD linphone-2.0.1.ebuild 2456 RMD160 9660a6975254e6365cc9915d22f12aae6c205534 SHA1 e6b3264a08d1d6b1d18168b1d71a411387abd9c8 SHA256 127fec19c3cee716a05fb0547dfba7feb8e0e1381ddcd1ba55cbe34960ff8889
+MISC ChangeLog 15161 RMD160 6f87d47144c93279b481c8253941a6c6e0acd736 SHA1 ae1ba8a1ec4c3cd1842c624344a38541c3f83c8b SHA256 15e196e244df87c3ab5aa8c18c973f16d9bbb2d2d4959b402765093f157da8e8
diff --git a/net-voip/linphone/linphone-1.7.1.ebuild b/net-voip/linphone/linphone-1.7.1.ebuild
deleted file mode 100644
index 91098ac..0000000
--- a/net-voip/linphone/linphone-1.7.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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.9 2006/07/01 11:08:57 pylon Exp $
-
-WANT_AUTOCONF="2.5"
-WANT_AUTOMAKE="1.9"
-
-inherit eutils autotools
-
-MY_DPV="${PV%.*}.x"
-
-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 console gtk ilbc ipv6 novideo portaudio xv"
-
-RDEPEND="dev-libs/glib
-	dev-perl/XML-Parser
-	net-dns/bind-tools
-	>=net-libs/libosip-2.2.0
-	>=media-libs/speex-1.1.12
-	x86? ( xv? ( dev-lang/nasm ) )
-	gtk? ( >=x11-libs/gtk+-2
-		gnome-base/libglade )
-	alsa? ( media-libs/alsa-lib )
-	ilbc? ( dev-libs/ilbc-rfc3951 )
-	!novideo? ( >=media-libs/libsdl-1.2.9
-		media-video/ffmpeg
-		media-libs/libtheora )
-	portaudio? ( >=media-libs/portaudio-19_pre )"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/linphone-1.6.0-call.patch
-	sed -i -e "s:wall_werror=yes:wall_werror=no:" mediastreamer2/config*
-
-	./autogen.sh
-}
-
-src_compile() {
-	local withconsole withgtk myconf
-
-	use console && withconsole="yes" || withconsole="no"
-	use gtk && withgtk="yes" || withgtk="no"
-	use x86 && myconf="--enable-truespeech"
-
-	econf \
-		--libdir=/usr/$(get_libdir)/linphone \
-		--enable-console_ui=${withconsole} \
-		--enable-gtk_ui=${withgtk} \
-		$(use_with ilbc) \
-		$(use_enable ipv6) \
-		$(use_enable alsa) \
-		$(use_enable !novideo video) \
-		$(use_enable 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
-	rm -rf ${D}/ortp
-}
diff --git a/net-voip/linphone/linphone-1.99.0.ebuild b/net-voip/linphone/linphone-2.0.1.ebuild
index 2ee235d..4d7c176 100644
--- a/net-voip/linphone/linphone-1.99.0.ebuild
+++ b/net-voip/linphone/linphone-2.0.1.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-voip/linphone/linphone-1.7.1-r1.ebuild,v 1.1 2007/08/20 20:22:42 vapier Exp $
+# $Header: $
 
 # Note: video support in linphone relies on swscaler being disabled
 #       in ffmpeg.  this is because the video code in linphone is old
@@ -11,7 +11,7 @@ inherit eutils
 
 DESCRIPTION="Voice Over IP phone (internet phone which uses SIP)"
 HOMEPAGE="http://www.linphone.org/"
-SRC_URI="http://download.savannah.nongnu.org/releases/${PN}/unstable/source/${P}.tar.gz"
+SRC_URI="http://download.savannah.nongnu.org/releases/${PN}/stable/sources/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
@@ -23,7 +23,8 @@ DEPEND="dev-libs/glib
 	net-dns/bind-tools
 	>=net-libs/libeXosip-3.0.3
 	>=media-libs/speex-1.1.12
-	>=media-sound/gsm-1.0.12
+	!amd64? ( >=media-sound/gsm-1.0.12 )
+	amd64? (  !<=media-sound/gsm-1.0.12 )
 	x86? ( xv? ( dev-lang/nasm ) )
 	gtk? (
 		>=x11-libs/gtk+-2
@@ -40,6 +41,7 @@ DEPEND="dev-libs/glib
 # use the bundled ortp until newer versions leave package.mask
 #	>=net-libs/ortp-0.9.0
 #	portaudio? ( >=media-libs/portaudio-19_pre )"
+# media-libs/gsm is an automagic dependency; fails on amd64 due to bug #192736
 
 src_unpack() {
 	unpack ${A}
@@ -63,6 +65,7 @@ src_compile() {
 		$(use_enable x86 truespeech) \
 		|| die "Unable to configure"
 		#--enable-external-ortp \
+		#$(use_enable gsm) \
 		#$(use_enable portaudio)
 	emake || die "Unable to make"
 }
diff --git a/profiles/package.mask b/profiles/package.mask
index 2918961..863a519 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -14,13 +14,6 @@ app-crypt/qca-openssl
 app-crypt/qca-gnupg
 app-crypt/qca-pkcs11
 
-#breaks linphone-1.7
->=net-libs/libosip-3
->=net-libs/libeXosip-3
-
-#requires libeXosip-3
->=net-libs/linphone-1.99
-
 # Santiago M. Mola <coldwind@gentoo.org> (05 Jun 2007)
 # Live ebuilds.
 =dev-dotnet/tapioca-sharp-9999