Gentoo Archives: gentoo-commits

From: "Jorge Manuel B. S. Vicetto" <jmbsvicetto@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: media-sound/amarok/
Date: Sun, 08 Jul 2012 14:29:46
Message-Id: 1341757697.9000328352237ae4b22f87c629a652188fe860b9.jmbsvicetto@gentoo
1 commit: 9000328352237ae4b22f87c629a652188fe860b9
2 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 8 14:28:17 2012 +0000
4 Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 8 14:28:17 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=90003283
7
8 [media-sound/amarok] Sync amarok-9999 and amarok-2.5.90-r1 ebuilds.
9 Drop the player use flag as there's no way to disable the build.
10 Add ofa use flag and deps for amarok-9999.
11
12 ---
13 media-sound/amarok/amarok-2.5.90-r1.ebuild | 151 +++++++++++----------------
14 media-sound/amarok/amarok-9999.ebuild | 149 +++++++++++----------------
15 media-sound/amarok/metadata.xml | 10 ++-
16 3 files changed, 132 insertions(+), 178 deletions(-)
17
18 diff --git a/media-sound/amarok/amarok-2.5.90-r1.ebuild b/media-sound/amarok/amarok-2.5.90-r1.ebuild
19 index ea59165..ccec98f 100644
20 --- a/media-sound/amarok/amarok-2.5.90-r1.ebuild
21 +++ b/media-sound/amarok/amarok-2.5.90-r1.ebuild
22 @@ -21,7 +21,7 @@ fi
23
24 LICENSE="GPL-2"
25 SLOT="4"
26 -IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl +player semantic-desktop +utils"
27 +IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl semantic-desktop +utils"
28
29 # Tests require gmock - http://code.google.com/p/gmock/
30 # It's not in the tree yet
31 @@ -31,42 +31,37 @@ RESTRICT="test"
32 COMMONDEPEND="
33 >=media-libs/taglib-1.6.1[asf,mp4]
34 >=media-libs/taglib-extras-1.0.1
35 - player? (
36 - app-crypt/qca:2
37 - >=app-misc/strigi-0.5.7
38 - $(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
39 - $(add_kdebase_dep kdebase-kioslaves)
40 - sys-libs/zlib
41 - >=virtual/mysql-5.1[embedded?]
42 - x11-libs/qt-script
43 - >=x11-libs/qtscriptgenerator-0.1.0
44 - cdda? (
45 - $(add_kdebase_dep libkcddb)
46 - $(add_kdebase_dep libkcompactdisc)
47 - || (
48 - $(add_kdebase_dep audiocd-kio)
49 - $(add_kdebase_dep kdemultimedia-kioslaves)
50 - )
51 + app-crypt/qca:2
52 + >=app-misc/strigi-0.5.7
53 + $(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
54 + $(add_kdebase_dep kdebase-kioslaves)
55 + sys-libs/zlib
56 + >=virtual/mysql-5.1[embedded?]
57 + x11-libs/qt-core
58 + x11-libs/qt-dbus
59 + x11-libs/qt-script
60 + >=x11-libs/qtscriptgenerator-0.1.0
61 + cdda? (
62 + $(add_kdebase_dep libkcddb)
63 + $(add_kdebase_dep libkcompactdisc)
64 + || (
65 + $(add_kdebase_dep audiocd-kio)
66 + $(add_kdebase_dep kdemultimedia-kioslaves)
67 )
68 - ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
69 - lastfm? ( =media-libs/liblastfm-0.3* )
70 - ofa? ( >=media-libs/libofa-0.9.0 )
71 - mp3tunes? (
72 - dev-libs/glib:2
73 - dev-libs/libxml2
74 - dev-libs/openssl
75 - net-libs/loudmouth
76 - net-misc/curl
77 - x11-libs/qt-core[glib]
78 - )
79 - mtp? ( >=media-libs/libmtp-1.0.0 )
80 - opengl? ( virtual/opengl )
81 )
82 - utils? (
83 - x11-libs/qt-core
84 - x11-libs/qt-dbus
85 + ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
86 + lastfm? ( =media-libs/liblastfm-0.3* )
87 + mp3tunes? (
88 + dev-libs/glib:2
89 + dev-libs/libxml2
90 + dev-libs/openssl
91 + net-libs/loudmouth
92 + net-misc/curl
93 + x11-libs/qt-core[glib]
94 )
95 - !player? ( !utils? ( media-sound/amarok[player] ) )
96 + mtp? ( >=media-libs/libmtp-1.0.0 )
97 + ofa? ( >=media-libs/libofa-0.9.0 )
98 + opengl? ( virtual/opengl )
99 "
100 DEPEND="${COMMONDEPEND}
101 dev-util/automoc
102 @@ -74,51 +69,32 @@ DEPEND="${COMMONDEPEND}
103 "
104 RDEPEND="${COMMONDEPEND}
105 !media-sound/amarok-utils
106 - player? ( $(add_kdebase_dep phonon-kde) )
107 + $(add_kdebase_dep phonon-kde)
108 "
109
110 -src_prepare() {
111 - if ! use player; then
112 - # Disable po processing
113 - sed -e "s:include(MacroOptionalAddSubdirectory)::" \
114 - -i "${S}/CMakeLists.txt" \
115 - || die "Removing include of MacroOptionalAddSubdirectory failed."
116 - sed -e "s:macro_optional_add_subdirectory( po )::" \
117 - -i "${S}/CMakeLists.txt" \
118 - || die "Removing include of MacroOptionalAddSubdirectory failed."
119 - fi
120 -
121 - kde4-base_src_prepare
122 -}
123 -
124 src_configure() {
125 # Append minimal-toc cflag for ppc64, see bug 280552 and 292707
126 use ppc64 && append-flags -mminimal-toc
127 local mycmakeargs
128
129 - if use player; then
130 - mycmakeargs=(
131 - -DWITH_PLAYER=ON
132 - -DWITH_Libgcrypt=OFF
133 - $(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
134 - $(cmake-utils_use_with ipod)
135 - $(cmake-utils_use_with ipod Gdk)
136 - $(cmake-utils_use_with lastfm LibLastFm)
137 - $(cmake-utils_use_with ofa LibOFA)
138 - $(cmake-utils_use_with mtp)
139 - $(cmake-utils_use_with mp3tunes MP3Tunes)
140 - )
141 - else
142 - mycmakeargs=(
143 - -DWITH_PLAYER=OFF
144 - )
145 - fi
146 + mycmakeargs=(
147 + -DWITH_PLAYER=ON
148 + -DWITH_Libgcrypt=OFF
149 + $(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
150 + $(cmake-utils_use_with ipod)
151 + $(cmake-utils_use_with ipod Gdk)
152 + $(cmake-utils_use_with lastfm LibLastFm)
153 + $(cmake-utils_use_with mtp)
154 + $(cmake-utils_use_with mp3tunes MP3Tunes)
155 + $(cmake-utils_use_with ofa LibOFA)
156 + )
157
158 mycmakeargs+=(
159 $(cmake-utils_use_with utils UTILITIES)
160 )
161 - # $(cmake-utils_use_with semantic-desktop Nepomuk)
162 - # $(cmake-utils_use_with semantic-desktop Soprano)
163 +
164 + # $(cmake-utils_use_with semantic-desktop Nepomuk)
165 + # $(cmake-utils_use_with semantic-desktop Soprano)
166
167 kde4-base_src_configure
168 }
169 @@ -126,29 +102,26 @@ src_configure() {
170 pkg_postinst() {
171 kde4-base_pkg_postinst
172
173 - if use player; then
174 -
175 - if use daap; then
176 - echo
177 - elog "You have installed amarok with daap support."
178 - elog "You may be interested in installing www-servers/mongrel as well."
179 - echo
180 - fi
181 + if use daap; then
182 + echo
183 + elog "You have installed amarok with daap support."
184 + elog "You may be interested in installing www-servers/mongrel as well."
185 + echo
186 + fi
187
188 - if ! use embedded; then
189 - echo
190 - elog "You've disabled the amarok support for embedded mysql DBs."
191 - elog "You'll have to configure amarok to use an external db server."
192 + if ! use embedded; then
193 + echo
194 + elog "You've disabled the amarok support for embedded mysql DBs."
195 + elog "You'll have to configure amarok to use an external db server."
196 + echo
197 + elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
198 + elog "to configure the external db and migrate your data from the embedded database."
199 + echo
200 +
201 + if has_version "virtual/mysql[minimal]"; then
202 + elog "You built mysql with the minimal use flag, so it doesn't include the server."
203 + elog "You won't be able to use the local mysql installation to store your amarok collection."
204 echo
205 - elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
206 - elog "to configure the external db and migrate your data from the embedded database."
207 - echo
208 -
209 - if has_version "virtual/mysql[minimal]"; then
210 - elog "You built mysql with the minimal use flag, so it doesn't include the server."
211 - elog "You won't be able to use the local mysql installation to store your amarok collection."
212 - echo
213 - fi
214 fi
215 fi
216 }
217
218 diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
219 index cccbabe..43fdacf 100644
220 --- a/media-sound/amarok/amarok-9999.ebuild
221 +++ b/media-sound/amarok/amarok-9999.ebuild
222 @@ -21,7 +21,7 @@ fi
223
224 LICENSE="GPL-2"
225 SLOT="4"
226 -IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp opengl +player semantic-desktop +utils"
227 +IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl semantic-desktop +utils"
228
229 # Tests require gmock - http://code.google.com/p/gmock/
230 # It's not in the tree yet
231 @@ -31,41 +31,37 @@ RESTRICT="test"
232 COMMONDEPEND="
233 >=media-libs/taglib-1.6.1[asf,mp4]
234 >=media-libs/taglib-extras-1.0.1
235 - player? (
236 - app-crypt/qca:2
237 - >=app-misc/strigi-0.5.7
238 - $(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
239 - $(add_kdebase_dep kdebase-kioslaves)
240 - sys-libs/zlib
241 - >=virtual/mysql-5.1[embedded?]
242 - x11-libs/qt-script
243 - >=x11-libs/qtscriptgenerator-0.1.0
244 - cdda? (
245 - $(add_kdebase_dep libkcddb)
246 - $(add_kdebase_dep libkcompactdisc)
247 - || (
248 - $(add_kdebase_dep audiocd-kio)
249 - $(add_kdebase_dep kdemultimedia-kioslaves)
250 - )
251 + app-crypt/qca:2
252 + >=app-misc/strigi-0.5.7
253 + $(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
254 + $(add_kdebase_dep kdebase-kioslaves)
255 + sys-libs/zlib
256 + >=virtual/mysql-5.1[embedded?]
257 + x11-libs/qt-core
258 + x11-libs/qt-dbus
259 + x11-libs/qt-script
260 + >=x11-libs/qtscriptgenerator-0.1.0
261 + cdda? (
262 + $(add_kdebase_dep libkcddb)
263 + $(add_kdebase_dep libkcompactdisc)
264 + || (
265 + $(add_kdebase_dep audiocd-kio)
266 + $(add_kdebase_dep kdemultimedia-kioslaves)
267 )
268 - ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
269 - lastfm? ( >=media-libs/liblastfm-0.3.0 )
270 - mp3tunes? (
271 - dev-libs/glib:2
272 - dev-libs/libxml2
273 - dev-libs/openssl
274 - net-libs/loudmouth
275 - net-misc/curl
276 - x11-libs/qt-core[glib]
277 - )
278 - mtp? ( >=media-libs/libmtp-1.0.0 )
279 - opengl? ( virtual/opengl )
280 )
281 - utils? (
282 - x11-libs/qt-core
283 - x11-libs/qt-dbus
284 + ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
285 + lastfm? ( >=media-libs/liblastfm-0.3.0 )
286 + mp3tunes? (
287 + dev-libs/glib:2
288 + dev-libs/libxml2
289 + dev-libs/openssl
290 + net-libs/loudmouth
291 + net-misc/curl
292 + x11-libs/qt-core[glib]
293 )
294 - !player? ( !utils? ( media-sound/amarok[player] ) )
295 + mtp? ( >=media-libs/libmtp-1.0.0 )
296 + ofa? ( >=media-libs/libofa-0.9.0 )
297 + opengl? ( virtual/opengl )
298 "
299 DEPEND="${COMMONDEPEND}
300 dev-util/automoc
301 @@ -73,50 +69,32 @@ DEPEND="${COMMONDEPEND}
302 "
303 RDEPEND="${COMMONDEPEND}
304 !media-sound/amarok-utils
305 - player? ( $(add_kdebase_dep phonon-kde) )
306 + $(add_kdebase_dep phonon-kde)
307 "
308
309 -src_prepare() {
310 - if ! use player; then
311 - # Disable po processing
312 - sed -e "s:include(MacroOptionalAddSubdirectory)::" \
313 - -i "${S}/CMakeLists.txt" \
314 - || die "Removing include of MacroOptionalAddSubdirectory failed."
315 - sed -e "s:macro_optional_add_subdirectory( po )::" \
316 - -i "${S}/CMakeLists.txt" \
317 - || die "Removing include of MacroOptionalAddSubdirectory failed."
318 - fi
319 -
320 - kde4-base_src_prepare
321 -}
322 -
323 src_configure() {
324 # Append minimal-toc cflag for ppc64, see bug 280552 and 292707
325 use ppc64 && append-flags -mminimal-toc
326 local mycmakeargs
327
328 - if use player; then
329 - mycmakeargs=(
330 - -DWITH_PLAYER=ON
331 - -DWITH_Libgcrypt=OFF
332 - $(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
333 - $(cmake-utils_use_with ipod)
334 - $(cmake-utils_use_with ipod Gdk)
335 - $(cmake-utils_use_with lastfm LibLastFm)
336 - $(cmake-utils_use_with mtp)
337 - $(cmake-utils_use_with mp3tunes MP3Tunes)
338 - )
339 - else
340 - mycmakeargs=(
341 - -DWITH_PLAYER=OFF
342 - )
343 - fi
344 + mycmakeargs=(
345 + -DWITH_PLAYER=ON
346 + -DWITH_Libgcrypt=OFF
347 + $(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
348 + $(cmake-utils_use_with ipod)
349 + $(cmake-utils_use_with ipod Gdk)
350 + $(cmake-utils_use_with lastfm LibLastFm)
351 + $(cmake-utils_use_with mtp)
352 + $(cmake-utils_use_with mp3tunes MP3Tunes)
353 + $(cmake-utils_use_with ofa LibOFA)
354 + )
355
356 mycmakeargs+=(
357 $(cmake-utils_use_with utils UTILITIES)
358 )
359 - # $(cmake-utils_use_with semantic-desktop Nepomuk)
360 - # $(cmake-utils_use_with semantic-desktop Soprano)
361 +
362 + # $(cmake-utils_use_with semantic-desktop Nepomuk)
363 + # $(cmake-utils_use_with semantic-desktop Soprano)
364
365 kde4-base_src_configure
366 }
367 @@ -124,29 +102,26 @@ src_configure() {
368 pkg_postinst() {
369 kde4-base_pkg_postinst
370
371 - if use player; then
372 -
373 - if use daap; then
374 - echo
375 - elog "You have installed amarok with daap support."
376 - elog "You may be interested in installing www-servers/mongrel as well."
377 - echo
378 - fi
379 + if use daap; then
380 + echo
381 + elog "You have installed amarok with daap support."
382 + elog "You may be interested in installing www-servers/mongrel as well."
383 + echo
384 + fi
385
386 - if ! use embedded; then
387 - echo
388 - elog "You've disabled the amarok support for embedded mysql DBs."
389 - elog "You'll have to configure amarok to use an external db server."
390 + if ! use embedded; then
391 + echo
392 + elog "You've disabled the amarok support for embedded mysql DBs."
393 + elog "You'll have to configure amarok to use an external db server."
394 + echo
395 + elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
396 + elog "to configure the external db and migrate your data from the embedded database."
397 + echo
398 +
399 + if has_version "virtual/mysql[minimal]"; then
400 + elog "You built mysql with the minimal use flag, so it doesn't include the server."
401 + elog "You won't be able to use the local mysql installation to store your amarok collection."
402 echo
403 - elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
404 - elog "to configure the external db and migrate your data from the embedded database."
405 - echo
406 -
407 - if has_version "virtual/mysql[minimal]"; then
408 - elog "You built mysql with the minimal use flag, so it doesn't include the server."
409 - elog "You won't be able to use the local mysql installation to store your amarok collection."
410 - echo
411 - fi
412 fi
413 fi
414 }
415
416 diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
417 index dc695a6..9fa39d5 100644
418 --- a/media-sound/amarok/metadata.xml
419 +++ b/media-sound/amarok/metadata.xml
420 @@ -2,6 +2,10 @@
421 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
422 <pkgmetadata>
423 <herd>kde</herd>
424 +<maintainer>
425 + <email>jmbsvicetto@g.o</email>
426 + <name>Jorge Manuel B. S. Vicetto</name>
427 +</maintainer>
428 <use>
429 <!--
430 <flag name="amazon">Enable support for downloading covers from amazon.com</flag>
431 @@ -17,10 +21,12 @@
432 Try disabling this if you encounter -PIC related in amarok,
433 it will make amarok rely only on standalone MySQL server.
434 </flag>
435 - <flag name="lastfm">Enable Last.fm streaming services support through <pkg>media-libs/liblastfm</pkg></flag>
436 + <flag name="lastfm">
437 + Enable Last.fm streaming services support through
438 + <pkg>media-libs/liblastfm</pkg>
439 + </flag>
440 <flag name="mp3tunes">Enable mp3tunes integration</flag>
441 <flag name="mtp">Enable support for libMTP (Plays4Sure) devices access through libmtp</flag>
442 - <flag name="player">Build the player</flag>
443 <flag name="utils">Build the utils - old <pkg>media-sound/amarok-utils</pkg></flag>
444 <!--
445 <flag name="ifp">Enable support for iRiver devices access through libifp</flag>