Change USE=novideo to USE=video and force newer gsm as the older one installed broken libraries.

Package-Manager: portage-2.1.4

3 files changed, 24 insertions, 17 deletions

diff --git a/net-voip/linphone/ChangeLog b/net-voip/linphone/ChangeLog
index a1ab4eedfd88..25c58f7b882b 100644
--- a/net-voip/linphone/ChangeLog
+++ b/net-voip/linphone/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-voip/linphone
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.7 2008/01/16 02:24:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.8 2008/01/20 04:17:16 vapier Exp $
+
+  20 Jan 2008; Mike Frysinger <vapier@gentoo.org> linphone-2.0.1-r1.ebuild:
+  Change USE=novideo to USE=video and force newer gsm as the older one
+  installed broken libraries.
 
   16 Jan 2008; Mike Frysinger <vapier@gentoo.org>
   +files/linphone-2.0.1-speexdsp.patch, linphone-2.0.1-r1.ebuild:
diff --git a/net-voip/linphone/Manifest b/net-voip/linphone/Manifest
index fe5993371bd1..54884b8f9c21 100644
--- a/net-voip/linphone/Manifest
+++ b/net-voip/linphone/Manifest
@@ -31,18 +31,18 @@ EBUILD linphone-1.7.1.ebuild 2079 RMD160 1468451776de6dfd69b1efefe413a9be558ac51
 MD5 cc6ef2e51a0a52f971c5998a0d5d0571 linphone-1.7.1.ebuild 2079
 RMD160 1468451776de6dfd69b1efefe413a9be558ac51d linphone-1.7.1.ebuild 2079
 SHA256 92009903c30c552aa1ac3d81dd3d5a1336a61cf9bb6c6e58ac586952b41f863f linphone-1.7.1.ebuild 2079
-EBUILD linphone-2.0.1-r1.ebuild 2847 RMD160 01c34573d61a22bb6c4461e5fccfdf1b172053d4 SHA1 bd2c3f17450462470f87ed4c879bba46e388ecd1 SHA256 0b043a18cfe8cbdd9f19c8229be881c56e83ed5148792b1d79d3cbe87b9922ee
-MD5 072f1aa7007d2d55f0426165c7149b43 linphone-2.0.1-r1.ebuild 2847
-RMD160 01c34573d61a22bb6c4461e5fccfdf1b172053d4 linphone-2.0.1-r1.ebuild 2847
-SHA256 0b043a18cfe8cbdd9f19c8229be881c56e83ed5148792b1d79d3cbe87b9922ee linphone-2.0.1-r1.ebuild 2847
+EBUILD linphone-2.0.1-r1.ebuild 3060 RMD160 2bee2a0b1efba852d809ae22d9be5d405c21e613 SHA1 8ddfce969c7e64b01cdda73af18eb1cf49c6ea66 SHA256 562322c71c6f09b7788d11cb454309a4b94b4550d8a4c74175ee3b2f65057384
+MD5 670875fa8389dfa57ec7291099bba0b2 linphone-2.0.1-r1.ebuild 3060
+RMD160 2bee2a0b1efba852d809ae22d9be5d405c21e613 linphone-2.0.1-r1.ebuild 3060
+SHA256 562322c71c6f09b7788d11cb454309a4b94b4550d8a4c74175ee3b2f65057384 linphone-2.0.1-r1.ebuild 3060
 EBUILD linphone-2.0.1.ebuild 2629 RMD160 d3e8faa69a4555005064f9f32af4d1d01743fb68 SHA1 a3f11664fb0d776a9c77dd030b959bddf082cbc8 SHA256 ad68e2b918c7a7ede1ca029da667dce1b2756b511bceeac9d453efc21b9dc6cf
 MD5 c1395e756c6e2ba7ce176a1544ba585e linphone-2.0.1.ebuild 2629
 RMD160 d3e8faa69a4555005064f9f32af4d1d01743fb68 linphone-2.0.1.ebuild 2629
 SHA256 ad68e2b918c7a7ede1ca029da667dce1b2756b511bceeac9d453efc21b9dc6cf linphone-2.0.1.ebuild 2629
-MISC ChangeLog 7480 RMD160 c31f01630d5bd843fcf09995405272878e426dcb SHA1 ebf3061473bcd20b5c4726ecd73fd3decab33c6a SHA256 4a5974c1486376649f145e62aacedb6c6af66dcfab29415e8b333f5eb5c34f38
-MD5 c94e2b0bd2ade9eb8e59014c3c701fd2 ChangeLog 7480
-RMD160 c31f01630d5bd843fcf09995405272878e426dcb ChangeLog 7480
-SHA256 4a5974c1486376649f145e62aacedb6c6af66dcfab29415e8b333f5eb5c34f38 ChangeLog 7480
+MISC ChangeLog 7658 RMD160 8626f2bf3a96175a78361cd71bce28433c4fee09 SHA1 3ab5b20e0ac44063ba36834320a1499eb6fc52da SHA256 58b30e6cb040d8c3e4503decbd428e64e2f0d1c331179fb6bc2c5e14303ff24b
+MD5 394a3180542c363b181e2e2fc47e4e99 ChangeLog 7658
+RMD160 8626f2bf3a96175a78361cd71bce28433c4fee09 ChangeLog 7658
+SHA256 58b30e6cb040d8c3e4503decbd428e64e2f0d1c331179fb6bc2c5e14303ff24b ChangeLog 7658
 MISC metadata.xml 312 RMD160 e3c2d66f793654c3d1ab1b70aa2b3b87731c04e7 SHA1 17015753e1e8e33227e3bf6260fff1a6447d32a0 SHA256 008abe484ed1f0a62e625789a99281919f3c933a222bbecef1bf9652728e6d38
 MD5 4147a43d9c89e23a84621861984e010e metadata.xml 312
 RMD160 e3c2d66f793654c3d1ab1b70aa2b3b87731c04e7 metadata.xml 312
@@ -62,7 +62,7 @@ SHA256 0188b5b395f8a9f060e085021891a3d5f98850ed47c567a1a2f8f1edbd8a5ac7 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHjWr2j9hvisErhMIRAgdlAKDAR1EzeQsO2Hi8vX+8YxzfflOoagCghKGq
-UYjqpkmZhf2ZeVe4zze7xdw=
-=9ykl
+iD8DBQFHkssmj9hvisErhMIRAgQeAJwKjVpHGht/ATY/vpIrAu3kwb4LiACfdh7b
+aGC+rdHdQSQekpGwTvQC9QE=
+=srHn
 -----END PGP SIGNATURE-----
diff --git a/net-voip/linphone/linphone-2.0.1-r1.ebuild b/net-voip/linphone/linphone-2.0.1-r1.ebuild
index ee2c57199e81..2f749f0ae1f1 100644
--- a/net-voip/linphone/linphone-2.0.1-r1.ebuild
+++ b/net-voip/linphone/linphone-2.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/linphone-2.0.1-r1.ebuild,v 1.2 2008/01/16 02:24:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/linphone-2.0.1-r1.ebuild,v 1.3 2008/01/20 04:17:16 vapier Exp $
 
 # Note: video support in linphone relies on swscaler being disabled
 #       in ffmpeg.  this is because the video code in linphone is old
@@ -16,7 +16,10 @@ SRC_URI="http://download.savannah.nongnu.org/releases/${PN}/stable/sources/${P}.
 LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alsa arts console gsm gtk ilbc ipv6 novideo xv"
+IUSE="alsa arts console gsm gtk ilbc ipv6 video xv"
+# XXX: Should "video" be split into ffmpeg/libsdl ?  They are two distinct
+#      things: libsdl is just for video display while ffmpeg is just for
+#      video capture ... but does anyone actually want a one-way linphone ?
 
 RDEPEND="dev-libs/glib
 	dev-perl/XML-Parser
@@ -24,7 +27,7 @@ RDEPEND="dev-libs/glib
 	>=net-libs/libosip-3.0.3
 	>=net-libs/libeXosip-3.0.3
 	>=media-libs/speex-1.1.12
-	gsm? ( >=media-sound/gsm-1.0.12 )
+	gsm? ( >=media-sound/gsm-1.0.12-r1 )
 	x86? ( xv? ( dev-lang/nasm ) )
 	gtk? (
 		>=x11-libs/gtk+-2
@@ -33,7 +36,7 @@ RDEPEND="dev-libs/glib
 	alsa? ( media-libs/alsa-lib )
 	arts? ( kde-base/arts )
 	ilbc? ( dev-libs/ilbc-rfc3951 )
-	!novideo? (
+	video? (
 		>=media-libs/libsdl-1.2.9
 		media-video/ffmpeg
 		>=media-libs/libtheora-1.0_alpha7
@@ -67,7 +70,7 @@ src_compile() {
 		$(use_enable alsa) \
 		$(use_enable arts artsc) \
 		$(use_enable gsm) \
-		$(use_enable !novideo video) \
+		$(use_enable video) \
 		--disable-portaudio \
 		$(use_enable x86 truespeech) \
 		|| die "Unable to configure"