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

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

8 files changed, 53 insertions, 48 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index bb8ba27751ca..436a210eda84 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/quassel
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.184 2014/12/31 13:40:29 kensington Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.185 2015/01/29 01:35:36 johu Exp $
+
+  29 Jan 2015; Johannes Huber <johu@gentoo.org> quassel-0.10.0-r1.ebuild,
+  quassel-0.10.1.ebuild, quassel-0.11.0.ebuild, quassel-0.9.2.ebuild,
+  quassel-0.9.3.ebuild, quassel-9999.ebuild:
+  Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1, bug
+  #537994.
 
   31 Dec 2014; Michael Palimaka <kensington@gentoo.org>
   quassel-0.10.0-r1.ebuild, quassel-0.10.1.ebuild, quassel-0.9.2.ebuild,
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 4b8f5fa6eaff..f9fab81aa6a8 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -11,29 +11,28 @@ DIST quassel-0.10.1.tar.bz2 2872973 SHA256 0d17b7d2284d9ef29ba4dad515ec84ce41a56
 DIST quassel-0.11.0.tar.bz2 2875387 SHA256 99a191b8bc2a410f7020b890ec57e0be49313f539da9f4843675bb108b0f4504 SHA512 51450559df2c0fee9a54b76a9342edb9a3b834f1f58edc556e0c1bf1f9366c846d95e7953e1b48c6ecf67ea4255b3574ed3ce537962eec222c5c03ab02852c1d WHIRLPOOL c2ffb7e052a5d412aec5d1b8bacc8cdb8144c20d62d699ca1d8972fd5e8fe6ce89da49251a02c22008061b344d9408b3f018b3b39623703b4d980c289cd5613a
 DIST quassel-0.9.2.tar.bz2 2782855 SHA256 f04d01602509c1d950602502e5f51aba47d99c73a9c70e77c563bb7749fc53c0 SHA512 81e343b9b7df7473c9d899df9ad8c4baa779545ac4fe15c3b7d47f3e9473d24aa78c8cfc1833b79ec5b4b3173e8d83e22394a50b7184f348b3f1155bb3724f3d WHIRLPOOL 0b5b45c1bb400f5e2728d5e74f35bc5ef010c029c242940b83c4e6ec3a0c0d16d0c9d9848278d075a548e4e15736f142cc99d4741b8e4901d6589b7f7e05996f
 DIST quassel-0.9.3.tar.bz2 2783132 SHA256 ec29df5c55a02f91d15fa23618b42fc82b0bb912594420cc6340a40567ea3d4d SHA512 f200c23fe0e0459dfc116dcd194184a8be28e65d8116859925c1887c6cff290316a704ca3666c0a5b65ed93e2a6a65aed890babb466fe3996bf9c0e08f988e98 WHIRLPOOL fd9b3bd2241845de69e907d2fc3d895054289c271584b07c99b3032effda44183cd2ba3f0d4b1590e93a72a3735ecca6a1d53c1ccd0a3fc32fc6dc5ec5b2281a
-EBUILD quassel-0.10.0-r1.ebuild 5006 SHA256 3a7f039022eab6e74c2ee7a7f8829fa2ec2a10eba702f56a7b10241e717fb19e SHA512 229033d6ba9759adb804b6d1ecc8bf8ab4f725145b1bd39f1c5ecc8dc51e2abc973b4a723feb28a9eb1563790df46f3f5ee342aed3f725cf14d55d0e6d0ae3d1 WHIRLPOOL e19e095bde68388467d496504b9f28f00d7234c78fac531b438d2956c0ff4014fa745fba044f30d769b4ab4cd0d377329825e9b0fe786bb26a50cac5ca3c0ebf
-EBUILD quassel-0.10.1.ebuild 5004 SHA256 0ed7794bea668ab121081b35c46ac3aa94f4574eabb9e12aa7faa5580fb18303 SHA512 e32054f5d034499cce965de75e0107aad43b63fefbd3f7e671783f22218938a94bd1738f2ff3e9026579846546016eafc79e5112764e327d1ec7279acf29bb5f WHIRLPOOL 1506447a7aebb1b058b7301e8e07f80abf7fdce4dcb085438faa65a6736baf122438581e7a33cbab1f30ac068b5adfc8a859e24fc44912e57fc6bed831d44d37
-EBUILD quassel-0.11.0.ebuild 5636 SHA256 04e41e491ff9c4ef3001ef846e2ff7ba91a81d8740d11cc9b94a2c5783c99b76 SHA512 2ccd23733ef1fd75d627e056e79f6d9d9033f40868e6c16dd3e2dca416e7b8b01ce7a2d8de6a47563f9c378cbc1908ccd1612c91ebb945e7b0fc77e637e11397 WHIRLPOOL ab013eb057ceb9feb3f3313873bd8a5c4fb68136e93ff40b14ce5eba2018c5739dc223cdff3e81fa8109201dd74a7de968c4677b52e9e73e85af93f1e31fa5ba
-EBUILD quassel-0.9.2.ebuild 5227 SHA256 7febd0de3ecd9ce2357b119464a114d774dd7d432dc895289929922247a423ba SHA512 b6b22064b1590f3644dc3b81b979a10fae8f064c4ced15b9b0ffcd2bbeedcbb35bcf385e13e169c7697226ae2e2690c6dab611af2a542fe9e6d062a2c946c78b WHIRLPOOL 654308ee0427bc7499ac19afe506fbb03a3d3625f62ba24c13d195ef7244dc2f7ecea22bbf82672018108cb02554f536d8773b4fc8ec8cdd32c8d31de2fa922d
-EBUILD quassel-0.9.3.ebuild 5134 SHA256 05ebb3feb1254c0cbcf26d7b783b5ccbe8ea38d1d2786f39861bcac99e2b58ad SHA512 f7b5db745fe89770f4651f075bbb14702c4f4bf902ffe4e3852bad5215d8c0da2d5ca825b15a849bbfae43ffa4d59d38862cd419b3332437c35dd79d29b1f73e WHIRLPOOL 56b73dd1581348df8c7c90c551d10658aef6aee8eb189f75ab1256d20b93ba65ab61ece6e583e5f757cdf01e6fd0f279ccad2d3d3214da86fff6d8740948f1a5
-EBUILD quassel-9999.ebuild 5579 SHA256 b75ef8744f4655d91dbba74c97e0295fb2ba0c2e76c51fcb5ae11e0b1fac7bbe SHA512 7fce49c327ef783e1032423fab43ff8a9c23d417b0ebb59c533892257648c13f0985847aeeac5eaa7170bc7523999ce5a77827da6fe02a2268c40deba3902ee0 WHIRLPOOL 113bffa923e4afb3f1b201a662fb601d03715a1f0482e64ee9553f0466f37cd95389e57d7cde0b62b4f5d9e4e90700db85f643b543421c05bb63d6674755847e
-MISC ChangeLog 28823 SHA256 7bbe363b1743530243bafeecb81d838a3f80bbcf4eac12ec12fc2c96de251b21 SHA512 a11c6ce77e1caa4aca499a698b3634875931ba717a537a131619fcc85ec27798029d53baa2998591d179237e99b9618c02f723e6a4d7ff461ccd39d8a54d06a5 WHIRLPOOL 22de5f902f1888a59860befd6367aa64244fcaf4be56a45c50e1dc0ea1f22f0d62bedf606ef36a1369997e05d5852968c71e67fad5fcf476476e9d1eb8d799f9
+EBUILD quassel-0.10.0-r1.ebuild 5042 SHA256 976e84bbc95ff822140c6c667a9736dd3769d753ac910182dadb77e77daf009d SHA512 9fab41c22d5b3ae7c6a140adce507d09f1f3ee2826bc49df2d001bfcf5397f917f39b6d3d31984e86992af84a8b7a31c198bc43f4529228d214ac6e5c7123a7d WHIRLPOOL 925a2f8e04baf458605528435ba55f5e5c27f6fffdf53b7bf3cc37a9786430fac4b8cfd7517ede83879c05746d9af674be4e79638ef72d573c4587a1ea61460b
+EBUILD quassel-0.10.1.ebuild 5040 SHA256 6fc15042184ca2c42fb804f07159b8fadb66186eb3fbbe7723c668b52c6cd724 SHA512 a78477d1ec822eabedb3a3c7863ad0d825c5e2cc54c06d7dcbb892f03cdf547b9bc7c9d2742d3b23c034d6fb0914a3174ab6c26b8f673ef1966a3dd7da475c88 WHIRLPOOL 1f92c9e4b49faa1db472e7019708ce11647e839b1b01e7c7a360fcc8fc9c0ece2bd4c038dcd74c088867e38a1d88151926e75451620399f330004bcaf706a68b
+EBUILD quassel-0.11.0.ebuild 5672 SHA256 453b7d1b5f1e24a210d6de90e95f1111699d532223480e994cbd598d4f97e966 SHA512 cec003ca353242479add16c54f9f3d7045bf6118c64497a85aac1295f17b5ca67fe64186fa0ce86886cecfae58211a808f087af3e866e4cb579df9cd69aadb2e WHIRLPOOL 3a5451b41385664af130e2153c5b00b228e7724310bfcc2182ac22093b21d4f495fd12d52fae0d341f52e99793d9131b60ff79652485734bb503479c3db5291f
+EBUILD quassel-0.9.2.ebuild 5264 SHA256 f5ee8089a04ad593b9730596632e2dd53e6d6998b4b071ffb2da8bd00806ddd0 SHA512 7e54f8987561bf564bfe2513b7f524624c5bb0e344e735153d9f63faed932bb233098a224692e8cf39955006a8f4b31a01846de3d6c27acdc23c3d279208074a WHIRLPOOL e82f0fef87e47fdfc889a88699b025d7954186ad61a9bc36e31558703dae94c6741cbc3bb99697e6d7f06ff46a2d54aa6250722bb1338cdb9e730e0c87f5ee05
+EBUILD quassel-0.9.3.ebuild 5170 SHA256 8525c3215fc309260803fb9655ad7da5fe5e7b5844bdf7b744cac8589bb661d8 SHA512 9301ea3cf0daec33d39198733ddd9a7be3877f527920d5b9b67af45d722e12a2de822ba2b073a6fd0ce21908d6626760cbaa8c6c2a8ea7303da7d586ffbaaed1 WHIRLPOOL ab214c083cf16ac1dae733f88e4d967bf2983e2525d7984c96a17423aea968cb284ae674aa4303a0ca1bd47f97e046abaa360741f1a343b6f6ece318c2b5d7f8
+EBUILD quassel-9999.ebuild 5615 SHA256 0c3edf71d5a02fc27a203d568178638437accaaed9f495bcb7bfc168121099ce SHA512 bcd79b7d21bc3269f713c1646870e9a1d6750bb172ab31408ee32fc32a2b99640d62866c24e8ffa2c003420c61053bd2671fe1eb3bcdf66d1bf62eb3d2bea55d WHIRLPOOL cec088ea1a7b009d0ab33dcdcfe4b69fb410d7e2e794c613b958b4f450690904112c813502c5ae8bd7d6bd31f635a5ce3bbc39ab0b270aeaf17fb617d58cf857
+MISC ChangeLog 29093 SHA256 7b23e0f0252a943ed2d15120486dd743cc5f0b801021de13f9e5c65cf2acbc00 SHA512 7faca21a59387ed1a47313e632d0b6717b8c2f04513a336621410364df6e8dd7b2fb2373c23cd00ef4a45ab3aa8e88537cac1c84a5b8b5be26abc9b60a2ad264 WHIRLPOOL 7a3ed248688e7bb6cd01f27fe0d7f403d3a1c48e97af5d892c441125d26efea66533c9e21b0a0d5dd60fd7066fb9f55df6c4b8d5f0f3c93fd4c184d3d796fb29
 MISC metadata.xml 1687 SHA256 20a821b954973d1f6c42184c6ca474b972896e6649ab37a44f093a7b3964e3c5 SHA512 7586fd9fa8552ae40e9294819bd56365e8e97eda8c5669519b57e8712e801c3513937effb716bd3e2cb75f47c3d180947b5a7a20107a8292f92d7c4c2837684a WHIRLPOOL 165eb876fc157171ac2d25ead567fce5ecd4d8ccab275591c0d9d18b8cb4e2f104a6a1b63c3bde76c0afdeee5651f13668ee30fe98a9bdc1b28e6f6fa2dcbc33
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJiBAEBCABMBQJUo/zfRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7NM2EACgToUGFPB9+rU5WhfanBumHnHHtvgWKmpW4w8fZpbalJZu4cHZCDzLEOv1
-RPFCCcEuBOsIW76Kvwl0OCRiHmqJFxc1xWKejkJGmQy4wTHiKte3Xg7gZy9yS2kz
-i0gGQ9bhSTGmkombVTPi/N+9lxYP30soMZDqoFNvhe/wF2bU54nQprApLDYc7Rks
-xTuMqReoG5lKpqw3pdzZAu34LGFQUgxP3SADY80ZD5ZHAtG/deq/8Ol9kPYCVkmM
-LQ41962AWDU/pNaU/82RoDEBTo/AFAFfVEQ3EFblu7QwqjpU7vhK+lF7MFxSZX5P
-2dYIYqFGufbB5elkx71E9fCOEF7ZDxwTmpvJqOqhzkNVVF3okoo9SB0RgXIan6Kq
-ur4rJxFZA78lg4vRFwEkUyVLed6bwwPcpM53RgaiM+D63AteNijckbUKHB+7TKEl
-TQsgPiw9QpdLRGpBqP1YmJSa4UNZNUWxzIzDlQh6RgU8RuianeYCYSIK5zkO/Ad0
-PBZhgX/AiMjUsJELFxZRZTalOpI2dFNr10Pv+VPDNtjLddpKzwQ61EBInrWGgOmS
-OvhCwLFM/KaNaoe0lPENCRDOLuyNj8AiUIT4/YmD7DuDhB2BhDzLLjYK76brfU+1
-Bj5IX0Ittd3DGHe7Ued3vjqv4nysAmnG3VouTBISKqRQusIL5w==
-=wtcI
+iQIcBAEBCAAGBQJUyY5uAAoJEGVpnaTzz9K9MXwP/RCMQQC3nzKBxBDe/0NKfXrA
+ZWWPcEwB6+0/K0V0mCxxOMDwJZpd+EkTfZXNVS73Lf+xc2wUhqs9Xmy1C7mp6T8t
+w+/7bVs+rkmtmxbcon85yrAilqeIoj+vyDE+LnyaEWYXs/1Bc6JPhzqen/CS/ZEW
+oRtfjem1AqTaGKNFFTYRdOK1brlEZrEEczRh17CQw5H/JpZDriXmVlpnN3cxLesX
+E0mPJ7vl8Q+LnHuDJdlTmYrRaviYo89grPGvyIN2kHtzlT0W0tnILlvYEf5FJAaY
+5J6LaG72VZ91w+iJZ0Z5cWbZKYvIwel2vrEuLAecGxiIWc3ZoZ9U/rlYYo4daByh
+QntgUFaNse9QnynW/rccPQdI5gz4fWEl3Qd16ybq8R2hOEKKbnh1cvxx6Zl/X+DP
+nD7UkeoI2ZqAQeECgsZt4H+M9MPlhGPIZcKt37+4bVpsK17Sf/Be3QUrmkBgIOxR
+ZMnXr/3ECkokTLekbp2BbLOo37slhSXcTOQzy44A+tnkqZd/LH9aEUl/vzeHlv1z
+X2cl4iCrEuwGMydb9imgPi23St2TCJjOfn75PjFPcwwm4E1fPpUYH4XXUgTcDSfW
+a4tbGEzkI8pFgzB9Z7kxlmaTM3Rqoa9A4HGExYUOu8rYaSem5Wi/+fJFjeQvTVaf
+UgCpLc1oMm8DnbnC7w6f
+=+3FI
 -----END PGP SIGNATURE-----
diff --git a/net-irc/quassel/quassel-0.10.0-r1.ebuild b/net-irc/quassel/quassel-0.10.0-r1.ebuild
index f583773ae8e2..6b2d45f9d4f6 100644
--- a/net-irc/quassel/quassel-0.10.0-r1.ebuild
+++ b/net-irc/quassel/quassel-0.10.0-r1.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/net-irc/quassel/quassel-0.10.0-r1.ebuild,v 1.5 2014/12/31 13:40:29 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.10.0-r1.ebuild,v 1.6 2015/01/29 01:35:36 johu Exp $
 
 EAPI=5
 
@@ -21,8 +21,8 @@ IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl syslo
 SERVER_RDEPEND="
 	dev-qt/qtscript:4
 	crypt? (
-		app-crypt/qca:2
-		app-crypt/qca-ossl
+		app-crypt/qca:2[qt4(+)]
+		|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
 	)
 	!postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	postgres? ( dev-qt/qtsql:4[postgres] )
diff --git a/net-irc/quassel/quassel-0.10.1.ebuild b/net-irc/quassel/quassel-0.10.1.ebuild
index 08831968afa2..59d7daf8fd9b 100644
--- a/net-irc/quassel/quassel-0.10.1.ebuild
+++ b/net-irc/quassel/quassel-0.10.1.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/net-irc/quassel/quassel-0.10.1.ebuild,v 1.2 2014/12/31 13:40:29 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.10.1.ebuild,v 1.3 2015/01/29 01:35:36 johu Exp $
 
 EAPI=5
 
@@ -21,8 +21,8 @@ IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl syslo
 SERVER_RDEPEND="
 	dev-qt/qtscript:4
 	crypt? (
-		app-crypt/qca:2
-		app-crypt/qca-ossl
+		app-crypt/qca:2[qt4(+)]
+		|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
 	)
 	!postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	postgres? ( dev-qt/qtsql:4[postgres] )
diff --git a/net-irc/quassel/quassel-0.11.0.ebuild b/net-irc/quassel/quassel-0.11.0.ebuild
index 7c65f44a601a..1343ad137b4e 100644
--- a/net-irc/quassel/quassel-0.11.0.ebuild
+++ b/net-irc/quassel/quassel-0.11.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/net-irc/quassel/quassel-0.11.0.ebuild,v 1.4 2014/12/31 12:42:10 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.11.0.ebuild,v 1.5 2015/01/29 01:35:36 johu Exp $
 
 EAPI=5
 
@@ -27,8 +27,8 @@ SERVER_RDEPEND="
 	!qt5? (
 		dev-qt/qtscript:4
 		crypt? (
-			app-crypt/qca:2
-			app-crypt/qca-ossl
+			app-crypt/qca:2[qt4(+)]
+			|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
 		)
 		postgres? ( dev-qt/qtsql:4[postgres] )
 		!postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
diff --git a/net-irc/quassel/quassel-0.9.2.ebuild b/net-irc/quassel/quassel-0.9.2.ebuild
index 54a4c6279a52..618c52562755 100644
--- a/net-irc/quassel/quassel-0.9.2.ebuild
+++ b/net-irc/quassel/quassel-0.9.2.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/net-irc/quassel/quassel-0.9.2.ebuild,v 1.9 2014/12/31 13:40:29 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.9.2.ebuild,v 1.10 2015/01/29 01:35:36 johu Exp $
 
 EAPI=4
 
@@ -25,8 +25,8 @@ IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl syslo
 SERVER_RDEPEND="
 	>=dev-qt/qtscript-${QT_MINIMAL}:4
 	crypt? (
-		app-crypt/qca:2
-		app-crypt/qca-ossl
+		app-crypt/qca:2[qt4(+)]
+		|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
 	)
 	!postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[postgres] )
diff --git a/net-irc/quassel/quassel-0.9.3.ebuild b/net-irc/quassel/quassel-0.9.3.ebuild
index 58d99de3243d..3adbb2c5a9a5 100644
--- a/net-irc/quassel/quassel-0.9.3.ebuild
+++ b/net-irc/quassel/quassel-0.9.3.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/net-irc/quassel/quassel-0.9.3.ebuild,v 1.6 2014/12/31 13:40:29 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.9.3.ebuild,v 1.7 2015/01/29 01:35:36 johu Exp $
 
 EAPI=5
 
@@ -25,8 +25,8 @@ IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl syslo
 SERVER_RDEPEND="
 	>=dev-qt/qtscript-${QT_MINIMAL}:4
 	crypt? (
-		app-crypt/qca:2
-		app-crypt/qca-ossl
+		app-crypt/qca:2[qt4(+)]
+		|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
 	)
 	!postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[postgres] )
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index e76a0a5dbf5e..12e1866f0505 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.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/net-irc/quassel/quassel-9999.ebuild,v 1.75 2014/12/31 12:42:10 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.76 2015/01/29 01:35:36 johu Exp $
 
 EAPI=5
 
@@ -27,8 +27,8 @@ SERVER_RDEPEND="
 	!qt5? (
 		dev-qt/qtscript:4
 		crypt? (
-			app-crypt/qca:2
-			app-crypt/qca-ossl
+			app-crypt/qca:2[qt4(+)]
+			|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
 		)
 		postgres? ( dev-qt/qtsql:4[postgres] )
 		!postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )