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

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 137 insertions, 2 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/Manifest b/media-sound/cmus/Manifest
index 338d73cf18eb..335395266afe 100644
--- a/media-sound/cmus/Manifest
+++ b/media-sound/cmus/Manifest
@@ -1,6 +1,8 @@
+AUX cmus-2.2.0-libmpcdecsv7.patch 897 RMD160 c4c3385b1bcf88d21aa91d7873704d6c06640521 SHA1 7b95f23835060e684fcca29e0b1244eb4fb6a720 SHA256 640fbc195b61398d05310d322404ecacd021446b6b5e3c1d544fe15651140391
 AUX cmus-2.2.0-new-ffmpeg.patch 395 RMD160 dc96f1b0f7cd44d16ca8cfda6f5ec9ceb8f62a8b SHA1 d4cb8d41e374cdd06c57172567afac9c13436a55 SHA256 613ff226ed5eaf74ad0314cb7032bc64221b7588bd16d831fbcd709a701a8ca5
 AUX cmus-2.2.0-symlink_attack.patch 458 RMD160 996b40375989082ea1fa49dcb11ef0f5b0f1eab8 SHA1 17146ed5b903f2aa31dd463c662695a5b9f9a76a SHA256 3cd685ccf3f9dd4005fa611aa29c950d11a93af37ba7df3d26beb4cf46fe5f75
 DIST cmus-2.2.0.tar.bz2 155448 RMD160 1287666c16332ad34222461e29d8355ef607e7b5 SHA1 a6472633ac55660eb3aec5d2ae0296da86903bb2 SHA256 f18ffafc7161a383ddc79b34cc16a5a38f675454c49799dac5d172bf22d12005
 EBUILD cmus-2.2.0-r1.ebuild 2723 RMD160 2b8c8de61e93bfaeb1a2eb9d4662950e9243fa22 SHA1 5aae8886c9aaa9d4a11846f3b3e25dcd6037da87 SHA256 79582a89ea9161431b7126ae1fdd4356fa1af2ae802a139167f9621ed4496a33
-MISC ChangeLog 4349 RMD160 e743dcb57a83a6b2b41e6607550c428e31742105 SHA1 ab00b21c7800399adf70f9c425043afad989956e SHA256 63c245fb027216b555ac2dd397efe02904d41de0720810d65cd82b087161846e
+EBUILD cmus-2.2.0-r2.ebuild 2764 RMD160 fedefc415c6a74091d4ecbdf25e8d60f7d8b72a8 SHA1 076ab14e96502716c2dddc31bd24d1bf6e1332de SHA256 fd65fb95b0a455b5ced4cde7503bce7443d3966b405afa0d1e53328ab6e12d70
+MISC ChangeLog 4602 RMD160 f617943efa6a99ed1f8d02049afb4672e992b9e5 SHA1 aa7c91be27f94bfae3e5fbd77fce090229f4fdcc SHA256 080735f6cf17b77db3f653c627ee1c4c71799304adeb970018d9d0e1dcb2e45d
 MISC metadata.xml 454 RMD160 3eee3b3cf9146d4a550ed07b0950cea8b916d4ad SHA1 db1ce4377d93692497eac6450e8a1e54d24ffe4a SHA256 6843f2cd0c3bf2240f0cbdb1d62616cc95efe665d1eb7d2a6e27ebeec5608340
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