[gentoo-commits] proj/kde:master commit in: app-editors/okteta/files/, app-editors/okteta/

[gentoo-commits] proj/kde:master commit in: app-editors/okteta/files/, app-editors/okteta/

[Andreas Sturmlechner]

commit:     0e3e70729c9ecf0aa3338e78317c9bf0eae25bf8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 27 20:47:23 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 27 20:47:23 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0e3e7072

app-editors/okteta: Fix build w/ USE=-handbook

See also:
https://github.com/gentoo/gentoo/pull/32474

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/okteta-23.08.0-doctools-optional.patch   | 35 ++++++++++++++++++++++
 app-editors/okteta/okteta-9999.ebuild              |  2 ++
 2 files changed, 37 insertions(+)

diff --git a/app-editors/okteta/files/okteta-23.08.0-doctools-optional.patch b/app-editors/okteta/files/okteta-23.08.0-doctools-optional.patch
new file mode 100644
index 0000000000..65beb70faa
--- /dev/null
+++ b/app-editors/okteta/files/okteta-23.08.0-doctools-optional.patch
@@ -0,0 +1,35 @@
+From 5ca1bc18272c0ddbb3496fa29076ac2d65c034cf Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 27 Aug 2023 21:55:17 +0200
+Subject: [PATCH] Search for KF5DocTools individually
+
+Makes our ECM_HANDBOOK=forceoptional facility work while upstream is against it.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 17203b22f..3c914f178 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -93,7 +93,6 @@ if( BUILD_DESKTOPPROGRAM )
+     list(APPEND ADDITIONAL_REQUIRED_KF_COMPONENTS
+         Crash
+         DBusAddons
+-        DocTools
+     )
+ endif()
+ find_package(KF5 ${REQUIRED_KF_VERSION} REQUIRED
+@@ -117,6 +116,7 @@ ecm_set_disabled_deprecation_versions(
+ # helper libs
+ add_subdirectory( libs )
+ if( BUILD_DESKTOPPROGRAM )
++    find_package(KF5DocTools ${REQUIRED_KF_VERSION} REQUIRED)
+     add_subdirectory( doc )
+ endif()
+ 
+-- 
+2.42.0
+

diff --git a/app-editors/okteta/okteta-9999.ebuild b/app-editors/okteta/okteta-9999.ebuild
index 657703e69c..9433a7e219 100644
--- a/app-editors/okteta/okteta-9999.ebuild
+++ b/app-editors/okteta/okteta-9999.ebuild
@@ -49,6 +49,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-23.08.0-doctools-optional.patch" ) # downstream
+
 src_configure() {
 	local mycmakeargs=(
 		-DOMIT_EXAMPLES=ON

[gentoo-commits] proj/kde:master commit in: app-editors/okteta/files/, app-editors/okteta/

[Andreas Sturmlechner]

commit:     bd9672c2cb5aad81ea7401c8d08de69d186c0e74
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 27 20:52:19 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 27 20:52:19 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=bd9672c2

app-editors/okteta: Fix patch file name

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...0-doctools-optional.patch => okteta-0.26.13-doctools-optional.patch} | 0
 app-editors/okteta/okteta-9999.ebuild                                   | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/okteta/files/okteta-23.08.0-doctools-optional.patch b/app-editors/okteta/files/okteta-0.26.13-doctools-optional.patch
similarity index 100%
rename from app-editors/okteta/files/okteta-23.08.0-doctools-optional.patch
rename to app-editors/okteta/files/okteta-0.26.13-doctools-optional.patch

diff --git a/app-editors/okteta/okteta-9999.ebuild b/app-editors/okteta/okteta-9999.ebuild
index 9433a7e219..1b7c3decfc 100644
--- a/app-editors/okteta/okteta-9999.ebuild
+++ b/app-editors/okteta/okteta-9999.ebuild
@@ -49,7 +49,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-23.08.0-doctools-optional.patch" ) # downstream
+PATCHES=( "${FILESDIR}/${PN}-0.26.13-doctools-optional.patch" ) # downstream
 
 src_configure() {
 	local mycmakeargs=(