From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-771296-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id B3AFC138A1A
for <garchives@archives.gentoo.org>; Wed, 11 Feb 2015 21:13:51 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 4CB9CE090A;
Wed, 11 Feb 2015 21:13:50 +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 DC761E090A
for <gentoo-commits@lists.gentoo.org>; Wed, 11 Feb 2015 21:13:49 +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 A72C93407C9
for <gentoo-commits@lists.gentoo.org>; Wed, 11 Feb 2015 21:13:48 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 2ED49118CB
for <gentoo-commits@lists.gentoo.org>; Wed, 11 Feb 2015 21:13:47 +0000 (UTC)
From: "Johannes Huber" <johu@gentoo.org>
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" <johu@gentoo.org>
Message-ID: <1423689156.62622d7b4ba539c8a4e530edc7f6e75a00df84a7.johu@gentoo>
Subject: [gentoo-commits] dev/johu:master commit in: net-irc/quassel/
X-VCS-Repository: dev/johu
X-VCS-Files: net-irc/quassel/quassel-9999.ebuild
X-VCS-Directories: net-irc/quassel/
X-VCS-Committer: johu
X-VCS-Committer-Name: Johannes Huber
X-VCS-Revision: 62622d7b4ba539c8a4e530edc7f6e75a00df84a7
X-VCS-Branch: master
Date: Wed, 11 Feb 2015 21:13:47 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 3cfe709b-162c-41be-bd90-b7b882ac5eb7
X-Archives-Hash: b04a2ddd46d289cce12c66abf8ff9dbb
commit: 62622d7b4ba539c8a4e530edc7f6e75a00df84a7
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 11 21:12:23 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Feb 11 21:12:36 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=62622d7b
[net-irc/quassel] Restore crypt + kde for qt5 build
Package-Manager: portage-2.2.16
---
net-irc/quassel/quassel-9999.ebuild | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 5b6e27e..33bf5bd 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -21,14 +21,15 @@ IUSE="ayatana crypt dbus debug kde monolithic phonon postgres qt5 +server +ssl s
SERVER_RDEPEND="
qt5? (
dev-qt/qtscript:5
+ crypt? ( app-crypt/qca:2[openssl,qt5] )
postgres? ( dev-qt/qtsql:5[postgres] )
!postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
)
!qt5? (
dev-qt/qtscript:4
crypt? (
- app-crypt/qca:2
- app-crypt/qca-ossl
+ app-crypt/qca:2[qt4(+)]
+ || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
)
postgres? ( dev-qt/qtsql:4[postgres] )
!postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
@@ -44,6 +45,13 @@ GUI_RDEPEND="
dev-libs/libdbusmenu-qt[qt5]
dev-qt/qtdbus:5
)
+ kde? (
+ kde-frameworks/kconfigwidgets:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ktextwidgets:5
+ kde-frameworks/kxmlgui:5
+ kde-frameworks/sonnet:5
+ )
phonon? ( media-libs/phonon[qt5] )
webkit? ( dev-qt/qtwebkit:5 )
)
@@ -81,7 +89,10 @@ RDEPEND="
)
"
DEPEND="${RDEPEND}
- qt5? ( dev-qt/linguist-tools:5 )
+ qt5? (
+ dev-libs/extra-cmake-modules
+ dev-qt/linguist-tools:5
+ )
"
DOCS=( AUTHORS ChangeLog README )
@@ -96,7 +107,7 @@ REQUIRED_USE="
kde? ( || ( X monolithic ) )
phonon? ( || ( X monolithic ) )
postgres? ( || ( server monolithic ) )
- qt5? ( !ayatana !crypt !kde phonon )
+ qt5? ( !ayatana phonon )
syslog? ( || ( server monolithic ) )
webkit? ( || ( X monolithic ) )
"
@@ -115,6 +126,7 @@ src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package ayatana IndicateQt)
$(cmake-utils_use_find_package crypt QCA2)
+ $(cmake-utils_use_find_package crypt QCA2-QT5)
$(cmake-utils_use_find_package dbus dbusmenu-qt)
$(cmake-utils_use_find_package dbus dbusmenu-qt5)
$(cmake-utils_use_with kde)