summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Alexander <wired@gentoo.org>2010-07-28 14:57:08 +0000
committerAlex Alexander <wired@gentoo.org>2010-07-28 14:57:08 +0000
commit45bb10c81ff4c12d3875b8a98a6a141ad440d453 (patch)
tree79b2f956d61dfaa55469699ed3c089db932d9383 /media-sound/ncmpcpp
parentopenmp was accidentally left in IUSE, doesnt do anything (diff)
downloadgentoo-2-45bb10c81ff4c12d3875b8a98a6a141ad440d453.tar.gz
gentoo-2-45bb10c81ff4c12d3875b8a98a6a141ad440d453.tar.bz2
gentoo-2-45bb10c81ff4c12d3875b8a98a6a141ad440d453.zip
don't die on +fftw -visualizer. fixes bug #330219
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/ncmpcpp')
-rw-r--r--media-sound/ncmpcpp/ChangeLog5
-rw-r--r--media-sound/ncmpcpp/ncmpcpp-0.5.4.ebuild23
2 files changed, 18 insertions, 10 deletions
diff --git a/media-sound/ncmpcpp/ChangeLog b/media-sound/ncmpcpp/ChangeLog
index 67495d16ac59..e2cc7bee2f47 100644
--- a/media-sound/ncmpcpp/ChangeLog
+++ b/media-sound/ncmpcpp/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-sound/ncmpcpp
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpcpp/ChangeLog,v 1.33 2010/07/28 13:38:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpcpp/ChangeLog,v 1.34 2010/07/28 14:57:08 wired Exp $
+
+ 28 Jul 2010; Alex Alexander <wired@gentoo.org> ncmpcpp-0.5.4.ebuild:
+ don't die on +fftw -visualizer. fixes bug #330219
28 Jul 2010; Jeroen Roovers <jer@gentoo.org> ncmpcpp-0.5.4.ebuild:
Stable for HPPA (bug #330123).
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.5.4.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.5.4.ebuild
index a551fb3bf007..530b72c448ac 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.5.4.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.5.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpcpp/ncmpcpp-0.5.4.ebuild,v 1.2 2010/07/28 13:38:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpcpp/ncmpcpp-0.5.4.ebuild,v 1.3 2010/07/28 14:57:08 wired Exp $
EAPI="2"
inherit bash-completion eutils
@@ -22,19 +22,24 @@ DEPEND="sys-libs/ncurses[unicode?]
taglib? ( media-libs/taglib )"
RDEPEND="$DEPEND"
-pkg_setup() {
- if ( use fftw && ! use visualizer ); then
- die "USE=fftw requires USE=visualizer enabled"
- fi
-}
-
src_configure() {
- econf $(use_enable clock) \
+ local myconf=""
+ if use fftw; then
+ myconf="$(use_with visualizer fftw)"
+ if ! use visualizer; then
+ ewarn "For the fftw USE flag to have any effect, you must also"
+ ewarn "enable the visualizer USE flag."
+ fi
+ else
+ myconf="--without-fftw"
+ fi
+ econf \
+ ${myconf} \
+ $(use_enable clock) \
$(use_enable outputs) \
$(use_enable unicode) \
$(use_enable visualizer) \
$(use_with curl) \
- $(use_with fftw) \
$(use_with iconv) \
$(use_with threads) \
$(use_with taglib)