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 B54F4139360 for ; Tue, 3 Aug 2021 15:00:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 04833E09A7; Tue, 3 Aug 2021 15:00:42 +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 C1ADFE09A7 for ; Tue, 3 Aug 2021 15:00:41 +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 C563C342A9B for ; Tue, 3 Aug 2021 15:00:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3BAAF63F for ; Tue, 3 Aug 2021 15:00:38 +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: <1628002793.028d514c48acb7f98af6daa44a4fcd93062e4925.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-9999.ebuild X-VCS-Directories: kde-apps/okular/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 028d514c48acb7f98af6daa44a4fcd93062e4925 X-VCS-Branch: master Date: Tue, 3 Aug 2021 15:00:38 +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: 34a0d0aa-66eb-4825-901b-07c48b06a6c0 X-Archives-Hash: 08a3dc6b8404876a41a4bcbcefbd83e3 commit: 028d514c48acb7f98af6daa44a4fcd93062e4925 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Aug 3 14:59:53 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Aug 3 14:59:53 2021 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=028d514c kde-apps/okular: Drop IUSE=chm from live Now that we have app-text/kchmviewer back in Gentoo ebuild repo, drop it here and direct users to the separate package where the okular code originally came from anyway. Bug: https://bugs.gentoo.org/806296 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/okular/okular-9999.ebuild | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild index 8cf916b602..387e337470 100644 --- a/kde-apps/okular/okular-9999.ebuild +++ b/kde-apps/okular/okular-9999.ebuild @@ -17,7 +17,7 @@ HOMEPAGE="https://okular.kde.org https://apps.kde.org/okular/" LICENSE="GPL-2" # TODO: CHECK SLOT="5" KEYWORDS="" -IUSE="chm djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff" +IUSE="djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff" DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 @@ -44,11 +44,6 @@ DEPEND=" media-libs/freetype >=media-libs/phonon-4.11.0 sys-libs/zlib - chm? ( - dev-libs/chmlib - dev-libs/libzip:= - >=kde-frameworks/khtml-${KFMIN}:5 - ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( @@ -79,10 +74,10 @@ PATCHES=( src_configure() { local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_CHM=ON + -DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON + -DCMAKE_DISABLE_FIND_PACKAGE_LibZip=ON -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)