commit: c17598fbbaa12c67798d045dc1d6798d494941c9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 30 15:42:28 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 31 10:47:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c17598fb
kde-frameworks/extra-cmake-modules: drop 5.116.0, 6.5.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/extra-cmake-modules/Manifest | 1 -
.../extra-cmake-modules-5.116.0.ebuild | 70 --------------------
.../extra-cmake-modules-6.5.0.ebuild | 70 --------------------
...make-modules-5.93.0-disable-qmlplugindump.patch | 76 ----------------------
4 files changed, 217 deletions(-)
diff --git a/kde-frameworks/extra-cmake-modules/Manifest
b/kde-frameworks/extra-cmake-modules/Manifest
index 7aa6482a2197..c6c7d36d9a58 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,2 +1 @@
-DIST extra-cmake-modules-5.116.0.tar.xz 332248 BLAKE2B
3a9b9afc47279c3f3242f5cc8271596533be347374b59db6af49b6b08368917be4321f33d3721d3a3328f52ad9347556b40611702d7b8c52f86a92c7a23613fe
SHA512
c0d73c2a6a155e3f03292335c994ec940892c751334e2336b42640016ebde5a9d72efe6fc6a31b7349504142da01e5974539b82d1e2aa967f448ae3ae80859f6
DIST extra-cmake-modules-6.5.0.tar.xz 340948 BLAKE2B
104e02638042498e9fae486542a30a8f454c11d5c8c7099c10a88e0c34cbfffff1563905a79705ce59a5448af19479ec130bc23182138083e5ff06e312f4c488
SHA512
70150c13f0eb85924d5f80a40efb8981227915c497980bfa8e5622f2cca7b6cad4e0e5ebe0b8a34cdf4aabb33dee66073926dd5ea3a23229823605b0d2f29aee
diff --git
a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.116.0.ebuild
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.116.0.ebuild
deleted file mode 100644
index b3f9beee0ee6..000000000000
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.116.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-QTMIN=5.15.9
-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]"
-BDEPEND="
- doc? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
- >=dev-qt/qthelp-${QTMIN}:5
- )
- test? (
- >=dev-qt/linguist-tools-${QTMIN}:5
- >=dev-qt/qtcore-${QTMIN}:5
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
- "${FILESDIR}/${PN}-5.93.0-skip-ecm_add_test-early.patch"
- "${FILESDIR}/${PN}-5.93.0-disable-qmlplugindump.patch"
- "${FILESDIR}/${PN}-5.112.0-disable-tests-requiring-PyQt5.patch" # bug
680256
-)
-
-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)
- )
-
- 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/extra-cmake-modules-6.5.0.ebuild
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0.ebuild
deleted file mode 100644
index 37cec1eb1db8..000000000000
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-QTMIN=6.6.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]"
-BDEPEND="
- doc? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
- >=dev-qt/qttools-${QTMIN}:6[assistant]
- )
- test? (
- >=dev-qt/qttools-${QTMIN}:6[linguist]
- >=dev-qt/qtbase-${QTMIN}:6
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
- "${FILESDIR}/${PN}-5.93.0-skip-ecm_add_test-early.patch"
- "${FILESDIR}/${PN}-5.112.0-disable-tests-requiring-PyQt5.patch" # bug
680256
- "${FILESDIR}/${PN}-5.245.0-disable-qmlplugindump.patch"
-)
-
-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)
- )
-
- 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-5.93.0-disable-qmlplugindump.patch
b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-disable-qmlplugindump.patch
deleted file mode 100644
index 06406a7eaf6d..000000000000
---
a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-disable-qmlplugindump.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 1c79ef2189dc156bbe0f182411bcc136f140a21d Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <[email protected]>
-Date: Sun, 8 Dec 2019 15:01:33 +0100
-Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to
- avoid sandbox violations
-
-See also: https://phabricator.kde.org/D25812
-
-Backstory: https://bugzilla.gnome.org/show_bug.cgi?id=744136
-BUG: 387753
----
- modules/ECMFindQmlModule.cmake.in | 45 ++++++++++++++++++-------------
- 1 file changed, 27 insertions(+), 18 deletions(-)
-
-diff --git a/modules/ECMFindQmlModule.cmake.in
b/modules/ECMFindQmlModule.cmake.in
-index 0ee5665e..d6e1f14c 100644
---- a/modules/ECMFindQmlModule.cmake.in
-+++ b/modules/ECMFindQmlModule.cmake.in
-@@ -7,27 +7,36 @@
- include(FindPackageHandleStandardArgs)
- include("${ECM_MODULE_DIR}/QtVersionOption.cmake")
-
--if (QT_MAJOR_VERSION EQUAL "5")
-- include("${ECM_MODULE_DIR}/ECMQueryQt.cmake")
-- ecm_query_qt(qt_binaries_dir QT_HOST_BINS)
-- find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS
${qt_binaries_dir})
--elseif (QT_MAJOR_VERSION EQUAL "6")
-- find_package(Qt6 COMPONENTS QmlTools REQUIRED)
-- get_target_property(QMLPLUGINDUMP_PROGRAM Qt6::qmlplugindump LOCATION)
--endif()
--
--if(NOT QMLPLUGINDUMP_PROGRAM)
-- message(WARNING "Could not find qmlplugindump. It is necessary to look up
qml module dependencies.")
--endif()
-+option (ECM_DISABLE_QMLPLUGINDUMP "Do not use qmlplugindump which may
segfault in some sandboxed environments" OFF)
-
--execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@"
"@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE
RESULT_VARIABLE ExitCode TIMEOUT 30)
--
--if(ExitCode EQUAL 0)
-+if(ECM_DISABLE_QMLPLUGINDUMP)
-+ message(NOTICE "@GENMODULE@: qmlplugindump disabled - assuming dependency
is available as >= @VERSION@.")
- set(@GENMODULE@_FOUND TRUE)
-- set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}")
-+ set(@GENMODULE@_VERSION @VERSION@)
- else()
-- message(STATUS "qmlplugindump failed for @MODULE_NAME@.")
-- set(@GENMODULE@_FOUND FALSE)
-+
-+ if (QT_MAJOR_VERSION EQUAL "5")
-+ include("${ECM_MODULE_DIR}/ECMQueryQt.cmake")
-+ ecm_query_qt(qt_binaries_dir QT_HOST_BINS)
-+ find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS
${qt_binaries_dir})
-+ elseif (QT_MAJOR_VERSION EQUAL "6")
-+ find_package(Qt6 COMPONENTS QmlTools REQUIRED)
-+ get_target_property(QMLPLUGINDUMP_PROGRAM Qt6::qmlplugindump LOCATION)
-+ endif()
-+
-+ if(NOT QMLPLUGINDUMP_PROGRAM)
-+ message(WARNING "Could not find qmlplugindump. It is necessary to
look up qml module dependencies.")
-+ endif()
-+
-+ execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@"
"@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE
RESULT_VARIABLE ExitCode TIMEOUT 30)
-+
-+ if(ExitCode EQUAL 0)
-+ set(@GENMODULE@_FOUND TRUE)
-+ set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}")
-+ else()
-+ message(STATUS "qmlplugindump failed for @MODULE_NAME@.")
-+ set(@GENMODULE@_FOUND FALSE)
-+ endif()
- endif()
-
- find_package_handle_standard_args(@GENMODULE@
---
-2.35.1
-
