1 |
commit: e4b662605db25fbc24a21ccc168c398699d61ac5 |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 30 12:54:36 2016 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 30 12:55:16 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4b66260 |
7 |
|
8 |
app-office/akonadi-server -> kde-apps/akonadi |
9 |
|
10 |
app-office/akonadi-server/Manifest | 1 - |
11 |
app-office/akonadi-server/metadata.xml | 8 -------- |
12 |
kde-apps/akonadi/Manifest | 1 + |
13 |
.../akonadi/akonadi-1.13.1_pre20160203-r1.ebuild | 11 ++++++----- |
14 |
kde-apps/akonadi/akonadi-16.08.2.ebuild | 1 - |
15 |
.../akonadi/files/akonadi-1.13.0-mysql56-crash.patch | 0 |
16 |
.../akonadi/files/akonadi-1.13.1-mysql.conf.patch | 0 |
17 |
.../akonadiconsole/akonadiconsole-4.14.11_pre20160211.ebuild | 2 +- |
18 |
.../kdepim-common-libs-4.14.11_pre20160211.ebuild | 2 +- |
19 |
.../kdepim-runtime/kdepim-runtime-4.14.11_pre20160211.ebuild | 2 +- |
20 |
kde-apps/kdepimlibs/kdepimlibs-4.14.10-r1.ebuild | 3 +-- |
21 |
kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r1.ebuild | 3 +-- |
22 |
kde-apps/kmail/kmail-4.14.11_pre20160211.ebuild | 6 +++--- |
23 |
kde-apps/ktnef/ktnef-4.14.11_pre20160211.ebuild | 2 +- |
24 |
kde-misc/plasma-lionmail/plasma-lionmail-0_p20121020.ebuild | 2 +- |
25 |
profiles/base/package.use.mask | 5 ----- |
26 |
profiles/targets/desktop/kde/package.use | 2 +- |
27 |
profiles/targets/desktop/plasma/package.use | 2 +- |
28 |
profiles/updates/4Q-2016 | 1 + |
29 |
19 files changed, 20 insertions(+), 34 deletions(-) |
30 |
|
31 |
diff --git a/app-office/akonadi-server/Manifest b/app-office/akonadi-server/Manifest |
32 |
deleted file mode 100644 |
33 |
index 4a7a66b..00000000 |
34 |
--- a/app-office/akonadi-server/Manifest |
35 |
+++ /dev/null |
36 |
@@ -1 +0,0 @@ |
37 |
-DIST akonadi-server-1.13.1_pre20160203.tar.gz 384556 SHA256 4243b32e529be6aadc38dc4463cb6e7cede9442c05cfc04ba679dde28f37aa96 SHA512 0ef8213f504ad1e500a2c1ce19a7575cd1fd8b7ffc7e5fb0bd2437639d8c458c47bbfea7734fcd3e200136a661331dde32af0b064f0b25d324138ce6e35d15f3 WHIRLPOOL 69eff1889a19f8d5714d7e71a106871172cd25c651ea30046ab81270cf7e46c7a1983cf20fd8d5fd8ad243d70e881be705d57b0b93b54248d086e7b253a4873a |
38 |
|
39 |
diff --git a/app-office/akonadi-server/metadata.xml b/app-office/akonadi-server/metadata.xml |
40 |
deleted file mode 100644 |
41 |
index 2fdbf33..00000000 |
42 |
--- a/app-office/akonadi-server/metadata.xml |
43 |
+++ /dev/null |
44 |
@@ -1,8 +0,0 @@ |
45 |
-<?xml version="1.0" encoding="UTF-8"?> |
46 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
47 |
-<pkgmetadata> |
48 |
- <maintainer type="project"> |
49 |
- <email>kde@g.o</email> |
50 |
- <name>Gentoo KDE Project</name> |
51 |
- </maintainer> |
52 |
-</pkgmetadata> |
53 |
|
54 |
diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest |
55 |
index 14878e4..d0fc050 100644 |
56 |
--- a/kde-apps/akonadi/Manifest |
57 |
+++ b/kde-apps/akonadi/Manifest |
58 |
@@ -1 +1,2 @@ |
59 |
+DIST akonadi-1.13.1_pre20160203.tar.gz 384556 SHA256 4243b32e529be6aadc38dc4463cb6e7cede9442c05cfc04ba679dde28f37aa96 SHA512 0ef8213f504ad1e500a2c1ce19a7575cd1fd8b7ffc7e5fb0bd2437639d8c458c47bbfea7734fcd3e200136a661331dde32af0b064f0b25d324138ce6e35d15f3 WHIRLPOOL 69eff1889a19f8d5714d7e71a106871172cd25c651ea30046ab81270cf7e46c7a1983cf20fd8d5fd8ad243d70e881be705d57b0b93b54248d086e7b253a4873a |
60 |
DIST akonadi-16.08.2.tar.xz 1021860 SHA256 e60d64528a10e6484d54850c12866bea6efd891ee9d304f5e4afb424fb502d90 SHA512 7a83f2f9c4396e3e68ec44e7da6f25aa05d2acba63d4e48ffaebea900f803b1bce6b0c76685d8b3a28acb2b5e08b532a67ab8108858ecd2622b821174c5f0cea WHIRLPOOL 3976a119cfd8ae566103580d799db03cfcca51f43f01e303b98abca5743bc4dd23d832f55df52e357492b2d0a8fba3bf5b74daa3b9109437de931e3c3f1ce811 |
61 |
|
62 |
diff --git a/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild b/kde-apps/akonadi/akonadi-1.13.1_pre20160203-r1.ebuild |
63 |
similarity index 90% |
64 |
rename from app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild |
65 |
rename to kde-apps/akonadi/akonadi-1.13.1_pre20160203-r1.ebuild |
66 |
index 6613ad6..a4f5fbe 100644 |
67 |
--- a/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild |
68 |
+++ b/kde-apps/akonadi/akonadi-1.13.1_pre20160203-r1.ebuild |
69 |
@@ -5,12 +5,13 @@ |
70 |
EAPI=6 |
71 |
|
72 |
if [[ ${PV} = *_pre* ]]; then |
73 |
- COMMIT_ID="18ed37d89b8185ac15a8bfe245de8a88d17f2c64" |
74 |
- SRC_URI="https://quickgit.kde.org/?p=akonadi.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${P}.tar.gz" |
75 |
- S="${WORKDIR}/${PN/-server/}" |
76 |
+ # KDE quickgit https certificate issue |
77 |
+ # COMMIT_ID="18ed37d89b8185ac15a8bfe245de8a88d17f2c64" |
78 |
+ # SRC_URI="https://quickgit.kde.org/?p=${PN}.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${P}.tar.gz" |
79 |
+ SRC_URI="https://dev.gentoo.org/~johu/distfiles/${P}.tar.gz" |
80 |
+ S="${WORKDIR}/${PN}" |
81 |
else |
82 |
- SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2" |
83 |
- S="${WORKDIR}/${P/-server/}" |
84 |
+ SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.bz2" |
85 |
fi |
86 |
inherit cmake-utils |
87 |
|
88 |
|
89 |
diff --git a/kde-apps/akonadi/akonadi-16.08.2.ebuild b/kde-apps/akonadi/akonadi-16.08.2.ebuild |
90 |
index 486b508..770f895 100644 |
91 |
--- a/kde-apps/akonadi/akonadi-16.08.2.ebuild |
92 |
+++ b/kde-apps/akonadi/akonadi-16.08.2.ebuild |
93 |
@@ -51,7 +51,6 @@ DEPEND="${COMMON_DEPEND} |
94 |
RDEPEND="${COMMON_DEPEND} |
95 |
mysql? ( virtual/mysql ) |
96 |
postgres? ( dev-db/postgresql ) |
97 |
- !app-office/akonadi-server:4 |
98 |
!kde-apps/kdepimlibs |
99 |
" |
100 |
|
101 |
|
102 |
diff --git a/app-office/akonadi-server/files/akonadi-server-1.13.0-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-1.13.0-mysql56-crash.patch |
103 |
similarity index 100% |
104 |
rename from app-office/akonadi-server/files/akonadi-server-1.13.0-mysql56-crash.patch |
105 |
rename to kde-apps/akonadi/files/akonadi-1.13.0-mysql56-crash.patch |
106 |
|
107 |
diff --git a/app-office/akonadi-server/files/akonadi-server-1.13.1-mysql.conf.patch b/kde-apps/akonadi/files/akonadi-1.13.1-mysql.conf.patch |
108 |
similarity index 100% |
109 |
rename from app-office/akonadi-server/files/akonadi-server-1.13.1-mysql.conf.patch |
110 |
rename to kde-apps/akonadi/files/akonadi-1.13.1-mysql.conf.patch |
111 |
|
112 |
diff --git a/kde-apps/akonadiconsole/akonadiconsole-4.14.11_pre20160211.ebuild b/kde-apps/akonadiconsole/akonadiconsole-4.14.11_pre20160211.ebuild |
113 |
index 68d714e..f141249 100644 |
114 |
--- a/kde-apps/akonadiconsole/akonadiconsole-4.14.11_pre20160211.ebuild |
115 |
+++ b/kde-apps/akonadiconsole/akonadiconsole-4.14.11_pre20160211.ebuild |
116 |
@@ -16,9 +16,9 @@ KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" |
117 |
IUSE="debug" |
118 |
|
119 |
DEPEND=" |
120 |
- >=app-office/akonadi-server-1.12.90:4 |
121 |
$(add_kdeapps_dep kdepimlibs 'akonadi(+)') |
122 |
$(add_kdeapps_dep kdepim-common-libs) |
123 |
+ kde-apps/akonadi:4 |
124 |
" |
125 |
RDEPEND="${DEPEND}" |
126 |
|
127 |
|
128 |
diff --git a/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160211.ebuild b/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160211.ebuild |
129 |
index fb1eb29..2954578 100644 |
130 |
--- a/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160211.ebuild |
131 |
+++ b/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160211.ebuild |
132 |
@@ -21,8 +21,8 @@ DEPEND=" |
133 |
$(add_kdebase_dep baloo '' 4.14.3) |
134 |
$(add_kdeapps_dep kdepimlibs 'akonadi(+)') |
135 |
app-crypt/gpgme |
136 |
- >=app-office/akonadi-server-1.12.90:4 |
137 |
dev-libs/grantlee:0 |
138 |
+ kde-apps/akonadi:4 |
139 |
google? ( net-libs/libkgapi:4 ) |
140 |
" |
141 |
RDEPEND="${DEPEND} |
142 |
|
143 |
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-4.14.11_pre20160211.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-4.14.11_pre20160211.ebuild |
144 |
index a1be914..8abef20 100644 |
145 |
--- a/kde-apps/kdepim-runtime/kdepim-runtime-4.14.11_pre20160211.ebuild |
146 |
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-4.14.11_pre20160211.ebuild |
147 |
@@ -21,10 +21,10 @@ RESTRICT="test" |
148 |
|
149 |
DEPEND=" |
150 |
$(add_kdeapps_dep kdepimlibs 'akonadi(+)' ${PV}) |
151 |
- >=app-office/akonadi-server-1.12.90:4 |
152 |
dev-libs/boost:= |
153 |
dev-libs/libxml2:2 |
154 |
dev-libs/libxslt |
155 |
+ kde-apps/akonadi:4 |
156 |
x11-misc/shared-mime-info |
157 |
google? ( >=net-libs/libkgapi-2.0:4 ) |
158 |
" |
159 |
|
160 |
diff --git a/kde-apps/kdepimlibs/kdepimlibs-4.14.10-r1.ebuild b/kde-apps/kdepimlibs/kdepimlibs-4.14.10-r1.ebuild |
161 |
index 8e8d64b..b9c12d0 100644 |
162 |
--- a/kde-apps/kdepimlibs/kdepimlibs-4.14.10-r1.ebuild |
163 |
+++ b/kde-apps/kdepimlibs/kdepimlibs-4.14.10-r1.ebuild |
164 |
@@ -18,14 +18,13 @@ IUSE="debug ldap prison" |
165 |
RESTRICT="test" |
166 |
|
167 |
DEPEND=" |
168 |
- !kde-misc/akonadi-social-utils |
169 |
>=app-crypt/gpgme-1.1.6 |
170 |
- >=app-office/akonadi-server-1.12.90:4 |
171 |
>=dev-libs/boost-1.35.0-r5:= |
172 |
dev-libs/libgpg-error |
173 |
>=dev-libs/libical-0.48-r2:= |
174 |
dev-libs/cyrus-sasl |
175 |
>=dev-libs/qjson-0.8.1 |
176 |
+ kde-apps/akonadi:4 |
177 |
media-libs/phonon[qt4] |
178 |
x11-misc/shared-mime-info |
179 |
prison? ( media-libs/prison:4 ) |
180 |
|
181 |
diff --git a/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r1.ebuild b/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r1.ebuild |
182 |
index 5a445ae..20a9930 100644 |
183 |
--- a/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r1.ebuild |
184 |
+++ b/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r1.ebuild |
185 |
@@ -23,12 +23,12 @@ RESTRICT="test" |
186 |
|
187 |
DEPEND=" |
188 |
>=app-crypt/gpgme-1.1.6 |
189 |
- >=app-office/akonadi-server-1.12.90:4 |
190 |
>=dev-libs/boost-1.35.0-r5:= |
191 |
dev-libs/libgpg-error |
192 |
>=dev-libs/libical-0.48-r2:= |
193 |
dev-libs/cyrus-sasl |
194 |
>=dev-libs/qjson-0.8.1 |
195 |
+ kde-apps/akonadi:4 |
196 |
media-libs/phonon[qt4] |
197 |
x11-misc/shared-mime-info |
198 |
prison? ( media-libs/prison:4 ) |
199 |
@@ -38,7 +38,6 @@ DEPEND=" |
200 |
# bug #418071 |
201 |
RDEPEND="${DEPEND} |
202 |
!<kde-apps/kdepim-runtime-4.4.11.1-r2:4 |
203 |
- !kde-misc/akonadi-social-utils |
204 |
" |
205 |
|
206 |
PATCHES=( |
207 |
|
208 |
diff --git a/kde-apps/kmail/kmail-4.14.11_pre20160211.ebuild b/kde-apps/kmail/kmail-4.14.11_pre20160211.ebuild |
209 |
index c920bd7..7b526d9 100644 |
210 |
--- a/kde-apps/kmail/kmail-4.14.11_pre20160211.ebuild |
211 |
+++ b/kde-apps/kmail/kmail-4.14.11_pre20160211.ebuild |
212 |
@@ -97,14 +97,14 @@ pkg_postinst() { |
213 |
echo |
214 |
fi |
215 |
|
216 |
- if has_version "app-office/akonadi-server[sqlite]"; then |
217 |
+ if has_version "kde-apps/akonadi[sqlite]"; then |
218 |
ewarn |
219 |
ewarn "We strongly recommend you set your Akonadi database backend to QMYSQL in your" |
220 |
ewarn "user configuration. This is the backend recommended by KDE upstream." |
221 |
ewarn "Reports indicate that kde-apps/kmail-4.10 does not work properly with the sqlite" |
222 |
ewarn "backend anymore." |
223 |
- if has_version "app-office/akonadi-server[-mysql]"; then |
224 |
- ewarn "FOR THAT, YOU WILL HAVE TO RE-BUILD app-office/akonadi-server WITH mysql USEFLAG ENABLED." |
225 |
+ if has_version "kde-apps/akonadi[-mysql]"; then |
226 |
+ ewarn "FOR THAT, YOU WILL HAVE TO RE-BUILD kde-apps/akonadi WITH mysql USEFLAG ENABLED." |
227 |
fi |
228 |
ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc." |
229 |
ewarn |
230 |
|
231 |
diff --git a/kde-apps/ktnef/ktnef-4.14.11_pre20160211.ebuild b/kde-apps/ktnef/ktnef-4.14.11_pre20160211.ebuild |
232 |
index 1928575..762d023 100644 |
233 |
--- a/kde-apps/ktnef/ktnef-4.14.11_pre20160211.ebuild |
234 |
+++ b/kde-apps/ktnef/ktnef-4.14.11_pre20160211.ebuild |
235 |
@@ -18,8 +18,8 @@ LICENSE="LGPL-2.1" |
236 |
IUSE="debug" |
237 |
|
238 |
DEPEND=" |
239 |
- app-office/akonadi-server:4 |
240 |
$(add_kdeapps_dep kdepimlibs 'akonadi(+)') |
241 |
+ kde-apps/akonadi:4 |
242 |
" |
243 |
RDEPEND="${DEPEND}" |
244 |
|
245 |
|
246 |
diff --git a/kde-misc/plasma-lionmail/plasma-lionmail-0_p20121020.ebuild b/kde-misc/plasma-lionmail/plasma-lionmail-0_p20121020.ebuild |
247 |
index 178c1f9..ed4fd10 100644 |
248 |
--- a/kde-misc/plasma-lionmail/plasma-lionmail-0_p20121020.ebuild |
249 |
+++ b/kde-misc/plasma-lionmail/plasma-lionmail-0_p20121020.ebuild |
250 |
@@ -18,7 +18,7 @@ IUSE="debug" |
251 |
DEPEND=" |
252 |
$(add_kdebase_dep kdelibs) |
253 |
$(add_kdeapps_dep kdepimlibs) |
254 |
- app-office/akonadi-server:4 |
255 |
+ kde-apps/akonadi:4 |
256 |
dev-qt/qtcore:4 |
257 |
dev-qt/qtgui:4 |
258 |
dev-qt/qtwebkit:4 |
259 |
|
260 |
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask |
261 |
index 06d6218..cb942be 100644 |
262 |
--- a/profiles/base/package.use.mask |
263 |
+++ b/profiles/base/package.use.mask |
264 |
@@ -277,11 +277,6 @@ app-office/libreoffice telepathy |
265 |
sys-devel/gcc awt |
266 |
dev-java/gcj-jdk awt |
267 |
|
268 |
-# Johannes Huber <johu@g.o> (18 Aug 2015) |
269 |
-# No consumer for Qt5 build, qt4/qt5 switch causes conflicts. |
270 |
-# Qt5 only version will come back with kde-apps/akonadi. |
271 |
-app-office/akonadi-server qt5 |
272 |
- |
273 |
# Heather Cynede <cynede@g.o> (13 Aug 2015) |
274 |
# mono currently fails with doc most likely because of xattr |
275 |
# Gentoo bug: 554484 |
276 |
|
277 |
diff --git a/profiles/targets/desktop/kde/package.use b/profiles/targets/desktop/kde/package.use |
278 |
index 1eabf0c..4f64861 100644 |
279 |
--- a/profiles/targets/desktop/kde/package.use |
280 |
+++ b/profiles/targets/desktop/kde/package.use |
281 |
@@ -33,7 +33,7 @@ dev-libs/libgit2 threads |
282 |
# Required by kde-base/pykde4 |
283 |
dev-python/PyQt4 script sql webkit |
284 |
|
285 |
-# Required by app-office/akonadi-server |
286 |
+# Required by kde-apps/akonadi |
287 |
dev-qt/qtsql mysql |
288 |
|
289 |
# Required by media-gfx/graphviz which is required by kde-apps/kcachegrind |
290 |
|
291 |
diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use |
292 |
index 57ebd98..99d1709 100644 |
293 |
--- a/profiles/targets/desktop/plasma/package.use |
294 |
+++ b/profiles/targets/desktop/plasma/package.use |
295 |
@@ -8,7 +8,7 @@ dev-util/cmake -qt4 -qt5 |
296 |
# Not required, but makes life easier with Qt; bug 457934 |
297 |
app-arch/unzip natspec |
298 |
|
299 |
-# Required by app-office/akonadi-server |
300 |
+# Required by kde/akonadi |
301 |
dev-qt/qtsql mysql |
302 |
|
303 |
# Required by dev-qt/qtcore |
304 |
|
305 |
diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016 |
306 |
index 215057e..86f2556 100644 |
307 |
--- a/profiles/updates/4Q-2016 |
308 |
+++ b/profiles/updates/4Q-2016 |
309 |
@@ -4,3 +4,4 @@ move x11-apps/xvfb-run x11-misc/xvfb-run |
310 |
move kde-plasma/plasma-mediacenter media-video/plasma-mediacenter |
311 |
move kde-misc/plasma-nm kde-plasma/plasma-nm |
312 |
slotmove app-office/akonadi-server 0 4 |
313 |
+move app-office/akonadi-server kde-apps/akonadi |