media-sound/qmmp: Add missing dev-qt/qdbusviewer dependency. Clean up. Bug #575012

Package-Manager: portage-2.2.27

5 files changed, 45 insertions, 173 deletions

diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 9d21b9b1138..62e0bd1eaa6 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,5 +1,3 @@
 DIST qmmp-0.9.2.tar.bz2 1112974 SHA256 90ac69a21779df5073efe71b25f28a7461d6a928deb1afbaa1ef8268f62ae9c5 SHA512 fc6cb0ec4bbf52e2ceb9e87a3585f25bd58b3a323ef07ddb9fd9f21a065ef0f5deb0b014f29b9648fe9e0a8b412f3b04643f8128638558089a25d867577690ad WHIRLPOOL 47a596b0f7d9e516737bfeb10a962f79edb74f61e2985b01f2cee80c8ff252a1709459f5712700784faef824e24ff3567d73f0d5759e2cd2c0c53c267cc6a026
-DIST qmmp-0.9.6.tar.bz2 1124762 SHA256 8d0ab2a8d3de49e34e8f7208ab3832aeea23a36307b271262ee1c0d637dec50b SHA512 92c240b163def08c9d68276384e34f916edfd7a9d0d2bdf0478f76c2da524119cfd20c5379329c75395f9930586b05f3c381f93328f6c50a4ea43ce106928578 WHIRLPOOL fb8db9d684e7a93923b34a8e6f2b34e4ad0716fe4b23d821440da80a5dfa06845be0808d61e541dc92751ebe58a631456369ff60db5f7e77fa9fe668521204b5
 DIST qmmp-0.9.7.tar.bz2 1125295 SHA256 339f260c8fac0c1ddcf4205b852724c0633e63a39d83ee1906b9661ef821bcdc SHA512 9a64043c94eeaed62af10f93e223aff7a9e4b09b79949b864f0092f7b64a458cf98883e983e3b9f24c8af277f7382b30a139666f5c1b1c9398b7feb125e7c844 WHIRLPOOL 7a082d38e3c6997515d8132a6207d456c9a052e27671daf3fab31def325279a092c1b3cc423ef835f4d6e28e88d7f5d90f57e4aa0a9a01bcaa072d6a82baaf39
-DIST qmmp-1.0.5.tar.bz2 1105704 SHA256 64952bfbe8b4bc6b74e04c4384fb923d0495f8380773ad7170b5a87fd2661ce1 SHA512 b4546457d3a4127a1911572233c367255fbbc6c08470bfb38b821062e516890186b6bd31960796bcb540b9c08610c9b9fcd193362d465dee9f722d431f70e699 WHIRLPOOL 28039c4b3cb16b3a7139534f37773081f96499eeb9b9f44b5f95bc010d290718d9f0a5cc7eb5b32565d16f7736e484053b4bd0ecb9d8eeeeb9734aeae8efea49
 DIST qmmp-1.0.6.tar.bz2 1107187 SHA256 e97965cb41426f0e2fc418a625b0f3097227a1414c81665a65bbd33802e77e7f SHA512 5faa68cddef230d03c5f208b46ed26abb6b88ed8d718aaeaefec368b54538f5e708827c8eef4233e69e494f1755c810da565da18fbca9a55284b7c36d74e7875 WHIRLPOOL a60fd777b72835bd630dbc082baedbb79448958eb5c3af1ce306dfa663869448548c087c81fe03c70be5d3334cb7551f0bedee3689a0cf6cbc936dd3a9123ca8
diff --git a/media-sound/qmmp/qmmp-0.9.6.ebuild b/media-sound/qmmp/qmmp-0.9.6.ebuild
deleted file mode 100644
index d90953185b4..00000000000
--- a/media-sound/qmmp/qmmp-0.9.6.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit cmake-utils
-[ "$PV" == "9999" ] && inherit subversion
-
-DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
-HOMEPAGE="http://qmmp.ylsoftware.com"
-if [ "$PV" != "9999" ]; then
-	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~ppc ~x86"
-else
-	SRC_URI=""
-	ESVN_REPO_URI="https://qmmp.googlecode.com/svn/trunk/qmmp/"
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# KEYWORDS further up
-IUSE="analyzer aac +alsa +dbus bs2b cdda cover crossfade cue curl enca ffmpeg flac jack game kde ladspa
-libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss
-projectm pulseaudio qsui scrobbler sndfile stereo tray udisks +vorbis wavpack"
-
-RDEPEND="media-libs/taglib
-	dev-qt/qtgui:4
-	alsa? ( media-libs/alsa-lib )
-	bs2b? ( media-libs/libbs2b )
-	cdda? ( dev-libs/libcdio-paranoia )
-	cue? ( media-libs/libcue )
-	curl? ( net-misc/curl )
-	dbus? ( sys-apps/dbus )
-	aac? ( media-libs/faad2 )
-	enca? ( app-i18n/enca )
-	flac? ( media-libs/flac )
-	game? ( media-libs/game-music-emu )
-	ladspa? ( media-libs/ladspa-cmt )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	midi? ( media-sound/wildmidi )
-	mms? ( media-libs/libmms )
-	mplayer? ( media-video/mplayer )
-	mpris? ( dev-qt/qtdbus:4 )
-	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? ( virtual/ffmpeg )
-	opus? ( media-libs/opusfile )
-	projectm? ( media-libs/libprojectm
-		dev-qt/qtopengl:4 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
-	wavpack? ( media-sound/wavpack )
-	scrobbler? ( net-misc/curl )
-	sndfile? ( media-libs/libsndfile )
-	udisks? ( sys-fs/udisks:2 )"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog README"
-
-CMAKE_IN_SOURCE_BUILD="1"
-
-REQUIRED_USE="kde? ( dbus ) "
-
-src_prepare() {
-	if has_version dev-libs/libcdio-paranoia; then
-		sed -i \
-			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
-			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_use alsa)
-		$(cmake-utils_use_use aac)
-		$(cmake-utils_use_use alsa)
-		$(cmake-utils_use_use analyzer)
-		$(cmake-utils_use_use bs2b)
-		$(cmake-utils_use_use cdda CDA)
-		$(cmake-utils_use_use crossfade)
-		$(cmake-utils_use_use cover)
-		$(cmake-utils_use_use cue)
-		$(cmake-utils_use_use curl)
-		$(cmake-utils_use_use dbus)
-		$(cmake-utils_use_use enca)
-		$(cmake-utils_use_use ffmpeg)
-		-DUSE_FFMPEG_LEGACY=OFF
-		$(cmake-utils_use_use flac)
-		$(cmake-utils_use_use game GME)
-		-DUSE_HAL=OFF
-		$(cmake-utils_use_use jack)
-		$(cmake-utils_use_use kde KDENOTIFY)
-		$(cmake-utils_use_use ladspa)
-		$(cmake-utils_use_use lyrics)
-		$(cmake-utils_use_use mad)
-		$(cmake-utils_use_use midi MIDI_WILDMIDI)
-		$(cmake-utils_use_use mplayer)
-		$(cmake-utils_use_use mms)
-		$(cmake-utils_use_use modplug)
-		$(cmake-utils_use_use mpris)
-		$(cmake-utils_use_use musepack MPC)
-		$(cmake-utils_use_use notifier)
-		$(cmake-utils_use_use opus)
-		$(cmake-utils_use_use oss)
-		$(cmake-utils_use_use projectm)
-		$(cmake-utils_use_use pulseaudio PULSE)
-		$(cmake-utils_use_use qsui)
-		$(cmake-utils_use_use scrobbler)
-		$(cmake-utils_use_use sndfile)
-		$(cmake-utils_use_use stereo)
-		$(cmake-utils_use_use tray STATICON)
-		$(cmake-utils_use_use udisks UDISKS2)
-		-DUSE_UDISKS=OFF
-		$(cmake-utils_use_use libsamplerate SRC)
-		$(cmake-utils_use_use vorbis)
-		$(cmake-utils_use_use wavpack)
-		)
-
-	cmake-utils_src_configure
-}
diff --git a/media-sound/qmmp/qmmp-0.9.7.ebuild b/media-sound/qmmp/qmmp-0.9.7-r1.ebuild
index 05b479f6dd5..9e3e826bfea 100644
--- a/media-sound/qmmp/qmmp-0.9.7.ebuild
+++ b/media-sound/qmmp/qmmp-0.9.7-r1.ebuild
@@ -27,6 +27,7 @@ projectm pulseaudio qsui scrobbler sndfile stereo tray udisks +vorbis wavpack"
 
 RDEPEND="media-libs/taglib
 	dev-qt/qtgui:4
+	dev-qt/qdbusviewer:4
 	alsa? ( media-libs/alsa-lib )
 	bs2b? ( media-libs/libbs2b )
 	cdda? ( dev-libs/libcdio-paranoia )
diff --git a/media-sound/qmmp/qmmp-1.0.5.ebuild b/media-sound/qmmp/qmmp-1.0.6-r1.ebuild
index 9eb2da36a38..ab3081cfff0 100644
--- a/media-sound/qmmp/qmmp-1.0.5.ebuild
+++ b/media-sound/qmmp/qmmp-1.0.6-r1.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 inherit cmake-utils
 [ "$PV" == "9999" ] && inherit subversion
 
-DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
+DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
 HOMEPAGE="http://qmmp.ylsoftware.com"
 if [ "$PV" != "9999" ]; then
 	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
@@ -27,6 +27,7 @@ libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus
 projectm pulseaudio qsui scrobbler sndfile stereo tray udisks +vorbis wavpack"
 
 RDEPEND="media-libs/taglib
+	dev-qt/qdbusviewer:5
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
@@ -87,48 +88,47 @@ src_prepare() {
 
 src_configure() {
 	mycmakeargs=(
-		$(cmake-utils_use_use alsa)
-		$(cmake-utils_use_use aac)
-		$(cmake-utils_use_use alsa)
-		$(cmake-utils_use_use analyzer)
-		$(cmake-utils_use_use bs2b)
-		$(cmake-utils_use_use cdda CDA)
-		$(cmake-utils_use_use crossfade)
-		$(cmake-utils_use_use cover)
-		$(cmake-utils_use_use cue)
-		$(cmake-utils_use_use curl)
-		$(cmake-utils_use_use dbus)
-		$(cmake-utils_use_use enca)
-		$(cmake-utils_use_use ffmpeg)
-		$(cmake-utils_use_use flac)
-		$(cmake-utils_use_use game GME)
+		-DUSE_alsa="$(usex alsa)"
+		-DUSE_aac="$(usex aac)"
+		-DUSE_analyzer="$(usex analyzer)"
+		-DUSE_bs2b="$(usex bs2b)"
+		-DUSE_CDA="$(usex cdda)"
+		-DUSE_crossfade="$(usex crossfade)"
+		-DUSE_cover="$(usex cover)"
+		-DUSE_cue="$(usex cue)"
+		-DUSE_curl="$(usex curl)"
+		-DUSE_dbus="$(usex dbus)"
+		-DUSE_enca="$(usex enca)"
+		-DUSE_ffmpeg="$(usex ffmpeg)"
+		-DUSE_flac="$(usex flac)"
+		-DUSE_GME="$(usex game)"
 		-DUSE_HAL=OFF
-		$(cmake-utils_use_use jack)
-		$(cmake-utils_use_use kde KDENOTIFY)
-		$(cmake-utils_use_use ladspa)
-		$(cmake-utils_use_use lyrics)
-		$(cmake-utils_use_use mad)
-		$(cmake-utils_use_use midi MIDI_WILDMIDI)
-		$(cmake-utils_use_use mplayer)
-		$(cmake-utils_use_use mms)
-		$(cmake-utils_use_use modplug)
-		$(cmake-utils_use_use mpris)
-		$(cmake-utils_use_use musepack MPC)
-		$(cmake-utils_use_use notifier)
-		$(cmake-utils_use_use opus)
-		$(cmake-utils_use_use oss)
-		$(cmake-utils_use_use projectm)
-		$(cmake-utils_use_use pulseaudio PULSE)
-		$(cmake-utils_use_use qsui)
-		$(cmake-utils_use_use scrobbler)
-		$(cmake-utils_use_use sndfile)
-		$(cmake-utils_use_use stereo)
-		$(cmake-utils_use_use tray STATICON)
-		$(cmake-utils_use_use udisks UDISKS2)
-		$(cmake-utils_use_use libsamplerate SRC)
-		$(cmake-utils_use_use vorbis)
-		$(cmake-utils_use_use wavpack)
-		)
+		-DUSE_jack="$(usex jack)"
+		-DUSE_KDENOTIFY="$(usex kde)"
+		-DUSE_ladspa="$(usex ladspa)"
+		-DUSE_lyrics="$(usex lyrics)"
+		-DUSE_mad="$(usex mad)"
+		-DUSE_MIDI_WILDMIDI="$(usex midi)"
+		-DUSE_mplayer="$(usex mplayer)"
+		-DUSE_mms="$(usex mms)"
+		-DUSE_modplug="$(usex modplug)"
+		-DUSE_mpris="$(usex mpris)"
+		-DUSE_MPC="$(usex musepack)"
+		-DUSE_notifier="$(usex notifier)"
+		-DUSE_opus="$(usex opus)"
+		-DUSE_oss="$(usex oss)"
+		-DUSE_projectm="$(usex projectm)"
+		-DUSE_PULSE="$(usex pulseaudio)"
+		-DUSE_qsui="$(usex qsui)"
+		-DUSE_scrobbler="$(usex scrobbler)"
+		-DUSE_sndfile="$(usex sndfile)"
+		-DUSE_stereo="$(usex stereo)"
+		-DUSE_STATICON="$(usex tray)"
+		-DUSE_UDISKS2="$(usex udisks)"
+		-DUSE_SRC="$(usex libsamplerate)"
+		-DUSE_vorbis="$(usex vorbis)"
+		-DUSE_wavpack="$(usex wavpack)"
+	)
 
 	cmake-utils_src_configure
 }
diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild
index 4cba7f4c13a..f048e0ad562 100644
--- a/media-sound/qmmp/qmmp-9999.ebuild
+++ b/media-sound/qmmp/qmmp-9999.ebuild
@@ -27,6 +27,7 @@ libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus
 projectm pulseaudio qsui scrobbler sndfile stereo tray udisks +vorbis wavpack"
 
 RDEPEND="media-libs/taglib
+	dev-qt/qdbusviewer:5
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5