gentoo resync : 31.01.2018

3 files changed, 48 insertions, 11 deletions

diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index 9e5a35b26d27..b5bb0d371fd3 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,6 +1,6 @@
-AUX extra-cmake-modules-5.40.0-qmlplugindump-path.patch 1270 BLAKE2B f07e75e7558f85f2b1bf0ec49258c489ac64dc8efb0b9d897fec790a91d36e6e44d75cdad5aa34c9f45f269b49531cb82bcdffe7a0627b6f092317ac5ffb01aa SHA512 cbfd90b802f9629573c6bf1b51b2bb46d2d5991ffe41381f8867fe094c43a8f2d80175f70d7372a1df05a835df34faad5049ae87971b581f3fe0ba12e41724db
+AUX extra-cmake-modules-5.40.0-qmlplugindump-path.patch 2734 BLAKE2B 8ca74b3886fec8d18874a50eb82a170d3610f49d449ef53956f58b91a67c0a115de90c86776110f8d19d53929e42a80f5d986608c11bc1816ed3719dbd2238f8 SHA512 132d1b6d4af195ddd8bbeb1b3a084ae7838dfede85fabea9d70385b8abd41d1b76569c9d94eece8bcbfb7a1b047b4dd6a86fa29a61534d71c4b9b4dab0a271f9
 DIST extra-cmake-modules-5.40.0.tar.xz 312532 BLAKE2B 0054ee4d3d17f238c4940404c6f5e00c951d305b0fce3e206bdc84dff0be683d4dc7e7043db61019422d182385ec2990e05b2df384b14e7b248d492cf918e691 SHA512 5390edfde7acb4c89abd2f5abc4fb533f2f4b45061127796b3a2f9d7ab65d7b8ba5cc0aee0543a28886118af8f1c7aed4f5b51c33f20223d9948ca39944c399c
 DIST extra-cmake-modules-5.42.0.tar.xz 313692 BLAKE2B 1758744fc97bc47ff4cb6f9cc1838843b2de53f687d768ea34feb66d057d97403f354483bacfd829e3e974252c1478902ac201be35e8a6c52de7abf81108bad3 SHA512 43bc1afb0bdb5fc74771e9ea30479995c43d7b74c7469c4d4e04303e209cfc1982834d085c6f4586271761832892fb0b3cb8e0723c332d01e544a4cd26e21e14
 EBUILD extra-cmake-modules-5.40.0-r1.ebuild 1319 BLAKE2B 51f4dd46c267d65f194eb8608bb7fd3fb7762827826bbe7bf9c1dc451d9b451ce4498c68cccdc714d8e47861d4e54728a401c3c40e206d69162c169849da9ef5 SHA512 8c227a7e9ec6085e03e6249c4397389320b5d054538f833194ed2a20d886b5b5c57dc70a62ffc4c4e70aed46c881c1c971e19454c16ac119eca3fc15f2b1b300
-EBUILD extra-cmake-modules-5.42.0.ebuild 1332 BLAKE2B e2ed1fa7566b9e171471d58449598ffc9bca186d09da0ff6763eadda6023d1e52ea92345009f8ccfe834628a650432ad0d243608b4815908f8cffd4bc2feb0d2 SHA512 4e379286cd6fa455232d85395218f826f00293ee8840e04aaacefa975aa1ef12b973b92e34ab9b507216129ff6035fb63fec808f826f34239dd00e949d2c3ccb
+EBUILD extra-cmake-modules-5.42.0-r1.ebuild 1332 BLAKE2B e2ed1fa7566b9e171471d58449598ffc9bca186d09da0ff6763eadda6023d1e52ea92345009f8ccfe834628a650432ad0d243608b4815908f8cffd4bc2feb0d2 SHA512 4e379286cd6fa455232d85395218f826f00293ee8840e04aaacefa975aa1ef12b973b92e34ab9b507216129ff6035fb63fec808f826f34239dd00e949d2c3ccb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.42.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.42.0-r1.ebuild
index fb96d8450171..fb96d8450171 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.42.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.42.0-r1.ebuild
diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch
index d1bcf791fd4c..a5b12aac3579 100644
--- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch
@@ -1,6 +1,6 @@
-From 32d596b8c64c1c963b053788feeee67ef012b836 Mon Sep 17 00:00:00 2001
+From 099fc991b85e91aa4bbfd20ba005f0c3a0002f97 Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sat, 2 Dec 2017 19:04:10 +0100
+Date: Wed, 31 Jan 2018 15:32:46 +0100
 Subject: [PATCH] Make sure to search for Qt5-based qmlplugindump
 
 Summary:
@@ -11,28 +11,65 @@ Test Plan: ecm_find_qmlmodule now works properly for e.g. kirigami.
 
 Reviewers: apol
 
-Subscribers: #frameworks, #build_system
+Subscribers: aacid, dfaure, cgiboudeaux, #frameworks, #build_system
 
 Tags: #frameworks, #build_system
 
 Differential Revision: https://phabricator.kde.org/D9116
 ---
- modules/ECMFindQMLModule.cmake.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ modules/ECMFindQMLModule.cmake.in | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in
-index 428d60a..d72c52b 100644
+index 428d60a..8109ab8 100644
 --- a/modules/ECMFindQMLModule.cmake.in
 +++ b/modules/ECMFindQMLModule.cmake.in
-@@ -27,7 +27,7 @@
+@@ -26,8 +26,11 @@
+ #=============================================================================
  
  include(FindPackageHandleStandardArgs)
++include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
  
 -find_program(QMLPLUGINDUMP_PROGRAM qmlplugindump)
-+find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/bin/)
++query_qmake(qt_binaries_dir QT_INSTALL_BINS)
++
++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()
 -- 
-2.15.1
+2.16.1
+
+From 3e3ac52aef1bbe22d293a05253c69b755f59428c Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Wed, 31 Jan 2018 15:58:10 +0100
+Subject: [PATCH] FindQtWaylandScanner.cmake: Use qmake-query for HINT
+
+Instead of hardcoded /usr/lib, same solution as in D9116
+---
+ find-modules/FindQtWaylandScanner.cmake | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/find-modules/FindQtWaylandScanner.cmake b/find-modules/FindQtWaylandScanner.cmake
+index 79a1b05..37ebbdb 100644
+--- a/find-modules/FindQtWaylandScanner.cmake
++++ b/find-modules/FindQtWaylandScanner.cmake
+@@ -86,11 +86,14 @@
+ #=============================================================================
+ 
+ include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpersStub.cmake)
++include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
+ 
+ ecm_find_package_version_check(QtWaylandScanner)
+ 
++query_qmake(qt_binaries_dir QT_INSTALL_BINS)
++
+ # Find qtwaylandscanner
+-find_program(QtWaylandScanner_EXECUTABLE NAMES qtwaylandscanner HINTS /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/bin/)
++find_program(QtWaylandScanner_EXECUTABLE NAMES qtwaylandscanner HINTS ${qt_binaries_dir})
+ 
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(QtWaylandScanner
+-- 
+2.16.1