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 80361138A1A for ; Wed, 28 Jan 2015 23:45:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 35A05E07E6; Wed, 28 Jan 2015 23:45:42 +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 BFEF2E07E6 for ; Wed, 28 Jan 2015 23:45:41 +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 123233406F9 for ; Wed, 28 Jan 2015 23:45:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A2C8110837 for ; Wed, 28 Jan 2015 23:45:39 +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: <1422488267.672999f41c82bddb8da2edd99efd7f4330e8c673.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.1.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: 672999f41c82bddb8da2edd99efd7f4330e8c673 X-VCS-Branch: master Date: Wed, 28 Jan 2015 23:45:39 +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: 29c31ef5-5f86-4ccf-b4b1-a41b2701a8f7 X-Archives-Hash: e139baedd6ef06d8c1afd69fe68d3b80 commit: 672999f41c82bddb8da2edd99efd7f4330e8c673 Author: Johannes Huber gentoo org> AuthorDate: Wed Jan 28 23:37:42 2015 +0000 Commit: Johannes Huber gentoo 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 )"