Version bump

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

diff --git a/media-sound/qmmp/ChangeLog b/media-sound/qmmp/ChangeLog
index e419ed01cfe80908d0f3bf84f013adcefe433ae6..30901c3f19b2fc51d0f6c58fa485f5c5de5843f5 100644 (file)
--- 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/Manifest b/media-sound/qmmp/Manifest
index f598a8f8c424541c7cad8a31cf76a638f0107838..82974a9261f85dbcef2e67274c3487f35f401832 100644 (file)
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -3,10 +3,12 @@ DIST qmmp-0.3.1.tar.bz2 490423 RMD160 ffce4cb387015db1ff6c1ff2b83fdf3c1f849984 S
 DIST qmmp-0.3.2.tar.bz2 491479 RMD160 a51f2ac118ed999f85e6e4d77f3ccc132f5b9a0e SHA1 84f66a0ab85ab257a3e8b02e12871ceebe30c4fc SHA256 3bfbc954591ad261459344182d8885c3a05683ea6f440504c17c5ecfdbb8be78
 DIST qmmp-0.3.3.tar.bz2 493424 RMD160 9008c4f91456936e76d861b02bc17d63e48fc88b SHA1 0816a6ae403d08891eb0f65239fff35cd743a3c5 SHA256 8646dac135dcd83d69797b266bc359b2ed8e32d9223f11d03ad7f7350c2f2953
 DIST qmmp-0.3.4.tar.bz2 494767 RMD160 0231da2ddd038b5a87c55118004201606c4e4ee1 SHA1 3460c8a2645ca7b16d7a4fe582e56a3564e23f16 SHA256 ee93845f29ba962a8c7b5498a1b79a05fa54c7023b51342724477a7ce22a871c
+DIST qmmp-0.4.0.tar.bz2 613749 RMD160 7749e86d8e7b3877afe6b140c08c8eca3a79a7a8 SHA1 741ad3d362c5889ca8dcbdfd8d48163f7dcce6df SHA256 20270813a59d973fb0b7dcd870d9f3d0d4d1eeed00e1a40b5b2fb9e95681e689
 EBUILD qmmp-0.3.1.ebuild 2459 RMD160 1f1c3da51c9bcdfa67749409d413eded112a35ae SHA1 cbc38a57c3b24af25617aa810326748d8253ca23 SHA256 76a49b336a84b68a62e27b77ce90c8808be122c568a14a74e56528d84fe95287
 EBUILD qmmp-0.3.2-r1.ebuild 2518 RMD160 5e68a1ea34d38eb7eaeb2d27a29a832c74c9c948 SHA1 488701663e37d6b5b6432a600bc5dee12641db3e SHA256 beedf5734ed1bfbbdddb860315fca21ec4b01564b5d3ad0d19a0d5c98985f1db
 EBUILD qmmp-0.3.3.ebuild 2458 RMD160 d395ef2856e7a789097fc0c436e78ff9bba8082e SHA1 756b7e1ed952938d0e2955e292fdd9bc7508828f SHA256 6c1cef155da3e79b161a130cece82afb45b6eb922ed49be762b2c89b61920f16
 EBUILD qmmp-0.3.4.ebuild 2458 RMD160 20bede9ab357f7a05320ddd0791ce10148c0ae67 SHA1 5d0626d3496eb25aa2b1713c610d7dbcbc79d666 SHA256 7e5bc031b15a954e94fc42644efdde527c53f461b62640b6fc1452e6d1f46436
-EBUILD qmmp-9999.ebuild 2456 RMD160 ae9dec6d231fc2658dfd21d10bf46f425f477a67 SHA1 af9666f2da38c814eade57342c507f0420268f01 SHA256 27fd96c88603dd785f3da742021a077be814c2e052e0c74a3a367b9fd688c7a9
-MISC ChangeLog 4596 RMD160 9c3ba2cf9ee3b9156a589b4692535b5645769e62 SHA1 6b10c315a3dc5c2cf0afba4db531a91eb5af14f0 SHA256 a61101443cd17dcc7d5abca89aa6c4234fb59ed244d97359624a0a72dba26e4a
-MISC metadata.xml 409 RMD160 1b1111c050fd665ca2eb3662e104fc051d0d817a SHA1 4d17839362ce6cda9f2dd7153e457d2d0a042798 SHA256 de8224b3db3607762ad766e5afa3ec0e4971bc3dfbb4ddaed1ee973761a13bac
+EBUILD qmmp-0.4.0.ebuild 3090 RMD160 e73c174da6f11a6828a95c985d158f730b9b694e SHA1 403723d1c1655e743e71ed9ee6cac073d0311e03 SHA256 60c0b8ebad4f4a61d52abb0bc1b0a4e2fc160c312eed2cdaa89e4e9f1867047c
+EBUILD qmmp-9999.ebuild 3089 RMD160 c09e879f7e8bbe236511af3bd3186bb82d567376 SHA1 d334ff42175b8454fdec4cede3278f3f7b3f2d12 SHA256 6b6e7b73ddf4433ee31f5f05408bea5869d1701fd31d3f1036095045ba2df64b
+MISC ChangeLog 4746 RMD160 6193de6c9a0e2581ba9fbd19f61bea094942784b SHA1 5ef0891e9540e39b5d6ecd92af4c4b33bb03f292 SHA256 fc9eed8c96db7c50304b1bd629495ec721e50eeba701fa60906b425524ffab95
+MISC metadata.xml 838 RMD160 2029a9a18ee2fa7a32d48a1d0cad0d57ebbf6afb SHA1 9a1e0a8f138e431641d514d6e43b0be859419049 SHA256 3290f1456911454ebed9867db9abbc8de6376420c46512a33bba1512585bfe5f

diff --git a/media-sound/qmmp/metadata.xml b/media-sound/qmmp/metadata.xml
index 2804c96504610e72259998ecd921891f69e84f92..6a00bbd7f92693cbc7bbbfbc3c269d9f41bb0dff 100644 (file)
--- 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 (file)
index 0000000..9a045d2
--- /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 f64081bc511d698c0a457f992f8656aa44eb9cfa..6ce36ba0e307839bfefed73a6273b83b34a2edee 100644 (file)
--- 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)"