Dependancy change of speex to speex? (media-libs/speex !=media-libs/speex-1.1.4)...

diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog
index f3c13033fbbb2f9ad0e6959c40b3c73b73f2f114..b31647ec64e967c901d675e8fdeee84c8b9d00b4 100644 (file)
--- a/net-libs/wvstreams/ChangeLog
+++ b/net-libs/wvstreams/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/wvstreams
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.22 2004/11/02 01:21:31 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.23 2004/11/02 09:07:22 dragonheart Exp $
+
+  02 Nov 2004; Daniel Black <dragonheart@gentoo.org> wvstreams-3.75.ebuild:
+  Dependancy change of speex to speex? (media-libs/speex
+  !=media-libs/speex-1.1.4) as per bug #69743 . Thanks to Tony Murray
+  <tonymurray@fastmail.fm> for the report and solution
 
   02 Nov 2004; Karol Wojtaszek,,, <sekretarz@gentoo.org>
   wvstreams-3.75.ebuild:

diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index 2c637e24cdd58cf0ba6fb257cedead7e8e852b18..298f3e57f0ea5c03355d9c730aa1a79215335a89 100644 (file)
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -1,16 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 15dbfb8249d439c9560fa0d2f42d6d4c ChangeLog 3603
 MD5 84906df12ff06c74e269a55f292f09ac wvstreams-3.70-r2.ebuild 869
-MD5 02c8ac5dea0b523e597021afc2ad534d wvstreams-3.75.ebuild 1767
 MD5 d991640e2ff373e482b3c3478282fef1 wvstreams-3.74.ebuild 1392
-MD5 e65bcd472f7fabe4f1a580d0ae1d864a ChangeLog 3342
+MD5 76eee65ed9ee7babf51f46e167d82bc1 wvstreams-3.75.ebuild 1736
 MD5 dab468062cf36e0e81e72fb2a59299e0 files/3.70-gcc3.patch 3171
 MD5 5d649f23e7b31fb9224bace4c35bcf3e files/3.70-openssl.patch 470
+MD5 f2058097f693e07dadf248b1a3319db3 files/digest-wvstreams-3.70-r2 66
+MD5 b8b38bbbccf83a9024a243149fd9b7d1 files/wvstreams-3.70-gentoo.patch 1174
 MD5 0ee90e98345afff96aaf89dbda1910fc files/digest-wvstreams-3.74 68
-MD5 9f5fc56a6f1636fa2b6673a16888c0ea files/digest-wvstreams-3.75 68
-MD5 c48022170e1e20f8222af4b4711373eb files/wvstreams-3.75-makefile.patch 363
 MD5 185e2acbb79c70873208936653ff2407 files/wvstreams-3.74-fPIC.patch 431
-MD5 e088c237ee63897e074e0f92e66fc250 files/wvstreams-3.75-fPIC.patch 1522
 MD5 c48022170e1e20f8222af4b4711373eb files/wvstreams-3.74-makefile.patch 363
-MD5 f2058097f693e07dadf248b1a3319db3 files/digest-wvstreams-3.70-r2 66
-MD5 b8b38bbbccf83a9024a243149fd9b7d1 files/wvstreams-3.70-gentoo.patch 1174
+MD5 9f5fc56a6f1636fa2b6673a16888c0ea files/digest-wvstreams-3.75 68
+MD5 e088c237ee63897e074e0f92e66fc250 files/wvstreams-3.75-fPIC.patch 1522
+MD5 c48022170e1e20f8222af4b4711373eb files/wvstreams-3.75-makefile.patch 363
 MD5 7a2a3fb9116991ebccad327a9ad0fd87 files/wvstreams-3.75-tcl_8_4.patch 945
 MD5 e4f46fcdd724dc1c316aefe9e0228dac files/wvstreams-3.75-gcc34.patch 3573
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBh05RmdTrptrqvGERAtBaAJ9r62VIp4G4oGwNk9PbmiMdT6xkNgCeMoZg
+r4jLRpmFHii7mIVGBq26zPE=
+=RjxV
+-----END PGP SIGNATURE-----

diff --git a/net-libs/wvstreams/wvstreams-3.75.ebuild b/net-libs/wvstreams/wvstreams-3.75.ebuild
index 93bf2fa57d409b6d43939bf1840a8fa71f2e2af6..18d32fa221f17fac4d70384e4dfa0441954b46bb 100644 (file)
--- a/net-libs/wvstreams/wvstreams-3.75.ebuild
+++ b/net-libs/wvstreams/wvstreams-3.75.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-3.75.ebuild,v 1.10 2004/11/02 01:21:31 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-3.75.ebuild,v 1.11 2004/11/02 09:07:22 dragonheart Exp $
 
 inherit eutils
 
@@ -16,9 +16,8 @@ IUSE="gtk qt oggvorbis speex fam gdbm pam fftw tcltk"
 RDEPEND="gtk? ( >=x11-libs/gtk+-2.2.0 )
        qt? ( >=x11-libs/qt-3.0.5 )
        oggvorbis? ( >=media-libs/libogg-1.0
-               >=media-libs/libvorbis-1.0
-               speex? ( <=media-libs/speex-1.0 ) )
-       !oggvorbis? ( speex? ( >=media-libs/speex-1.0 ) )
+               >=media-libs/libvorbis-1.0 )
+       speex? ( media-libs/speex !=media-libs/speex-1.1.4 )
        fam? ( >=app-admin/fam-2.7.0 )
        >=sys-libs/db-3
        gdbm? ( >=sys-libs/gdbm-1.8.0 )