summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2009-09-20 12:38:21 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2009-09-20 12:38:21 +0000
commitef6b91e6be383316eb0ff11a6d1de71b25a552bf (patch)
tree6ef5073e6c268f69053f733d44e4824dc9f3e632 /net-im
parentFix hooking of debian/extra/ build so that relative paths are handled correct... (diff)
downloadhistorical-ef6b91e6be383316eb0ff11a6d1de71b25a552bf.tar.gz
historical-ef6b91e6be383316eb0ff11a6d1de71b25a552bf.tar.bz2
historical-ef6b91e6be383316eb0ff11a6d1de71b25a552bf.zip
Add a minimum version on media-libs/speex so we can drop the built_with_use check.
Package-Manager: portage-2.2_rc40/cvs/Linux i686
Diffstat (limited to 'net-im')
-rw-r--r--net-im/twinkle/ChangeLog6
-rw-r--r--net-im/twinkle/Manifest14
-rw-r--r--net-im/twinkle/twinkle-1.4.2.ebuild13
3 files changed, 20 insertions, 13 deletions
diff --git a/net-im/twinkle/ChangeLog b/net-im/twinkle/ChangeLog
index 548e91cebec2..865edde1a98a 100644
--- a/net-im/twinkle/ChangeLog
+++ b/net-im/twinkle/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-im/twinkle
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/ChangeLog,v 1.50 2009/05/14 22:09:25 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/ChangeLog,v 1.51 2009/09/20 12:38:21 betelgeuse Exp $
+
+ 20 Sep 2009; Petteri Räty <betelgeuse@gentoo.org> twinkle-1.4.2.ebuild:
+ Add a minimum version on media-libs/speex so we can drop the
+ built_with_use check.
14 May 2009; Daniel Black <dragonheart@gentoo.org>
-files/twinkle-0.4.1-badcflags.patch, -files/twinkle-1.0.1-icmp.patch,
diff --git a/net-im/twinkle/Manifest b/net-im/twinkle/Manifest
index 1ba5bd00ac35..956fb278dc92 100644
--- a/net-im/twinkle/Manifest
+++ b/net-im/twinkle/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX twinkle-1.4.1-kdedetect.patch 892 RMD160 20a7fa1d5187c7411b27c78780b8c18ad3b52427 SHA1 31b03362954636f1770d8c8b278f2f3b1d99adc6 SHA256 82e2084a795ee9b08b0524229f28a4a44b7343273edd7fb120aaf7f0eb85f7ca
DIST twinkle-1.4.1.tar.gz 1577865 RMD160 e8b9777b020a21c1ea0b2680db810eeea85d6af3 SHA1 a65ce2ff0176d38d1275d4367b297234fac684d3 SHA256 ea5d1eb1b1127d1bc63a33b2682f95cecbf252e81d4dba16969dd63856aa169e
DIST twinkle-1.4.2.tar.gz 1601100 RMD160 75acf3caa4643108d2b2e8b639f476926a23e4f1 SHA1 3751ef1a69ae16072393f44c2888b0fb488089e9 SHA256 807686c7ac1b54bb0ea27ff4be362db6926d1d3d6f1802f6d359a353157e89a5
EBUILD twinkle-1.4.1.ebuild 1573 RMD160 4c33e6b3eb09a16debf9f9dcf48e67703b006f68 SHA1 8c7d51bb23a60959c0df4eecbfd263f0e2ee8697 SHA256 cd151221cb729022af7ad8f0f2929132bc5dff62e526e103644b4d3db5d34561
-EBUILD twinkle-1.4.2.ebuild 1583 RMD160 7c25c3ca1dde06a8173c34d6707fc5b016d12182 SHA1 785a3af18cef929c49360107b5f06c72a560a038 SHA256 5c1c4a62b2b2bf492966007f236e346cd9d0521a3ad3ce207ec9a98c2527582a
-MISC ChangeLog 9666 RMD160 5cf510c88d8a3d50042f2a956fccc3fb01776f8a SHA1 9556233f10c33daf5c8b185d69e219f080fc609c SHA256 0d194c90a334a367535df46562f4fb71e9b426ecaeafb3cf00c151f3801eb1e4
+EBUILD twinkle-1.4.2.ebuild 1410 RMD160 01c0187ccb564226d4a34bd8993dd4574c238122 SHA1 1e0d7348987ff0d2667bcd1ef54117ebed38caac SHA256 877ef4d5ed0b96607c8339c26c24fe9b7bd9fae4ba7195f0985d3395224f285c
+MISC ChangeLog 9828 RMD160 e72b6932a07024ffa9b90b1d5cfa2a57cfbd6053 SHA1 75bd491acacb13e2acf0cc8734afa6f80832c5da SHA256 b44b6547ec88d127a0932b6cf0c4fd914557810b6d27b12774567afe3c2bcc8d
MISC metadata.xml 669 RMD160 3cafb4dca8f6e7e14568c5565ae604a3b997a8e4 SHA1 903267899c47c5b80eac0e07a18cf73723fef533 SHA256 e0f82424abfd4c18cfe89191c41d3e7531bb620cd78ffc1aeafcb7b7a4f853a6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkq2IkcACgkQcxLzpIGCsLQIzgCeOEuPG/FsUsXkGgoK9fH7qFTz
+WlAAn0FxokzkMwkNaxqsMvM14iErw6cC
+=bM1O
+-----END PGP SIGNATURE-----
diff --git a/net-im/twinkle/twinkle-1.4.2.ebuild b/net-im/twinkle/twinkle-1.4.2.ebuild
index 676344eca84e..7c925245744b 100644
--- a/net-im/twinkle/twinkle-1.4.2.ebuild
+++ b/net-im/twinkle/twinkle-1.4.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-1.4.2.ebuild,v 1.2 2009/05/14 22:09:25 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-1.4.2.ebuild,v 1.3 2009/09/20 12:38:21 betelgeuse Exp $
EAPI=2
ARTS_REQUIRED="never"
@@ -16,12 +16,13 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="kde arts speex ilbc zrtp kdehiddenvisibility"
# Requires libqt-mt actually... Is that *always* built, or do we need to check?
+# Now speex so we don't need built_with_use checks for wideband any more
RDEPEND=">=net-libs/ccrtp-1.6.0
>=dev-cpp/commoncpp2-1.6.1
x11-libs/qt:3
media-libs/libsndfile
dev-libs/boost
- speex? ( media-libs/speex )
+ speex? ( >=media-libs/speex-1.2_beta3 )
ilbc? ( dev-libs/ilbc-rfc3951 )
zrtp? ( >=net-libs/libzrtpcpp-1.3.0 )
media-libs/alsa-lib"
@@ -29,14 +30,6 @@ RDEPEND=">=net-libs/ccrtp-1.6.0
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_prepare() {
epatch "${FILESDIR}"/${PN}-1.4.1-kdedetect.patch
eautoreconf