public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in media-sound/amarok: ChangeLog amarok-2.4.0.ebuild amarok-2.3.2-r1.ebuild
@ 2011-02-02  4:11 Theo Chatzimichos (tampakrap)
  0 siblings, 0 replies; only message in thread
From: Theo Chatzimichos (tampakrap) @ 2011-02-02  4:11 UTC (permalink / raw
  To: gentoo-commits

tampakrap    11/02/02 04:11:39

  Modified:             ChangeLog amarok-2.4.0.ebuild
                        amarok-2.3.2-r1.ebuild
  Log:
  EAPI3, sync with live ebuild about git eclass handling, use add_kdebase_dep
  
  (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

Revision  Changes    Path
1.399                media-sound/amarok/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/ChangeLog?rev=1.399&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/ChangeLog?rev=1.399&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/ChangeLog?r1=1.398&r2=1.399

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -r1.398 -r1.399
--- ChangeLog	14 Jan 2011 02:39:43 -0000	1.398
+++ ChangeLog	2 Feb 2011 04:11:38 -0000	1.399
@@ -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:



1.3                  media-sound/amarok/amarok-2.4.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/amarok-2.4.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/amarok-2.4.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/amarok-2.4.0.ebuild?r1=1.2&r2=1.3

Index: amarok-2.4.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.4.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- amarok-2.4.0.ebuild	14 Jan 2011 02:39:43 -0000	1.2
+++ amarok-2.4.0.ebuild	2 Feb 2011 04:11:38 -0000	1.3
@@ -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 @@
 	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 @@
 	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 @@
 "
 RDEPEND="${COMMONDEPEND}
 	!media-sound/amarok-utils
-	player? ( >=kde-base/phonon-kde-${KDE_MINIMAL} )
+	player? ( $(add_kdebase_dep phonon-kde) )
 "
 
 src_prepare() {



1.6                  media-sound/amarok/amarok-2.3.2-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/amarok-2.3.2-r1.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/amarok-2.3.2-r1.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/amarok-2.3.2-r1.ebuild?r1=1.5&r2=1.6

Index: amarok-2.3.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.3.2-r1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- amarok-2.3.2-r1.ebuild	21 Nov 2010 22:35:24 -0000	1.5
+++ amarok-2.3.2-r1.ebuild	2 Feb 2011 04:11:39 -0000	1.6
@@ -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 @@
 	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 @@
 "
 RDEPEND="${COMMONDEPEND}
 	!media-sound/amarok-utils
-	player? ( >=kde-base/phonon-kde-${KDE_MINIMAL} )
+	player? ( $(add_kdebase_dep phonon-kde) )
 "
 
 src_prepare() {






^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2011-02-02  4:11 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-02  4:11 [gentoo-commits] gentoo-x86 commit in media-sound/amarok: ChangeLog amarok-2.4.0.ebuild amarok-2.3.2-r1.ebuild Theo Chatzimichos (tampakrap)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox