fix to allow to work with speex-1.2_beta3+ that doesn\'t have USE=wideband

Package-Manager: portage-2.1.3.19

4 files changed, 21 insertions, 17 deletions

diff --git a/net-im/twinkle/ChangeLog b/net-im/twinkle/ChangeLog
index 94444b6c8900..50ad3c1d2aac 100644
--- a/net-im/twinkle/ChangeLog
+++ b/net-im/twinkle/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/twinkle
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/ChangeLog,v 1.35 2007/09/14 12:05:55 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/ChangeLog,v 1.36 2007/12/24 09:59:13 dragonheart Exp $
+
+  24 Dec 2007; Daniel Black <dragonheart@gentoo.org>
+  twinkle-1.0.1-r1.ebuild, twinkle-1.1.ebuild:
+  fix to allow to work with speex-1.2_beta3+ that doesn\'t have USE=wideband
 
   14 Sep 2007; Daniel Black <dragonheart@gentoo.org>
   twinkle-1.0.1-r1.ebuild, twinkle-1.1.ebuild:
diff --git a/net-im/twinkle/Manifest b/net-im/twinkle/Manifest
index ba6fee0477ef..bbccd8d33b58 100644
--- a/net-im/twinkle/Manifest
+++ b/net-im/twinkle/Manifest
@@ -12,18 +12,18 @@ RMD160 788925b507d7fcfb8456bbef6dade0e9dae31c7e files/twinkle.desktop.patch 250
 SHA256 c384de5a69863d6dddbfc8f4376fb2e7ac6fa18acc3ba55676d02ef69f90f600 files/twinkle.desktop.patch 250
 DIST twinkle-1.0.1.tar.gz 1256457 RMD160 094aa44f014427ff919831e4fa02976736390a8d SHA1 d8894d803e2cc08e181cd71001a4f5e0fa9434ef SHA256 91beee47027d25c746acf92afd4cb3efbe906c005dbb929b496dd31b6b9d3b99
 DIST twinkle-1.1.tar.gz 1372495 RMD160 afd1f82a889b5313dc5b59fdf6fe8d190ff5d4ac SHA1 e2f0b1e7c0273b3197c5e4c21545d0500249240f SHA256 62df017d033670832beca97eca5eaf8ee6fe8dfe5d48ee137427745e2f09589f
-EBUILD twinkle-1.0.1-r1.ebuild 1753 RMD160 efeab6c891a0b5c1fc761e2bb47f440f8ab8dc2f SHA1 d63c27f3bfff3bf9b16b981f50349c11350d9ff3 SHA256 dbe1ca1827232d5cb83aa6e9ebd4a9151d05d26e946631cf310f305e5528d72f
-MD5 e71beb21b3bbf46ec7807c2859c58b4e twinkle-1.0.1-r1.ebuild 1753
-RMD160 efeab6c891a0b5c1fc761e2bb47f440f8ab8dc2f twinkle-1.0.1-r1.ebuild 1753
-SHA256 dbe1ca1827232d5cb83aa6e9ebd4a9151d05d26e946631cf310f305e5528d72f twinkle-1.0.1-r1.ebuild 1753
-EBUILD twinkle-1.1.ebuild 1715 RMD160 42dccc9534ebafd3f225caba2920fe85ac34ed53 SHA1 42ce639c355d1c4969a46822f2c974bb59ddf463 SHA256 5aaa0f53ceaa42020792b574b4469ebd7a526dc7ca2a2e15eda52d2c995973eb
-MD5 2e67b802b92c28bf31e3c627e57766b1 twinkle-1.1.ebuild 1715
-RMD160 42dccc9534ebafd3f225caba2920fe85ac34ed53 twinkle-1.1.ebuild 1715
-SHA256 5aaa0f53ceaa42020792b574b4469ebd7a526dc7ca2a2e15eda52d2c995973eb twinkle-1.1.ebuild 1715
-MISC ChangeLog 6644 RMD160 07473f8c01f20ce62de9f82ec3a9d3150ad80b26 SHA1 2dc1848486f9f59f2067911c9d31a4dfb6386280 SHA256 f6317b398e31ed5b6bc3e7f90b86b855c5f4383e6e8bc0711481c70e43a18487
-MD5 4843fecf32beca20040fc544d217ccb6 ChangeLog 6644
-RMD160 07473f8c01f20ce62de9f82ec3a9d3150ad80b26 ChangeLog 6644
-SHA256 f6317b398e31ed5b6bc3e7f90b86b855c5f4383e6e8bc0711481c70e43a18487 ChangeLog 6644
+EBUILD twinkle-1.0.1-r1.ebuild 1754 RMD160 2e0cd4e1e8a29409f819ab687d2e064f0e40a884 SHA1 2caefee357076dc4f35f3cff88d665b25abbe3ed SHA256 8bc8a5b9437f6612f3b76c8a631bb4e0fc8fb4f21dc6c101e14f1701595a896d
+MD5 702ac1b69cb5c75b3c72daec68849f16 twinkle-1.0.1-r1.ebuild 1754
+RMD160 2e0cd4e1e8a29409f819ab687d2e064f0e40a884 twinkle-1.0.1-r1.ebuild 1754
+SHA256 8bc8a5b9437f6612f3b76c8a631bb4e0fc8fb4f21dc6c101e14f1701595a896d twinkle-1.0.1-r1.ebuild 1754
+EBUILD twinkle-1.1.ebuild 1714 RMD160 a9fa0ff5d4663ea1a22c9b55d9885b44b6e00949 SHA1 9d6ae5bdad9c0b0076537703b2aef8208e0a7ed6 SHA256 80619f959bfb9f374aa1f001c0aabfe95341a666d37c3e946012e1d723275965
+MD5 2173558408755534109587eef5174c41 twinkle-1.1.ebuild 1714
+RMD160 a9fa0ff5d4663ea1a22c9b55d9885b44b6e00949 twinkle-1.1.ebuild 1714
+SHA256 80619f959bfb9f374aa1f001c0aabfe95341a666d37c3e946012e1d723275965 twinkle-1.1.ebuild 1714
+MISC ChangeLog 6822 RMD160 0b2f933adcde9624d7f4c33d6429c99f881a3041 SHA1 1f5d4e0e414e8c0752af60945c536ae5a8b4a910 SHA256 895982e42fdfe2def3dae75f8085c2eeb19ab3cbca3ee9adb7d1631bae08e30c
+MD5 8d1ce4848e6f39409bba5602dd97a976 ChangeLog 6822
+RMD160 0b2f933adcde9624d7f4c33d6429c99f881a3041 ChangeLog 6822
+SHA256 895982e42fdfe2def3dae75f8085c2eeb19ab3cbca3ee9adb7d1631bae08e30c ChangeLog 6822
 MISC metadata.xml 458 RMD160 51da9f8eb28d451a724fa7b687894976057263c1 SHA1 789cc96e32af0b71920e2df2c8ab7f45c1e9279d SHA256 9ee142b0e5854bae9e0365b52f6f0cf00a3b428c0c199ccce029108d03f42996
 MD5 81380b5fa13f903ff321873d95ed35bb metadata.xml 458
 RMD160 51da9f8eb28d451a724fa7b687894976057263c1 metadata.xml 458
diff --git a/net-im/twinkle/twinkle-1.0.1-r1.ebuild b/net-im/twinkle/twinkle-1.0.1-r1.ebuild
index b508516e7986..e42f94ccf815 100644
--- a/net-im/twinkle/twinkle-1.0.1-r1.ebuild
+++ b/net-im/twinkle/twinkle-1.0.1-r1.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-im/twinkle/twinkle-1.0.1-r1.ebuild,v 1.8 2007/09/14 17:37:30 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-1.0.1-r1.ebuild,v 1.9 2007/12/24 09:59:13 dragonheart Exp $
 
 ARTS_REQUIRED="never"
 inherit eutils qt3 kde
@@ -29,7 +29,7 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 pkg_setup() {
-	if use speex && has_version '>=media-libs/speex-1.2_beta2' &&
+	if use speex && has_version '~media-libs/speex-1.2_beta2' &&
 		! built_with_use 'media-libs/speex' 'wideband' ; then
 		eerror "You need to build media-libs/speex with USE=wideband enabled."
 		die "Speex w/o wideband-support detected."
diff --git a/net-im/twinkle/twinkle-1.1.ebuild b/net-im/twinkle/twinkle-1.1.ebuild
index 858728fe70c6..f327ab5a2864 100644
--- a/net-im/twinkle/twinkle-1.1.ebuild
+++ b/net-im/twinkle/twinkle-1.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-im/twinkle/twinkle-1.1.ebuild,v 1.2 2007/09/14 12:05:55 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-1.1.ebuild,v 1.3 2007/12/24 09:59:13 dragonheart Exp $
 
 ARTS_REQUIRED="never"
 inherit eutils qt3 kde
@@ -29,7 +29,7 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 pkg_setup() {
-	if use speex && has_version '>=media-libs/speex-1.2_beta2' &&
+	if use speex && has_version '~media-libs/speex-1.2_beta2' &&
 		! built_with_use 'media-libs/speex' 'wideband' ; then
 		eerror "You need to build media-libs/speex with USE=wideband enabled."
 		die "Speex w/o wideband-support detected."