Update dependency on QCA plugins to use USE flags on app-crypt/qca:2 unconditionally, to provide a single sane path for dependency resolution. Bug #541066.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 25 insertions, 18 deletions

diff --git a/net-im/ktp-auth-handler/ChangeLog b/net-im/ktp-auth-handler/ChangeLog
index ef67c9db547e..905278ff55a9 100644
--- a/net-im/ktp-auth-handler/ChangeLog
+++ b/net-im/ktp-auth-handler/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/ktp-auth-handler
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-auth-handler/ChangeLog,v 1.33 2015/01/29 00:45:46 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-auth-handler/ChangeLog,v 1.34 2015/02/22 18:41:23 mgorny Exp $
+
+  22 Feb 2015; Michał Górny <mgorny@gentoo.org> ktp-auth-handler-0.9.0.ebuild:
+  Update dependency on QCA plugins to use USE flags on app-crypt/qca:2
+  unconditionally, to provide a single sane path for dependency resolution. Bug
+  #541066.
 
   29 Jan 2015; Johannes Huber <johu@gentoo.org> ktp-auth-handler-0.9.0.ebuild:
   Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1, bug
diff --git a/net-im/ktp-auth-handler/Manifest b/net-im/ktp-auth-handler/Manifest
index b7c23afea338..f668781cb45e 100644
--- a/net-im/ktp-auth-handler/Manifest
+++ b/net-im/ktp-auth-handler/Manifest
@@ -2,23 +2,25 @@
 Hash: SHA256
 
 DIST ktp-auth-handler-0.9.0.tar.bz2 49212 SHA256 6eb07a75200bd18154f42fbe1ff64a9fb0799b709899c3cb31474523b418478e SHA512 915790f317d82a34b2daaf81eae47af0d68e6602de57902801d7904f3b64165556554a12a076bb40037ccdc6e74c39328dfdaefd2e30dd1018952ec3e4fae675 WHIRLPOOL ed97c5c475650fd6f20e55afe2deae9266531aa024874294110266d990018a93f9be51ab2ea982f25474375ee63e8c20dd7fbcad8b3b04ebe3aac66d467c016d
-EBUILD ktp-auth-handler-0.9.0.ebuild 970 SHA256 1cd71a41c60ead15a4fed6628eef30220f9ec3324afa4c7a1b3a46d7734bdfb9 SHA512 4481740453c356e9adf2aab8059e98b9214fc2f9d0f449065a74c5969cc43cd15cdfa82db30765587ea3f5305c5de1a49b7a5fb987729a5666000107268af8c3 WHIRLPOOL 9c49a949270cf7a6baef07d2c223c2098988e0ae7aa4798a8a722f6e87e0beecf06593a77ad4fc7c8dfff58d4b5ad94ca8f35da551d307ba3c08c813e769a45d
-MISC ChangeLog 4947 SHA256 8465419894f445cc3f9f754878bb91f96b09de89e4c29b2003fabd0586775022 SHA512 cfe8351de894df9dd56a6c9399889a640db39cb16ad05b9a9be3aa31e7b09d44b20a46866fa61d5bef061c7364fb25733a7b8e3d9e8de0f7a5a3663d0a7dcac6 WHIRLPOOL 8e96b852f225825e9227fcfc73c15fcde8f53b403ad360c41e286fcb7547801f79a5d44e87adc9103382df621dd9ae35a6da64ecc0666987928f3c5ab40b926f
+EBUILD ktp-auth-handler-0.9.0.ebuild 944 SHA256 df226655bc3a00a22a2f8f10c5b6f05eea517285516731e0b0e50c875cda05de SHA512 5e7b7dd8bb45f415500c5cf0339170baed613f0a93cd941fde7ceb31ec7906bfdedddb36a5b2ea3ea543ea7ebe808b51de16b9061839bcfe9498720341d8f7c5 WHIRLPOOL 2d27686d6dd252bb2f3b3223cba23a960f6826c8c77dc5b0424881236a79109fcaa693a8ee5b3985d3937a45625f408cb19da80c4779798413675b619b75c19f
+MISC ChangeLog 5193 SHA256 f5eabedf1f47d1b15d9075a281d3c9694b61198a203d6f0d9dfb35653f903ee9 SHA512 bdf2f1b525408fcb8a70bd2aca460c07f72c6af1006a84d49c930321da1d5a4fa1f3b1cd2c840c032a2db256bf02e4d44ff8953a7aa4ea8dd0b79a30ed139a58 WHIRLPOOL bf3874c5eb39dab8c3da9e2134ea971d3fa6ccf43beb8d6d8811aa127af024ef6546d556eef977e8ec5bce0a974a6df7ea3efee101285b33783d9a16a00630ac
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUyYK7AAoJEGVpnaTzz9K9nWMP/2tuAFZ/UkZ23rju2MKS+Ihp
-AQaon1n+kPPYPaD0mBDv4FHsbLfcUtqW/TDOdjbcmdVrrv3LWIZ9Sx74yaSRcfdw
-RY7YeSspyMRKyuNP/JyuzujAhWxECOSbNEH8XLqjOZNNwXLMaV3lH+NxhOa/Pzgt
-nDuOykP65LdoHOoIntGCzfgyZOOIltFh3sLNcTDLdAh649EXIJ1hSDn3Xe2HpOWO
-F/9pQ4BS3s1HCVqo5VNFRckGZiaIRfSdzYn8b9v3UOcSte+m+TFfj3BJocD6EDik
-xoLzyRlI3tLHBV8w31my0JO+GfEx76kvjA7+sy44F/RGSyfCJ9KI0DSljg9Qr1gV
-o+eF2uAvxyFs0jOvQUEmfqYOjPG67doIXDsnLvxEKdOMVr8kpf+KTaGtNChBw+UJ
-yLfoxpVUSSQJ3X5zpVdos1d/N7Nh38LwGJuPPH1QzKQAWgtKJ/BOLjdchJNnJ01p
-pPNV8rTQ2CJV+TagFxa03S4vwOP9z/KchB1XBJiZAvC27cHPnmOJdF9ZiTKFs2Sc
-+gMerM6/RCOZIexHvUv5qP7/yiMsEt0ZlqUOvyHfuQmfw9HxwJfuBb2TK0DkrP77
-QAQNOhr3WqPk3m+kG4TAbiFPIQLLimZFFtEpLjdCcFDFOyDHdfT3PKHJdh7rz7p4
-o0H2NEyTGvMb6r57vigv
-=3R0B
+iQJ8BAEBCABmBQJU6iLiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOLRMP/A39f4tEsFAoPwh+DugH6bVo
+bEG13NSLOX2g/hinPgNFVJUjc/39ULegTh+O9GnVBqrhOAOW6AKbQUx4/8pWwT9q
+Fh1wz6jvohpwCF6xaqS16HV8A+QpfDdJ9K4fBqi/C30bqU/ru5kMDCllQX+pZVu7
+w5uM4BXePIBufcZtXsG45GUXRtjLv3ICauoC+DtrTT5uyZTeJxTpNeWYe+hOBdML
+QMvxPc9TO4sxlTCiCO6EzdtZ0E4wh4zOkCWWFKip70zMi9n0n3h+EKKPvn+rLkyO
+HO1Ssn3PwHCuKi0cdQESJjyUEs1JhYXUr79L7pgYXW20vPusOuk0WXSeFx1cS0Bc
+xOAJEwAyaEYeGdQCJHV4tyhFProfllop5B56k3RP2z4fhiIg6HqxQ9jYQ9oHoSfH
+K7ROxpQg9v/jk6IcQNlsgjti4U7NA7GsEv65ulrF3gLtVvS5/17WuB/wDKjO1RAZ
+4uOM//GpUQbYfpo6MxKPKPlnrz3nza74Nr2a3A7OqobNTpg2ceg+gd7oOLL4v5u6
+oM11dMPwHBqpyLX6tmVB+tPSL1s5EpD7+dkVYFtSLLls9F4+HknIsNNLr4DN6gbI
+fRvv1a2hxXKHJTbv7e6rFTqC6sVpBoDcq4H+NF0nyIDQgaTMABeiyn009h/QMyUt
+9c0mT2HofP1FVrq9oYeL
+=GwMj
 -----END PGP SIGNATURE-----
diff --git a/net-im/ktp-auth-handler/ktp-auth-handler-0.9.0.ebuild b/net-im/ktp-auth-handler/ktp-auth-handler-0.9.0.ebuild
index 8612ee28878e..2ca78b883054 100644
--- a/net-im/ktp-auth-handler/ktp-auth-handler-0.9.0.ebuild
+++ b/net-im/ktp-auth-handler/ktp-auth-handler-0.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-auth-handler/ktp-auth-handler-0.9.0.ebuild,v 1.2 2015/01/29 00:45:46 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-auth-handler/ktp-auth-handler-0.9.0.ebuild,v 1.3 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -29,5 +29,5 @@ DEPEND="
 	>=net-libs/telepathy-qt-0.9.5[qt4]
 "
 RDEPEND="${DEPEND}
-	|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
+	app-crypt/qca:2[openssl]
 "