EAPI3, sync with live ebuild about git eclass handling, use add_kdebase_dep

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

4 files changed, 29 insertions, 26 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/Manifest b/media-sound/amarok/Manifest
index f846cc1c575c..9bb751931782 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -2,7 +2,7 @@ AUX amarok-2.3.2-fix-qt-regression.patch 2958 RMD160 810ddadf7fa226302b75aaaf694
 AUX amarok-2.3.2-flac-fix.patch 1233 RMD160 ee3f98e2ccbd14798c2b75ed6def2d1709ead21e SHA1 3a4cb3edd6dc1a14410d3f13b6c9a7c0019c1a17 SHA256 f68f3c9b4fb8be02a37ac21d535d417b8fa6167d123e6e13e98c26fb758e40f1
 DIST amarok-2.3.2.tar.bz2 13948250 RMD160 3c2a7868fb7b3f74e35e124cf3a8bad5d8653390 SHA1 594d6d3ad57832fb80ba4387459356132d37ace2 SHA256 842569da06b4ebfc334f3530a77f900ea30b3b8968698bda8082b4b991488237
 DIST amarok-2.4.0.tar.bz2 15219572 RMD160 f32a664521b9827ef8e7d49100e39b69fa87dd29 SHA1 d37ecda0fecdba88bb239f11c6d4ff885d7ac23f SHA256 52be0e926d1362828a4bf64e2a174dc009c85f6f33da4ca589f0f09ab9b7085c
-EBUILD amarok-2.3.2-r1.ebuild 4502 RMD160 d3ca327ac29b02464c29e284fe785374584f6dc5 SHA1 41468c097e5ec7ef2e240207f7f2238c987e686e SHA256 b50b16911f27ac8948ce6d1be7c9301b9e5cecfc8081d9c07fb4e504cafa7e38
-EBUILD amarok-2.4.0.ebuild 4176 RMD160 7a0ef4012a8edaed178ed6e83a670590831a6e86 SHA1 11afef03b44b28c3e64f112e56f860c43af8425d SHA256 a69a11229ffb31626555b1f8f13649f3ddd8f666b3d33fbd74b445261fad1d35
-MISC ChangeLog 67900 RMD160 a782c0cfc16c764e2b72cc9163ca258a2f5a4f9d SHA1 3de51e2e6152fe2511a58bf200fd0f179738cec5 SHA256 2bc13eb320498ef78796172e7fd384208cba7e0ac2520ad2d9213f6df1d1e942
+EBUILD amarok-2.3.2-r1.ebuild 4422 RMD160 af32f0173b16b2b78fe6d0e194cae01cab965146 SHA1 bc5a59a7abe3d0156fd1d92b9e3a6db86a33b566 SHA256 5c72c144e0fd6d45b896ce24cec9f22065f0ace3f6e4a54c3f95129c0f7f5d56
+EBUILD amarok-2.4.0.ebuild 4076 RMD160 80896a741d6c9a76dc71963aba0483fcef993fff SHA1 679fd0a4e8cf508d22c792cddea302a079a6e23c SHA256 d4f712bde33c32091779818aedea84ac7a411f0662e0a02b2fffb0fecd3712db
+MISC ChangeLog 68080 RMD160 28603e8d1efc8d710bf050cdc272e77ec4916acc SHA1 26c8a5761ca1e32139bd246da2c25d8d457ed90d SHA256 ada43c5ef6fe00706987649654f663cd10a38b819a5112564a2726b03a22b50b
 MISC metadata.xml 1413 RMD160 62fc2ae4eae51f52f3ef02d86e8b244a3132ba86 SHA1 dda8b8bf344947925b93744cff693605f46c1006 SHA256 be46bcd7f470f66bb3afc8df3338aab204e055e10f042d4bae2be65eae7b3f8f
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() {