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/dev-libs/qoauth/ChangeLog b/dev-libs/qoauth/ChangeLog
index 9c5d208b0b31..8af706329480 100644
--- a/dev-libs/qoauth/ChangeLog
+++ b/dev-libs/qoauth/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/qoauth
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/qoauth/ChangeLog,v 1.22 2015/01/28 23:06:23 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qoauth/ChangeLog,v 1.23 2015/02/22 18:32:01 mgorny Exp $
+
+  22 Feb 2015; Michał Górny <mgorny@gentoo.org> qoauth-1.0.1.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.
 
   28 Jan 2015; Johannes Huber <johu@gentoo.org> qoauth-1.0.1.ebuild:
   Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1.
diff --git a/dev-libs/qoauth/Manifest b/dev-libs/qoauth/Manifest
index 627ba9be3948..e4a1db131183 100644
--- a/dev-libs/qoauth/Manifest
+++ b/dev-libs/qoauth/Manifest
@@ -3,23 +3,25 @@ Hash: SHA256
 
 AUX qoauth-1.0.1-disable-ft.patch 629 SHA256 8933ba98f972b8b19c5e6bccd685224800810434bfed22987d228137b65c22c0 SHA512 04d06d1989866e208510f9c726fb3a447df2020ba0c7ec169534b39075343c03e05f2dc854696c87cd007ce980dc747f0658d8e88d0ef96b77dc0c70dae923d7 WHIRLPOOL 51a83526605c3e77c3d125c33cd161b57aa46bbcc8704642706e89ac60f93fe7bf031f155ebde47841d90329c8ecce044a751240d92dd7474f1a7566ce79ddb2
 DIST qoauth-1.0.1-src.tar.bz2 42298 SHA256 b8579a77cecb07928e557c4a019db902a0f040b22f7926f147299e87ac5a54fd SHA512 86869c82e6efd490888f3bb16cba5bb014821e35507d3d396a84f5112a2d0bd7cb1251ba5dff82a8913eeae77a0feeebfdf4a7d1e9870023fb3c106d603c3dd8 WHIRLPOOL e990ad4fbaa7ce3c45eec6f3a49d9404139432e5941882cc73d85520868bdc592604c8b7058866648d27b2001b310848edd239f8c3f9fc4f0bc66c79fee7f8bd
-EBUILD qoauth-1.0.1.ebuild 1571 SHA256 13e2f3ebdcaeb2925dec1dc12449880760f953e1f0c54d934b547298ffd0dc40 SHA512 f483cf73246c0c0d32706830b31ce877480d4a5185eaea0a34736abff8ecc13869be3aeef62e61a840cf067bf0e3698b17725c456ed0ff40bb2237ef62dddc32 WHIRLPOOL 01384a0f6659f0382f10bea3b5cf3f4e82013656a6ca6a76c277f7f2b36fd83218d0d87f513256da462fbe6cbec4d0dc0c029a41d386a7dfd3a5270daac15a2e
-MISC ChangeLog 2942 SHA256 57471c88a47ebcf5f2b2b2867cd7fcc5e5e0bea12e066f087d27a987226aca7e SHA512 2bde9bea2ddc1dff06207ddd4a621172cd983fe4685685f6432e1ccf5a73319534253bbc989682a9e6e33e4ced089ad8dcf409b2e4cf817cd438c27348fe0e2e WHIRLPOOL e53e76a2760bf70d65233d95b5118b19983c19fca1bf8470a2c45d261af9ef3a26c3865c1f0b18e35fd4b81ecc1ec155f245b66e77df63fff510bc5cf3b9d1bf
+EBUILD qoauth-1.0.1.ebuild 1530 SHA256 7eb9794c633b05bf3fb5157d4c32e1ca004cf810c14455f6d6a2a06b1567fc9c SHA512 6b408861e30a78d05a3ea4a5b1f766632859944e8ff625aa9d70ffe11ebb432fba88fe1e5985a30a8eab50439bd206a33b6bd19eb22d5657f01d2670a2e25999 WHIRLPOOL eb06cce42e56d16f7bf9f2fb398d33248734c31fef252e0707b3240171aa053eb2b27387b62a0a9e5cabb90ebfc945fa9546378bcb907ebac694c1f5d29c5ca5
+MISC ChangeLog 3178 SHA256 49c15062dd1bbc402cb897ab90f1f598340af6696c6e8c063e732bf0a4a278d0 SHA512 7e60c0fa8733a24aa763f00d8141aaddf060a4384b8fb8d8758e6b09c9dcba1b0f11d91c63658df696779a7f0065539b067d9412054df44bd25f42780ec15153 WHIRLPOOL 75362aabe31b8fa0f12410c7f20081da08799accc5a2da88dc55e88b62a68d3834d31701cc42a166b75813f13e08591703e1d2a1113a38ec07585686653f88a5
 MISC metadata.xml 155 SHA256 94ed5876ef16dbc191744ff6b8939a0f428fcb8add316d898880e1c4c880b9e7 SHA512 f05c8982778167c3667c9246b9730ba49fec2967731ed2c615e31a7fddc220fcea8c0843caa70a14957c8c4910892c512b6f2e00a9724d65e6032e1289f4562a WHIRLPOOL 25ccd49f04da07c8525fe18b21229764bb4104938abefc6c953bf9caa533dd5c10ae7b3f80a1251182e6c1520c09383d9f1d0ac1dc74832a99299c9be27406c4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUyWtxAAoJEGVpnaTzz9K9yEgP+wbJbE79Ap/jU0WY1lROvB/o
-xmSTr41La7IT1b7C3pzpsNZPlUCa1jkLSgiEN7xEZULNCa6zH/36zJLDj7zoiimB
-9sa03gzxQWT40TXAMPcM5HHy4TqnVpnM63+dkmH+pquRGB3pqdxLlbQ/aI4q+72r
-5RM+vOIJBkuAjLGMx3rHrOWZnsaVn6LFYlFJvbqQMJHwd1wNGw97Up7kqb1a4a6i
-H1EdXloqWBprnZNgR1uNNrGNgl6Q/zDphqokkyOo6XCeKDCDLfNlVSB0Gjv5K0M/
-qKtDWnELGsdIeXEA+j32BD06ZfQv8dfZPu0q64syQtwgsjkCL32bOkJMuCDqBazT
-YOWYIaKD6V04Oj9N9ie3J/6YQbcvyTwj7zrPTbjc3AGNokmXwOLHV8XawuTTeIVx
-wIYxqf2TCu9tEG0InrMV/CTEqcLCcJlyM8pISjFjjF5eHN+pKk0aq+5lsXRsD7gF
-tFya8tu3sevLCpxn9Y/S2pIEBI7t4Tl7jBM3nqjRwIyO5OROHocjmOYzJ8TuwWNM
-X08Gsb7hKOeJAUPUGV+P1Q1gqmteyUQt45rpEf/pajAu7ZLtb56Z6fQ279s5/x11
-s7GQAjXQ+G+71xRRo+olgWKUmK0DEdfijiRyiYVQZETDRNTncEU9BOUpyvrGCCJW
-GgA3V/70GdIsi6A5kDbw
-=DLnq
+iQJ8BAEBCABmBQJU6iCiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOq5sQAILpGlozILfKmSw7GYsghVAX
+XYaOPaOm4y71eDCqrDay2gDc7Z2ki/e5+N7cAQCbK3p5LWsmYZP7d+VcEhPOS2x7
+auB/Q5nY9sXV5p8MJyjnD3sMLPi7JbNp64L120UnDsmkp+X4Ak6oIM2fstRJpOCe
+d6r/H8bqgPCyLDJhsSC3zCCQ9uL/5GhOCnVH3E/u6LYXArdbWC2eGDS8Zw+8keMB
+0swxns7wSrrESZcV8/HVroJfSfKUPCMk0RPfeNNSBCa5006iW/HSo5tE3Terdy86
+yZK2DRpBbk0q54HzI3z8d+m531r1wWP6hgDfpJLrnDzRp1AGh3uhqVAsd1RGo3ss
+b74lm/cb4V+N5gNAxPuKnoLNGzkt6Pr7YdbuO5y+94fhEw1w1T84HmVNAlRwYkPc
+mBD7HxIXYEOCofTmvI+ES9Sz7LD/KKAVczmo+ELPOGy8BZzzxNhlGWOTELSPImFv
+nA+PaonsjHAptELWA6mXg1CxeJtG60jjVNzI/OLeRYeZQiJj8m/ZGOiG2FeIt6O4
+eXlVMJ+kVrv2Qy7eKmwf1dBZwU9upWptKzBeaKnlzEdXW2xV9sqJQ8KINWK1H/Mb
+QIaPqi8utUamMF+YqrDe61QRdECWZecpkCXFQlxZ22/XR5LUIIZ2j8PTYGqyVPy7
+OMgy2k3TWXGDOBcPoa+H
+=aGWn
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/qoauth/qoauth-1.0.1.ebuild b/dev-libs/qoauth/qoauth-1.0.1.ebuild
index 3f5a8c0fe664..97177def7ab7 100644
--- a/dev-libs/qoauth/qoauth-1.0.1.ebuild
+++ b/dev-libs/qoauth/qoauth-1.0.1.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/dev-libs/qoauth/qoauth-1.0.1.ebuild,v 1.13 2015/01/28 23:06:23 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qoauth/qoauth-1.0.1.ebuild,v 1.14 2015/02/22 18:32:01 mgorny Exp $
 
 EAPI=4
 
@@ -21,7 +21,7 @@ DEPEND="${COMMON_DEPEND}
 	test? ( dev-qt/qttest:4 )
 "
 RDEPEND="${COMMON_DEPEND}
-	|| ( app-crypt/qca-ossl:2[debug?] app-crypt/qca:2[debug?,openssl] )
+	app-crypt/qca:2[openssl]
 "
 
 S=${WORKDIR}/${P}-src