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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4759F15800A for ; Sun, 27 Aug 2023 20:56:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 91AF82BC03B; Sun, 27 Aug 2023 20:56:09 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 75AE62BC03B for ; Sun, 27 Aug 2023 20:56:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 55D14335DBB for ; Sun, 27 Aug 2023 20:56:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C248410BD for ; Sun, 27 Aug 2023 20:56:06 +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: <1693169729.6228099a74fb31ded95477a2a20aec69d381b050.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/okteta/files/, app-editors/okteta/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/okteta/files/okteta-0.26.13-doctools-optional.patch app-editors/okteta/okteta-0.26.13.ebuild X-VCS-Directories: app-editors/okteta/files/ app-editors/okteta/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 6228099a74fb31ded95477a2a20aec69d381b050 X-VCS-Branch: master Date: Sun, 27 Aug 2023 20:56:06 +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: 19d97b5a-7eaa-4741-ab5e-7d1921878886 X-Archives-Hash: 1e94912ae7a4f5c7dccca0808e886df5 commit: 6228099a74fb31ded95477a2a20aec69d381b050 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Aug 27 20:47:23 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Aug 27 20:55:29 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6228099a app-editors/okteta: Fix build w/ USE=-handbook See also: https://github.com/gentoo/gentoo/pull/32474 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/okteta-0.26.13-doctools-optional.patch | 35 ++++++++++++++++++++++ app-editors/okteta/okteta-0.26.13.ebuild | 2 ++ 2 files changed, 37 insertions(+) diff --git a/app-editors/okteta/files/okteta-0.26.13-doctools-optional.patch b/app-editors/okteta/files/okteta-0.26.13-doctools-optional.patch new file mode 100644 index 000000000000..65beb70faae9 --- /dev/null +++ b/app-editors/okteta/files/okteta-0.26.13-doctools-optional.patch @@ -0,0 +1,35 @@ +From 5ca1bc18272c0ddbb3496fa29076ac2d65c034cf Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +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 +--- + 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-0.26.13.ebuild b/app-editors/okteta/okteta-0.26.13.ebuild index 4d7c709b3373..6a2d27d2f802 100644 --- a/app-editors/okteta/okteta-0.26.13.ebuild +++ b/app-editors/okteta/okteta-0.26.13.ebuild @@ -53,6 +53,8 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${P}-doctools-optional.patch" ) # downstream + src_configure() { local mycmakeargs=( -DOMIT_EXAMPLES=ON