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, 39 insertions, 15 deletions

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index 5227ece90b51..6761b295aecb 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kopete
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.449 2014/12/11 15:45:05 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.450 2015/01/28 23:45:22 johu Exp $
+
+  28 Jan 2015; Johannes Huber <johu@gentoo.org> kopete-4.12.5.ebuild,
+  kopete-4.14.3.ebuild:
+  Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1.
 
   11 Dec 2014; Manuel Rüger <mrueg@gentoo.org> -kopete-4.14.2.ebuild:
   Remove KDE SC 4.14.2
diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index 1a1f3d485c69..15f03d06a58f 100644
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -1,6 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST kopete-4.12.5.tar.xz 6309392 SHA256 bfb4f8147b04c521bfee9018157cd6ce8e4dd559cb7e755ec5920503e414440d SHA512 50663de13d27ea9a225cb66629983107812f1626d9a73b7aa215153e3b5883f6edc1216e60683179f412e620959635c4f888e890ca53303c63d148729621ccc1 WHIRLPOOL 81cb187d3002d87f3bbe82e8445413c2084f50cdbfff7209a440b5de3f2ee777852d6cc0bf2161e887c9d7f3b43104452d4ff589a9cbd4fcb0c7fce66d964556
 DIST kopete-4.14.3.tar.xz 6317288 SHA256 ba23c6dea57233e0861865a1d76c356b0d3f7037f95e2166d0daef14e6c13845 SHA512 33a433da426e7a4a519f033bb14635f31c92954f8e6c46b41759f4e1e41197aed9d07894b163a1e484648ac0e9f92914afe20dfbaa8ddff56b8751d426afd9fc WHIRLPOOL 62d8df47f3214b8cf05fc9ffab3662cc10a1402fd2d33339adb91cd91651c2652dc1dd637130f9e77bf77825b23e19c813f5c43614160cd4dcec945c19e3542e
-EBUILD kopete-4.12.5.ebuild 4130 SHA256 8584ebb2b3513e6d14c4bb7e4e5b9b3c481926371894a209c09599485a643049 SHA512 bb841cccd3004d5821846922acf29087b76ecd611519c1ac2e9dcd3b0fcfcfb258c3d679178047b3934b81b46670e35b05e5d5a8ec8a7d7e8c59a10d00a6c29b WHIRLPOOL d6ef29691faf10637dde52120a78a87b3b2f740469a49e2ce879a703de06e1b261fcdc9841a8f576f8527d0dea9fcd84aa39cbb9b00e91f6d3f4c0423dcf29e6
-EBUILD kopete-4.14.3.ebuild 4057 SHA256 e1d504c9d4ae974003d35525e7854d5f1ac77c49e290c74eecba9babcb53523c SHA512 8f209bcc762fd47ee9b8cd6e9a865921fc1375b29f03ed4a7fbe8e0d686f743ed050dbe71ade0b5d9051b63f725830cacad264852d09c4b7e95f7e378e37fe42 WHIRLPOOL a67d206a76dc2664d47546d1f7987820ef36d3ef1f0024bec3ce9c33311993cc21b95820fe1c228778f2352d011f88cdcc1ab419e9df4e3d761d933a9daa08c9
-MISC ChangeLog 61230 SHA256 22191e79defbac3ccd38ad5bb4ff1a4a43132941a65da33dd0093b820a8ce48f SHA512 65d750f58fc17ca1805f435b44b448c83f583ee310407713913ca85e75f81376725fcff96ae82ee83d85c720e0638735c794dee0896648317d203d3c074c6950 WHIRLPOOL 00b9985b8db5ec47363d70644047749afe16dcf88d7ad102f01258e8be17f8b2aea5a83da2a47c885ff3238060b150ccdb421588ddf3ce0b34cd53f230e11b20
+EBUILD kopete-4.12.5.ebuild 4181 SHA256 ebc037e96b63d4ef3d4be5c621b53a2a670ed9a743c3e111c622b9831cbd28ce SHA512 445b5c7c3699394003e101a550b125fb191c8dbac691bd6a6dc50fabd1165a29a88ac5a082733218ac82ccd0ad329fef12805b6ebaa42daafe7c316c7dbb91cf WHIRLPOOL 35efd9545f54545e3aee919ea156cf0608149e8243f2371f41fc1334564ad41552ae643fa8498d002a43a6e8133c6805e8db8fd274a7682ab79640161f9cc3c2
+EBUILD kopete-4.14.3.ebuild 4102 SHA256 1f1bb3910dade986bd92a6caa83292af031aa63dfe43a5612ce37c84df5f5ca7 SHA512 4258eeb0016839902599f7ecc85e0d608a2518067087c18bbfbeabf9e70302093db8157f9360999560a4ff3f384cc5eb13777c9618d634fa3f561f4d7de9dc99 WHIRLPOOL 2eda4470a986acdde711039f2c402f936558e102c5f10a1cd6537df697bb7dcd917279a99ae5a4ec9b84be5208da18cadf134de0bc99f1d601eab8607e013cbf
+MISC ChangeLog 61395 SHA256 2b353c66fc6c2efb6ab06d9608d7f9d26211ce0deff00a5d9cb38bde6f136d70 SHA512 d13f2f93c4ffbf9310b19de0434e29e11f74c3793139dbd997cceccf411d905772187ee045dcbfccd6ed73b1e3f3d4367033254c6f51345cce13a29d4a2f5c94 WHIRLPOOL a59a1e40b87dfc6122e70198e8c5793495d883ab4f26349e3c1fe25c585a1683872534d292f7063941fd5bd2d03e4177b5c04145498bd204f595c62cfa66307a
 MISC metadata.xml 2449 SHA256 2373b4b12a5db6aed29c91a5a9c114250692ac02691b3ec919dda89ceeb3fa0b SHA512 087fd456daee8ce857b321d32a572838fb5c32137c051ff9f1a8df9cded0dbcbc3517a784347e9231ecc41069d8ef5242efd08def865489bb434e99ddaf0db88 WHIRLPOOL dfe45c7f2a1821f5636ea1dc88e38cd47b9f4b6d4831c60cb68f4ce52eea03435e46fc128bf8af36e5f7de5598408989f9ae419dec62cc096f15f1717a67cb61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJUyXSTAAoJEGVpnaTzz9K9GcwP/3W/ZHbtV5/ZaoEJBucgw57F
+Tdl1NjWdl+qgt16vCi9jlTOTopPXgnQlcRvAJ2WsiZg8LGbO4jVKhDk9P3CFt1k3
+hPfcauJoOjebW1FeygJGMa9K+/Fx/+mPG4P1uOpBenmzAeZl79lh38l2g1LPDc/p
+fcySwGFu+TljKfO6910EIajl8XHwIvYQQwcC1l70g/hWgFiFu+oNvWCYwt8OPWCt
+qsPjbcrBD8uOG5YkmiKxOFA7dmkJBtA+uGHcH0WZR99CsxQsYseCKDxvb6gnbo/f
+o/cB6Gc3MEu8QnQ8gCjLDpLLplaND09SxJDyBux1yr886+0cL9u047EziDeH8cnQ
+2jMv+B/2ZVks8dlA/MkpqPb1/q0mSU89yvkivIjz1Gr2YvBZ6LRfwskd/KGV7gu2
+XcG0zUmX8xpTPi9r2GhSfpC0rYteDRA6rR+/6zcqERRH9TxBz5jKGX1PCWtxc1vN
+BHHdOjyMDsBDsI7+LtfwQw3H731WkdZzcVKoxtgvyei7zvYoUwGj1xqd2yVyfz5S
+k73aakoeFgUTMLSUaoCygZxmLvdkGzwlcnjdtiO1NcALpwQ78TUoW11oirbodizA
+DOsv34b9gJgvj0rX7OWspWzyz0C0ufY0fhwM9lg10KJ4nnB9SF2agm7n7W+7ecPA
+ALyB1al8hrSAWyq3QwYb
+=rOe4
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kopete/kopete-4.12.5.ebuild b/kde-base/kopete/kopete-4.12.5.ebuild
index cf15be234943..d1c05667f074 100644
--- a/kde-base/kopete/kopete-4.12.5.ebuild
+++ b/kde-base/kopete/kopete-4.12.5.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/kde-base/kopete/kopete-4.12.5.ebuild,v 1.5 2014/05/08 07:32:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.12.5.ebuild,v 1.6 2015/01/28 23:45:22 johu Exp $
 
 EAPI=5
 
@@ -71,7 +71,7 @@ COMMONDEPEND="
 	>=dev-qt/qtgui-4.4.0:4[mng]
 	!aqua? ( x11-libs/libXScrnSaver )
 	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
-	groupwise? ( app-crypt/qca:2 )
+	groupwise? ( app-crypt/qca:2[qt4(+)] )
 	jingle? (
 		>=media-libs/mediastreamer-2.3.0
 		media-libs/speex
@@ -87,7 +87,7 @@ COMMONDEPEND="
 		dev-libs/libxslt
 	)
 	xmpp? (
-		app-crypt/qca:2
+		app-crypt/qca:2[qt4(+)]
 		net-dns/libidn
 	)
 	yahoo? ( media-libs/jasper )
@@ -101,7 +101,7 @@ RDEPEND="${COMMONDEPEND}
 		virtual/latex-base
 	)
 	sms? ( app-mobilephone/smssend )
-	ssl? ( app-crypt/qca-ossl )
+	ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
 	winpopup? ( net-fs/samba )
 "
 #	telepathy? ( net-libs/decibel )"
diff --git a/kde-base/kopete/kopete-4.14.3.ebuild b/kde-base/kopete/kopete-4.14.3.ebuild
index c1db5cc60261..8f474bc8c749 100644
--- a/kde-base/kopete/kopete-4.14.3.ebuild
+++ b/kde-base/kopete/kopete-4.14.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/kde-base/kopete/kopete-4.14.3.ebuild,v 1.2 2014/12/11 13:05:46 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.14.3.ebuild,v 1.3 2015/01/28 23:45:22 johu Exp $
 
 EAPI=5
 
@@ -71,7 +71,7 @@ COMMONDEPEND="
 	>=dev-qt/qtgui-4.4.0:4[mng]
 	!aqua? ( x11-libs/libXScrnSaver )
 	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
-	groupwise? ( app-crypt/qca:2 )
+	groupwise? ( app-crypt/qca:2[qt4(+)] )
 	jingle? (
 		>=media-libs/mediastreamer-2.3.0
 		media-libs/speex
@@ -86,7 +86,7 @@ COMMONDEPEND="
 		dev-libs/libxslt
 	)
 	xmpp? (
-		app-crypt/qca:2
+		app-crypt/qca:2[qt4(+)]
 		net-dns/libidn
 	)
 	yahoo? ( media-libs/jasper )
@@ -100,7 +100,7 @@ RDEPEND="${COMMONDEPEND}
 		virtual/latex-base
 	)
 	sms? ( app-mobilephone/smssend )
-	ssl? ( app-crypt/qca-ossl:2 )
+	ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
 	winpopup? ( net-fs/samba )
 "
 #	telepathy? ( net-libs/decibel )"