diff options
| author |   Alexey Shvetsov <alexxy@gentoo.org> | 2012-05-26 15:22:19 +0000 |
|---|---|---|
| committer | Alexey Shvetsov <alexxy@gentoo.org> | 2012-05-26 15:22:19 +0000 |
| commit | 5e5977c522c2c9ef80a19221ec1640d2cd7e9c18 (patch) | |
| tree | ce62859b4aef8f45df3243d716c1c983f0f7cf4e /media-sound/amarok | |
| parent | fixed typo. removed old (diff) | |
| download | gentoo-2-5e5977c522c2c9ef80a19221ec1640d2cd7e9c18.tar.gz gentoo-2-5e5977c522c2c9ef80a19221ec1640d2cd7e9c18.tar.bz2 gentoo-2-5e5977c522c2c9ef80a19221ec1640d2cd7e9c18.zip | |
[media-sound/amarok] Allow installing with KDE SC 4.9
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/amarok')
| -rw-r--r-- | media-sound/amarok/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/amarok/amarok-2.5.0-r2.ebuild | 7 | ||||
| -rw-r--r-- | media-sound/amarok/metadata.xml | 3 |
3 files changed, 10 insertions, 6 deletions
diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog index 36e2ece55fc2..3f2ae38967b3 100644 --- a/media-sound/amarok/ChangeLog +++ b/media-sound/amarok/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/amarok # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.423 2012/05/04 13:54:38 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.424 2012/05/26 15:22:19 alexxy Exp $ + + 26 May 2012; Alexey Shvetsov <alexxy@gentoo.org> amarok-2.5.0-r2.ebuild, + metadata.xml: + [media-sound/amarok] Allow installing with KDE SC 4.9 04 May 2012; Johannes Huber <johu@gentoo.org> -amarok-2.4.0.ebuild, -amarok-2.4.3.ebuild, -amarok-2.5.0-r1.ebuild, -amarok-2.5.0.ebuild, diff --git a/media-sound/amarok/amarok-2.5.0-r2.ebuild b/media-sound/amarok/amarok-2.5.0-r2.ebuild index 28848ee80a6e..922098bdb624 100644 --- a/media-sound/amarok/amarok-2.5.0-r2.ebuild +++ b/media-sound/amarok/amarok-2.5.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.5.0-r2.ebuild,v 1.2 2012/05/04 13:54:38 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.5.0-r2.ebuild,v 1.3 2012/05/26 15:22:19 alexxy Exp $ EAPI=4 @@ -44,7 +44,10 @@ COMMONDEPEND=" cdda? ( $(add_kdebase_dep libkcddb) $(add_kdebase_dep libkcompactdisc) - $(add_kdebase_dep kdemultimedia-kioslaves) + || ( + $(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 ) diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml index 0ed4fbd7afc5..b6b77cfeb171 100644 --- a/media-sound/amarok/metadata.xml +++ b/media-sound/amarok/metadata.xml @@ -28,9 +28,6 @@ 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> |