[gentoo-commits] proj/kde:master commit in: media-sound/amarok/

["Johannes Huber" <johu@gentoo.org>]

commit:     e4ee94008839df67655489e7057394102dbd1243
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun May  4 23:30:12 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun May  4 23:30:12 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e4ee9400

[media-sound/amarok] Introduce nepomuk USE flag, bug #508350

Package-Manager: portage-2.2.10

---
 media-sound/amarok/amarok-9999.ebuild | 10 +++++-----
 media-sound/amarok/metadata.xml       |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index aa180ca..91106ad 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -28,7 +28,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="4"
-IUSE="cdda debug +embedded ipod lastfm mp3tunes mtp ofa opengl semantic-desktop test +utils"
+IUSE="cdda debug +embedded ipod lastfm mp3tunes mtp nepomuk ofa opengl test +utils"
 
 if [[ ${KDE_BUILD_TYPE} == live ]]; then
 	RESTRICT="test"
@@ -37,7 +37,7 @@ fi
 # ipod requires gdk enabled and also gtk compiled in libgpod
 COMMONDEPEND="
 	app-crypt/qca:2
-	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?' 4.8.4)
+	$(add_kdebase_dep kdelibs 'nepomuk?,opengl?' 4.8.4)
 	$(add_kdebase_dep kdebase-kioslaves)
 	>=media-libs/taglib-1.7[asf,mp4]
 	>=media-libs/taglib-extras-1.0.1
@@ -63,9 +63,9 @@ COMMONDEPEND="
 		>=dev-qt/qtcore-4.8.4:4[glib]
 	)
 	mtp? ( >=media-libs/libmtp-1.0.0 )
+	nepomuk? ( >=kde-base/nepomuk-core-4.9.0 )
 	ofa? ( >=media-libs/libofa-0.9.0 )
 	opengl? ( virtual/opengl )
-	semantic-desktop? ( >=kde-base/nepomuk-core-4.9.0 )
 "
 DEPEND="${COMMONDEPEND}
 	dev-util/automoc
@@ -100,9 +100,9 @@ src_configure() {
 		$(cmake-utils_use_with lastfm LibLastFm)
 		$(cmake-utils_use_with mtp)
 		$(cmake-utils_use_with mp3tunes MP3Tunes)
+		$(cmake-utils_use_with nepomuk)
+		$(cmake-utils_use_with nepomuk Soprano)
 		$(cmake-utils_use_with ofa LibOFA)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)
 		$(cmake-utils_use_with utils UTILITIES)
 	)
 

diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index c964fd8..e4da6b0 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -18,6 +18,7 @@
 	<flag name="mp3tunes">Enable mp3tunes integration</flag>
 	<flag name="mtp">Enable support for libMTP (Plays4Sure) devices access through libmtp
 	</flag>
+	<flag name="nepomuk">Enable Nepomuk based semantic desktop support (deprecated)</flag>
 	<flag name="ofa">Use <pkg>media-libs/libofa</pkg> to compute MusicDNS acoustic
 		fingerprints (used by MusicBrainz)
 	</flag>