speex-1.2* need USE=wideband as per bug #190634 and bug #191288. Thanks to David Watzke and William Zhou. Added alsa-lib dependency too as per bug #192191

Package-Manager: portage-2.1.2.12

4 files changed, 42 insertions, 17 deletions

diff --git a/net-im/twinkle/ChangeLog b/net-im/twinkle/ChangeLog
index 78c1dbe71825..94444b6c8900 100644
--- a/net-im/twinkle/ChangeLog
+++ b/net-im/twinkle/ChangeLog
@@ -1,6 +1,12 @@
 # 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.34 2007/08/15 23:51:34 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/ChangeLog,v 1.35 2007/09/14 12:05:55 dragonheart Exp $
+
+  14 Sep 2007; Daniel Black <dragonheart@gentoo.org>
+  twinkle-1.0.1-r1.ebuild, twinkle-1.1.ebuild:
+  speex-1.2* need USE=wideband as per bug #190634 and bug #191288. Thanks to
+  David Watzke and William Zhou. Added alsa-lib dependency too as per bug
+  #192191
 
   15 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   twinkle-1.0.1-r1.ebuild:
diff --git a/net-im/twinkle/Manifest b/net-im/twinkle/Manifest
index 05d7650362be..f2bf3627a692 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 1475 RMD160 9bea1518664fd0cd27ca6d5223f5830a1761036b SHA1 b820c62a5b929b61c9d0f78b8e3e473b6dfc1785 SHA256 8595fdffc701aed3d488510249ea494cf71b94e32c30c194d9b872157def92f3
-MD5 163f97004c4c49223e19235ee453c335 twinkle-1.0.1-r1.ebuild 1475
-RMD160 9bea1518664fd0cd27ca6d5223f5830a1761036b twinkle-1.0.1-r1.ebuild 1475
-SHA256 8595fdffc701aed3d488510249ea494cf71b94e32c30c194d9b872157def92f3 twinkle-1.0.1-r1.ebuild 1475
-EBUILD twinkle-1.1.ebuild 1436 RMD160 ae725c3b48f49f84807e8ee4ddd337e6906d359f SHA1 12c310df282e2ffd536cfa47d94f573292b5bfe1 SHA256 c2978dd69e1a15b698ea36ad6fd362bbbaf2fc3194df5754c74c8bd0d5691903
-MD5 e3d1aa2d3735ed460cca7b1dd7c146d2 twinkle-1.1.ebuild 1436
-RMD160 ae725c3b48f49f84807e8ee4ddd337e6906d359f twinkle-1.1.ebuild 1436
-SHA256 c2978dd69e1a15b698ea36ad6fd362bbbaf2fc3194df5754c74c8bd0d5691903 twinkle-1.1.ebuild 1436
-MISC ChangeLog 6381 RMD160 00592e0a449be1d541a9769f46397ecf0e715b5a SHA1 191f54f1e2607ce8ef9bd4eb4a6e930c2be8d9eb SHA256 f552c6106b5e004f543945b533f882e98ac9bc9473b5e1feb7c64a390b4e1450
-MD5 32468d247654d90c8d711cfb264c3610 ChangeLog 6381
-RMD160 00592e0a449be1d541a9769f46397ecf0e715b5a ChangeLog 6381
-SHA256 f552c6106b5e004f543945b533f882e98ac9bc9473b5e1feb7c64a390b4e1450 ChangeLog 6381
+EBUILD twinkle-1.0.1-r1.ebuild 1756 RMD160 ad209c6551890f45a56d771f955d6db2ba463d39 SHA1 564f60d61b5540da4e1ac5670660e56689bfb260 SHA256 714bee8cd8649cc3d76af57a653f0d67ccae2603d455138a1270352cdec8f7c1
+MD5 967050aca6a35c49742a03bda5752b46 twinkle-1.0.1-r1.ebuild 1756
+RMD160 ad209c6551890f45a56d771f955d6db2ba463d39 twinkle-1.0.1-r1.ebuild 1756
+SHA256 714bee8cd8649cc3d76af57a653f0d67ccae2603d455138a1270352cdec8f7c1 twinkle-1.0.1-r1.ebuild 1756
+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
 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 61e0677cb522..958fc5bd1bfb 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.6 2007/08/15 23:51:34 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-1.0.1-r1.ebuild,v 1.7 2007/09/14 12:05:55 dragonheart Exp $
 
 ARTS_REQUIRED="never"
 inherit eutils qt3 kde
@@ -22,11 +22,21 @@ RDEPEND=">=net-libs/ccrtp-1.5.0
 	dev-libs/boost
 	speex? ( media-libs/speex )
 	ilbc? ( dev-libs/ilbc-rfc3951 )
-	zrtp? ( net-libs/libzrtpcpp )"
+	zrtp? ( net-libs/libzrtpcpp )
+	media-libs/alsa-lib"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+pkg_setup() {
+	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."
+	fi
+}
+
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
diff --git a/net-im/twinkle/twinkle-1.1.ebuild b/net-im/twinkle/twinkle-1.1.ebuild
index 870bd7a6afc9..858728fe70c6 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.1 2007/07/23 09:37:51 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-1.1.ebuild,v 1.2 2007/09/14 12:05:55 dragonheart Exp $
 
 ARTS_REQUIRED="never"
 inherit eutils qt3 kde
@@ -22,11 +22,20 @@ RDEPEND=">=net-libs/ccrtp-1.5.0
 	dev-libs/boost
 	speex? ( media-libs/speex )
 	ilbc? ( dev-libs/ilbc-rfc3951 )
-	zrtp? ( net-libs/libzrtpcpp )"
+	zrtp? ( net-libs/libzrtpcpp )
+	media-libs/alsa-lib"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+pkg_setup() {
+	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."
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"