Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Andreas K. Huettel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
Date: Tue, 01 Mar 2011 20:22:53
Message-Id: 22d7c660a8ee760c4fce856ae55c0a2fcf9e71a9.dilfridge@gentoo
1 commit: 22d7c660a8ee760c4fce856ae55c0a2fcf9e71a9
2 Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
3 AuthorDate: Tue Mar 1 07:24:16 2011 +0000
4 Commit: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 1 07:24:16 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=22d7c660
7
8 [media-gfx/digikam] Resync with main tree
9
10 (Portage version: 2.1.9.41/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key B6C5F7DE)
11
12 ---
13 media-gfx/digikam/ChangeLog | 5 +++
14 media-gfx/digikam/Manifest | 35 +++++++++++----------
15 media-gfx/digikam/digikam-1.2.0-r4.ebuild | 5 ++-
16 media-gfx/digikam/digikam-1.8.0.ebuild | 6 ++--
17 media-gfx/digikam/digikam-1.9.0.ebuild | 4 +-
18 media-gfx/digikam/files/digikam-1.8.0-gcc46.patch | 15 +++++++++
19 6 files changed, 46 insertions(+), 24 deletions(-)
20
21 diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
22 index 5dfd6a9..2d9a7df 100644
23 --- a/media-gfx/digikam/ChangeLog
24 +++ b/media-gfx/digikam/ChangeLog
25 @@ -2,6 +2,11 @@
26 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
27 # $Header: $
28
29 + 01 Mar 2011; Andreas K. Huettel <dilfridge@g.o>
30 + digikam-1.2.0-r4.ebuild, digikam-1.8.0.ebuild,
31 + +files/digikam-1.8.0-gcc46.patch, digikam-1.9.0.ebuild:
32 + Resync with main tree
33 +
34 *digikam-2.0.0_beta3 (28 Feb 2011)
35
36 28 Feb 2011; Andreas K. Huettel <dilfridge@g.o>
37
38 diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
39 index 502bcaf..8a88a23 100644
40 --- a/media-gfx/digikam/Manifest
41 +++ b/media-gfx/digikam/Manifest
42 @@ -15,6 +15,7 @@ AUX digikam-1.4.0-docs.patch 1953 RMD160 c90ab96aea6e08bca963a22bee5f7868de22a70
43 AUX digikam-1.5.0-unbundle.patch 11772 RMD160 a593a67bd5d1ea02f695dc51f6240917e4f7ccdc SHA1 b989dc93f5949b1d313234d28b24b4e024d82861 SHA256 28320a7d1beb3ad8caf7fd011a93ab3f6835191183477c673c2f27662417d8ad
44 AUX digikam-1.6.0-docs.patch 1438 RMD160 d4507c7aabe6eceb700ae8e3b76ac90c500c3326 SHA1 b6f477d6e6ceaef8947071a12cf07e188789fc81 SHA256 21286862bb1dc5893cec0b16cf563b75edb6fe952f6aad7add6f4f59a575d2b8
45 AUX digikam-1.7.0-docs.patch 1457 RMD160 e41322e23bb47234047fbe78aaf9202996907055 SHA1 281f7ad8644aa3f6c284cef7db40f330c8cec5d7 SHA256 7c32e5193a2ce168d10cdb3ea0bfa3a06774220013e51f61e8ba02fe65958ac6
46 +AUX digikam-1.8.0-gcc46.patch 512 RMD160 950c4744a8d4bfe88f0f19233bfd5aefb87ccbba SHA1 e3682e8af28233609c12817ec13a120c95a169be SHA256 088709ad10f71266957d237fabba9ee6f1de0f43ba2c5f63badbeb974d140241
47 AUX digikam-1.8.0-tests.patch 914 RMD160 520675d0fb1080549a0c3f5c67fc51d36bb19b1d SHA1 1e80a74d91f593939a69a7f77870cbefbbb73235 SHA256 29a7e68abd804019b1ae533a62920e931d5057aaa10bf20cd81358cf8bfcee1c
48 AUX digikam-1.9.0-docs.patch 1466 RMD160 d12a4bd9e825d88863da954763641157a87f11bd SHA1 7496668276f5a54d6ffde0a71ff7dfc6252ff3e3 SHA256 f348ab1a931af78e1aa752676a9515a50183dc07c32a99cdfd59a32dd2ece2af
49 AUX digikam-2.0.0_beta1-docs.patch 1361 RMD160 3b98a59e9790a7bc12dc5ec4723860d2cc968c4b SHA1 63d6d8c23126a198b91a56528cdfd97559f1f398 SHA256 dc8bf8aa8c6f956a5afd60bc0bc526872ed7b7604a3e1b8acb1613c947a5c97c
50 @@ -24,27 +25,27 @@ DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d9
51 DIST digikam-2.0.0-beta2.tar.bz2 23685947 RMD160 0370c304af9dfcc380d97747f698ab449e0d0beb SHA1 dbc62eed97c54dbdfff97690d4eb218d361e0d25 SHA256 15f49e18fefdf7bcce8b31bb77b4fe31368f16d88c039842c58e7cbafa58fd49
52 DIST digikam-2.0.0-beta3.tar.bz2 24063835 RMD160 61871d8f1f28acd7f3b83f261a94715d97bf71ea SHA1 7688ef4eec77b55e36ecd8f55d92635c36f38349 SHA256 60c9f050b07a787e1512173b7b871dbf9babc730804f98829dae53229e16b97e
53 DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
54 -EBUILD digikam-1.2.0-r4.ebuild 3215 RMD160 8b65234982a07cbca031e762cca9ad9fca0af112 SHA1 ed204cc640716af1998afe46f6cb2c3395da31ba SHA256 bba559b09bdb15fa23ffc390e70c26cb111143cca6bfc280e5c5240f1052aac1
55 -EBUILD digikam-1.8.0.ebuild 3233 RMD160 9d246c104d4705c7be47a7496da68f663ca5012c SHA1 d5033cb9d1f909a3b0516e92bff9c5e596fad486 SHA256 cd3a989f75296645049899f45d9f6a5dc96695c44615561088b8e9d077b9e87d
56 -EBUILD digikam-1.9.0.ebuild 3240 RMD160 7070312f1310e0c79702c08f404c97192a826130 SHA1 b79572a1dc6a95f6735091fdd74a8cd204a4a430 SHA256 a39706489d6a16212de05a90563f5681e6634e5070f62bf6c740f167d8919aa7
57 +EBUILD digikam-1.2.0-r4.ebuild 3241 RMD160 97240d9bf66f91276583380abb44abcca32aef53 SHA1 541cb89174e630ede2a012f75576b1e66a7e5834 SHA256 7b99de04c49c27afc4047b49eb88558d34ab83cdddf272d3a282313f79e88c48
58 +EBUILD digikam-1.8.0.ebuild 3247 RMD160 86c84f6dea0b55764dad9cf4c6427b1b2fbc7742 SHA1 4ea44c2e1e30d7dfdb28bbeb8defbd740199fad9 SHA256 b93cb62a5f973e48ec99716183ee339dcd0c90791594a982b6d70bd216a425c4
59 +EBUILD digikam-1.9.0.ebuild 3245 RMD160 7595b6ce1967bafa99dd8ecf19257838aef23753 SHA1 6c144376c2ed7058111505fc265fcee15f6f5462 SHA256 a410fe8542a23f6f1a47b6fac8e4ec0980f84518da06c90f2c9532292818fd06
60 EBUILD digikam-2.0.0_beta2.ebuild 3334 RMD160 a0297ac43f4aff1d038d88236c2cfc0389fcdde4 SHA1 9c155bafa5736bfff2e150450771e26501ec82d0 SHA256 e2e1103efd5454be2ec03af814460e8578cc6a9bdd033612a15c79a9e68e665f
61 EBUILD digikam-2.0.0_beta3.ebuild 3334 RMD160 8611636f62192c2eaa4ce7a338e66bd50985315d SHA1 787a9098b3682828267ffef72a421c858b266c1f SHA256 9a29623a16ef1071a33473e9b951b391182ed95e032046ec43de51384514d9f5
62 -MISC ChangeLog 8969 RMD160 16a5788bc1e9bd154abb686410240a6b7dad687e SHA1 12f21833715fe8a1d259411f948e66c5c8f70900 SHA256 b9e162a75fae2ad09638307a4fe15c3927651b9bd94c718cefe44744ea4064b8
63 +MISC ChangeLog 9158 RMD160 d241792c1fdfcb85afbd04053c8cce8600acaa92 SHA1 8c8136a08fdb7c49ced677a164a8c135342ecf6c SHA256 9a117017b2d87825f2b8cb2d0a257f25ba1a58fddd6987b34f3c3ec3cc02ccc8
64 MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6
65 -----BEGIN PGP SIGNATURE-----
66 Version: GnuPG v2.0.17 (GNU/Linux)
67
68 -iQIcBAEBAgAGBQJNbCutAAoJENwGBM22xffeKhAP/AlKiIxuEDAKBAGz3kLZ7ydp
69 -M5JXvUU+4auGfNdLl5vq7eFUPopapweS6ltCOlU6H2e41gCaOUiEpHAzTBRGDWxd
70 -1bMdF0bxaHfPiUXQ2FfX72HgTj05shWqr/S+rBmFjs/o9x3no7G9K9QdFg+lFvrq
71 -F6Cf4kxWLLBbefziS6vW64EIJ/VzAmQISrlsLK8nyFe5/Z15WNKvCXQpNd4zm+xW
72 -h9kpJXkGwh1asRqQTjdTphQewWsKmBBBRbul1pCJf0gCjceejtWHa28bbBPMBKc4
73 -zv+fkgY900r14hjHNNSkiy8S9FZinIA89hhnM71G7qelljUhF0I9ELmeJ0n93M1i
74 -3w99208fpXoCqoCn3Amv7Mw9dIFjOizz6htFZ7jipAwXn3syfgI3qPYDfrPNkebE
75 -hrb1PKJT3nnpK8cTKFS3fgGiVTdtFeV4+kwifw2EGVHoBTFdu5CSt4qlnXUnOFcX
76 -WzUZTiAukfE2ezQ++pKFYPLbkkuxdy9Ov3GVtI6VVKwMGQWqprtM4ib4AR1NQmNm
77 -J+4Of6H741Ai1714CwQgOHQEOufs04ix2GvpHqNtgO+TDSRj0YJsxyBKOVG8euok
78 -O0mNuxDPLxF9DTkZFR9dWGx3H6brj7G1DIak0HLG1fmP3YYNvkpKOxOA7qGI3I9h
79 -M2Uv4U95E1mUhjNZG3mE
80 -=QiqD
81 +iQIcBAEBAgAGBQJNbJ8gAAoJENwGBM22xffeQUsP/jt+LOgxXqBzOcT5CGYOu43B
82 +lXdIGIEEwD5P8e0q2iQZ94v19HDGb4dVybc4DZ3pGQD3bn9JAeon/7NNKRBmepap
83 +1mZFcty+r75cuCbrR7bVmykQYDk0UKz+1r/npkJ4dzt8+LOxBBG8SfKRH16Wjx+w
84 +DW464d3No3iWsEunYxrIu9bODlLvgQhd7/oeEWZYgGTd3Py2Cc3GzYUZiAgpgZOr
85 +sMn+G061YKiOydpSWvIz4HeNLXVE+QD6K9kzdC1PpU1/JQWzNsH9HH2z9rnWfo7B
86 +TyvFxq6ngyBYGJr4lu+dpgPz6tr/5SK7DUVIoK2cI4VWynfLMg3D27WkEyotJQJ1
87 +A8ZQ1/oLTq7BBoJQpxNGla1cr4EmC9MyY5MCValBAsiLB85S8saxz2mDu+DAJ/yg
88 +TR2s7DpeDVJzWB6op+EbDhurJW/zn1XeNXyNQDLcIAeHDc1TePNhGOgr/F2DnY+J
89 +kAsZS+Z8Tq2M7tgjksptscc0UfHpLx2Yijqs7mJOVVMSOHjYFiqqSz7SZEllhsl4
90 +lShlYEaNtF1c9eeNunCzO5wA2eD5eyY6IEkGLlto/UjA7or4g8OAZ56CB/sEh/kd
91 +GwTl7KlWxvwJAUAzt8tMU31v1ph7NzoFR4MtS6SqOB0AJteX7ZSsA5lLl+pptWV9
92 +zGcP8XMME2vdW7Zvx2YJ
93 +=0rel
94 -----END PGP SIGNATURE-----
95
96 diff --git a/media-gfx/digikam/digikam-1.2.0-r4.ebuild b/media-gfx/digikam/digikam-1.2.0-r4.ebuild
97 index f38aa63..29b34e7 100644
98 --- a/media-gfx/digikam/digikam-1.2.0-r4.ebuild
99 +++ b/media-gfx/digikam/digikam-1.2.0-r4.ebuild
100 @@ -1,6 +1,6 @@
101 # Copyright 1999-2011 Gentoo Foundation
102 # Distributed under the terms of the GNU General Public License v2
103 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.2.0-r4.ebuild,v 1.2 2011/01/28 19:15:45 dilfridge Exp $
104 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.2.0-r4.ebuild,v 1.6 2011/02/27 11:55:04 dilfridge Exp $
105
106 EAPI=3
107
108 @@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
109
110 LICENSE="GPL-2
111 handbook? ( FDL-1.2 )"
112 -KEYWORDS="~amd64 ~x86"
113 +KEYWORDS="amd64 ~ppc x86"
114 SLOT="4"
115 IUSE="addressbook debug doc geolocation gphoto2 handbook lensfun semantic-desktop +thumbnails video"
116
117 @@ -43,6 +43,7 @@ CDEPEND="
118 geolocation? ( >=kde-base/marble-${KDE_MINIMAL} )
119 gphoto2? ( media-libs/libgphoto2 )
120 lensfun? ( media-libs/lensfun )
121 + <kde-base/kdelibs-4.6
122 "
123 RDEPEND="${CDEPEND}
124 >=kde-base/kreadconfig-${KDE_MINIMAL}
125
126 diff --git a/media-gfx/digikam/digikam-1.8.0.ebuild b/media-gfx/digikam/digikam-1.8.0.ebuild
127 index 84cb1d8..0f4eca1 100644
128 --- a/media-gfx/digikam/digikam-1.8.0.ebuild
129 +++ b/media-gfx/digikam/digikam-1.8.0.ebuild
130 @@ -1,6 +1,6 @@
131 # Copyright 1999-2011 Gentoo Foundation
132 # Distributed under the terms of the GNU General Public License v2
133 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.7.0.ebuild,v 1.2 2011/01/19 12:59:18 scarabeus Exp $
134 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.8.0.ebuild,v 1.4 2011/02/11 20:33:40 xarthisius Exp $
135
136 EAPI=3
137
138 @@ -21,7 +21,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
139
140 LICENSE="GPL-2
141 handbook? ( FDL-1.2 )"
142 -KEYWORDS="~amd64 ~x86"
143 +KEYWORDS="~amd64 ~ppc ~x86"
144 SLOT="4"
145 IUSE="addressbook debug doc geolocation gphoto2 handbook semantic-desktop themedesigner +thumbnails video"
146
147 @@ -65,7 +65,7 @@ DEPEND="${CDEPEND}
148 S="${WORKDIR}/${MY_P}"
149
150 PATCHES=( "${FILESDIR}/${PN}"-1.7.0-docs.patch
151 - "${FILESDIR}/${P}"-tests.patch )
152 + "${FILESDIR}/${P}"-{tests,gcc46}.patch )
153
154 src_prepare() {
155 if use handbook; then
156
157 diff --git a/media-gfx/digikam/digikam-1.9.0.ebuild b/media-gfx/digikam/digikam-1.9.0.ebuild
158 index 11e045c..61764c8 100644
159 --- a/media-gfx/digikam/digikam-1.9.0.ebuild
160 +++ b/media-gfx/digikam/digikam-1.9.0.ebuild
161 @@ -1,6 +1,6 @@
162 # Copyright 1999-2011 Gentoo Foundation
163 # Distributed under the terms of the GNU General Public License v2
164 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.7.0.ebuild,v 1.2 2011/01/19 12:59:18 scarabeus Exp $
165 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.9.0.ebuild,v 1.2 2011/03/01 07:19:59 dilfridge Exp $
166
167 EAPI=3
168
169 @@ -21,7 +21,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
170
171 LICENSE="GPL-2
172 handbook? ( FDL-1.2 )"
173 -KEYWORDS="~amd64 ~x86"
174 +KEYWORDS="~amd64 ~ppc ~x86"
175 SLOT="4"
176 IUSE="addressbook debug doc geolocation gphoto2 handbook semantic-desktop themedesigner +thumbnails video"
177
178
179 diff --git a/media-gfx/digikam/files/digikam-1.8.0-gcc46.patch b/media-gfx/digikam/files/digikam-1.8.0-gcc46.patch
180 new file mode 100644
181 index 0000000..d958102
182 --- /dev/null
183 +++ b/media-gfx/digikam/files/digikam-1.8.0-gcc46.patch
184 @@ -0,0 +1,15 @@
185 +--- trunk/extragear/graphics/digikam/libs/threads/dynamicthread.cpp 2011/02/06 10:48:24 1219102
186 ++++ trunk/extragear/graphics/digikam/libs/threads/dynamicthread.cpp 2011/02/06 11:02:50 1219103
187 +@@ -257,6 +257,12 @@
188 + kDebug() << "Transition to Running: Invalid Inactive state" << q;
189 + return false;
190 + }
191 ++ default:
192 ++ {
193 ++ kDebug() << "libs/threads/dynanamicthread.cpp : Should never reach here: assert?" << q;
194 ++ return false;
195 ++ }
196 ++
197 + }
198 + }
199 +
Report Message
Find on MARC Find on Google Groups