media-sound/qmmp: USE: kde->dbus; add gnome,libav,sid,qtmedia; drop mpris

virtual/ffmpeg -> ffmpeg/libav
Consolidate USE kde, mpris into one dbus flag
Add USE=gnome to get full control over optional dev-qt/qtdbus DEPEND
Add USE=qtmedia to control missing dev-qt/qtmultimedia DEPEND
Add missing DEPENDs: dev-libs/libcdio, x11-libs/libX11
Sort IUSE, DEPENDs
CMAKE_IN_SOURCE_BUILD seems not necessary anymore.
metadata.xml: Indentation

Gentoo-bug: 610838

Package-Manager: Portage-2.3.3, Repoman-2.3.1

2 files changed, 79 insertions, 57 deletions

diff --git a/media-sound/qmmp/metadata.xml b/media-sound/qmmp/metadata.xml
index 81b6c44ec59b..9e4d00ae5823 100644
--- a/media-sound/qmmp/metadata.xml
+++ b/media-sound/qmmp/metadata.xml
@@ -1,33 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-  	<email>hwoarang@gentoo.org</email>
-	<name>Markos Chandras</name>
+	<maintainer type="person">
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+		</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
 	</maintainer>
-  <maintainer type="project">
-    <email>sound@gentoo.org</email>
-    <name>Gentoo Sound project</name>
-  </maintainer>
-  <use>
-    <flag name="analyzer">Enable visual analyzer</flag>
-    <flag name="bs2b">Enable Bauer stereophonic-to-binaural headphone filter</flag>
-	<flag name="crossfade">Enable crossfade effect when switching tracks</flag>
-	<flag name="cover">Enable album cover support</flag>
-	<flag name="cue">enable CUE sheet parsing</flag>
-	<flag name="enca">Detects the character encoding automatically</flag>
-	<flag name="game">Enable Game music support</flag>
-	<flag name="lyrics">Fetch track lyrics from the web</flag>
-	<flag name="midi">Enable midi support using wildmidi library</flag>
-	<flag name="mpris">Enable MPRIS support</flag>
-	<flag name="notifier">Enable qmmps' notifier system</flag>
-	<flag name="opus">Enable the opus plugin</flag>
-	<flag name="qsui">Enable QMMP simple UI</flag>
-	<flag name="stereo">Enable stereo effect</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>
-    <flag name="soxr">Use the SoX resampling library</flag>
-  </use>
+	<use>
+		<flag name="analyzer">Enable visual analyzer</flag>
+		<flag name="bs2b">Enable Bauer stereophonic-to-binaural headphone filter</flag>
+		<flag name="cover">Enable album cover support</flag>
+		<flag name="crossfade">Enable crossfade effect when switching tracks</flag>
+		<flag name="cue">enable CUE sheet parsing</flag>
+		<flag name="dbus">Enable DBus notifiications and MPRIS support</flag>
+		<flag name="enca">Detects the character encoding automatically</flag>
+		<flag name="game">Enable Game music support</flag>
+		<flag name="gnome">Enable Gnome hotkey support (requires Qt5DBus)</flag>
+		<flag name="kde">Use kde4 notifier system</flag>
+		<flag name="lyrics">Fetch track lyrics from the web</flag>
+		<flag name="midi">Enable midi support using wildmidi library</flag>
+		<flag name="mpris">Enable MPRIS support</flag>
+		<flag name="notifier">Enable qmmps' notifier system</flag>
+		<flag name="opus">Enable the opus plugin</flag>
+		<flag name="projectm">Enable projectm music visualization plugin</flag>
+		<flag name="qsui">Enable QMMP simple UI</flag>
+		<flag name="qtmedia">Enable playback via <pkg>dev-qt/qtmultimedia</pkg></flag>
+		<flag name="scrobbler">Enable audioscrobbler/last.fm support</flag>
+		<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
+		<flag name="soxr">Use the SoX resampling library</flag>
+		<flag name="stereo">Enable stereo effect</flag>
+		<flag name="tray">Build tray icon</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild
index 488c726cc443..be65bb451616 100644
--- a/media-sound/qmmp/qmmp-9999.ebuild
+++ b/media-sound/qmmp/qmmp-9999.ebuild
@@ -1,76 +1,91 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=6
 
 inherit cmake-utils
-[ "$PV" == "9999" ] && inherit subversion
+[[ ${PV} = 9999 ]] && inherit subversion
 
 DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
 HOMEPAGE="http://qmmp.ylsoftware.com"
-if [ "$PV" != "9999" ]; then
+if [[ ${PV} != 9999 ]]; then
 	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 else
 	QMMP_DEV_BRANCH="1.1"
-	SRC_URI=""
 	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
-	KEYWORDS=""
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
 # KEYWORDS further up
-IUSE="analyzer aac +alsa bs2b cdda cover crossfade cue curl enca ffmpeg flac jack game kde ladspa
-lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss projectm
-pulseaudio qsui scrobbler sndfile soxr stereo tray udisks +vorbis wavpack"
+IUSE="aac +alsa analyzer bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game gnome
+jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
+pulseaudio qsui qtmedia scrobbler sid sndfile soxr stereo tray udisks +vorbis wavpack"
 
-RDEPEND="media-libs/taglib
+RDEPEND="
 	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
+	media-libs/taglib
+	x11-libs/libX11
+	aac? ( media-libs/faad2 )
 	alsa? ( media-libs/alsa-lib )
 	bs2b? ( media-libs/libbs2b )
-	cdda? ( dev-libs/libcdio-paranoia )
+	cdda? (
+		dev-libs/libcdio
+		dev-libs/libcdio-paranoia
+	)
 	cue? ( media-libs/libcue )
 	curl? ( net-misc/curl )
-	aac? ( media-libs/faad2 )
+	dbus? ( dev-qt/qtdbus:5 )
 	enca? ( app-i18n/enca )
+	ffmpeg? (
+		!libav? ( media-video/ffmpeg:= )
+		libav? ( media-video/libav:= )
+	)
 	flac? ( media-libs/flac )
 	game? ( media-libs/game-music-emu )
+	jack? (
+		media-libs/libsamplerate
+		media-sound/jack-audio-connection-kit
+	)
 	ladspa? ( media-libs/ladspa-cmt )
 	mad? ( media-libs/libmad )
 	midi? ( media-sound/wildmidi )
 	mms? ( media-libs/libmms )
+	modplug? ( >=media-libs/libmodplug-0.8.4 )
 	mplayer? ( media-video/mplayer )
-	mpris? ( dev-qt/qtdbus:5 )
 	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
+	projectm? (
+		dev-qt/qtgui:5[-gles2]
 		dev-qt/qtopengl:5
-		dev-qt/qtgui:5[-gles2] )
+		media-libs/libprojectm
+	)
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
-	wavpack? ( media-sound/wavpack )
+	qtmedia? ( dev-qt/qtmultimedia:5 )
 	scrobbler? ( net-misc/curl )
 	sndfile? ( media-libs/libsndfile )
+	sid? ( >=media-libs/libsidplayfp-1.1.0 )
 	soxr? ( media-libs/soxr )
-	udisks? ( sys-fs/udisks:2 )"
+	udisks? ( sys-fs/udisks:2 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	wavpack? ( media-sound/wavpack )
+"
 DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
+	dev-qt/linguist-tools:5
+"
 
-DOCS="AUTHORS ChangeLog README"
+DOCS=( AUTHORS ChangeLog README )
 
-CMAKE_IN_SOURCE_BUILD="1"
+REQUIRED_USE="gnome? ( dbus ) udisks? ( dbus )"
 
 src_prepare() {
 	if has_version dev-libs/libcdio-paranoia; then
@@ -83,7 +98,7 @@ src_prepare() {
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DUSE_ALSA="$(usex alsa)"
 		-DUSE_AAC="$(usex aac)"
 		-DUSE_ANALYZER="$(usex analyzer)"
@@ -97,9 +112,10 @@ src_configure() {
 		-DUSE_FFMPEG="$(usex ffmpeg)"
 		-DUSE_FLAC="$(usex flac)"
 		-DUSE_GME="$(usex game)"
+		-DUSE_GNOMEHOTKEY="$(usex gnome)"
 		-DUSE_HAL=OFF
 		-DUSE_JACK="$(usex jack)"
-		-DUSE_KDENOTIFY="$(usex kde)"
+		-DUSE_KDENOTIFY="$(usex dbus)"
 		-DUSE_LADSPA="$(usex ladspa)"
 		-DUSE_LYRICS="$(usex lyrics)"
 		-DUSE_MAD="$(usex mad)"
@@ -107,7 +123,7 @@ src_configure() {
 		-DUSE_MPLAYER="$(usex mplayer)"
 		-DUSE_MMS="$(usex mms)"
 		-DUSE_MODPLUG="$(usex modplug)"
-		-DUSE_MPRIS="$(usex mpris)"
+		-DUSE_MPRIS="$(usex dbus)"
 		-DUSE_MPC="$(usex musepack)"
 		-DUSE_NOTIFIER="$(usex notifier)"
 		-DUSE_OPUS="$(usex opus)"
@@ -115,7 +131,9 @@ src_configure() {
 		-DUSE_PROJECTM="$(usex projectm)"
 		-DUSE_PULSE="$(usex pulseaudio)"
 		-DUSE_QSUI="$(usex qsui)"
+		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
 		-DUSE_SCROBBLER="$(usex scrobbler)"
+		-DUSE_SID="$(usex sid)"
 		-DUSE_SNDFILE="$(usex sndfile)"
 		-DUSE_SOXR="$(usex soxr)"
 		-DUSE_STEREO="$(usex stereo)"