gentoo Easter resync : 12.04.2020

4 files changed, 10 insertions, 133 deletions

diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index 8bab7ef0bcfc..2e681b6f5b30 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,8 +1,7 @@
 AUX extra-cmake-modules-5.49.0-no-fatal-warnings.patch 1104 BLAKE2B 9f70e75ed92696e0856a5f1962d9c420ce67b13591dceb0b24990407e3c2b567f5a8c59f16bd97464be40fb291184f0825542e48f0c287ea47536f34eada1a56 SHA512 0aae30715bd5e7ac7eb65bef5caafdcdd22b46a81ba6f3fa9dcca356b146793b6877c7bfbe67ea3f38114c4cba8094c063470421ebf44c06289ef61398200697
-AUX extra-cmake-modules-5.64.0-tests.patch 5542 BLAKE2B fd8e8762015fcd205039cbb8a6c5a175a6d115e4f52d6af93537e838ce728f3c6212390d5f64478570f9710ce0d9bdec0e68b23417233d8ae6d90803c682ab20 SHA512 71ef3d46b2d148ba06d446f8e589d8ed3b8b3e3ae47e26f90e4571e587955539aaa28154bbef21c0e070bbbaedea71fc3ccdf38c2417e2fd8868a89c1b52e595
 AUX extra-cmake-modules-5.65.0-disable-qmlplugindump.patch 2666 BLAKE2B a321b9881f643fee4b790ce47063b54722a17d98fcc7a17da4a84fcd412ae1dd5ed959767990ae5953e282fc3a8e9ecd4089aa056f0f366a937aa38bd27e153c SHA512 f43998ab4f9cb334d2a269e589aed9db08bdc8c91f2f5413c6e4ea9c5391068146cb7d9de1c7a0bffe61489075231caee535d1e669d95df3bce1fac6aa4155c9
-DIST extra-cmake-modules-5.64.0.tar.xz 339444 BLAKE2B 361689b58ee5b681afd0ff1dfe4ec8fa96f8ba4b1b559be1045c4551e4f874086130fd90a87327b967c9ec48cf532356e675954ceff5fd51f258dd26907110f9 SHA512 81649a1fbe148eab56ff9147b412303112376343c84767139908b9f39e77debcbbf6b8fe2c1edf3151d3556ab9a826eef9b893cc1ef679d0b5cb37096f23fa44
 DIST extra-cmake-modules-5.67.0.tar.xz 339812 BLAKE2B 9fa1c93e512341f6ae91dd2bb7126bdc55b5d1df6390a54f1fa7506f1f903a005103d1259f7962e94c0f2e27bf82d8d4c5320053b197c18305d32ba870ced67e SHA512 1a0e185ea4eac16d57c34f140a4709c0bcd9baaa7e0727ab5c1bfee88fe08efe23dc3634d8f73abade98ad6f2dbf529563e0778f0fbeddaa50b435e12b674229
-EBUILD extra-cmake-modules-5.64.0.ebuild 1560 BLAKE2B 99b5bb4f89e149907fca430c4a2257da530e0f012ac7e39c112b69166d7c73aa3243d19a369b86560753851828a46978a0bbe591a1ec3f84dd9890df913b5152 SHA512 43e2cba69f2a4ff4307e54ae898de3f9c0098c1da09a81d9b2cea7a335c53e93d826781e3286213d179f253b476d8ff4b14c811a225afa92b94029a506e41ac3
-EBUILD extra-cmake-modules-5.67.0.ebuild 1656 BLAKE2B bb18c4b2fedbf26801a1dca0b28e75b6463eb45eb96fb12442949aaf0ec5e797c1ee5ba17e10bff32646f1c9e1def0cb68c02370dd8dae51d2fada2feab6532b SHA512 63a484d37090e42fbf40a8120abd35b15e277d68c2204cf308c7e5bdc46bd9014afa7edaca6a4dce5048949df2a6236e4cfa47b39cc01949833893c65f15d711
+DIST extra-cmake-modules-5.69.0.tar.xz 342704 BLAKE2B 1be871480bc6b61e6b69d6ee11bff047dc491a0300c8c1a6d99e870bb9a0c50affef1a2b973831a2ee1d8154e288952d643b873bdee206ea5e71fb6fa086c4b7 SHA512 e79be580b3254331fd8008be36c9e537e18f0d2b8100f59ae0ccf003a8e15560432cc31e59b232b413f34e79e0a30bc45990ffc3cf259de34af8134fda76606d
+EBUILD extra-cmake-modules-5.67.0.ebuild 1651 BLAKE2B 0c6640ecf97624c8e4e8ad9f00712dfd11646291cfce7089fc9164747ee4b2a240dbd6cd717c6c6d1a59bcd147f328fb24a571ee1d79a98f09967891169230f7 SHA512 092d6f2b59ca53a4c101881282e6d02955e38ffcac2c0865fd24a2eb8eaa8bb33ec3d0eaf78245a7a26412c2f8969b5b0ee9341a75d4fd52a9aea23a18968389
+EBUILD extra-cmake-modules-5.69.0.ebuild 1656 BLAKE2B bb18c4b2fedbf26801a1dca0b28e75b6463eb45eb96fb12442949aaf0ec5e797c1ee5ba17e10bff32646f1c9e1def0cb68c02370dd8dae51d2fada2feab6532b SHA512 63a484d37090e42fbf40a8120abd35b15e277d68c2204cf308c7e5bdc46bd9014afa7edaca6a4dce5048949df2a6236e4cfa47b39cc01949833893c65f15d711
 MISC metadata.xml 273 BLAKE2B e5a4eabc4773a11bcdf052b2ce87104bb85b0ed030475140ad0ec7fea2dcb401f539c67e1b1dc1138a5985be143947c86ff3b0b4d6881cc3a0952140ce33732e SHA512 570f3ea3dd25cac1410c3290a4003a288b9e1a0b873884fc33250dfa110cc39b61bd4db1f4d06e3b6e5f761bda8da222a4e294d12ebd8194d771ac61069ffc92
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.67.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.67.0.ebuild
index 5a9859acaa9a..20db90ad3785 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.67.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.67.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake"
 HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86"
 IUSE="doc test"
 
 BDEPEND="
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.64.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.69.0.ebuild
index 620ba795aed6..5a9859acaa9a 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.64.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.69.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 QTMIN=5.12.3
 inherit cmake kde.org python-any-r1
 
@@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake"
 HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"
 
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="doc test"
 
 BDEPEND="
@@ -33,7 +33,7 @@ RESTRICT+=" !test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
-	"${FILESDIR}/${P}-tests.patch"
+	"${FILESDIR}/${PN}-5.65.0-disable-qmlplugindump.patch"
 )
 
 python_check_deps() {
@@ -66,7 +66,9 @@ src_configure() {
 src_test() {
 	# ECMToolchainAndroidTest passes but then breaks src_install
 	# ECMPoQmToolsTest is broken, bug #627806
+	# possible race condition with multiple jobs, bug #701854
 	local myctestargs=(
+		-j1
 		-E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)"
 	)
 
diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.64.0-tests.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.64.0-tests.patch
deleted file mode 100644
index 511342cd2b9a..000000000000
--- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.64.0-tests.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From d2810741c2166354d7c95d4101eea52035d4fdf5 Mon Sep 17 00:00:00 2001
-From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
-Date: Mon, 4 Nov 2019 12:04:56 +0100
-Subject: Fix ECMSetupVersion tests for old policy with project() wo/ VERSION
-
-With min required cmake version now bumped to 3.5, the policy for CMP0048
-needs to be set explicitly to old now to prepare what the tests check.
-
-Fixup for 5ca01895e3c50322f79feeef5054d7f28b164d68
----
- tests/ECMSetupVersionTest/old_header/CMakeLists.txt                 | 1 +
- tests/ECMSetupVersionTest/old_header_abspath/CMakeLists.txt         | 1 +
- tests/ECMSetupVersionTest/old_simple/CMakeLists.txt                 | 1 +
- tests/ECMSetupVersionTest/old_soversion/CMakeLists.txt              | 1 +
- tests/ECMSetupVersionTest/old_version_file/CMakeLists.txt           | 1 +
- tests/ECMSetupVersionTest/old_version_file_abspath/CMakeLists.txt   | 1 +
- tests/ECMSetupVersionTest/old_version_file_anynewer/CMakeLists.txt  | 1 +
- tests/ECMSetupVersionTest/old_version_file_exact/CMakeLists.txt     | 1 +
- tests/ECMSetupVersionTest/old_version_file_samemajor/CMakeLists.txt | 1 +
- 9 files changed, 9 insertions(+)
-
-(limited to 'tests')
-
-diff --git a/tests/ECMSetupVersionTest/old_header/CMakeLists.txt b/tests/ECMSetupVersionTest/old_header/CMakeLists.txt
-index ea5ef2b..2bf8374 100644
---- a/tests/ECMSetupVersionTest/old_header/CMakeLists.txt
-+++ b/tests/ECMSetupVersionTest/old_header/CMakeLists.txt
-@@ -1,5 +1,6 @@
- cmake_minimum_required(VERSION 3.5)
- 
-+cmake_policy(SET CMP0048 OLD)
- project(old_header)
- 
- set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules)
-diff --git a/tests/ECMSetupVersionTest/old_header_abspath/CMakeLists.txt b/tests/ECMSetupVersionTest/old_header_abspath/CMakeLists.txt
-index 8fbc211..1080a0e 100644
---- a/tests/ECMSetupVersionTest/old_header_abspath/CMakeLists.txt
-+++ b/tests/ECMSetupVersionTest/old_header_abspath/CMakeLists.txt
-@@ -1,5 +1,6 @@
- cmake_minimum_required(VERSION 3.5)
- 
-+cmake_policy(SET CMP0048 OLD)
- project(old_header_abspath)
- 
- set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules)
-diff --git a/tests/ECMSetupVersionTest/old_simple/CMakeLists.txt b/tests/ECMSetupVersionTest/old_simple/CMakeLists.txt
-index 80e670e..30a26fd 100644
---- a/tests/ECMSetupVersionTest/old_simple/CMakeLists.txt
-+++ b/tests/ECMSetupVersionTest/old_simple/CMakeLists.txt
-@@ -1,5 +1,6 @@
- cmake_minimum_required(VERSION 3.5)
- 
-+cmake_policy(SET CMP0048 OLD)
- project(old_simple)
- 
- set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules)
-diff --git a/tests/ECMSetupVersionTest/old_soversion/CMakeLists.txt b/tests/ECMSetupVersionTest/old_soversion/CMakeLists.txt
-index 9d87e14..3e16b99 100644
---- a/tests/ECMSetupVersionTest/old_soversion/CMakeLists.txt
-+++ b/tests/ECMSetupVersionTest/old_soversion/CMakeLists.txt
-@@ -1,5 +1,6 @@
- cmake_minimum_required(VERSION 3.5)
- 
-+cmake_policy(SET CMP0048 OLD)
- project(old_soversion)
- 
- set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules)
-diff --git a/tests/ECMSetupVersionTest/old_version_file/CMakeLists.txt b/tests/ECMSetupVersionTest/old_version_file/CMakeLists.txt
-index 8544e37..712a55a 100644
---- a/tests/ECMSetupVersionTest/old_version_file/CMakeLists.txt
-+++ b/tests/ECMSetupVersionTest/old_version_file/CMakeLists.txt
-@@ -1,5 +1,6 @@
- cmake_minimum_required(VERSION 3.5)
- 
-+cmake_policy(SET CMP0048 OLD)
- project(old_version_file)
- 
- set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules)
-diff --git a/tests/ECMSetupVersionTest/old_version_file_abspath/CMakeLists.txt b/tests/ECMSetupVersionTest/old_version_file_abspath/CMakeLists.txt
-index ee4a5ee..6a17ce5 100644
---- a/tests/ECMSetupVersionTest/old_version_file_abspath/CMakeLists.txt
-+++ b/tests/ECMSetupVersionTest/old_version_file_abspath/CMakeLists.txt
-@@ -1,5 +1,6 @@
- cmake_minimum_required(VERSION 3.5)
- 
-+cmake_policy(SET CMP0048 OLD)
- project(old_version_file_abspath)
- 
- set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules)
-diff --git a/tests/ECMSetupVersionTest/old_version_file_anynewer/CMakeLists.txt b/tests/ECMSetupVersionTest/old_version_file_anynewer/CMakeLists.txt
-index 445fd24..ba31da2 100644
---- a/tests/ECMSetupVersionTest/old_version_file_anynewer/CMakeLists.txt
-+++ b/tests/ECMSetupVersionTest/old_version_file_anynewer/CMakeLists.txt
-@@ -1,5 +1,6 @@
- cmake_minimum_required(VERSION 3.5)
- 
-+cmake_policy(SET CMP0048 OLD)
- project(old_version_file_anynewer)
- 
- set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules)
-diff --git a/tests/ECMSetupVersionTest/old_version_file_exact/CMakeLists.txt b/tests/ECMSetupVersionTest/old_version_file_exact/CMakeLists.txt
-index fbf8e9a..4c80712 100644
---- a/tests/ECMSetupVersionTest/old_version_file_exact/CMakeLists.txt
-+++ b/tests/ECMSetupVersionTest/old_version_file_exact/CMakeLists.txt
-@@ -1,5 +1,6 @@
- cmake_minimum_required(VERSION 3.5)
- 
-+cmake_policy(SET CMP0048 OLD)
- project(old_version_file_exact)
- 
- set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules)
-diff --git a/tests/ECMSetupVersionTest/old_version_file_samemajor/CMakeLists.txt b/tests/ECMSetupVersionTest/old_version_file_samemajor/CMakeLists.txt
-index 8ac01d1..27a9ba8 100644
---- a/tests/ECMSetupVersionTest/old_version_file_samemajor/CMakeLists.txt
-+++ b/tests/ECMSetupVersionTest/old_version_file_samemajor/CMakeLists.txt
-@@ -1,5 +1,6 @@
- cmake_minimum_required(VERSION 3.5)
- 
-+cmake_policy(SET CMP0048 OLD)
- project(old_version_file_samemajor)
- 
- set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules)
--- 
-cgit v1.1