Enable USE kdepim by default, bug #510384.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

4 files changed, 25 insertions, 21 deletions

diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog
index 127ac57ae6a9..47c754aec241 100644
--- a/app-office/calligra/ChangeLog
+++ b/app-office/calligra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/calligra
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.109 2014/05/13 18:46:53 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.110 2014/05/24 11:28:43 johu Exp $
+
+  24 May 2014; Johannes Huber <johu@gentoo.org> calligra-2.8.2.ebuild,
+  calligra-9999.ebuild:
+  Enable USE kdepim by default, bug #510384.
 
 *calligra-2.8.2 (13 May 2014)
 
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index e82c4786f806..b64147f34323 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -4,24 +4,24 @@ Hash: SHA256
 DIST calligra-2.7.5.tar.xz 119293708 SHA256 b1d1237606fd5113e13156192a4c4833b189825628fc40abeedc77109842cf5e SHA512 2438add98f173732b93ccd5ad1f237fa6982e220521b2c64056cfb5e14f16cd3859ff2e64926a657b51454154f255a46f3ad6aaebb67532a31ec98d366672dad WHIRLPOOL 3865f86333d878581bdbc9c1bb39c0bd626e11aa84e535b704f832eabfdf1ef054fd0f7b5324b109bfea9132a59c9b7d76bf20ab3b18921ed6a8a429a27ca99d
 DIST calligra-2.8.2.tar.xz 138487720 SHA256 37dc9a9416e6e74791eac057d894c648af52d2aff1df77f4737c373e474113e5 SHA512 0a7da5eeb3b1c23c9bee0fe75247cf6c07dc1ade49749d3491e8343142b8e059d2d4f3f083e526f3f4329a2c71dbe9c54a0bef956e06786cf983c21e851bdcff WHIRLPOOL 0a5885289d1f4f44ea53355699fa15127e1d3c41007ef60960b81d283de0d5ddf20d37dcbcd8fbeecdfb43c5e404f1dc322e0a768b57f3f94caced6f9dfb90b3
 EBUILD calligra-2.7.5.ebuild 6933 SHA256 9ad1d1406430744e4aaf8242f3e1ab5deaa6aaf7eb19cb898d704c360591a8d0 SHA512 83201efe07014a217e9ec1e0fb51afc218673ab1664d3835e2f4e891e1ce0dfa59f1fc5b6592fbafa17ffcb5e736614aa52e2553058be995bb2630e3a8110ca8 WHIRLPOOL 76edb1259c245cb527f420428f46eb199be455f75a6f5cdc198c13d19d6129b39c1f1595c2f545c2a63b337e39961cdef67074fcdbaf67a1057f74e7eac75ee9
-EBUILD calligra-2.8.2.ebuild 7216 SHA256 154ec8b47107a93c8d1ccb5c8e04d5b48062ba13381863f4db301be267828857 SHA512 b23b36c6753895a7cbb2e4983fe2aeb6999b3a41606c115e439bf1daede2fc85b2d5a354314e1bf4d4dcded89a964b26764e0959cc4f1c2b9b3d13a8586a8fd6 WHIRLPOOL 6a8ebea7f03cbb468aecd7461ab6a0a6b378d16e7e647707a64f014b6f308f07506984615b5293db6dad568ff9a5f969bb74e4f7e7212894c6590853b5b3939c
-EBUILD calligra-9999.ebuild 7216 SHA256 780e02c9b6eb28891d1dca532c539da3ae1d321b0afb4db3c4929aaa5b1e34e8 SHA512 954227132264be2b0f1e8f31442b2c673ebc6c484897fcae3424e5cc84ce670b6231afee05b76778dd3147866aaa1973376f0c03683c5be14dd3e3830e5c384f WHIRLPOOL b96c56dd84ba3a7d044863863e0d1d2c2c6fce80b24876b10995d27c883b29c1110e57ef7c030d05e9ba975e896450d14838cc2137dd4562ff99648cc3ec8a54
-MISC ChangeLog 18411 SHA256 ae17838b0122795c83e7d2b4d8abae07a4fe82f654b4c65681b5ac44f69f7db1 SHA512 7b9b72a47dbbf0ae9b0ad55873d9b7870d0c7c46093176c8ff2d20ed23f304f30fa569d694b930e5986641e8a78f40a2c3575301a9ad3ff577c97e2d982d00b5 WHIRLPOOL db42be85671e6bf3937b0b875084cd1efa2e5bfc8d4acbbf3103b601c3b31e120152fdf8b2cb158d0837af2a2967f2e3c7626cf5c20ba39d38a54474cdb7e483
+EBUILD calligra-2.8.2.ebuild 7217 SHA256 c62b74a4a2cdc5594eab1adcfeadcfe9597a8a017a01f4f06e7abf68ab02326b SHA512 da5bf4fc21ba5b568345d935a10fd63a2da1a08616ee9f13e0e45d77064b3143ac9e59d20c64ed1a3aac9e8a3c56b7ed50a401db5ef2e9dab40056c2b323ca98 WHIRLPOOL 3f15fd27719d00bbe1b905a1cf5ce96395426b6049a2b519887688f62f568a64509f2d7e93668a5b4e9029b28b14a4266f3bce46e92d9c6ead51f32c09e191df
+EBUILD calligra-9999.ebuild 7217 SHA256 ba0ae16f4eacb7d7471b77affc6e3de7b9ac5c402bfdfaa96c015599b0ed1552 SHA512 c6fee27aebc57624b8d495c9824f4e55976b86bb6ad9d00bd931a15c5c60653aec7cf4b14cae66da167d7440d3186daaae55941b8fa72d15b05c39e9fa9966fd WHIRLPOOL 7174951cc3f66e1a315719b1330f001cf5aa3a2e90ea94a32ba33d69001cd0523bae137b45c96d782edba068180c094b272b421beee6abedf3aa060258ac78a9
+MISC ChangeLog 18552 SHA256 6028d3c1284187cbbc6b5886a3fa0076a10c935cca6945b108fd00499d5c36c3 SHA512 7f09cab6a60a0222bb72c0d59fc432555ad4505d377c4548dcedf99da0d725389ea7db59273e9db6e332a402d54d23308a0781418968cee0af23c0c625fe3e37 WHIRLPOOL 96743117077821c5533b8916836fe6d6ee94fc4eb24f7d3db1ea7405781072cd2011a7cdbd40000fe91109791c58f8777839f1878a86aed7727046762712450d
 MISC metadata.xml 1799 SHA256 9d92157dacff9ec1cffdea45db09a659596a2968cad9e02917c8a2e51278b0b5 SHA512 f42d542c2598960d46f45937b0f76a9e560ed8057a72162d5ab7525b2765cc3127e2321d33b030c9bd0b50862b3a191a60b6382396b921da8baa31a951460242 WHIRLPOOL 4ae5c169f00b96edb2a463815a49c79cb18f29e9b0f94a99b1f8aa145d8ec56bf5b7f44fad867af437af85e1581a1c69bc950ff6a1cb4e212f6aa71a7970cc87
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTcmieAAoJEGVpnaTzz9K9494P/2UFT54xz3odvzX1ExFLRaA4
-gB9k18Y+0cbDpPSg+QU1cUjYtjYximKmnSIlapuMJ/4/SSqRsC6L3VLJ+p8JJp6d
-ZymLzITvBpU5MrqnLE/EQZoCTPCLniBhup8ivGYHTMLo3T/y4fgoTOCbqyMxomHP
-mkVwopMETYp5OfDzkMN1ou+SqGyARRubsKvYTlmqnpxaG0JRh7WG6v/y1XW9HCr1
-XeeyVoP69KchyhPWxIJU6JYdjD+LENSUEdviqZBw9JWx0d75WP1pJchqgM2HytMC
-V+Vi/RvfQ5CrPjuTt4TjUuxmbS2kZ4Z5o+DJmeDlU/ttkPFFtaGzvmUFffUDWkQp
-huXUkaySy7TLw59wHlMTkYCcCLTkzWA/MVTI2IYtxT+O66SpOhHFpy6+PW91h/Qy
-75GVYrBULSXcfVZGPbPkDjEed/7v0eNyrj7Co4mJ23s3aiPyQt6nEmZhtws4yb26
-zwH8vEuRpcRe8QmgZWufK3xEia4CN9+9U7P1PYfEQyg4I+Hi/nTJYGqUTCy0i+Je
-hEscrsMVc0RGhyXIIDbK8wHNyXo5CXZH/oZSGZkyLnScUvEalQdE457a7fXpLGyS
-/raqI/mTKGZyDH7ZFeMauL0imwegpQcU8KPcaP854+JlCcMTymrTOtW+AdN5dnGP
-kOc7ScWJBZS4TjFVH39Z
-=SUtr
+iQIcBAEBCAAGBQJTgIJzAAoJEGVpnaTzz9K94YYQAIgU3/+rTlXA3PeLwO8VPdqP
+La6tPW/4RdsyRHA3l/yE/Gesasbsr7XOgYBRJzDPMGufamT5P3gIIMrXhovU4Hv+
+fLM9sZQ1JC1rLhtJNxPueqBBMqASCJg//h6qDdeUTNsU8lTcnmtfC6+ahaie3nWl
+T1cM/hUQKqCWOLJke6lU/EmiFpnjvZ0MHiIoQo3KGJstfNrHdpqqaxRc04gAwX8s
+mUNKj5WEF8PRFbzCfLFLJVySbAE2EdeuVWxA5qZswGfO5kW4sBhDtDk66tF4BiR5
+mrGDvgVSv4X7S0ENUJ4DhfUuAHWFmB7s1cLN64PjX/w6iRzHGhukZPfSwMH8WsVu
+IrZKX5rhefThxZX++HpfdhEE+ZRNMSKSMwrtc4Dljo1CbXqZVwXHrZ5KPaEEwx3U
+k6OWXYr7deN4/tfF+ytUsjaqYpdMq3lsIk9YpUeG0RYnuvkPzEV6S3bSaavd6J0r
+zA0yx6owRdM9c7ZMZt7GiIWZVpL65aAPLOtGNAn+o0OzM6a/142D1AArAXEyGi1T
+h7q9l/1n/uxPavoi8tPKTRxqA0eFX90GKfvz5sLLtSanZAbOVD+niOJCC8D/r0oc
+lX3vnVfZxdZ2EhkB1AWCpZ3khBNekiyGi2y/NTLiqTVnCKXfDwCeifDncRCI0wIL
+F63ducr0hXpc4qTedCi0
+=ynS8
 -----END PGP SIGNATURE-----
diff --git a/app-office/calligra/calligra-2.8.2.ebuild b/app-office/calligra/calligra-2.8.2.ebuild
index 521f04bde73a..fb6673f96499 100644
--- a/app-office/calligra/calligra-2.8.2.ebuild
+++ b/app-office/calligra/calligra-2.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.8.2.ebuild,v 1.1 2014/05/13 18:46:53 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.8.2.ebuild,v 1.2 2014/05/24 11:28:43 johu Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -41,7 +41,7 @@ SLOT="4"
 KEYWORDS="~amd64 ~arm ~x86"
 
 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif +glew +glib +gsf
-gsl import-filter +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql nepomuk
+gsl import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms marble mysql nepomuk
 +okular opengtl openexr +pdf postgres spacenav +ssl sybase test tiff +threads
 +truetype vc xbase +xml +xslt"
 
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 7962ae97d9b6..185472c807fc 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.45 2014/05/13 18:46:53 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.46 2014/05/24 11:28:43 johu Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -41,7 +41,7 @@ SLOT="4"
 KEYWORDS="~amd64 ~arm ~x86"
 
 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif +glew +glib +gsf
-gsl import-filter +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql nepomuk
+gsl import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms marble mysql nepomuk
 +okular opengtl openexr +pdf postgres spacenav +ssl sybase test tiff +threads
 +truetype vc xbase +xml +xslt"