diff options
| author |   Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2016-08-03 15:09:28 +0200 |
|---|---|---|
| committer |   Michael Palimaka <kensington@gentoo.org> | 2016-08-05 00:31:49 +1000 |
| commit | b17915e5a4ad50ece45aa81ccb9dc19ebd449b04 (patch) | |
| tree | b62c2e9da3fc75ee6e0fc53dd86e55a0488323f4 /media-gfx/digikam | |
| parent | media-video/kmplayer: Fix prepare with USE=npp (diff) | |
| download | gentoo-b17915e5a4ad50ece45aa81ccb9dc19ebd449b04.tar.gz gentoo-b17915e5a4ad50ece45aa81ccb9dc19ebd449b04.tar.bz2 gentoo-b17915e5a4ad50ece45aa81ccb9dc19ebd449b04.zip | |
media-gfx/digikam: Lower opencv dependency
Arfrever-enhanced method.
Package-Manager: portage-2.2.28
Diffstat (limited to 'media-gfx/digikam')
| -rw-r--r-- | media-gfx/digikam/digikam-4.14.0-r1.ebuild | 8 | ||||
| -rw-r--r-- | media-gfx/digikam/digikam-5.0.0.ebuild | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/media-gfx/digikam/digikam-4.14.0-r1.ebuild b/media-gfx/digikam/digikam-4.14.0-r1.ebuild index bea1bc9d61f7..f3828f62f31d 100644 --- a/media-gfx/digikam/digikam-4.14.0-r1.ebuild +++ b/media-gfx/digikam/digikam-4.14.0-r1.ebuild @@ -41,7 +41,7 @@ CDEPEND=" media-libs/liblqr >=media-libs/libpgf-6.12.27 media-libs/libpng:0= - >=media-libs/opencv-3.0.0:=[contrib] + media-libs/opencv:=[contrib(+)] media-libs/phonon[qt4] >=media-libs/tiff-3.8.2:0 virtual/jpeg:0 @@ -102,17 +102,17 @@ src_configure() { # LQR = only allows to choose between bundled/external local mycmakeargs=( -DENABLE_LCMS2=ON - -DENABLE_OPENCV3=ON -DWITH_LQR=ON -DWITH_LENSFUN=ON + -DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo yes || echo no) $(cmake-utils_use_enable addressbook KDEPIMLIBSSUPPORT) + $(cmake-utils_use_enable debug DEBUG_MESSAGES) $(cmake-utils_use_enable gphoto2 GPHOTO2) $(cmake-utils_use_with gphoto2) - $(cmake-utils_use_enable thumbnails THUMBS_DB) $(cmake-utils_use_enable mysql INTERNALMYSQL) $(cmake-utils_use_enable mysql MYSQLSUPPORT) - $(cmake-utils_use_enable debug DEBUG_MESSAGES) $(cmake-utils_use_enable semantic-desktop BALOOSUPPORT) + $(cmake-utils_use_enable thumbnails THUMBS_DB) ) kde4-base_src_configure diff --git a/media-gfx/digikam/digikam-5.0.0.ebuild b/media-gfx/digikam/digikam-5.0.0.ebuild index f099f90518f9..23ace8808e13 100644 --- a/media-gfx/digikam/digikam-5.0.0.ebuild +++ b/media-gfx/digikam/digikam-5.0.0.ebuild @@ -5,7 +5,7 @@ EAPI=6 if [[ ${KDE_BUILD_TYPE} != live ]]; then - KDE_TEST=true + KDE_TEST="true" fi CMAKE_MAKEFILE_GENERATOR="emake" inherit kde5 @@ -65,7 +65,7 @@ COMMON_DEPEND=" media-libs/liblqr >=media-libs/libpgf-6.12.27 media-libs/libpng:0= - >=media-libs/opencv-3.0.0:= + media-libs/opencv:= media-libs/tiff:0 virtual/jpeg:0 addressbook? ( @@ -119,11 +119,11 @@ src_prepare() { src_configure() { # LQR = only allows to choose between bundled/external local mycmakeargs=( - -DENABLE_OPENCV3=ON -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) -DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop) -DENABLE_MYSQLSUPPORT=$(usex mysql) -DENABLE_MEDIAPLAYER=$(usex video) + -DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo yes || echo no) $(cmake-utils_use_find_package gphoto2 Gphoto2) $(cmake-utils_use_find_package lensfun LensFun) $(cmake-utils_use_find_package marble Marble) |