summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2010-12-18 12:00:56 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2010-12-18 12:00:56 +0000
commit6235d320ce3510d39d8069b07bd6f3d86fdd4b4a (patch)
tree94672f191a71d7602f13eab79642b30d695a44e6 /media-sound
parentVersion bump (diff)
downloadgentoo-2-6235d320ce3510d39d8069b07bd6f3d86fdd4b4a.tar.gz
gentoo-2-6235d320ce3510d39d8069b07bd6f3d86fdd4b4a.tar.bz2
gentoo-2-6235d320ce3510d39d8069b07bd6f3d86fdd4b4a.zip
Apply Dane Smiths' patch as for 0.15.15 series
(Portage version: 2.2.0_alpha8/cvs/Linux x86_64)
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/mpd/ChangeLog5
-rw-r--r--media-sound/mpd/mpd-0.16.ebuild10
2 files changed, 11 insertions, 4 deletions
diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 8094a4f7426a..715b618ca3ab 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-sound/mpd
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.228 2010/12/17 17:53:29 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.229 2010/12/18 12:00:56 hwoarang Exp $
+
+ 18 Dec 2010; Markos Chandras <hwoarang@gentoo.org> mpd-0.16.ebuild:
+ Apply Dane Smiths' patch as for 0.15.15 series
17 Dec 2010; Dane Smith <c1pher@gentoo.org> mpd-0.15.15.ebuild:
Fixed another smaller and much less obvious typo regarding the patch I
diff --git a/media-sound/mpd/mpd-0.16.ebuild b/media-sound/mpd/mpd-0.16.ebuild
index 5a024a80b4d1..c164f95f6abe 100644
--- a/media-sound/mpd/mpd-0.16.ebuild
+++ b/media-sound/mpd/mpd-0.16.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/mpd/mpd-0.16.ebuild,v 1.4 2010/12/14 18:34:05 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.ebuild,v 1.5 2010/12/18 12:00:56 hwoarang Exp $
EAPI=2
inherit eutils flag-o-matic multilib
@@ -57,7 +57,7 @@ DEPEND="${RDEPEND}
pkg_setup() {
use network || ewarn "Icecast and Shoutcast streaming needs networking."
use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
-
+ use lastfmradio && ! use curl && ewarn "Lastfm requires curl support. Disabling lastfm"
enewuser mpd "" "" "/var/lib/mpd" audio
}
@@ -88,6 +88,11 @@ src_configure() {
else
mpdconf+=" --disable-oggflac"
fi
+ if use lastfmradio && use curl; then
+ mpdconf+=" --enable-lastfm"
+ else
+ mpdconf+=" --disable-lastfm"
+ fi
append-lfs-flags
append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
@@ -112,7 +117,6 @@ src_configure() {
$(use_enable jack) \
$(use_enable id3) \
$(use_enable ipv6) \
- $(use_enable lastfmradio lastfm) \
$(use_enable libmms mms) \
$(use_enable libsamplerate lsr) \
$(use_enable mad) \