1 |
commit: d6df2cca201ae2cb3a113aca6d074f8e26c055c3 |
2 |
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jul 2 18:30:45 2011 +0000 |
4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 2 18:30:45 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=d6df2cca |
7 |
|
8 |
Version bump, does not build yet (kde bug 276969) |
9 |
|
10 |
(Portage version: 2.1.10.3/git/Linux x86_64, unsigned Manifest commit) |
11 |
|
12 |
--- |
13 |
media-gfx/digikam/ChangeLog | 6 ++ |
14 |
media-gfx/digikam/Manifest | 6 +- |
15 |
media-gfx/digikam/digikam-2.0.0_rc.ebuild | 134 +++++++++++++++++++++++++++++ |
16 |
media-gfx/digikam/metadata.xml | 1 - |
17 |
4 files changed, 144 insertions(+), 3 deletions(-) |
18 |
|
19 |
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog |
20 |
index 109f284..a6ca443 100644 |
21 |
--- a/media-gfx/digikam/ChangeLog |
22 |
+++ b/media-gfx/digikam/ChangeLog |
23 |
@@ -2,6 +2,12 @@ |
24 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
25 |
# $Header: $ |
26 |
|
27 |
+*digikam-2.0.0_rc (02 Jul 2011) |
28 |
+ |
29 |
+ 02 Jul 2011; Andreas K. Huettel <dilfridge@g.o> |
30 |
+ +digikam-2.0.0_rc.ebuild, metadata.xml: |
31 |
+ Version bump, does not build yet (kde bug 276969) |
32 |
+ |
33 |
02 Jul 2011; Andreas K. Huettel <dilfridge@g.o> |
34 |
-digikam-1.2.0-r4.ebuild: |
35 |
Drop old |
36 |
|
37 |
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest |
38 |
index 8a26a08..88551a0 100644 |
39 |
--- a/media-gfx/digikam/Manifest |
40 |
+++ b/media-gfx/digikam/Manifest |
41 |
@@ -24,11 +24,13 @@ DIST digikam-1.8.0.tar.bz2 23376636 RMD160 aa86cae8048a8f7122285c5e27aaa59e5dbcc |
42 |
DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5 |
43 |
DIST digikam-2.0.0-beta5.tar.bz2 43494127 RMD160 715f9f3f1695bad8e74dbeb9313da7a5303f0473 SHA1 97432e5997f00028c1acff38e2e0a791294c2aaf SHA256 118ea42cebaec6795b89cbb6018bdfa1d0e664eeda9b09ac0fd4083e3969f394 |
44 |
DIST digikam-2.0.0-beta6.tar.bz2 43533320 RMD160 eb50febc2ade359f8d92e6673e4f73a6b57b6fa5 SHA1 3ca5356da07d6484ce2299627e9d54acf14e06a2 SHA256 5f81ce581ff8e1148c023b71365928509d497f0bd248f27c925ea3038cea2cea |
45 |
+DIST digikam-2.0.0-rc.tar.bz2 45397480 RMD160 20fa3790c8ca950960020cdf3a32410689005db3 SHA1 b0067f99de1244723c45650d9a684b1e8f743954 SHA256 564354c34b41287e951005707b84b8a1f82c691189083c5943abed5e0aebe691 |
46 |
DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467 |
47 |
EBUILD digikam-1.8.0.ebuild 3247 RMD160 86c84f6dea0b55764dad9cf4c6427b1b2fbc7742 SHA1 4ea44c2e1e30d7dfdb28bbeb8defbd740199fad9 SHA256 b93cb62a5f973e48ec99716183ee339dcd0c90791594a982b6d70bd216a425c4 |
48 |
EBUILD digikam-1.9.0-r1.ebuild 3299 RMD160 c4f0ffdc7d1bb89581c721a4a85310e7ca4b704f SHA1 1346318824da28a94445ebac446c737e46906dae SHA256 b73c19ab5cf8ecddec3802687b00e664e3fbc7b054a504173b540151e0c324f6 |
49 |
EBUILD digikam-1.9.0.ebuild 3242 RMD160 04df3e2432a19d01a07851d8a8a3821279aa4af0 SHA1 c80b1939a52ab7aa7c0032373022f3cb931fee81 SHA256 e5bc2256f812d90206d99b3ec6f6ffbad75e5dd0bbcccaa8e349e894eef73d53 |
50 |
EBUILD digikam-2.0.0_beta5.ebuild 3245 RMD160 cc3e08c7da4a3bd909edb43f6b33ad3aff64b762 SHA1 a8501a880d6cc3c9e22153fc8288908de09c1d2a SHA256 8b5dfd0865866bb01fcfe6d5055b798194ea6e3dfefa29821dac73dd997643bf |
51 |
EBUILD digikam-2.0.0_beta6.ebuild 3226 RMD160 939ed0020e35608d4140e73b40f9266093c0e2a8 SHA1 6baad3fab16f5f406295f7e7e084e67e9c233e48 SHA256 b6ee9123131a9b97c984d7bfc05a9b69ce644083499702c0c18d394c5854ba75 |
52 |
-MISC ChangeLog 10819 RMD160 7396d8ad78084f949d38c2f068fd9a3427a2961d SHA1 0237a2601b498d5c88e3a65fe9fde7fa8d059c52 SHA256 a19176aa98decddf9fc30e5198a19767dbcd8fa13e01779c4122dcfca5934218 |
53 |
-MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6 |
54 |
+EBUILD digikam-2.0.0_rc.ebuild 3207 RMD160 1aeaf47f7a6c4980322bd699030b6ec8bd6360bd SHA1 a5cac00b9d468418cf340ed250416dad5d20fee1 SHA256 f529b966f33261732c072060dcbc3767d53de7665e1663440a9b3933bcd64a8f |
55 |
+MISC ChangeLog 11004 RMD160 5e9edd169e242504366ee2f45bbe2f0f02d3657f SHA1 eb603e9e4ee3eb507a9520005dd889800809beeb SHA256 3ebb5b184f05fa323b682cac3d35b77a251762d1dc505341555c20b465f04483 |
56 |
+MISC metadata.xml 553 RMD160 7de4b2dc583e17cfab08965015c5bb6291b968d8 SHA1 c7eecc86fd6539448bc2a8296f77c2bc4796e3a1 SHA256 f3280886ea9f988ca1315148380f1c89c6c042d0bc511105f3b2c3a926e17b80 |
57 |
|
58 |
diff --git a/media-gfx/digikam/digikam-2.0.0_rc.ebuild b/media-gfx/digikam/digikam-2.0.0_rc.ebuild |
59 |
new file mode 100644 |
60 |
index 0000000..8f062fe |
61 |
--- /dev/null |
62 |
+++ b/media-gfx/digikam/digikam-2.0.0_rc.ebuild |
63 |
@@ -0,0 +1,134 @@ |
64 |
+# Copyright 1999-2011 Gentoo Foundation |
65 |
+# Distributed under the terms of the GNU General Public License v2 |
66 |
+# $Header: $ |
67 |
+ |
68 |
+EAPI=4 |
69 |
+ |
70 |
+KDE_LINGUAS="" |
71 |
+#KDE_LINGUAS="be ca ca@valencia de el en_GB eo es et eu fi fr he hi hne hu is it km |
72 |
+# ko lt lv nds nn pa pl pt pt_BR ro se sl sv th tr vi zh_CN zh_TW" |
73 |
+ |
74 |
+KDE_HANDBOOK="optional" |
75 |
+ |
76 |
+CMAKE_MIN_VERSION=2.8 |
77 |
+ |
78 |
+KDEGRAPHICS_MINIMAL="4.6.31" |
79 |
+# please leave the weird number here for the moment |
80 |
+ |
81 |
+inherit kde4-base |
82 |
+ |
83 |
+MY_P="${PN}-${PV/_/-}" |
84 |
+ |
85 |
+DESCRIPTION="A digital photo management application for KDE." |
86 |
+HOMEPAGE="http://www.digikam.org/" |
87 |
+[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" |
88 |
+ |
89 |
+LICENSE="GPL-2 |
90 |
+ handbook? ( FDL-1.2 )" |
91 |
+KEYWORDS="~amd64 ~x86" |
92 |
+SLOT="4" |
93 |
+IUSE="addressbook debug doc gphoto2 semantic-desktop themedesigner +thumbnails video" |
94 |
+ |
95 |
+CDEPEND=" |
96 |
+ $(add_kdebase_dep kdelibs semantic-desktop) |
97 |
+ $(add_kdebase_dep marble plasma) |
98 |
+ $(add_kdebase_dep libkipi) |
99 |
+ $(add_kdebase_dep libkexiv2) |
100 |
+ >=kde-base/libkdcraw-${KDEGRAPHICS_MINIMAL} |
101 |
+ >=media-libs/libkface-${PV} |
102 |
+ >=media-libs/libkmap-${PV} |
103 |
+ $(add_kdebase_dep solid) |
104 |
+ media-libs/jasper |
105 |
+ virtual/jpeg |
106 |
+ media-libs/lcms:0 |
107 |
+ >=media-libs/lensfun-0.2.5 |
108 |
+ media-libs/liblqr |
109 |
+ media-libs/libpng |
110 |
+ media-libs/tiff |
111 |
+ media-libs/libpgf |
112 |
+ >=media-plugins/kipi-plugins-1.2.0-r1 |
113 |
+ || ( >=sci-libs/clapack-3.2.1-r6 sci-libs/lapack-atlas ) |
114 |
+ virtual/mysql |
115 |
+ x11-libs/qt-gui[qt3support] |
116 |
+ || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] ) |
117 |
+ addressbook? ( $(add_kdebase_dep kdepimlibs) ) |
118 |
+ gphoto2? ( media-libs/libgphoto2 ) |
119 |
+" |
120 |
+RDEPEND="${CDEPEND} |
121 |
+ $(add_kdebase_dep kreadconfig) |
122 |
+ video? ( |
123 |
+ || ( |
124 |
+ $(add_kdebase_dep mplayerthumbs) |
125 |
+ $(add_kdebase_dep ffmpegthumbs) |
126 |
+ ) |
127 |
+ ) |
128 |
+" |
129 |
+DEPEND="${CDEPEND} |
130 |
+ sys-devel/gettext |
131 |
+ doc? ( app-doc/doxygen ) |
132 |
+" |
133 |
+ |
134 |
+S="${WORKDIR}/${MY_P}/core" |
135 |
+ |
136 |
+src_prepare() { |
137 |
+ # just to make absolutely sure |
138 |
+ rm -rf "${WORKDIR}/${MY_P}/extra" || die |
139 |
+ |
140 |
+ mv "${WORKDIR}/${MY_P}/doc/${PN}" doc || die |
141 |
+ echo "add_subdirectory( digikam )" > doc/CMakeLists.txt |
142 |
+ echo "add_subdirectory( showfoto )" >> doc/CMakeLists.txt |
143 |
+ |
144 |
+ kde4-base_src_prepare |
145 |
+ |
146 |
+ if use handbook; then |
147 |
+ echo "add_subdirectory( doc )" >> CMakeLists.txt |
148 |
+ fi |
149 |
+} |
150 |
+ |
151 |
+src_configure() { |
152 |
+ local backend |
153 |
+ |
154 |
+ use semantic-desktop && backend="Nepomuk" || backend="None" |
155 |
+ # LQR = only allows to choose between bundled/external |
156 |
+ local mycmakeargs=( |
157 |
+ -DFORCED_UNBUNDLE=ON |
158 |
+ -DWITH_LQR=ON |
159 |
+ -DWITH_LENSFUN=ON |
160 |
+ -DGWENVIEW_SEMANTICINFO_BACKEND=${backend} |
161 |
+ $(cmake-utils_use_with addressbook KdepimLibs) |
162 |
+ -DWITH_MarbleWidget=ON |
163 |
+ $(cmake-utils_use_enable gphoto2 GPHOTO2) |
164 |
+ $(cmake-utils_use_with gphoto2) |
165 |
+ $(cmake-utils_use_with semantic-desktop Soprano) |
166 |
+ $(cmake-utils_use_enable themedesigner) |
167 |
+ $(cmake-utils_use_enable thumbnails THUMBS_DB) |
168 |
+ $(cmake-utils_use_enable debug DEBUG_MESSAGES) |
169 |
+ ) |
170 |
+ |
171 |
+ kde4-base_src_configure |
172 |
+} |
173 |
+ |
174 |
+src_compile() { |
175 |
+ local mytargets="all" |
176 |
+ use doc && mytargets+=" doc" |
177 |
+ |
178 |
+ kde4-base_src_compile ${mytargets} |
179 |
+} |
180 |
+ |
181 |
+src_install() { |
182 |
+ kde4-base_src_install |
183 |
+ |
184 |
+ if use doc; then |
185 |
+ # install the api documentation |
186 |
+ insinto /usr/share/doc/${PF}/html |
187 |
+ doins -r ${CMAKE_BUILD_DIR}/api/html/* |
188 |
+ fi |
189 |
+} |
190 |
+ |
191 |
+pkg_postinst() { |
192 |
+ kde4-base_pkg_postinst |
193 |
+ |
194 |
+ if use doc; then |
195 |
+ elog "The digikam api documentation has been installed at /usr/share/doc/${PF}/html" |
196 |
+ fi |
197 |
+} |
198 |
|
199 |
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml |
200 |
index cf0f6e0..65589fb 100644 |
201 |
--- a/media-gfx/digikam/metadata.xml |
202 |
+++ b/media-gfx/digikam/metadata.xml |
203 |
@@ -6,7 +6,6 @@ |
204 |
<use> |
205 |
<flag name="addressbook">Add support for kdepim</flag> |
206 |
<flag name="geolocation">Add support for marble</flag> |
207 |
- <flag name="lensfun">Enable support for lens-correnction library</flag> |
208 |
<flag name="themedesigner">Build the digikam theme designer</flag> |
209 |
<flag name="thumbnails">Enable thumbnails database support</flag> |
210 |
<flag name="video">Pull in mplayerthumbs to enable video thumbnails</flag> |