diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest index d56bd746a881f..94c40f2a36ee4 100644 --- a/kde-frameworks/extra-cmake-modules/Manifest +++ b/kde-frameworks/extra-cmake-modules/Manifest @@ -1,3 +1,2 @@ DIST extra-cmake-modules-6.13.0.tar.xz 328572 BLAKE2B 2dd0b8890e2a6b7f5696409a0c886491b1b97910773011f7b4b885371eabaabb025b0e2ff85d1a3852b11a9ee782243c0899196fa46c9732105f44801901c090 SHA512 7e6c89e959d6ec5d69f5353a01e0971d94e7d5386c3724a8c3530d9bc7cb4d53d8f1d67bfc76e866af12f4260940d094439fc01a23a55ad0cc74661797345884 -DIST extra-cmake-modules-6.15.0.tar.xz 329068 BLAKE2B 7896a97fbb6fee0857409fae0baede3fb24ec462c2888ff1ecfb68a69878d7f3c78fbf690e89bd31b4190df2dd1b7437652125e2a727fb53dc1b3c41b6dc8d4f SHA512 e3d0be54f22de4768d891a0deec78127d5916c1f7d06bb65654288e805ee718a6111191b5da847a80630a55c875f50e96e5df9eea22d7e1e49281346452b8534 DIST extra-cmake-modules-6.16.0.tar.xz 329140 BLAKE2B 97e02de8c2fafc1d36704124fa8b4e7cbaa6ce50b63395d03a9a080d88046238d05a322c47f9956efb1bd4174d8aa06cf9c554a1b1bbbaf5d9562beb161fa7f4 SHA512 982a40bf36ea5692172b57aa563be132aa236199cde0993bf169241624a9ef7f9b9d5d79e06890da103f49610aeaa6a951562f7bf98f1535540d12670cec49f6 diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.15.0-r1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.15.0-r1.ebuild deleted file mode 100644 index 603de2c69beab..0000000000000 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.15.0-r1.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) -QTMIN=6.7.2 -inherit cmake frameworks.kde.org python-any-r1 - -DESCRIPTION="Extra modules and scripts for CMake" -HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules" - -LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" -IUSE="doc test" - -RESTRICT="!test? ( test )" - -RDEPEND="app-arch/libarchive[bzip2]" -DEPEND=" - test? ( - >=dev-qt/qtbase-${QTMIN}:6[dbus,gui] - >=dev-qt/qtdeclarative-${QTMIN}:6 - ) -" -BDEPEND=" - doc? ( - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') - >=dev-qt/qttools-${QTMIN}:6[assistant] - ) - test? ( - >=dev-qt/qtbase-${QTMIN}:6 - >=dev-qt/qttools-${QTMIN}:6[linguist] - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" - "${FILESDIR}/${PN}-5.93.0-skip-ecm_add_test-early.patch" - "${FILESDIR}/${PN}-5.245.0-disable-qmlplugindump.patch" - "${FILESDIR}/${PN}-6.5.0-disable-appstreamtest.patch" - "${FILESDIR}/${PN}-6.5.0-disable-git-commit-hooks.patch" - "${FILESDIR}/${P}-optional-qttools.patch" # bug 959341 -) - -python_check_deps() { - python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use doc && python-any-r1_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DDOC_INSTALL_DIR=/usr/share/doc/"${PF}" - -DBUILD_QTHELP_DOCS=$(usex doc) - -DBUILD_HTML_DOCS=$(usex doc) - -DBUILD_MAN_DOCS=$(usex doc) - -DBUILD_TESTING=$(usex test) - ) - if use test; then - mycmakeargs+=( -DQT_MAJOR_VERSION=6 ) # bug 938316 - fi - - cmake_src_configure -} - -src_test() { - local CMAKE_SKIP_TESTS=( - # passes, but then breaks src_install - ECMToolchainAndroidTest - # broken, bug #627806 - ECMPoQmToolsTest - # can not possibly succeed in releases, bug #764953 - KDEFetchTranslations - ) - # possible race condition with multiple jobs, bug #701854 - cmake_src_test -j1 -} diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-6.15.0-optional-qttools.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-6.15.0-optional-qttools.patch deleted file mode 100644 index bb2de3e6b9480..0000000000000 --- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-6.15.0-optional-qttools.patch +++ /dev/null @@ -1,32 +0,0 @@ -From af2d6d6dba7d44244abfb2eb513d123296297d3d Mon Sep 17 00:00:00 2001 -From: Azhar Momin -Date: Wed, 18 Jun 2025 11:14:10 +0530 -Subject: [PATCH] [ECMGenerateQDoc] Make QtTools optional - ---- - modules/ECMGenerateQDoc.cmake | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/modules/ECMGenerateQDoc.cmake b/modules/ECMGenerateQDoc.cmake -index b6d64783..68c57050 100644 ---- a/modules/ECMGenerateQDoc.cmake -+++ b/modules/ECMGenerateQDoc.cmake -@@ -55,8 +55,13 @@ add_custom_target(generate_qch) - add_custom_target(install_qch_docs) - - function(ecm_generate_qdoc target qdocconf_file) -- find_package(Qt6Tools CONFIG REQUIRED) -- find_package(Qt6 COMPONENTS ToolsTools CONFIG REQUIRED) -+ find_package(Qt6Tools CONFIG QUIET) -+ find_package(Qt6 OPTIONAL_COMPONENTS ToolsTools CONFIG QUIET) -+ -+ if (NOT Qt6Tools_FOUND OR NOT Qt6ToolsTools_FOUND) -+ message(STATUS "Qt6Tools or Qt6ToolsTools not found, not generating API documentation") -+ return() -+ endif() - - if (NOT TARGET ${target}) - message(FATAL_ERROR "${target} is not a target") --- -GitLab -