Stable for x86, wrt bug #429842

Package-Manager: portage-2.2.0_alpha122/cvs/Linux x86_64

3 files changed, 15 insertions, 18 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 4843bfdd4391..a000ee4c8362 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.227 2012/08/11 15:08:37 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.228 2012/08/25 07:37:14 johu Exp $
+
+  25 Aug 2012; Johannes Huber <johu@gentoo.org> digikam-2.6.0.ebuild:
+  Stable for x86, wrt bug #429842
 
 *digikam-2.8.0 (11 Aug 2012)
 
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 4fbd48400291..44cd57292bb0 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -8,25 +8,19 @@ DIST digikam-2.6.0.tar.bz2 55362029 SHA256 411ceaa3a489d9c9a5566d43c167927a07fb0
 DIST digikam-2.7.0.tar.bz2 55696444 SHA256 2782b0f047cd0ae58af04095e2d03ea4a9d621fbef9d385f1465851fb62f5bab SHA512 34d33ef8b7dd0664f92bbb5f67720397f537ac46da7ad1b6c4ae854691925fe9004b27820e4ded0c6a45126429a452fdfe7f4114e381d975afbbee6d514536a9 WHIRLPOOL e8171b7b18d841382aa66588937308e3fe31cf7eb8f03ab79a89deabf92082e025532a416e112fd5d51113f2a656405a78631aace022eb8b17040044986eb68d
 DIST digikam-2.8.0.tar.bz2 56897743 SHA256 93f1f577cbf5a0f3ca56244b76e4eecc0c445fe4cede51b301aa63db1c0508bc SHA512 256a4ab52c650da0eb01b87ad4b29b7409017a4686bdabac9598569e2b94986ab62c162e135491ded8fd056844a8052d452e28cb410b96ae54bc9659a2bcf25a WHIRLPOOL daa6a16ae786a99dd169d400d6d0cab806999660bc379a78cec7e87904a281dae14097b5ed40ada7aa4f57720e8099b2765da922710c98ba4dbf6e6021d3f6d6
 EBUILD digikam-2.5.0.ebuild 4237 SHA256 c08b18a453bc3999ac93a5732957184e85d801f5ec42371afb927ff7b4da3b28 SHA512 5addd427cf4d603da24fe8d98e7ce4381858eaf0f1c7d4a9276730229e068e26782f8095519f0e223eb7e28db9cfa60777c5ca6cbb5552f830bf5c54095702b2 WHIRLPOOL 0f7ed1ead6b232e0ed4201d741d6050564acc105d18034ef9ddea2d7bd9bf8472aefc113c0d2ef813723a6021247a9b2a8ab3c04edc4b01d82715c836bd82a16
-EBUILD digikam-2.6.0.ebuild 4127 SHA256 b9b25a9c2c183e752b824089b258eeab8731f64423edec570eba4065b3a62835 SHA512 989dc2cd51b57cf7f4bea615028610593bc218f3d09bd22d5661491525d75b9df535af6dcddddf6b9229a1bdf1b9b894d39387f00ba5c6668f5657b8fd950499 WHIRLPOOL 38b722d17fdec7a7b285193c6c54feee829509fa6827bb7f1e5d476687808a0e3b7e81ce61068cfd4b1be75c1bd82df7b400f4d9d1940ce447f8c2dc1b7b6677
+EBUILD digikam-2.6.0.ebuild 4127 SHA256 30ee889b3a0c437dec5ad9df1075ba93453b9e3defa44fbb7fa5a5be288b3c90 SHA512 214dda2662d67c029652b60baf3f0fff88058c0a8a9751db48f3f51670c29f4e0699f972b5fc136527b64766f5783e66bd7ccb37229060fa7ebb17f2e92d31d4 WHIRLPOOL 16d1a16750eb8183a309e3b21ceff3d8166ccf450116e80da56c74218deb422eb40b063e49dbb3e206b6cad06ac6bf2213fa47b8c6c0e29daf18919f546bb154
 EBUILD digikam-2.7.0.ebuild 4144 SHA256 57d3f43b5c2984b541fb96d21de28c00f45abdca6af353e2794bd4cdb309e185 SHA512 cc555180b1ead5d2d15984268ee7beed0e1b44b4d1e6395d1414dbbd791a2b5d98fa97cde9e44f564611304fc0a5d665ea32ec534e68c45c89cc688714f795b2 WHIRLPOOL 2475e15bc954da0cc194578c50fc31d87d5b61be7c1f2a7217f121a358c0ef31d2720bfcb60eb59b2855b2d50d339a8f00ad1832828f3c45639fdd3706958cf1
 EBUILD digikam-2.8.0.ebuild 4144 SHA256 a18ef33dbd6305dcbc2bfcdf220a78a489bb5689ac05b925d9305fe449569b06 SHA512 45b6cc56223f9d5c9af0fba3abdfddfa892381018a1e7e89925a88b04e14aa41015daa339f81c28e0bf44e489eaa2f11739c7fb9ca2f577d88de224cc2e9b1bc WHIRLPOOL 55cddb486fd7dd97ba7b88935829d5ecd2249330d70de898e451b362edc8786e6f9c1fd6f78f9e6f14b8ccf83004958b1a8541697e1e4eaf9448941eff5dd878
-MISC ChangeLog 38022 SHA256 373ae7d1abad2bc08ea258e4ed6f844a64afcb927ca3dab80c206b92121c56d1 SHA512 b24b0765d80b6fba194544ad226da732ded256800cbe931398e3661cf5ad0c6628699e2682de069f73c3a641973d383caa7db4e004da8071cd47c9bd6d18f724 WHIRLPOOL e4fe4718937dd7dd0372565f025af138591494254951e55c725ee71561dc6449516ea3ebede34601c3dbf925e9839e1c1b29d38cf775fc8db5bec0eedbdd9638
+MISC ChangeLog 38122 SHA256 bdd1e0fa5deee0014774d376dc9a42685fa9afcc696d139acbd99775279a0aff SHA512 4d60642a9261e63dc3a00e9838ef65aea36f9c36fa734889e0e5eabb8a207cb3be356a8262affeb323cd32aebb821f6970852c188b6cd257a809a3ad3a83f631 WHIRLPOOL a16f1808a55781ad647dbe2418f7ec2affde1439456ac8322cd9195db8abfa39156439ac47eab0dd110b10b2b6e89d8c964e28e86d67ba94e9ff364c5b707304
 MISC metadata.xml 648 SHA256 fed8bb77a841bcbc558e06fbe5f729a616152051924fa17fed0e527237f09f8c SHA512 70b5b6c2f5d5ae242a3a3fe287802eaf722cd611ea0db1abe1c2daabf7a960c2f7ebc30e646db52f373efa9f9aa18481abc422bf9b080a8d6248551e0b8bd86d WHIRLPOOL 45976f32e90b1ba1e0b654017400b7e4860cbf5f6a1284fbfd81d05dd3df13654d7cea41a925c6bfc227c63566fc2af80299458c9c866b10628e12d38951803f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQJnXbAAoJEEb+UGWnxTyHTUsP+wdw2rwU1kVeq326Vl9lGO2T
-kRap6r7faq2V6ipbFwDexrx7GJKJQ91xwEp1RdBQjVWKYBa/0Ws8OaXaxx63W/GB
-AxXLJSJxKQoMh6/0Lh96ylRUNA1I1wqqCRBNP5YOh6jEJYZvogrJmlxeLAEmiD2n
-YF42RyuGjg2KA70u2rxpBdeYJ86qFU76daDBQxacOl/6Eoq0jx1CPqr37XyFipXn
-pb+d5eHaQIdJkAi9g6F/r444zoGXf5cuOESdq4bjKOK6gIm43Z+yW6GVMTMTOMMn
-Nk0r7AfmrOTA9YHYW7VvBKa+Iu5Xlq3QBaRpuBx4XY0tRp/TLHwUV1KF8nhGitk5
-kfmxh6ogFYZ31z7l2N7viwUCwmiANyjo5aAjRN1B81HTUOiiSiTEsFOwrly2ytwc
-grJ+H8zwmXRUHPfyTY41AXTNl+o16+Dwm5ddK6QP3XepUn5Ui76SLsaueMqmG3fa
-Y2lAcUE/KcqxJ2AAJYy0OiriXhLyWM41mYYw++xDrKMVDg6T01EDKVJQ+JxaxUpV
-qfQ8a1E3gs+qCCz3pUdNPGWzudn3La8yAw+JhpXsFkVGpJXudLLy3rTMHuD19VB2
-DtP9ngptJn/I0Imv8CXWi0Ufx6nnlBcpucrqxxe/RpnsgLM5TmjmO8vY4NH/vFMb
-UBsvG/zgFKwmsrSBAxsQ
-=K/Fn
+iQEcBAEBCAAGBQJQOICwAAoJEO+t9ga+3I3aqNcH/0pHeKMaJNFJXnpmJ6ilMkGp
+y+9oK8ZrC/vpRVmdk6a6EzxoPNRgHPbMofWhf18M5TyiqmGy1TYjP4w+BmPkrX4D
+ILi2qUqZ235/H9uEwCD5KTnotkgGofOxTSaxJxrRqgtO9xv2LzACTs+PhYdy9juG
+49hwWaXzAy4QPixkO8t72oOzoPEDLxutQZ+THAndhfvpowBiHgSHcYKTHJIPZFEA
+9vNw8k3IH0ssl1g3E7iD8kMIrTHRqF4H83UrMF9uWWksawj5emfnPLN1hA7n4gzH
+JBJbPl2m47sopBYqoIjDHvEByC546hOAyI15qcLkPmm347CrA/10x11CIVao7fo=
+=3ffA
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-2.6.0.ebuild b/media-gfx/digikam/digikam-2.6.0.ebuild
index da4486bb3341..97472ac1a207 100644
--- a/media-gfx/digikam/digikam-2.6.0.ebuild
+++ b/media-gfx/digikam/digikam-2.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.6.0.ebuild,v 1.6 2012/08/06 17:49:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.6.0.ebuild,v 1.7 2012/08/25 07:37:14 johu Exp $
 
 EAPI=4
 
@@ -25,7 +25,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2
 	handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="4"
 IUSE="addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video"