media-sound/amarok: fix deps, metadata.xml

media-sound/amarok/amarok-9999-r1.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -36,12 +36,12 @@ COMMONDEPEND="
 	>=media-libs/taglib-extras-1.0.1
 	sys-libs/zlib
 	>=virtual/mysql-5.1[embedded?]
-	x11-libs/qt-script
+	dev-qt/qtscript
 	>=x11-libs/qtscriptgenerator-0.1.0
 	cdda? (
 		$(add_kdebase_dep libkcddb)
 		$(add_kdebase_dep libkcompactdisc)
-		$(add_kdebase_dep kdemultimedia-kioslaves)
+		$(add_kdebase_dep audiocd-kio)
 	)
 	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
 	lastfm? ( >=media-libs/liblastfm-0.3.0 )
@@ -51,15 +51,15 @@ COMMONDEPEND="
 		dev-libs/openssl
 		net-libs/loudmouth
 		net-misc/curl
-		x11-libs/qt-core[glib]
+		dev-qt/qtcore[glib]
 	)
 	mtp? ( >=media-libs/libmtp-1.0.0 )
 	ofa? ( >=media-libs/libofa-0.9.0 )
 	opengl? ( virtual/opengl )
 "
 DEPEND="${COMMONDEPEND}
 	dev-util/automoc
-	dev-util/pkgconfig
+	virtual/pkgconfig
 	test? ( >=dev-cpp/gmock-1.4.0 )
 "
 RDEPEND="${COMMONDEPEND}

media-sound/amarok/metadata.xml

@@ -22,9 +22,6 @@
     <flag name="lastfm">Enable Last.fm streaming services support through <pkg>media-libs/liblastfm</pkg></flag>
     <flag name="mp3tunes">Enable mp3tunes integration</flag>
     <flag name="ofa">Use <pkg>media-libs/libofa</pkg> to compute MusicDNS acoustic fingerprints (used by MusicBrainz)</flag>
-	<flag name="playdar">Build the playdar collection</flag>
-	<flag name="player">Build the player</flag>
-	<flag name="upnp">Support for upnp servers</flag>
-	<flag name="utils">Build the utils - old <pkg>media-sound/amarok-utils</pkg></flag>
+    <flag name="utils">Build the utils - old <pkg>media-sound/amarok-utils</pkg></flag>
   </use>
 </pkgmetadata>