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, 119 insertions, 1 deletions

diff --git a/media-sound/moc/ChangeLog b/media-sound/moc/ChangeLog
index ee5c12d6d1e5..d961cd58181f 100644
--- a/media-sound/moc/ChangeLog
+++ b/media-sound/moc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/moc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.65 2009/06/28 14:05:03 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.66 2009/07/26 13:08:29 ssuominen Exp $
+
+*moc-2.5.0_alpha3-r3 (26 Jul 2009)
+
+  26 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +moc-2.5.0_alpha3-r3.ebuild, +files/moc-2.5.0_alpha3-libmpcdecsv7.patch:
+  Use transition package media-libs/libmpcdecsv7 instead of
+  media-libs/libmpcdec for Musepack support.
 
   28 Jun 2009; Tobias Klausmann <klausman@gentoo.org>
   moc-2.5.0_alpha3-r2.ebuild:
diff --git a/media-sound/moc/files/moc-2.5.0_alpha3-libmpcdecsv7.patch b/media-sound/moc/files/moc-2.5.0_alpha3-libmpcdecsv7.patch
new file mode 100644
index 000000000000..55c29424d774
--- /dev/null
+++ b/media-sound/moc/files/moc-2.5.0_alpha3-libmpcdecsv7.patch
@@ -0,0 +1,33 @@
+diff -ur moc-2.5.0-alpha3.orig/configure.in moc-2.5.0-alpha3/configure.in
+--- moc-2.5.0-alpha3.orig/configure.in	2008-02-26 00:37:30.000000000 +0200
++++ moc-2.5.0-alpha3/configure.in	2009-07-26 16:05:30.000000000 +0300
+@@ -295,14 +295,14 @@
+ AC_ARG_WITH(musepack, AS_HELP_STRING(--without-musepack, [Compile without musepack (mpc) support]))
+ if test "x$with_musepack" != "xno"
+ then
+-	AC_CHECK_LIB(mpcdec, mpc_decoder_setup, [
+-		AC_CHECK_HEADER([mpcdec/mpcdec.h], [have_musepack="yes"])
++	AC_CHECK_LIB(mpcdecsv7, mpc_decoder_setup, [
++		AC_CHECK_HEADER([mpcdecsv7/mpcdec.h], [have_musepack="yes"])
+ 		])
+ 
+ 	if test "x$have_musepack" = "xyes"
+ 	then
+ 		
+-		MUSEPACK_LIBS="-lmpcdec"
++		MUSEPACK_LIBS="-lmpcdecsv7"
+ 		AC_SUBST([MUSEPACK_LIBS])
+ 
+ 		dnl taglib
+diff -ur moc-2.5.0-alpha3.orig/decoder_plugins/musepack/musepack.c moc-2.5.0-alpha3/decoder_plugins/musepack/musepack.c
+--- moc-2.5.0-alpha3.orig/decoder_plugins/musepack/musepack.c	2006-12-16 18:27:18.000000000 +0200
++++ moc-2.5.0-alpha3/decoder_plugins/musepack/musepack.c	2009-07-26 16:05:46.000000000 +0300
+@@ -20,7 +20,7 @@
+ #include <strings.h>
+ #include <stdio.h>
+ #include <errno.h>
+-#include <mpcdec/mpcdec.h>
++#include <mpcdecsv7/mpcdec.h>
+ #include <tag_c.h>
+ 
+ #define DEBUG
diff --git a/media-sound/moc/moc-2.5.0_alpha3-r3.ebuild b/media-sound/moc/moc-2.5.0_alpha3-r3.ebuild
new file mode 100644
index 000000000000..5591a1364d99
--- /dev/null
+++ b/media-sound/moc/moc-2.5.0_alpha3-r3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.5.0_alpha3-r3.ebuild,v 1.1 2009/07/26 13:08:29 ssuominen Exp $
+
+EAPI=2
+inherit autotools eutils
+
+MY_P=${P/_/-}
+MOC_M4_VER=1
+
+DESCRIPTION="Music On Console - ncurses interface for playing audio files"
+HOMEPAGE="http://moc.daper.net"
+SRC_URI="ftp://ftp.daper.net/pub/soft/${PN}/unstable/${MY_P}.tar.bz2
+	mirror://gentoo/${PN}-m4-${MOC_M4_VER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa aac jack mad musepack vorbis flac wavpack sndfile modplug timidity sid ffmpeg speex libsamplerate curl debug"
+
+RDEPEND="media-libs/libao
+	alsa? ( media-libs/alsa-lib )
+	aac? ( media-libs/faad2 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag )
+	musepack? ( media-libs/libmpcdecsv7 >=media-libs/taglib-1.3 )
+	vorbis? ( >=media-libs/libvorbis-1 )
+	flac? ( media-libs/flac )
+	wavpack? ( >=media-sound/wavpack-4.31 )
+	sndfile? ( >=media-libs/libsndfile-1 )
+	modplug? ( >=media-libs/libmodplug-0.7 )
+	timidity? ( media-libs/libtimidity media-sound/timidity++ )
+	sid? ( >=media-libs/libsidplay-2 )
+	ffmpeg? ( media-video/ffmpeg )
+	speex? ( >=media-libs/speex-1 )
+	libsamplerate? ( >=media-libs/libsamplerate-0.1 )
+	curl? ( >=net-misc/curl-7.12.2 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-faad2.patch \
+		"${FILESDIR}"/${P}-ffmpegheaders.patch \
+		"${FILESDIR}"/${P}-libtool22.patch \
+		"${FILESDIR}"/${P}-fix_default_configuration_layout.patch \
+		"${FILESDIR}"/${P}-libmpcdecsv7.patch
+	cp -f "${WORKDIR}"/m4/* m4/
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+	econf \
+		--without-rcc \
+		$(use_with aac) \
+		$(use_with jack) \
+		$(use_with mad mp3) \
+		$(use_with musepack) \
+		$(use_with vorbis) \
+		$(use_with flac) \
+		$(use_with wavpack) \
+		$(use_with sndfile) \
+		$(use_with modplug) \
+		$(use_with timidity) \
+		$(use_with sid sidplay2) \
+		$(use_with ffmpeg) \
+		$(use_with speex) \
+		$(use_with libsamplerate samplerate) \
+		$(use_with curl) \
+		$(use_enable debug)
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO *.example
+	rm -rf "${D}"/usr/share/doc/${PN}
+}