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

Gentoo Archives: gentoo-commits

From: "Jorge Manuel B. S. Vicetto (jmbsvicetto)" <jmbsvicetto@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-sound/amarok: ChangeLog amarok-2.2.2-r1.ebuild amarok-2.2.2.90.ebuild
Date: Tue, 23 Feb 2010 22:58:09
Message-Id: E1Nk3hd-0001ik-0A@stork.gentoo.org
1 jmbsvicetto 10/02/23 22:58:04
2
3 Modified: ChangeLog amarok-2.2.2-r1.ebuild
4 amarok-2.2.2.90.ebuild
5 Log:
6 Reviewed mysql deps and added a few postinst warnings.
7 (Portage version: 2.2_rc62/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.364 media-sound/amarok/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/amarok/ChangeLog?rev=1.364&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/amarok/ChangeLog?rev=1.364&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/amarok/ChangeLog?r1=1.363&r2=1.364
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v
19 retrieving revision 1.363
20 retrieving revision 1.364
21 diff -u -r1.363 -r1.364
22 --- ChangeLog 23 Feb 2010 17:02:29 -0000 1.363
23 +++ ChangeLog 23 Feb 2010 22:58:04 -0000 1.364
24 @@ -1,6 +1,10 @@
25 # ChangeLog for media-sound/amarok
26 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.363 2010/02/23 17:02:29 jmbsvicetto Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.364 2010/02/23 22:58:04 jmbsvicetto Exp $
29 +
30 + 23 Feb 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o>
31 + amarok-2.2.2-r1.ebuild, amarok-2.2.2.90.ebuild:
32 + Reviewed mysql deps and added a few postinst warnings.
33
34 23 Feb 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o>
35 amarok-2.2.2-r1.ebuild, amarok-2.2.2.90.ebuild:
36
37
38
39 1.6 media-sound/amarok/amarok-2.2.2-r1.ebuild
40
41 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/amarok/amarok-2.2.2-r1.ebuild?rev=1.6&view=markup
42 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/amarok/amarok-2.2.2-r1.ebuild?rev=1.6&content-type=text/plain
43 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/amarok/amarok-2.2.2-r1.ebuild?r1=1.5&r2=1.6
44
45 Index: amarok-2.2.2-r1.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.2.2-r1.ebuild,v
48 retrieving revision 1.5
49 retrieving revision 1.6
50 diff -u -r1.5 -r1.6
51 --- amarok-2.2.2-r1.ebuild 23 Feb 2010 17:02:29 -0000 1.5
52 +++ amarok-2.2.2-r1.ebuild 23 Feb 2010 22:58:04 -0000 1.6
53 @@ -1,6 +1,6 @@
54 # Copyright 1999-2010 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.2.2-r1.ebuild,v 1.5 2010/02/23 17:02:29 jmbsvicetto Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.2.2-r1.ebuild,v 1.6 2010/02/23 22:58:04 jmbsvicetto Exp $
58
59 EAPI="2"
60
61 @@ -32,6 +32,7 @@
62 DEPEND="
63 app-crypt/qca:2
64 >=app-misc/strigi-0.5.7[dbus,qt4]
65 + >=dev-db/mysql-5.0.76
66 >=media-libs/taglib-1.6.1[asf,mp4]
67 >=media-libs/taglib-extras-1.0.1
68 >=kde-base/kdelibs-${KDE_MINIMAL}[opengl?,semantic-desktop?]
69 @@ -43,8 +44,7 @@
70 >=kde-base/libkcompactdisc-${KDE_MINIMAL}
71 >=kde-base/kdemultimedia-kioslaves-${KDE_MINIMAL}
72 )
73 - embedded? ( <=dev-db/mysql-5.1[embedded,-minimal] )
74 - !embedded? ( dev-db/mysql[-embedded,-minimal] )
75 + embedded? ( <dev-db/mysql-5.1[embedded,-minimal] )
76 ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
77 lastfm? ( >=media-libs/liblastfm-0.3.0 )
78 mp3tunes? (
79 @@ -97,4 +97,17 @@
80 elog "You may be interested in installing www-servers/mongrel as well."
81 echo
82 fi
83 +
84 + if !use embedded; then
85 + echo
86 + elog "You've disabled the amarok support for embedded mysql DBs."
87 + elog "You'll have to configure amarok to use an external db server."
88 + echo
89 +
90 + if has_version "dev-db/mysql[minimal]"; then
91 + elog "You built mysql with the minimal use flag, so it doesn't include the server."
92 + elog "You won't be able to use the local mysql installation to store your amarok collection."
93 + echo
94 + fi
95 + fi
96 }
97
98
99
100 1.6 media-sound/amarok/amarok-2.2.2.90.ebuild
101
102 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/amarok/amarok-2.2.2.90.ebuild?rev=1.6&view=markup
103 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/amarok/amarok-2.2.2.90.ebuild?rev=1.6&content-type=text/plain
104 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/amarok/amarok-2.2.2.90.ebuild?r1=1.5&r2=1.6
105
106 Index: amarok-2.2.2.90.ebuild
107 ===================================================================
108 RCS file: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.2.2.90.ebuild,v
109 retrieving revision 1.5
110 retrieving revision 1.6
111 diff -u -r1.5 -r1.6
112 --- amarok-2.2.2.90.ebuild 23 Feb 2010 17:02:29 -0000 1.5
113 +++ amarok-2.2.2.90.ebuild 23 Feb 2010 22:58:04 -0000 1.6
114 @@ -1,6 +1,6 @@
115 # Copyright 1999-2010 Gentoo Foundation
116 # Distributed under the terms of the GNU General Public License v2
117 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.2.2.90.ebuild,v 1.5 2010/02/23 17:02:29 jmbsvicetto Exp $
118 +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.2.2.90.ebuild,v 1.6 2010/02/23 22:58:04 jmbsvicetto Exp $
119
120 EAPI="2"
121
122 @@ -32,14 +32,14 @@
123 DEPEND="
124 app-crypt/qca:2
125 >=app-misc/strigi-0.5.7[dbus,qt4]
126 + >=dev-db/mysql-5.0.76
127 >=media-libs/taglib-1.6.1[asf,mp4]
128 >=media-libs/taglib-extras-1.0.1
129 >=kde-base/kdelibs-${KDE_MINIMAL}[opengl?,semantic-desktop?]
130 sys-libs/zlib
131 x11-libs/qt-script
132 >=x11-libs/qtscriptgenerator-0.1.0
133 - embedded? ( <=dev-db/mysql-5.1[embedded,-minimal] )
134 - !embedded? ( dev-db/mysql[-embedded,-minimal] )
135 + embedded? ( <dev-db/mysql-5.1[embedded,-minimal] )
136 cdda? (
137 >=kde-base/libkcddb-${KDE_MINIMAL}
138 >=kde-base/libkcompactdisc-${KDE_MINIMAL}
139 @@ -99,4 +99,17 @@
140 elog "You may be interested in installing www-servers/mongrel as well."
141 echo
142 fi
143 +
144 + if !use embedded; then
145 + echo
146 + elog "You've disabled the amarok support for embedded mysql DBs."
147 + elog "You'll have to configure amarok to use an external db server."
148 + echo
149 +
150 + if has_version "dev-db/mysql[minimal]"; then
151 + elog "You built mysql with the minimal use flag, so it doesn't include the server."
152 + elog "You won't be able to use the local mysql installation to store your amarok collection."
153 + echo
154 + fi
155 + fi
156 }
Report Message
Find on MARC Find on Google Groups