gentoo resync : 25.08.2020

3 files changed, 39 insertions, 7 deletions

diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index 752bf30eb233..3235998f9854 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,5 +1,6 @@
+AUX milou-5.19.80-disable-manual-tests.patch 849 BLAKE2B 96f6148e384bcaa62cd7748bb695c86dec1d12b93252a5deda724ccee92b72ab9cdb132848746771dd4ee539eb8ba6f83681c410b28c1a203cde50a0a36b7ffc SHA512 c5dd9078754ef0dabe5704df18423ddc273c0ac0d7a685cc3df949588202bc18dd3542925e67dba868074e2e4bb5ad06ca4c6d8efec91d19af6fbea2642d6d2b
 DIST milou-5.18.5.tar.xz 64264 BLAKE2B e4dba1cded6c5b833f35086b3cc943e4bfa4a0a6df530eb43aba7efbc40ea48aad8c88a2221546e7fdcc411c136232af84b7ab6a45d99233369c4a2c628f56d4 SHA512 3c1d0b032e8f26a637aed8067d919d95bcbf033e0b494bc9a2a0295d000773ac3900903dca96eb32d3fc1b831884e3435ab91a26c9cd179548c3b2cd0377577d
-DIST milou-5.19.2.tar.xz 64500 BLAKE2B 93c7799a8a9db176b2375c0ce6419cbba0e42bf8a6058fae604ce2383c95e64341d950bbd0e4ff436d0b5ba7a84a45aed7b64adf42f4b87a28df528bb5fdb92e SHA512 d7b82d170343d19c3ca0f11fbc5d59da6746e67be453ce85e1880bbcf4365e7f3588d622849ae9dc334fb87d4b0b6fc5043b1b0cf239b4f69d50a8faa0a480b0
+DIST milou-5.19.4.tar.xz 64488 BLAKE2B 3efb31b19801105d2887d04439b3386ee8cff683abab101620c9ea41ffd11c31e39b1c1e829712469a1ce4561a1456aaec24595046f2daa6a04ce9c43ebcdfa1 SHA512 7a7dc70641935d29c8196040b0ac410b97b98f694ab6720e470c8cba8338139a1f0b6d8c69c9ddebc98e016fe0e240051632a35be8f26a6ddcb392e7b39dc88e
 EBUILD milou-5.18.5.ebuild 842 BLAKE2B db01ebcc996229b0918aeaebb5b58b798fc342f50eb5b4dc4d5c1e2d906a7171fd40ce1faf228ae04aed8611888086674d83f9ee3a4c48de2be24bf6bad09565 SHA512 965bdebf6546e32453e842dffef2b8b2f2ffd47d6eb314051a7f94f401542a1eed8b1e6eddfc26934607068eefca3c22768396aab649618b422da378193c9081
-EBUILD milou-5.19.2.ebuild 840 BLAKE2B 41931cfdc0566ebc2d78fafa1e42d701d3012ae14ee0f1d8ff5f499d245b16edfe1be0cf7b248fc03a761697a009983bf82d0594cb10fa2351fb9980b239db25 SHA512 5aaa2283009a14dd5e2d2b3be4a94adc666206e4baaaacce25b07b43d244a8fc3836fda6ae8c07707e2114013a8645a235b0ab4035680ee7495dfab1f86d2301
+EBUILD milou-5.19.4.ebuild 916 BLAKE2B 5b52df96804f3e4e54a5da2bd747c19c5dc02870dd490a7510e2468d3b1da0806e0b912183ec2e969c24d82b6745cdceebd523693a83098a9adfd0720272dd2d SHA512 75bcec4ec9b08877ed6588e3b87d772785f8126e68e86af2422564036434df0ab1ceda5e0bde7f8b666ab9f0294d0bc37fcd30e0b998f1954d43d43b41fccc1f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/milou/files/milou-5.19.80-disable-manual-tests.patch b/kde-plasma/milou/files/milou-5.19.80-disable-manual-tests.patch
new file mode 100644
index 000000000000..a9e3b029f910
--- /dev/null
+++ b/kde-plasma/milou/files/milou-5.19.80-disable-manual-tests.patch
@@ -0,0 +1,29 @@
+From b239834faa093a972bd7ca33296484609f121a3b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 14 Jul 2020 20:24:01 +0200
+Subject: [PATCH] Disable test dir based on BUILD_TESTING or unavailability of
+ Qt5::Test
+
+These tests are manual; an attempt to run them ended in failure.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ lib/CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index a739c5c..92dd0be 100644
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -39,4 +39,7 @@ install(TARGETS milou EXPORT MilouLibraryTargets ${KDE_INSTALL_TARGETS_DEFAULT_A
+ 
+ add_subdirectory(qml)
+ add_subdirectory(previews)
+-add_subdirectory(test)
++
++if(BUILD_TESTING AND TARGET Qt5::Test)
++  add_subdirectory(test)
++endif()
+-- 
+2.27.0
+
diff --git a/kde-plasma/milou/milou-5.19.2.ebuild b/kde-plasma/milou/milou-5.19.4.ebuild
index 965b1da6db1a..7dbe1e1668f3 100644
--- a/kde-plasma/milou/milou-5.19.2.ebuild
+++ b/kde-plasma/milou/milou-5.19.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ECM_TEST="forceoptional-recursive"
+ECM_TEST="forceoptional"
 KFMIN=5.71.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.14.2
@@ -14,10 +14,13 @@ HOMEPAGE="https://invent.kde.org/plasma/milou"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/kdeclarative-${KFMIN}:5
@@ -26,8 +29,7 @@ DEPEND="
 	>=kde-frameworks/krunner-${KFMIN}:5
 	>=kde-frameworks/kservice-${KFMIN}:5
 	>=kde-frameworks/plasma-${KFMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.19.80-disable-manual-tests.patch" ) # bug 732584