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, 24 insertions, 19 deletions

diff --git a/kde-base/kdeplasma-addons/ChangeLog b/kde-base/kdeplasma-addons/ChangeLog
index 7a1d7a9fb970..4e1c54ecfd74 100644
--- a/kde-base/kdeplasma-addons/ChangeLog
+++ b/kde-base/kdeplasma-addons/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdeplasma-addons
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.274 2015/02/18 16:26:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.275 2015/02/22 18:41:23 mgorny Exp $
+
+  22 Feb 2015; Michał Górny <mgorny@gentoo.org> kdeplasma-addons-4.14.3.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.
 
   18 Feb 2015; Michał Górny <mgorny@gentoo.org> -kdeplasma-addons-4.12.5.ebuild:
   Remove KDE SC 4.12
diff --git a/kde-base/kdeplasma-addons/Manifest b/kde-base/kdeplasma-addons/Manifest
index 00e7d5299057..b072d843a9cd 100644
--- a/kde-base/kdeplasma-addons/Manifest
+++ b/kde-base/kdeplasma-addons/Manifest
@@ -2,25 +2,25 @@
 Hash: SHA256
 
 DIST kdeplasma-addons-4.14.3.tar.xz 1791328 SHA256 12d58e30362729473db208c0650676dac0fdae8b3f223ce92e8df41e3e928f24 SHA512 e4382aa1aab27ddcdecdd53ca0d931b9d53d27dfe4b53736642e1e030ac940ee6909029d7ddb865ee13567facb4e380d3c23601b9ea985151fccba8860077925 WHIRLPOOL 13b3a9f6706bbdda6ab4010aedbb1da4f677de771e3bd5f7c6dc2074db413860ea26bbeae919b7927e31116f535f51ef67ada1d2aa3b368ca4df23f4146a4165
-EBUILD kdeplasma-addons-4.14.3.ebuild 1826 SHA256 ae356e84137b571dcd67d83d4d383285c79848795a7b54d2dd4749102b430a14 SHA512 19ee163d368762a484c967c6232050d5ad34b0555d84a2b6f75d95003c26cf29a5401794564aa4cd5ff656af865051a1cfb9c88a021fa3e32847eb9cfc6c3b89 WHIRLPOOL c252c2f8abc87f5524ebf6fd5fe863a9aa3e888e5eb4e64bb81c53964231e71e4291078043325d324d843d087d5bdc5521d836a09cb1915a5b4cfb8b9d66dac0
-MISC ChangeLog 37960 SHA256 c4e3e82bc290246c38af644eda7c9c52f9bce10b92df2b78ede5624833aa275b SHA512 646ef1ef6c274a11faab3676882648a0b5eb25cc05404f79e7b56bdaae52b6b522396a97563eed8590d39a5607decf134c91a8948254fedd9e5b03b388d0b560 WHIRLPOOL 4e6419d77a8cf584e730c57b91a6b9fbb0f32dfbfa4cd26d5474caad7f3b58735ab14d498351343f4a100d611138dbc18379b16a4f98dda298f635f7135fe935
+EBUILD kdeplasma-addons-4.14.3.ebuild 1801 SHA256 d3b75dd6818302a0cbf8c85c619f876cdd721aa3f165bf212f22d9dbf043a49d SHA512 41bedb160a18a08edcb780433c2ade7a8b90f9fca03a62dc1919fbc362457c1eeabe570ebe490dbfcfb73fa98c65f16e5b4cb602da19df0b06b1c161743f236a WHIRLPOOL ba6ebd972a92568e3787187757198e163ef4d9da6096747e86c877b602546e75baa43377752a41528a533178cfa58b95682376d8db72e8cf1ef7ba87a5dfe77a
+MISC ChangeLog 38205 SHA256 ffd3d8a3699013607f96c4c23d31555f73fad8f458292aee38b8beecdda4fad4 SHA512 4a49c93cb06d60bbc00aa174fd119c44a95d7e1c240d0138a6b8cf494118670797fe971b84a4f25c03d606532255a236b65c97c9c69f7e80bdbcb22b83989bab WHIRLPOOL 3d300dccf2da95c15f33de4070d4c7670e20b43a1b13180afdb735e2f0c680cd6dcde4d98516bf5060792ea0cba9d167edf39fa2f0215b964f376acca7eab79b
 MISC metadata.xml 1085 SHA256 8aae2baceaced2ddd8220a4b45df6e7f064cac64e722eb64bbef0fd8c58a3b9d SHA512 b3411467a19bffaa0f8957e6ea7e8b6ab42173838e6df36818ef58668817d02a5206126bfda8e854b18ce6cf7dd88b359a8d961deeaac7f9396a3753e934aaff WHIRLPOOL 711eab4f22667e726919a7618de2bc7a48fa3eb2d26d6fc3f9da785898095f9a00fcf63118df2298a3a93d9b999d54373627a04f01111b0415183b34e892cc24
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJU5L1hXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJU6iLhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZObM8QALEXFDNmwB5DNbJbN/uM42Fq
-zHbMuANUPRvreCtC3Fs6ZOMblwyZHvl+WXLwCsIyR2bYWZua7QzNwqJp7JakhE18
-PZFMvp9r50p9UYEsdC8sIQIviR2ReZVEmsbmo2xUuElWZQO+JwpMlP5NzqqNkpPK
-TGgZFqrHTMojtUSjvfCtcLqs91nLc5AQ12AyA0m7PEGZ2JCD0G3nriHIKZkmagh4
-hMjexajpnBfhHlW2rmBUjsMwLoZqtZEIU9Ol5nUUQBP+JFKQaimam+jPzpYObaYZ
-aFLosHwQn1DNCz+fNip9D3yHkwyZ4nAtvbktVoPn9vaWbHRpYJi6uYUbFZjuTIjv
-Me4NMWloDz0IBVM861sSL7PC+qPdv9mAEFj5ddWBHLopUZvbc+4QSYVcE//qU+iz
-m8PJTSWXLuAiSzV9s6Dddt82B17+R45CioHGME2OE3wRndtbBQZWYlp3Y6r6lfF0
-u6dg9JaV03Wxd2HFb5LAeFDuE5JhLJDK9N680KEJPnbZ0HDAdRDeg0GsEpfmwZ1D
-amAK9GPZNF8FwTvtxWAu/LEPjANTUBFqfyfkwQ/qrVUrLPa/ha/5QviQwNu9/OEV
-gSMnf156naPO4oENUC9IrSjBpwAv5qtimQczsgKqyQ3UKRNx9MFE9kgKTLTCrmNI
-xD12hurKqxdV52Cez092
-=4erU
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOHuoP/jOytR1fuGsfDK2ojCpRUreD
+ihixE/ptqyFtpWkQ8Hmnn5++SpBoBFeW9xZ0Fd3WMD2IX+Hna+aslD9H1oELdNJJ
+QKe/wQWf7xtkXkvDyNn+XnoCGcZKssD6814/uISolz3xKUGM3EOMEJraa6EuD04D
+MrgzPbSwl7DgggzUVR6CK8lpYHFFgNdSxLkLdYzlHY5qBRY+wMFrUbPxVP7U3ON9
+8OlbvvSkWLwxAsPCkkXJWK219NWD9tgTBjDG1Hq3pAi+4x+r0pz+jfucRftRttgT
+htdhqiWQiCpGCH3PufW8VHofMTvJduVD9mYETbcs938W87XNQcv/iHkf8KAAalUk
+2UTRS712mKsKPJm4+605kVNbutdWaT9uykrVkdre5eZj0I2kJ2uQc9BnFAj9pJUz
+jhXz52i2jsQwPHtkLOn5llyl+k+/yxz2eQ9+6clVD8QZEVC+3PLaodZxANcjAlKr
+K6Kg/NJoHjL4oldZKkh07LHhEGPjsvkumWIe/BC4IbG3FZs7WQxyWceTd6yDuJfK
+fJGv5GQJE4WrFHWRBDxeu2mCdXU2rn+ADv9Uxip3mKkARzU6r/tWFbtzhAe0gWxe
+v1aY49ohXtXIOFHp+1WifPz7LsXQezCoOCRgrh+KT/lzdK27+Oxt4gmloTfjV9it
+r8OHqk3FdX2PqxNWRfHt
+=OrAM
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild
index ea23fd5b3f4c..512f3b203cdf 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.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/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild,v 1.6 2015/02/17 11:06:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild,v 1.7 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -38,7 +38,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-cpp/eigen:2
 "
 RDEPEND="${COMMON_DEPEND}
-	|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
+	app-crypt/qca:2[openssl]
 "
 
 src_configure() {