Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Theo Chatzimichos (tampakrap)" <tampakrap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-sound/amarok: ChangeLog amarok-2.4.0.ebuild amarok-2.3.2-r1.ebuild
Date: Wed, 02 Feb 2011 04:11:52
Message-Id: 20110202041139.5E52B20054@flycatcher.gentoo.org
1 tampakrap 11/02/02 04:11:39
2
3 Modified: ChangeLog amarok-2.4.0.ebuild
4 amarok-2.3.2-r1.ebuild
5 Log:
6 EAPI3, sync with live ebuild about git eclass handling, use add_kdebase_dep
7
8 (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.399 media-sound/amarok/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/ChangeLog?rev=1.399&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/ChangeLog?rev=1.399&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/ChangeLog?r1=1.398&r2=1.399
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v
20 retrieving revision 1.398
21 retrieving revision 1.399
22 diff -u -r1.398 -r1.399
23 --- ChangeLog 14 Jan 2011 02:39:43 -0000 1.398
24 +++ ChangeLog 2 Feb 2011 04:11:38 -0000 1.399
25 @@ -1,6 +1,10 @@
26 # ChangeLog for media-sound/amarok
27 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.398 2011/01/14 02:39:43 jmbsvicetto Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.399 2011/02/02 04:11:38 tampakrap Exp $
30 +
31 + 02 Feb 2011; Theo Chatzimichos <tampakrap@g.o> amarok-2.3.2-r1.ebuild,
32 + amarok-2.4.0.ebuild:
33 + EAPI3, sync with live ebuild about git eclass handling, use add_kdebase_dep
34
35 14 Jan 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o>
36 amarok-2.4.0.ebuild:
37
38
39
40 1.3 media-sound/amarok/amarok-2.4.0.ebuild
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/amarok-2.4.0.ebuild?rev=1.3&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/amarok-2.4.0.ebuild?rev=1.3&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/amarok-2.4.0.ebuild?r1=1.2&r2=1.3
45
46 Index: amarok-2.4.0.ebuild
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.4.0.ebuild,v
49 retrieving revision 1.2
50 retrieving revision 1.3
51 diff -u -r1.2 -r1.3
52 --- amarok-2.4.0.ebuild 14 Jan 2011 02:39:43 -0000 1.2
53 +++ amarok-2.4.0.ebuild 2 Feb 2011 04:11:38 -0000 1.3
54 @@ -1,8 +1,8 @@
55 # Copyright 1999-2011 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.4.0.ebuild,v 1.2 2011/01/14 02:39:43 jmbsvicetto Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.4.0.ebuild,v 1.3 2011/02/02 04:11:38 tampakrap Exp $
59
60 -EAPI="2"
61 +EAPI=3
62
63 # Translations are only in the tarballs, not the git repo
64 if [[ ${PV} != *9999* ]]; then
65 @@ -11,13 +11,12 @@
66 SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
67 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
68 else
69 - EGIT_REPO_URI="git://anongit.kde.org/${PN}"
70 - GIT_ECLASS="git"
71 + KDE_SCM="git"
72 KEYWORDS=""
73 fi
74
75 KDE_REQUIRED="never"
76 -inherit flag-o-matic kde4-base ${GIT_ECLASS}
77 +inherit flag-o-matic kde4-base
78
79 DESCRIPTION="Advanced audio player based on KDE framework."
80 HOMEPAGE="http://amarok.kde.org/"
81 @@ -37,15 +36,15 @@
82 player? (
83 app-crypt/qca:2
84 >=app-misc/strigi-0.5.7[dbus,qt4]
85 - >=kde-base/kdelibs-${KDE_MINIMAL}[opengl?,semantic-desktop?]
86 + $(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
87 sys-libs/zlib
88 >=virtual/mysql-5.1
89 x11-libs/qt-script
90 >=x11-libs/qtscriptgenerator-0.1.0
91 cdda? (
92 - >=kde-base/libkcddb-${KDE_MINIMAL}
93 - >=kde-base/libkcompactdisc-${KDE_MINIMAL}
94 - >=kde-base/kdemultimedia-kioslaves-${KDE_MINIMAL}
95 + $(add_kdebase_dep libkcddb)
96 + $(add_kdebase_dep libkcompactdisc)
97 + $(add_kdebase_dep kdemultimedia-kioslaves)
98 )
99 embedded? (
100 || (
101 @@ -78,7 +77,7 @@
102 "
103 RDEPEND="${COMMONDEPEND}
104 !media-sound/amarok-utils
105 - player? ( >=kde-base/phonon-kde-${KDE_MINIMAL} )
106 + player? ( $(add_kdebase_dep phonon-kde) )
107 "
108
109 src_prepare() {
110
111
112
113 1.6 media-sound/amarok/amarok-2.3.2-r1.ebuild
114
115 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/amarok-2.3.2-r1.ebuild?rev=1.6&view=markup
116 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
117 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/amarok-2.3.2-r1.ebuild?r1=1.5&r2=1.6
118
119 Index: amarok-2.3.2-r1.ebuild
120 ===================================================================
121 RCS file: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.3.2-r1.ebuild,v
122 retrieving revision 1.5
123 retrieving revision 1.6
124 diff -u -r1.5 -r1.6
125 --- amarok-2.3.2-r1.ebuild 21 Nov 2010 22:35:24 -0000 1.5
126 +++ amarok-2.3.2-r1.ebuild 2 Feb 2011 04:11:39 -0000 1.6
127 @@ -1,27 +1,27 @@
128 -# Copyright 1999-2010 Gentoo Foundation
129 +# Copyright 1999-2011 Gentoo Foundation
130 # Distributed under the terms of the GNU General Public License v2
131 -# $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 $
132 +# $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 $
133
134 -EAPI="2"
135 +EAPI=3
136
137 # Translations are only in the tarballs, not the git repo
138 if [[ ${PV} != *9999* ]]; then
139 KDE_LINGUAS="af bg ca ca@valencia cs da de el en_GB es et fr it ja lt lv nb nds pa pl
140 pt pt_BR ru sk sl sr sr@ijekavian sr@ijekavianlatin sr@latin sv th tr uk zh_CN zh_TW"
141 SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
142 + KEYWORDS="amd64 ~ppc ~ppc64 x86"
143 else
144 - EGIT_REPO_URI="git://git.kde.org/${PN}.git"
145 - GIT_ECLASS="git"
146 + KDE_SCM="git"
147 + KEYWORDS=""
148 fi
149
150 KDE_REQUIRED="never"
151 -inherit flag-o-matic kde4-base ${GIT_ECLASS}
152 +inherit flag-o-matic kde4-base
153
154 DESCRIPTION="Advanced audio player based on KDE framework."
155 HOMEPAGE="http://amarok.kde.org/"
156
157 LICENSE="GPL-2"
158 -KEYWORDS="amd64 ~ppc ~ppc64 x86"
159 SLOT="4"
160 IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp opengl +player semantic-desktop +utils"
161
162 @@ -43,15 +43,15 @@
163 player? (
164 app-crypt/qca:2
165 >=app-misc/strigi-0.5.7[dbus,qt4]
166 - >=kde-base/kdelibs-${KDE_MINIMAL}[opengl?,semantic-desktop?]
167 + $(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
168 sys-libs/zlib
169 >=virtual/mysql-5.1
170 x11-libs/qt-script
171 >=x11-libs/qtscriptgenerator-0.1.0
172 cdda? (
173 - >=kde-base/libkcddb-${KDE_MINIMAL}
174 - >=kde-base/libkcompactdisc-${KDE_MINIMAL}
175 - >=kde-base/kdemultimedia-kioslaves-${KDE_MINIMAL}
176 + $(add_kdebase_dep libkcddb)
177 + $(add_kdebase_dep libkcompactdisc)
178 + $(add_kdebase_dep kdemultimedia-kioslaves)
179 )
180 embedded? (
181 || (
182 @@ -84,7 +84,7 @@
183 "
184 RDEPEND="${COMMONDEPEND}
185 !media-sound/amarok-utils
186 - player? ( >=kde-base/phonon-kde-${KDE_MINIMAL} )
187 + player? ( $(add_kdebase_dep phonon-kde) )
188 "
189
190 src_prepare() {
Report Message
Find on MARC Find on Google Groups