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, 122 insertions, 2 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/Manifest b/media-sound/moc/Manifest
index 373b960f0790..cd85da60d6d4 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -1,9 +1,11 @@
 AUX moc-2.5.0_alpha3-faad2.patch 933 RMD160 54fdaee534bde0f2004334ce1637d6f57a95028a SHA1 d387c13600458eb4bebe2d2715e5eaba36c748af SHA256 2a221a9328b3a1dd753af07d0ba64ebffba145b2309d7c9ac596b04fc8c4a283
 AUX moc-2.5.0_alpha3-ffmpegheaders.patch 1702 RMD160 3f8f8c1b92d7c86ee27efb5793bb8257e47701fb SHA1 84bc2e2ab2de630a6bae6d33f5016ee66a48f509 SHA256 a887f0eb68cb8741069561117c36ad8e228b9fabc1c41947a7f59e16c7d1e546
 AUX moc-2.5.0_alpha3-fix_default_configuration_layout.patch 354 RMD160 bc11e5d17a06669f949abb05e5ae157d30883652 SHA1 496017390e0078bde6a01afbd466cead5e904233 SHA256 e11b7fe9e29bbb500c4360bfc4e8e991e494a5d9db432783b1785be6c27a606d
+AUX moc-2.5.0_alpha3-libmpcdecsv7.patch 1247 RMD160 05a71bf3b2a7c7bfb4a63e2d253da82ad9cf57a2 SHA1 b96072076867e3b0d51875d3b083ff5348997080 SHA256 68ce63bf8d4122ca01e15189137755f0e41a7b078d2bf501290c7230d9bbda8d
 AUX moc-2.5.0_alpha3-libtool22.patch 964 RMD160 964b69215300a010b536a73bf1644f15524b098f SHA1 34d03402e276e941bd86eacf61ca5ef4a80a1f06 SHA256 61e0513ffd5132b658ad330444ccb32163efb8f892049d068ee6dbfbc3cab259
 DIST moc-2.5.0-alpha3.tar.bz2 489824 RMD160 7a603538e2080f3e182a543bc82100a09a56c2fe SHA1 59251b6239ad38f3f5ba8a1f73d1e90246765ab7 SHA256 6b691295eb0b42aab17805798bd40fb308619a9ba8f6a1e1ed599e3449946617
 DIST moc-m4-1.tar.bz2 1635 RMD160 25f0561e4fdd7f5a622d419dae434bbcba70a02f SHA1 0e0c47b379764f986976414c283a05e6da825822 SHA256 337f47d91fbf532443f278b81db3d69d13260bebeaa1358bedff34e10637dee7
 EBUILD moc-2.5.0_alpha3-r2.ebuild 2328 RMD160 2ca55aaad12e191cb05fce6237eb4120959c6f8c SHA1 ba0b063898753ee62049adb5641309d13bf62d8e SHA256 8b39c2829dd987991ddc4b856f5f319db8500f336c26c014e2db6d8961e467c5
-MISC ChangeLog 9265 RMD160 a36e318a90ae21cac8809fd9a41de3be125fc148 SHA1 9a05ba56f291b3feb3d6c1ea1a18a757e16f555b SHA256 4fb992f1e78898b0eef0f8b77d62c1d08de86974a211f862650750170c5be056
+EBUILD moc-2.5.0_alpha3-r3.ebuild 2379 RMD160 c12a3931058ff9cb62fb4cc62110149817dcaec2 SHA1 c966901ce3789bc7769735e18b8302680febd89a SHA256 3dee42005cca1e83b193ffe981286e1687361b0853d6f46f907e4f4c28267176
+MISC ChangeLog 9537 RMD160 ebecb2c931687a3daf2664623c958de372e69928 SHA1 ab6cefb417f417e847bc4b4b97561ddd9ec988a3 SHA256 e16ea73a8d6d4a70dd8b8dd6bed025024c09d497b0b172bd8872222ca2d30590
 MISC metadata.xml 244 RMD160 0f687a8096aa4afe69e958cf8cc4eb62361694d2 SHA1 14fe5a7bc2710d0240e9208786b24f409e71b179 SHA256 3f55674c364d24e3977d896f3bc95745716c55817511c3fc7282523da0aca164
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}
+}