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!

11 files changed, 67 insertions, 69 deletions

diff --git a/net-irc/konversation/ChangeLog b/net-irc/konversation/ChangeLog
index 951d6d88cb27..60a275740c87 100644
--- a/net-irc/konversation/ChangeLog
+++ b/net-irc/konversation/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/konversation
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/ChangeLog,v 1.121 2015/01/29 01:20:50 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/ChangeLog,v 1.122 2015/02/22 18:41:23 mgorny Exp $
+
+  22 Feb 2015; Michał Górny <mgorny@gentoo.org> konversation-1.5.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.
 
   29 Jan 2015; Johannes Huber <johu@gentoo.org> konversation-1.5.1.ebuild:
   Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1.
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index 58a0e3f5e452..15524dfe53e5 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -2,23 +2,25 @@
 Hash: SHA256
 
 DIST konversation-1.5.1.tar.xz 3188288 SHA256 97838dc3cb07210c96154958237e216ad05cffa334f5e549d8619b4c70961986 SHA512 c34def02b776692134e40f6a6fc8a7d362a58d1365a247f21828e08a0df95aface809e23f187f7c445112ce3e8cc41826ef8558de5b224258269c67ea6826615 WHIRLPOOL 44e78a0353673401ab36f2d292e18d19305d0aede43b5b929407fc0cb9d5389816b2840e7acecd644c172eada9eee52f8bbca5d9dfa252189d57fcc646fe644a
-EBUILD konversation-1.5.1.ebuild 1055 SHA256 1d6502e1475b89c4076f228bc49bd96a5f02e5d6e75cf0f72390229c2836054a SHA512 03a2e39e9d341ffacf34170b479ae416b90a5c97c792d755882911e4253d00674153d526e75465d9f9e23019448bdad77fad6aa302c25d0e4ece7fcb189ce39b WHIRLPOOL 4007355642e4778fd2b8309a60e476abc30b5783c27b1fb0e578afd357c1613fc176657b6da0b36264b0f6a6b5270078edf843445b643859554593b59b8be687
-MISC ChangeLog 17667 SHA256 6ee667f009da3c069100005774fb8f6679b0602e29ac9746b2338e753092f3c5 SHA512 b45316cd65ff712fa0310875f28661e8cb75d57198f5f282a604d875d9842c3ac6e6604e785e8b21ccb65d9e4ddf17030dedeedd784ccf7f51710edbf82e1f41 WHIRLPOOL e64a7296eb7cb40bbe9a2c234a8bf987fe696bad8d159f0ecfab1601f348ab9bfaf75fac310e34ad8c45394429d59d1885edcb4344d629908000566417ada12c
+EBUILD konversation-1.5.1.ebuild 1029 SHA256 bfc0443a7511b90078bc0dcc1fa1fd535d06405c8a62c0952a4503dc408d96e7 SHA512 101f96f6e26d6cabb9eee9c920932867954c28393d628431ddcd7748e5c8f28d2fbdcf69d837e105288c3e1963a126eef4469053047e4abe5c655f1291a2652e WHIRLPOOL ae472cdb3211dd57cd9384fcf6c80deb750bf9c3d9a19139657988f3106bacd3e42104a74529e070094c19d743422ccf19f57afcd877130ce1b4638084aa2b05
+MISC ChangeLog 17909 SHA256 c9cb390473fa29f11d7033b6831d7c8b25683de004a97feebf5dc467f2fd3bda SHA512 2757423f50b61f4cbaf5f6ec86d10d02a630b2d4aa26815ff260e61578ad6b626ab0febadab82132757787a83ade1ef51c4fa1a8b23f40d4a6c8ccbb0ed37ca6 WHIRLPOOL 4993f1c6d0836b1be92d2aeee236df5f50f5d28acab95a884c38f88f1a5758e129b6e1d44c29fbdbe7428efa093f5f8fd3009706efec41b049953042d8fe587c
 MISC metadata.xml 177 SHA256 0d969af6afa28170dac4b321dd8489b27d322f49f40c39aa3f614953f85292ce SHA512 65c9833c0dfd58cbec68d7c3d88849dbd9477cd76cc983fc580d531525998cf280c6b708b9d3eb970f9b6e18bcf21da194bbb0a1931efbfc4164b1709226cff0 WHIRLPOOL 427f0f186ab280f1f9aaa3f27f89fc69743a38848e0e2d369013da2c907faabc47e4a66497ae6079376c7742db639f42d07262bc011c0e8311cd6228a9867b48
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUyYrzAAoJEGVpnaTzz9K9CFsP+wdyCP273iznSS+xEwKdnQMg
-5QOtXgwSqT7w/SRQK6rhJ38bR5us+GGeuACDihoJLQapLxrSFG3vrg3/xbQN3lJ7
-u97Q+MVP7H4cUZbllkw6mYD/xgZw8QlbHjlfozRWWDbwIVY5R+YEin3VENqlzJaW
-fIzeRKBvqM0Z+IA+td2dGVQzXejebYhl92yiX2J+FVWZL9XOxf+JpzvxZfeEDRKa
-z03kFu8GcxrMUzQ6Vf99fEaEMwy85Do4dnv8jSmuKDVWmaj31lhAZjsfhA2yPDIr
-24mu/8r2t1gKu5hc1jpifGdubRaareYmluiGd37RmwaHTK1y4xni2Nxx5c+4HyZq
-1EhdcdOkNitKbRVF88ta8/4n7zy+OZjsUMYmh87mURDk/OhrITvFij2daKSZOUGb
-9x40jgZMM5/QkWUvWPPW7+6R8xLVJoFRPxjUY3xzkWhuVrGNVsmADp6ZAsqqO2Du
-2KEXwlJcg0OOfHcq++ILBD5CJE0nSp+1/3FwngjDIARJPLRdCtiRgyfLMGnu0b7H
-5iOK+HushVED7qfsH9GH0htWcYygJyT2Pnptr2LD3RCF2bNcJsmtIm2H3FCxHbMA
-3UFxlVYBxmrbNIOu+0V1zMYDaWFSfGldiOvuWa8doJnEcIFHEYDrLooHq7o/KBj6
-xuXwJyc9TUADeuQfUVb6
-=xgCX
+iQJ8BAEBCABmBQJU6iLiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO26gQAI6TzOvo5SMYvM2ekAkrFiyx
+SOpbGe6wYqIhaQyutAup0Xtg47EX6ZJjCROz2b4V1mcJs9LgYx7zeOoPRMuucc3L
++8HERXQ+OPaqcz2vG6FePpLYSYfucC2bVQyMg9rgZpL785oi5ESmUQiH9OyQ3SuR
+OxJv2koYhiFb0nrP/iNKEdCa+0/HAv/ESaupfO+PUA8PUP0r0JPlnf7+V6yQzASJ
+yWy02UBkgwlN1dhYeDUtlqqqqD4+8S0/YP1L3paXXtKC2QAfwJcoD5PNjoTlhjSz
+8xTN8xSmW08LZjkjx6J5ZOhz+PiTeFyU6Xm/SRrxIvSuBJvpiRTwhbcgvKm9A2Jn
++3dhTuic7uRlotm2sUqT1lqL2CZjBGeRzoMZbDj3pCSwjni+H4hWXoHjXqeubh5I
+dNlte+rBWXHSvE4V5GBS4+ZZr51oVLsI+V/+WOqXOt7gWmuCjXM5SpyILX72+Vs4
+xp6yK78A0w+STmjnDGgb1ikXNfWTW1ehN2mzFOAUR9eTinPNShw4bhpJ63VrTsrw
+Krcq6EU3gdPkKM6LbXxucvOV11PRI3VhGBkKUqZxvHk4EB0yaBa2sZ/MvAW30sUH
+OSgX4wPnDCLM1ILkTjxnWUicpI3E3UNPKuVoMeDfbq2LXnc+l1JJ5YYmA83/aBa8
+B9icB7UPLJTNvzRmAr6q
+=rqGD
 -----END PGP SIGNATURE-----
diff --git a/net-irc/konversation/konversation-1.5.1.ebuild b/net-irc/konversation/konversation-1.5.1.ebuild
index bb4b76ed8297..cecf4e9b496a 100644
--- a/net-irc/konversation/konversation-1.5.1.ebuild
+++ b/net-irc/konversation/konversation-1.5.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/net-irc/konversation/konversation-1.5.1.ebuild,v 1.4 2015/01/29 01:20:50 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/konversation-1.5.1.ebuild,v 1.5 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@ DEPEND="
 	crypt? ( app-crypt/qca:2[qt4(+)] )
 "
 RDEPEND="${DEPEND}
-	crypt? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
+	crypt? ( app-crypt/qca:2[openssl] )
 "
 
 src_configure() {
diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index 57094bc0e59d..1bf1a9571fc6 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/quassel
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.189 2015/02/16 22:01:22 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.190 2015/02/22 18:41:23 mgorny Exp $
+
+  22 Feb 2015; Michał Górny <mgorny@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:
+  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.
 
   16 Feb 2015; Johannes Huber <johu@gentoo.org> quassel-9999.ebuild:
   Update dependencies for Qt5 based kde support.
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index f41ac4c3c16a..279784e51553 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -11,28 +11,30 @@ 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 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 6000 SHA256 089cdedaff63193b733b17687f1865bd884c7a89984609978d3f8bc47a546358 SHA512 f1b2acb1c27afac3d9947922c8f90af6b0f58b9c3f995ca694137f97150eaca6846bcc524b37cf7a0df35ae370e342d0e74cd941ea543100fbf9128dc0b0b26e WHIRLPOOL 20e48d1971f608e6f75345921c1bac647e10717fdc5f7c2cb9991fac1ccf52dcda18a9c866bcab2c095b6342e3c9ab5cc1e36d826f28a98478e26f19ddc183a2
-MISC ChangeLog 29552 SHA256 33683dbf2dc260d9c9000211595c928aa6965c5ef3f65ae758f8d9d3afdcbef8 SHA512 7ac552f786583b9a413fb1b0648833216486dc787ee4c14da94d8e7c7f9d31329f314413255a2a7ae47d7843a96686ec9eaea8e7ea448c7aabbb27f72afa910f WHIRLPOOL 0e74b98f02dad15589b54c7352949fed8abe69c48b068146d512f7733aabe4b13ea2b9fb0a21df4be82b358fe89806f0982060236dfe5cde7dd67f413bd772a6
+EBUILD quassel-0.10.0-r1.ebuild 4994 SHA256 b20c3c0a51e489c538781c0d3020868c13f5f8ec1104c6e318c10a5d47b64f84 SHA512 12bcde0120b0835578644e72f4053040f9a4a63c877921733bcb250d57a8416506e85bc7b51f3a28d4a9a8871f2763d2f41fc2b4af9ee66bc8a49e20d44cf38b WHIRLPOOL dfb7c50e1e93a942161f523b85af3bc57bdfe50a5489600f98d5bfbba00720fdeb472ed96de7d305cfe512e09cd345949ed056311df62faf872630ee51ff0eca
+EBUILD quassel-0.10.1.ebuild 4992 SHA256 745fb12a19a2411205bbedd6467650fc2eba4c88ca9e38989e4e2c49805b32d6 SHA512 10fb8dcbb1d6904921b553c42b9208e781493c98e0d352eb2767ba11048220cf7c2298d976f78d6cf64ac57e15f94dd5bb7a910d585ee8f6f8c8247c493ea2ef WHIRLPOOL d1249dcb052278fdc1bbd607d6862186a74247499be001f70d8a7ba925031ce2e9dcb75ab2352c05fa7d960d6209c6abeafc23266b1c0b8ee7b787723dddfc75
+EBUILD quassel-0.11.0.ebuild 5621 SHA256 6bc36f01160007c3411ab3b903213672f8319d893b97e6f42983a0fcb24b2def SHA512 7993183acef66aa5fb9fb117da4643e70a9fdd78344023a25d65074e662e103f4372e54975a81a92628ca6c865de511c85cbc9e7f5596fe8a424b37634be20d4 WHIRLPOOL 1b187e13784805c2af85277482a1b5dae27a7be632f67224781b609f2179f0528bd7e94d3bc5bdd0a8148349f683cfbdfe062becdee43efc16974c2a471fd295
+EBUILD quassel-0.9.2.ebuild 5216 SHA256 47bc6b669c17f03119dbbbb19be0e60bb256c2048e9749763c6cacd0e93919ea SHA512 c6c8945a15ee6d6dbc9a4bff2d729d33c39663c067ee19a79c3e8eb8de12c982805614464b961429985610b75049e9c4e975e8207a256957aeb493cd2f033f18 WHIRLPOOL 8143fb89d51531d2704513e2fa07ac7775101c71a2591e056157bd85b3cb4f8f38ecc3149938403a3c27dd422e796c042ad89ab6669d5dbf748cbc61762fb19c
+EBUILD quassel-0.9.3.ebuild 5122 SHA256 27e9695a431a476a9a922069237c9f396586c458e16026607365dd79dcb3e545 SHA512 358540b9daa8bf5b72a8d13f107f9e35d73b0c931d9958c43f0677925d6ca194e3186dfec2a8dc0807371d37341b78df4424756c8c54dc63dd2abde59bfa30ff WHIRLPOOL 129f99548c1fa7916f67457d21848da920534dc2e63bc554b09e35b8dbd71302aafb0f90e5ebe78246106fceb919f3cf73b6dacee53aa13928721e335eefc22c
+EBUILD quassel-9999.ebuild 5949 SHA256 1be872f9e03a6ee270716857ee97c17c0fa36d990269fe44652a9570e20e8e9b SHA512 6138c310954f5ace10270296eced8b882c3191b386b99c0b21a7603d835a8655c9299d33b923befafa59bfc9abafd804eeede8c4170c3cdab8a98227176733ef WHIRLPOOL fc73c334975331bf70aebc0e981db80ee642161d6a772506aca713cbee05a15849e2b2b9bf8fa4d6a72c5874d683d4858716e5a32f0eb22d1af01506064853bd
+MISC ChangeLog 29908 SHA256 3b2c42f91ae65dc20ae3beb079d2bfe83233cf70b22477c74037829d5c045545 SHA512 8491fe68fbf164d3bd45f1f56087c6b5eaee4f08651ed9704472b5808f8cc764a9fe5391975e482f8fbadfc57cf0e0a1bdc2e14e48e5d45722cb985e6de93130 WHIRLPOOL f926632696dbb4684856c21645c9d3cdc394311bf1ade60340b0baf5a71d37f5c63d052982564667ab4f360f477122b049c3882f4483733ad52a56677b6365ab
 MISC metadata.xml 1687 SHA256 20a821b954973d1f6c42184c6ca474b972896e6649ab37a44f093a7b3964e3c5 SHA512 7586fd9fa8552ae40e9294819bd56365e8e97eda8c5669519b57e8712e801c3513937effb716bd3e2cb75f47c3d180947b5a7a20107a8292f92d7c4c2837684a WHIRLPOOL 165eb876fc157171ac2d25ead567fce5ecd4d8ccab275591c0d9d18b8cb4e2f104a6a1b63c3bde76c0afdeee5651f13668ee30fe98a9bdc1b28e6f6fa2dcbc33
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU4mixAAoJEGVpnaTzz9K9ECEP/0OE+g9Yxev/PZ4SgWyrXa7n
-m8L3jFjvBE8PVygMVHI91loTLtwLqw1ECkcC5N5wEszuraIiDS7KRwOd/YGjLXFv
-DIWHad3S8wWR3V88HX3fil+oP6S4ICpPbI4IIYEhS1ARgqdFLZk1opWaeZFISPvx
-6TQwxGXWDaWpx5Xt17d+FEC1kKaHs6OpzInBql+y0e+CcToE9tVTCEU32/YBmWZa
-Y11ollBxKcMUnj0TIPt0tXBzJE8hzqIjcbiuyoTnSji62pLzIkwQnXRZizXwYfA1
-cPJCVx10f9GKCAQ6GaWofQ1hFao81YTJnkJ8XAsTgQzrZAWFVa6fYLc4Wv/p+2hl
-+arLgEH2zj/8yiWqNqVJrpMQ1tg27gx+WetcRSl+I0wvcWgq1sPxEPw/6e580sAo
-xpM9MTh2dV49IUeAshRDyQIFlaHol/K5BblSex51M75xDIhchbUDCtXZHpNNz58h
-/2Qy+y5N/wMm4SwW+fhrAZbpwkHqZ4e2lIB0+fJvZPfSCjsNm8zeFWGfvqCgClYj
-sPuZmst5n35JbFupwmxWRPk/qResgpowtc14Kl8U/duwFV9cyGK8Lk7yR9u1fZO5
-hgs4EJSC2fB4+7o9Ijc1eMuE6HPYoKw8JR8Dsx1IhZpa+lMuSAJs73iNWC4PwTpl
-wpb/E/odQeMGbDFoVafA
-=H6wN
+iQJ8BAEBCABmBQJU6iLiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOewMQANG8P8wpeW73woKv27EDnDvG
+XklidI5toGPjANjZVX9wiPq32bEF4wR+zcitvYJsLfr4xNjiC80QQtJStST29SCM
+GBShB6ix/eIgPLBunjzFV/HHYWHRl99ZSgCo/EUsU8neFH5CKISM1mXVVOp0yNNq
+4Kw7zQukAK2P8xkAktWsgW/6bxkenhIUD1N5Vh0Dq16c6BHiDbFdjkRjDwqq3e74
+hyQHFnQS3/jgJEYbwGKugAIMD9BZW4p0OG8wHcWGIL8bdhbA1y6OS1wnzH7cg/C0
+uMJdHoc07yAHv0CmYbRW+Mz+m3a7pqrU+KfeQZBJ8lfDaVgfBiBL3ydOEE18G1/g
+RCGaJmUFOPhAAj57Oyq/KymbfRcgJ76Kyb4nUGGc7T+lmi8GYb2iRkjBzt6/9Why
+QxG5rSBunFnQO95UR3L7sy2uGGgY3PLibzgl4rYkII8UJDXrWHu/oTWrmLvK15Pz
+hpIDd/hlRkWhx90ial8jw0FYgUNsbi6eoqwnDLkjfFKHsAB2RIu+tb3BZjV3hsUu
+0513Z6cvWvDbEOw0R8jfcDPSnq/wu+3bLDb+hsj+M95TWldd4ycS0C/mx25Zh3DA
+CP8wihxRhLtonMvpgUm9mUN5ey10zBibMEm/BQMT3cKsKZsvkqIrao3zlV6AM7Br
+MfpezjnywmCKRn6eNVfh
+=2Wmb
 -----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 6b2d45f9d4f6..500092dc1a47 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-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.6 2015/01/29 01:35:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.10.0-r1.ebuild,v 1.7 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -20,10 +20,7 @@ IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl syslo
 
 SERVER_RDEPEND="
 	dev-qt/qtscript:4
-	crypt? (
-		app-crypt/qca:2[qt4(+)]
-		|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
-	)
+	crypt? ( app-crypt/qca:2[openssl,qt4(+)] )
 	!postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	postgres? ( dev-qt/qtsql:4[postgres] )
 	syslog? ( virtual/logger )
diff --git a/net-irc/quassel/quassel-0.10.1.ebuild b/net-irc/quassel/quassel-0.10.1.ebuild
index 59d7daf8fd9b..a45eef1ca392 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-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.3 2015/01/29 01:35:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.10.1.ebuild,v 1.4 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -20,10 +20,7 @@ IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl syslo
 
 SERVER_RDEPEND="
 	dev-qt/qtscript:4
-	crypt? (
-		app-crypt/qca:2[qt4(+)]
-		|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
-	)
+	crypt? ( app-crypt/qca:2[openssl,qt4(+)] )
 	!postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	postgres? ( dev-qt/qtsql:4[postgres] )
 	syslog? ( virtual/logger )
diff --git a/net-irc/quassel/quassel-0.11.0.ebuild b/net-irc/quassel/quassel-0.11.0.ebuild
index 1343ad137b4e..719dfc198dc5 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-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.5 2015/01/29 01:35:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.11.0.ebuild,v 1.6 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -26,10 +26,7 @@ SERVER_RDEPEND="
 	)
 	!qt5? (
 		dev-qt/qtscript:4
-		crypt? (
-			app-crypt/qca:2[qt4(+)]
-			|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
-		)
+		crypt? ( app-crypt/qca:2[openssl,qt4(+)] )
 		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 618c52562755..e59e0db12e4f 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-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.10 2015/01/29 01:35:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.9.2.ebuild,v 1.11 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=4
 
@@ -24,10 +24,7 @@ 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[qt4(+)]
-		|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
-	)
+	crypt? ( app-crypt/qca:2[openssl,qt4(+)] )
 	!postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[postgres] )
 	syslog? ( virtual/logger )
diff --git a/net-irc/quassel/quassel-0.9.3.ebuild b/net-irc/quassel/quassel-0.9.3.ebuild
index 3adbb2c5a9a5..b111291dfb26 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-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.7 2015/01/29 01:35:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.9.3.ebuild,v 1.8 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -24,10 +24,7 @@ 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[qt4(+)]
-		|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
-	)
+	crypt? ( app-crypt/qca:2[openssl,qt4(+)] )
 	!postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[postgres] )
 	syslog? ( virtual/logger )
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 4b97b4941737..7fc867d36850 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.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-irc/quassel/quassel-9999.ebuild,v 1.79 2015/02/16 22:01:22 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.80 2015/02/22 18:41:23 mgorny Exp $
 
 EAPI=5
 
@@ -27,10 +27,7 @@ SERVER_RDEPEND="
 	)
 	!qt5? (
 		dev-qt/qtscript:4
-		crypt? (
-			app-crypt/qca:2[qt4(+)]
-			|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
-		)
+		crypt? ( app-crypt/qca:2[openssl,qt4(+)] )
 		postgres? ( dev-qt/qtsql:4[postgres] )
 		!postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	)