[media-sound/amarok] Synchronized ebuilds, fixed cdaudio->cdda in live ebuild, fixed metadata.xml

4 files changed, 16 insertions, 18 deletions

diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index d9728d3d35d..149bb88626a 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,5 +1,5 @@
 AUX disable_bindings_test.patch 550 RMD160 3ff076dccf7036fcd52836ff529ae16b56fdcbd1 SHA1 09dadd86dc57c39ce768230bf8e0630af40db297 SHA256 b3a4cd44dbd8ce610cb6d5a9214df0abb1458290c6382458dfeb95de00f92ba6
 DIST amarok-2.1.80.tar.bz2 8274265 RMD160 1605c49797ec3c2e10218ea48fa06628f79d33bf SHA1 808f81948e3db826e83a7655273680149551a40f SHA256 28d04a681c604529006ae579558da0e35be1c0827f5d5b59acf25d434239f3fb
-EBUILD amarok-2.1.80.ebuild 2395 RMD160 c5cdc4745d0f68592e32bcf75385ea10ecdcfa4a SHA1 1be826b6ab8a7aa875fabbdab49ed3ee401a1c7b SHA256 20435c5336d151d07c28cf2903568cfa3eb71c3e5623d8cf8a57bba9f8085b37
-EBUILD amarok-9999.ebuild 2225 RMD160 db0807418123019313d02ba142fe8dcfb1ac8617 SHA1 65230107aa740749f8fea9c6f8156d8a8f5c9cfd SHA256 0f981dbadbc528da59ee40e983984e5ad2a07211f69c996305f012aacac3a437
-MISC metadata.xml 2109 RMD160 e8a0ec87d9ee8e2748a56307c304238544880dbf SHA1 3de189261268d9a529c96eaa3811a8408c17f2a1 SHA256 e323108dcf3412b021084872f25a5c972bc015ec9f1a85c0e6f2d2742ceb08a3
+EBUILD amarok-2.1.80.ebuild 2342 RMD160 aded4d7a85fc6537547510bcc961394416b46e82 SHA1 5dc5d9430ac93a83f5c7bcc592bba414fb65451a SHA256 3b33efacf4d6411c0e095d48818325bea94ff410c347ef0ee97395b31289cb1a
+EBUILD amarok-9999.ebuild 2219 RMD160 b98a8eafbdaf3828fbfd5feb93eb9fc93418677c SHA1 5a94bd57418aeb9d263f42bdcc00f1a472fe2109 SHA256 95053879f122cbd153b61c8e098a8196949d955459abf856ebabd363eb44af46
+MISC metadata.xml 2051 RMD160 184f210064f2b9ef0fc26d4b66664731564e0781 SHA1 21576dd88e2b0791df413ddbb781134c5e19f1ec SHA256 e8860278e67b859816f40b60a71c05e7d164f32e5e2371b15d456e7bf404250d
diff --git a/media-sound/amarok/amarok-2.1.80.ebuild b/media-sound/amarok/amarok-2.1.80.ebuild
index 788b7708fc5..389e96d1e11 100644
--- a/media-sound/amarok/amarok-2.1.80.ebuild
+++ b/media-sound/amarok/amarok-2.1.80.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.1.1.ebuild,v 1.2 2009/07/22 16:11:11 ssuominen Exp $
+# $Header: $
 
 EAPI="2"
 
 KDE_LINGUAS="bg ca cs da de el en_GB es et eu fr gl he is it ja km ku lt lv nb
 nds nl nn pa pl pt pt_BR ro ru sl sv th tr uk wa zh_CN zh_TW"
 OPENGL_REQUIRED="optional"
-KMNAME="extragear/multimedia"
 inherit kde4-base
 
 DESCRIPTION="Advanced audio player based on KDE framework."
@@ -17,7 +16,7 @@ SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 SLOT="4"
-IUSE="cdda daap debug ipod mp3tunes mtp +semantic-desktop"
+IUSE="cdda daap debug ipod lastfm mp3tunes mtp +semantic-desktop"
 
 # ipod requires gdk enabled and also gtk compiled in libgpod
 DEPEND="
@@ -35,9 +34,8 @@ DEPEND="
 		>=kde-base/libkcddb-${KDE_MINIMAL}
 		>=kde-base/libkcompactdisc-${KDE_MINIMAL}
 	)
-	ipod? (
-		>=media-libs/libgpod-0.7.0[gtk]
-	)
+	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
+	lastfm? ( >=media-libs/liblastfm-0.3.0 )
 	mp3tunes? (
 		dev-libs/glib:2
 		dev-libs/libxml2
@@ -65,10 +63,11 @@ src_configure() {
 		-DWITH_PLAYER=ON
 		-DWITH_UTILITIES=OFF
 		-DWITH_Libgcrypt=OFF
-		$(cmake-utils_use_with ipod Ipod)
+		$(cmake-utils_use_with ipod)
 		$(cmake-utils_use_with ipod Gdk)
-		$(cmake-utils_use_with mtp Mtp)
-		$(cmake-utils_use_with mp3tunes MP3TUNES)"
+		$(cmake-utils_use_with lastfm LibLastFm)
+		$(cmake-utils_use_with mtp)
+		$(cmake-utils_use_with mp3tunes MP3Tunes)"
 #		$(cmake-utils_use_with semantic-desktop Nepomuk)
 #		$(cmake-utils_use_with semantic-desktop Soprano)"
 
diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 785d30317d6..97fd2740c4f 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -14,7 +14,7 @@ EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}.git"
 LICENSE="GPL-2"
 KEYWORDS=""
 SLOT="4"
-IUSE="cdaudio daap debug ipod lastfm mp3tunes mtp +semantic-desktop"
+IUSE="cdda daap debug ipod lastfm mp3tunes mtp +semantic-desktop"
 
 # ipod requires gdk enabled and also gtk compiled in libgpod
 DEPEND="
@@ -28,7 +28,7 @@ DEPEND="
 	>=kde-base/kdelibs-${KDE_MINIMAL}[opengl?,semantic-desktop?]
 	sys-libs/zlib
 	>=x11-libs/qtscriptgenerator-0.1.0
-	cdaudio? (
+	cdda? (
 		>=kde-base/libkcddb-${KDE_MINIMAL}
 		>=kde-base/libkcompactdisc-${KDE_MINIMAL}
 	)
diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index 46c76c9a20d..df36c0491f2 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -6,7 +6,6 @@
 	<!--
 	<flag name="amazon">Enable support for downloading covers from amazon.com</flag>
 	-->
-	<flag name="cdaudio">Enable cdaudio functionality</flag>
 	<flag name="daap">
 		Enable the scripts for music sharing through DAAP. This flag adds
 		dependencies on <pkg>www-servers/mongrel</pkg> to allow sharing of
@@ -14,8 +13,10 @@
 		that turning this flag off has no effect on DAAP browsing.
 	</flag>
 	<flag name="lastfm">Enable Last.fm streaming services support through <pkg>media-libs/liblastfm</pkg></flag>
-	<flag name="ifp">Enable support for iRiver devices access through libifp</flag>
 	<flag name="mp3tunes">Enable mp3tunes integration</flag>
+	<flag name="mtp">Enable support for libMTP (Plays4Sure) devices access through libmtp</flag>
+	<!--
+	<flag name="ifp">Enable support for iRiver devices access through libifp</flag>
 	<flag name="mp4">
 		Build the TagLib plugin for writing tags in Mp4 container files
 		(m4a). Please note that by enabling this USE flag, the resulting
@@ -23,9 +24,7 @@
 		<pkg>media-libs/libmp4v2</pkg>, distributed under a
 		GPL-incompatible license.
 	</flag>
-	<flag name="mtp">Enable support for libMTP (Plays4Sure) devices access through libmtp</flag>
 	<flag name="njb">Enable support for NJB (Creative) devices access through libnjb</flag>
-	<!--
 	<flag name="python">
 		Install the Amarok scripts written in Python, depending on
 		<pkg>dev-python/PyQt</pkg>. At the moment the only script