Drop old buggy revision. Drop monolithic Qt dep alternative.

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

3 files changed, 8 insertions, 75 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/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
-}