Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/okular/
Date: Sun, 25 Oct 2020 00:26:46
Message-Id: 1603567779.dfc36a12c97b9ba3b2be0e9f8358e10d6c6bf002.asturm@gentoo
1 commit: dfc36a12c97b9ba3b2be0e9f8358e10d6c6bf002
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 24 19:29:39 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 24 19:29:39 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=dfc36a12
7
8 kde-apps/okular: Add missing DEPEND for IUSE="chm"
9
10 Bug: https://bugs.gentoo.org/750941
11 Package-Manager: Portage-3.0.8, Repoman-3.0.2
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 kde-apps/okular/okular-20.08.49.9999.ebuild | 4 +++-
15 kde-apps/okular/okular-9999.ebuild | 3 +++
16 2 files changed, 6 insertions(+), 1 deletion(-)
17
18 diff --git a/kde-apps/okular/okular-20.08.49.9999.ebuild b/kde-apps/okular/okular-20.08.49.9999.ebuild
19 index 813a62c06f..781454848b 100644
20 --- a/kde-apps/okular/okular-20.08.49.9999.ebuild
21 +++ b/kde-apps/okular/okular-20.08.49.9999.ebuild
22 @@ -44,6 +44,7 @@ DEPEND="
23 sys-libs/zlib
24 chm? (
25 dev-libs/chmlib
26 + dev-libs/libzip:=
27 >=kde-frameworks/khtml-${KFMIN}:5
28 )
29 djvu? ( app-text/djvu )
30 @@ -83,6 +84,8 @@ src_configure() {
31 local mycmakeargs=(
32 -DOKULAR_UI=$(usex qml "both" "desktop")
33 $(cmake_use_find_package chm CHM)
34 + $(cmake_use_find_package chm KF5KHtml)
35 + $(cmake_use_find_package chm LibZip)
36 $(cmake_use_find_package djvu DjVuLibre)
37 $(cmake_use_find_package epub EPub)
38 $(cmake_use_find_package image-backend KF5KExiv2)
39 @@ -95,7 +98,6 @@ src_configure() {
40 $(cmake_use_find_package speech Qt5TextToSpeech)
41 $(cmake_use_find_package tiff TIFF)
42 )
43 -
44 ecm_src_configure
45 }
46
47
48 diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
49 index 23579f5d89..5cd236d78a 100644
50 --- a/kde-apps/okular/okular-9999.ebuild
51 +++ b/kde-apps/okular/okular-9999.ebuild
52 @@ -44,6 +44,7 @@ DEPEND="
53 sys-libs/zlib
54 chm? (
55 dev-libs/chmlib
56 + dev-libs/libzip:=
57 >=kde-frameworks/khtml-${KFMIN}:5
58 )
59 djvu? ( app-text/djvu )
60 @@ -78,6 +79,8 @@ src_configure() {
61 local mycmakeargs=(
62 -DOKULAR_UI=$(usex qml "both" "desktop")
63 $(cmake_use_find_package chm CHM)
64 + $(cmake_use_find_package chm KF5KHtml)
65 + $(cmake_use_find_package chm LibZip)
66 $(cmake_use_find_package djvu DjVuLibre)
67 $(cmake_use_find_package epub EPub)
68 $(cmake_use_find_package image-backend KF5KExiv2)