[gentoo-commits] proj/kde:master commit in: kde-misc/kdeconnect/

[Michael Palimaka]

commit:     e0b8a9690059be864bb0b0b87615866b98563c46
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Mar  8 19:23:34 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Mar 11 16:26:20 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e0b8a969

kde-misc/kdeconnect: KDE_HANDBOOK="optional", EAPI=6

Package-Manager: portage-2.2.27

 kde-misc/kdeconnect/kdeconnect-0.9g.ebuild | 5 ++---
 kde-misc/kdeconnect/kdeconnect-9999.ebuild | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/kde-misc/kdeconnect/kdeconnect-0.9g.ebuild 
b/kde-misc/kdeconnect/kdeconnect-0.9g.ebuild
index 6ee71c7..febdc33 100644
--- a/kde-misc/kdeconnect/kdeconnect-0.9g.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-0.9g.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-KDE_HANDBOOK="true"
+KDE_HANDBOOK="optional"
 KDE_TEST="true"
 KMNAME="${PN}-kde"
 inherit kde5
@@ -29,13 +29,13 @@ DEPEND="
        $(add_frameworks_dep knotifications)
        $(add_frameworks_dep kservice)
        $(add_frameworks_dep kwidgetsaddons)
-       >=app-crypt/qca-2.1.0:2[qt5,openssl]
        $(add_qt_dep qtdbus)
        $(add_qt_dep qtdeclarative)
        $(add_qt_dep qtgui)
        $(add_qt_dep qtnetwork)
        $(add_qt_dep qtwidgets)
        $(add_qt_dep qtx11extras)
+       >=app-crypt/qca-2.1.0:2[qt5,openssl]
        x11-libs/libfakekey
        x11-libs/libX11
        x11-libs/libXtst
@@ -60,7 +60,6 @@ src_prepare() {
 src_configure() {
        local mycmakeargs=(
                -DEXPERIMENTALAPP_ENABLED=$(usex app)
-               $(cmake-utils_use_find_package handbook KF5DocTools)
                $(cmake-utils_use_find_package telepathy TelepathyQt5)
                $(cmake-utils_use_find_package telepathy TelepathyQt5Service)
                $(cmake-utils_use_find_package wayland KF5Wayland)

diff --git a/kde-misc/kdeconnect/kdeconnect-9999.ebuild 
b/kde-misc/kdeconnect/kdeconnect-9999.ebuild
index b8c881a..e595662 100644
--- a/kde-misc/kdeconnect/kdeconnect-9999.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-KDE_HANDBOOK="true"
+KDE_HANDBOOK="optional"
 KDE_TEST="true"
 KMNAME="${PN}-kde"
 inherit kde5
@@ -59,7 +59,6 @@ src_prepare() {
 src_configure() {
        local mycmakeargs=(
                -DEXPERIMENTALAPP_ENABLED=$(usex app)
-               $(cmake-utils_use_find_package handbook KF5DocTools)
                $(cmake-utils_use_find_package telepathy TelepathyQt5)
                $(cmake-utils_use_find_package telepathy TelepathyQt5Service)
                $(cmake-utils_use_find_package wayland KF5Wayland)