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: Thu, 28 Jul 2011 22:45:37
Message-Id: 0f7a080c42f1506a43bbf8e7d63967e3378e4948.dilfridge@gentoo
1 commit: 0f7a080c42f1506a43bbf8e7d63967e3378e4948
2 Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
3 AuthorDate: Thu Jul 28 22:45:19 2011 +0000
4 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 28 22:45:19 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=0f7a080c
7
8 Added work in progess, does not build yet
9
10 (Portage version: 2.1.10.7/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key B6C5F7DE)
11
12 ---
13 media-gfx/digikam/ChangeLog | 7 +
14 media-gfx/digikam/Manifest | 34 +++---
15 ...kam-2.0.0_beta6.ebuild => digikam-2.0.0.ebuild} | 52 ++++----
16 media-gfx/digikam/digikam-2.0.0_beta5.ebuild | 132 --------------------
17 4 files changed, 51 insertions(+), 174 deletions(-)
18
19 diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
20 index 51e1807..29166b6 100644
21 --- a/media-gfx/digikam/ChangeLog
22 +++ b/media-gfx/digikam/ChangeLog
23 @@ -2,6 +2,13 @@
24 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
25 # $Header: $
26
27 +*digikam-2.0.0 (28 Jul 2011)
28 +
29 + 28 Jul 2011; Andreas K. Huettel <dilfridge@g.o>
30 + -digikam-2.0.0_beta5.ebuild, -digikam-2.0.0_beta6.ebuild,
31 + +digikam-2.0.0.ebuild:
32 + Added work in progess, does not build yet
33 +
34 27 Jul 2011; Andreas K. Huettel <dilfridge@g.o> digikam-1.9.0.ebuild,
35 digikam-1.9.0-r1.ebuild, +files/digikam-1.9.0-newpgf.patch,
36 digikam-2.0.0_rc.ebuild:
37
38 diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
39 index 6b434ee..2e146d5 100644
40 --- a/media-gfx/digikam/Manifest
41 +++ b/media-gfx/digikam/Manifest
42 @@ -29,32 +29,30 @@ AUX digikam-2.0.0_rc-officialpgf2.patch 824 RMD160 54715604f3ca772253fee111f3110
43 AUX digikam-2.0.0_rc-oldpgf.patch 866 RMD160 36d94d476bdd02647fe4071b6ca2d9d09c851282 SHA1 3c49b420987df7db854a6a426daa848c42a36f3c SHA256 11389b36e669ae65522f439672d0409963f86eba0d2f439402311e67650dc89c
44 DIST digikam-1.8.0.tar.bz2 23376636 RMD160 aa86cae8048a8f7122285c5e27aaa59e5dbcc47c SHA1 65430990896b56b7ec76b9a6bc5f8472145f44fd SHA256 210de9d949265e910c65c9ab8b19efab13839f6a2ef761a5915d267ddfe494aa
45 DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5
46 -DIST digikam-2.0.0-beta5.tar.bz2 43494127 RMD160 715f9f3f1695bad8e74dbeb9313da7a5303f0473 SHA1 97432e5997f00028c1acff38e2e0a791294c2aaf SHA256 118ea42cebaec6795b89cbb6018bdfa1d0e664eeda9b09ac0fd4083e3969f394
47 -DIST digikam-2.0.0-beta6.tar.bz2 43533320 RMD160 eb50febc2ade359f8d92e6673e4f73a6b57b6fa5 SHA1 3ca5356da07d6484ce2299627e9d54acf14e06a2 SHA256 5f81ce581ff8e1148c023b71365928509d497f0bd248f27c925ea3038cea2cea
48 DIST digikam-2.0.0-rc.tar.bz2 45397480 RMD160 20fa3790c8ca950960020cdf3a32410689005db3 SHA1 b0067f99de1244723c45650d9a684b1e8f743954 SHA256 564354c34b41287e951005707b84b8a1f82c691189083c5943abed5e0aebe691
49 +DIST digikam-2.0.0.tar.bz2 53906557 RMD160 010f6b37920828003fa56159f1a7cf8452226fc6 SHA1 5941681163d90a13d316bd606589354099fd4f8a SHA256 c7d19f0562a06f02479cf84a257fe30aa523f82e668a16b21ce9ae5443034234
50 DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
51 EBUILD digikam-1.8.0.ebuild 3247 RMD160 86c84f6dea0b55764dad9cf4c6427b1b2fbc7742 SHA1 4ea44c2e1e30d7dfdb28bbeb8defbd740199fad9 SHA256 b93cb62a5f973e48ec99716183ee339dcd0c90791594a982b6d70bd216a425c4
52 EBUILD digikam-1.9.0-r1.ebuild 3347 RMD160 3cdaf055dc0b801a3cd05ce5ebd91a7db10ff819 SHA1 29390bef0da866f1f914ba05e046f15f78297d4e SHA256 2b83becdcae58d502d977afe0551abf24b80365bb42be54144444b969d7342e2
53 EBUILD digikam-1.9.0.ebuild 3178 RMD160 1f56c6f8cc4d7595dd751866f7a342974c0b67ea SHA1 e4193070e15b3851ff8fa2b6bb18ec48d3bfb0ac SHA256 b75d893953c1f37396f4f4b6a0c59005b4bf09307cb85aef958bc3910f3e9c75
54 -EBUILD digikam-2.0.0_beta5.ebuild 3245 RMD160 cc3e08c7da4a3bd909edb43f6b33ad3aff64b762 SHA1 a8501a880d6cc3c9e22153fc8288908de09c1d2a SHA256 8b5dfd0865866bb01fcfe6d5055b798194ea6e3dfefa29821dac73dd997643bf
55 -EBUILD digikam-2.0.0_beta6.ebuild 3226 RMD160 939ed0020e35608d4140e73b40f9266093c0e2a8 SHA1 6baad3fab16f5f406295f7e7e084e67e9c233e48 SHA256 b6ee9123131a9b97c984d7bfc05a9b69ce644083499702c0c18d394c5854ba75
56 +EBUILD digikam-2.0.0.ebuild 3615 RMD160 effa4c716dc295c077abb2316303909092a31c22 SHA1 8a1e48212e8fbfb2355fe4d93f68a4a7d4e26cfd SHA256 0eaa68b9a008bf8b222492854204d51a8ab6e7ea909d57c88a55f6b760180bc8
57 EBUILD digikam-2.0.0_rc.ebuild 3500 RMD160 34a75d9a7b3aea4e5065cfc94d1674672a9a5ce3 SHA1 17abcd6e5996cc57a83fee9f9b0088aeaf1f4054 SHA256 2254955af12fb79aebdaec5dbaa6c3fe8e747ce47c42c22f2067ddddbf37f89a
58 -MISC ChangeLog 12203 RMD160 dad8c089a58312af04a5df63bae02cf38af3209d SHA1 9558c98e432bc61204e9782d1fb9c4c050fccfe3 SHA256 4a85e9b0a2cbc911a6ee392c357d7d603bd2cb9b4095b125c14d1cb6921f9044
59 +MISC ChangeLog 12420 RMD160 a141058d391b2035ed86bf0c380e7a576ad8b027 SHA1 6e70d14f65f91b00b51ac9d3b9bd61d5485a0e48 SHA256 1f9671289485fd404433c9f2e583fbe5e63ab0626b64de3d54e88b13e6861d2b
60 MISC metadata.xml 553 RMD160 7de4b2dc583e17cfab08965015c5bb6291b968d8 SHA1 c7eecc86fd6539448bc2a8296f77c2bc4796e3a1 SHA256 f3280886ea9f988ca1315148380f1c89c6c042d0bc511105f3b2c3a926e17b80
61 -----BEGIN PGP SIGNATURE-----
62 Version: GnuPG v2.0.17 (GNU/Linux)
63
64 -iQIcBAEBCgAGBQJOMInJAAoJENwGBM22xffeoecQAJ5dNaTo+foLdjZAnYQOqzAO
65 -ZemA7GnO/84v0P2YFJJfDaKMmhvy1YFl1fXZBHNk1Ivk10LJhMXKcSHpkwP8BDwp
66 -BOUVJqWIRVmBXNjsoNbwWG08P3zs4nkjWRPFBwYjuW2SOld3Kt0zZ2/2YqvkMaT9
67 -Pxgw9HAVmOFrBo+jiDU3lCGM+zaplUIBXuXf4Uz/RH8nCgBAtpQ4rsFDbBNgrPJh
68 -4NjgK/3qGJ9EUsLNQaPuynlrM0JqUajylrOEPMrI4ZqGG+o/KIDMTQTipkgVQAHq
69 -jVQMDptS0u3cGmArOOGTdv23PIPWVI9iqLoAE2jhS6M2t+JG54OqaNhh+zd9fEkb
70 -MlDAA0ISxdQeEj5tgpA/U2zv9W9WtH9TpN087OCc5ZXXlmN+36oWfGSw3eOdXdrZ
71 -e3Xfhgpbia/35/nmbxh/tpEfRBuMBGdsI/oZVToeQXqVRyfzX5hIhpvSIiUuKGz6
72 -NillqL7oSAUnNEAhi95ZTXtSMTyChkrVXV2kuDrN4SdRE3Wjwphdf2XR2pYwHrrB
73 -KFGwXwClNn6hmHVFh2Jvr2jrQUronIWlaXdun+w1F50Gv0CbDCl6KcLFM3zrjL60
74 -dFSr3s2ynmxaRH2Qgv73aL/BvPcz2pOaBaPuLIoAjwSjsvTRtA6w8Cmx2uPiJGK8
75 -yCtbfrJpTKyukhs4vo/f
76 -=feu8
77 +iQIcBAEBCgAGBQJOMeZ/AAoJENwGBM22xffeSrEP/jYRZKVsPWTNNuGLWzdaPX3M
78 +Y3l2t5YJ4VJOHX1X73wbduY1FGqj8SoGVbfEPDiS89ezfwREwFREf4c2AD7LlI4a
79 +AS1Z4ydewHhBryE9E4p/uXEOoDe8r2Cc0YghByTiOwh5wxjdC27Fg56D8yM2EBED
80 +H/b2YMEl3iqsgJKcuDp13o8aJNVk+UxROIW8TwJELxhPdlnWm/qu9SR1eWCS/+se
81 +MwuNYRLjf2zxT1tubNbCIyGjwLuz747C9kPKDtB97dzmJPKEMi1lvWf4Z34Zuohb
82 +UiVOeFY0SqhPYWbTsiFZcZfjt9jrXFF/rY35nzJpFuuvLkIoFQP91eomQNgjuWIN
83 +nU84vJUV3HGA1mqRKgXgCdJJkbpe2fdR/GVUg9A20GP8lbiHN9LqNPxOZhDHjO3E
84 ++LvZ0kgdT4XM04jpikY8Mopq8Yl7i5PGlYE9nizEkEHmXpPZH6poT/NggGmKsDZg
85 +f+VX+Qk+OeleV7DVeut03a/VHkKfBWJewMdAfciLyH54B/KIhcFHvlpgoARryMJr
86 +MYQkNyiHNi+RZPLlDod/MJIQfgr0QopmVW5QgPIG+45mNR7V4GAyd0W+2sXEVcTy
87 +8wXxDdNKySdSXvkzdwIU/Ktjb4287qvF5Fz1NoSTe9LR/40gFlNnWAndfQaq+xY0
88 +meruCDTchw5qGtBnlFxt
89 +=gU0/
90 -----END PGP SIGNATURE-----
91
92 diff --git a/media-gfx/digikam/digikam-2.0.0_beta6.ebuild b/media-gfx/digikam/digikam-2.0.0.ebuild
93 similarity index 72%
94 rename from media-gfx/digikam/digikam-2.0.0_beta6.ebuild
95 rename to media-gfx/digikam/digikam-2.0.0.ebuild
96 index be5c2a8..74034dd 100644
97 --- a/media-gfx/digikam/digikam-2.0.0_beta6.ebuild
98 +++ b/media-gfx/digikam/digikam-2.0.0.ebuild
99 @@ -1,63 +1,59 @@
100 # Copyright 1999-2011 Gentoo Foundation
101 # Distributed under the terms of the GNU General Public License v2
102 -# $Header: $
103 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.0.0_rc.ebuild,v 1.1 2011/07/27 20:51:56 dilfridge Exp $
104
105 EAPI=4
106
107 -KDE_LINGUAS=""
108 -#KDE_LINGUAS="be ca ca@valencia de el en_GB eo es et eu fi fr he hi hne hu is it km
109 -# ko lt lv nds nn pa pl pt pt_BR ro se sl sv th tr vi zh_CN zh_TW"
110 +KDE_LINGUAS="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
111 +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 nb nds ne nl nn
112 +nso oc pa pl pt pt_BR ro ru rw se sk sl sq sr ss sv ta te tg th tr tt uk uz ven vi wa xh
113 +zh_CN zh_HK zh_TW zu"
114
115 KDE_HANDBOOK="optional"
116 -
117 -CMAKE_MIN_VERSION=2.8
118 -
119 -KDE_MINIMAL="4.6"
120 -
121 -KDEGRAPHICS_MINIMAL="4.6.30"
122 -# please leave the weird number here for the moment
123 +CMAKE_MIN_VERSION="2.8"
124 +KDE_MINIMAL="4.7"
125
126 inherit kde4-base
127
128 MY_P="${PN}-${PV/_/-}"
129
130 -DESCRIPTION="A digital photo management application for KDE."
131 +DESCRIPTION="Digital photo management application for KDE"
132 HOMEPAGE="http://www.digikam.org/"
133 [[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
134
135 LICENSE="GPL-2
136 handbook? ( FDL-1.2 )"
137 -KEYWORDS="~amd64 ~x86"
138 +KEYWORDS=""
139 SLOT="4"
140 -IUSE="addressbook debug doc gphoto2 semantic-desktop themedesigner +thumbnails video"
141 +IUSE="addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video"
142
143 CDEPEND="
144 $(add_kdebase_dep kdelibs semantic-desktop)
145 - $(add_kdebase_dep marble plasma)
146 - $(add_kdebase_dep libkipi)
147 + $(add_kdebase_dep libkdcraw)
148 $(add_kdebase_dep libkexiv2)
149 - >=kde-base/libkdcraw-${KDEGRAPHICS_MINIMAL}
150 - >=media-libs/libkface-${PV}
151 - >=media-libs/libkmap-${PV}
152 + $(add_kdebase_dep libkipi)
153 + $(add_kdebase_dep marble plasma)
154 $(add_kdebase_dep solid)
155 media-libs/jasper
156 - virtual/jpeg
157 media-libs/lcms:0
158 >=media-libs/lensfun-0.2.5
159 + >=media-libs/libkface-${PV}
160 + >=media-libs/libkgeomap-${PV}
161 media-libs/liblqr
162 + >=media-libs/libpgf-6.11.28
163 media-libs/libpng
164 media-libs/tiff
165 - media-libs/libpgf
166 - >=media-plugins/kipi-plugins-1.2.0-r1
167 - || ( >=sci-libs/clapack-3.2.1-r6 sci-libs/lapack-atlas )
168 - virtual/mysql
169 + virtual/jpeg
170 x11-libs/qt-gui[qt3support]
171 + || ( >=sci-libs/clapack-3.2.1-r6 sci-libs/lapack-atlas )
172 || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
173 addressbook? ( $(add_kdebase_dep kdepimlibs) )
174 gphoto2? ( media-libs/libgphoto2 )
175 + mysql? ( virtual/mysql )
176 "
177 RDEPEND="${CDEPEND}
178 $(add_kdebase_dep kreadconfig)
179 + ~media-plugins/kipi-plugins-${PV}
180 video? (
181 || (
182 $(add_kdebase_dep mplayerthumbs)
183 @@ -76,10 +72,17 @@ src_prepare() {
184 # just to make absolutely sure
185 rm -rf "${WORKDIR}/${MY_P}/extra" || die
186
187 + # prepare the handbook
188 mv "${WORKDIR}/${MY_P}/doc/${PN}" doc || die
189 echo "add_subdirectory( digikam )" > doc/CMakeLists.txt
190 echo "add_subdirectory( showfoto )" >> doc/CMakeLists.txt
191
192 + # prepare the translations
193 + mv "${WORKDIR}/${MY_P}/po" po || die
194 + find po -name "kipiplugin_*.po" -exec rm {} +
195 +
196 + echo "add_subdirectory( po )" >> CMakeLists.txt
197 +
198 kde4-base_src_prepare
199
200 if use handbook; then
201 @@ -104,6 +107,7 @@ src_configure() {
202 $(cmake-utils_use_with semantic-desktop Soprano)
203 $(cmake-utils_use_enable themedesigner)
204 $(cmake-utils_use_enable thumbnails THUMBS_DB)
205 + $(cmake-utils_use_enable mysql INTERNALMYSQL)
206 $(cmake-utils_use_enable debug DEBUG_MESSAGES)
207 )
208
209
210 diff --git a/media-gfx/digikam/digikam-2.0.0_beta5.ebuild b/media-gfx/digikam/digikam-2.0.0_beta5.ebuild
211 deleted file mode 100644
212 index b8e43c9..0000000
213 --- a/media-gfx/digikam/digikam-2.0.0_beta5.ebuild
214 +++ /dev/null
215 @@ -1,132 +0,0 @@
216 -# Copyright 1999-2011 Gentoo Foundation
217 -# Distributed under the terms of the GNU General Public License v2
218 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.6.0.ebuild,v 1.1 2010/11/25 20:30:29 dilfridge Exp $
219 -
220 -EAPI=4
221 -
222 -KDE_LINGUAS=""
223 -#KDE_LINGUAS="be ca ca@valencia de el en_GB eo es et eu fi fr he hi hne hu is it km
224 -# ko lt lv nds nn pa pl pt pt_BR ro se sl sv th tr vi zh_CN zh_TW"
225 -
226 -KDE_HANDBOOK="optional"
227 -
228 -CMAKE_MIN_VERSION=2.8
229 -
230 -KDE_MINIMAL="4.6"
231 -KDEGRAPHICS_MINIMAL="4.6.29"
232 -
233 -inherit kde4-base
234 -
235 -MY_P="${PN}-${PV/_/-}"
236 -
237 -DESCRIPTION="A digital photo management application for KDE."
238 -HOMEPAGE="http://www.digikam.org/"
239 -[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
240 -
241 -LICENSE="GPL-2
242 - handbook? ( FDL-1.2 )"
243 -KEYWORDS="~amd64 ~x86"
244 -SLOT="4"
245 -IUSE="addressbook debug doc gphoto2 semantic-desktop themedesigner +thumbnails video"
246 -
247 -CDEPEND="
248 - $(add_kdebase_dep kdelibs semantic-desktop)
249 - $(add_kdebase_dep marble plasma)
250 - $(add_kdebase_dep libkipi)
251 - $(add_kdebase_dep libkexiv2)
252 - >=kde-base/libkdcraw-${KDEGRAPHICS_MINIMAL}
253 - >=media-libs/libkface-${PV}
254 - >=media-libs/libkmap-${PV}
255 - $(add_kdebase_dep solid)
256 - media-libs/jasper
257 - virtual/jpeg
258 - media-libs/lcms:0
259 - >=media-libs/lensfun-0.2.5
260 - media-libs/liblqr
261 - media-libs/libpng
262 - media-libs/tiff
263 - media-libs/libpgf
264 - >=media-plugins/kipi-plugins-1.2.0-r1
265 - || ( >=sci-libs/clapack-3.2.1-r3 sci-libs/lapack-atlas )
266 - virtual/mysql
267 - x11-libs/qt-gui[qt3support]
268 - || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
269 - addressbook? ( $(add_kdebase_dep kdepimlibs) )
270 - gphoto2? ( media-libs/libgphoto2 )
271 -"
272 -RDEPEND="${CDEPEND}
273 - $(add_kdebase_dep kreadconfig)
274 - video? (
275 - || (
276 - $(add_kdebase_dep mplayerthumbs)
277 - $(add_kdebase_dep ffmpegthumbs)
278 - )
279 - )
280 -"
281 -DEPEND="${CDEPEND}
282 - sys-devel/gettext
283 - doc? ( app-doc/doxygen )
284 -"
285 -
286 -PATCHES=(
287 - "${FILESDIR}/${PN}"-2.0.0_beta5-docs.patch
288 - "${FILESDIR}/${PN}"-1.9.0-turbo.patch
289 -)
290 -
291 -S="${WORKDIR}/${MY_P}/core"
292 -
293 -src_prepare() {
294 - # just to make absolutely sure
295 - rm -rf "${WORKDIR}/${MY_P}/extra" || die
296 -
297 - mv "${WORKDIR}/${MY_P}/doc/${PN}" doc || die
298 - echo "add_subdirectory( digikam )" > doc/CMakeLists.txt
299 - echo "add_subdirectory( showfoto )" >> doc/CMakeLists.txt
300 -
301 - kde4-base_src_prepare
302 -
303 - if use handbook; then
304 - echo "add_subdirectory( doc )" >> CMakeLists.txt
305 - fi
306 -}
307 -
308 -src_configure() {
309 - local backend
310 -
311 - use semantic-desktop && backend="Nepomuk" || backend="None"
312 - # LQR = only allows to choose between bundled/external
313 - local mycmakeargs=(
314 - -DFORCED_UNBUNDLE=ON
315 - -DWITH_LQR=ON
316 - -DWITH_LENSFUN=ON
317 - -DGWENVIEW_SEMANTICINFO_BACKEND=${backend}
318 - $(cmake-utils_use_with addressbook KdepimLibs)
319 - $(cmake-utils_use_build doc)
320 - -DWITH_MarbleWidget=ON
321 - $(cmake-utils_use_enable gphoto2 GPHOTO2)
322 - $(cmake-utils_use_with gphoto2)
323 - $(cmake-utils_use_with semantic-desktop Soprano)
324 - $(cmake-utils_use_enable themedesigner)
325 - $(cmake-utils_use_enable thumbnails THUMBS_DB)
326 - )
327 -
328 - kde4-base_src_configure
329 -}
330 -
331 -src_install() {
332 - kde4-base_src_install
333 -
334 - if use doc; then
335 - # install the api documentation
336 - insinto /usr/share/doc/${PF}/html
337 - doins -r ${CMAKE_BUILD_DIR}/api/html/*
338 - fi
339 -}
340 -
341 -pkg_postinst() {
342 - kde4-base_pkg_postinst
343 -
344 - if use doc; then
345 - elog "The digikam api documentation has been installed at /usr/share/doc/${PF}/html"
346 - fi
347 -}