gentoo resync : 16.01.2021

3 files changed, 35 insertions, 24 deletions

diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index 7e265b8b2d13..0b730e5f1fb1 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,9 +1,9 @@
 AUX extra-cmake-modules-5.49.0-no-fatal-warnings.patch 1104 BLAKE2B 9f70e75ed92696e0856a5f1962d9c420ce67b13591dceb0b24990407e3c2b567f5a8c59f16bd97464be40fb291184f0825542e48f0c287ea47536f34eada1a56 SHA512 0aae30715bd5e7ac7eb65bef5caafdcdd22b46a81ba6f3fa9dcca356b146793b6877c7bfbe67ea3f38114c4cba8094c063470421ebf44c06289ef61398200697
 AUX extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch 1636 BLAKE2B 8aa07049667ec2e4e986e459fa557ec171dde2746ff603b7d6a18f3197aa025ff1ee07d89e6dd17a722abde379aed69eaee58b99131c289efa979ad1bc3dc91c SHA512 3ba5f3d6cdf6afb230378e9891426ab64414eb19876ad0a7253b4301a50cd23a1bfbe9f5d267545fe788e846a4f86f93c09887b5f76f96f19643f0e18d6b0ba1
-AUX extra-cmake-modules-5.74.0-disable-qmlplugindump.patch 2677 BLAKE2B 7ee3d039291f65e667d83dafbedf1a7790db9c411962dca48dadf8e65d25733cf1f74b406b871986340e65ab43cea586739274d3e9e36ad00021bfa1fc6700a8 SHA512 47105664fb59b5bee31b58c034e4e83cfa93983d40d369ff82204a35195171a5fab6063f0257eead5186fadd17f87c378daacecc3c9cdb63fdfd0dbe42fe56a7
 AUX extra-cmake-modules-5.88.0-disable-qmlplugindump.patch 2671 BLAKE2B b6dc3f2da4224b8a983ca7305c46f4413dae715980879c3645d9a757c0f0839e3eecac17cf11d2a0bbc36939d0170f08422c3d858dacd7f53a1892165da33ae5 SHA512 3e1adce381c73a370483a8302024b3c808def95ba8eec306e10b9ebae9465a326a683ca29db5998e2c472c900f59cac0b6570222653e5225128a2078e8622555
+AUX extra-cmake-modules-5.90.0-disable-qmlplugindump.patch 3129 BLAKE2B 9bc0c5c8312ff14fbf8b58efea9d2f7c629b20fb8aca7e17ccf5c1425348ffe52e9c8862cd9308924892076d2361a74ac00e1a69fac5288bead037f0fb1309ac SHA512 881ddf5eb2432d402ffd6f1076353a4d903b7165b792ddda2ff8f60e1bf026cb471e6675325356df88c0b882d9f5a9cdcba0d1dba99ac652198e14a9783f54e3
 DIST extra-cmake-modules-5.88.0.tar.xz 319140 BLAKE2B 784483a6b66cb859bb0b8764928e4a42a1c265119196e5f79e074930a302d10698fa7b59f065dfddfd6462b9810d378b2129cee3822b897f187d9a5225de69d1 SHA512 e560aa84dbbc1f1673bb51b7c384a64899244f255c7a20e6f5c4046334a6bbfa4632d01ec75b219cb129f0ac37c328a10fe1ea5bbd05bc4c839d797fa965ce3b
-DIST extra-cmake-modules-5.89.0.tar.xz 323180 BLAKE2B 8689de45af87c9bbef5c12048cf51f37d5bbc50752abe8f3ae055fe9c7e41ead60f88083e62ff9d5957c75b5b5a4c038bbd5f1e18e4c5ce320ec34e24a8d363a SHA512 94e12ee5bc9405664ae6a91c1c9ef13193aa90937f6ae5609c19aabb63666f4e7d287f0f791a8d7d435bb9f537d2fd7355ffae9aa6a9d352321fddfe9f943a85
+DIST extra-cmake-modules-5.90.0.tar.xz 323352 BLAKE2B 00df6be76989e0730b8b0be66ea68d979c22ee66f115720218b80eb6a06f2d471b24c08e4db2b5a4febdc3e44481adce522c4e62cf86bbe0c10d07cd40ae0cab SHA512 1f1257a8b9d0a7ba088d5da3bb96070c6cd18d19a17224249e886d7a4aa9bda8192be54607908b1cbcbea57366649cebde173e5bce64ea16ed3b60d1a5ba04a5
 EBUILD extra-cmake-modules-5.88.0.ebuild 1818 BLAKE2B 15917f0a45637284bb15acd08b87d8569356ea66581905ce69b2a9eb21c06da235d1c742a957326ff8f5f29896a01ca73a1518524324dba6e6f3ec59c53b2a84 SHA512 41f5bde0a7166be8e61ffef3f575aedcbaf50a408bf945993ce69906658400e4f8f6867a4b8856a0533e44477db6beeee73a5de5067db186758c2653670e398b
-EBUILD extra-cmake-modules-5.89.0.ebuild 1823 BLAKE2B 0a28a5df8295bd07699dc3efa4574e172b7b8e63624cf5921a6dd88ef956b784e9c39d2455ffc80c6473b90f73237982b0db0102978e2829120b0133ea1fd5f4 SHA512 02a719e80d0dd8533d9aa96270c21f3340c1def4a2b31238ff035079365707858c19ebef0912b645c3201e05803655c6d04885e1a69cee086e8a609c03cfb2a5
+EBUILD extra-cmake-modules-5.90.0.ebuild 1823 BLAKE2B 654a08b5a890e30065cf966e3009db55f7950423ac9f010f14d45973b81ed20896c77521ebf7c86738637e0df7b537932ef1725e28c07da83fcfca73a8dfe53e SHA512 9211dc25731144874e8f60bcd8570ee8348362620b7844344bf178516455854de201111db360c17edf932faed9d4ec7d55ccd8ee350529c1dc7c8b6a48d100e5
 MISC metadata.xml 480 BLAKE2B ab8e3f4e0a74a0e856bba9cf47e40254738c6d545a569bf12fae38e8e6d1e5d0cfd5a0ffaf6d5266a1532ea455d5f7f5421f1b88fa09539af6e31d2e85e170ad SHA512 0161373d45e5fd9a1c3c4f47892fcf1173419481f8de3ee73cc029ac628d36551516d0b99acc8b227b336ec5ce138844fd2654555edff3a73b8c07dbd931e468
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.89.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.90.0.ebuild
index bfa6d7323bb8..ce19268ac9d8 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.89.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.90.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -34,7 +34,7 @@ RDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
 	"${FILESDIR}/${PN}-5.72.0-skip-ecm_add_test-early.patch"
-	"${FILESDIR}/${PN}-5.88.0-disable-qmlplugindump.patch"
+	"${FILESDIR}/${PN}-5.90.0-disable-qmlplugindump.patch"
 )
 
 python_check_deps() {
diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.74.0-disable-qmlplugindump.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.90.0-disable-qmlplugindump.patch
index 08fcf32338b6..db46d3e86167 100644
--- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.74.0-disable-qmlplugindump.patch
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.90.0-disable-qmlplugindump.patch
@@ -1,33 +1,39 @@
-From 8d30a7dd4517130bf1f6904b0969aaa78e44e16b Mon Sep 17 00:00:00 2001
+From 763df79a4b468acd401f8adb5b245245a63d2934 Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <asturm@gentoo.org>
 Date: Sun, 8 Dec 2019 15:01:33 +0100
 Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to
  avoid sandbox violations
 
-Back story: https://bugzilla.gnome.org/show_bug.cgi?id=744135
+See also: https://phabricator.kde.org/D25812
+
+Backstory: https://bugzilla.gnome.org/show_bug.cgi?id=744135
 BUG: 387753
 ---
- modules/ECMFindQMLModule.cmake.in | 35 +++++++++++++++++++------------
- 1 file changed, 22 insertions(+), 13 deletions(-)
+ 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 8109ab8..1edc01d 100644
+index 7cd737b..9847825 100644
 --- a/modules/ECMFindQMLModule.cmake.in
 +++ b/modules/ECMFindQMLModule.cmake.in
-@@ -26,23 +26,32 @@
- #=============================================================================
- 
+@@ -7,27 +7,36 @@
  include(FindPackageHandleStandardArgs)
--include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
+ include("${ECM_MODULE_DIR}/QtVersionOption.cmake")
  
--query_qmake(qt_binaries_dir QT_INSTALL_BINS)
-+option (ECM_DISABLE_QMLPLUGINDUMP "Do not use qmlplugindump which may segfault in some sandboxed environments" OFF)
- 
--find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir})
+-if (QT_MAJOR_VERSION EQUAL "5")
+-    include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
+-    query_qmake(qt_binaries_dir QT_HOST_BINS)
+-    find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir})
+-elseif (QT_MAJOR_VERSION EQUAL "6")
+-    find_package(Qt6QmlTools 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)
@@ -39,16 +45,21 @@ index 8109ab8..1edc01d 100644
  else()
 -    message(STATUS "qmlplugindump failed for @MODULE_NAME@.")
 -    set(@GENMODULE@_FOUND FALSE)
-+    include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
 +
-+    query_qmake(qt_binaries_dir QT_INSTALL_BINS)
++    if (QT_MAJOR_VERSION EQUAL "5")
++        include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
++        query_qmake(qt_binaries_dir QT_HOST_BINS)
++        find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir})
++    elseif (QT_MAJOR_VERSION EQUAL "6")
++        find_package(Qt6QmlTools REQUIRED)
++        get_target_property(QMLPLUGINDUMP_PROGRAM Qt6::qmlplugindump LOCATION)
++    endif()
 +
-+    find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir})
 +    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)
++    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)
@@ -61,5 +72,5 @@ index 8109ab8..1edc01d 100644
  
  find_package_handle_standard_args(@GENMODULE@
 -- 
-2.24.0
+2.34.1