commit:     9b27ab2d916d89a9476f9faf8fa1f2112bf991be
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jan 31 01:31:54 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 15:52:57 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9b27ab2d

kde-apps/okular: Fix DEPENDs, tests succeed

Package-Manager: portage-2.2.27

 kde-apps/okular/okular-5.9999.ebuild | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/kde-apps/okular/okular-5.9999.ebuild 
b/kde-apps/okular/okular-5.9999.ebuild
index ad53d64..e08e661 100644
--- a/kde-apps/okular/okular-5.9999.ebuild
+++ b/kde-apps/okular/okular-5.9999.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
 EGIT_BRANCH="frameworks"
 FRAMEWORKS_MINIMAL="5.18.0"
 inherit kde5
@@ -12,15 +13,17 @@ inherit kde5
 DESCRIPTION="Universal document viewer based on KPDF"
 HOMEPAGE="https://okular.kde.org 
https://www.kde.org/applications/graphics/okular";
 KEYWORDS=""
-IUSE="chm crypt dpi djvu ebook +jpeg +pdf +postscript +tiff"
+IUSE="chm crypt djvu ebook +jpeg +pdf +postscript +tiff"
 # TODO:
-# * Deactivated dependency media-libs/qimageblitz as there is no Qt5 version
-#   yet
+# * Deactivated media-libs/qimageblitz as there is no Qt5 version yet
+# * Deactivated kde-apps/kdegraphics-mobipocket, no Qt5 version yet
+# * Not packaged: Qt5TextToSpeech
 
-DEPEND="
+COMMON_DEPEND="
        $(add_frameworks_dep kactivities)
        $(add_frameworks_dep karchive)
        $(add_frameworks_dep kbookmarks)
+       $(add_frameworks_dep kcompletion)
        $(add_frameworks_dep kconfig)
        $(add_frameworks_dep kconfigwidgets)
        $(add_frameworks_dep kcoreaddons)
@@ -39,12 +42,10 @@ DEPEND="
        dev-qt/qtwidgets:5
        media-libs/freetype
        media-libs/phonon[qt5]
-       sys-devel/gettext
        sys-libs/zlib
        chm? ( dev-libs/chmlib )
        crypt? ( app-crypt/qca:2[qt5] )
        djvu? ( app-text/djvu )
-       dpi? ( $(add_plasma_dep libkscreen) )
        ebook? ( app-text/ebook-tools )
        jpeg? (
                $(add_kdeapps_dep libkexiv2)
@@ -54,18 +55,26 @@ DEPEND="
        postscript? ( app-text/libspectre )
        tiff? ( media-libs/tiff:0 )
 "
-RDEPEND="${DEPEND}
-       !kde-base/okular:4
+DEPEND="${COMMON_DEPEND}
+       sys-devel/gettext
 "
-RESTRICT=test
-# test 2: parttest hangs
+RDEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+       kde5_src_prepare
+
+       if ! use test ; then
+               sed -i \
+                       -e "/^add_subdirectory.*conf\/autotests/ s/^/#DONT/" \
+                       CMakeLists.txt || die
+       fi
+}
 
 src_configure() {
        local mycmakeargs=(
                $(cmake-utils_use_find_package chm CHM)
                $(cmake-utils_use_find_package crypt Qca-qt5)
                $(cmake-utils_use_find_package djvu DjVuLibre)
-               $(cmake-utils_use_find_package dpi KF5Screen)
                $(cmake-utils_use_find_package ebook EPub)
                $(cmake-utils_use_find_package jpeg KF5KExiv2)
                $(cmake-utils_use_find_package pdf Poppler)

Reply via email to