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

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

diff --git a/net-im/ktp-auth-handler/ChangeLog b/net-im/ktp-auth-handler/ChangeLog
index 8d859f80ed232e5950d2e71f43e408bbf92886b6..ef67c9db547e8a2a9445016ba18293791aaf4ab8 100644 (file)
--- a/net-im/ktp-auth-handler/ChangeLog
+++ b/net-im/ktp-auth-handler/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/ktp-auth-handler
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-auth-handler/ChangeLog,v 1.32 2014/12/02 13:08:18 kensington Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-auth-handler/ChangeLog,v 1.33 2015/01/29 00:45:46 johu Exp $
+
+  29 Jan 2015; Johannes Huber <johu@gentoo.org> ktp-auth-handler-0.9.0.ebuild:
+  Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1, bug
+  #537642.
 
   02 Dec 2014; Michael Palimaka <kensington@gentoo.org>
   -ktp-auth-handler-0.8.1.ebuild:

diff --git a/net-im/ktp-auth-handler/Manifest b/net-im/ktp-auth-handler/Manifest
index 4365ea340d84da635821ed625baaaf611aee0255..b7c23afea338b79674f998c839d8f1c53f4801fc 100644 (file)
--- a/net-im/ktp-auth-handler/Manifest
+++ b/net-im/ktp-auth-handler/Manifest
@@ -2,24 +2,23 @@
 Hash: SHA256
 
 DIST ktp-auth-handler-0.9.0.tar.bz2 49212 SHA256 6eb07a75200bd18154f42fbe1ff64a9fb0799b709899c3cb31474523b418478e SHA512 915790f317d82a34b2daaf81eae47af0d68e6602de57902801d7904f3b64165556554a12a076bb40037ccdc6e74c39328dfdaefd2e30dd1018952ec3e4fae675 WHIRLPOOL ed97c5c475650fd6f20e55afe2deae9266531aa024874294110266d990018a93f9be51ab2ea982f25474375ee63e8c20dd7fbcad8b3b04ebe3aac66d467c016d
-EBUILD ktp-auth-handler-0.9.0.ebuild 936 SHA256 ef7e827acd1e108cdc4fd1f20060d3aa27b2ba0a3e7149ea44c53ff8f81609a9 SHA512 4763d33058ce9e3c79ea529d883fc5713ddd804fa90f967c91e56ecb8cc522be98d54112da43b36ca805336db2a0e98a241360c8958ddbaef6e27ba31592a4fb WHIRLPOOL 8da8abbd5cfa1626617d62fa6495adac90ea12d5101c2d2d1422f3f224737aacb1bc77d7af82f89f04c4906b30ea8f102f029e302cc0459919a2206c2fb9992e
-MISC ChangeLog 4787 SHA256 99b7ede263339fc1b9c9511be81a63df9a95df0dd4390aec10f8293dca4b33a5 SHA512 d942f33a775a6f150ccb32c9c93222964462910836e301b4dbcb0e5709d30770ef71dcb64ae07c3112810c3fdd2b56658823fd210d52ece47c8b3b7a5f1860dc WHIRLPOOL 4c7fc637358b31e053f276053a4c066da87be9820ba6929403ecf7d34961c1efc25e3bc4fa3102beff3e2bd0e6c05deb7f61eff1b3f0ee47ed8801de1518bd8f
+EBUILD ktp-auth-handler-0.9.0.ebuild 970 SHA256 1cd71a41c60ead15a4fed6628eef30220f9ec3324afa4c7a1b3a46d7734bdfb9 SHA512 4481740453c356e9adf2aab8059e98b9214fc2f9d0f449065a74c5969cc43cd15cdfa82db30765587ea3f5305c5de1a49b7a5fb987729a5666000107268af8c3 WHIRLPOOL 9c49a949270cf7a6baef07d2c223c2098988e0ae7aa4798a8a722f6e87e0beecf06593a77ad4fc7c8dfff58d4b5ad94ca8f35da551d307ba3c08c813e769a45d
+MISC ChangeLog 4947 SHA256 8465419894f445cc3f9f754878bb91f96b09de89e4c29b2003fabd0586775022 SHA512 cfe8351de894df9dd56a6c9399889a640db39cb16ad05b9a9be3aa31e7b09d44b20a46866fa61d5bef061c7364fb25733a7b8e3d9e8de0f7a5a3663d0a7dcac6 WHIRLPOOL 8e96b852f225825e9227fcfc73c15fcde8f53b403ad360c41e286fcb7547801f79a5d44e87adc9103382df621dd9ae35a6da64ecc0666987928f3c5ab40b926f
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJiBAEBCABMBQJUfbnXRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7F+CD/0SkVMlVXpuv12jjqI8w0bChkPt4ocydKx48V8PtSpo4KAXbVg5ldSShbj/
-5Y6qwv2Qp/wetMTlljtzvYqAowK0XiW3ry+bY0zErubhxmpCouNgA1k4OH5huJLh
-17122XpWRtOScJ75e8fwYcPK26V65ntCbgL/5Lh368ugiYjNMwKdbXL0CtoGnUVL
-tFkppYciaQWSiqCIpb5QsxX6FEZhkzWcUNhSO4wEA1GHVjL5/xizA2S+/wtmnoLF
-7jsLvHRkRBfNYYvt5qPk5FVrerm9oxgJRzOGf7fu98KdNaF6ktE10imSaIIgF+aN
-KZmnG22bTODQsRW+VyCK9VgXlOAU7kW3mbCffyY2VlfhL23EY0XpGOB/gb78fori
-KnO4ssLFtMrhU6kKkEgL4qxPKInccfJ2eMnREkEB/efG0PCHFrSiBKmxQPKauAoO
-JJl9Eq7MemSTGuqVOMYT3mPprYpJMHlsqHVqB7jJxzwbRpo+ybBVTQItRUpt2FLs
-g4Sl5I6MP9UFwjYZZGMFSZDErAeJvEbpEFDDbAx9WAc+84WSGOuh/0MkaaCel3FP
-Lzc477hW8GwrXyFQUBZqEfkpArSZvW/ybJZ5p/E2liRl9iaGzvwNNt5eGjDvPztn
-45DSEVEvo0oFxkcztebaFKLtAKTJCcVvq9JN/xA+rEGKPI+vMQ==
-=9Y02
+iQIcBAEBCAAGBQJUyYK7AAoJEGVpnaTzz9K9nWMP/2tuAFZ/UkZ23rju2MKS+Ihp
+AQaon1n+kPPYPaD0mBDv4FHsbLfcUtqW/TDOdjbcmdVrrv3LWIZ9Sx74yaSRcfdw
+RY7YeSspyMRKyuNP/JyuzujAhWxECOSbNEH8XLqjOZNNwXLMaV3lH+NxhOa/Pzgt
+nDuOykP65LdoHOoIntGCzfgyZOOIltFh3sLNcTDLdAh649EXIJ1hSDn3Xe2HpOWO
+F/9pQ4BS3s1HCVqo5VNFRckGZiaIRfSdzYn8b9v3UOcSte+m+TFfj3BJocD6EDik
+xoLzyRlI3tLHBV8w31my0JO+GfEx76kvjA7+sy44F/RGSyfCJ9KI0DSljg9Qr1gV
+o+eF2uAvxyFs0jOvQUEmfqYOjPG67doIXDsnLvxEKdOMVr8kpf+KTaGtNChBw+UJ
+yLfoxpVUSSQJ3X5zpVdos1d/N7Nh38LwGJuPPH1QzKQAWgtKJ/BOLjdchJNnJ01p
+pPNV8rTQ2CJV+TagFxa03S4vwOP9z/KchB1XBJiZAvC27cHPnmOJdF9ZiTKFs2Sc
++gMerM6/RCOZIexHvUv5qP7/yiMsEt0ZlqUOvyHfuQmfw9HxwJfuBb2TK0DkrP77
+QAQNOhr3WqPk3m+kG4TAbiFPIQLLimZFFtEpLjdCcFDFOyDHdfT3PKHJdh7rz7p4
+o0H2NEyTGvMb6r57vigv
+=3R0B
 -----END PGP SIGNATURE-----

diff --git a/net-im/ktp-auth-handler/ktp-auth-handler-0.9.0.ebuild b/net-im/ktp-auth-handler/ktp-auth-handler-0.9.0.ebuild
index e9b169173b0acdd328c4e9e1b97a4153ef2944bd..8612ee28878e210e8fdc79c1aab34896a15704ce 100644 (file)
--- a/net-im/ktp-auth-handler/ktp-auth-handler-0.9.0.ebuild
+++ b/net-im/ktp-auth-handler/ktp-auth-handler-0.9.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-im/ktp-auth-handler/ktp-auth-handler-0.9.0.ebuild,v 1.1 2014/10/26 16:37:44 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-auth-handler/ktp-auth-handler-0.9.0.ebuild,v 1.2 2015/01/29 00:45:46 johu Exp $
 
 EAPI=5
 
@@ -23,11 +23,11 @@ SLOT="4"
 IUSE="debug"
 
 DEPEND="
-       app-crypt/qca:2
+       app-crypt/qca:2[qt4(+)]
        >=dev-libs/qjson-0.8
        >=net-im/ktp-common-internals-${PV}
        >=net-libs/telepathy-qt-0.9.5[qt4]
 "
 RDEPEND="${DEPEND}
-       app-crypt/qca-ossl:2
+       || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
 "