From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B36EB13835A for ; Sun, 25 Oct 2020 00:26:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C947AE0908; Sun, 25 Oct 2020 00:26:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7F6E0E0908 for ; Sun, 25 Oct 2020 00:26:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7591E33BF1A for ; Sun, 25 Oct 2020 00:26:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D108C3B7 for ; Sun, 25 Oct 2020 00:26:41 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1603567779.dfc36a12c97b9ba3b2be0e9f8358e10d6c6bf002.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/okular/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/okular/okular-20.08.49.9999.ebuild kde-apps/okular/okular-9999.ebuild X-VCS-Directories: kde-apps/okular/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: dfc36a12c97b9ba3b2be0e9f8358e10d6c6bf002 X-VCS-Branch: master Date: Sun, 25 Oct 2020 00:26:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 62a995a7-4307-418b-9e6b-c41883f255bd X-Archives-Hash: e386f540014fdf12862a392a66eeb786 commit: dfc36a12c97b9ba3b2be0e9f8358e10d6c6bf002 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Oct 24 19:29:39 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Oct 24 19:29:39 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=dfc36a12 kde-apps/okular: Add missing DEPEND for IUSE="chm" Bug: https://bugs.gentoo.org/750941 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/okular/okular-20.08.49.9999.ebuild | 4 +++- kde-apps/okular/okular-9999.ebuild | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/kde-apps/okular/okular-20.08.49.9999.ebuild b/kde-apps/okular/okular-20.08.49.9999.ebuild index 813a62c06f..781454848b 100644 --- a/kde-apps/okular/okular-20.08.49.9999.ebuild +++ b/kde-apps/okular/okular-20.08.49.9999.ebuild @@ -44,6 +44,7 @@ DEPEND=" sys-libs/zlib chm? ( dev-libs/chmlib + dev-libs/libzip:= >=kde-frameworks/khtml-${KFMIN}:5 ) djvu? ( app-text/djvu ) @@ -83,6 +84,8 @@ src_configure() { local mycmakeargs=( -DOKULAR_UI=$(usex qml "both" "desktop") $(cmake_use_find_package chm CHM) + $(cmake_use_find_package chm KF5KHtml) + $(cmake_use_find_package chm LibZip) $(cmake_use_find_package djvu DjVuLibre) $(cmake_use_find_package epub EPub) $(cmake_use_find_package image-backend KF5KExiv2) @@ -95,7 +98,6 @@ src_configure() { $(cmake_use_find_package speech Qt5TextToSpeech) $(cmake_use_find_package tiff TIFF) ) - ecm_src_configure } diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild index 23579f5d89..5cd236d78a 100644 --- a/kde-apps/okular/okular-9999.ebuild +++ b/kde-apps/okular/okular-9999.ebuild @@ -44,6 +44,7 @@ DEPEND=" sys-libs/zlib chm? ( dev-libs/chmlib + dev-libs/libzip:= >=kde-frameworks/khtml-${KFMIN}:5 ) djvu? ( app-text/djvu ) @@ -78,6 +79,8 @@ src_configure() { local mycmakeargs=( -DOKULAR_UI=$(usex qml "both" "desktop") $(cmake_use_find_package chm CHM) + $(cmake_use_find_package chm KF5KHtml) + $(cmake_use_find_package chm LibZip) $(cmake_use_find_package djvu DjVuLibre) $(cmake_use_find_package epub EPub) $(cmake_use_find_package image-backend KF5KExiv2)