1 |
commit: 7a4a69f57229dcf8dd162a5a7a0ae77d310abae1 |
2 |
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de> |
3 |
AuthorDate: Wed Jul 27 22:00:06 2011 +0000 |
4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jul 27 22:00:06 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=7a4a69f5 |
7 |
|
8 |
Resync with main tree |
9 |
|
10 |
(Portage version: 2.1.10.7/git/Linux x86_64, signed Manifest commit with key B6C5F7DE) |
11 |
|
12 |
--- |
13 |
media-plugins/kipi-plugins/ChangeLog | 4 +++ |
14 |
media-plugins/kipi-plugins/Manifest | 24 ++++++++++++++++++- |
15 |
.../kipi-plugins/kipi-plugins-2.0.0_rc.ebuild | 24 ++++++++++---------- |
16 |
3 files changed, 38 insertions(+), 14 deletions(-) |
17 |
|
18 |
diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog |
19 |
index e5fb98f..a0fe707 100644 |
20 |
--- a/media-plugins/kipi-plugins/ChangeLog |
21 |
+++ b/media-plugins/kipi-plugins/ChangeLog |
22 |
@@ -2,6 +2,10 @@ |
23 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
24 |
# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.72 2010/09/18 14:20:09 dilfridge Exp $ |
25 |
|
26 |
+ 27 Jul 2011; Andreas K. Huettel <dilfridge@g.o> |
27 |
+ kipi-plugins-2.0.0_rc.ebuild: |
28 |
+ Resync with main tree |
29 |
+ |
30 |
*kipi-plugins-2.0.0_rc (02 Jul 2011) |
31 |
|
32 |
02 Jul 2011; Andreas K. Huettel <dilfridge@g.o> |
33 |
|
34 |
diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plugins/Manifest |
35 |
index 8333061..b3bc7d2 100644 |
36 |
--- a/media-plugins/kipi-plugins/Manifest |
37 |
+++ b/media-plugins/kipi-plugins/Manifest |
38 |
@@ -1,3 +1,6 @@ |
39 |
+-----BEGIN PGP SIGNED MESSAGE----- |
40 |
+Hash: SHA512 |
41 |
+ |
42 |
AUX kipi-plugins-1.2.0-expoblending.patch 698 RMD160 08d991df50ec649387c1186f5661f53810a6ca65 SHA1 a24867095ad275308d2ab02bc415bc1d9de02a92 SHA256 4070a17dc3e61806a69e99342d11cb2ba9f24e9adc57f0febaef2486ec9f6894 |
43 |
AUX kipi-plugins-1.3.0-expoblending.patch 501 RMD160 ebcde1b3ead4d16166a585bf000a1e90a865dad1 SHA1 1db5476f9c3eb669a5cd546822a82d236d7eac81 SHA256 f9504f51e9f20d9f62c477cd5679db5bf76abafe4ffde71e19f7aa995f7ea752 |
44 |
AUX kipi-plugins-1.7.0-expoblending.patch 570 RMD160 c08b628dceb39b4a2dbe15fd376256785dd8cacf SHA1 763aec7f286f4cd208aa38f5665c62986bcfaddb SHA256 31788bac46a0af39e2b8475bdd84e07710af5d6655efbdaa6939795eb8b7d7f0 |
45 |
@@ -17,6 +20,23 @@ EBUILD kipi-plugins-1.9.0.ebuild 2697 RMD160 b42df2225066d816b710a7e76ef615c57dd |
46 |
EBUILD kipi-plugins-2.0.0_beta4.ebuild 2550 RMD160 eeae2647a54f2f62bc741bda9587c83ac7829ec7 SHA1 3b6c678e0d146383b08a8fb21ecae6b20bd3e66d SHA256 090345bff375f1f1807c18adb74912fc2896d7bc94e25fe3f6a0f44f50198405 |
47 |
EBUILD kipi-plugins-2.0.0_beta5.ebuild 2670 RMD160 64e05f20d4178087400efe39372da63ca5e140e1 SHA1 ee1e3d0b6c555770ae66383c877e4d7f8b66818e SHA256 bb3d871f3cbaf4839790c23eb9e83ea51c9176609f56e173668dac3244ac3881 |
48 |
EBUILD kipi-plugins-2.0.0_beta6.ebuild 2551 RMD160 109052ff96eb3b507fafa5ee439ccd5c29ffe3fe SHA1 33f5540a1a9a03e59170af5b5c264551a7db59cb SHA256 75da98c4346acdcb0c4c141e24ccbdbea92828130bd05d30e40bdf2cf46f88bc |
49 |
-EBUILD kipi-plugins-2.0.0_rc.ebuild 2533 RMD160 c34858066d8fd6e4709f073a47c7382336a9bc6e SHA1 5e0ff405046f326ee674807540ebcbeb563ed976 SHA256 2ef46a4e213c8aeb30b2f94338aea9f092b68c3b45c92527b6b22a2fb51984bc |
50 |
-MISC ChangeLog 16882 RMD160 2f04926427a827c9c8415ac160984ffa4916908e SHA1 92fba671007e2a148ec04c06b8782ed3f3f247a0 SHA256 35f9f1433157528e968966f151f4b9d5545bd5a54cdcfb67e99485561ae71464 |
51 |
+EBUILD kipi-plugins-2.0.0_rc.ebuild 2577 RMD160 15f531fc4a8c83e4991171ec068f7f38935c05fb SHA1 4fc190b713c5bc8c0f6215a199a2f05aff399910 SHA256 9d4f82f32d972b931f1e6a9566c9a4c65d165c98250c54b558b42bcf710e3da9 |
52 |
+MISC ChangeLog 16996 RMD160 04ee5d5bcca08d44b0cf4165a89e94a878dc66b2 SHA1 ef196ef0250c61ea5c27eb1deab3d0b703907169 SHA256 b6b14c0eb62d04c691a5c513a11be7c310c3a8762c8beadaf528403e14ae7c67 |
53 |
MISC metadata.xml 442 RMD160 3ebeb3175e61f59febadca1633f0f7dbb60dc011 SHA1 cc18d6adaa318b095bdd00b3c37e59fb7f621055 SHA256 41b0a7ff3057182bd5d434dbe6643a95714f54c75ffc0a33625725fa0a8bd57b |
54 |
+-----BEGIN PGP SIGNATURE----- |
55 |
+Version: GnuPG v2.0.17 (GNU/Linux) |
56 |
+ |
57 |
+iQIcBAEBCgAGBQJOMIpmAAoJENwGBM22xffeKgcP+gPVeUoyvrdQvwDZRC1D+V0R |
58 |
+ny07/fuXgbt1oVbKkwlNsIHEXp9Vva/xavxJxec9FQ8BCmqhcoOlmAvTkJ9w3ay7 |
59 |
+aySnUzZH9itN6W5kwHNAeAhquaGUODR2BRaTCLtWTqkKEJun1VlhjgyJFHcH5WWv |
60 |
+lcj0a+AscHszhR2kfl5N4qm8ti1vsUnR/41blKkpkrot96EdPtz5UCtip4HX2Bvw |
61 |
+FdIo+syWA7Zh5d4czFczGSXeRnwmf7B5HPm69iSgu3T3d740bInHB7id5dKb8I5W |
62 |
+LXMBSGijTDOIox58+zN8ygGWF+9q0A78yJsTYwf64pNg1IX0DZoYcQZLtruWhgv2 |
63 |
+xjeUfmHuj6btxqeN0qOAuEgBSQUD1kJYrLlaXFUVMDIq5UopAw5G2LgyoXDM71gW |
64 |
+An8ZAVxjZKy/9lAlteE2YnOZRPb6++7fWCmprsGAP/+01BqQCeXyt7TSkad3GetS |
65 |
+KXdNIFxlysEUziQJFpCxIoA1qb4USvvNhHGAsWbOKNGEYkbA4oUCEBiuU+JzA5OY |
66 |
+G4rSykMPwfgoi4X+/nESe9lD+r4Zp1RMm0HhJTQsj4cit+gEUFk79Mvm9/blhfj7 |
67 |
+DXT5gmmZ52hlzAINiklq/Mpzbp8Utj+/y0CTfFoIVoxWAEEpqYyTLHfxJMzN/m3J |
68 |
+jsYEqiM5x9HeXAIy5aSl |
69 |
+=BhPJ |
70 |
+-----END PGP SIGNATURE----- |
71 |
|
72 |
diff --git a/media-plugins/kipi-plugins/kipi-plugins-2.0.0_rc.ebuild b/media-plugins/kipi-plugins/kipi-plugins-2.0.0_rc.ebuild |
73 |
index 0b17744..c9f4a6f 100644 |
74 |
--- a/media-plugins/kipi-plugins/kipi-plugins-2.0.0_rc.ebuild |
75 |
+++ b/media-plugins/kipi-plugins/kipi-plugins-2.0.0_rc.ebuild |
76 |
@@ -1,17 +1,17 @@ |
77 |
# Copyright 1999-2011 Gentoo Foundation |
78 |
# Distributed under the terms of the GNU General Public License v2 |
79 |
-# $Header: $ |
80 |
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-2.0.0_rc.ebuild,v 1.1 2011/07/27 21:04:25 dilfridge Exp $ |
81 |
|
82 |
EAPI=4 |
83 |
|
84 |
OPENGL_REQUIRED="optional" |
85 |
# KDE_LINGUAS="ar ast be bg ca ca@valencia cs da de el en_GB eo es et eu fi fr ga gl he hi hne hr hu is it ja km ko |
86 |
# lt lv mai ms nb nds nl nn oc pa pl pt pt_BR ro ru se sk sv th tr uk zh_CN zh_TW" |
87 |
+# the release candidate has no internationalization |
88 |
|
89 |
-inherit flag-o-matic kde4-base |
90 |
+KDE_MINIMAL="4.7" |
91 |
|
92 |
-KDEGRAPHICS_MINIMAL="4.6.31" |
93 |
-# please leave the weird number here for the moment |
94 |
+inherit flag-o-matic kde4-base |
95 |
|
96 |
MY_P="digikam-${PV/_/-}" |
97 |
|
98 |
@@ -26,18 +26,18 @@ SLOT="4" |
99 |
IUSE="cdr calendar crypt debug expoblending handbook +imagemagick ipod mjpeg redeyes scanner" |
100 |
|
101 |
DEPEND=" |
102 |
- >=dev-libs/expat-2.0.1 |
103 |
- >=dev-libs/libxml2-2.7 |
104 |
- >=dev-libs/libxslt-1.1 |
105 |
+ $(add_kdebase_dep libkipi) |
106 |
+ $(add_kdebase_dep libkdcraw) |
107 |
+ $(add_kdebase_dep libkexiv2) |
108 |
+ dev-libs/expat |
109 |
+ dev-libs/libxml2 |
110 |
+ dev-libs/libxslt |
111 |
dev-libs/qjson |
112 |
- >=kde-base/libkdcraw-${KDEGRAPHICS_MINIMAL} |
113 |
- >=kde-base/libkexiv2-${KDEGRAPHICS_MINIMAL} |
114 |
>=media-libs/libkmap-${PV} |
115 |
>=media-libs/libmediawiki-${PV} |
116 |
- $(add_kdebase_dep libkipi) |
117 |
- virtual/jpeg |
118 |
media-libs/libpng |
119 |
media-libs/tiff |
120 |
+ virtual/jpeg |
121 |
calendar? ( $(add_kdebase_dep kdepimlibs) ) |
122 |
crypt? ( app-crypt/qca:2 ) |
123 |
ipod? ( |
124 |
@@ -46,7 +46,7 @@ DEPEND=" |
125 |
) |
126 |
redeyes? ( media-libs/opencv ) |
127 |
scanner? ( |
128 |
- >=kde-base/libksane-${KDEGRAPHICS_MINIMAL} |
129 |
+ $(add_kdebase_dep libksane) |
130 |
media-gfx/sane-backends |
131 |
) |
132 |
" |