Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1.

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

3 files changed, 25 insertions, 22 deletions

diff --git a/dev-libs/qoauth/ChangeLog b/dev-libs/qoauth/ChangeLog
index a13c398b3bb9..9c5d208b0b31 100644
--- a/dev-libs/qoauth/ChangeLog
+++ b/dev-libs/qoauth/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/qoauth
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/qoauth/ChangeLog,v 1.21 2013/04/02 20:56:16 ago Exp $
+# 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 $
+
+  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.
 
   02 Apr 2013; Agostino Sarubbo <ago@gentoo.org> qoauth-1.0.1.ebuild:
   Stable for ppc64, wrt bug #462890
diff --git a/dev-libs/qoauth/Manifest b/dev-libs/qoauth/Manifest
index ef7d98e2fb6c..627ba9be3948 100644
--- a/dev-libs/qoauth/Manifest
+++ b/dev-libs/qoauth/Manifest
@@ -3,23 +3,23 @@ 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 1524 SHA256 32ce64618aebcedf24c1da133d2d0823fd8b5638d105fc4d5d294decb7de6a5d SHA512 d2be81126d60d33edc8ceb7f0afb0a5e2beda36b11060083bd0cafa982c9bfa18f23ac2f6bdee8cb557f676df21cfdece313e5f7d6357008435827125048c76b WHIRLPOOL 2e40f53f7c70cc6b83961a0b078368ca60230b499865f570c37afdc850c81cec919453b03f7771acbf8dbcf2956f95922673c13d48c51149731f3f99ee17db47
-MISC ChangeLog 2800 SHA256 d6670d45643fa190437b660a7e8a1b7ebb2e48b1c978892ba922047c177a1db0 SHA512 18637f310a81df01a9f4eaf8c63ad6c158156fd4f56c32ad5b6c25f5fc7341ccc121ac8582850f676a4e96e789d3da99a8d8e8d499ab910c90f4b7de34c9b611 WHIRLPOOL a82c83bb5e89ddb23cd91d8ce69ce066c62fe7b9b4d1cb7818a2a20119092283b150b25187e551c92c00296e6f0122b630cd74caf039c59715b1f7b4ea98fdf9
+EBUILD qoauth-1.0.1.ebuild 1571 SHA256 13e2f3ebdcaeb2925dec1dc12449880760f953e1f0c54d934b547298ffd0dc40 SHA512 f483cf73246c0c0d32706830b31ce877480d4a5185eaea0a34736abff8ecc13869be3aeef62e61a840cf067bf0e3698b17725c456ed0ff40bb2237ef62dddc32 WHIRLPOOL 01384a0f6659f0382f10bea3b5cf3f4e82013656a6ca6a76c277f7f2b36fd83218d0d87f513256da462fbe6cbec4d0dc0c029a41d386a7dfd3a5270daac15a2e
+MISC ChangeLog 2942 SHA256 57471c88a47ebcf5f2b2b2867cd7fcc5e5e0bea12e066f087d27a987226aca7e SHA512 2bde9bea2ddc1dff06207ddd4a621172cd983fe4685685f6432e1ccf5a73319534253bbc989682a9e6e33e4ced089ad8dcf409b2e4cf817cd438c27348fe0e2e WHIRLPOOL e53e76a2760bf70d65233d95b5118b19983c19fca1bf8470a2c45d261af9ef3a26c3865c1f0b18e35fd4b81ecc1ec155f245b66e77df63fff510bc5cf3b9d1bf
 MISC metadata.xml 155 SHA256 94ed5876ef16dbc191744ff6b8939a0f428fcb8add316d898880e1c4c880b9e7 SHA512 f05c8982778167c3667c9246b9730ba49fec2967731ed2c615e31a7fddc220fcea8c0843caa70a14957c8c4910892c512b6f2e00a9724d65e6032e1289f4562a WHIRLPOOL 25ccd49f04da07c8525fe18b21229764bb4104938abefc6c953bf9caa533dd5c10ae7b3f80a1251182e6c1520c09383d9f1d0ac1dc74832a99299c9be27406c4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJRW0XzAAoJELp701BxlEWfOf8P/2wBw1Zl3t2bGymRnuOyHvYa
-4s+VSZSDHzLgbYV5YNa9NgOow+nzVLuaueYoU+k/yuS09TLqy4kCeSzEDoobJZrI
-qzB6ThVUSfjmYcA6TVUyKFLVHYhBLgEDOWJXmgQskbOFhtq2jQC0l5hsBeYC6AMF
-69HzcnY2Pg4SvRuuOvYsqWAe6aTDaP78BEgPkoGfxEHBv2mjL2D6gRiH0mS4xXc/
-jtURJj2O5dMSQ9XHi/Afkpb7jlhTEVwH2kVDlZkzC5nu/XJAmBMRA699u524CHaR
-cGSZqCqTrMaOCVlTtoKNvHT+2AaBLos8meanFB7l3mFqlYv212DjknZiME+4wgg1
-BAn2aZwuH0c8Hvntgash24I0raxHefgfbuZt93Ys0QF7OZ23OAbilgXO6MdS7Q5n
-H21k3os3nFuvxPzXBEULEYLtlP/AgqxPDr2SZ398IMN9YzOxGWqfXD13hyfK7UDW
-/kSqVDARhd9ra97HDTuLzpt7BASLq1T5/fwt5d7vlkSYlwIRiKVIl6n2LDBunwLH
-IhXVsZLm5AkKm7ysGm1lEk0MFSJ5TbUNR0ReUAY9GTxkGg+6q3FGrC1B0iJ9MgA/
-oFO1PKkl2njRsx8T4l/XIdsjAmmRtiA4rYAhEb/lYJ/IxE2/bsW3A+D+3gVyRONd
-kZTlMpZ/tYsEA5qqFQKR
-=wOdf
+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
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/qoauth/qoauth-1.0.1.ebuild b/dev-libs/qoauth/qoauth-1.0.1.ebuild
index 88555e5baed9..3f5a8c0fe664 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-2013 Gentoo Foundation
+# 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.12 2013/04/02 20:56:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qoauth/qoauth-1.0.1.ebuild,v 1.13 2015/01/28 23:06:23 johu Exp $
 
 EAPI=4
 
@@ -15,13 +15,13 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="debug doc static-libs test"
 
-COMMON_DEPEND="app-crypt/qca:2[debug?]"
+COMMON_DEPEND="app-crypt/qca:2[debug?,qt4(+)]"
 DEPEND="${COMMON_DEPEND}
 	doc? ( app-doc/doxygen )
 	test? ( dev-qt/qttest:4 )
 "
 RDEPEND="${COMMON_DEPEND}
-	app-crypt/qca-ossl:2[debug?]
+	|| ( app-crypt/qca-ossl:2[debug?] app-crypt/qca:2[debug?,openssl] )
 "
 
 S=${WORKDIR}/${P}-src