Gentoo Archives: gentoo-commits

From: "Andreas Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
Date: Sun, 08 Apr 2012 15:40:57
Message-Id: 1333897077.5b8006052da2690448bb8286476d8a3a095b49cd.dilfridge@gentoo
1 commit: 5b8006052da2690448bb8286476d8a3a095b49cd
2 Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
3 AuthorDate: Sun Apr 8 14:57:57 2012 +0000
4 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 8 14:57:57 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=5b800605
7
8 [media-gfx/digikam] Copied from main tree
9
10 (Portage version: 2.1.10.56/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key B6C5F7DE)
11
12 ---
13 media-gfx/digikam/Manifest | 29 ++++
14 media-gfx/digikam/digikam-2.3.0.ebuild | 152 +++++++++++++++++++
15 media-gfx/digikam/digikam-2.4.1.ebuild | 145 ++++++++++++++++++
16 media-gfx/digikam/digikam-2.5.0.ebuild | 156 ++++++++++++++++++++
17 .../digikam/files/digikam-2.5.0-boost148.patch | 74 +++++++++
18 .../digikam/files/digikam-2.5.0-libkipi.patch | 75 ++++++++++
19 media-gfx/digikam/metadata.xml | 15 ++
20 7 files changed, 646 insertions(+), 0 deletions(-)
21
22 diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
23 new file mode 100644
24 index 0000000..fc17d91
25 --- /dev/null
26 +++ b/media-gfx/digikam/Manifest
27 @@ -0,0 +1,29 @@
28 +-----BEGIN PGP SIGNED MESSAGE-----
29 +Hash: SHA512
30 +
31 +AUX digikam-2.5.0-boost148.patch 4133 RMD160 033b19386db95818d8f1aa7ac8b1384be8ec7169 SHA1 095ea8de1e353120f47ed41c0cd15a36d468efcb SHA256 e9adb199ca4955f64275481231c6761c32b84cdcc8bfab9ddebab6864f0f4a9f
32 +AUX digikam-2.5.0-libkipi.patch 2670 RMD160 a82bf1c2797279ac5f195a3f296ece677a838583 SHA1 23268e63dcc39f9e4452aff6639489f16d2c462c SHA256 7652e7854998b03a6047779361801dc63aa42c1f0221ef2b5c0f0a25abf1e651
33 +DIST digikam-2.3.0.tar.bz2 54522109 RMD160 304bce5841f5d36a72a064784c90c91960c9a7c3 SHA1 15b8b16d7cce6ac50fb958d30166214f2f2b83ee SHA256 29ddf83a160817314e9274a35d678678da58006e41d961dcebc6afb0ab200a33
34 +DIST digikam-2.4.1.tar.bz2 54531119 RMD160 2a07c061927e7cec7a0128a68e60f9d7c6d1e78b SHA1 2ec3a20225462d277d5f0c3aa17b1ecfbb61f98c SHA256 aca967a4cc5312923cb2340502eb10a571684c14cf63896a68a1796d0483de3b
35 +DIST digikam-2.5.0.tar.bz2 54976375 RMD160 4ff1b5fbc2cc4a8cb9994f7c7796086418dd43fb SHA1 6cadb838669d1bdcbd6abb677889f7d68d696383 SHA256 55292c79b41fd2c20ce0a821f388645436acb18b3b06b486747e17129114851a
36 +EBUILD digikam-2.3.0.ebuild 4045 RMD160 69f49da4f45b4338dab884fa09a1d03c728863cc SHA1 d8673baceb9692057a6811e23fc9d872eb50d332 SHA256 6f14cd55caba84399ab6ca0f5b5539f7d8a553477e28644e42160b3ea6a49e17
37 +EBUILD digikam-2.4.1.ebuild 3779 RMD160 ae3417da8b3dd7720e8099458b1ab5cf2835b1a2 SHA1 c29f3d4c178699a85a045ce7fdf485b8afe9ca60 SHA256 67177511b82432bb24096be539428a8a7b0160aa513c69039ed6388fde790dae
38 +EBUILD digikam-2.5.0.ebuild 4197 RMD160 cd406b2bab0a40c52ed6a03aa36764b226406aa6 SHA1 cee756c8a06606acfd79379c085fc32e1c41789a SHA256 844f1cd90ed191aa990c483a76e8951d8968b0d3cab4c1f244ac114f861f21ac
39 +MISC metadata.xml 648 RMD160 7694bc7a07e2b35c60e2ed22981007ba0680dd1f SHA1 15b78b8dee48c87b702a5705009b3eee46aa7ebd SHA256 fed8bb77a841bcbc558e06fbe5f729a616152051924fa17fed0e527237f09f8c
40 +-----BEGIN PGP SIGNATURE-----
41 +Version: GnuPG v2.0.17 (GNU/Linux)
42 +
43 +iQIcBAEBCgAGBQJPgad1AAoJENwGBM22xffejx8P/1RHtEG5Wsz4Aru6gYpoVR/p
44 +/bbHJAM4HKFxQiWVXTmI//fj4q5n0MzrZT/O8PD31bvIok4FOHh6QTAzbSKLVr1K
45 +aBA0RhB9O9JAfWOiCZ5CWJj6lHDuRFYdcHSDewnVjTb2b5HnVhbUs74j4LgYm+AM
46 +0xE+NLRn3s6vcKUGXeYlHnQ9/ZX9/yU3SH9PnrCHCDXcjbK5EelYMqtS3DbzQlG1
47 +biruu8csqaoErN/irLo/2jN/ohDYypExn3s7eWUveQsJmoAAEnX38rvraj9yDZo1
48 +oO0TQT5R1TlqnrSOXKWjQF7b5gYfYnhuli5JpAGRuGDV0UKL9mZs2D3HAg93/Y0U
49 +Diop+4yN5P6dKrVhud7WdN6sbfNV/ZIAuWbWdF27y+D/tgoeYn9EUz6zzHU0tehP
50 +Dyor2/xObKV6cQ6ZEs+3quPWewi0HBfiyrbXY78y7WPYSw+p0Oe4LySxOCxVYKPx
51 +mqfw49zVjpgDkn3r30nlwCNT6kU0dYgHWBOeb67np5jNG8wJkR0UMMd3rQ8jZV8v
52 +XtZ8a9e4R+j595nZ9sAIlGpcELz1PLGn5e8R0SEoBdJqYdFHeLpG3YWz4IwArq4V
53 +PGCQinlavTHDxVPNGgAhvkNqn0mKufsZYBWkYgc8IvKAGfguhYK7fgngEUFuw1aM
54 +BL8t9QRHdobwlNrZtH5A
55 +=mj0p
56 +-----END PGP SIGNATURE-----
57
58 diff --git a/media-gfx/digikam/digikam-2.3.0.ebuild b/media-gfx/digikam/digikam-2.3.0.ebuild
59 new file mode 100644
60 index 0000000..4b2a706
61 --- /dev/null
62 +++ b/media-gfx/digikam/digikam-2.3.0.ebuild
63 @@ -0,0 +1,152 @@
64 +# Copyright 1999-2012 Gentoo Foundation
65 +# Distributed under the terms of the GNU General Public License v2
66 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.3.0.ebuild,v 1.5 2012/02/12 16:01:42 dilfridge Exp $
67 +
68 +EAPI=4
69 +
70 +KDE_LINGUAS="af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fo
71 +fr fy ga gl ha he hi hr hsb hu id is it ja ka kk km ko ku lb lo lt lv mi mk mn ms mt
72 +nb nds ne nl nn nso oc pa pl pt pt_BR ro ru rw se sk sl sq sr sr@Latn ss sv ta te tg
73 +th tr tt uk uz uz@cyrillic ven vi wa xh zh_CN zh_HK zh_TW zu"
74 +
75 +KDE_HANDBOOK="optional"
76 +CMAKE_MIN_VERSION="2.8"
77 +KDE_MINIMAL="4.7"
78 +
79 +inherit kde4-base
80 +
81 +MY_P="${PN}-${PV/_/-}"
82 +
83 +DESCRIPTION="Digital photo management application for KDE"
84 +HOMEPAGE="http://www.digikam.org/"
85 +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
86 +
87 +LICENSE="GPL-2
88 + handbook? ( FDL-1.2 )"
89 +KEYWORDS="amd64 x86"
90 +SLOT="4"
91 +IUSE="addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video"
92 +
93 +CDEPEND="
94 + !!=media-gfx/digikam-2.1.0-r1
95 + $(add_kdebase_dep kdelibs 'semantic-desktop=')
96 + $(add_kdebase_dep libkdcraw)
97 + $(add_kdebase_dep libkexiv2)
98 + $(add_kdebase_dep libkipi)
99 + $(add_kdebase_dep marble plasma)
100 + $(add_kdebase_dep solid)
101 + media-libs/jasper
102 + media-libs/lcms:0
103 + >=media-libs/lensfun-0.2.5
104 + >=media-libs/libkface-${PV}
105 + >=media-libs/libkgeomap-${PV}
106 + media-libs/liblqr
107 + >=media-libs/libpgf-6.11.28
108 + media-libs/libpng
109 + media-libs/tiff
110 + virtual/jpeg
111 + x11-libs/qt-gui[qt3support]
112 + >=sci-libs/clapack-3.2.1-r6
113 + || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
114 + addressbook? ( $(add_kdebase_dep kdepimlibs) )
115 + gphoto2? ( media-libs/libgphoto2 )
116 + mysql? ( virtual/mysql )
117 +"
118 +RDEPEND="${CDEPEND}
119 + $(add_kdebase_dep kreadconfig)
120 + media-plugins/kipi-plugins
121 + video? (
122 + || (
123 + $(add_kdebase_dep mplayerthumbs)
124 + $(add_kdebase_dep ffmpegthumbs)
125 + )
126 + )
127 +"
128 +DEPEND="${CDEPEND}
129 + dev-libs/boost
130 + sys-devel/gettext
131 + doc? ( app-doc/doxygen )
132 +"
133 +
134 +S="${WORKDIR}/${MY_P}/core"
135 +
136 +RESTRICT=test
137 +# bug 366505
138 +
139 +src_prepare() {
140 + # just to make absolutely sure
141 + rm -rf "${WORKDIR}/${MY_P}/extra" || die
142 +
143 + # prepare the handbook
144 + mv "${WORKDIR}/${MY_P}/doc/${PN}" doc || die
145 + echo "add_subdirectory( digikam )" > doc/CMakeLists.txt
146 + echo "add_subdirectory( showfoto )" >> doc/CMakeLists.txt
147 +
148 + # prepare the translations
149 + mv "${WORKDIR}/${MY_P}/po" po || die
150 + find po -name "*.po" -and -not -name "digikam.po" -exec rm {} +
151 +
152 + echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die
153 + echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
154 + echo "add_subdirectory( po )" >> CMakeLists.txt || die
155 +
156 + kde4-base_src_prepare
157 +
158 + if use handbook; then
159 + echo "add_subdirectory( doc )" >> CMakeLists.txt
160 + fi
161 +}
162 +
163 +src_configure() {
164 + local backend
165 +
166 + use semantic-desktop && backend="Nepomuk" || backend="None"
167 + # LQR = only allows to choose between bundled/external
168 + local mycmakeargs=(
169 + -DFORCED_UNBUNDLE=ON
170 + -DWITH_LQR=ON
171 + -DWITH_LENSFUN=ON
172 + -DGWENVIEW_SEMANTICINFO_BACKEND=${backend}
173 + $(cmake-utils_use_with addressbook KdepimLibs)
174 + -DWITH_MarbleWidget=ON
175 + $(cmake-utils_use_enable gphoto2 GPHOTO2)
176 + $(cmake-utils_use_with gphoto2)
177 + $(cmake-utils_use_with semantic-desktop Soprano)
178 + $(cmake-utils_use_enable themedesigner)
179 + $(cmake-utils_use_enable thumbnails THUMBS_DB)
180 + $(cmake-utils_use_enable mysql INTERNALMYSQL)
181 + $(cmake-utils_use_enable debug DEBUG_MESSAGES)
182 + )
183 +
184 + kde4-base_src_configure
185 +}
186 +
187 +src_compile() {
188 + local mytargets="all"
189 + use doc && mytargets+=" doc"
190 +
191 + kde4-base_src_compile ${mytargets}
192 +}
193 +
194 +src_install() {
195 + kde4-base_src_install
196 +
197 + # someone had the great idea to install duplicate icons
198 + einfo Removing duplicate icons
199 + find "${ED}/usr/share/icons/oxygen" -name digikam.png -exec rm -v {} +
200 + find "${ED}/usr/share/icons/oxygen" -name showfoto.png -exec rm -v {} +
201 +
202 + if use doc; then
203 + # install the api documentation
204 + insinto /usr/share/doc/${PF}/html
205 + doins -r ${CMAKE_BUILD_DIR}/api/html/*
206 + fi
207 +}
208 +
209 +pkg_postinst() {
210 + kde4-base_pkg_postinst
211 +
212 + if use doc; then
213 + elog "The digikam api documentation has been installed at /usr/share/doc/${PF}/html"
214 + fi
215 +}
216
217 diff --git a/media-gfx/digikam/digikam-2.4.1.ebuild b/media-gfx/digikam/digikam-2.4.1.ebuild
218 new file mode 100644
219 index 0000000..f4baa95
220 --- /dev/null
221 +++ b/media-gfx/digikam/digikam-2.4.1.ebuild
222 @@ -0,0 +1,145 @@
223 +# Copyright 1999-2012 Gentoo Foundation
224 +# Distributed under the terms of the GNU General Public License v2
225 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.4.1.ebuild,v 1.4 2012/02/12 16:01:42 dilfridge Exp $
226 +
227 +EAPI=4
228 +
229 +KDE_LINGUAS="af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fo fr fy ga gl ha he hi hr hsb
230 +hu id is it ja ka kk km ko ku lb lo lt lv mi mk mn ms mt nb nds ne nl nn nso oc pa pl pt pt_BR ro ru
231 +rw se sk sl sq sr sr@Latn ss sv ta te tg th tr tt uk uz uz@cyrillic ven vi wa xh zh_CN zh_HK zh_TW zu"
232 +
233 +KDE_HANDBOOK="optional"
234 +CMAKE_MIN_VERSION="2.8"
235 +KDE_MINIMAL="4.7"
236 +
237 +inherit kde4-base
238 +
239 +MY_P="${PN}-${PV/_/-}"
240 +
241 +DESCRIPTION="Digital photo management application for KDE"
242 +HOMEPAGE="http://www.digikam.org/"
243 +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
244 +
245 +LICENSE="GPL-2
246 + handbook? ( FDL-1.2 )"
247 +KEYWORDS="amd64 x86"
248 +SLOT="4"
249 +IUSE="addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video"
250 +
251 +CDEPEND="
252 + $(add_kdebase_dep kdelibs 'semantic-desktop=')
253 + $(add_kdebase_dep libkdcraw)
254 + $(add_kdebase_dep libkexiv2)
255 + $(add_kdebase_dep libkipi)
256 + $(add_kdebase_dep marble plasma)
257 + $(add_kdebase_dep solid)
258 + media-libs/jasper
259 + media-libs/lcms:0
260 + >=media-libs/lensfun-0.2.5
261 + >=media-libs/libkface-${PV}
262 + >=media-libs/libkgeomap-${PV}
263 + media-libs/liblqr
264 + >=media-libs/libpgf-6.11.28
265 + media-libs/libpng
266 + media-libs/tiff
267 + virtual/jpeg
268 + x11-libs/qt-gui[qt3support]
269 + >=sci-libs/clapack-3.2.1-r6
270 + || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
271 + addressbook? ( $(add_kdebase_dep kdepimlibs) )
272 + gphoto2? ( media-libs/libgphoto2 )
273 + mysql? ( virtual/mysql )
274 +"
275 +RDEPEND="${CDEPEND}
276 + $(add_kdebase_dep kreadconfig)
277 + media-plugins/kipi-plugins
278 + video? (
279 + || (
280 + $(add_kdebase_dep mplayerthumbs)
281 + $(add_kdebase_dep ffmpegthumbs)
282 + )
283 + )
284 +"
285 +DEPEND="${CDEPEND}
286 + dev-libs/boost
287 + sys-devel/gettext
288 + doc? ( app-doc/doxygen )
289 +"
290 +
291 +S="${WORKDIR}/${MY_P}/core"
292 +
293 +RESTRICT=test
294 +# bug 366505
295 +
296 +src_prepare() {
297 + # just to make absolutely sure
298 + rm -rf "${WORKDIR}/${MY_P}/extra" || die
299 +
300 + # prepare the handbook
301 + mv "${WORKDIR}/${MY_P}/doc/${PN}" doc || die
302 + echo "add_subdirectory( digikam )" > doc/CMakeLists.txt
303 + echo "add_subdirectory( showfoto )" >> doc/CMakeLists.txt
304 +
305 + # prepare the translations
306 + mv "${WORKDIR}/${MY_P}/po" po || die
307 + find po -name "*.po" -and -not -name "digikam.po" -exec rm {} +
308 +
309 + echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die
310 + echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
311 + echo "add_subdirectory( po )" >> CMakeLists.txt || die
312 +
313 + kde4-base_src_prepare
314 +
315 + if use handbook; then
316 + echo "add_subdirectory( doc )" >> CMakeLists.txt
317 + fi
318 +}
319 +
320 +src_configure() {
321 + local backend
322 +
323 + use semantic-desktop && backend="Nepomuk" || backend="None"
324 + # LQR = only allows to choose between bundled/external
325 + local mycmakeargs=(
326 + -DFORCED_UNBUNDLE=ON
327 + -DWITH_LQR=ON
328 + -DWITH_LENSFUN=ON
329 + -DGWENVIEW_SEMANTICINFO_BACKEND=${backend}
330 + $(cmake-utils_use_with addressbook KdepimLibs)
331 + -DWITH_MarbleWidget=ON
332 + $(cmake-utils_use_enable gphoto2 GPHOTO2)
333 + $(cmake-utils_use_with gphoto2)
334 + $(cmake-utils_use_with semantic-desktop Soprano)
335 + $(cmake-utils_use_enable themedesigner)
336 + $(cmake-utils_use_enable thumbnails THUMBS_DB)
337 + $(cmake-utils_use_enable mysql INTERNALMYSQL)
338 + $(cmake-utils_use_enable debug DEBUG_MESSAGES)
339 + )
340 +
341 + kde4-base_src_configure
342 +}
343 +
344 +src_compile() {
345 + local mytargets="all"
346 + use doc && mytargets+=" doc"
347 +
348 + kde4-base_src_compile ${mytargets}
349 +}
350 +
351 +src_install() {
352 + kde4-base_src_install
353 +
354 + if use doc; then
355 + # install the api documentation
356 + insinto /usr/share/doc/${PF}/html
357 + doins -r ${CMAKE_BUILD_DIR}/api/html/*
358 + fi
359 +}
360 +
361 +pkg_postinst() {
362 + kde4-base_pkg_postinst
363 +
364 + if use doc; then
365 + elog "The digikam api documentation has been installed at /usr/share/doc/${PF}/html"
366 + fi
367 +}
368
369 diff --git a/media-gfx/digikam/digikam-2.5.0.ebuild b/media-gfx/digikam/digikam-2.5.0.ebuild
370 new file mode 100644
371 index 0000000..4ed93cc
372 --- /dev/null
373 +++ b/media-gfx/digikam/digikam-2.5.0.ebuild
374 @@ -0,0 +1,156 @@
375 +# Copyright 1999-2012 Gentoo Foundation
376 +# Distributed under the terms of the GNU General Public License v2
377 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.5.0.ebuild,v 1.5 2012/04/04 19:30:58 ago Exp $
378 +
379 +EAPI=4
380 +
381 +KDE_LINGUAS="af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fo fr fy ga gl ha he hi hr hsb
382 +hu id is it ja ka kk km ko ku lb lo lt lv mi mk mn ms mt nb nds ne nl nn nso oc pa pl pt pt_BR ro ru
383 +rw se sk sl sq sr sr@Latn ss sv ta te tg th tr tt uk uz uz@cyrillic ven vi wa xh zh_CN zh_HK zh_TW zu"
384 +
385 +KDE_HANDBOOK="optional"
386 +CMAKE_MIN_VERSION="2.8"
387 +KDE_MINIMAL="4.7"
388 +
389 +KDE_DOC_DIRS="doc-digikam doc-showfoto"
390 +
391 +inherit kde4-base
392 +
393 +MY_P="${PN}-${PV/_/-}"
394 +
395 +DESCRIPTION="Digital photo management application for KDE"
396 +HOMEPAGE="http://www.digikam.org/"
397 +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
398 +
399 +LICENSE="GPL-2
400 + handbook? ( FDL-1.2 )"
401 +KEYWORDS="amd64 ~x86"
402 +SLOT="4"
403 +IUSE="addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video"
404 +
405 +CDEPEND="
406 + $(add_kdebase_dep kdelibs 'semantic-desktop=')
407 + $(add_kdebase_dep libkdcraw)
408 + $(add_kdebase_dep libkexiv2)
409 + $(add_kdebase_dep libkipi)
410 + $(add_kdebase_dep marble plasma)
411 + $(add_kdebase_dep solid)
412 + media-libs/jasper
413 + media-libs/lcms:0
414 + >=media-libs/lensfun-0.2.5
415 + >=media-libs/libkface-${PV}
416 + >=media-libs/libkgeomap-${PV}
417 + media-libs/liblqr
418 + >=media-libs/libpgf-6.11.28
419 + media-libs/libpng
420 + media-libs/tiff
421 + virtual/jpeg
422 + x11-libs/qt-gui[qt3support]
423 + >=sci-libs/clapack-3.2.1-r6
424 + || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
425 + addressbook? ( $(add_kdebase_dep kdepimlibs) )
426 + gphoto2? ( media-libs/libgphoto2 )
427 + mysql? ( virtual/mysql )
428 +"
429 +RDEPEND="${CDEPEND}
430 + $(add_kdebase_dep kreadconfig)
431 + media-plugins/kipi-plugins
432 + video? (
433 + || (
434 + $(add_kdebase_dep mplayerthumbs)
435 + $(add_kdebase_dep ffmpegthumbs)
436 + )
437 + )
438 +"
439 +DEPEND="${CDEPEND}
440 + dev-libs/boost
441 + sys-devel/gettext
442 + doc? ( app-doc/doxygen )
443 +"
444 +
445 +S="${WORKDIR}/${MY_P}/core"
446 +
447 +RESTRICT=test
448 +# bug 366505
449 +
450 +PATCHES=(
451 + "${FILESDIR}/${P}-libkipi.patch"
452 + "${FILESDIR}/${P}-boost148.patch"
453 +)
454 +
455 +src_prepare() {
456 + # just to make absolutely sure
457 + rm -rf "${WORKDIR}/${MY_P}/extra" || die
458 +
459 + # prepare the handbook
460 + mkdir doc-digikam doc-showfoto || die
461 + echo "add_subdirectory( en )" > doc-digikam/CMakeLists.txt || die
462 + mv "${WORKDIR}/${MY_P}/doc/${PN}/digikam" doc-digikam/en || die
463 + echo "add_subdirectory( en )" > doc-showfoto/CMakeLists.txt || die
464 + mv "${WORKDIR}/${MY_P}/doc/${PN}/showfoto" doc-showfoto/en || die
465 + sed -i -e 's:../digikam/:../../doc-digikam/en/:g' doc-showfoto/en/index.docbook || die
466 +
467 + # prepare the translations
468 + mv "${WORKDIR}/${MY_P}/po" po || die
469 + find po -name "*.po" -and -not -name "digikam.po" -exec rm {} +
470 +
471 + echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die
472 + echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
473 + echo "add_subdirectory( po )" >> CMakeLists.txt || die
474 +
475 + kde4-base_src_prepare
476 +
477 + if use handbook; then
478 + echo "add_subdirectory( doc-digikam )" >> CMakeLists.txt
479 + echo "add_subdirectory( doc-showfoto )" >> CMakeLists.txt
480 + fi
481 +}
482 +
483 +src_configure() {
484 + local backend
485 +
486 + use semantic-desktop && backend="Nepomuk" || backend="None"
487 + # LQR = only allows to choose between bundled/external
488 + local mycmakeargs=(
489 + -DFORCED_UNBUNDLE=ON
490 + -DWITH_LQR=ON
491 + -DWITH_LENSFUN=ON
492 + -DGWENVIEW_SEMANTICINFO_BACKEND=${backend}
493 + $(cmake-utils_use_with addressbook KdepimLibs)
494 + -DWITH_MarbleWidget=ON
495 + $(cmake-utils_use_enable gphoto2 GPHOTO2)
496 + $(cmake-utils_use_with gphoto2)
497 + $(cmake-utils_use_with semantic-desktop Soprano)
498 + $(cmake-utils_use_enable themedesigner)
499 + $(cmake-utils_use_enable thumbnails THUMBS_DB)
500 + $(cmake-utils_use_enable mysql INTERNALMYSQL)
501 + $(cmake-utils_use_enable debug DEBUG_MESSAGES)
502 + )
503 +
504 + kde4-base_src_configure
505 +}
506 +
507 +src_compile() {
508 + local mytargets="all"
509 + use doc && mytargets+=" doc"
510 +
511 + kde4-base_src_compile ${mytargets}
512 +}
513 +
514 +src_install() {
515 + kde4-base_src_install
516 +
517 + if use doc; then
518 + # install the api documentation
519 + insinto /usr/share/doc/${PF}/html
520 + doins -r ${CMAKE_BUILD_DIR}/api/html/*
521 + fi
522 +}
523 +
524 +pkg_postinst() {
525 + kde4-base_pkg_postinst
526 +
527 + if use doc; then
528 + elog "The digikam api documentation has been installed at /usr/share/doc/${PF}/html"
529 + fi
530 +}
531
532 diff --git a/media-gfx/digikam/files/digikam-2.5.0-boost148.patch b/media-gfx/digikam/files/digikam-2.5.0-boost148.patch
533 new file mode 100644
534 index 0000000..8119839
535 --- /dev/null
536 +++ b/media-gfx/digikam/files/digikam-2.5.0-boost148.patch
537 @@ -0,0 +1,74 @@
538 +commit d18ea6da2d3e2359f4113e83c3fd40c18a29ddab
539 +Author: Gilles Caulier <caulier.gilles@×××××.com>
540 +Date: Fri Jan 6 11:23:48 2012 +0100
541 +
542 + Apply patch #67483 from Jeremiah Willcock to compile fine digiKam boost graph interface with libboost 1.48
543 + BUGS: 287772
544 + CCBUGS: 267777
545 +
546 +diff --git a/libs/database/imagehistory/imagehistorygraph_boost.h b/libs/database/imagehistory/imagehistorygraph_boost.h
547 +index 4017c4f..76c764a 100644
548 +--- a/libs/database/imagehistory/imagehistorygraph_boost.h
549 ++++ b/libs/database/imagehistory/imagehistorygraph_boost.h
550 +@@ -1198,7 +1198,7 @@ protected:
551 + {
552 + boost::dag_shortest_paths(graph, v,
553 + // we provide a constant weight of 1
554 +- weight_map(boost::ref_property_map<edge_t,int>(weight)).
555 ++ weight_map(boost::ref_property_map<typename boost::graph_traits<GraphType>::edge_descriptor,int>(weight)).
556 + // Store distance and predecessors in QMaps, wrapped to serve as property maps
557 + distance_map(VertexIntMapAdaptor(distances)).
558 + predecessor_map(VertexVertexMapAdaptor(predecessors))
559 +@@ -1218,7 +1218,7 @@ protected:
560 + {
561 + boost::dag_shortest_paths(graph, v,
562 + // we provide a constant weight of 1
563 +- weight_map(boost::ref_property_map<edge_t,int>(weight)).
564 ++ weight_map(boost::ref_property_map<typename boost::graph_traits<GraphType>::edge_descriptor,int>(weight)).
565 + // Invert the default compare method: With greater, we get the longest path
566 + distance_compare(std::greater<int>()).
567 + // will be returned if a node is unreachable
568 +@@ -1384,14 +1384,15 @@ protected:
569 + template <class GraphType, typename VertexLessThan>
570 + class lessThanMapEdgeToTarget
571 + {
572 ++ typedef typename boost::graph_traits<GraphType>::edge_descriptor edge_descriptor;
573 + public:
574 + lessThanMapEdgeToTarget(const GraphType& g, VertexLessThan vertexLessThan)
575 + : g(g), vertexLessThan(vertexLessThan) {}
576 + const GraphType& g;
577 + VertexLessThan vertexLessThan;
578 +- bool operator()(const Edge& a, const Edge& b)
579 ++ bool operator()(const edge_descriptor& a, const edge_descriptor& b)
580 + {
581 +- return vertexLessThan(boost::target(a.toEdge(), g), boost::target(b.toEdge(), g));
582 ++ return vertexLessThan(boost::target(a, g), boost::target(b, g));
583 + }
584 + };
585 +
586 +@@ -1402,20 +1403,21 @@ protected:
587 + {
588 + typedef std::pair<Vertex, QList<Edge> > VertexInfo;
589 +
590 +- QList<Edge> outEdges;
591 ++ typedef typename boost::graph_traits<IncidenceGraph>::edge_descriptor edge_descriptor;
592 ++ QList<edge_descriptor> outEdges;
593 + std::vector<VertexInfo> stack;
594 +
595 + boost::put(color, u, boost::gray_color);
596 + vis.discover_vertex(u, g);
597 +
598 +- outEdges = toEdgeList(boost::out_edges(u, g));
599 ++ outEdges = toList<edge_descriptor>(boost::out_edges(u, g));
600 + // Sort edges. The lessThan we have takes vertices, so we use a lessThan which
601 + // maps the given edges to their targets, and calls our vertex lessThan.
602 + qSort(outEdges.begin(), outEdges.end(), lessThanMapEdgeToTarget<IncidenceGraph, LessThan>(g, lessThan));
603 +
604 +- foreach(const Edge& e, outEdges)
605 ++ foreach(const edge_descriptor& e, outEdges)
606 + {
607 +- Vertex v = boost::target(e.toEdge(), g);
608 ++ Vertex v = boost::target(e, g);
609 + vis.examine_edge(e, g);
610 + boost::default_color_type v_color = boost::get(color, v);
611 + if (v_color == boost::white_color)
612
613 diff --git a/media-gfx/digikam/files/digikam-2.5.0-libkipi.patch b/media-gfx/digikam/files/digikam-2.5.0-libkipi.patch
614 new file mode 100644
615 index 0000000..fbbac97
616 --- /dev/null
617 +++ b/media-gfx/digikam/files/digikam-2.5.0-libkipi.patch
618 @@ -0,0 +1,75 @@
619 +From 25cc9c9876a5233bd630105d0110319892d4e18c Mon Sep 17 00:00:00 2001
620 +From: Gilles Caulier <caulier.gilles@×××××.com>
621 +Date: Tue, 3 Jan 2012 15:16:37 +0100
622 +Subject: [PATCH] enable checkall and clearall buttons only with libkipi version 1.4.0
623 + BUGS: 290496
624 +
625 +---
626 + utilities/setup/setupplugins.cpp | 13 +++++++++++--
627 + utilities/setup/setupplugins.h | 4 ++--
628 + 2 files changed, 13 insertions(+), 4 deletions(-)
629 +
630 +diff --git a/utilities/setup/setupplugins.cpp b/utilities/setup/setupplugins.cpp
631 +index 0f4030a..b8efb35 100644
632 +--- a/utilities/setup/setupplugins.cpp
633 ++++ b/utilities/setup/setupplugins.cpp
634 +@@ -6,8 +6,8 @@
635 + * Date : 2004-01-02
636 + * Description : setup Kipi plugins tab.
637 + *
638 +- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
639 +- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
640 ++ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
641 ++ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
642 + *
643 + * This program is free software; you can redistribute it
644 + * and/or modify it under the terms of the GNU General
645 +@@ -100,6 +100,11 @@ SetupPlugins::SetupPlugins(QWidget* parent)
646 +
647 + panel->setLayout(mainLayout);
648 +
649 ++#if KIPI_VERSION < 0x010400
650 ++ d->checkAllBtn->setVisible(false);
651 ++ d->clearBtn->setVisible(false);
652 ++#endif
653 ++
654 + initPlugins();
655 +
656 + // --------------------------------------------------------
657 +@@ -158,14 +163,18 @@ void SetupPlugins::applyPlugins()
658 + void SetupPlugins::slotCheckAll()
659 + {
660 + QApplication::setOverrideCursor(Qt::WaitCursor);
661 ++#if KIPI_VERSION >= 0x010400
662 + d->kipiConfig->slotCheckAll();
663 ++#endif
664 + QApplication::restoreOverrideCursor();
665 + }
666 +
667 + void SetupPlugins::slotClear()
668 + {
669 + QApplication::setOverrideCursor(Qt::WaitCursor);
670 ++#if KIPI_VERSION >= 0x010400
671 + d->kipiConfig->slotClear();
672 ++#endif
673 + QApplication::restoreOverrideCursor();
674 + }
675 +
676 +diff --git a/utilities/setup/setupplugins.h b/utilities/setup/setupplugins.h
677 +index 271a569..114e0fa 100644
678 +--- a/utilities/setup/setupplugins.h
679 ++++ b/utilities/setup/setupplugins.h
680 +@@ -6,8 +6,8 @@
681 + * Date : 2004-01-02
682 + * Description : setup Kipi plugins tab.
683 + *
684 +- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
685 +- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
686 ++ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
687 ++ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
688 + *
689 + * This program is free software; you can redistribute it
690 + * and/or modify it under the terms of the GNU General
691 +--
692 +1.7.3.4
693 +
694
695 diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
696 new file mode 100644
697 index 0000000..6764ab6
698 --- /dev/null
699 +++ b/media-gfx/digikam/metadata.xml
700 @@ -0,0 +1,15 @@
701 +<?xml version="1.0" encoding="UTF-8"?>
702 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
703 +<pkgmetadata>
704 +<herd>kde</herd>
705 +<maintainer><email>dilfridge@g.o</email></maintainer>
706 +<use>
707 + <flag name="addressbook">Add support for kdepim</flag>
708 + <flag name="themedesigner">Build the digikam theme designer</flag>
709 + <flag name="thumbnails">Enable thumbnails database support</flag>
710 + <flag name="video">Pull in mplayerthumbs to enable video thumbnails</flag>
711 + <flag name="linguas_ha">Hausa translation</flag>
712 + <flag name="linguas_mi">Maori translation</flag>
713 + <flag name="linguas_ven">Venda translation</flag>
714 +</use>
715 +</pkgmetadata>