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

4 files changed, 38 insertions, 35 deletions

diff --git a/net-im/qutim/ChangeLog b/net-im/qutim/ChangeLog
index 8af97cbc3df0..61fbb75f0874 100644
--- a/net-im/qutim/ChangeLog
+++ b/net-im/qutim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/qutim
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.35 2014/12/31 13:35:53 kensington Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.36 2015/01/29 01:18:11 johu Exp $
+
+  29 Jan 2015; Johannes Huber <johu@gentoo.org> qutim-0.3.1-r1.ebuild,
+  qutim-0.3.2.ebuild:
+  Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1.
 
   31 Dec 2014; Michael Palimaka <kensington@gentoo.org> qutim-0.3.1-r1.ebuild,
   qutim-0.3.2.ebuild:
diff --git a/net-im/qutim/Manifest b/net-im/qutim/Manifest
index 440912decdf9..9b068a2d4f88 100644
--- a/net-im/qutim/Manifest
+++ b/net-im/qutim/Manifest
@@ -6,25 +6,24 @@ AUX qutim-0.3.1-cmake-2.8.12-qt-build.patch 4506 SHA256 c9354118436e71c978c0fca5
 AUX qutim-0.3.2-astral-migrate-qt-telepaphy.patch 5761 SHA256 865b38868e90a599b9123eb5d42e6946c39e98871ee5e39aea3fe4b08b82a956 SHA512 e930fe3f6d33fc27c5cc578fceb09280c72201290e0e3eb97f57d8fd08616e4234b526db1a0445f78ef0338b1b6c83f60ff8be1123a8a5639a5b9d58f51d2f26 WHIRLPOOL 7c16f5f04fa367e48da1e20242d20a4b7c84024a7aa860a6ab70f8b8b7102e3b9d965d13666083e275ff3232248faf1811393d64ff1f7bff3bf2957cfe87de60
 DIST qutim-0.3.1.tar.bz2 12056208 SHA256 a85f2bbb1d8010ee5506b0e82185a21a950d2fa36f72373a192070859e4944e1 SHA512 c3902aad605596bca943a2de706dcf1c35a0cf55df1309d8d0a7a4950a5900bc60829d6a785e408cbb66f21ba6ac3e5315d8d5140eed476ebee3bcb94cd3bc57 WHIRLPOOL 06a04a87f7cf24cf9440d263c835bb3273336838f9a927fc0debccec44861e057b5c97e5ab24d6f89c42edca6f183023396116fd0f5a32d04abfc01fdb27222a
 DIST qutim-0.3.2.tar.xz 10232436 SHA256 326bd4048cdee2913b6a01900d15736c54b431b4ec1a11c88e567920c2948849 SHA512 0767552e31d6e999f6622f14a48e2da7f4497b4a958550189dce38709689cb5f12e9b91a55b5d94d1a24f3e8149cf8453dea56b7e5a8c1758a6579c4142f01cb WHIRLPOOL dac2bb0c43e4bc195c2374aa885ae8174317eccb8e02d011902f4416b3808bf598507e1c74668f1ff04a53bd828d8695c93cc83e04342fdb92688b44236eb2a5
-EBUILD qutim-0.3.1-r1.ebuild 3600 SHA256 ac4529d8dbc9cd59de48259fb8c098f2128d0b9cd3d1f3eb49ecb196fb834d2f SHA512 02127e3845397807900a294ee2e8303d859567b49739b4448e4d9b6b33445afdf8a17d70d4f921b4528412a064ab3cf296876a4e1409c012f59fb244188ad3f1 WHIRLPOOL 1d4ed52815424303f4eb59832e6d24aec26f80853da34524cce03c78f4660c4414ff62f76a864a5ac9ce32dc5b0a6e838974f7c0b34ab22d08958cad6ab0b424
-EBUILD qutim-0.3.2.ebuild 5750 SHA256 5f07a3fc2a997631bda02e536f440f112969bdb2689fab6ff597119df72deef2 SHA512 939270b267954be93581348e31892d34e61420430b14a16478279634f9036f8c8fb40cf301390ed9af38a885d94bf2de31ab5d87606e09f11549479a1f6077b7 WHIRLPOOL 16686cacc38afd7d360556348cbf780472730c84b272b6c2f1027c9a2d1db9e0276be50e6940d4f27e9f8ad204f280d758478faab51d3c4b1f3e6d2f706d9496
-MISC ChangeLog 5857 SHA256 6836a9a65fdaa3f4e9457a1520b431970087b187c9fa15ba097ff71d92b65e5e SHA512 9b5d79c93dc6815bcb9851174c527f9026d44733511ff66ba6ffbdd064dbd1a40b0f901738ccae5a4d1191d8e593bf1bf6d354244e279bb58ce32849b022cfc7 WHIRLPOOL 45a04f1a0db3630ceb18617c643b05e8b858fe3b184e8d2a7d03825cf4e354a36f5fde3c5e8aa2edf63a9925910d0f2068e6b8cf9db9f8516eb2b25832931d15
+EBUILD qutim-0.3.1-r1.ebuild 3678 SHA256 94952c5eabe309062731f78ab5690007250bac2fa92fd76cbdcc147a777dec91 SHA512 a878f75c2f6e6c637c55a5545dfcec0724addf9326ef2027cd2f9e717170378fff177064f5886ce1cca8d0b9f9c01089551905a69e2a77e878e043e5e627ea60 WHIRLPOOL b77f48f81533f136e1eb57402f0c07ed4ef8fad2de48cce963932b1015d00adc4ada04d555e7816343d54dfeb6651436794fe4a48283385299a5b3313be12c57
+EBUILD qutim-0.3.2.ebuild 5836 SHA256 8f11e04b7dd4fb9ffe51e4d4c26e43bffe4ab7d68c8d254cc76407866fa53b0a SHA512 6d4ec912ebc57249d41002896e338d37ceea970b3d0476614aa290256e2651df8df0dbd95e55e1f8339c2fd43961b7397abe9f677c2d02c7e7163042a78cc3dc WHIRLPOOL e260d220b5bf5abd977de405bde8a54e7d788f414acf87a96112a194a517bb274308cf4f304e29ca8511e162659e8f9f84f6ea2f877b6797f1bcf9e4132a18e0
+MISC ChangeLog 6016 SHA256 b7680fb961dcace4957366e77fe5fdfb84ec81f7a4080c1e69b08a0a4a20f94c SHA512 5eef3b063d21833356526072505d7c62628cea116aaf8aac21d028d346434ed2c65f9bbc923d8a0d809a24858bcc779ecdbf7b158760e28f53cfe115f4ddbb99 WHIRLPOOL 42f08589667b6d79015cfebee607fa948e4d057c8ddb4152dc2e33c0f30c2baaf8f8844b307c9ae2620dbc8eb8cc1cf4403e878375aba565be887cf16207aec3
 MISC metadata.xml 2434 SHA256 73b5c832bc3d5eb0787755eadae66cbc21c74d63cf395a58d5f3a8ed8d81b586 SHA512 13c5934ca4c08f919ca822d3f3c129de3728fa7f6f135395d96496c78f745dfc1e8bac3f6640d9bc8ecea38310af32fc532c8b0d3d0d13ecb7c4c5e07a66cb7e WHIRLPOOL 59841e549ad2993588e4a2e09251f1ab86756577366d3cc045ee4707eb05166e5a7e04d7425b46d76b422d0bdb3f06af2f8bb6fdea508d3bfbedc13b80ae971f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJiBAEBCABMBQJUo/vKRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7LGHEADEEc2cINE0w5tMntZb+Im98UiMFeN/bC2tITgkIxa25gZg7epDAEVfPZzK
-1rfiIygqupNSoVJrFCt8k3p8n5Pz9rmdrE933kohOK35K7x64h5FyNhj4GHhWAv7
-HYZ0uwJI9VZFCPls/mlKrWgYL1q1zeTHbupgUknwCaItaAkh9haphKDswiOxK7N7
-Zx1N+kHyTSWEih0SbqMey62zXVFJmz2L/Zw/0emFDFvLeGdYgfvgrt7kKX798ely
-7pI2KuOIBEd8LI0pbrHuGEMAqS2N3RKBEpR/u8N3GssDF5i529xLBKwhj2d9+4KO
-6aSPCEo117CvYmxl1/l5tTmjJzb0gThNx1JnAxqXPS1oYNpl+eTuquU+0RVob/TV
-s7wk7P7PBhipQz2yyzL4X63YqCWKasqFu45unIZILhWvdcf+PQyBuqxO++b4jTgw
-orfgFNXlH6cAGpbzqTLlrZ6T5g3zdb5+n+ummcUUYalPrPabnWIL8HX/zXS4hNlk
-faFuq92gxQ1FIpfTe0XLOAEzGUUnIf9DSmZKCObFMPkaR92VO4DH193oZcbU1mq+
-sxvvWGAxFRq8ewNTuWOsyPCf8m0Kbssbex+xK5G2lFEhKgqO3p9jDHwv9tAylTUj
-+MaGV7rMTriPpiO1tMZ5INI7QoPoWkTzJk1L+h3T8XPHjUHrVA==
-=/1aj
+iQIcBAEBCAAGBQJUyYpUAAoJEGVpnaTzz9K9f0QP/3pTOgjtiF+7vga6JoTdiVAC
+cuf16/W6nCwgZVkEoJBeXHXrA9lC4SF6hPy/uPRUnRy3DGclf6TBQ6nLM9hUSM83
+VV6veR0q1Ci2WwQJgS0Gjl1RFLa+GNElVzMJRdF62EyaHanX3vaXREG7IjviIGdT
+E6p/30bTk/fgheBzyH4XkmEV4oiZPPBhunHvamKcm/hiGE5oc+4RPid5euIPD854
+vbNYEGn9R2n/E4JMsKQa7ftEnBZHf3uJsc2GoPZxWM/hDMsdVOmpnJMIhYCn6dUI
+epkf1gPrVuCGr4+MxPbwH/Oaxa1KCrbOGuB0Ef/R5ocO1NjnHI3RF0OhhZhEXsAO
+vfRxSlai0aWP2rHOoi1oP0RV0rEjKHH2ogvgjSsBPRX61pd9c66M8AsUkaWByI2E
+Z5DklKCg+as9rxrOu+SqlEnBpOGGztOPvnM2iMIQKGNaUVSNztI4IcBJypflTCWc
+89V71lpthpMjF/Yk5tFlVie5JoZHD5Ml2/qn50uqQc6SzjKPM0SvyxSi9ZbGde1s
++UrKBHWnipo3BNbxxjpkJvH1eWrf/HSPOnrrVoguXubBPo505g+UQi+40uG40p71
+7FI7C6CZXSdoPKHnTSnL+fF/EpHjgkygEko2KxlLuBN3vBVr3J2OjI0dIkASKdMM
+PygaEAVx5eS4yQfsajWA
+=ms9l
 -----END PGP SIGNATURE-----
diff --git a/net-im/qutim/qutim-0.3.1-r1.ebuild b/net-im/qutim/qutim-0.3.1-r1.ebuild
index d44a5f28b88f..14a8ec1d783c 100644
--- a/net-im/qutim/qutim-0.3.1-r1.ebuild
+++ b/net-im/qutim/qutim-0.3.1-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-im/qutim/qutim-0.3.1-r1.ebuild,v 1.2 2014/12/31 13:35:53 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.3.1-r1.ebuild,v 1.3 2015/01/29 01:18:10 johu Exp $
 
 EAPI=5
 
@@ -33,19 +33,19 @@ CDEPEND="
 	aspell? ( app-text/aspell )
 	awn? ( >=dev-qt/qtdbus-${QT_PV} )
 	ayatana? ( >=dev-libs/libindicate-qt-0.2.2 )
-	crypt? ( app-crypt/qca:2 )
+	crypt? ( app-crypt/qca:2[qt4(+)] )
 	dbus? ( >=dev-qt/qtdbus-${QT_PV} )
 	debug? ( >=dev-qt/qtdeclarative-${QT_PV} )
 	histman? ( >=dev-qt/qtsql-${QT_PV} )
 	hunspell? ( app-text/hunspell )
 	jabber? (
-		app-crypt/qca:2
+		app-crypt/qca:2[qt4(+)]
 		>=net-libs/jreen-1.1.0
 	)
 	kde? ( kde-base/kdelibs:4 )
 	kinetic? ( >=dev-qt/qtdeclarative-${QT_PV} )
 	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
-	oscar? ( app-crypt/qca:2 )
+	oscar? ( app-crypt/qca:2[qt4(+)] )
 	otr? (
 		>=net-libs/libotr-3.2.0
 		<net-libs/libotr-4.0.0
@@ -70,8 +70,8 @@ DEPEND="${CDEPEND}
 	kde? ( dev-util/automoc )
 "
 RDEPEND="${CDEPEND}
-	jabber? ( app-crypt/qca-gnupg:2 )
-	oscar? ( app-crypt/qca-ossl:2 )
+	jabber? ( || ( app-crypt/qca-gnupg:2 app-crypt/qca:2[gpg] ) )
+	oscar? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
 "
 
 DOCS=( AUTHORS ChangeLog )
diff --git a/net-im/qutim/qutim-0.3.2.ebuild b/net-im/qutim/qutim-0.3.2.ebuild
index 3c0cac461329..3758f6dc3dc7 100644
--- a/net-im/qutim/qutim-0.3.2.ebuild
+++ b/net-im/qutim/qutim-0.3.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-im/qutim/qutim-0.3.2.ebuild,v 1.5 2014/12/31 13:35:53 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.3.2.ebuild,v 1.6 2015/01/29 01:18:10 johu Exp $
 
 EAPI=5
 
@@ -42,19 +42,19 @@ CDEPEND="
 
 	telepathy? ( >=net-libs/telepathy-qt-0.3 )
 	jabber? (
-		app-crypt/qca:2
+		app-crypt/qca:2[qt4(+)]
 		>=net-libs/jreen-1.2.0
 	)
 	jingle? ( dev-qt/qt-mobility[multimedia] )
-	oscar? ( app-crypt/qca:2 )
+	oscar? ( app-crypt/qca:2[qt4(+)] )
 	purple? ( net-im/pidgin )
 	vkontakte? ( >=dev-qt/qtwebkit-${QT_PV} )
 
 	aspell? ( app-text/aspell )
 	awn? ( >=dev-qt/qtdbus-${QT_PV} )
-	crypt? ( app-crypt/qca:2 )
+	crypt? ( app-crypt/qca:2[qt4(+)] )
 	dbus? ( >=dev-qt/qtdbus-${QT_PV} )
-	espionage? ( app-crypt/qca:2 )
+	espionage? ( app-crypt/qca:2[qt4(+)] )
 	histman? ( >=dev-qt/qtsql-${QT_PV} )
 	ayatana? ( >=dev-libs/libindicate-qt-0.2.2 )
 	hunspell? ( app-text/hunspell )
@@ -88,8 +88,8 @@ DEPEND="${CDEPEND}
 	kde? ( dev-util/automoc )
 "
 RDEPEND="${CDEPEND}
-	jabber? ( app-crypt/qca-gnupg:2 )
-	oscar? ( app-crypt/qca-ossl:2 )
+	jabber? ( || ( app-crypt/qca-gnupg:2 app-crypt/qca:2[gpg] ) )
+	oscar? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
 	|| ( kde-apps/oxygen-icons kde-base/oxygen-icons )
 "