gentoo resync : 24.12.2018

4 files changed, 55 insertions, 4 deletions

diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index ad371103f4b0..2994d4058ba1 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
-DIST extra-cmake-modules-5.50.0.tar.xz 323928 BLAKE2B 79bc97221cda54a51f2f6ff8797f715f4e27b1d5724da852cf06022eaf88b687a6d6aa0afb5eb2abb45b846cb49bd4c2b5e8e863e4d2f1b9b8d4446bc57ccd60 SHA512 0e56b1137a9cd8ff6a25b7790986713fb2358d8ffa1a175ca87054790440e528a37f56e2785190b40a469fd4d32bc731d4d24f55d6557515c8edb311abf3a56c
+AUX extra-cmake-modules-5.52.0-fix-FindQHelpGenerator.patch 1587 BLAKE2B 48095429a52441e33145ee32c49827de7d9dac339ed520c1d1548a41567452a5a0df1412568f7066196f30e8b62ff49142df277555f5713a29e02b17b2d6fe7d SHA512 aa83832d6cecab6bf5583193b59145139a57e568239d39718018555fe1c36c4d110e825dbaa5fbbf148fd5867a954be71d14e20d5d3a4477ee31017d914c52b0
 DIST extra-cmake-modules-5.52.0.tar.xz 324412 BLAKE2B 36099a820b79e010a3f1616f852e0364e1e72a5553786d35a9a9f5d9452574ab3166179856d76a89d1b801b5e99452c19a6419561f1c9e3e873cb6f5fbf8d3d6 SHA512 f3147f493c24bea3c53a6537ba78ac81e0b8d31162c5d6e12305d318e5f13cdda70ea79d7e9db2a1d834609c7e1a0134e76bcae9f6c9109beaee2c051afbe269
-EBUILD extra-cmake-modules-5.50.0.ebuild 1386 BLAKE2B 16f75f82ea521a30e082008d8a0ba30beae0435bf9e43bc3ad0b7da3cce13a8b7a4118b0158bcbc41acb5eceba9e63ae54e3e9ff73d7ec4b58d85d20a1f6c46c SHA512 ecf310790562133f700fabe77de96b98566ecd87c0d9c976a227e027bc9aabb20f2ce6c9ed36273d91e93f897b1f39dc6b62986cce6a73a018e24bc578862951
-EBUILD extra-cmake-modules-5.52.0.ebuild 1390 BLAKE2B a2f2d64e306aeac906ec763105e5a0c8593cad9098bbad8b68728cab3d0333e8023f7d990248186e5b785ecb916f2b075af2636d02c3342e008724cf3b982935 SHA512 cd44e0818039d4931d541bf8bcfeaa6271369f002c16bbb69787a39d85a128eac3a4837479a0794a31c1f59c33dc645f04c6ab9370f121629748ea3f8921dd15
+DIST extra-cmake-modules-5.53.0.tar.xz 324504 BLAKE2B 0337e20330cfd68c3c3d37f285cceaf17b52effa16c9c24568bb05c53b83b5e983f3a7967ea69bd5b852c9854dea14576d244c61233a4a6335019c5079a393d6 SHA512 f760c6040585730dee261cc09b47f7df12cb3e6be6d859f4a5b065641fdf9329bd831e47a9d51d9978d7379501e045614d40b9c55b0f4082222a2e662a0952ea
+EBUILD extra-cmake-modules-5.52.0-r1.ebuild 1436 BLAKE2B e00c1953635a9186071099b757458f8356af632a99fb1ee3a7402a51f9b6a51c27894747bce371202437b0d830ad6e767a71acf3df9eb7951c7d11db7e052f63 SHA512 31df94ee812cd1310e1c07739b9760430a1fcecc1cd414a7d72c65151ab9063ba3130d796a2ebacabba35f0374dd7772f5f0339614fbe321c4291a785fca85a8
+EBUILD extra-cmake-modules-5.53.0.ebuild 1390 BLAKE2B a2f2d64e306aeac906ec763105e5a0c8593cad9098bbad8b68728cab3d0333e8023f7d990248186e5b785ecb916f2b075af2636d02c3342e008724cf3b982935 SHA512 cd44e0818039d4931d541bf8bcfeaa6271369f002c16bbb69787a39d85a128eac3a4837479a0794a31c1f59c33dc645f04c6ab9370f121629748ea3f8921dd15
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.50.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.52.0-r1.ebuild
index 3b13c99a3559..9f3d2cfead04 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.50.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.52.0-r1.ebuild
@@ -32,7 +32,10 @@ RDEPEND="
 	app-arch/libarchive[bzip2]
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
+	"${FILESDIR}/${P}-fix-FindQHelpGenerator.patch"
+)
 
 python_check_deps() {
 	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.52.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.53.0.ebuild
index 4f32e710baca..4f32e710baca 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.52.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.53.0.ebuild
diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.52.0-fix-FindQHelpGenerator.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.52.0-fix-FindQHelpGenerator.patch
new file mode 100644
index 000000000000..9e4200121fe5
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.52.0-fix-FindQHelpGenerator.patch
@@ -0,0 +1,47 @@
+From 96d169b87292d935646b1924952829b0f4d5d669 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+Date: Sat, 17 Nov 2018 08:57:09 +0100
+Subject: FindQHelpGenerator: try to find Qt5Help instead of Qt5Core
+
+Summary:
+The Qt5Help CMake modules contain the Qt5::qhelpgenerator target, so
+look for that instead of Qt5Core.  Otherwise, the Qt5::qhelpgenerator
+is available only if Qt5Help was searched previously (which does not
+happen often).
+
+Using the Qt5::qhelpgenerator is more reliable than the search for the
+qhelpgenerator executable based on the qmake path.
+
+Test Plan:
+build some framework with -DBUILD_QCH=ON, and notice that
+the right path of qhelpgenerator is found directly with the
+Qt5::qhelpgenerator target.
+
+Reviewers: kossebau
+
+Reviewed By: kossebau
+
+Subscribers: kde-frameworks-devel, kde-buildsystem
+
+Tags: #frameworks, #build_system
+
+Differential Revision: https://phabricator.kde.org/D16938
+---
+ find-modules/FindQHelpGenerator.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/find-modules/FindQHelpGenerator.cmake b/find-modules/FindQHelpGenerator.cmake
+index 50aef27..272e587 100644
+--- a/find-modules/FindQHelpGenerator.cmake
++++ b/find-modules/FindQHelpGenerator.cmake
+@@ -33,7 +33,7 @@
+ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #=============================================================================
+ 
+-find_package(Qt5Core QUIET)
++find_package(Qt5Help QUIET)
+ if (TARGET Qt5::qhelpgenerator)
+     get_target_property(QHelpGenerator_EXECUTABLE Qt5::qhelpgenerator LOCATION)
+ else()
+-- 
+cgit v0.11.2