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

6 files changed, 60 insertions, 26 deletions

diff --git a/app-leechcraft/lc-azoth/ChangeLog b/app-leechcraft/lc-azoth/ChangeLog
index 1213a00ef233..28af21386194 100644
--- a/app-leechcraft/lc-azoth/ChangeLog
+++ b/app-leechcraft/lc-azoth/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-leechcraft/lc-azoth
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-azoth/ChangeLog,v 1.24 2014/12/06 18:16:22 maksbotan Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-azoth/ChangeLog,v 1.25 2015/01/28 22:29:09 johu Exp $
+
+  28 Jan 2015; Johannes Huber <johu@gentoo.org> lc-azoth-0.6.60.ebuild,
+  lc-azoth-0.6.65.ebuild, lc-azoth-0.6.70.ebuild, lc-azoth-9999.ebuild:
+  Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1.
 
   06 Dec 2014; Maxim Koltsov <maksbotan@gentoo.org> lc-azoth-0.6.70.ebuild,
   lc-azoth-9999.ebuild, metadata.xml:
diff --git a/app-leechcraft/lc-azoth/Manifest b/app-leechcraft/lc-azoth/Manifest
index 92ef62112a21..e881f405b600 100644
--- a/app-leechcraft/lc-azoth/Manifest
+++ b/app-leechcraft/lc-azoth/Manifest
@@ -4,20 +4,26 @@ Hash: SHA256
 DIST leechcraft-0.6.60.tar.xz 5089252 SHA256 669c2325235c3c49dfc9a30d38c1ad08c0a6abf1ebbf2c8d33eca27e976e1b6d SHA512 0bac75f96bfc43c692e8b61ba5e9b6b82d535a78bd310966c36579666feb8b87217a9d74cfe792fa32b57b9b04e158239acbf2422014735d2316cbda2d8b39ec WHIRLPOOL f3056faab0006830afbcf5f3448094e530c908d432cebec731f305f34347e514db55416a911674c28445a3cd4e542136fd053ee5e444b3cf93e086dc9e88428c
 DIST leechcraft-0.6.65.tar.xz 5067580 SHA256 b821fb8716b3ba04862bbb358a738609ead84cd9c86b569fe31c712b48c2a7fd SHA512 94e3cfa42bea572cb2feeaf4c7153c8d7e08e0597d447db5033b72222cea67370e8948d0dd0e2b89585583a88b4ee3df7b32d72dcd624d383e79b9472ceffe30 WHIRLPOOL bc589f46c89351328e25e6e32febdcba8ead639a8d1daf18df7352372d66fb8f8e7e5bbef02d49b6a00a7f5ffa15d66699b79cc73f64ea1bf8b59949fcd81b8a
 DIST leechcraft-0.6.70.tar.xz 5204940 SHA256 3e7f51da0b7eec6df11471ada409d752754f3badc388b8f0adab3f056fabcd45 SHA512 fedf0467e39bd512c937b25f5da62af2be7908831169e1d82d10af43b7c164be2658138663578d7658c3692d5269dd3df9e391744561443f49771edd063ba408 WHIRLPOOL a0aef0bdc11d4b3a3680a055671208db0528bb4744930a0fecab6d1fbf99cc87f4fd8483e98e93357a4c0dda1f3edc1a20a9a725b28ea9003c564469531a2d37
-EBUILD lc-azoth-0.6.60.ebuild 3559 SHA256 681a10a0757f50de640c33fb7411b5476a490fbc302d15e220fa77e3b6036aab SHA512 38b5f8c1fef7687254b7ae0017ca3e00859369e93388c0c437842a81ca4a80d9b0cfc46700bca52ef4c2bb8d8ec18907ac26f7004944c7f9efc4720f7f0e47ba WHIRLPOOL ab4919e43432ef536823fa98de37e1dd64d07d137f874b2696e1448202a91bd4ce2d825f1c99d82345f21e85ce4bd11fafe0d1e653def25a11a6e381c28a8c9b
-EBUILD lc-azoth-0.6.65.ebuild 3576 SHA256 f6e4392043e75750e169085d04b09ffc39b8f48c0675b6a3a2a0a00df0c25dfa SHA512 c8067a9bd4cddf0d7a6fd623c3b41d6579c474e11b6b49cf0c2486b51f75001072e7db51c73b71f41d14fa6be56494433f2c4dc1c2a8cbb5f504dae3068f079d WHIRLPOOL 06d8d9ba13b47d0ab42c09b72f200e81f07ab4d079c623bdd2008be05d3c9b2b8f427c93f2ee9e650c921182ab9eccda37a393a359201fc3c9962d310cd8ed53
-EBUILD lc-azoth-0.6.70.ebuild 3599 SHA256 dbdc2cd72a87e0d3484eae84c57a2f7406f2b8317aa5899d3c1fb72f2247780b SHA512 253b41419ec105db244bec807a2ba73e4df58e71ec44303d18354b6ff758d536b3098ff839989f3f4598fa77f6019f9969d3f225df4a1e97b0a0abc2393048a8 WHIRLPOOL 2ae5842366dbfefdd9d1c4f71065e97dff54b64ff92aafa37c32261acd7ef17a7ea648174573e09fbe8f85b36d099bdde634fd64b7b3df4bb9debf7cd857f258
-EBUILD lc-azoth-9999.ebuild 3661 SHA256 a479a5e191284ac9eca4b706ab040200a8278083dbf0bb69d3ef8eb41ffbe8b0 SHA512 b95fd8770935d4df892de83f8abba2d9adb4f584ed5479aff93c62cd4abe913f28c1cb3dfd4faef6a00be95d3e1b73f00a555666caf48782f5e4a8ec9b3e9e0c WHIRLPOOL 6a112a13a5a922d9f163df98213b7ddc1d3c4179b43a707a0d845a8d1faa2e45dfd4f6603d2b20d78c570b99bd5fb45ae6e686ffc33f4658f293aae9dac222b3
-MISC ChangeLog 11388 SHA256 bcffe75862e7b1d14937131df88b7cbd5d3aeeba704cd779be670ef9794de079 SHA512 2c4612a1dc65043cce8fafd8436c747ee8d3e6bf8189e5cf3d864a86654c5a1dc4cf0d13037a43181abd8883e8c7cd702391b76d7d99f88cda9f9da15b0c40ea WHIRLPOOL f5e5cfbcdb96887dd50979d3e6894cb6c57023ba15a98f7ca0dc44fe5a067d6553e55be5b2b892b8aa12cebb7073f7cda1256dee33bc168fb325effedd34a17d
+EBUILD lc-azoth-0.6.60.ebuild 3619 SHA256 cd215ac3d7a80f820b825a30f3545c713766e0de7962df3c573b86d0698efc67 SHA512 a45646d15cb10211a7729e1fa7335485e3e5c9eacf8da09d0cdf64c595a035ae8dd9d31cc249f8e840003308a4a86f741706333225a1586474d6d51c93e37af8 WHIRLPOOL efc0c73210410ec77ebcbf32a4c4dbe8710194d05fade97c962f3b23c71acf0a0c77b270422990eb00c97ac509b73cde9ffbeec3e961179ef542bb985312c244
+EBUILD lc-azoth-0.6.65.ebuild 3634 SHA256 89054454d91b1f736c292048f036391c33b5fa092b9f14b9f95c196f6b1096cc SHA512 b9f682c68f730099ab59850c9bb59ba72137ac711ebd0d50d6f983648f4ca5d7748ed2067dde8cf96ebf382022c7134029ca93654f8340500512f96a28a8d7a8 WHIRLPOOL 814c3178808904a64d0d6cc09dd3e640ad2dd3929ebc44700f9b1d429ae4c82d8ca242b68e73a4e16d3501d64290feefaefbcfc3c6bedbe92630af3a9a7a215b
+EBUILD lc-azoth-0.6.70.ebuild 3657 SHA256 1f4e37514019b49dfcc2c8bca555f5efd6cb5e08c3844d4c5a6ac837bed28400 SHA512 29d6bcef1724981bb4701b499691d9dfd9d61f100a688b28a7bd6c495a11487c15e44ec923a53bfcde941b5ca4ec09ad44fd465aeeaafaef7224a6db56324020 WHIRLPOOL 094d01d74fde5df14c83d9cbb7177eb5a6aaa76c1d06839ad717970af404aa3774246cdef7cacfd1f5b8000ad5b2a83a92cc3a8b1608a1e0eb0c99e15fd4e9ea
+EBUILD lc-azoth-9999.ebuild 3719 SHA256 fdef27a7b18832d480c3a8a1a488684b3a099639275ca039ef157a7a4ff37118 SHA512 9bfd7d69f29675c242502841f59132756f50abd9be4115171aed88e4dd03dde61d44ef75ab08c6af3d40e7140afa0b91d6a2c48ec216725f47fc22e830bee78b WHIRLPOOL 966685b8fc5c58ca7e28adce33ed434ed47edb06a6d79a95aef680de4dd0adb55e961571445b6ef2131b5040e81982a7e0ae9c8c80e1caa123e2b9f2caa76c9c
+MISC ChangeLog 11599 SHA256 0a354362a1d838bee143741d9a7a17ec4e43cfc6763ddf5c69b861163794aee1 SHA512 96dc4b3ae86d92f627181dc2e8dced3f57ff2c9a8adaaeb6048df7c8f8f029bc907eb846d9a68d46d2380dd01bc08e4bffc1494d633a1f3f01b437b829f74624 WHIRLPOOL de20dd00486c76e70b1e18771c200d92cfd686b4edcd4459df8b3fdee5f284e06941b805068b1a80524905c1e7e5de55542534c314ae3120d9c7a7e69bbd8c96
 MISC metadata.xml 2597 SHA256 cead907f3a7b17d527712ea6d55452742dcfc9442f551e281c1d286c3ef2dc8b SHA512 44a70e9683c48f03b1b2160a3117e929906cf72001144cfc188ae5e71948b48ec09c76ea981042bacc4500bbd37a8a7cdda6eea3957130c4bdc5aa61b9e62904 WHIRLPOOL 0fad27242ea201291c9ee4ce2faebde5a73cc7550e6551d7a2010a76a730513e0b61219c038ee0c8991c27a3a9f423e169c5309769cd0c21262448b2d3610265
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUg0fUAAoJEAmJmMX429rem04H/jF39Y2hVCTeWw8/8PW/4rYf
-X62aaeDIrVuOI3z3upy3bEP1pYsr83ed3arcGyN7nXpNA3Ph0Qd+ttkS1iN7OT4G
-DfqqfmFCDBUradwBPDxLPHRk35OvOVc7jWvK7fTsiFZfX9ViNY7s4pMIF1JfdT5d
-8sKrik+B0GNkjjVQ+6SVQm7CRlS9pxXW1OO0NSoOgNvv+Ws7m2ZBQDVZoQhbhsNd
-86Vi3NMdrMGrxv4niwNSIKx5NLDuQiMvSy2Xw7naKMGP3WLtz0/cJi6PG1cCQH8n
-DfVWuiOoAc94izgjMNTcj0caopTjx9nZXJZmza+Jc97vTKANJCZwZd8U7ryNS/I=
-=w9Hc
+iQIcBAEBCAAGBQJUyWK2AAoJEGVpnaTzz9K99SoQAMkPtzJ3BOCrgRc6DaotVZl+
+LJHPjIAPYTkUu7qSf6t0G/PbzWMSlekSH5jn6fb+6c2zr6LTZzJhSdT67JwSzZcp
++O96xUdbBfY7hLoqgLoegrKo+gYx25R9NbQ5pg/44cT0j3ryfRMlj0X/G7/dnBQd
+LLwzXcGnxvCnjngYZ9ktqh3qFUn+9U9OkQWCCNkUA7ajiNR4gV324y5Hf10m3mhe
+v79JQulGX7FaCyGF6oibTwu4WjSUG2Rjh+ZTccAzVCPqK72r9oL4Zi5W7b7+vDoi
+cu1kxFO5t/lY4HZqGcQaeBaWuXpkZrYdfDY23arf/EoXoF7PWCV5HOyVz3De5pOB
+40+VhqfqLLwhunJQbuvYMJcJu7kU04QKeCz9egzkelr7oXc8J106GQzCeAucrgF1
+CsfvNnQT+BtGoercFwnBsk5HPQ/iEQEILgePnkm8YfkWtbFUF3BSE5NtphgD6T5h
+VeGFQePm0LjipsJpmUi6ouOcbSmRIaEYKPexovivrhKQdj6aeVWQzuqW73/iS0WF
+/Gueir+prBMj56FUv1gFOfdlkZ+EweJ3Y/kJfzfgYzOoJVDSrsQ31Dzkx/pX4BGP
+9Ssmk7ulcYm8UaosrkYKAr+sO0sEvcATMRoC7Ci/wXXflFK/0cTr9naBVWcSfeKq
+GF6rwIFQgOink9wW2Y8h
+=QUfo
 -----END PGP SIGNATURE-----
diff --git a/app-leechcraft/lc-azoth/lc-azoth-0.6.60.ebuild b/app-leechcraft/lc-azoth/lc-azoth-0.6.60.ebuild
index 1f0de6501e21..31528494c061 100644
--- a/app-leechcraft/lc-azoth/lc-azoth-0.6.60.ebuild
+++ b/app-leechcraft/lc-azoth/lc-azoth-0.6.60.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/app-leechcraft/lc-azoth/lc-azoth-0.6.60.ebuild,v 1.3 2014/04/03 08:06:07 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-azoth/lc-azoth-0.6.60.ebuild,v 1.4 2015/01/28 22:29:09 johu Exp $
 
 EAPI="5"
 
@@ -33,7 +33,7 @@ COMMON_DEPEND="~app-leechcraft/lc-core-${PV}
 			~app-leechcraft/lc-xtazy-${PV}
 			dev-qt/qtdbus:4
 		)
-		crypt? ( app-crypt/qca app-crypt/qca-gnupg )"
+		crypt? ( app-crypt/qca:2[qt4(+)] )"
 DEPEND="${COMMON_DEPEND}
 	doc? ( app-doc/doxygen[dot] )"
 RDEPEND="${COMMON_DEPEND}
@@ -41,6 +41,12 @@ RDEPEND="${COMMON_DEPEND}
 		net-im/telepathy-mission-control
 		net-voip/telepathy-haze
 	)
+	crypt? (
+		|| (
+			app-crypt/qca-gnupg:2
+			app-crypt/qca:2[gpg]
+		)
+	)
 	latex? (
 		|| (
 			media-gfx/imagemagick
diff --git a/app-leechcraft/lc-azoth/lc-azoth-0.6.65.ebuild b/app-leechcraft/lc-azoth/lc-azoth-0.6.65.ebuild
index 509ab61d2c1a..d2af72eb54a6 100644
--- a/app-leechcraft/lc-azoth/lc-azoth-0.6.65.ebuild
+++ b/app-leechcraft/lc-azoth/lc-azoth-0.6.65.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/app-leechcraft/lc-azoth/lc-azoth-0.6.65.ebuild,v 1.1 2014/04/10 17:50:41 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-azoth/lc-azoth-0.6.65.ebuild,v 1.2 2015/01/28 22:29:09 johu Exp $
 
 EAPI="5"
 
@@ -32,7 +32,7 @@ COMMON_DEPEND="~app-leechcraft/lc-core-${PV}
 			~app-leechcraft/lc-xtazy-${PV}
 			dev-qt/qtdbus:4
 		)
-		crypt? ( app-crypt/qca app-crypt/qca-gnupg )"
+		crypt? ( app-crypt/qca:2[qt4(+)] )"
 DEPEND="${COMMON_DEPEND}
 	doc? ( app-doc/doxygen[dot] )"
 RDEPEND="${COMMON_DEPEND}
@@ -40,6 +40,12 @@ RDEPEND="${COMMON_DEPEND}
 		net-im/telepathy-mission-control
 		net-voip/telepathy-haze
 	)
+	crypt? (
+		|| (
+			app-crypt/qca-gnupg:2
+			app-crypt/qca:2[gpg]
+		)
+	)
 	latex? (
 		|| (
 			media-gfx/imagemagick
diff --git a/app-leechcraft/lc-azoth/lc-azoth-0.6.70.ebuild b/app-leechcraft/lc-azoth/lc-azoth-0.6.70.ebuild
index 0e471ac65deb..20d4c5567f6d 100644
--- a/app-leechcraft/lc-azoth/lc-azoth-0.6.70.ebuild
+++ b/app-leechcraft/lc-azoth/lc-azoth-0.6.70.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/app-leechcraft/lc-azoth/lc-azoth-0.6.70.ebuild,v 1.2 2014/12/06 18:16:22 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-azoth/lc-azoth-0.6.70.ebuild,v 1.3 2015/01/28 22:29:09 johu Exp $
 
 EAPI="5"
 
@@ -32,7 +32,7 @@ COMMON_DEPEND="~app-leechcraft/lc-core-${PV}
 			~app-leechcraft/lc-xtazy-${PV}
 			dev-qt/qtdbus:4
 		)
-		crypt? ( app-crypt/qca app-crypt/qca-gnupg )"
+		crypt? ( app-crypt/qca:2[qt4(+)] )"
 DEPEND="${COMMON_DEPEND}
 	doc? ( app-doc/doxygen[dot] )"
 RDEPEND="${COMMON_DEPEND}
@@ -40,6 +40,12 @@ RDEPEND="${COMMON_DEPEND}
 		net-im/telepathy-mission-control
 		net-voip/telepathy-haze
 	)
+	crypt? (
+		|| (
+			app-crypt/qca-gnupg:2
+			app-crypt/qca:2[gpg]
+		)
+	)
 	latex? (
 		|| (
 			media-gfx/imagemagick
diff --git a/app-leechcraft/lc-azoth/lc-azoth-9999.ebuild b/app-leechcraft/lc-azoth/lc-azoth-9999.ebuild
index b663a3f449c6..c07ae0f30654 100644
--- a/app-leechcraft/lc-azoth/lc-azoth-9999.ebuild
+++ b/app-leechcraft/lc-azoth/lc-azoth-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/app-leechcraft/lc-azoth/lc-azoth-9999.ebuild,v 1.13 2014/12/06 18:16:22 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-azoth/lc-azoth-9999.ebuild,v 1.14 2015/01/28 22:29:09 johu Exp $
 
 EAPI="5"
 
@@ -32,7 +32,7 @@ COMMON_DEPEND="~app-leechcraft/lc-core-${PV}
 			~app-leechcraft/lc-xtazy-${PV}
 			dev-qt/qtdbus:4
 		)
-		crypt? ( app-crypt/qca app-crypt/qca-gnupg )
+		crypt? ( app-crypt/qca:2[qt4(+)] )
 		sarin? ( net-libs/tox )
 "
 DEPEND="${COMMON_DEPEND}
@@ -42,6 +42,12 @@ RDEPEND="${COMMON_DEPEND}
 		net-im/telepathy-mission-control
 		net-voip/telepathy-haze
 	)
+	crypt? (
+		|| (
+			app-crypt/qca-gnupg:2
+			app-crypt/qca:2[gpg]
+		)
+	)
 	latex? (
 		|| (
 			media-gfx/imagemagick