1 |
robbat2 10/02/22 18:37:26 |
2 |
|
3 |
Modified: ChangeLog amarok-2.2.2.ebuild |
4 |
amarok-2.2.2-r1.ebuild amarok-2.2.0.ebuild |
5 |
amarok-2.2.2.90.ebuild |
6 |
Log: |
7 |
Bug #306155 workaround: Update MySQL dep to prevent MySQL 5.1 from being considered as a dep solution, due to the lack of a functional shared-embedded patch at this time. |
8 |
(Portage version: 2.2_rc63/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.361 media-sound/amarok/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/amarok/ChangeLog?rev=1.361&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/amarok/ChangeLog?rev=1.361&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/amarok/ChangeLog?r1=1.360&r2=1.361 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v |
20 |
retrieving revision 1.360 |
21 |
retrieving revision 1.361 |
22 |
diff -p -w -b -B -u -u -r1.360 -r1.361 |
23 |
--- ChangeLog 20 Feb 2010 19:44:17 -0000 1.360 |
24 |
+++ ChangeLog 22 Feb 2010 18:37:24 -0000 1.361 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for media-sound/amarok |
27 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.360 2010/02/20 19:44:17 ssuominen Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.361 2010/02/22 18:37:24 robbat2 Exp $ |
30 |
+ |
31 |
+ 22 Feb 2010; Robin H. Johnson <robbat2@g.o> amarok-2.2.0.ebuild, |
32 |
+ amarok-2.2.2.ebuild, amarok-2.2.2-r1.ebuild, amarok-2.2.2.90.ebuild: |
33 |
+ Bug #306155 workaround: Update MySQL dep to prevent MySQL 5.1 from being |
34 |
+ considered as a dep solution, due to the lack of a functional |
35 |
+ shared-embedded patch at this time. |
36 |
|
37 |
20 Feb 2010; Samuli Suominen <ssuominen@g.o> |
38 |
amarok-2.2.2-r1.ebuild: |
39 |
|
40 |
|
41 |
|
42 |
1.2 media-sound/amarok/amarok-2.2.2.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/amarok/amarok-2.2.2.ebuild?rev=1.2&view=markup |
45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/amarok/amarok-2.2.2.ebuild?rev=1.2&content-type=text/plain |
46 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/amarok/amarok-2.2.2.ebuild?r1=1.1&r2=1.2 |
47 |
|
48 |
Index: amarok-2.2.2.ebuild |
49 |
=================================================================== |
50 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.2.2.ebuild,v |
51 |
retrieving revision 1.1 |
52 |
retrieving revision 1.2 |
53 |
diff -p -w -b -B -u -u -r1.1 -r1.2 |
54 |
--- amarok-2.2.2.ebuild 8 Jan 2010 15:53:27 -0000 1.1 |
55 |
+++ amarok-2.2.2.ebuild 22 Feb 2010 18:37:24 -0000 1.2 |
56 |
@@ -1,6 +1,6 @@ |
57 |
# Copyright 1999-2010 Gentoo Foundation |
58 |
# Distributed under the terms of the GNU General Public License v2 |
59 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.2.2.ebuild,v 1.1 2010/01/08 15:53:27 jmbsvicetto Exp $ |
60 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.2.2.ebuild,v 1.2 2010/02/22 18:37:24 robbat2 Exp $ |
61 |
|
62 |
EAPI="2" |
63 |
|
64 |
@@ -33,8 +33,8 @@ DEPEND=" |
65 |
app-crypt/qca:2 |
66 |
>=app-misc/strigi-0.5.7 |
67 |
|| ( |
68 |
- >=dev-db/mysql-5.0.76-r1[embedded?,-minimal] |
69 |
- >=dev-db/mysql-community-5.0.77-r1[embedded?,-minimal] |
70 |
+ ( >=dev-db/mysql-5.0.76-r1[embedded,-minimal] <dev-db/mysql-5.1 ) |
71 |
+ ( >=dev-db/mysql-community-5.0.77-r1[embedded,-minimal] <dev-db/mysql-community-5.1 ) |
72 |
) |
73 |
>=media-libs/taglib-extras-1.0.1 |
74 |
>=kde-base/kdelibs-${KDE_MINIMAL}[opengl?,semantic-desktop?] |
75 |
|
76 |
|
77 |
|
78 |
1.3 media-sound/amarok/amarok-2.2.2-r1.ebuild |
79 |
|
80 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/amarok/amarok-2.2.2-r1.ebuild?rev=1.3&view=markup |
81 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/amarok/amarok-2.2.2-r1.ebuild?rev=1.3&content-type=text/plain |
82 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/amarok/amarok-2.2.2-r1.ebuild?r1=1.2&r2=1.3 |
83 |
|
84 |
Index: amarok-2.2.2-r1.ebuild |
85 |
=================================================================== |
86 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.2.2-r1.ebuild,v |
87 |
retrieving revision 1.2 |
88 |
retrieving revision 1.3 |
89 |
diff -p -w -b -B -u -u -r1.2 -r1.3 |
90 |
--- amarok-2.2.2-r1.ebuild 20 Feb 2010 19:44:17 -0000 1.2 |
91 |
+++ amarok-2.2.2-r1.ebuild 22 Feb 2010 18:37:24 -0000 1.3 |
92 |
@@ -1,6 +1,6 @@ |
93 |
# Copyright 1999-2010 Gentoo Foundation |
94 |
# Distributed under the terms of the GNU General Public License v2 |
95 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.2.2-r1.ebuild,v 1.2 2010/02/20 19:44:17 ssuominen Exp $ |
96 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.2.2-r1.ebuild,v 1.3 2010/02/22 18:37:24 robbat2 Exp $ |
97 |
|
98 |
EAPI="2" |
99 |
|
100 |
@@ -33,8 +33,8 @@ DEPEND=" |
101 |
app-crypt/qca:2 |
102 |
>=app-misc/strigi-0.5.7[dbus,qt4] |
103 |
|| ( |
104 |
- >=dev-db/mysql-5.0.76-r1[embedded?,-minimal] |
105 |
- >=dev-db/mysql-community-5.0.77-r1[embedded?,-minimal] |
106 |
+ ( >=dev-db/mysql-5.0.76-r1[embedded,-minimal] <dev-db/mysql-5.1 ) |
107 |
+ ( >=dev-db/mysql-community-5.0.77-r1[embedded,-minimal] <dev-db/mysql-community-5.1 ) |
108 |
) |
109 |
>=media-libs/taglib-1.6.1[asf,mp4] |
110 |
>=media-libs/taglib-extras-1.0.1 |
111 |
|
112 |
|
113 |
|
114 |
1.5 media-sound/amarok/amarok-2.2.0.ebuild |
115 |
|
116 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/amarok/amarok-2.2.0.ebuild?rev=1.5&view=markup |
117 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/amarok/amarok-2.2.0.ebuild?rev=1.5&content-type=text/plain |
118 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/amarok/amarok-2.2.0.ebuild?r1=1.4&r2=1.5 |
119 |
|
120 |
Index: amarok-2.2.0.ebuild |
121 |
=================================================================== |
122 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.2.0.ebuild,v |
123 |
retrieving revision 1.4 |
124 |
retrieving revision 1.5 |
125 |
diff -p -w -b -B -u -u -r1.4 -r1.5 |
126 |
--- amarok-2.2.0.ebuild 14 Nov 2009 15:20:30 -0000 1.4 |
127 |
+++ amarok-2.2.0.ebuild 22 Feb 2010 18:37:24 -0000 1.5 |
128 |
@@ -1,6 +1,6 @@ |
129 |
-# Copyright 1999-2009 Gentoo Foundation |
130 |
+# Copyright 1999-2010 Gentoo Foundation |
131 |
# Distributed under the terms of the GNU General Public License v2 |
132 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.2.0.ebuild,v 1.4 2009/11/14 15:20:30 tampakrap Exp $ |
133 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.2.0.ebuild,v 1.5 2010/02/22 18:37:24 robbat2 Exp $ |
134 |
|
135 |
EAPI="2" |
136 |
|
137 |
@@ -32,8 +32,8 @@ IUSE="cdda daap debug ipod lastfm mp3tun |
138 |
DEPEND=" |
139 |
>=app-misc/strigi-0.5.7 |
140 |
|| ( |
141 |
- >=dev-db/mysql-5.0.76-r1[embedded,-minimal] |
142 |
- >=dev-db/mysql-community-5.0.77-r1[embedded,-minimal] |
143 |
+ ( >=dev-db/mysql-5.0.76-r1[embedded,-minimal] <dev-db/mysql-5.1 ) |
144 |
+ ( >=dev-db/mysql-community-5.0.77-r1[embedded,-minimal] <dev-db/mysql-community-5.1 ) |
145 |
) |
146 |
>=media-libs/taglib-1.6 |
147 |
>=media-libs/taglib-extras-1.0.1 |
148 |
|
149 |
|
150 |
|
151 |
1.3 media-sound/amarok/amarok-2.2.2.90.ebuild |
152 |
|
153 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/amarok/amarok-2.2.2.90.ebuild?rev=1.3&view=markup |
154 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/amarok/amarok-2.2.2.90.ebuild?rev=1.3&content-type=text/plain |
155 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/amarok/amarok-2.2.2.90.ebuild?r1=1.2&r2=1.3 |
156 |
|
157 |
Index: amarok-2.2.2.90.ebuild |
158 |
=================================================================== |
159 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.2.2.90.ebuild,v |
160 |
retrieving revision 1.2 |
161 |
retrieving revision 1.3 |
162 |
diff -p -w -b -B -u -u -r1.2 -r1.3 |
163 |
--- amarok-2.2.2.90.ebuild 20 Feb 2010 18:29:04 -0000 1.2 |
164 |
+++ amarok-2.2.2.90.ebuild 22 Feb 2010 18:37:24 -0000 1.3 |
165 |
@@ -1,6 +1,6 @@ |
166 |
# Copyright 1999-2010 Gentoo Foundation |
167 |
# Distributed under the terms of the GNU General Public License v2 |
168 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.2.2.90.ebuild,v 1.2 2010/02/20 18:29:04 jmbsvicetto Exp $ |
169 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.2.2.90.ebuild,v 1.3 2010/02/22 18:37:24 robbat2 Exp $ |
170 |
|
171 |
EAPI="2" |
172 |
|
173 |
@@ -33,8 +33,8 @@ DEPEND=" |
174 |
app-crypt/qca:2 |
175 |
>=app-misc/strigi-0.5.7[dbus,qt4] |
176 |
|| ( |
177 |
- >=dev-db/mysql-5.0.76-r1[embedded?,-minimal] |
178 |
- >=dev-db/mysql-community-5.0.77-r1[embedded?,-minimal] |
179 |
+ ( >=dev-db/mysql-5.0.76-r1[embedded,-minimal] <dev-db/mysql-5.1 ) |
180 |
+ ( >=dev-db/mysql-community-5.0.77-r1[embedded,-minimal] <dev-db/mysql-community-5.1 ) |
181 |
) |
182 |
>=media-libs/taglib-1.6.1[asf,mp4] |
183 |
>=media-libs/taglib-extras-1.0.1 |