gentoo resync : 25.08.2020

3 files changed, 59 insertions, 3 deletions

diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index e4c92ebecd34..fe8d4298425f 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,7 +1,8 @@
 AUX extra-cmake-modules-5.49.0-no-fatal-warnings.patch 1104 BLAKE2B 9f70e75ed92696e0856a5f1962d9c420ce67b13591dceb0b24990407e3c2b567f5a8c59f16bd97464be40fb291184f0825542e48f0c287ea47536f34eada1a56 SHA512 0aae30715bd5e7ac7eb65bef5caafdcdd22b46a81ba6f3fa9dcca356b146793b6877c7bfbe67ea3f38114c4cba8094c063470421ebf44c06289ef61398200697
 AUX extra-cmake-modules-5.65.0-disable-qmlplugindump.patch 2666 BLAKE2B a321b9881f643fee4b790ce47063b54722a17d98fcc7a17da4a84fcd412ae1dd5ed959767990ae5953e282fc3a8e9ecd4089aa056f0f366a937aa38bd27e153c SHA512 f43998ab4f9cb334d2a269e589aed9db08bdc8c91f2f5413c6e4ea9c5391068146cb7d9de1c7a0bffe61489075231caee535d1e669d95df3bce1fac6aa4155c9
+AUX extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch 1636 BLAKE2B 8aa07049667ec2e4e986e459fa557ec171dde2746ff603b7d6a18f3197aa025ff1ee07d89e6dd17a722abde379aed69eaee58b99131c289efa979ad1bc3dc91c SHA512 3ba5f3d6cdf6afb230378e9891426ab64414eb19876ad0a7253b4301a50cd23a1bfbe9f5d267545fe788e846a4f86f93c09887b5f76f96f19643f0e18d6b0ba1
 DIST extra-cmake-modules-5.70.0.tar.xz 343476 BLAKE2B efcf47af54decc383c150aff14628408f6e77001ba4c6bc8a6f1636e62e20c06fb435a0bf7d93ce610ed7404ae186b732d994d2a530f2d65207cee70cdac8af8 SHA512 cbee488db0ccef4c876770ec073408208037d791ea67d9f72937c4fa20765f69d9312a3f9e2106526d4fb0a76e25d7fed13178209f8e0b1b3f01b76be17d4784
-DIST extra-cmake-modules-5.71.0.tar.xz 343720 BLAKE2B 2e127f2b51a1ee23135603b718235236971379b1e1ffdfe0ddf799f7e579fbc9e0ce66d3a186f2fda5c0e4ce27eec9d75d350ff676dd811144dfe78c7d609b80 SHA512 234c3e42fac4a0f926d9420592a8de10e36aa4a164b3d9c15381f2593fce195456f8524c4389179af820e00138a997d5485d94339fcf6311ebcca45c402733c2
+DIST extra-cmake-modules-5.73.0.tar.xz 344348 BLAKE2B fe7df3a60da1e1097a8435ccf221c6b50bc2174f04d4bb9d417f78e5206fd092aefbafe2a8d17f69dea736eaa6fc81d19d2684f49602cc228ae6bfb660773891 SHA512 2ecfbfb757de92e6f0855c102c1b9374807fbffdf2b38a9e5c270baae2382b649c88944ed95c27f2519fb8432a0da32122735eb6f986569ed3229cc5d7f74cad
 EBUILD extra-cmake-modules-5.70.0.ebuild 1660 BLAKE2B a50fb5034e3359dbe527670ff439baadc4a4e77f895de0944610887cabfa466aa2e343a30cdbac3f58bbaa04319eaeaa16c6bdafcdadca530fd37bccabdad6c6 SHA512 ddba4f393fcee5691ac437fa9295836b5b3f791389372937adf917693dec8bebc764bef4484a281b75003ab0824c051dee351dfdbcc05d0da79f72344a9caec0
-EBUILD extra-cmake-modules-5.71.0.ebuild 1665 BLAKE2B 2d2c974a298ad1afa17bf6e262887b0b594352a853d5643763fd3bb8cdd0f7aba1e931c487fc2d55448e6bde3cc2b586720bcb80fc170ba089d191ce283db268 SHA512 e02dbee2e8f2ee0ad952c0f6739972186b5d3873c6573da76daa9da663b9eb7f8304e3f0e1538233b6976452dadc6ad89d2449669ce2050fac2871e173037ebb
+EBUILD extra-cmake-modules-5.73.0.ebuild 1723 BLAKE2B 0ebea2cf8c42156875483acadb3766bef5819ad8e5b3d6d6fcb5c3fad25aabbc2285821ce767d370310fb836986cca2dea9cc15520e86b66c8f2083da8710ab7 SHA512 f8dca85cccb5e09da9e4f42d55b86339234aa30c216eb731f227d0360ff1397e8b2b278aa1191f7b16c4a618f22a00763b09e83c935f245e324a442f7ef5d5e7
 MISC metadata.xml 273 BLAKE2B e5a4eabc4773a11bcdf052b2ce87104bb85b0ed030475140ad0ec7fea2dcb401f539c67e1b1dc1138a5985be143947c86ff3b0b4d6881cc3a0952140ce33732e SHA512 570f3ea3dd25cac1410c3290a4003a288b9e1a0b873884fc33250dfa110cc39b61bd4db1f4d06e3b6e5f761bda8da222a4e294d12ebd8194d771ac61069ffc92
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.71.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.73.0.ebuild
index 6b1f05507126..aedbbe8565e1 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.71.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.73.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
-QTMIN=5.14.1
+QTMIN=5.14.2
 inherit cmake kde.org python-any-r1
 
 DESCRIPTION="Extra modules and scripts for CMake"
@@ -34,6 +34,7 @@ RESTRICT+=" !test? ( test )"
 PATCHES=(
 	"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
 	"${FILESDIR}/${PN}-5.65.0-disable-qmlplugindump.patch"
+	"${FILESDIR}/${PN}-5.72.0-skip-ecm_add_test-early.patch"
 )
 
 python_check_deps() {
diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch
new file mode 100644
index 000000000000..72541d73e72e
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch
@@ -0,0 +1,54 @@
+From ad3aec71ed7f8820e69fe55489368a19d0735ab5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 11 Jul 2020 23:04:16 +0200
+Subject: [PATCH] ECMAddTests.cmake: Skip ecm_add_test early if Qt5::Test is not available
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ modules/ECMAddTests.cmake        | 9 +++++++++
+ tests/ECMAddTests/CMakeLists.txt | 5 +++++
+ 2 files changed, 14 insertions(+)
+
+diff --git a/modules/ECMAddTests.cmake b/modules/ECMAddTests.cmake
+index 4bc7fb8..12825aa 100644
+--- a/modules/ECMAddTests.cmake
++++ b/modules/ECMAddTests.cmake
+@@ -81,6 +81,10 @@ function(ecm_add_test)
+     message(FATAL_ERROR "ecm_add_test() called with multiple source files but without setting \"TEST_NAME\"")
+   endif()
+ 
++  if(NOT TARGET Qt5::Test)
++    return()
++  endif()
++
+   set(_testname ${ARG_NAME_PREFIX}${_targetname})
+   set(gui_args)
+   if(ARG_GUI)
+@@ -122,6 +126,11 @@ function(ecm_add_tests)
+   endif()
+   set(test_names)
+   set(target_names)
++
++  if(NOT TARGET Qt5::Test)
++    return()
++  endif()
++
+   foreach(_test_source ${ARG_UNPARSED_ARGUMENTS})
+     ecm_add_test(${_test_source}
+       NAME_PREFIX ${ARG_NAME_PREFIX}
+diff --git a/tests/ECMAddTests/CMakeLists.txt b/tests/ECMAddTests/CMakeLists.txt
+index e77b33f..4e191fe 100644
+--- a/tests/ECMAddTests/CMakeLists.txt
++++ b/tests/ECMAddTests/CMakeLists.txt
+@@ -1,3 +1,8 @@
++if(NOT TARGET Qt5::Test)
++    message(STATUS "WARNING: skipping tests that require Qt5::Test")
++    return()
++endif()
++
+ macro(add_check NAME)
+     string(REPLACE "." "/" dir "${NAME}")
+     string(REGEX REPLACE "[^.]*\\." "" proj "${NAME}")
+-- 
+2.27.0
+