summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-01-16 08:20:12 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-01-16 08:20:12 +0000
commit8cda5ee3f3781d70a07bd4cbc13c8df93d403e15 (patch)
treec5a55d14a5aa4bdcbd7272e7a834fd3315c37d4a /media-sound/mpd
parentFix compability with dev-libs/libcdio-paranoia. (diff)
downloadgentoo-2-8cda5ee3f3781d70a07bd4cbc13c8df93d403e15.tar.gz
gentoo-2-8cda5ee3f3781d70a07bd4cbc13c8df93d403e15.tar.bz2
gentoo-2-8cda5ee3f3781d70a07bd4cbc13c8df93d403e15.zip
Fix compability with dev-libs/libcdio-paranoia.
(Portage version: 2.2.0_alpha151/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'media-sound/mpd')
-rw-r--r--media-sound/mpd/ChangeLog5
-rw-r--r--media-sound/mpd/mpd-0.17.3.ebuild10
2 files changed, 12 insertions, 3 deletions
diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index be78b47d441e..f33ff6a2f8b4 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-sound/mpd
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.302 2013/01/14 04:22:32 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.303 2013/01/16 08:20:12 ssuominen Exp $
+
+ 16 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> mpd-0.17.3.ebuild:
+ Fix compability with dev-libs/libcdio-paranoia.
*mpd-0.17.3 (14 Jan 2013)
diff --git a/media-sound/mpd/mpd-0.17.3.ebuild b/media-sound/mpd/mpd-0.17.3.ebuild
index 8f76c3967cc8..1c4f16c4799c 100644
--- a/media-sound/mpd/mpd-0.17.3.ebuild
+++ b/media-sound/mpd/mpd-0.17.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.17.3.ebuild,v 1.1 2013/01/14 04:22:32 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.17.3.ebuild,v 1.2 2013/01/16 08:20:12 ssuominen Exp $
EAPI=4
inherit eutils flag-o-matic linux-info multilib systemd user
@@ -37,7 +37,7 @@ RDEPEND="!<sys-cluster/mpich2-1.4_rc2
ao? ( media-libs/libao[alsa?,pulseaudio?] )
audiofile? ( media-libs/audiofile )
bzip2? ( app-arch/bzip2 )
- cdio? ( dev-libs/libcdio[-minimal] )
+ cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
curl? ( net-misc/curl )
ffmpeg? ( virtual/ffmpeg )
flac? ( media-libs/flac[ogg?] )
@@ -90,6 +90,12 @@ pkg_setup() {
src_prepare() {
cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
epatch "${FILESDIR}"/${PN}-0.16.conf.patch
+
+ if has_version dev-libs/libcdio-paranoia; then
+ sed -i \
+ -e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \
+ src/input/cdio_paranoia_input_plugin.c || die
+ fi
}
src_configure() {