Adjust use dependencies to handle >=app-crypt/qca-2.1.

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

5 files changed, 33 insertions, 31 deletions

diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog
index f588c655ecd0..e07439c615b0 100644
--- a/media-plugins/kipi-plugins/ChangeLog
+++ b/media-plugins/kipi-plugins/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/kipi-plugins
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.173 2014/12/21 20:57:33 dilfridge Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.174 2015/01/29 00:01:15 johu Exp $
+
+  29 Jan 2015; Johannes Huber <johu@gentoo.org> kipi-plugins-3.5.0.ebuild,
+  kipi-plugins-4.4.0.ebuild, kipi-plugins-4.6.0.ebuild:
+  Adjust use dependencies to handle >=app-crypt/qca-2.1.
 
 *kipi-plugins-4.6.0 (21 Dec 2014)
 
diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plugins/Manifest
index 757c107a2669..026954d2cfb1 100644
--- a/media-plugins/kipi-plugins/Manifest
+++ b/media-plugins/kipi-plugins/Manifest
@@ -7,27 +7,25 @@ AUX kipi-plugins-4.6.0-options.patch 879 SHA256 ee42da1469c0aae8eb8ddfc9a80db44d
 DIST digikam-3.5.0.tar.bz2 65698806 SHA256 57bd2aa4fdde44333d1362b02b26ebf6c1a70675bf5cb40de5172df02857c42a SHA512 d9c4651398ab85490016324ee69d1303e57e6ac646ab48ac5860d2966b3f3f0b5b4112de1d793795aef322d3dc6e7c3aba33bd2b164a084e5b65d38944fb0d73 WHIRLPOOL e7e6527270f3daf6ca97c007253793ea6e02b637f86f3355d675bfc0d562a36d5a7311d2e1be0701bc4f6119037398bbc6f2e9deb4da04f01cc008ec52679aba
 DIST digikam-4.4.0.tar.bz2 68871203 SHA256 5c68a2d200f5b502706128ea64839319aad333fb79548f49ecc92594e280d4e9 SHA512 4992fad1e574fc44eac53f3ac8d4ab78ccbf8e04beb54a211a9afc20af1efb6f8bacedea07e403f490e7f70a74ed5ac02d4f9b939dfaf25f64a4a9bda0a7d94a WHIRLPOOL 7a05ab9926227232a1cf52bf68da45b849b982e840b171f702610acce85a1ce8e59967a02e845a0ef19c316daee835861573aca40dc7b28422cf7d6d56119e2c
 DIST digikam-4.6.0.tar.bz2 70266430 SHA256 b047a3172203e036c35f73dbb93cc7e71408c05bedaa8f7f1e0cc539a355a345 SHA512 557133712c88f987fdde4c9b3d97c09c7f744a7d5bc7056803a2bf828a7f8fbe0534f9a131b82175c1bf2a5a76fb4ea06c21a70f9925082239a9fce74efa4b92 WHIRLPOOL cc07964fe78e0fbbf6753344a74d51dee88caaa70ba3d68fbac7f766f8ee1996eb435bf56a2d51882c842b54d5a3429763e358b58b5ce6ccc1870fdd2438101e
-EBUILD kipi-plugins-3.5.0.ebuild 3715 SHA256 b04126392bc2eb60c0a83caec5ab7a4a3f98fd219e45153642dc60331133ac99 SHA512 cdf2dfa38a3b07be866c241418ca89137b301281549bc0ce97f208017d8aa485482384375132d06706f46fcde3270a2e6ba367a94b5e56aa2d529377f7b471a2 WHIRLPOOL d73780f26e17359a980c6fedac26a321e46593fd2d0fab9a96774616167b45028a18bb33634a90e760c3f5aa580da185849fe5a2fdde1f67291a06add5a054e8
-EBUILD kipi-plugins-4.4.0.ebuild 3776 SHA256 c1f0ed8c6625e31b615e64a3d27d3465362ab4c79aade1f0f7739950afc19866 SHA512 aabd2093253f6a193befed74f88e1188541328c899830f316541c7a1fc8f654c2480430bc05cd5d5145128bab74ed103c1d87624adc2eca202a15380f754d9ec WHIRLPOOL d34f7f3d1b829424ef5b6e08215ff75b9251c914237cb3d1b333f7e582ab2eef17cd4f365bb88c7308ec526e2eebcfd85256f6830957d6c9cb6df21d6ad82787
-EBUILD kipi-plugins-4.6.0.ebuild 3886 SHA256 afa65857a8269cb228d175b365934f374ad8c28b320722c1fd9b4b07e8397269 SHA512 f24f6f69bc38ecad878185d3aed6fc6dd6951213583e4d3cadaa71fe30d6adf6f830b065f1d4721622b672ae18ef8cdbe5f37b4f122eea4bf53ebabf9756818a WHIRLPOOL d20a45413b4e7d7e31153dc5de303e6504dd4244019f8efd319ef57af2de98dd8453b7d15f76aa09805fc27cb8bf3ea8c0cbdde2c0727c9df539c8e6b8f7d504
-MISC ChangeLog 28367 SHA256 a429946dbe9b5b5fd5adab8b616b76fcbdb195e0c37ec4d4d6a95caa11f0017b SHA512 68c37d105f469991eb1cb7d63e316cf9446fb6e1a5f408ebd8caabb881e4aa6a7edf72f2ce3f3d001c0c5edb91bb51cd0a6472e477133c45fd5e49a5a9049fc5 WHIRLPOOL 706287c3fa36e11d0a91d8bf6ff4d117dbde18025238fd8d212a51464f9648f744241c5ff8e5260967c70ebdba77b0ac0d98680a0aa66b7471e90774e3e6b88d
+EBUILD kipi-plugins-3.5.0.ebuild 3719 SHA256 75afdb1891c12bb92e8cb3e151310f7cc00e92cdaa059cf00261f32a9f206285 SHA512 d2565bf67c83447a82124dedb179369bcd6c7ae525fdd9d42d4a0250f74e271efade23ed2912b978b38611b24dd874336e7da678fc3f5f03a551138f85533a85 WHIRLPOOL 488b637abdec952d379df4098ad4221c47b911d8f8a20317dccf4351f9fbdcae1fc0379beef9cc94dfe62f73826be72dceeed35f823f8c168f91f571754c8f20
+EBUILD kipi-plugins-4.4.0.ebuild 3781 SHA256 d1cd517e1d08c4f7dd6182f04e424e204730d14eb126997c66354adb800dbcf9 SHA512 a1879d7a4838ae7019eb99c8311b7a5bb9e69870eda66e9643318b8fab407b3bfc6a76e6fb0856cb6b6baaf7823774915a43d9794b39e38de13c278192d895ea WHIRLPOOL b323613c331b48dd292036dd976fa037ee58d7cc873b5c44174c33712a5e361afd731668ec659dedd80cad035786ec9f69ae1e66cd10bae3151ebade55a16f5b
+EBUILD kipi-plugins-4.6.0.ebuild 3889 SHA256 9d57212f1694f4efed57d1021d781f8fa12163908728a0768a3807c377d615c6 SHA512 4edce23b455d9035045578c9ea1c2b9fba23b55f7696cd9f34fee84846547986b441209381f6f118fe17e660606466243e62841c5ff8d018dfca37852c462432 WHIRLPOOL 5b2c5cd5852f9c65556a2ff3bd015dfc553fd3819037201e52dc02a562268f505f5051aaaf4fd65e5e3e002d78ce14d2749a74c66e079f5b366f91ad9ab00d61
+MISC ChangeLog 28551 SHA256 5a4ec195bab1599b8725e2ad0b9a682cbf96ebe8ec87a5001088bafe2880cfc2 SHA512 7788981cb1938014d7f1c819cb1e8f13e2e310461fa317f31b510b3d6f213998b0c5d2e4f71a83a7458d2d0ad6e1587ce62478e988a43e22d5557b5b2c9be1b0 WHIRLPOOL 2ec7ddf4df9a6abc7722fea0da7cfe24a930fc32090f722db448acc3754efdfd258e730176b4248d763a5617e03c77faae5d6eaefb8a975b3e282beb882859f9
 MISC metadata.xml 1024 SHA256 f17bcdc8b53cd0535a88e8889018faeebc810b0e3508bdef4f0d1a27b97e86d0 SHA512 5f3007722c81efe4f6e224ea91e0e9dac1157205d039b76a68d1e0c978c2e20a79b91c9d1b565035c8fb1a444a25dc96db299538498defd05e52a1072c2af54c WHIRLPOOL 38a851de1c962df10b16242bfe22f98259e1ef0c9c73edebf4bddcfe94641d766114445da822f5d06c2925cbe68e89bff747c24d6c002be011e2c6c8c96cbfd6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUlzQ+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOc9yoQAJ7orPB3+MztVNtN+8byYzM+
-dT36kAyTYE4BC41lubqMRkJSFk18DhrP3hDj9Cr5OKDR6bKNcBd0DnGqUkMw9KQf
-5NkLvJOC23kHasrPwpWSzBOW0f7M6C4yE12b0uogcadZhr1I1u3307kRDSpy9VO0
-2ePCPXZiZjRVx8I+px+LkEgNkuUm2/HZ1ctLiwPAgN98j0pWuWDR28nxFy97h8c3
-HdZUe+SZuUg0MdXB6p33vUWh0+VC35ZYuSXE5aLVF93ccVPmy6eFuncxDMiwVDam
-P1Vv+6A1TJnL+cAExLIVGLZf47W8NxexuvJLFYf9KvSXLOW51yy8N7+cJAXv8XoN
-qO52JHf+EM3t6OyT+uZ/yAkiOCq1k+/UZvFyf6Nb8nITJ6TZmeBGkYTRvJH8mrM/
-YETK9zdiLgCvHJLMdIAPPkI3s79Z0g7+5i8X5nNMwOv50K6ho2XAQWVHsjMsYEh/
-8V5bMMo9aEgtWtyouHk95ypRkHqirm2Bw+ZIAB9HTSIFIB95KyUuef3ZFeRYWL0h
-7mAszdvCaLL9epKX955CqHH4cDt8fH4KXGA9B69U1IYlOYm5zursfuykuxLZGFav
-ffsEPuS2HmosvFm1HpHy8gWeQgZzaflpCfz7rzyfqjyt0Ao2N+0XoTGdHoCIxP+7
-wb9ZF12HXbGrewHs+G39
-=utfe
+iQIcBAEBCAAGBQJUyXhOAAoJEGVpnaTzz9K9E2EP/isqpampShdLhHJxq5+5UR/E
+lnHvNXNxsRfKoba2LNIjVeCRdvoEKrmLxeqtVPFu2LTAuxkxq8FA5ljw0xNLP5yk
+hs1VxeraaA/4EUH1xCEYwAwh7I55qCokLjvcfKMxHOfMllmXid7npYxgE55+ncAG
+Ss1VrEa9J50/SL7Rx+EmPj3GNdCEHmCLcDM7if9gtYYGlQSTYo1IITPR0Si+tkMd
+zpzOMI2Tiukic4YPtzRCiwNNV7ujosVlPU9CBOKpQRvTcgtRrVMeEmGFIaXGL2Pp
+TmDbmi4c6+3uQc9CHkVS6ldk/c8zHPXlgKWJSIgCKAiUUyXE0JrgWqtjDP3cB74T
+t26d1uRCt5Ampy2/hTbx1mG9uHG71IoqdgkeUO9GlmEs1F0qxytiaSQYQNqKLPHb
+IVJWVi5ADt6swp7dEFrpHxxKGFz/TkyNwj01wwR/BlsgN/3EpVkVeU+iXkc1uBbU
+BbiREmZwva+MVuI/KvGcSHtMjvzU5zaptx/VvHUAWrsUjA6QNnTzj5xGQrR8St1n
+93/+j/NzxCy+i539pPtG5kyaK/bBn0YVOGIZsu7T4gTHWGQR/a+ZrGFpgZ4g3kqy
+YUloOqLU/WYkLtKDxs2WM45AsSEua2b3hpWU03yokXUSAx3CCHSUis0WVE77OIKg
+/xTUvWHa5N0dnNHJkPRm
+=orwf
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/kipi-plugins/kipi-plugins-3.5.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-3.5.0.ebuild
index 50b8477fd53e..7bdefb745d21 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-3.5.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-3.5.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-3.5.0.ebuild,v 1.6 2014/09/15 23:30:42 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-3.5.0.ebuild,v 1.7 2015/01/29 00:01:15 johu Exp $
 
 EAPI=5
 
@@ -43,7 +43,7 @@ COMMONDEPEND="
 	media-libs/tiff
 	virtual/jpeg
 	calendar?	( $(add_kdebase_dep kdepimlibs) )
-	crypt?		( app-crypt/qca:2 )
+	crypt?		( app-crypt/qca:2[qt4(+)] )
 	ipod?		(
 			  media-libs/libgpod
 			  x11-libs/gtk+:2
diff --git a/media-plugins/kipi-plugins/kipi-plugins-4.4.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-4.4.0.ebuild
index aae56afce086..c2a33ab45019 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-4.4.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-4.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-4.4.0.ebuild,v 1.4 2014/12/12 15:50:27 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-4.4.0.ebuild,v 1.5 2015/01/29 00:01:15 johu Exp $
 
 EAPI=5
 
@@ -44,7 +44,7 @@ COMMONDEPEND="
 	media-libs/tiff
 	virtual/jpeg
 	calendar?	( $(add_kdebase_dep kdepimlibs) )
-	crypt?		( app-crypt/qca:2 )
+	crypt?		( app-crypt/qca:2[qt4(+)] )
 	ipod?		(
 			  media-libs/libgpod
 			  x11-libs/gtk+:2
diff --git a/media-plugins/kipi-plugins/kipi-plugins-4.6.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-4.6.0.ebuild
index d1f94eea865d..b6ecd8955325 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-4.6.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-4.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-4.6.0.ebuild,v 1.1 2014/12/21 20:57:33 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-4.6.0.ebuild,v 1.2 2015/01/29 00:01:15 johu Exp $
 
 #
 # TODO: complete packaging of qtsoap and qtkoauth, see dilfridge overlay for work in progress
@@ -48,7 +48,7 @@ COMMONDEPEND="
 	media-libs/tiff
 	virtual/jpeg
 	calendar?	( $(add_kdebase_dep kdepimlibs) )
-	crypt?		( app-crypt/qca:2 )
+	crypt?		( app-crypt/qca:2[qt4(+)] )
 	ipod?		(
 			  media-libs/libgpod
 			  x11-libs/gtk+:2