gentoo resync : 18.11.2019

3 files changed, 144 insertions, 17 deletions

diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index c84c3953f0d1..a813f28312aa 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,6 +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
 DIST extra-cmake-modules-5.60.0.tar.xz 325768 BLAKE2B de99c37171d298ef8168403b9b27275171db142f204a2c2b3ff82942390b91510e16a19f0d366242f03259c0c045186a8a8f5bd598ef6051709a307423972fab SHA512 c505f765169d4e77a836d971cabe513f5fbda6c772bff10a97013dd14fb91167b461c7e01382e41c4e9ca050a20ab828f3090ef7cd64625fa784d81f2cbf2743
-DIST extra-cmake-modules-5.63.0.tar.xz 330556 BLAKE2B c5bdb0d5db78b0ffe3f5227bcc8ccc067904b2b648b66a4593776e93ba5bf500c69948daa3694ae1dcf8c15a8cf6f493976c3dcebe97934e51ab8e42ad804f9d SHA512 e2e50c43b6b639cebc11dfde7dbc8db6587d34cbcb4b4aa88edc683dbe16ca733aee8cd15de70f634af5d01ad774c882c58d43876d4177bf18b0ddd1c6a9db36
+DIST extra-cmake-modules-5.64.0.tar.xz 339444 BLAKE2B 361689b58ee5b681afd0ff1dfe4ec8fa96f8ba4b1b559be1045c4551e4f874086130fd90a87327b967c9ec48cf532356e675954ceff5fd51f258dd26907110f9 SHA512 81649a1fbe148eab56ff9147b412303112376343c84767139908b9f39e77debcbbf6b8fe2c1edf3151d3556ab9a826eef9b893cc1ef679d0b5cb37096f23fa44
 EBUILD extra-cmake-modules-5.60.0.ebuild 1533 BLAKE2B 5c7ef9d239800dd4dafb1a788d850556dd5db93acb25142408594fc5be2423b4942179b734a6dcfa11dedd595d8759b5cc27bcf0f05661b0404b5470ad926fad SHA512 187d4aa8246d9cf2e5867a51a6cebd475d133a25653ffd15e764725b79d14244f65c0e38ca7b82c8da7e4545e3f70e6c2fc24fdd8ac15d833f08679527181c03
-EBUILD extra-cmake-modules-5.63.0.ebuild 1536 BLAKE2B 0258bf7c81b15705dffe014abdd40f4a8e455d3515d9adb25a5534d7763650495cdc358a9a30d1f3ea7e9a4d294272d0de11c9ff59fee0335e058815a386adcc SHA512 8980c9f848d28f2d5acbfe0fd56a2278536262889cf403907e70b3bcfc3d92503a2317006f2428e04bbd82be32bce6870868a22636f5cde5eb7fefb03255a548
+EBUILD extra-cmake-modules-5.64.0.ebuild 1589 BLAKE2B 2dc1c889e5ab8cb204ec09a7e25f67b29644f11039c8616a9b8e539ee100f38058e31d4bfbaaffad02c66a826d41a3d77bc1c38b9f4250ffeace8c4c1d93d2ba SHA512 12d5003315f85d9217a397a5ae05456643da40a2887444c4dfdcd0db918f1f0adaefe88285bb487fe77faf1e0ed76ae5a756a20ff8240daf6595f3880596412f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.63.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.64.0.ebuild
index 65262ecc7226..c0a33ce5a2ac 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.63.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.64.0.ebuild
@@ -3,13 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-ECM_KDEINSTALLDIRS="false"
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-KDE_QTHELP="false"
-KDE_TEST="false"
-inherit kde5 python-any-r1
+PYTHON_COMPAT=( python3_{6,7} )
+QTMIN=5.12.3
+inherit cmake-utils kde.org python-any-r1
 
 DESCRIPTION="Extra modules and scripts for CMake"
 HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"
@@ -22,18 +18,23 @@ BDEPEND="
 	doc? (
 		${PYTHON_DEPS}
 		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
-		$(add_qt_dep qthelp)
+		>=dev-qt/qthelp-${QTMIN}:5
 	)
 	test? (
-		$(add_qt_dep qtcore)
-		$(add_qt_dep linguist-tools)
+		>=dev-qt/linguist-tools-${QTMIN}:5
+		>=dev-qt/qtcore-${QTMIN}:5
 	)
 "
 RDEPEND="
 	app-arch/libarchive[bzip2]
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" )
+RESTRICT+=" !test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
+	"${FILESDIR}/${P}-tests.patch"
+)
 
 python_check_deps() {
 	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
@@ -44,7 +45,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	kde5_src_prepare
+	cmake-utils_src_prepare
 	# Requires PyQt5, bug #680256
 	sed -i -e "/^if(NOT SIP_Qt5Core_Mod_FILE)/s/NOT SIP_Qt5Core_Mod_FILE/TRUE/" \
 		tests/CMakeLists.txt || die "failed to disable GenerateSipBindings tests"
@@ -52,13 +53,14 @@ src_prepare() {
 
 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)
-		-DDOC_INSTALL_DIR=/usr/share/doc/"${PF}"
+		-DBUILD_TESTING=$(usex test)
 	)
 
-	kde5_src_configure
+	cmake-utils_src_configure
 }
 
 src_test() {
@@ -68,5 +70,5 @@ src_test() {
 		-E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)"
 	)
 
-	kde5_src_test
+	cmake-utils_src_test
 }
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
new file mode 100644
index 000000000000..511342cd2b9a
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.64.0-tests.patch
@@ -0,0 +1,124 @@
+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