Drop old buggy revision. Drop monolithic Qt dep alternative.

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

4 files changed, 10 insertions, 78 deletions

diff --git a/media-sound/qmmp/ChangeLog b/media-sound/qmmp/ChangeLog
index 53913f735f87..1940b0b624ca 100644
--- a/media-sound/qmmp/ChangeLog
+++ b/media-sound/qmmp/ChangeLog
@@ -1,6 +1,10 @@
 # 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.4 2009/02/23 20:41:38 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/ChangeLog,v 1.5 2009/03/25 07:04:16 yngwin Exp $
+
+  25 Mar 2009; Ben de Groot <yngwin@gentoo.org> -qmmp-0.2.3.ebuild,
+  qmmp-0.2.3-r1:
+  Drop old buggy revision. Drop monolithic Qt dep alternative.
 
   23 Feb 2009; Markos Chandras <hwoarang@gentoo.org> qmmp-0.2.3,
   qmmp-0.2.3-r1:
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 7e033cedf250..b85bf66d62d2 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,7 +1,6 @@
 AUX qmmp-0.2.3-fix-playlist-download.patch 2943 RMD160 57558ec0c833862ccbb6e1d7bf912c368eb21bdb SHA1 57b97aaed871df9f43293a86162903fd0079cfcf SHA256 ba6b7210999fe3779e6e1b137297e4f4c88158fd3b40104d8d268735dfd52b2f
 AUX qmmp-0.2.3-fix-xspf.patch 1223 RMD160 e49770d519e10d3f9ad80b4ba5c707112f7a5777 SHA1 3cac0f6882ec526ae6f6593b145e714eb7901b75 SHA256 e4bdd87aed7fc5f8ee1ffd57bc674595aff40c7826ec8a9fd20623b6229dd323
 DIST qmmp-0.2.3.tar.bz2 382224 RMD160 14dc9fdcf53ff52ac0e538ba1bf099db334301a5 SHA1 5269725e3ed608038d47e415ecf64d7e24693843 SHA256 cce0f421ec9f8c56eaa637b6c0330808ce23b09d03600c2be7c99c18edcc7162
-EBUILD qmmp-0.2.3-r1.ebuild 2185 RMD160 49f81dd76af1262504e47c28c8d5f1ab101a3d4c SHA1 fb161b3e4af4317fcc3dba70d41c93fc1a8d9838 SHA256 d3da4e721aaa5a90bcf406035c4997121d658546573b61268083a4b32088a68f
-EBUILD qmmp-0.2.3.ebuild 2054 RMD160 0a482bcb6b7f8613529630229511ec56296a181a SHA1 9f7abe06ec89b1964f8e4f543ead25a66d19e6dc SHA256 46ec8627d1a4d799dc4cb37615968e4c127e53136614d1dec8a44e23eedf3f0e
-MISC ChangeLog 936 RMD160 27112baae1ed357b91050b813448ca5164c7a882 SHA1 0b4554dfb4974eae3ff4a15f6160e34715bded24 SHA256 5ebc166192153589c9abdf152445a8e8600fd1bb22add48014f2eaa57686ac19
+EBUILD qmmp-0.2.3-r1.ebuild 2132 RMD160 543161f5c92168ff01ed68ed0579cced86c212fb SHA1 b0a0e99b0b391f767bf01ef700c26f1e83b24e8f SHA256 65a2e5fe5b56f8543a209ddbb6fa4a8667cdbd98b94609e7db08c26c75df42dc
+MISC ChangeLog 1083 RMD160 0ea9c79c5456ce10aa12f01e97b954bda8d21d91 SHA1 9abc2e52f56f97928c20ce8b2e3e8ea3fd711d08 SHA256 90d1380f0b55a52edb03bfd30163a4b5cde3d1aa29e22df63f646039d8c30faa
 MISC metadata.xml 316 RMD160 7a7a7ec2ffde8476e4f3b5d041d6029344f98c8a SHA1 587ef05d574b566494ad6cbb91aea571290487e2 SHA256 9ddbcd71e77874b34d4b0a197c86cf8712c381a7b3944dee6e827a650d39272c
diff --git a/media-sound/qmmp/qmmp-0.2.3-r1.ebuild b/media-sound/qmmp/qmmp-0.2.3-r1.ebuild
index 3011a16592db..a3a88427c956 100644
--- a/media-sound/qmmp/qmmp-0.2.3-r1.ebuild
+++ b/media-sound/qmmp/qmmp-0.2.3-r1.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.2.3-r1.ebuild,v 1.2 2009/02/23 20:41:38 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-0.2.3-r1.ebuild,v 1.3 2009/03/25 07:04:16 yngwin Exp $
 
 EAPI="2"
 
@@ -16,7 +16,7 @@ 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 =x11-libs/qt-4.3*:4 )
+RDEPEND="x11-libs/qt-gui:4
 	media-libs/taglib
 	alsa? ( media-libs/alsa-lib )
 	dbus? ( sys-apps/dbus )
@@ -34,8 +34,7 @@ RDEPEND="|| ( x11-libs/qt-gui:4 =x11-libs/qt-4.3*:4 )
 	wavpack? ( media-sound/wavpack )
 	scrobbler? ( net-misc/curl )
 	sndfile? ( media-libs/libsndfile )"
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.4.8"
+DEPEND="${RDEPEND}"
 
 DOCS="AUTHORS ChangeLog README"
 
diff --git a/media-sound/qmmp/qmmp-0.2.3.ebuild b/media-sound/qmmp/qmmp-0.2.3.ebuild
deleted file mode 100644
index edcde069f9d1..000000000000
--- a/media-sound/qmmp/qmmp-0.2.3.ebuild
+++ /dev/null
@@ -1,70 +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.3.ebuild,v 1.3 2009/02/23 20:41:38 hwoarang Exp $
-
-EAPI="1"
-
-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 =x11-libs/qt-4.3*: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}
-	>=dev-util/cmake-2.4.8"
-
-DOCS="AUTHORS ChangeLog README"
-
-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
-}