removed optional dep that isn't in portage anymore

Package-Manager: portage-2.1.1_pre2-r2

3 files changed, 26 insertions, 13 deletions

diff --git a/net-misc/linphone/ChangeLog b/net-misc/linphone/ChangeLog
index 766b93b362d5..12856deb0e47 100644
--- a/net-misc/linphone/ChangeLog
+++ b/net-misc/linphone/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/linphone
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/linphone/ChangeLog,v 1.15 2006/07/01 11:08:57 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/linphone/ChangeLog,v 1.16 2006/07/07 06:49:53 mr_bones_ Exp $
+
+  07 Jul 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  linphone-1.1.0.ebuild:
+  removed optional dep that isn't in portage anymore
 
   01 Jul 2006; Lars Weiler <pylon@gentoo.org> linphone-1.3.5.ebuild:
   Added ~ppc; bug #132672.
diff --git a/net-misc/linphone/Manifest b/net-misc/linphone/Manifest
index 200ea5eee5a9..dc011a597d6d 100644
--- a/net-misc/linphone/Manifest
+++ b/net-misc/linphone/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ilbc-1.2.0-makefile.diff 642 RMD160 0fc90f5a48224edda2467faa7f64665ebdba7836 SHA1 e035e6aef2dd6883adb2d62c091074c04ba3e6a6 SHA256 3c94d6a98da228939feb7eb5707ba5bc9efb34e99ad68293d853d272d6743ab9
 MD5 9b4371485a3d0c4eb6c6090125745603 files/ilbc-1.2.0-makefile.diff 642
 RMD160 0fc90f5a48224edda2467faa7f64665ebdba7836 files/ilbc-1.2.0-makefile.diff 642
@@ -9,18 +12,18 @@ SHA256 a50c156aaa331beb1c1bfe300ada81d18ee1532018d4fd33482ad6853878ae38 files/li
 DIST linphone-1.1.0.tar.gz 7334577
 DIST linphone-1.3.5.tar.gz 7411961 RMD160 51376621dd9f0b9e8ea1a30aa175680c7b94989d SHA1 d705efb0c840890c154f2bdca7f8a5cd5a15bba1 SHA256 b1036fde820c928b877a7065a8e396a7aaf262df125da96c6f6b56f02097a1f3
 DIST linphone-plugin-ilbc-1.2.0.tar.gz 334855 RMD160 0bf4ac7552544cf33126e80ac37e6cfd996ddc3e SHA1 e2d413173106f9585d7506f66c52c01e33909578 SHA256 33240cce2cb2cd5e46bb6efa332a8687c1ab998432d9c07deeba0866966e22b1
-EBUILD linphone-1.1.0.ebuild 1667 RMD160 f54fb1ef90b17c7f71a612e8e353ea5b99dd95a7 SHA1 60d96639705bdf33e53b733e87a1eafba3766d04 SHA256 129f41fd76d92f9768c65cf298b3fe9ed84d8445b2fc85f66a620b35eb43ba1b
-MD5 810e47a5b7316d318b884037eb874345 linphone-1.1.0.ebuild 1667
-RMD160 f54fb1ef90b17c7f71a612e8e353ea5b99dd95a7 linphone-1.1.0.ebuild 1667
-SHA256 129f41fd76d92f9768c65cf298b3fe9ed84d8445b2fc85f66a620b35eb43ba1b linphone-1.1.0.ebuild 1667
+EBUILD linphone-1.1.0.ebuild 1635 RMD160 2f8a956ce306f8b67a72989543cc99d9ce6f3b4f SHA1 9d769f4398fc54889db766071db90202c738b7d8 SHA256 c628d3a721127f39124a7e2ae94be430f971b8a9a8952ce71154ad355186ad9f
+MD5 46553f90e00cb1cef654ccc40a80f60f linphone-1.1.0.ebuild 1635
+RMD160 2f8a956ce306f8b67a72989543cc99d9ce6f3b4f linphone-1.1.0.ebuild 1635
+SHA256 c628d3a721127f39124a7e2ae94be430f971b8a9a8952ce71154ad355186ad9f linphone-1.1.0.ebuild 1635
 EBUILD linphone-1.3.5.ebuild 2558 RMD160 ea0966fd0d91c079e189fe7e5ff4cf58542dbce7 SHA1 eccd131e104ad59f95a976c997e7e29e408db4da SHA256 367b5d9dbbf19d8a4ed93887f67605bec3c696a3b53ec50001803a95025ceacf
 MD5 632a9f25c0ea028effba95b892e5c950 linphone-1.3.5.ebuild 2558
 RMD160 ea0966fd0d91c079e189fe7e5ff4cf58542dbce7 linphone-1.3.5.ebuild 2558
 SHA256 367b5d9dbbf19d8a4ed93887f67605bec3c696a3b53ec50001803a95025ceacf linphone-1.3.5.ebuild 2558
-MISC ChangeLog 4790 RMD160 26e0417d4b02564f5cdcc414a4dd8f838cae0675 SHA1 aef257dea6433e4f91861f693699af5d4250e692 SHA256 d1b04fffa413fd483cfcd20b8d14dddfab1e6addd58e38e1f6c5b425174dc7d1
-MD5 d55ece6c952ebaaf37daa4fa762687d3 ChangeLog 4790
-RMD160 26e0417d4b02564f5cdcc414a4dd8f838cae0675 ChangeLog 4790
-SHA256 d1b04fffa413fd483cfcd20b8d14dddfab1e6addd58e38e1f6c5b425174dc7d1 ChangeLog 4790
+MISC ChangeLog 4928 RMD160 d4fe9fd94f220666cef534f11e07d659a29bf18c SHA1 682d3ef62337f21e3d9c9ea4d05b43a698dfc1b1 SHA256 c862b2cb7d805231710bb2c46feeb01a277a4e8e5efb8f44fc1b788d6bdff1f7
+MD5 5ad2322b2688e303ebdc9f43aaa5dc27 ChangeLog 4928
+RMD160 d4fe9fd94f220666cef534f11e07d659a29bf18c ChangeLog 4928
+SHA256 c862b2cb7d805231710bb2c46feeb01a277a4e8e5efb8f44fc1b788d6bdff1f7 ChangeLog 4928
 MISC metadata.xml 315 RMD160 5904ff296ee18dd6f9e9b3ab4794879fb14d94a6 SHA1 ebcb6e1b5a6023d682b7b0ae34b35b481b7de7d0 SHA256 776755752503a4051438c6c0c20c10ac7f0943898a1d476fa1d0477a1a50001e
 MD5 bf329e2b298c08082a3ff4dfe6c236b3 metadata.xml 315
 RMD160 5904ff296ee18dd6f9e9b3ab4794879fb14d94a6 metadata.xml 315
@@ -31,3 +34,10 @@ SHA256 8aaccb64c07578f6c2ea8b2aa28abb949e034ae9a65e3cdc9d58edcdb236d948 files/di
 MD5 14eeb10146aa603901b026dd41e06577 files/digest-linphone-1.3.5 527
 RMD160 b02cf309dcd1450b6c0b4142aeed29421950dffa files/digest-linphone-1.3.5 527
 SHA256 09ca241d72ecd62a45b030cf967a5e99dd7df67119ea0398102b6e3fc8bd926a files/digest-linphone-1.3.5 527
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFErgQd9AbAhSK0CiwRAl21AJ4mL34i5+LMFSgch4PtCTJNQ1QRGgCfdesG
+ZswWcFZEE6Da3p1kBMP/vzM=
+=GdBv
+-----END PGP SIGNATURE-----
diff --git a/net-misc/linphone/linphone-1.1.0.ebuild b/net-misc/linphone/linphone-1.1.0.ebuild
index c27537422e67..b84fc7feb012 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-2005 Gentoo Foundation
+# Copyright 1999-2006 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.4 2005/09/30 16:23:36 stkn Exp $
+# $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 $
 
 inherit eutils
 
@@ -18,8 +18,7 @@ IUSE="alsa gnome ipv6 xv"
 DEPEND="dev-libs/glib
 	dev-perl/XML-Parser
 	>=net-libs/libosip-2.2.0
-	|| ( >=media-libs/speex-1.1.6
-	     <media-libs/speex-1.1.0 )
+	>=media-libs/speex-1.1.6
 	x86? 	( xv? ( dev-lang/nasm ) )
 	gnome? 	( >=gnome-base/libgnome-2
 		  >=gnome-base/libgnomeui-2