diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2009-09-20 12:38:21 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2009-09-20 12:38:21 +0000 |
| commit | cdbaa70217744a29f32acdd1b2783e852f06fd74 (patch) | |
| tree | aa63ec9c3f44143773bea647d988476e3c072829 /net-im/twinkle | |
| parent | Fix hooking of debian/extra/ build so that relative paths are handled correct... (diff) | |
| download | gentoo-2-cdbaa70217744a29f32acdd1b2783e852f06fd74.tar.gz gentoo-2-cdbaa70217744a29f32acdd1b2783e852f06fd74.tar.bz2 gentoo-2-cdbaa70217744a29f32acdd1b2783e852f06fd74.zip | |
Add a minimum version on media-libs/speex so we can drop the built_with_use check.
(Portage version: 2.2_rc40/cvs/Linux i686)
Diffstat (limited to 'net-im/twinkle')
| -rw-r--r-- | net-im/twinkle/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/twinkle/twinkle-1.4.2.ebuild | 13 |
2 files changed, 8 insertions, 11 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/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 |