[gentoo-commits] proj/kde:master commit in: kde-apps/kopete/

["Johannes Huber" <johu@gentoo.org>]

commit:     672999f41c82bddb8da2edd99efd7f4330e8c673
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 28 23:37:42 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jan 28 23:37:47 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=672999f4

[kde-apps/kopete] Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1

Package-Manager: portage-2.2.15

---
 kde-apps/kopete/kopete-14.12.1.ebuild | 6 +++---
 kde-apps/kopete/kopete-9999.ebuild    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kde-apps/kopete/kopete-14.12.1.ebuild b/kde-apps/kopete/kopete-14.12.1.ebuild
index b28414f..3295209 100644
--- a/kde-apps/kopete/kopete-14.12.1.ebuild
+++ b/kde-apps/kopete/kopete-14.12.1.ebuild
@@ -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 )"

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index b6a6493..b5d2c61 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -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 )"