Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/okular/
Date: Sun, 31 Jan 2016 15:53:16
Message-Id: 1454255577.9b27ab2d916d89a9476f9faf8fa1f2112bf991be.kensington@gentoo
1 commit: 9b27ab2d916d89a9476f9faf8fa1f2112bf991be
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Sun Jan 31 01:31:54 2016 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 31 15:52:57 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9b27ab2d
7
8 kde-apps/okular: Fix DEPENDs, tests succeed
9
10 Package-Manager: portage-2.2.27
11
12 kde-apps/okular/okular-5.9999.ebuild | 31 ++++++++++++++++++++-----------
13 1 file changed, 20 insertions(+), 11 deletions(-)
14
15 diff --git a/kde-apps/okular/okular-5.9999.ebuild b/kde-apps/okular/okular-5.9999.ebuild
16 index ad53d64..e08e661 100644
17 --- a/kde-apps/okular/okular-5.9999.ebuild
18 +++ b/kde-apps/okular/okular-5.9999.ebuild
19 @@ -5,6 +5,7 @@
20 EAPI=5
21
22 KDE_HANDBOOK="forceoptional"
23 +KDE_TEST="forceoptional"
24 EGIT_BRANCH="frameworks"
25 FRAMEWORKS_MINIMAL="5.18.0"
26 inherit kde5
27 @@ -12,15 +13,17 @@ inherit kde5
28 DESCRIPTION="Universal document viewer based on KPDF"
29 HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular"
30 KEYWORDS=""
31 -IUSE="chm crypt dpi djvu ebook +jpeg +pdf +postscript +tiff"
32 +IUSE="chm crypt djvu ebook +jpeg +pdf +postscript +tiff"
33 # TODO:
34 -# * Deactivated dependency media-libs/qimageblitz as there is no Qt5 version
35 -# yet
36 +# * Deactivated media-libs/qimageblitz as there is no Qt5 version yet
37 +# * Deactivated kde-apps/kdegraphics-mobipocket, no Qt5 version yet
38 +# * Not packaged: Qt5TextToSpeech
39
40 -DEPEND="
41 +COMMON_DEPEND="
42 $(add_frameworks_dep kactivities)
43 $(add_frameworks_dep karchive)
44 $(add_frameworks_dep kbookmarks)
45 + $(add_frameworks_dep kcompletion)
46 $(add_frameworks_dep kconfig)
47 $(add_frameworks_dep kconfigwidgets)
48 $(add_frameworks_dep kcoreaddons)
49 @@ -39,12 +42,10 @@ DEPEND="
50 dev-qt/qtwidgets:5
51 media-libs/freetype
52 media-libs/phonon[qt5]
53 - sys-devel/gettext
54 sys-libs/zlib
55 chm? ( dev-libs/chmlib )
56 crypt? ( app-crypt/qca:2[qt5] )
57 djvu? ( app-text/djvu )
58 - dpi? ( $(add_plasma_dep libkscreen) )
59 ebook? ( app-text/ebook-tools )
60 jpeg? (
61 $(add_kdeapps_dep libkexiv2)
62 @@ -54,18 +55,26 @@ DEPEND="
63 postscript? ( app-text/libspectre )
64 tiff? ( media-libs/tiff:0 )
65 "
66 -RDEPEND="${DEPEND}
67 - !kde-base/okular:4
68 +DEPEND="${COMMON_DEPEND}
69 + sys-devel/gettext
70 "
71 -RESTRICT=test
72 -# test 2: parttest hangs
73 +RDEPEND="${COMMON_DEPEND}"
74 +
75 +src_prepare() {
76 + kde5_src_prepare
77 +
78 + if ! use test ; then
79 + sed -i \
80 + -e "/^add_subdirectory.*conf\/autotests/ s/^/#DONT/" \
81 + CMakeLists.txt || die
82 + fi
83 +}
84
85 src_configure() {
86 local mycmakeargs=(
87 $(cmake-utils_use_find_package chm CHM)
88 $(cmake-utils_use_find_package crypt Qca-qt5)
89 $(cmake-utils_use_find_package djvu DjVuLibre)
90 - $(cmake-utils_use_find_package dpi KF5Screen)
91 $(cmake-utils_use_find_package ebook EPub)
92 $(cmake-utils_use_find_package jpeg KF5KExiv2)
93 $(cmake-utils_use_find_package pdf Poppler)