libmpcdec SV7 support is replaced by musepack-tools SV8 support.

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

5 files changed, 9 insertions, 99 deletions

diff --git a/media-sound/qmmp/ChangeLog b/media-sound/qmmp/ChangeLog
index 6df152c77438..a8451a595723 100644
--- a/media-sound/qmmp/ChangeLog
+++ b/media-sound/qmmp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/qmmp
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/ChangeLog,v 1.15 2009/09/20 22:08:05 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/ChangeLog,v 1.16 2009/09/24 07:11:41 ssuominen Exp $
+
+  24 Sep 2009; Samuli Suominen <ssuominen@gentoo.org> qmmp-0.3.0.ebuild:
+  libmpcdec SV7 support is replaced by musepack-tools SV8 support.
 
   20 Sep 2009; Markus Meier <maekke@gentoo.org> qmmp-0.3.0.ebuild:
   amd64 stable, bug #284782
diff --git a/media-sound/qmmp/files/decoder_mad-gcc-4.3.patch b/media-sound/qmmp/files/decoder_mad-gcc-4.3.patch
deleted file mode 100644
index 46ba04935e3b..000000000000
--- a/media-sound/qmmp/files/decoder_mad-gcc-4.3.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: qmmp-0.2.4/src/plugins/Input/mad/decoder_mad.cpp
-===================================================================
---- qmmp-0.2.4.orig/src/plugins/Input/mad/decoder_mad.cpp
-+++ qmmp-0.2.4/src/plugins/Input/mad/decoder_mad.cpp
-@@ -264,8 +264,8 @@ bool DecoderMAD::findHeader()
-             if (stream.error == MAD_ERROR_LOSTSYNC)
-             {
-                 //skip ID3v2 tag
--                uint tagSize = findID3v2((uchar *)stream.this_frame,
--                                         (uint) stream.bufend - (uint) stream.this_frame);
-+                ulong tagSize = findID3v2((uchar *)stream.this_frame,
-+                                         (ulong) stream.bufend - (ulong) stream.this_frame);
-                 if (tagSize > 0)
-                 {
-                     mad_stream_skip(&stream, tagSize);
diff --git a/media-sound/qmmp/metadata.xml b/media-sound/qmmp/metadata.xml
index f210bbb44eed..ab7d1b4175c2 100644
--- a/media-sound/qmmp/metadata.xml
+++ b/media-sound/qmmp/metadata.xml
@@ -2,12 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sound</herd>
-  <maintainer>
-    <email>sound@gentoo.org</email>
-  </maintainer>
   <use>
-  	<flag name="bs2b">Enable Bauer stereophonic-to-binaural DSP library</flag>
-	<flag name="projectm">Enable projectm music visualization plugin</flag>
+    <flag name="bs2b">Enable Bauer stereophonic-to-binaural DSP library</flag>
+    <flag name="projectm">Enable projectm music visualization plugin</flag>
     <flag name="scrobbler">Enable audioscrobbler/last.fm support</flag>
   </use>
 </pkgmetadata>
diff --git a/media-sound/qmmp/qmmp-0.2.4.ebuild b/media-sound/qmmp/qmmp-0.2.4.ebuild
deleted file mode 100644
index 872237bd7165..000000000000
--- a/media-sound/qmmp/qmmp-0.2.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-0.2.4.ebuild,v 1.4 2009/07/26 15:21:48 ssuominen Exp $
-
-EAPI="2"
-
-inherit cmake-utils
-
-DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
-HOMEPAGE="http://qmmp.ylsoftware.com/index_en.php"
-SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+alsa +dbus ffmpeg flac jack libsamplerate +mad modplug musepack oss
-	pulseaudio scrobbler sndfile +vorbis wavpack"
-
-RDEPEND="x11-libs/qt-gui:4
-	media-libs/taglib
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	flac? ( media-libs/flac )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	musepack? ( >=media-libs/libmpcdec-1.2.5 )
-	modplug? ( >=media-libs/libmodplug-0.8.4 )
-	vorbis? ( media-libs/libvorbis
-		media-libs/libogg )
-	jack? ( media-sound/jack-audio-connection-kit
-		media-libs/libsamplerate )
-	ffmpeg? ( media-video/ffmpeg )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
-	wavpack? ( media-sound/wavpack )
-	scrobbler? ( net-misc/curl )
-	sndfile? ( media-libs/libsndfile )"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog README"
-
-PATCHES=(
-	"${FILESDIR}/decoder_mad-gcc-4.3.patch"
-)
-
-qmmp_use_enable() {
-	# uses completely non standard cmake options...
-	if use ${1}; then
-		echo "-DUSE_${2}:BOOL=TRUE"
-	else
-		echo "-DUSE_${2}:BOOL=FALSE"
-	fi
-}
-
-src_compile() {
-	mycmakeargs="${mycmakeargs}
-		$(qmmp_use_enable alsa ALSA)
-		$(qmmp_use_enable dbus DBUS)
-		$(qmmp_use_enable ffmpeg FFMPEG)
-		$(qmmp_use_enable flac FLAC)
-		$(qmmp_use_enable jack JACK)
-		$(qmmp_use_enable mad MAD)
-		$(qmmp_use_enable modplug MODPLUG)
-		$(qmmp_use_enable musepack MPC)
-		$(qmmp_use_enable oss OSS)
-		$(qmmp_use_enable pulseaudio PULSE)
-		$(qmmp_use_enable scrobbler SCROBBLER)
-		$(qmmp_use_enable sndfile SNDFILE)
-		$(qmmp_use_enable libsamplerate SRC)
-		$(qmmp_use_enable vorbis VORBIS)
-		$(qmmp_use_enable wavpack WAVPACK)"
-
-	cmake-utils_src_compile
-}
diff --git a/media-sound/qmmp/qmmp-0.3.0.ebuild b/media-sound/qmmp/qmmp-0.3.0.ebuild
index 6dd5fe888a0b..36c4b21a41a8 100644
--- a/media-sound/qmmp/qmmp-0.3.0.ebuild
+++ b/media-sound/qmmp/qmmp-0.3.0.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/qmmp/qmmp-0.3.0.ebuild,v 1.6 2009/09/20 22:08:05 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-0.3.0.ebuild,v 1.7 2009/09/24 07:11:41 ssuominen Exp $
 
 EAPI="2"
 
@@ -13,8 +13,7 @@ SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="aac +alsa +dbus bs2b ffmpeg flac jack libsamplerate +mad modplug musepack oss
-projectm pulseaudio scrobbler sndfile +vorbis wavpack"
+IUSE="aac +alsa +dbus bs2b ffmpeg flac jack libsamplerate +mad modplug musepack oss projectm pulseaudio scrobbler sndfile +vorbis wavpack"
 
 RDEPEND="x11-libs/qt-gui:4
 	media-libs/taglib
@@ -25,8 +24,7 @@ RDEPEND="x11-libs/qt-gui:4
 	flac? ( media-libs/flac )
 	libsamplerate? ( media-libs/libsamplerate )
 	mad? ( media-libs/libmad )
-	musepack? ( || ( >=media-sound/musepack-tools-444
-		media-libs/libmpcdec ) )
+	musepack? ( >=media-sound/musepack-tools-444 )
 	modplug? ( >=media-libs/libmodplug-0.8.4 )
 	vorbis? ( media-libs/libvorbis
 		media-libs/libogg )