From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B4373138AD7 for ; Sun, 22 Feb 2015 21:57:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3DE8BE084F; Sun, 22 Feb 2015 21:57:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C13C9E0899 for ; Sun, 22 Feb 2015 21:57:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 76299340B05 for ; Sun, 22 Feb 2015 21:57:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 24F6B1255C for ; Sun, 22 Feb 2015 21:57:06 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1424641710.632bdb95ade7f7bc8a0b2085f0b327746abd24b2.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kopete/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/kopete/kopete-14.12.2.ebuild kde-apps/kopete/kopete-9999.ebuild X-VCS-Directories: kde-apps/kopete/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 632bdb95ade7f7bc8a0b2085f0b327746abd24b2 X-VCS-Branch: master Date: Sun, 22 Feb 2015 21:57:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fec74ca5-e2f9-4bc4-8652-8adc7a5886ee X-Archives-Hash: b83c17c172d639974e2f5834ab26a593 commit: 632bdb95ade7f7bc8a0b2085f0b327746abd24b2 Author: Johannes Huber gentoo org> AuthorDate: Sun Feb 22 21:48:30 2015 +0000 Commit: Johannes Huber gentoo 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