Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: media-sound/amarok/
Date: Thu, 01 Aug 2013 12:32:11
Message-Id: 1375360159.406f4676a61e3d7bec807eba0862583052023cbe.kensington@gentoo
1 commit: 406f4676a61e3d7bec807eba0862583052023cbe
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 1 12:29:19 2013 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 1 12:29:19 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=406f4676
7
8 [media-sound/amarok] Remove daap USE flag wrt bug #477208.
9
10 Package-Manager: portage-2.1.13.2
11
12 ---
13 media-sound/amarok/amarok-2.7.90.ebuild | 9 +--------
14 media-sound/amarok/amarok-9999.ebuild | 9 +--------
15 media-sound/amarok/metadata.xml | 5 -----
16 3 files changed, 2 insertions(+), 21 deletions(-)
17
18 diff --git a/media-sound/amarok/amarok-2.7.90.ebuild b/media-sound/amarok/amarok-2.7.90.ebuild
19 index a4bc4b1..0642359 100644
20 --- a/media-sound/amarok/amarok-2.7.90.ebuild
21 +++ b/media-sound/amarok/amarok-2.7.90.ebuild
22 @@ -26,7 +26,7 @@ fi
23
24 LICENSE="GPL-2"
25 SLOT="4"
26 -IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
27 +IUSE="cdda debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
28
29 if [[ ${PV} == *9999* ]]; then
30 RESTRICT="test"
31 @@ -104,13 +104,6 @@ src_configure() {
32 pkg_postinst() {
33 kde4-base_pkg_postinst
34
35 - if use daap; then
36 - echo
37 - elog "You have installed amarok with daap support."
38 - elog "You may be interested in installing www-servers/mongrel as well."
39 - echo
40 - fi
41 -
42 if ! use embedded; then
43 echo
44 elog "You've disabled the amarok support for embedded mysql DBs."
45
46 diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
47 index 5bd74e2..01dd23e 100644
48 --- a/media-sound/amarok/amarok-9999.ebuild
49 +++ b/media-sound/amarok/amarok-9999.ebuild
50 @@ -26,7 +26,7 @@ fi
51
52 LICENSE="GPL-2"
53 SLOT="4"
54 -IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
55 +IUSE="cdda debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
56
57 if [[ ${KDE_BUILD_TYPE} == live ]]; then
58 RESTRICT="test"
59 @@ -109,13 +109,6 @@ src_configure() {
60 pkg_postinst() {
61 kde4-base_pkg_postinst
62
63 - if use daap && ! has_version www-servers/mongrel ; then
64 - echo
65 - elog "You have installed amarok with daap support."
66 - elog "You may be interested in installing www-servers/mongrel as well."
67 - echo
68 - fi
69 -
70 if ! use embedded; then
71 echo
72 elog "You've disabled the amarok support for embedded mysql DBs."
73
74 diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
75 index 6a78f0d..c964fd8 100644
76 --- a/media-sound/amarok/metadata.xml
77 +++ b/media-sound/amarok/metadata.xml
78 @@ -8,11 +8,6 @@
79 <name>Jorge Manuel B. S. Vicetto</name>
80 </maintainer>
81 <use>
82 - <flag name="daap">Enable the scripts for music sharing through DAAP. This flag adds
83 - dependencies on <pkg>www-servers/mongrel</pkg> to allow sharing of
84 - the Amarok music collection through DAAP protocol. Please note
85 - that turning this flag off has no effect on DAAP browsing.
86 - </flag>
87 <flag name="embedded">Use libmysqld, MySQL embedded server library.
88 Try disabling this if you encounter -PIC related in amarok,
89 it will make amarok rely only on standalone MySQL server.