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/
Date: Sun, 08 Apr 2012 15:41:02
Message-Id: 1333897110.90efe83e93433f439eb9ec7eacad614138dae264.dilfridge@gentoo
1 commit: 90efe83e93433f439eb9ec7eacad614138dae264
2 Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
3 AuthorDate: Sun Apr 8 14:58:30 2012 +0000
4 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 8 14:58:30 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=90efe83e
7
8 [media-gfx/digikam] Remove old
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 | 30 +++----
14 media-gfx/digikam/digikam-2.3.0.ebuild | 152 --------------------------------
15 media-gfx/digikam/digikam-2.4.1.ebuild | 145 ------------------------------
16 3 files changed, 13 insertions(+), 314 deletions(-)
17
18 diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
19 index fc17d91..4a23123 100644
20 --- a/media-gfx/digikam/Manifest
21 +++ b/media-gfx/digikam/Manifest
22 @@ -3,27 +3,23 @@ Hash: SHA512
23
24 AUX digikam-2.5.0-boost148.patch 4133 RMD160 033b19386db95818d8f1aa7ac8b1384be8ec7169 SHA1 095ea8de1e353120f47ed41c0cd15a36d468efcb SHA256 e9adb199ca4955f64275481231c6761c32b84cdcc8bfab9ddebab6864f0f4a9f
25 AUX digikam-2.5.0-libkipi.patch 2670 RMD160 a82bf1c2797279ac5f195a3f296ece677a838583 SHA1 23268e63dcc39f9e4452aff6639489f16d2c462c SHA256 7652e7854998b03a6047779361801dc63aa42c1f0221ef2b5c0f0a25abf1e651
26 -DIST digikam-2.3.0.tar.bz2 54522109 RMD160 304bce5841f5d36a72a064784c90c91960c9a7c3 SHA1 15b8b16d7cce6ac50fb958d30166214f2f2b83ee SHA256 29ddf83a160817314e9274a35d678678da58006e41d961dcebc6afb0ab200a33
27 -DIST digikam-2.4.1.tar.bz2 54531119 RMD160 2a07c061927e7cec7a0128a68e60f9d7c6d1e78b SHA1 2ec3a20225462d277d5f0c3aa17b1ecfbb61f98c SHA256 aca967a4cc5312923cb2340502eb10a571684c14cf63896a68a1796d0483de3b
28 DIST digikam-2.5.0.tar.bz2 54976375 RMD160 4ff1b5fbc2cc4a8cb9994f7c7796086418dd43fb SHA1 6cadb838669d1bdcbd6abb677889f7d68d696383 SHA256 55292c79b41fd2c20ce0a821f388645436acb18b3b06b486747e17129114851a
29 -EBUILD digikam-2.3.0.ebuild 4045 RMD160 69f49da4f45b4338dab884fa09a1d03c728863cc SHA1 d8673baceb9692057a6811e23fc9d872eb50d332 SHA256 6f14cd55caba84399ab6ca0f5b5539f7d8a553477e28644e42160b3ea6a49e17
30 -EBUILD digikam-2.4.1.ebuild 3779 RMD160 ae3417da8b3dd7720e8099458b1ab5cf2835b1a2 SHA1 c29f3d4c178699a85a045ce7fdf485b8afe9ca60 SHA256 67177511b82432bb24096be539428a8a7b0160aa513c69039ed6388fde790dae
31 EBUILD digikam-2.5.0.ebuild 4197 RMD160 cd406b2bab0a40c52ed6a03aa36764b226406aa6 SHA1 cee756c8a06606acfd79379c085fc32e1c41789a SHA256 844f1cd90ed191aa990c483a76e8951d8968b0d3cab4c1f244ac114f861f21ac
32 MISC metadata.xml 648 RMD160 7694bc7a07e2b35c60e2ed22981007ba0680dd1f SHA1 15b78b8dee48c87b702a5705009b3eee46aa7ebd SHA256 fed8bb77a841bcbc558e06fbe5f729a616152051924fa17fed0e527237f09f8c
33 -----BEGIN PGP SIGNATURE-----
34 Version: GnuPG v2.0.17 (GNU/Linux)
35
36 -iQIcBAEBCgAGBQJPgad1AAoJENwGBM22xffejx8P/1RHtEG5Wsz4Aru6gYpoVR/p
37 -/bbHJAM4HKFxQiWVXTmI//fj4q5n0MzrZT/O8PD31bvIok4FOHh6QTAzbSKLVr1K
38 -aBA0RhB9O9JAfWOiCZ5CWJj6lHDuRFYdcHSDewnVjTb2b5HnVhbUs74j4LgYm+AM
39 -0xE+NLRn3s6vcKUGXeYlHnQ9/ZX9/yU3SH9PnrCHCDXcjbK5EelYMqtS3DbzQlG1
40 -biruu8csqaoErN/irLo/2jN/ohDYypExn3s7eWUveQsJmoAAEnX38rvraj9yDZo1
41 -oO0TQT5R1TlqnrSOXKWjQF7b5gYfYnhuli5JpAGRuGDV0UKL9mZs2D3HAg93/Y0U
42 -Diop+4yN5P6dKrVhud7WdN6sbfNV/ZIAuWbWdF27y+D/tgoeYn9EUz6zzHU0tehP
43 -Dyor2/xObKV6cQ6ZEs+3quPWewi0HBfiyrbXY78y7WPYSw+p0Oe4LySxOCxVYKPx
44 -mqfw49zVjpgDkn3r30nlwCNT6kU0dYgHWBOeb67np5jNG8wJkR0UMMd3rQ8jZV8v
45 -XtZ8a9e4R+j595nZ9sAIlGpcELz1PLGn5e8R0SEoBdJqYdFHeLpG3YWz4IwArq4V
46 -PGCQinlavTHDxVPNGgAhvkNqn0mKufsZYBWkYgc8IvKAGfguhYK7fgngEUFuw1aM
47 -BL8t9QRHdobwlNrZtH5A
48 -=mj0p
49 +iQIcBAEBCgAGBQJPgaeVAAoJENwGBM22xffePFkP/iluQNoOjHoArz70ryaeEfTh
50 +6ZztE+bh8KJlKaMQQwW/3EbewdIgZkE4cK6+lauO5KpG5jGi4IEnerjtZOpz4Qdg
51 +VPI9Nik/EdDlumKmPtyfeAppGK8iVjIZ87nYiVQ6fz9pVcnHUovgAhYmbXV7ju7a
52 +xXT3bzH5xBZfMfO/fhpT0Hir2fPnYBAKl0IgyIMUdub/pxL/l1xOOurGqpGLLU1g
53 +ChzCro3AdhWG//9LxajjNQnlmIU56TYYY86uZJwgTzltvjNtPoMEVHlccSrb/xJB
54 +G8cA7X9E9PhMcnOXmhVG+SWGfYnxmzMZbQrMArDj5G7ZY4uZkYflGit22hhrE0WJ
55 +HqmBLLlz16Gj9e/c+gQ1z9auPL6zk4+RN+QkMsy8bLv5N07ButcrpVeqIeivFRoR
56 +746dhJnOQBZxnwDwWdPRc9DHI5SbFoJo1kHki/46awoMGsS7TjlRTYYnrqQp49Ar
57 +CTRvygzt1ts9dO0KUY7zFq/8/y9v4DBu4Fby+ouEFR4a1i1j+rO5RW2UD/FEp6eE
58 +zvQvn982bgOJ4AFKzdYQx4YpsVA8BuVuD8nysRYphuHq0SSIoQ6ogk1XxPoIkICF
59 +JALG6P9C4oomGSIiVI7iNOF02XSqpyCrya58G2mNDfYGyFzE2jLzgIGbwwhNz7zl
60 +JJVeWwwOfwBdx54BcVqU
61 +=/1AA
62 -----END PGP SIGNATURE-----
63
64 diff --git a/media-gfx/digikam/digikam-2.3.0.ebuild b/media-gfx/digikam/digikam-2.3.0.ebuild
65 deleted file mode 100644
66 index 4b2a706..0000000
67 --- a/media-gfx/digikam/digikam-2.3.0.ebuild
68 +++ /dev/null
69 @@ -1,152 +0,0 @@
70 -# Copyright 1999-2012 Gentoo Foundation
71 -# Distributed under the terms of the GNU General Public License v2
72 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.3.0.ebuild,v 1.5 2012/02/12 16:01:42 dilfridge Exp $
73 -
74 -EAPI=4
75 -
76 -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
77 -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
78 -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
79 -th tr tt uk uz uz@cyrillic ven vi wa xh zh_CN zh_HK zh_TW zu"
80 -
81 -KDE_HANDBOOK="optional"
82 -CMAKE_MIN_VERSION="2.8"
83 -KDE_MINIMAL="4.7"
84 -
85 -inherit kde4-base
86 -
87 -MY_P="${PN}-${PV/_/-}"
88 -
89 -DESCRIPTION="Digital photo management application for KDE"
90 -HOMEPAGE="http://www.digikam.org/"
91 -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
92 -
93 -LICENSE="GPL-2
94 - handbook? ( FDL-1.2 )"
95 -KEYWORDS="amd64 x86"
96 -SLOT="4"
97 -IUSE="addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video"
98 -
99 -CDEPEND="
100 - !!=media-gfx/digikam-2.1.0-r1
101 - $(add_kdebase_dep kdelibs 'semantic-desktop=')
102 - $(add_kdebase_dep libkdcraw)
103 - $(add_kdebase_dep libkexiv2)
104 - $(add_kdebase_dep libkipi)
105 - $(add_kdebase_dep marble plasma)
106 - $(add_kdebase_dep solid)
107 - media-libs/jasper
108 - media-libs/lcms:0
109 - >=media-libs/lensfun-0.2.5
110 - >=media-libs/libkface-${PV}
111 - >=media-libs/libkgeomap-${PV}
112 - media-libs/liblqr
113 - >=media-libs/libpgf-6.11.28
114 - media-libs/libpng
115 - media-libs/tiff
116 - virtual/jpeg
117 - x11-libs/qt-gui[qt3support]
118 - >=sci-libs/clapack-3.2.1-r6
119 - || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
120 - addressbook? ( $(add_kdebase_dep kdepimlibs) )
121 - gphoto2? ( media-libs/libgphoto2 )
122 - mysql? ( virtual/mysql )
123 -"
124 -RDEPEND="${CDEPEND}
125 - $(add_kdebase_dep kreadconfig)
126 - media-plugins/kipi-plugins
127 - video? (
128 - || (
129 - $(add_kdebase_dep mplayerthumbs)
130 - $(add_kdebase_dep ffmpegthumbs)
131 - )
132 - )
133 -"
134 -DEPEND="${CDEPEND}
135 - dev-libs/boost
136 - sys-devel/gettext
137 - doc? ( app-doc/doxygen )
138 -"
139 -
140 -S="${WORKDIR}/${MY_P}/core"
141 -
142 -RESTRICT=test
143 -# bug 366505
144 -
145 -src_prepare() {
146 - # just to make absolutely sure
147 - rm -rf "${WORKDIR}/${MY_P}/extra" || die
148 -
149 - # prepare the handbook
150 - mv "${WORKDIR}/${MY_P}/doc/${PN}" doc || die
151 - echo "add_subdirectory( digikam )" > doc/CMakeLists.txt
152 - echo "add_subdirectory( showfoto )" >> doc/CMakeLists.txt
153 -
154 - # prepare the translations
155 - mv "${WORKDIR}/${MY_P}/po" po || die
156 - find po -name "*.po" -and -not -name "digikam.po" -exec rm {} +
157 -
158 - echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die
159 - echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
160 - echo "add_subdirectory( po )" >> CMakeLists.txt || die
161 -
162 - kde4-base_src_prepare
163 -
164 - if use handbook; then
165 - echo "add_subdirectory( doc )" >> CMakeLists.txt
166 - fi
167 -}
168 -
169 -src_configure() {
170 - local backend
171 -
172 - use semantic-desktop && backend="Nepomuk" || backend="None"
173 - # LQR = only allows to choose between bundled/external
174 - local mycmakeargs=(
175 - -DFORCED_UNBUNDLE=ON
176 - -DWITH_LQR=ON
177 - -DWITH_LENSFUN=ON
178 - -DGWENVIEW_SEMANTICINFO_BACKEND=${backend}
179 - $(cmake-utils_use_with addressbook KdepimLibs)
180 - -DWITH_MarbleWidget=ON
181 - $(cmake-utils_use_enable gphoto2 GPHOTO2)
182 - $(cmake-utils_use_with gphoto2)
183 - $(cmake-utils_use_with semantic-desktop Soprano)
184 - $(cmake-utils_use_enable themedesigner)
185 - $(cmake-utils_use_enable thumbnails THUMBS_DB)
186 - $(cmake-utils_use_enable mysql INTERNALMYSQL)
187 - $(cmake-utils_use_enable debug DEBUG_MESSAGES)
188 - )
189 -
190 - kde4-base_src_configure
191 -}
192 -
193 -src_compile() {
194 - local mytargets="all"
195 - use doc && mytargets+=" doc"
196 -
197 - kde4-base_src_compile ${mytargets}
198 -}
199 -
200 -src_install() {
201 - kde4-base_src_install
202 -
203 - # someone had the great idea to install duplicate icons
204 - einfo Removing duplicate icons
205 - find "${ED}/usr/share/icons/oxygen" -name digikam.png -exec rm -v {} +
206 - find "${ED}/usr/share/icons/oxygen" -name showfoto.png -exec rm -v {} +
207 -
208 - if use doc; then
209 - # install the api documentation
210 - insinto /usr/share/doc/${PF}/html
211 - doins -r ${CMAKE_BUILD_DIR}/api/html/*
212 - fi
213 -}
214 -
215 -pkg_postinst() {
216 - kde4-base_pkg_postinst
217 -
218 - if use doc; then
219 - elog "The digikam api documentation has been installed at /usr/share/doc/${PF}/html"
220 - fi
221 -}
222
223 diff --git a/media-gfx/digikam/digikam-2.4.1.ebuild b/media-gfx/digikam/digikam-2.4.1.ebuild
224 deleted file mode 100644
225 index f4baa95..0000000
226 --- a/media-gfx/digikam/digikam-2.4.1.ebuild
227 +++ /dev/null
228 @@ -1,145 +0,0 @@
229 -# Copyright 1999-2012 Gentoo Foundation
230 -# Distributed under the terms of the GNU General Public License v2
231 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.4.1.ebuild,v 1.4 2012/02/12 16:01:42 dilfridge Exp $
232 -
233 -EAPI=4
234 -
235 -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
236 -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
237 -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"
238 -
239 -KDE_HANDBOOK="optional"
240 -CMAKE_MIN_VERSION="2.8"
241 -KDE_MINIMAL="4.7"
242 -
243 -inherit kde4-base
244 -
245 -MY_P="${PN}-${PV/_/-}"
246 -
247 -DESCRIPTION="Digital photo management application for KDE"
248 -HOMEPAGE="http://www.digikam.org/"
249 -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
250 -
251 -LICENSE="GPL-2
252 - handbook? ( FDL-1.2 )"
253 -KEYWORDS="amd64 x86"
254 -SLOT="4"
255 -IUSE="addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video"
256 -
257 -CDEPEND="
258 - $(add_kdebase_dep kdelibs 'semantic-desktop=')
259 - $(add_kdebase_dep libkdcraw)
260 - $(add_kdebase_dep libkexiv2)
261 - $(add_kdebase_dep libkipi)
262 - $(add_kdebase_dep marble plasma)
263 - $(add_kdebase_dep solid)
264 - media-libs/jasper
265 - media-libs/lcms:0
266 - >=media-libs/lensfun-0.2.5
267 - >=media-libs/libkface-${PV}
268 - >=media-libs/libkgeomap-${PV}
269 - media-libs/liblqr
270 - >=media-libs/libpgf-6.11.28
271 - media-libs/libpng
272 - media-libs/tiff
273 - virtual/jpeg
274 - x11-libs/qt-gui[qt3support]
275 - >=sci-libs/clapack-3.2.1-r6
276 - || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
277 - addressbook? ( $(add_kdebase_dep kdepimlibs) )
278 - gphoto2? ( media-libs/libgphoto2 )
279 - mysql? ( virtual/mysql )
280 -"
281 -RDEPEND="${CDEPEND}
282 - $(add_kdebase_dep kreadconfig)
283 - media-plugins/kipi-plugins
284 - video? (
285 - || (
286 - $(add_kdebase_dep mplayerthumbs)
287 - $(add_kdebase_dep ffmpegthumbs)
288 - )
289 - )
290 -"
291 -DEPEND="${CDEPEND}
292 - dev-libs/boost
293 - sys-devel/gettext
294 - doc? ( app-doc/doxygen )
295 -"
296 -
297 -S="${WORKDIR}/${MY_P}/core"
298 -
299 -RESTRICT=test
300 -# bug 366505
301 -
302 -src_prepare() {
303 - # just to make absolutely sure
304 - rm -rf "${WORKDIR}/${MY_P}/extra" || die
305 -
306 - # prepare the handbook
307 - mv "${WORKDIR}/${MY_P}/doc/${PN}" doc || die
308 - echo "add_subdirectory( digikam )" > doc/CMakeLists.txt
309 - echo "add_subdirectory( showfoto )" >> doc/CMakeLists.txt
310 -
311 - # prepare the translations
312 - mv "${WORKDIR}/${MY_P}/po" po || die
313 - find po -name "*.po" -and -not -name "digikam.po" -exec rm {} +
314 -
315 - echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die
316 - echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
317 - echo "add_subdirectory( po )" >> CMakeLists.txt || die
318 -
319 - kde4-base_src_prepare
320 -
321 - if use handbook; then
322 - echo "add_subdirectory( doc )" >> CMakeLists.txt
323 - fi
324 -}
325 -
326 -src_configure() {
327 - local backend
328 -
329 - use semantic-desktop && backend="Nepomuk" || backend="None"
330 - # LQR = only allows to choose between bundled/external
331 - local mycmakeargs=(
332 - -DFORCED_UNBUNDLE=ON
333 - -DWITH_LQR=ON
334 - -DWITH_LENSFUN=ON
335 - -DGWENVIEW_SEMANTICINFO_BACKEND=${backend}
336 - $(cmake-utils_use_with addressbook KdepimLibs)
337 - -DWITH_MarbleWidget=ON
338 - $(cmake-utils_use_enable gphoto2 GPHOTO2)
339 - $(cmake-utils_use_with gphoto2)
340 - $(cmake-utils_use_with semantic-desktop Soprano)
341 - $(cmake-utils_use_enable themedesigner)
342 - $(cmake-utils_use_enable thumbnails THUMBS_DB)
343 - $(cmake-utils_use_enable mysql INTERNALMYSQL)
344 - $(cmake-utils_use_enable debug DEBUG_MESSAGES)
345 - )
346 -
347 - kde4-base_src_configure
348 -}
349 -
350 -src_compile() {
351 - local mytargets="all"
352 - use doc && mytargets+=" doc"
353 -
354 - kde4-base_src_compile ${mytargets}
355 -}
356 -
357 -src_install() {
358 - kde4-base_src_install
359 -
360 - if use doc; then
361 - # install the api documentation
362 - insinto /usr/share/doc/${PF}/html
363 - doins -r ${CMAKE_BUILD_DIR}/api/html/*
364 - fi
365 -}
366 -
367 -pkg_postinst() {
368 - kde4-base_pkg_postinst
369 -
370 - if use doc; then
371 - elog "The digikam api documentation has been installed at /usr/share/doc/${PF}/html"
372 - fi
373 -}