Remove media-libs/libmpcdecsv7 support, because it can't decode SV8 format and doesn't pass ./configure with Autoconf >= 2.65.

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

3 files changed, 11 insertions, 41 deletions

diff --git a/media-sound/moc/ChangeLog b/media-sound/moc/ChangeLog
index 621a5b238293..698daa069c73 100644
--- a/media-sound/moc/ChangeLog
+++ b/media-sound/moc/ChangeLog
@@ -1,6 +1,11 @@
 # 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.72 2009/10/23 09:54:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.73 2009/12/04 10:35:31 ssuominen Exp $
+
+  04 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
+  moc-2.5.0_alpha3-r3.ebuild, -files/moc-2.5.0_alpha3-libmpcdecsv7.patch:
+  Remove media-libs/libmpcdecsv7 support, because it can't decode SV8 format
+  and doesn't pass ./configure with Autoconf >= 2.65.
 
   23 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
   moc-2.5.0_alpha3-r3.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
deleted file mode 100644
index 55c29424d774..000000000000
--- a/media-sound/moc/files/moc-2.5.0_alpha3-libmpcdecsv7.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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
index ccd43873c8e1..b954dbf5fd73 100644
--- a/media-sound/moc/moc-2.5.0_alpha3-r3.ebuild
+++ b/media-sound/moc/moc-2.5.0_alpha3-r3.ebuild
@@ -1,6 +1,6 @@
 # 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.7 2009/10/23 09:54:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.5.0_alpha3-r3.ebuild,v 1.8 2009/12/04 10:35:31 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils
@@ -16,13 +16,12 @@ SRC_URI="ftp://ftp.daper.net/pub/soft/${PN}/unstable/${MY_P}.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"
+IUSE="alsa aac jack mad vorbis flac wavpack sndfile modplug timidity sid ffmpeg speex libsamplerate curl debug"
 
 RDEPEND="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 )
@@ -43,8 +42,7 @@ 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
+		"${FILESDIR}"/${P}-fix_default_configuration_layout.patch
 	cp -f "${WORKDIR}"/m4/* m4/
 	AT_M4DIR="m4" eautoreconf
 }
@@ -55,7 +53,7 @@ src_configure() {
 		$(use_with aac) \
 		$(use_with jack) \
 		$(use_with mad mp3) \
-		$(use_with musepack) \
+		--without-musepack \
 		$(use_with vorbis) \
 		$(use_with flac) \
 		$(use_with wavpack) \
@@ -71,7 +69,7 @@ src_configure() {
 }
 
 src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog NEWS README THANKS TODO *.example
 	rm -rf "${D}"/usr/share/doc/${PN}
 }