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:04
Message-Id: 1333899576.93144f9f3f00f589fdaacfe9ac5a4246d3e19052.dilfridge@gentoo
1 commit: 93144f9f3f00f589fdaacfe9ac5a4246d3e19052
2 Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
3 AuthorDate: Sun Apr 8 15:39:36 2012 +0000
4 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 8 15:39:36 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=93144f9f
7
8 [media-gfx/digikam] Version bump
9
10 (Portage version: 2.1.10.56/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
11
12 ---
13 media-gfx/digikam/Manifest | 28 +++---
14 media-gfx/digikam/digikam-2.6.0_beta3.ebuild | 151 ++++++++++++++++++++++++++
15 2 files changed, 166 insertions(+), 13 deletions(-)
16
17 diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
18 index 4a23123..7267d9f 100644
19 --- a/media-gfx/digikam/Manifest
20 +++ b/media-gfx/digikam/Manifest
21 @@ -4,22 +4,24 @@ Hash: SHA512
22 AUX digikam-2.5.0-boost148.patch 4133 RMD160 033b19386db95818d8f1aa7ac8b1384be8ec7169 SHA1 095ea8de1e353120f47ed41c0cd15a36d468efcb SHA256 e9adb199ca4955f64275481231c6761c32b84cdcc8bfab9ddebab6864f0f4a9f
23 AUX digikam-2.5.0-libkipi.patch 2670 RMD160 a82bf1c2797279ac5f195a3f296ece677a838583 SHA1 23268e63dcc39f9e4452aff6639489f16d2c462c SHA256 7652e7854998b03a6047779361801dc63aa42c1f0221ef2b5c0f0a25abf1e651
24 DIST digikam-2.5.0.tar.bz2 54976375 RMD160 4ff1b5fbc2cc4a8cb9994f7c7796086418dd43fb SHA1 6cadb838669d1bdcbd6abb677889f7d68d696383 SHA256 55292c79b41fd2c20ce0a821f388645436acb18b3b06b486747e17129114851a
25 +DIST digikam-2.6.0-beta3.tar.bz2 55694232 RMD160 4337411d074a9f940270a8929293d5457cd283c9 SHA1 8ad5d6d482bbac582aaa2943c0d86272181e1565 SHA256 697ab7fdc0aff0a2a842df21608158f2abd1f7a4619cae9818749012267e6fec
26 EBUILD digikam-2.5.0.ebuild 4197 RMD160 cd406b2bab0a40c52ed6a03aa36764b226406aa6 SHA1 cee756c8a06606acfd79379c085fc32e1c41789a SHA256 844f1cd90ed191aa990c483a76e8951d8968b0d3cab4c1f244ac114f861f21ac
27 +EBUILD digikam-2.6.0_beta3.ebuild 4100 RMD160 50b5bd3fe722057bff72fd1db3cf9e341a868b28 SHA1 7cc17bc9bed640a85fc5e1a38d83bdd3e357b16e SHA256 1b20f2998b83d1ef67b301a3e219080e578641ae74c97b4a001df09760456575
28 MISC metadata.xml 648 RMD160 7694bc7a07e2b35c60e2ed22981007ba0680dd1f SHA1 15b78b8dee48c87b702a5705009b3eee46aa7ebd SHA256 fed8bb77a841bcbc558e06fbe5f729a616152051924fa17fed0e527237f09f8c
29 -----BEGIN PGP SIGNATURE-----
30 Version: GnuPG v2.0.17 (GNU/Linux)
31
32 -iQIcBAEBCgAGBQJPgaeVAAoJENwGBM22xffePFkP/iluQNoOjHoArz70ryaeEfTh
33 -6ZztE+bh8KJlKaMQQwW/3EbewdIgZkE4cK6+lauO5KpG5jGi4IEnerjtZOpz4Qdg
34 -VPI9Nik/EdDlumKmPtyfeAppGK8iVjIZ87nYiVQ6fz9pVcnHUovgAhYmbXV7ju7a
35 -xXT3bzH5xBZfMfO/fhpT0Hir2fPnYBAKl0IgyIMUdub/pxL/l1xOOurGqpGLLU1g
36 -ChzCro3AdhWG//9LxajjNQnlmIU56TYYY86uZJwgTzltvjNtPoMEVHlccSrb/xJB
37 -G8cA7X9E9PhMcnOXmhVG+SWGfYnxmzMZbQrMArDj5G7ZY4uZkYflGit22hhrE0WJ
38 -HqmBLLlz16Gj9e/c+gQ1z9auPL6zk4+RN+QkMsy8bLv5N07ButcrpVeqIeivFRoR
39 -746dhJnOQBZxnwDwWdPRc9DHI5SbFoJo1kHki/46awoMGsS7TjlRTYYnrqQp49Ar
40 -CTRvygzt1ts9dO0KUY7zFq/8/y9v4DBu4Fby+ouEFR4a1i1j+rO5RW2UD/FEp6eE
41 -zvQvn982bgOJ4AFKzdYQx4YpsVA8BuVuD8nysRYphuHq0SSIoQ6ogk1XxPoIkICF
42 -JALG6P9C4oomGSIiVI7iNOF02XSqpyCrya58G2mNDfYGyFzE2jLzgIGbwwhNz7zl
43 -JJVeWwwOfwBdx54BcVqU
44 -=/1AA
45 +iQIcBAEBCgAGBQJPgbE4AAoJENwGBM22xffeydoQAKJMPNwlKcvC/YkpxahcUDEX
46 +/cBsX+9ZU1gKzjg1GRwhLSfWrtLwPmVrYaklyko/+xToTdhVfFoe9NoXNyZq8gse
47 +2ODP0GiitfC++BkciPQaeA7POo8dVhG1fMCKq3hsZmNvw8EdTfrwpLI4rDa+GU7Y
48 +5VzOMn2+7SeitmcVCB/9w5qpsKQEg+yIkoAHjeYmZAWSMhs6mPY3RUIWr8p1LCdy
49 +MjR4X88gEFCH8PWhe7fQFDWDAiS8m7owtTEtlgPVGahR0Q210PgjXPl4wt7YKymp
50 +dU8i04NCb6YrVHaSrCBg2Soi1cIVYKu3Lq2l/V733BqEU5XIUXBNOYF+w93EzJgp
51 +lEE6MVWT6TVkf8+eDd76WFdmKruQV6gQ9cTZonf+WgpC/CQ8XyaVnpJFUsOSgJjL
52 +dO944na7EQ85OcFvCAVcuLh1fOUecFLVK4a1hd/SA68MEGgcntxVRsbWi7Ss6E4o
53 +bmLaoADBn5leIqOfkZ21thLre/6w/VdknlMxMeKSPwclSAzh3ZAX7+qcRSB6Mqs6
54 +/OYJqRrXprKaTbXF9CV13ZcN+kpVctmsblndVFfkWRdFhXCqKvbnI+tue+BGwpP0
55 +0CvpHJhet3WeHSYNo7cAp9oS33seCSKh4K41liIrD/aJioFWFDS8MkUw492jgXlf
56 +p2+sdxjOd/s4oPGtEMxh
57 +=lhnf
58 -----END PGP SIGNATURE-----
59
60 diff --git a/media-gfx/digikam/digikam-2.6.0_beta3.ebuild b/media-gfx/digikam/digikam-2.6.0_beta3.ebuild
61 new file mode 100644
62 index 0000000..f92a6d3
63 --- /dev/null
64 +++ b/media-gfx/digikam/digikam-2.6.0_beta3.ebuild
65 @@ -0,0 +1,151 @@
66 +# Copyright 1999-2012 Gentoo Foundation
67 +# Distributed under the terms of the GNU General Public License v2
68 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.5.0.ebuild,v 1.5 2012/04/04 19:30:58 ago Exp $
69 +
70 +EAPI=4
71 +
72 +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
73 +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
74 +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"
75 +
76 +KDE_HANDBOOK="optional"
77 +CMAKE_MIN_VERSION="2.8"
78 +KDE_MINIMAL="4.8"
79 +
80 +KDE_DOC_DIRS="doc-digikam doc-showfoto"
81 +
82 +inherit kde4-base
83 +
84 +MY_P="${PN}-${PV/_/-}"
85 +
86 +DESCRIPTION="Digital photo management application for KDE"
87 +HOMEPAGE="http://www.digikam.org/"
88 +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
89 +
90 +LICENSE="GPL-2
91 + handbook? ( FDL-1.2 )"
92 +KEYWORDS="~amd64 ~x86"
93 +SLOT="4"
94 +IUSE="addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video"
95 +
96 +CDEPEND="
97 + $(add_kdebase_dep kdelibs 'semantic-desktop=')
98 + $(add_kdebase_dep libkdcraw)
99 + $(add_kdebase_dep libkexiv2)
100 + $(add_kdebase_dep libkipi)
101 + $(add_kdebase_dep marble plasma)
102 + $(add_kdebase_dep solid)
103 + media-libs/jasper
104 + media-libs/lcms:0
105 + >=media-libs/lensfun-0.2.5
106 + media-libs/libkface
107 + media-libs/libkgeomap
108 + media-libs/liblqr
109 + >=media-libs/libpgf-6.11.28
110 + media-libs/libpng
111 + media-libs/tiff
112 + virtual/jpeg
113 + x11-libs/qt-gui[qt3support]
114 + >=sci-libs/clapack-3.2.1-r6
115 + || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
116 + addressbook? ( $(add_kdebase_dep kdepimlibs) )
117 + gphoto2? ( media-libs/libgphoto2 )
118 + mysql? ( virtual/mysql )
119 +"
120 +RDEPEND="${CDEPEND}
121 + $(add_kdebase_dep kreadconfig)
122 + media-plugins/kipi-plugins
123 + video? (
124 + || (
125 + $(add_kdebase_dep mplayerthumbs)
126 + $(add_kdebase_dep ffmpegthumbs)
127 + )
128 + )
129 +"
130 +DEPEND="${CDEPEND}
131 + dev-libs/boost
132 + sys-devel/gettext
133 + doc? ( app-doc/doxygen )
134 +"
135 +
136 +S="${WORKDIR}/${MY_P}/core"
137 +
138 +RESTRICT=test
139 +# bug 366505
140 +
141 +src_prepare() {
142 + # just to make absolutely sure
143 + rm -rf "${WORKDIR}/${MY_P}/extra" || die
144 +
145 + # prepare the handbook
146 + mkdir doc-digikam doc-showfoto || die
147 + echo "add_subdirectory( en )" > doc-digikam/CMakeLists.txt || die
148 + mv "${WORKDIR}/${MY_P}/doc/${PN}/digikam" doc-digikam/en || die
149 + echo "add_subdirectory( en )" > doc-showfoto/CMakeLists.txt || die
150 + mv "${WORKDIR}/${MY_P}/doc/${PN}/showfoto" doc-showfoto/en || die
151 + sed -i -e 's:../digikam/:../../doc-digikam/en/:g' doc-showfoto/en/index.docbook || die
152 +
153 + # prepare the translations
154 + mv "${WORKDIR}/${MY_P}/po" po || die
155 + find po -name "*.po" -and -not -name "digikam.po" -exec rm {} +
156 +
157 + echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die
158 + echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
159 + echo "add_subdirectory( po )" >> CMakeLists.txt || die
160 +
161 + kde4-base_src_prepare
162 +
163 + if use handbook; then
164 + echo "add_subdirectory( doc-digikam )" >> CMakeLists.txt
165 + echo "add_subdirectory( doc-showfoto )" >> 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 + if use doc; then
204 + # install the api documentation
205 + insinto /usr/share/doc/${PF}/html
206 + doins -r ${CMAKE_BUILD_DIR}/api/html/*
207 + fi
208 +}
209 +
210 +pkg_postinst() {
211 + kde4-base_pkg_postinst
212 +
213 + if use doc; then
214 + elog "The digikam api documentation has been installed at /usr/share/doc/${PF}/html"
215 + fi
216 +}