[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/

[Johannes Huber]

commit:     6ab7437cf4fc4919016eef9434eb4e98980094ec
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Nov  6 17:18:30 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Nov  7 21:44:20 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6ab7437c

media-gfx/digikam: Add subslot op, improve openmp check

Thanks to Soap.

Package-Manager: portage-2.3.0

Signed-off-by: Johannes Huber <johu <AT> gentoo.org>

 media-gfx/digikam/digikam-9999.ebuild | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/media-gfx/digikam/digikam-9999.ebuild 
b/media-gfx/digikam/digikam-9999.ebuild
index cbd2f47..bf6d12f 100644
--- a/media-gfx/digikam/digikam-9999.ebuild
+++ b/media-gfx/digikam/digikam-9999.ebuild
@@ -65,7 +65,7 @@ COMMON_DEPEND="
        )
        calendar? ( $(add_kdeapps_dep kcalcore) )
        gphoto2? ( media-libs/libgphoto2:= )
-       jpeg2k? ( media-libs/jasper )
+       jpeg2k? ( media-libs/jasper:= )
        kipi? ( $(add_kdeapps_dep libkipi '' '16.03.80') )
        lensfun? ( media-libs/lensfun )
        marble? (
@@ -107,14 +107,17 @@ RDEPEND="${COMMON_DEPEND}
 RESTRICT=test
 # bug 366505
 
-# FIXME: Unbundle libraw (libs/rawengine/libraw)
 pkg_pretend() {
-       if use openmp ; then
-               tc-has-openmp || die "Please switch to an openmp compatible 
compiler"
-       fi
+       [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
        kde5_pkg_pretend
 }
 
+pkg_setup() {
+       [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+       kde5_pkg_setup
+}
+
+# FIXME: Unbundle libraw (libs/rawengine/libraw)
 src_prepare() {
        if [[ ${KDE_BUILD_TYPE} != live ]]; then
                # prepare the translations
@@ -141,7 +144,6 @@ src_prepare() {
 }
 
 src_configure() {
-       # LQR = only allows to choose between bundled/external
        local mycmakeargs=(
                -DENABLE_APPSTYLES=ON
                -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)