1 |
commit: 5ba7ba8fb50debd33fc32f878c55c58ce6853a82 |
2 |
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Apr 5 23:27:22 2011 +0000 |
4 |
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Apr 5 23:27:39 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5ba7ba8f |
7 |
|
8 |
[app-office/akonadi-server] Cleanup the ebuild. |
9 |
|
10 |
--- |
11 |
.../akonadi-server/akonadi-server-9999.ebuild | 35 ++++++++----------- |
12 |
1 files changed, 15 insertions(+), 20 deletions(-) |
13 |
|
14 |
diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild |
15 |
index 3535345..1638c23 100644 |
16 |
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild |
17 |
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild |
18 |
@@ -13,7 +13,7 @@ EGIT_REPO_URI="git://anongit.kde.org/akonadi" |
19 |
LICENSE="LGPL-2.1" |
20 |
KEYWORDS="" |
21 |
SLOT="0" |
22 |
-IUSE="mysql postgres +sqlite +server" |
23 |
+IUSE="mysql postgres +sqlite" |
24 |
|
25 |
CDEPEND=" |
26 |
dev-libs/boost |
27 |
@@ -28,27 +28,22 @@ DEPEND="${CDEPEND} |
28 |
>=dev-util/automoc-0.9.88 |
29 |
" |
30 |
RDEPEND="${CDEPEND} |
31 |
- server? ( |
32 |
- postgres? ( dev-db/postgresql-server ) |
33 |
- ) |
34 |
+ postgres? ( dev-db/postgresql-server ) |
35 |
" |
36 |
|
37 |
-REQUIRED_USE="^^ ( sqlite mysql postgres )" |
38 |
+REQUIRED_USE="|| ( sqlite mysql postgres )" |
39 |
|
40 |
pkg_setup() { |
41 |
# Set default storage backend in order: SQLite, MySQL, PostgreSQL |
42 |
- local available |
43 |
if use sqlite; then |
44 |
- driver="QSQLITE3" |
45 |
- available+=" ${driver}" |
46 |
- fi |
47 |
- if use mysql; then |
48 |
- driver="QMYSQL" |
49 |
- available+=" ${driver}" |
50 |
- fi |
51 |
- if use postgres; then |
52 |
- driver="QPSQL" |
53 |
- available+=" ${driver}" |
54 |
+ DRIVER="QSQLITE3" |
55 |
+ AVAILABLE+=" ${driver}" |
56 |
+ elif use mysql; then |
57 |
+ DRIVER="QMYSQL" |
58 |
+ AVAILABLE+=" ${driver}" |
59 |
+ elif use postgres; then |
60 |
+ DRIVER="QPSQL" |
61 |
+ AVAILABLE+=" ${driver}" |
62 |
fi |
63 |
|
64 |
# Notify about driver name change |
65 |
@@ -65,7 +60,7 @@ pkg_setup() { |
66 |
ewarn "If you intend to use it, please enable mysql USE flag and reinstall" |
67 |
ewarn "${CATEGORY}/${PN}." |
68 |
ewarn "Otherwise select different driver in your ~/.config/akonadi/akonadiserverrc." |
69 |
- ewarn "Available drivers are:${available}" |
70 |
+ ewarn "Available drivers are:${AVAILABLE}" |
71 |
fi |
72 |
} |
73 |
|
74 |
@@ -73,7 +68,7 @@ src_install() { |
75 |
# Who knows, maybe it accidentally fixes our permission issues |
76 |
cat <<-EOF > "${T}"/akonadiserverrc |
77 |
[%General] |
78 |
-Driver=${driver} |
79 |
+Driver=${DRIVER} |
80 |
EOF |
81 |
insinto /usr/share/config/akonadi |
82 |
doins "${T}"/akonadiserverrc || die "doins failed" |
83 |
@@ -83,7 +78,7 @@ EOF |
84 |
|
85 |
pkg_postinst() { |
86 |
echo |
87 |
- elog "${driver} has been set as your default akonadi storage backend." |
88 |
+ elog "${DRIVER} has been set as your default akonadi storage backend." |
89 |
elog "You can override it in your ~/.config/akonadi/akonadiserverrc." |
90 |
- elog "Available drivers are: QMYSQL, QPSQL, QSQLITE3" |
91 |
+ elog "Available drivers are: ${AVAILABLE}" |
92 |
} |