1 |
commit: 296e5cab83feea3555633b2e58987cde881eaee0 |
2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 15 04:21:22 2011 +0000 |
4 |
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 15 04:21:22 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=296e5cab |
7 |
|
8 |
[media-sound/amarok] Added amarok-2.5 Beta 1. |
9 |
|
10 |
(Portage version: 2.2.0_alpha73/git/Linux x86_64, unsigned Manifest commit) |
11 |
|
12 |
--- |
13 |
.../{amarok-9999.ebuild => amarok-2.4.90.ebuild} | 12 +++--------- |
14 |
media-sound/amarok/amarok-9999.ebuild | 12 +++--------- |
15 |
2 files changed, 6 insertions(+), 18 deletions(-) |
16 |
|
17 |
diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-2.4.90.ebuild |
18 |
similarity index 95% |
19 |
copy from media-sound/amarok/amarok-9999.ebuild |
20 |
copy to media-sound/amarok/amarok-2.4.90.ebuild |
21 |
index ae7012a..1f6ee9e 100644 |
22 |
--- a/media-sound/amarok/amarok-9999.ebuild |
23 |
+++ b/media-sound/amarok/amarok-2.4.90.ebuild |
24 |
@@ -33,11 +33,11 @@ COMMONDEPEND=" |
25 |
>=media-libs/taglib-extras-1.0.1 |
26 |
player? ( |
27 |
app-crypt/qca:2 |
28 |
- app-misc/strigi |
29 |
+ >=app-misc/strigi-0.5.7 |
30 |
$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?') |
31 |
$(add_kdebase_dep kdebase-kioslaves) |
32 |
sys-libs/zlib |
33 |
- >=virtual/mysql-5.1 |
34 |
+ >=virtual/mysql-5.1[embedded?] |
35 |
x11-libs/qt-script |
36 |
>=x11-libs/qtscriptgenerator-0.1.0 |
37 |
cdda? ( |
38 |
@@ -45,12 +45,6 @@ COMMONDEPEND=" |
39 |
$(add_kdebase_dep libkcompactdisc) |
40 |
$(add_kdebase_dep kdemultimedia-kioslaves) |
41 |
) |
42 |
- embedded? ( |
43 |
- || ( |
44 |
- >=dev-db/mysql-5.1.50-r3[embedded] |
45 |
- >=dev-db/mariadb-5.1.50[embedded] |
46 |
- ) |
47 |
- ) |
48 |
ipod? ( >=media-libs/libgpod-0.7.0[gtk] ) |
49 |
lastfm? ( >=media-libs/liblastfm-0.3.0 ) |
50 |
mp3tunes? ( |
51 |
@@ -145,7 +139,7 @@ pkg_postinst() { |
52 |
elog "to configure the external db and migrate your data from the embedded database." |
53 |
echo |
54 |
|
55 |
- if has_version "dev-db/mysql[minimal]"; then |
56 |
+ if has_version "virtual/mysql[minimal]"; then |
57 |
elog "You built mysql with the minimal use flag, so it doesn't include the server." |
58 |
elog "You won't be able to use the local mysql installation to store your amarok collection." |
59 |
echo |
60 |
|
61 |
diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild |
62 |
index ae7012a..1f6ee9e 100644 |
63 |
--- a/media-sound/amarok/amarok-9999.ebuild |
64 |
+++ b/media-sound/amarok/amarok-9999.ebuild |
65 |
@@ -33,11 +33,11 @@ COMMONDEPEND=" |
66 |
>=media-libs/taglib-extras-1.0.1 |
67 |
player? ( |
68 |
app-crypt/qca:2 |
69 |
- app-misc/strigi |
70 |
+ >=app-misc/strigi-0.5.7 |
71 |
$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?') |
72 |
$(add_kdebase_dep kdebase-kioslaves) |
73 |
sys-libs/zlib |
74 |
- >=virtual/mysql-5.1 |
75 |
+ >=virtual/mysql-5.1[embedded?] |
76 |
x11-libs/qt-script |
77 |
>=x11-libs/qtscriptgenerator-0.1.0 |
78 |
cdda? ( |
79 |
@@ -45,12 +45,6 @@ COMMONDEPEND=" |
80 |
$(add_kdebase_dep libkcompactdisc) |
81 |
$(add_kdebase_dep kdemultimedia-kioslaves) |
82 |
) |
83 |
- embedded? ( |
84 |
- || ( |
85 |
- >=dev-db/mysql-5.1.50-r3[embedded] |
86 |
- >=dev-db/mariadb-5.1.50[embedded] |
87 |
- ) |
88 |
- ) |
89 |
ipod? ( >=media-libs/libgpod-0.7.0[gtk] ) |
90 |
lastfm? ( >=media-libs/liblastfm-0.3.0 ) |
91 |
mp3tunes? ( |
92 |
@@ -145,7 +139,7 @@ pkg_postinst() { |
93 |
elog "to configure the external db and migrate your data from the embedded database." |
94 |
echo |
95 |
|
96 |
- if has_version "dev-db/mysql[minimal]"; then |
97 |
+ if has_version "virtual/mysql[minimal]"; then |
98 |
elog "You built mysql with the minimal use flag, so it doesn't include the server." |
99 |
elog "You won't be able to use the local mysql installation to store your amarok collection." |
100 |
echo |