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

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

commit:     632bdb95ade7f7bc8a0b2085f0b327746abd24b2
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 22 21:48:30 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Feb 22 21:48:30 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=632bdb95

[kde-apps/kopete] Sync with tree

Package-Manager: portage-2.2.17

---
 kde-apps/kopete/kopete-14.12.2.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.2.ebuild b/kde-apps/kopete/kopete-14.12.2.ebuild
index 7e9238d..469fa13 100644
--- a/kde-apps/kopete/kopete-14.12.2.ebuild
+++ b/kde-apps/kopete/kopete-14.12.2.ebuild
@@ -108,7 +108,7 @@ RDEPEND="${COMMONDEPEND}
 		virtual/latex-base
 	)
 	sms? ( app-mobilephone/smssend )
-	ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
+	ssl? ( app-crypt/qca:2[openssl] )
 	winpopup? ( net-fs/samba )
 "
 #	telepathy? ( net-libs/decibel )"
@@ -158,9 +158,9 @@ pkg_postinst() {
 
 	if ! use ssl; then
 		if use xmpp ; then # || use irc; then
-			if ! has_version app-crypt/qca-ossl ; then
+			if ! has_version "app-crypt/qca:2[openssl]" ; then
 				elog "In order to use ssl in xmpp you'll need to"
-				elog "install app-crypt/qca-ossl package."
+				elog "install app-crypt/qca package with USE=openssl."
 			fi
 		fi
 	fi

diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild
index 0e7ae12..d4e07a0 100644
--- a/kde-apps/kopete/kopete-9999.ebuild
+++ b/kde-apps/kopete/kopete-9999.ebuild
@@ -108,7 +108,7 @@ RDEPEND="${COMMONDEPEND}
 		virtual/latex-base
 	)
 	sms? ( app-mobilephone/smssend )
-	ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
+	ssl? ( app-crypt/qca:2[openssl] )
 	winpopup? ( net-fs/samba )
 "
 #	telepathy? ( net-libs/decibel )"
@@ -158,9 +158,9 @@ pkg_postinst() {
 
 	if ! use ssl; then
 		if use xmpp ; then # || use irc; then
-			if ! has_version app-crypt/qca-ossl ; then
+			if ! has_version "app-crypt/qca:2[openssl]" ; then
 				elog "In order to use ssl in xmpp you'll need to"
-				elog "install app-crypt/qca-ossl package."
+				elog "install app-crypt/qca package with USE=openssl."
 			fi
 		fi
 	fi