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

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

6 files changed, 12 insertions, 115 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/Manifest b/media-sound/qmmp/Manifest
index cdafe5ba1491..51f90115409e 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,17 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX decoder_mad-gcc-4.3.patch 823 RMD160 4bd668f6a7f0eeb6422bfa53a4cb818d2c8db87c SHA1 eede5dc2454d517ef7f0fef48b2febbc8c20d134 SHA256 48c41636b81e87ae54e58986d51951a7195a0ca828c76460f3f9319a56af8343
-DIST qmmp-0.2.4.tar.bz2 383553 RMD160 7d25c7b3c5d4cf05d31d4adc3da62bc82c4e65dc SHA1 8296f5899088b61d8d965e5f38511d357b7b8383 SHA256 d1e1cc136c6574de5f14b54f33a70e56de05fe4c90facdb1812116107a58a399
 DIST qmmp-0.3.0.tar.bz2 486650 RMD160 ff51ff434299b616da736467a0d33977d379f6c4 SHA1 3bbe00daa0227e64d97f797002ffff49b27e01a0 SHA256 b2e3b253ea0a2a9c6f464cf247539e4a83897ae9a92c6389805f6bf1ca89bfe3
-EBUILD qmmp-0.2.4.ebuild 2056 RMD160 236c908748ed92c1e1eee3069e9ee9e5a0d4f7c6 SHA1 d7c369bbbaf097c5c23cb2fc144249a23e699076 SHA256 7d6f77bbcdec807e40505ea2367df1a18624cfc5345f7f61c066628d02825d2c
-EBUILD qmmp-0.3.0.ebuild 2253 RMD160 d314483a4467b22e15032c8bbfd2fad6a585fb69 SHA1 cb9bdf901a42f062de442379695ff57f10e9afa5 SHA256 4b105b359c4e29c3a2edfb2549e3d00d1a745d9c7845f2e646c8e65c63c95674
-MISC ChangeLog 2282 RMD160 8f60c326ab368e974295c3e2121b0e156fa4e512 SHA1 6af21111f31268a37bbd3d0e14abb880d5927f57 SHA256 2593dae8cf76a5d875b03fb4ad3ab0a5019de7bee5302691dc32fd959693cadb
-MISC metadata.xml 467 RMD160 902dc34ff2858f3c1e0fc1a9bb4480f889a28a27 SHA1 cc040f1519138421f39d539a3ba3f616580db32d SHA256 9a7fdeabe603be14bc5517c18dfb5b52e90650ae5619addcf4adbd65a5071603
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkq2p/IACgkQkKaRLQcq0GINKgCggD9SStGlAcqy347LsS3ZVw9W
-euIAni2PCXYJrZGvfGmkN/rhh77iQnry
-=MAHV
------END PGP SIGNATURE-----
+EBUILD qmmp-0.3.0.ebuild 2226 RMD160 aab2d54b2ce4dc802229ae4d1fb1f3ea91c27c6b SHA1 18a77edde3b40a0a139748d9fb315aa2d48ea591 SHA256 eeff97bcba007c23b8be5292f9e2851ca73832312da72c4772f3cd69798af760
+MISC ChangeLog 2426 RMD160 a71e28a2b42d1d8e4bd20519b405a17a2be841fc SHA1 38556066845bf2742ab383a59af8c1c1259c94c2 SHA256 3529a4969007b5cfea7da38be4d52adb389a4cfab8e5bebded6355711149bd9d
+MISC metadata.xml 404 RMD160 78b497bb52adbac2ef4f220deb2075af2d082f4e SHA1 7987c9e852abfc01ed0db50186eee091c5372ba2 SHA256 2ad481276376cdc04d16b110697095803112b88c5ded9b5e33fb39cbd5fe0075
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 )