diff options
author | Theo Chatzimichos <tampakrap@gentoo.org> | 2011-02-02 04:11:39 +0000 |
---|---|---|
committer | Theo Chatzimichos <tampakrap@gentoo.org> | 2011-02-02 04:11:39 +0000 |
commit | 48adafca8bebb9098161198e661b78b308b3474e (patch) | |
tree | 9c0c196b1d049c49922b343ba489d1d374535878 /media-sound | |
parent | slotmove media-libs/gluon to 4 (diff) | |
download | gentoo-2-48adafca8bebb9098161198e661b78b308b3474e.tar.gz gentoo-2-48adafca8bebb9098161198e661b78b308b3474e.tar.bz2 gentoo-2-48adafca8bebb9098161198e661b78b308b3474e.zip |
EAPI3, sync with live ebuild about git eclass handling, use add_kdebase_dep
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
Diffstat (limited to 'media-sound')
-rw-r--r-- | media-sound/amarok/ChangeLog | 6 | ||||
-rw-r--r-- | media-sound/amarok/amarok-2.3.2-r1.ebuild | 24 | ||||
-rw-r--r-- | media-sound/amarok/amarok-2.4.0.ebuild | 19 |
3 files changed, 26 insertions, 23 deletions
diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog index f4da0bd075d1..9575a8ff0815 100644 --- a/media-sound/amarok/ChangeLog +++ b/media-sound/amarok/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/amarok # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.398 2011/01/14 02:39:43 jmbsvicetto Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.399 2011/02/02 04:11:38 tampakrap Exp $ + + 02 Feb 2011; Theo Chatzimichos <tampakrap@gentoo.org> amarok-2.3.2-r1.ebuild, + amarok-2.4.0.ebuild: + EAPI3, sync with live ebuild about git eclass handling, use add_kdebase_dep 14 Jan 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> amarok-2.4.0.ebuild: diff --git a/media-sound/amarok/amarok-2.3.2-r1.ebuild b/media-sound/amarok/amarok-2.3.2-r1.ebuild index 59d04fa550c2..836413e69390 100644 --- a/media-sound/amarok/amarok-2.3.2-r1.ebuild +++ b/media-sound/amarok/amarok-2.3.2-r1.ebuild @@ -1,27 +1,27 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.3.2-r1.ebuild,v 1.5 2010/11/21 22:35:24 tomka Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.3.2-r1.ebuild,v 1.6 2011/02/02 04:11:39 tampakrap Exp $ -EAPI="2" +EAPI=3 # Translations are only in the tarballs, not the git repo if [[ ${PV} != *9999* ]]; then KDE_LINGUAS="af bg ca ca@valencia cs da de el en_GB es et fr it ja lt lv nb nds pa pl pt pt_BR ru sk sl sr sr@ijekavian sr@ijekavianlatin sr@latin sv th tr uk zh_CN zh_TW" SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2" + KEYWORDS="amd64 ~ppc ~ppc64 x86" else - EGIT_REPO_URI="git://git.kde.org/${PN}.git" - GIT_ECLASS="git" + KDE_SCM="git" + KEYWORDS="" fi KDE_REQUIRED="never" -inherit flag-o-matic kde4-base ${GIT_ECLASS} +inherit flag-o-matic kde4-base DESCRIPTION="Advanced audio player based on KDE framework." HOMEPAGE="http://amarok.kde.org/" LICENSE="GPL-2" -KEYWORDS="amd64 ~ppc ~ppc64 x86" SLOT="4" IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp opengl +player semantic-desktop +utils" @@ -43,15 +43,15 @@ COMMONDEPEND=" player? ( app-crypt/qca:2 >=app-misc/strigi-0.5.7[dbus,qt4] - >=kde-base/kdelibs-${KDE_MINIMAL}[opengl?,semantic-desktop?] + $(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?') sys-libs/zlib >=virtual/mysql-5.1 x11-libs/qt-script >=x11-libs/qtscriptgenerator-0.1.0 cdda? ( - >=kde-base/libkcddb-${KDE_MINIMAL} - >=kde-base/libkcompactdisc-${KDE_MINIMAL} - >=kde-base/kdemultimedia-kioslaves-${KDE_MINIMAL} + $(add_kdebase_dep libkcddb) + $(add_kdebase_dep libkcompactdisc) + $(add_kdebase_dep kdemultimedia-kioslaves) ) embedded? ( || ( @@ -84,7 +84,7 @@ DEPEND="${COMMONDEPEND} " RDEPEND="${COMMONDEPEND} !media-sound/amarok-utils - player? ( >=kde-base/phonon-kde-${KDE_MINIMAL} ) + player? ( $(add_kdebase_dep phonon-kde) ) " src_prepare() { diff --git a/media-sound/amarok/amarok-2.4.0.ebuild b/media-sound/amarok/amarok-2.4.0.ebuild index a1de1be97a77..159570393881 100644 --- a/media-sound/amarok/amarok-2.4.0.ebuild +++ b/media-sound/amarok/amarok-2.4.0.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.4.0.ebuild,v 1.2 2011/01/14 02:39:43 jmbsvicetto Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.4.0.ebuild,v 1.3 2011/02/02 04:11:38 tampakrap Exp $ -EAPI="2" +EAPI=3 # Translations are only in the tarballs, not the git repo if [[ ${PV} != *9999* ]]; then @@ -11,13 +11,12 @@ if [[ ${PV} != *9999* ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" else - EGIT_REPO_URI="git://anongit.kde.org/${PN}" - GIT_ECLASS="git" + KDE_SCM="git" KEYWORDS="" fi KDE_REQUIRED="never" -inherit flag-o-matic kde4-base ${GIT_ECLASS} +inherit flag-o-matic kde4-base DESCRIPTION="Advanced audio player based on KDE framework." HOMEPAGE="http://amarok.kde.org/" @@ -37,15 +36,15 @@ COMMONDEPEND=" player? ( app-crypt/qca:2 >=app-misc/strigi-0.5.7[dbus,qt4] - >=kde-base/kdelibs-${KDE_MINIMAL}[opengl?,semantic-desktop?] + $(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?') sys-libs/zlib >=virtual/mysql-5.1 x11-libs/qt-script >=x11-libs/qtscriptgenerator-0.1.0 cdda? ( - >=kde-base/libkcddb-${KDE_MINIMAL} - >=kde-base/libkcompactdisc-${KDE_MINIMAL} - >=kde-base/kdemultimedia-kioslaves-${KDE_MINIMAL} + $(add_kdebase_dep libkcddb) + $(add_kdebase_dep libkcompactdisc) + $(add_kdebase_dep kdemultimedia-kioslaves) ) embedded? ( || ( @@ -78,7 +77,7 @@ DEPEND="${COMMONDEPEND} " RDEPEND="${COMMONDEPEND} !media-sound/amarok-utils - player? ( >=kde-base/phonon-kde-${KDE_MINIMAL} ) + player? ( $(add_kdebase_dep phonon-kde) ) " src_prepare() { |