diff options
| author | Robert Förster <Dessa@gmake.de> | 2009-07-13 01:42:03 +0200 |
|---|---|---|
| committer | Robert Förster <Dessa@gmake.de> | 2009-07-13 01:42:53 +0200 |
| commit | 859289b64d35730fc95b88554d6be3461bf74a5a (patch) | |
| tree | 391a3ca19d68bec4ac11e107e22d5048ee41dd36 | |
| parent | ea96b3d37b52421834af9eea304694c7c47db3e4 (diff) | |
| download | kde-859289b64d35730fc95b88554d6be3461bf74a5a.tar.gz kde-859289b64d35730fc95b88554d6be3461bf74a5a.tar.bz2 kde-859289b64d35730fc95b88554d6be3461bf74a5a.zip | |
Revert "[media-sound/amarok] - liblastfm is now required"
This reverts commit 6a20b884122ed74c465b1505845e17206d0b134b.
Conflicts:
media-sound/amarok/Manifest
| -rw-r--r-- | media-sound/amarok/Manifest | 4 | ||||
| -rw-r--r-- | media-sound/amarok/amarok-9999.ebuild | 5 | ||||
| -rw-r--r-- | media-sound/amarok/metadata.xml | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest index 7428c99930a..7483c007ae6 100644 --- a/media-sound/amarok/Manifest +++ b/media-sound/amarok/Manifest @@ -1,3 +1,3 @@ AUX disable_bindings_test.patch 550 RMD160 3ff076dccf7036fcd52836ff529ae16b56fdcbd1 SHA1 09dadd86dc57c39ce768230bf8e0630af40db297 SHA256 b3a4cd44dbd8ce610cb6d5a9214df0abb1458290c6382458dfeb95de00f92ba6 -EBUILD amarok-9999.ebuild 2103 RMD160 3b9951ef1b14d1bdaa64917701bfb82139068305 SHA1 74e4c41587f622b9c42e7100198e26ecfaa18370 SHA256 856e97051b7e0759c779398eba34170d6c5e25123c3ba4e4b97c0817d5e1eada -MISC metadata.xml 1999 RMD160 63f7987491620b67603d2c53e673c49c55937d62 SHA1 9c8ca66b5d1f1804ec8087cf2a05d07a2aacee25 SHA256 1b1484b185d63cd03c8bbc85c797447b5249d12b7e04db0fa64efecf89cd28f8 +EBUILD amarok-9999.ebuild 2165 RMD160 83179b4c6508d5d66714ccc6a87d86b63420fc75 SHA1 ca6e88e80afc6b3d981384165f0dc75c6a06f2cb SHA256 474fbc4eeca9f8598de1da230f6168eb7a333b268ff6c0ccf9078faa0520902f +MISC metadata.xml 2109 RMD160 e8a0ec87d9ee8e2748a56307c304238544880dbf SHA1 3de189261268d9a529c96eaa3811a8408c17f2a1 SHA256 e323108dcf3412b021084872f25a5c972bc015ec9f1a85c0e6f2d2742ceb08a3 diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild index c5691288d31..61878bb8e1f 100644 --- a/media-sound/amarok/amarok-9999.ebuild +++ b/media-sound/amarok/amarok-9999.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="http://amarok.kde.org/" LICENSE="GPL-2" KEYWORDS="" SLOT="4" -IUSE="cdaudio daap debug ipod mp3tunes mtp +semantic-desktop" +IUSE="cdaudio daap debug ipod lastfm mp3tunes mtp +semantic-desktop" # ipod requires gdk enabled and also gtk compiled in libgpod DEPEND=" @@ -23,7 +23,6 @@ DEPEND=" >=dev-db/mysql-5.0.76-r1[embedded,-minimal] >=dev-db/mysql-community-5.0.77-r1[embedded,-minimal] ) - >=media-libs/liblastfm-0.3.0 >=media-libs/taglib-1.5 >=media-libs/taglib-extras-0.1[kde] >=kde-base/kdelibs-${KDE_MINIMAL}[opengl?,semantic-desktop?] @@ -34,6 +33,7 @@ DEPEND=" >=kde-base/libkcompactdisc-${KDE_MINIMAL} ) ipod? ( >=media-libs/libgpod-0.7.0[gtk] ) + lastfm? ( >=media-libs/liblastfm-0.3.0 ) mp3tunes? ( dev-libs/glib:2 dev-libs/libxml2 @@ -63,6 +63,7 @@ src_configure() { -DWITH_Libgcrypt=OFF $(cmake-utils_use_with ipod) $(cmake-utils_use_with ipod Gdk) + $(cmake-utils_use_with lastfm LibLastFm) $(cmake-utils_use_with mtp) $(cmake-utils_use_with mp3tunes MP3Tunes)" # $(cmake-utils_use_with semantic-desktop Nepomuk) diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml index 0ea1b82ba99..46c76c9a20d 100644 --- a/media-sound/amarok/metadata.xml +++ b/media-sound/amarok/metadata.xml @@ -13,6 +13,7 @@ the Amarok music collection through DAAP protocol. Please note 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="mp4"> |