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, 23 deletions

diff --git a/net-im/kadu/ChangeLog b/net-im/kadu/ChangeLog
index f5791c2cf21b..8f7e0c94ede3 100644
--- a/net-im/kadu/ChangeLog
+++ b/net-im/kadu/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/kadu
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.152 2014/12/31 13:34:24 kensington Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.153 2015/01/29 00:42:13 johu Exp $
+
+  29 Jan 2015; Johannes Huber <johu@gentoo.org> kadu-0.12.3.ebuild:
+  Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1.
 
   31 Dec 2014; Michael Palimaka <kensington@gentoo.org> kadu-0.12.3.ebuild:
   Enforce USE dependency for media-libs/phonon.
diff --git a/net-im/kadu/Manifest b/net-im/kadu/Manifest
index 21fbaa05cfcb..3ece2576e99c 100644
--- a/net-im/kadu/Manifest
+++ b/net-im/kadu/Manifest
@@ -2,24 +2,23 @@
 Hash: SHA256
 
 DIST kadu-0.12.3.tar.bz2 5106482 SHA256 d607bbd0d00b01bfb70dd15f15c8be4076896a935041651e67a3887ad12ab8a8 SHA512 0aeaec9ac3ce5a1860571721e307a8d5e6657a30780125e21d153901ce5f2870ba3ea6ebc272bbb6f35a56ed9a24127abfc8f25b9eb88d01ecf9c931fa5c851c WHIRLPOOL 0a2b1b9684577d95027b9107fc51e8a8f290b7ed38a18bf282f9589eb3dd5ca7a9fa61b088e2fb2be8d4d16e6d4e72d766476e36f7d65cc55a2d5efae53bb8ca
-EBUILD kadu-0.12.3.ebuild 2609 SHA256 f8f543ed6805daeb18eb9ecf9e3b8be744e875257517819c57bbc384a86e5657 SHA512 e710684944bc3c7dcb0cc3d8d6281b3f8168ae0f1743f9a9de1a2937753e64a671abdd7e43d50bd7934b7b37d0038e344d669e2c5020f0eaf8174d727073236c WHIRLPOOL db4faa229227bfef5662b6c20c02ba6a922afca559823789f2e47e36c931e557625dfe2a3de1e111b29fdf57706737a72a90ac7a01bf4dbfcfdd0f13672fc592
-MISC ChangeLog 21856 SHA256 8c70eb26342c69d6c031ad55ee43230929d59a521b51193cf4cc9cfb35b0aea5 SHA512 78ae37b2ab35bf0b57f5d68f90d84af5d122e3e136b08e375de193e6e568dcc44e069004781eafc3799209f23a4c00cd1a9e8169aa1185ea4adc9187f3bb6f7c WHIRLPOOL d0b722c95f994916e99b7c16c07e4dfbaf139c2982f3540885cfa759f410ecf9cb80d6ba7f2a76d5a67d316bb58c5d229c167ba696a7a0d1b507894bad06589e
+EBUILD kadu-0.12.3.ebuild 2634 SHA256 8b1530f9d94a43a625fd1827f8e14a31ffec4cfd7152f374d0b76c9444d1d3cb SHA512 ca33aa1d7bf3b548c769c9e37ceea8cf94fd9e02f6a18de96972edacf9a74d09ec77f2840a47897c78451493f7ee37a4b03d00bfdc07d47e119dd36030fb12ca WHIRLPOOL 92f4010014b396b6dbea0d72ccc08c2e2c1f5f7ea44d15dc8c1d72d2f9e26db1a7b4308786a322d9eb79d0c7d8736b6b4470e8c59843ad3cf3c4bea3f49bc480
+MISC ChangeLog 21990 SHA256 971ba9f5d4e042bcdca806bf41ef737cdc2fabb71b76a83eb68fd2e235e83299 SHA512 8c32ad2d55109e9e5b1665726f3b41460f699efa24e024ef70129119be2aee91e7a9bb875802a255e8caea1b48661653c64c9b87ac2bc8e0da5f210e864fd068 WHIRLPOOL 3fe49a1b40dfc9097ee586de4b37be8bd83a0aa3359112bc9b010943b07775947870c7a7688d49aef04937a5bad869d1a0d673e48f17347c1af68f0a8f543217
 MISC metadata.xml 577 SHA256 38cad9cdfd2009798cc27cff9bb4946903f3bd8e42fd09f1af4c6327a4c513dc SHA512 18dc27fa927c25ea682f5548dc63b52c5227c8fd29343be73254ba2c4fa5d374f9315e7a468ed310926fe58044fbbf07a1893d77b405d94871120fdd2444610d WHIRLPOOL 381df376b9754e3a594624d648e85b7ee79bc25509373a8011404cc44d51a8d13f38242717fa1601f2985f2195571cfd4f46e7768016c79ae1fb4ce55a75cbe1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJiBAEBCABMBQJUo/txRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7H0zD/9aO7j/O3vH0xLu+5/HtiflNMxoEqghOdOGliD0hGapn5+T1DuiYDWGH39v
-46zgP806oL7Y6LHt5woPys2KF4msmamcwsCmfRpJSgNRwwBfaYxNCaDsr++B/Aha
-IAcVmUiRuGcTIbxULq3kFh67QaAGg6PBw4D+y0ZpTPnrh5u2tSUbaU4LMCTgG4wv
-2A7h0+Jwt9vrmOFXmsfBcPeDV50OSq+yDcQFA0r0j3J1pC8MZ17S2gEe75Br+riA
-/H5vhkLtCeo5cXqyl0ihIN2ynUskZHqBK0aS/dGIprnwXZIf3i9YKRMNVa/12vi+
-wVv7ufejojaIkE/GK17j7jaCcMiqGvlUGtFiAT44Qo8dXCYkQbyFrJ5TY0GepQaX
-XvN13aw1clqog24T0D0BQ5/shQJhHKh62W5M9ky8FirdNUelqK/uBTsBDCp9GFYl
-F/1iytHYxu3nQeLd7Uva/oo8PrBVAMzupA98WeNPgjf5ALlv7IKzp9yh7bqhr9cO
-9XFL6sd1hCoK+RIQkXy1RUc3pnnjnGfyiF0XyHoirKvlE5zzKTqYOOn61NXf8x1Y
-kdEFJ/Of3NUzsh0CiyaS5Dqc2n9JoZAIl5QONktXs0Jp5OItIX6P1ggdRdgzDlWk
-iCug1oXleiq5//5T686vctMRRxLSDzH1ps5Sodk81wdPWPHrpQ==
-=d/i6
+iQIcBAEBCAAGBQJUyYHmAAoJEGVpnaTzz9K9AaoP/Rz3aXZCQiKXTyddjScjkqcv
+AnQw9WECTATUnnNiU8vYqFk3qT4vqFtfprDoXy32bxGRRO7Xyr7FzdRu5LhxWYds
+ebH3VKmKtxjSwahFtHAxg/NSUUNIwSH5jLbYB8zJZO9PRazrpNjVSCZXbp7Rcy70
+DlJSOp+/HJqY8nEjc9w0MQ0IQNEcZ+fRBT5fQnzuSCN9n7qWIVh3+v0gtA80rT2j
+2Ig+0vgQlyrmLTuvoENDR2JOxjNYSTXsLHNY7q7bKerPoskoro52Z28zWEomOPWk
+NsQY5NKgOHAfCHwJP70i/d+b7Mi3QmuVPBbZAhggjoWAVVIHdNuiWKKNVNmiEpRF
+V0u6Esy4q3ZmYQ/GtC2kHb6HR8YSP/qUbg5oVoJ4AQo3pejyQaADR+7dY5LJQFIa
+LRrSUNlzVAu3rij06ZTTzy1v7p/72s+k72Qt7BzfaY2t5oBzKmQfvJWFXeY4pumd
+UAU7QQnL+B3eXoDw6ujRDTVOMbHNtGijdpGSf/T3DsjCFEzXsRN3tC4/F2auqut3
+TiarETYm/2uSz0JNNeBf0EPCajdDO+NLYqOuRWTLDexpx4VGRlMcP3rTcISAiugq
+3F+wV9kSwBXFv9CubQNhstiioBKVFmPWeHgSrWpPDAcp2GCjLI8IW7jmwgxpluz9
+9bcSDGq6WivmDdgRM4vq
+=+QjA
 -----END PGP SIGNATURE-----
diff --git a/net-im/kadu/kadu-0.12.3.ebuild b/net-im/kadu/kadu-0.12.3.ebuild
index ea490b8d4e7e..b8b0c955968e 100644
--- a/net-im/kadu/kadu-0.12.3.ebuild
+++ b/net-im/kadu/kadu-0.12.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-im/kadu/kadu-0.12.3.ebuild,v 1.7 2014/12/31 13:34:24 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.12.3.ebuild,v 1.8 2015/01/29 00:42:13 johu Exp $
 
 EAPI="4"
 
@@ -23,7 +23,7 @@ REQUIRED_USE="
 	)
 "
 COMMON_DEPEND="
-	>=app-crypt/qca-2.0.0-r2
+	app-crypt/qca:2[qt4(+)]
 	x11-libs/libX11
 	x11-libs/libXfixes
 	x11-libs/libXScrnSaver
@@ -56,7 +56,7 @@ DEPEND="${COMMON_DEPEND}
 	x11-proto/xproto
 "
 RDEPEND="${COMMON_DEPEND}
-	app-crypt/qca-ossl:2
+	|| ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
 	>=dev-qt/qtsvg-4.7.0:4
 	speech? ( app-accessibility/powiedz )
 "