1 |
commit: 820018dccdc71d90198c390f83bc9aca6a5838f0 |
2 |
Author: Johannes Huber <johu <AT> gmx <DOT> de> |
3 |
AuthorDate: Mon Sep 26 23:35:37 2011 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gmx <DOT> de> |
5 |
CommitDate: Mon Sep 26 23:58:06 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=820018dc |
7 |
|
8 |
[app-office/akonadi-server] Bump 1.6.1 |
9 |
|
10 |
(Portage version: 2.2.0_alpha59/git/Linux i686, signed Manifest commit with key DF018462) |
11 |
|
12 |
--- |
13 |
.../.kde-live/kdebase-runtime-live | 1 - |
14 |
Documentation/package.keywords/kde-live.keywords | 1 - |
15 |
Documentation/package.unmask/kde-live | 1 - |
16 |
.../akonadi-server/akonadi-server-1.6.1.ebuild | 96 ++++++++++++++++++++ |
17 |
profiles/package.mask | 3 + |
18 |
profiles/package.mask.d/akonadi-server | 2 + |
19 |
6 files changed, 101 insertions(+), 3 deletions(-) |
20 |
|
21 |
diff --git a/Documentation/package.keywords/.kde-live/kdebase-runtime-live b/Documentation/package.keywords/.kde-live/kdebase-runtime-live |
22 |
index 981d4ee..7c0fbe5 100644 |
23 |
--- a/Documentation/package.keywords/.kde-live/kdebase-runtime-live |
24 |
+++ b/Documentation/package.keywords/.kde-live/kdebase-runtime-live |
25 |
@@ -1,4 +1,3 @@ |
26 |
-~kde-base/activitymanager-9999 ** |
27 |
~kde-base/attica-9999 ** |
28 |
~kde-base/drkonqi-9999 ** |
29 |
~kde-base/kcmshell-9999 ** |
30 |
|
31 |
diff --git a/Documentation/package.keywords/kde-live.keywords b/Documentation/package.keywords/kde-live.keywords |
32 |
index 99cea55..79911e9 100644 |
33 |
--- a/Documentation/package.keywords/kde-live.keywords |
34 |
+++ b/Documentation/package.keywords/kde-live.keywords |
35 |
@@ -37,7 +37,6 @@ |
36 |
~kde-base/libkonq-9999 ** |
37 |
~kde-base/nsplugins-9999 ** |
38 |
~kde-base/plasma-apps-9999 ** |
39 |
-~kde-base/activitymanager-9999 ** |
40 |
~kde-base/attica-9999 ** |
41 |
~kde-base/drkonqi-9999 ** |
42 |
~kde-base/kcmshell-9999 ** |
43 |
|
44 |
diff --git a/Documentation/package.unmask/kde-live b/Documentation/package.unmask/kde-live |
45 |
index e989d22..dab762a 100644 |
46 |
--- a/Documentation/package.unmask/kde-live |
47 |
+++ b/Documentation/package.unmask/kde-live |
48 |
@@ -37,7 +37,6 @@ |
49 |
~kde-base/libkonq-9999 |
50 |
~kde-base/nsplugins-9999 |
51 |
~kde-base/plasma-apps-9999 |
52 |
-~kde-base/activitymanager-9999 |
53 |
~kde-base/attica-9999 |
54 |
~kde-base/drkonqi-9999 |
55 |
~kde-base/kcmshell-9999 |
56 |
|
57 |
diff --git a/app-office/akonadi-server/akonadi-server-1.6.1.ebuild b/app-office/akonadi-server/akonadi-server-1.6.1.ebuild |
58 |
new file mode 100644 |
59 |
index 0000000..cc43b6f |
60 |
--- /dev/null |
61 |
+++ b/app-office/akonadi-server/akonadi-server-1.6.1.ebuild |
62 |
@@ -0,0 +1,96 @@ |
63 |
+# Copyright 1999-2011 Gentoo Foundation |
64 |
+# Distributed under the terms of the GNU General Public License v2 |
65 |
+# $Header: $ |
66 |
+ |
67 |
+EAPI=4 |
68 |
+ |
69 |
+inherit cmake-utils |
70 |
+ |
71 |
+DESCRIPTION="The server part of Akonadi" |
72 |
+HOMEPAGE="http://pim.kde.org/akonadi" |
73 |
+SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2" |
74 |
+ |
75 |
+LICENSE="LGPL-2.1" |
76 |
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
77 |
+SLOT="0" |
78 |
+IUSE="mysql postgres +sqlite test" |
79 |
+ |
80 |
+CDEPEND=" |
81 |
+ dev-libs/boost |
82 |
+ >=dev-libs/soprano-2.6.51 |
83 |
+ >=x11-libs/qt-gui-4.5.0:4[dbus] |
84 |
+ >=x11-libs/qt-sql-4.5.0:4[mysql?,postgres?] |
85 |
+ >=x11-libs/qt-test-4.5.0:4 |
86 |
+ x11-misc/shared-mime-info |
87 |
+" |
88 |
+DEPEND="${CDEPEND} |
89 |
+ dev-libs/libxslt |
90 |
+ >=dev-util/automoc-0.9.88 |
91 |
+" |
92 |
+RDEPEND="${CDEPEND} |
93 |
+ postgres? ( dev-db/postgresql-server ) |
94 |
+" |
95 |
+ |
96 |
+REQUIRED_USE="|| ( sqlite mysql postgres )" |
97 |
+ |
98 |
+S=${WORKDIR}/${P/-server/} |
99 |
+ |
100 |
+pkg_setup() { |
101 |
+ # Set default storage backend in order: SQLite, MySQL, PostgreSQL |
102 |
+ if use sqlite; then |
103 |
+ DRIVER="QSQLITE3" |
104 |
+ AVAILABLE+=" ${driver}" |
105 |
+ elif use mysql; then |
106 |
+ DRIVER="QMYSQL" |
107 |
+ AVAILABLE+=" ${driver}" |
108 |
+ elif use postgres; then |
109 |
+ DRIVER="QPSQL" |
110 |
+ AVAILABLE+=" ${driver}" |
111 |
+ fi |
112 |
+ |
113 |
+ # Notify about driver name change |
114 |
+ if use sqlite && has_version "<=${CATEGORY}/${PN}-1.4.0[sqlite]"; then |
115 |
+ ewarn |
116 |
+ ewarn "SQLite driver name changed from QSQLITE to QSQLITE3." |
117 |
+ ewarn "Please edit your ~/.config/akonadi/akonadiserverrc." |
118 |
+ fi |
119 |
+ |
120 |
+ # Notify about MySQL not being default anymore |
121 |
+ if ! use mysql && has_version "<=${CATEGORY}/${PN}-1.4.0[mysql]"; then |
122 |
+ ewarn |
123 |
+ ewarn "MySQL driver is not enabled by default in Gentoo anymore." |
124 |
+ ewarn "If you intend to use it, please enable mysql USE flag and reinstall" |
125 |
+ ewarn "${CATEGORY}/${PN}." |
126 |
+ ewarn "Otherwise select different driver in your ~/.config/akonadi/akonadiserverrc." |
127 |
+ ewarn "Available drivers are:${AVAILABLE}" |
128 |
+ fi |
129 |
+} |
130 |
+ |
131 |
+src_configure() { |
132 |
+ local mycmakeargs=( |
133 |
+ "-DAKONADI_USE_STRIGI_SEARCH=OFF" |
134 |
+ $(cmake-utils_use test AKONADI_BUILD_TESTS) |
135 |
+ $(cmake-utils_use sqlite INSTALL_QSQLITE_IN_QT_PREFIX) |
136 |
+ ) |
137 |
+ |
138 |
+ cmake-utils_src_configure |
139 |
+} |
140 |
+ |
141 |
+src_install() { |
142 |
+ # Who knows, maybe it accidentally fixes our permission issues |
143 |
+ cat <<-EOF > "${T}"/akonadiserverrc |
144 |
+[%General] |
145 |
+Driver=${DRIVER} |
146 |
+EOF |
147 |
+ insinto /usr/share/config/akonadi |
148 |
+ doins "${T}"/akonadiserverrc |
149 |
+ |
150 |
+ cmake-utils_src_install |
151 |
+} |
152 |
+ |
153 |
+pkg_postinst() { |
154 |
+ echo |
155 |
+ elog "${DRIVER} has been set as your default akonadi storage backend." |
156 |
+ elog "You can override it in your ~/.config/akonadi/akonadiserverrc." |
157 |
+ elog "Available drivers are: ${AVAILABLE}" |
158 |
+} |
159 |
|
160 |
diff --git a/profiles/package.mask b/profiles/package.mask |
161 |
index bb22764..72dd45f 100644 |
162 |
--- a/profiles/package.mask |
163 |
+++ b/profiles/package.mask |
164 |
@@ -1,6 +1,9 @@ |
165 |
# Autogenerated by regenerate-files, DO NOT EDIT. |
166 |
# Edit profiles/package.mask.d/ files instead. |
167 |
|
168 |
+# Available on mirrors, but not announced officially |
169 |
+~app-office/akonadi-server-1.6.1 |
170 |
+ |
171 |
# Dennis Schridde <devurandom@×××.net> (06 Feb 2011) |
172 |
# Beta versions of the Ayatana ebuilds |
173 |
~dev-libs/libdbusmenu-0.3.94 |
174 |
|
175 |
diff --git a/profiles/package.mask.d/akonadi-server b/profiles/package.mask.d/akonadi-server |
176 |
new file mode 100644 |
177 |
index 0000000..5980e7b |
178 |
--- /dev/null |
179 |
+++ b/profiles/package.mask.d/akonadi-server |
180 |
@@ -0,0 +1,2 @@ |
181 |
+# Available on mirrors, but not announced officially |
182 |
+~app-office/akonadi-server-1.6.1 |