Use transition package media-libs/libmpcdecsv7 instead of media-libs/libmpcdec for Musepack support.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 134 insertions, 1 deletions

diff --git a/media-sound/cmus/ChangeLog b/media-sound/cmus/ChangeLog
index 38201a0927a6..69be4e600954 100644
--- a/media-sound/cmus/ChangeLog
+++ b/media-sound/cmus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/cmus
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/ChangeLog,v 1.27 2009/07/13 21:36:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/ChangeLog,v 1.28 2009/07/26 13:19:04 ssuominen Exp $
+
+*cmus-2.2.0-r2 (26 Jul 2009)
+
+  26 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> +cmus-2.2.0-r2.ebuild,
+  +files/cmus-2.2.0-libmpcdecsv7.patch:
+  Use transition package media-libs/libmpcdecsv7 instead of
+  media-libs/libmpcdec for Musepack support.
 
   13 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> cmus-2.2.0-r1.ebuild:
   Remove USE mp3 since we have USE mad which is correct.
diff --git a/media-sound/cmus/cmus-2.2.0-r2.ebuild b/media-sound/cmus/cmus-2.2.0-r2.ebuild
new file mode 100644
index 000000000000..1d7dd1369f7c
--- /dev/null
+++ b/media-sound/cmus/cmus-2.2.0-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/cmus-2.2.0-r2.ebuild,v 1.1 2009/07/26 13:19:04 ssuominen Exp $
+
+EAPI=2
+inherit eutils multilib
+
+DESCRIPTION="A ncurses based music player with plugin support for many formats"
+HOMEPAGE="http://cmus.sourceforge.net/"
+SRC_URI="http://mirror.greaterscope.net/cmus/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="aac alsa ao debug examples flac mad mikmod modplug mp4 musepack \
+	oss pidgin unicode vorbis wavpack wma zsh-completion"
+
+DEPEND="sys-libs/ncurses[unicode?]
+	aac? ( media-libs/faad2 )
+	alsa? ( >=media-libs/alsa-lib-1.0.11 )
+	ao? (  media-libs/libao )
+	flac? ( media-libs/flac )
+	mad? ( >=media-libs/libmad-0.14 )
+	mikmod? ( media-libs/libmikmod )
+	modplug? ( >=media-libs/libmodplug-0.7 )
+	mp4? ( media-libs/libmp4v2 )
+	musepack? ( media-libs/libmpcdecsv7 )
+	vorbis? ( >=media-libs/libvorbis-1.0 )
+	wavpack? ( media-sound/wavpack )
+	wma? ( >=media-video/ffmpeg-0.4.9_p20080326 )"
+RDEPEND="${DEPEND}
+	zsh-completion? ( app-shells/zsh )
+	pidgin? ( net-im/pidgin
+		dev-python/dbus-python )"
+
+my_config() {
+	local value
+	use ${1} && value=y || value=n
+	myconf="${myconf} ${2}=${value}"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-new-ffmpeg.patch \
+		"${FILESDIR}"/${P}-symlink_attack.patch \
+		"${FILESDIR}"/${P}-libmpcdecsv7.patch
+
+	if use mp4 && has_version ">=media-libs/libmp4v2-1.9.0"; then
+		ebegin "Patching in libmp4v2 compability support"
+		sed -i -e 's:<mp4.h>:<mp4v2/mp4v2.h>:' mp4.c || die "sed failed"
+		eend $?
+	fi
+}
+
+src_configure() {
+	local debuglevel=1 myconf="CONFIG_SUN=n"
+
+	use debug && debuglevel=2
+
+	my_config aac CONFIG_AAC
+	my_config ao CONFIG_AO
+	my_config alsa CONFIG_ALSA
+	my_config flac CONFIG_FLAC
+	my_config mad CONFIG_MAD
+	my_config mikmod CONFIG_MIKMOD
+	my_config mp4 CONFIG_MP4
+	my_config modplug CONFIG_MODPLUG
+	my_config musepack CONFIG_MPC
+	my_config oss CONFIG_OSS
+	my_config vorbis CONFIG_VORBIS
+	my_config wavpack CONFIG_WAVPACK
+	my_config wma CONFIG_FFMPEG
+
+	# econf doesn't work, because configure wants "prefix" (and similar) without dashes
+	./configure prefix=/usr ${myconf} exampledir=/usr/share/doc/${PF}/examples \
+		libdir=/usr/$(get_libdir) DEBUG=${debuglevel} || die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS README
+	use examples || rm -rf "${D}/usr/share/doc/${PF}/examples/"
+
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		doins contrib/_cmus
+	fi
+
+	if use pidgin; then
+		sed -i -e "s:/usr/local/bin/python:/usr/bin/python:" contrib/cmus-updatepidgin.py
+		newbin contrib/cmus-updatepidgin.py cmus-updatepidgin
+	fi
+}
diff --git a/media-sound/cmus/files/cmus-2.2.0-libmpcdecsv7.patch b/media-sound/cmus/files/cmus-2.2.0-libmpcdecsv7.patch
new file mode 100644
index 000000000000..6982a7ab6d77
--- /dev/null
+++ b/media-sound/cmus/files/cmus-2.2.0-libmpcdecsv7.patch
@@ -0,0 +1,34 @@
+Only in cmus-2.2.0.orig: cmus-2.2.0
+diff -ur cmus-2.2.0.orig/configure cmus-2.2.0/configure
+--- cmus-2.2.0.orig/configure	2007-07-27 17:52:13.000000000 +0300
++++ cmus-2.2.0/configure	2009-07-26 16:16:43.000000000 +0300
+@@ -61,7 +61,7 @@
+ 
+ check_mpc()
+ {
+-	check_library MPC "" "-lmpcdec"
++	check_library MPC "" "-lmpcdecsv7"
+ 	return $?
+ }
+ 
+diff -ur cmus-2.2.0.orig/mpc.c cmus-2.2.0/mpc.c
+--- cmus-2.2.0.orig/mpc.c	2007-07-27 17:52:13.000000000 +0300
++++ cmus-2.2.0/mpc.c	2009-07-26 16:17:32.000000000 +0300
+@@ -11,7 +11,7 @@
+ #include "xmalloc.h"
+ #include "read_wrapper.h"
+ 
+-#include <mpcdec/mpcdec.h>
++#include <mpcdecsv7/mpcdec.h>
+ #include <inttypes.h>
+ #include <errno.h>
+ 
+@@ -25,7 +25,7 @@
+ 	int samples_pos;
+ 	int samples_avail;
+ 
+-	/* mpcdec/mpcdec.h
++	/* mpcdecsv7/mpcdec.h
+ 	 *
+ 	 * the api doc says this is pcm samples per mpc frame
+ 	 * but it's really pcm _frames_ per mpc frame