gentoo auto-resync : 16:08:2024 - 12:22:56

5 files changed, 137 insertions, 0 deletions

diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 270e3bdc4b15..5fb98e715866 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index f91a71fb9607..95d6ea7345b2 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -3,8 +3,11 @@ AUX extra-cmake-modules-5.245.0-disable-qmlplugindump.patch 1570 BLAKE2B 2890d1e
 AUX extra-cmake-modules-5.49.0-no-fatal-warnings.patch 1104 BLAKE2B 9f70e75ed92696e0856a5f1962d9c420ce67b13591dceb0b24990407e3c2b567f5a8c59f16bd97464be40fb291184f0825542e48f0c287ea47536f34eada1a56 SHA512 0aae30715bd5e7ac7eb65bef5caafdcdd22b46a81ba6f3fa9dcca356b146793b6877c7bfbe67ea3f38114c4cba8094c063470421ebf44c06289ef61398200697
 AUX extra-cmake-modules-5.93.0-disable-qmlplugindump.patch 3151 BLAKE2B f10ceecfbfdad60f628cf1b0c0972f8ebc8db615938b23f300f80855bcc77a6f21d35cb56130df760e3e893ee025689869023048434a3f6329f25181304b4eb6 SHA512 8f046619df65df32736a217ca94439e9c567f6a84a3c736507259b20958c1972d21ee7dcda79b11cc220713010fbfb69f516f0ea1ea2b730e5efb7c32a2fdd04
 AUX extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch 1703 BLAKE2B 71d07fcfb3a93caf5f73f818cff7f0139c4866ef3a1abaede189e171217ec9a4e6825ec6d37c344ab8d94989493647f4d7b5749d3db1767b54bb9c6e328ca571 SHA512 8b015810e455aa0a54535f594668595900b0b2d700685c952cbb9a2dd46e3c413815b33fef69f4251bb20c93e4c3a4e6b9691680b3ffcf1bac5cf48931bb5e3b
+AUX extra-cmake-modules-6.5.0-disable-appstreamtest.patch 959 BLAKE2B c2f59c27dd23a4df8dca95cafaeaf1df075a104119fc263cf122aa1c5618c502caa01c460834e2fa0f00755d5ed2837e79d97510dfdf5a392e7727fe6924a007 SHA512 6d06c56e2f8d3484f10a733ecc6d16bb1c159335475eb156962cc1c7373c04de2ad15afcbce8b86c3684af496e2eed926b66455cb997a8574259abeda3cc2abc
+AUX extra-cmake-modules-6.5.0-disable-git-commit-hooks.patch 1132 BLAKE2B 3c52e5e987534718f2243a28e629f866ee87955e10c2fad6a6302d28ed4504b06f661b37e1cb19ac4f107b71742a68ffb689a697393e288c244a68254f14b865 SHA512 2dd727162c0bedbfcbc08a8d5ec35fedc2b5bfd8aed578ecc69319cb20406b75bd7b86fe83fbfe2cc645788cf0806b238f5fa3d6219e6662ad4ed8781d267eec
 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
 EBUILD extra-cmake-modules-5.116.0.ebuild 1632 BLAKE2B e0e30590c952dcfdc0022e0327762ac6b539164aa48f5eb5bcf3a4936237881e461d7019a732fa15d5ad4192c97d71c64c9b155138e31171833cbc774b25af13 SHA512 5843febf66114e687692068069083ac864f9e05052357fbfd0fc6b4ba8b3aaf304e62fb8ffcf8932ab3540a3fe2e84c085771d4cfb676039f3d03d0a0a39cba1
+EBUILD extra-cmake-modules-6.5.0-r1.ebuild 1766 BLAKE2B 9f3fe3422c2f9d57f1c798a638c5607ebc2a61ca0a73e1dbea7e1a4854e06409f70a9ab6b3bc1ee69b713b53dda64c71f0f794ac90747a9eeb35a05c71ace91d SHA512 54a9797096648e209aea2bf827de8b88059a18577e5697612b753c9cf0847401834376ae9b67f4bff8d0497de37c203811d932c5b2fecd594bface5546a51157
 EBUILD extra-cmake-modules-6.5.0.ebuild 1653 BLAKE2B 410354209df46feb13572b001984601228b8619cfa01dc2a821e45cf46496363d1c8de5a8730142bb9edb436939da9b6fca4a84ce9323ecbe96a2d497497f738 SHA512 ce040a12a16507f3046f3b222d479db75bd778629c9f17fd701ead6d73f57bd7cfe0880885129c4e1c3487d4abb7b1a8575cd2f1af39e1d157fcc7a750e58440
 MISC metadata.xml 554 BLAKE2B 7af82aeb7ce6ab40ccaabe8c60c232d0832a6995fed4449777bfd3df39191007080672bfb6d8fbebb756e3380666b9790ab175dd8ea76743fefcecb52d3e1511 SHA512 199c85f33ac9628f012c917e8af4d95ce67a2e0ff6c66b27d46293f9fce37c893e67d0a92587bef076e38ed3553b09c0f40e9757b24c2de608f8411be6045f62
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild
new file mode 100644
index 000000000000..cfe32a36a87c
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild
@@ -0,0 +1,72 @@
+# 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"
+	"${FILESDIR}/${PN}-6.5.0-disable-appstreamtest.patch"
+	"${FILESDIR}/${PN}-6.5.0-disable-git-commit-hooks.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-6.5.0-disable-appstreamtest.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-6.5.0-disable-appstreamtest.patch
new file mode 100644
index 000000000000..3691e891892b
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-6.5.0-disable-appstreamtest.patch
@@ -0,0 +1,31 @@
+From c287bae2677f0339d12a12f90147b5d96cdaa7a1 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 13 Aug 2024 21:44:24 +0200
+Subject: [PATCH] KDECMakeSettings.cmake: Add ECM_DISABLE_APPSTREAMTEST to not
+ run test
+
+and spend time in every consumer.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ kde-modules/KDECMakeSettings.cmake | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/kde-modules/KDECMakeSettings.cmake b/kde-modules/KDECMakeSettings.cmake
+index 3e4ac32f..9f73eb28 100644
+--- a/kde-modules/KDECMakeSettings.cmake
++++ b/kde-modules/KDECMakeSettings.cmake
+@@ -184,7 +184,10 @@ if(NOT KDE_SKIP_TEST_SETTINGS)
+       option(BUILD_TESTING "Build the testing tree." ON)
+       if(BUILD_TESTING)
+          enable_testing()
++option (ECM_DISABLE_APPSTREAMTEST "Do not run appstreamtest" OFF)
++if(NOT ECM_DISABLE_APPSTREAMTEST)
+          appstreamtest()
++endif()
+       endif ()
+    endif ()
+ 
+-- 
+2.45.2
+
diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-6.5.0-disable-git-commit-hooks.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-6.5.0-disable-git-commit-hooks.patch
new file mode 100644
index 000000000000..ad67e8233a4b
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-6.5.0-disable-git-commit-hooks.patch
@@ -0,0 +1,31 @@
+From ed944c8c85822c39dea66afdd1759dec093fd6b3 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 13 Aug 2024 22:15:40 +0200
+Subject: [PATCH] KDEGitCommitHooks.cmake: Add ECM_DISABLE_GIT to silence
+ useless Git search/hooks
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ kde-modules/KDEGitCommitHooks.cmake | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/kde-modules/KDEGitCommitHooks.cmake b/kde-modules/KDEGitCommitHooks.cmake
+index 6122cc7a..fef735a2 100644
+--- a/kde-modules/KDEGitCommitHooks.cmake
++++ b/kde-modules/KDEGitCommitHooks.cmake
+@@ -59,7 +59,12 @@ set(GIT_DIR "${CMAKE_SOURCE_DIR}/.git")
+ set(GIT_HOOKS_DIR "${GIT_DIR}/hooks")
+ set(JSON_SCHEMA_OUT "${GIT_HOOKS_DIR}/scripts/combined.schema.json")
+ 
++option (ECM_DISABLE_GIT "Disable Git commit hooks (for e.g. distro package build)" OFF)
++
+ function(KDE_CONFIGURE_GIT_PRE_COMMIT_HOOK)
++    if(ECM_DISABLE_GIT)
++        return()
++    endif()
+     set(_oneValueArgs "")
+     set(_multiValueArgs CHECKS CUSTOM_SCRIPTS)
+     cmake_parse_arguments(ARG "" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN})
+-- 
+2.45.2
+