commit:     5ae8e84212b45052fdd9113379c50994657839ff
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May  9 05:33:22 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May  9 05:38:38 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5ae8e842

kde-apps/okular: Drop obsolete patch

Upstream commit 913d437822f23730d10bf97c3ed9201f936a33a2

Closes: https://bugs.gentoo.org/829509
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/okular/okular-9999.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-apps/okular/okular-9999.ebuild 
b/kde-apps/okular/okular-9999.ebuild
index 222d0bef65..8a47d39f2d 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK="optional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.92.0
@@ -70,7 +70,6 @@ RDEPEND="${DEPEND}
 PATCHES=(
        "${FILESDIR}/${PN}-21.11.80-tests.patch" # bug 734138
        "${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name 
entry
-       "${FILESDIR}/${PN}-22.04.0-optional-options.patch" # bug 810958
 )
 
 src_configure() {
@@ -78,8 +77,9 @@ src_configure() {
                -DCMAKE_DISABLE_FIND_PACKAGE_CHM=ON
                -DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON
                -DCMAKE_DISABLE_FIND_PACKAGE_LibZip=ON
+               
-DFORCE_NOT_REQUIRED_DEPENDENCIES="KF5DocTools;CHM;KF5KHtml;LibZip;KF5Wallet;DjVuLibre;EPub;KF5KExiv2;Discount;QMobipocket;Poppler;JPEG;LibSpectre;KF5Purpose;Qt5TextToSpeech;TIFF;"
                -DOKULAR_UI=$(usex qml "both" "desktop")
-               -DWITH_KWALLET=$(usex crypt)
+               $(cmake_use_find_package crypt KF5Wallet)
                $(cmake_use_find_package djvu DjVuLibre)
                $(cmake_use_find_package epub EPub)
                $(cmake_use_find_package image-backend KF5KExiv2)

Reply via email to