diff options
author | Johannes Huber <johu@gentoo.org> | 2015-02-11 21:14:37 +0000 |
---|---|---|
committer | Johannes Huber <johu@gentoo.org> | 2015-02-11 21:14:37 +0000 |
commit | 5e552bdbee13bc705ce264f0c402cf87ec78973b (patch) | |
tree | 66817bc2316b3f5a3801642b031791ca8a2e6246 /net-irc | |
parent | version bump (diff) | |
download | gentoo-2-5e552bdbee13bc705ce264f0c402cf87ec78973b.tar.gz gentoo-2-5e552bdbee13bc705ce264f0c402cf87ec78973b.tar.bz2 gentoo-2-5e552bdbee13bc705ce264f0c402cf87ec78973b.zip |
Restore crypt + kde for qt5 build.
(Portage version: 2.2.16/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
Diffstat (limited to 'net-irc')
-rw-r--r-- | net-irc/quassel/ChangeLog | 5 | ||||
-rw-r--r-- | net-irc/quassel/quassel-9999.ebuild | 18 |
2 files changed, 19 insertions, 4 deletions
diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog index 8a838474dbe2..eadd86551f57 100644 --- a/net-irc/quassel/ChangeLog +++ b/net-irc/quassel/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-irc/quassel # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.186 2015/02/02 02:52:50 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.187 2015/02/11 21:14:37 johu Exp $ + + 11 Feb 2015; Johannes Huber <johu@gentoo.org> quassel-9999.ebuild: + Restore crypt + kde for qt5 build. 02 Feb 2015; Patrick Lauer <patrick@gentoo.org> files/quasselcore.conf: Fix typo in quasselcore.conf #538240 diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild index 12e1866f0505..ea45a4652eb5 100644 --- a/net-irc/quassel/quassel-9999.ebuild +++ b/net-irc/quassel/quassel-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.76 2015/01/29 01:35:36 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.77 2015/02/11 21:14:37 johu Exp $ EAPI=5 @@ -21,6 +21,7 @@ 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] ) ) @@ -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) |