mrueg 14/12/13 01:39:45 Modified: amarok-2.8.0-r3.ebuild ChangeLog Log: Add support for kde applications dependency. (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key )
Revision Changes Path 1.4 media-sound/amarok/amarok-2.8.0-r3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/amarok-2.8.0-r3.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/amarok-2.8.0-r3.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/amarok-2.8.0-r3.ebuild?r1=1.3&r2=1.4 Index: amarok-2.8.0-r3.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.8.0-r3.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- amarok-2.8.0-r3.ebuild 12 Dec 2014 15:29:29 -0000 1.3 +++ amarok-2.8.0-r3.ebuild 13 Dec 2014 01:39:45 -0000 1.4 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.8.0-r3.ebuild,v 1.3 2014/12/12 15:29:29 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.8.0-r3.ebuild,v 1.4 2014/12/13 01:39:45 mrueg Exp $ EAPI=5 @@ -39,7 +39,8 @@ COMMONDEPEND=" app-crypt/qca:2 $(add_kdebase_dep kdelibs 'nepomuk?,opengl?' 4.8.4) - $(add_kdebase_dep kdebase-kioslaves) + || ( kde-apps/kdebase-kioslaves:4 + $(add_kdebase_dep kdebase-kioslaves) ) >=media-libs/taglib-1.7[asf,mp4] >=media-libs/taglib-extras-1.0.1 sys-libs/zlib @@ -49,9 +50,16 @@ >=dev-qt/qtscript-4.8:4 >=x11-libs/qtscriptgenerator-0.1.0 cdda? ( - $(add_kdebase_dep libkcddb) - $(add_kdebase_dep libkcompactdisc) - $(add_kdebase_dep audiocd-kio) + || ( + ( kde-apps/libkcddb:4 + kde-apps/libkcompactdisc:4 + kde-apps/audiocd-kio:4 + ) + ( $(add_kdebase_dep libkcddb) + $(add_kdebase_dep libkcompactdisc) + $(add_kdebase_dep audiocd-kio) + ) + ) ) ipod? ( >=media-libs/libgpod-0.7.0[gtk] ) lastfm? ( >=media-libs/liblastfm-1.0.3 ) @@ -75,7 +83,8 @@ " RDEPEND="${COMMONDEPEND} !media-sound/amarok-utils - $(add_kdebase_dep phonon-kde) + || ( kde-apps/phonon-kde:4 + $(add_kdebase_dep phonon-kde) ) " PATCHES=( 1.474 media-sound/amarok/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/ChangeLog?rev=1.474&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/ChangeLog?rev=1.474&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/ChangeLog?r1=1.473&r2=1.474 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v retrieving revision 1.473 retrieving revision 1.474 diff -u -r1.473 -r1.474 --- ChangeLog 12 Dec 2014 15:29:29 -0000 1.473 +++ ChangeLog 13 Dec 2014 01:39:45 -0000 1.474 @@ -1,6 +1,9 @@ # ChangeLog for media-sound/amarok # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.473 2014/12/12 15:29:29 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.474 2014/12/13 01:39:45 mrueg Exp $ + + 13 Dec 2014; Manuel Rüger <[email protected]> amarok-2.8.0-r3.ebuild: + Add support for kde applications dependency. 12 Dec 2014; Mikle Kolyada <[email protected]> amarok-2.8.0-r3.ebuild: amd64 stable wrt bug #517344
