gentoo resync : 20.02.2019

3 files changed, 68 insertions, 2 deletions

diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index fa036a378837..a8d9e59a2abc 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,5 +1,6 @@
+AUX digikam-6.0.0-cmake.patch 1972 BLAKE2B 103f282e8cdc33d6e7cc3982bb15b290ff2381846d6262005922b97df1b54d9dd7572fb95eee01a3cf413dda9eed28e0201123bfedddc7beda6dc4ddc99e5d55 SHA512 8efe171f763692efd7c8449e1365e2d531a4d1b6da79fe1f5048dbe1b328f70b6e923298015f2a162751843eb88db2dd1af744a2b2cd3219e0f44aea4d3a569a
 DIST digikam-5.9.0.tar.xz 132931184 BLAKE2B cfbcbae8471c9c00bdf846d13bbc1ce3fbbd2ee4cc86500d011f9e15c1a21d7799638f94708794e8bc36a200df455667f9df8fcefdc38aaa00060630807d11cb SHA512 f6134a957dcd11343e34f0bc90f5560a28ed205c47d2ffd76a5418a4c63f76706045e9179c47f1448304b59081051b524f7a6847c3c1dcee4673047ce5d90e63
 DIST digikam-6.0.0.tar.xz 331386500 BLAKE2B 93da3822ad10b3c017aadcdcc1501af5dfcfa07640d73b6987cc7e1229573e02489c166abf16a07378466fcd2bf7c4423415af563b5ab835e6d5d8ea63a04eba SHA512 b8a70dde0b3838c4ccaffa3324eacb0541642e82177c90a1f8fcbd9691c194369f2760c4ea56c58b7ae049fc1a748d5d88cb537c62e3700ed5e21bad44d01adb
 EBUILD digikam-5.9.0.ebuild 4758 BLAKE2B 89cb7574f20f3cd08697386b6a0cc25a6bec270062a23d68afe1148c631980f8fe9cde76d5ebf9fc129eafba06dc96c25d92614e3422abc5140d7a0f2364f576 SHA512 f758f3dfb93c15721d27cb6242779a358dbe86b976d84fb5fe7796c959d757dfc9efedecfb344df17eaf0869d5fbab1169d1bcf34cf45c68e8422caf48ccaa6c
-EBUILD digikam-6.0.0.ebuild 3838 BLAKE2B f47ca56ae55f11b3a488ff2c5ba2e29892d789b4c965628c6c06782ff9843e26575c3de2353a8e25a882ea95e6a133d0c2bfeda8b6eb7b60c16572e5c4556512 SHA512 3559ac4f170b8588c28ba620373708519169d8ffbd5022ab7baddb162b6dc3a17eac293ca8f8979c28b03717b44cbab67703bac1deed5d8e9d99a94c976244dd
+EBUILD digikam-6.0.0.ebuild 3951 BLAKE2B b7bcf74012b240e5864298c82e18e5f1d3a52f0df16c90896b9d2ba295e396f757f10e3c4a14dd8359086acfde797013d68bcfae57f4105de933d16790d0fd24 SHA512 50c11d1925a65f4d9c307bc1a32fb615176b7c14dd4ec3b30b4080b30f93845b732f725cae2a6fc188ea43982396a44acaf6e4fc64c1f47b95a4070f39ef8913
 MISC metadata.xml 1166 BLAKE2B 0844b599bbb92d64c88ed1d4d32ffec17f71912d8736e8f6cd5829a662be59886f52ae57c3de2eb3c36c3de252d6ff9868dddff30d212f7ae7cef36775c46ec0 SHA512 41741282ed42fa5bb9ff644d0dc3cf021daaf4904d8811fe5f3e37e909432e86c489f0c1843b547f70790acdbc74163de133f078722f8c33fffd389d870d4367
diff --git a/media-gfx/digikam/digikam-6.0.0.ebuild b/media-gfx/digikam/digikam-6.0.0.ebuild
index 1ed43c3ed62c..f44c5dbd4ce8 100644
--- a/media-gfx/digikam/digikam-6.0.0.ebuild
+++ b/media-gfx/digikam/digikam-6.0.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_MAKEFILE_GENERATOR="emake" # keep until CMAKE_MIN_VERSION=3.13.4
 inherit kde5 toolchain-funcs
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
@@ -11,7 +12,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_BRANCH=stable
 	[[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable
 	SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${PV}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
@@ -104,6 +105,8 @@ RDEPEND="${COMMON_DEPEND}
 RESTRICT+=" test"
 # bug 366505
 
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 	kde5_pkg_pretend
diff --git a/media-gfx/digikam/files/digikam-6.0.0-cmake.patch b/media-gfx/digikam/files/digikam-6.0.0-cmake.patch
new file mode 100644
index 000000000000..f90067f48126
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-6.0.0-cmake.patch
@@ -0,0 +1,62 @@
+From 0d24a8971700454533c66ab9fc63043c67d44da6 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 17 Feb 2019 23:51:03 +0100
+Subject: [PATCH] Un-break optional Qt5 detection
+
+---
+ core/CMakeLists.txt | 22 ++++++++++------------
+ 1 file changed, 10 insertions(+), 12 deletions(-)
+
+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
+index 27d3819323..17c8aa0320 100644
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -134,16 +134,14 @@ find_package(Qt5 ${QT_MIN_VERSION}
+ )
+ 
+ if(ENABLE_QWEBENGINE)
+-    find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebEngineWidgets)
++    find_package(Qt5WebEngineWidgets ${QT_MIN_VERSION} NO_MODULE)
+ else()
+-    find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebKitWidgets)
++    find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} NO_MODULE)
+ endif()
+ 
+-find_package(Qt5 ${QT_MIN_VERSION}
+-             OPTIONAL_COMPONENTS
+-             DBus
+-             OpenGL
+-)
++find_package(Qt5DBus ${QT_MIN_VERSION})
++
++find_package(Qt5OpenGL ${QT_MIN_VERSION})
+ 
+ if(ENABLE_DBUS)
+     if(NOT Qt5DBus_FOUND)
+@@ -154,10 +152,10 @@ endif()
+ # Dependencies For unit tests and CLI test tools
+ 
+ if(BUILD_TESTING)
+-    find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS
+-                 Test
+-                 Qml WebView  # Optional, for 'sialis' O2 library test tool.
+-    )
++    find_package(Qt5Test ${QT_MIN_VERSION} NO_MODULE)
++    # Optional, for 'sialis' O2 library test tool.
++    find_package(Qt5Qml ${QT_MIN_VERSION} NO_MODULE)
++    find_package(Qt5WebView ${QT_MIN_VERSION} NO_MODULE)
+ endif()
+ 
+ find_package(KF5 ${KF5_MIN_VERSION}
+@@ -323,7 +321,7 @@ find_package(OpenGL)                               # For Presentation tool.
+ find_package(X11)
+ 
+ if(X11_FOUND)
+-    find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS X11Extras)
++    find_package(Qt5X11Extras ${QT_MIN_VERSION} NO_MODULE)
+     set(HAVE_X11 TRUE)
+ else()
+     set(HAVE_X11 FALSE)
+-- 
+2.20.1
+