summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <andreas.sturmlechner@gmail.com>2016-11-06 18:18:30 +0100
committerJohannes Huber <johu@gentoo.org>2016-11-07 22:44:20 +0100
commit6ab7437cf4fc4919016eef9434eb4e98980094ec (patch)
treeb3be4622d3e4844601a0cb15d48d38fd347ec4b3
parentda804758cd79c849a7a2f2a940b1c78c83e6536c (diff)
downloadkde-6ab7437cf4fc4919016eef9434eb4e98980094ec.tar.gz
kde-6ab7437cf4fc4919016eef9434eb4e98980094ec.tar.bz2
kde-6ab7437cf4fc4919016eef9434eb4e98980094ec.zip
media-gfx/digikam: Add subslot op, improve openmp check
Thanks to Soap. Package-Manager: portage-2.3.0 Signed-off-by: Johannes Huber <johu@gentoo.org>
-rw-r--r--media-gfx/digikam/digikam-9999.ebuild14
1 files changed, 8 insertions, 6 deletions
diff --git a/media-gfx/digikam/digikam-9999.ebuild b/media-gfx/digikam/digikam-9999.ebuild
index cbd2f471b74..bf6d12f9a2a 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)