Version bump

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

4 files changed, 141 insertions, 5 deletions

diff --git a/media-sound/qmmp/ChangeLog b/media-sound/qmmp/ChangeLog
index e419ed01cfe8..30901c3f19b2 100644
--- a/media-sound/qmmp/ChangeLog
+++ b/media-sound/qmmp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/qmmp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/ChangeLog,v 1.33 2010/04/19 14:25:31 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/ChangeLog,v 1.34 2010/05/02 09:50:57 hwoarang Exp $
+
+*qmmp-0.4.0 (02 May 2010)
+
+  02 May 2010; Markos Chandras <hwoarang@gentoo.org> +qmmp-0.4.0.ebuild,
+  qmmp-9999.ebuild, metadata.xml:
+  Version bump
 
 *qmmp-0.3.4 (19 Apr 2010)
 
diff --git a/media-sound/qmmp/metadata.xml b/media-sound/qmmp/metadata.xml
index 2804c9650461..6a00bbd7f926 100644
--- a/media-sound/qmmp/metadata.xml
+++ b/media-sound/qmmp/metadata.xml
@@ -4,7 +4,15 @@
   <herd>sound</herd>
   <use>
     <flag name="bs2b">Enable Bauer stereophonic-to-binaural headphone filter</flag>
-    <flag name="projectm">Enable projectm music visualization plugin</flag>
+	<flag name="cover">Enable album cover support</flag>
+	<flag name="enca">Detects the character encoding automatically</flag>
+	<flag name="lyrics">Fetch track lyrics from the web</flag>
+	<flag name="mms">Enable mms support</flag>
+	<flag name="mpris">Enable MPRIS support</flag>
+	<flag name="notifier">Enable qmmps' notifier system</flag>
+	<flag name="tray">Build tray icon</flag>
+    <flag name="kde">Use kde4 notifier system</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.4.0.ebuild b/media-sound/qmmp/qmmp-0.4.0.ebuild
new file mode 100644
index 000000000000..9a045d28f74e
--- /dev/null
+++ b/media-sound/qmmp/qmmp-0.4.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-0.4.0.ebuild,v 1.1 2010/05/02 09:50:57 hwoarang Exp $
+
+EAPI="2"
+
+inherit cmake-utils
+[ "$PV" == "9999" ] && inherit subversion
+
+DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com/index_en.php"
+if [ "$PV" != "9999" ]; then
+	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	SRC_URI=""
+	ESVN_REPO_URI="http://qmmp.googlecode.com/svn/trunk/qmmp/"
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="aac +alsa +dbus bs2b cover enca ffmpeg flac hal jack kde ladspa
+libsamplerate lyrics +mad mms modplug mplayer mpris musepack notifier oss projectm pulseaudio scrobbler sndfile tray +vorbis wavpack"
+
+RDEPEND="x11-libs/qt-gui:4[qt3support]
+	media-libs/taglib
+	alsa? ( media-libs/alsa-lib )
+	bs2b? ( media-libs/libbs2b )
+	cdrom? ( dev-libs/libcdio )
+	dbus? ( sys-apps/dbus )
+	aac? ( media-libs/faad2 )
+	enca? ( app-i18n/enca )
+	flac? ( media-libs/flac )
+	hal? ( sys-apps/hal )
+	ladspa? ( media-libs/ladspa-cmt )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	mms? ( media-libs/libmms )
+	mplayer? ( media-video/mplayer )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	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 )
+	projectm? ( media-libs/libprojectm )
+	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"
+
+CMAKE_IN_SOURCE_BUILD="1"
+
+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_configure() {
+	mycmakeargs="${mycmakeargs}
+		$(qmmp_use_enable alsa ALSA)
+		$(qmmp_use_enable aac AAC)
+		$(qmmp_use_enable bs2b BS2B)
+		$(qmmp_use_enable cover COVER)
+		$(qmmp_use_enable cdrom CDA)
+		$(qmmp_use_enable dbus DBUS)
+		$(qmmp_use_enable enca ENCA)
+		$(qmmp_use_enable ffmpeg FFMPEG)
+		$(qmmp_use_enable flac FLAC)
+		$(qmmp_use_enable hal HAL)
+		$(qmmp_use_enable jack JACK)
+		$(qmmp_use_enable kde KDENOTIFY)
+		$(qmmp_use_enable ladspa LADSPA)
+		$(qmmp_use_enable lyrics LYRICS)
+		$(qmmp_use_enable mad MAD)
+		$(qmmp_use_enable mplayer MPLAYER)
+		$(qmmp_use_enable mms MMS)
+		$(qmmp_use_enable modplug MODPLUG)
+		$(qmmp_use_enable mpris MPRIS)
+		$(qmmp_use_enable musepack MPC)
+		$(qmmp_use_enable notifier NOTIFIER)
+		$(qmmp_use_enable oss OSS)
+		$(qmmp_use_enable projectm PROJECTM)
+		$(qmmp_use_enable pulseaudio PULSE)
+		$(qmmp_use_enable scrobbler SCROBBLER)
+		$(qmmp_use_enable sndfile SNDFILE)
+		$(qmmp_use_enalbe tray STATICON)
+		$(qmmp_use_enable libsamplerate SRC)
+		$(qmmp_use_enable vorbis VORBIS)
+		$(qmmp_use_enable wavpack WAVPACK)"
+
+	cmake-utils_src_configure
+}
diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild
index f64081bc511d..6ce36ba0e307 100644
--- a/media-sound/qmmp/qmmp-9999.ebuild
+++ b/media-sound/qmmp/qmmp-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-9999.ebuild,v 1.3 2010/03/06 11:44:27 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-9999.ebuild,v 1.4 2010/05/02 09:50:57 hwoarang Exp $
 
 EAPI="2"
 
@@ -21,17 +21,24 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 # KEYWORDS further up
-IUSE="aac +alsa +dbus bs2b ffmpeg flac jack libsamplerate +mad modplug musepack oss projectm pulseaudio scrobbler sndfile +vorbis wavpack"
+IUSE="aac +alsa +dbus bs2b cover enca ffmpeg flac hal jack kde ladspa
+libsamplerate lyrics +mad mms modplug mplayer mpris musepack notifier oss projectm pulseaudio scrobbler sndfile tray +vorbis wavpack"
 
 RDEPEND="x11-libs/qt-gui:4[qt3support]
 	media-libs/taglib
 	alsa? ( media-libs/alsa-lib )
 	bs2b? ( media-libs/libbs2b )
+	cdrom? ( dev-libs/libcdio )
 	dbus? ( sys-apps/dbus )
 	aac? ( media-libs/faad2 )
+	enca? ( app-i18n/enca )
 	flac? ( media-libs/flac )
+	hal? ( sys-apps/hal )
+	ladspa? ( media-libs/ladspa-cmt )
 	libsamplerate? ( media-libs/libsamplerate )
 	mad? ( media-libs/libmad )
+	mms? ( media-libs/libmms )
+	mplayer? ( media-video/mplayer )
 	musepack? ( >=media-sound/musepack-tools-444 )
 	modplug? ( >=media-libs/libmodplug-0.8.4 )
 	vorbis? ( media-libs/libvorbis
@@ -39,7 +46,7 @@ RDEPEND="x11-libs/qt-gui:4[qt3support]
 	jack? ( media-sound/jack-audio-connection-kit
 		media-libs/libsamplerate )
 	ffmpeg? ( media-video/ffmpeg )
-	projectm? ( >=media-libs/libprojectm-1.2.0 )
+	projectm? ( media-libs/libprojectm )
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
 	wavpack? ( media-sound/wavpack )
 	scrobbler? ( net-misc/curl )
@@ -64,18 +71,30 @@ src_configure() {
 		$(qmmp_use_enable alsa ALSA)
 		$(qmmp_use_enable aac AAC)
 		$(qmmp_use_enable bs2b BS2B)
+		$(qmmp_use_enable cover COVER)
+		$(qmmp_use_enable cdrom CDA)
 		$(qmmp_use_enable dbus DBUS)
+		$(qmmp_use_enable enca ENCA)
 		$(qmmp_use_enable ffmpeg FFMPEG)
 		$(qmmp_use_enable flac FLAC)
+		$(qmmp_use_enable hal HAL)
 		$(qmmp_use_enable jack JACK)
+		$(qmmp_use_enable kde KDENOTIFY)
+		$(qmmp_use_enable ladspa LADSPA)
+		$(qmmp_use_enable lyrics LYRICS)
 		$(qmmp_use_enable mad MAD)
+		$(qmmp_use_enable mplayer MPLAYER)
+		$(qmmp_use_enable mms MMS)
 		$(qmmp_use_enable modplug MODPLUG)
+		$(qmmp_use_enable mpris MPRIS)
 		$(qmmp_use_enable musepack MPC)
+		$(qmmp_use_enable notifier NOTIFIER)
 		$(qmmp_use_enable oss OSS)
 		$(qmmp_use_enable projectm PROJECTM)
 		$(qmmp_use_enable pulseaudio PULSE)
 		$(qmmp_use_enable scrobbler SCROBBLER)
 		$(qmmp_use_enable sndfile SNDFILE)
+		$(qmmp_use_enalbe tray STATICON)
 		$(qmmp_use_enable libsamplerate SRC)
 		$(qmmp_use_enable vorbis VORBIS)
 		$(qmmp_use_enable wavpack WAVPACK)"