| 1 |
commit: 00c4edac89d0a1c5ce5cf9baaa2f94034133a5b8 |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Jul 31 20:31:58 2016 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 4 14:11:10 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=00c4edac |
| 7 |
|
| 8 |
kde-apps/libkface: Lower opencv dependency |
| 9 |
|
| 10 |
Arfrever-enhanced method. |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.28 |
| 13 |
|
| 14 |
kde-apps/libkface/libkface-16.07.80.ebuild | 4 ++-- |
| 15 |
kde-apps/libkface/libkface-16.08.49.9999.ebuild | 4 ++-- |
| 16 |
kde-apps/libkface/libkface-9999.ebuild | 4 ++-- |
| 17 |
3 files changed, 6 insertions(+), 6 deletions(-) |
| 18 |
|
| 19 |
diff --git a/kde-apps/libkface/libkface-16.07.80.ebuild b/kde-apps/libkface/libkface-16.07.80.ebuild |
| 20 |
index 6bda88f..847d330 100644 |
| 21 |
--- a/kde-apps/libkface/libkface-16.07.80.ebuild |
| 22 |
+++ b/kde-apps/libkface/libkface-16.07.80.ebuild |
| 23 |
@@ -19,7 +19,7 @@ DEPEND=" |
| 24 |
$(add_qt_dep qtsql) |
| 25 |
$(add_qt_dep qtwidgets) |
| 26 |
$(add_qt_dep qtxml) |
| 27 |
- >=media-libs/opencv-3:=[contrib] |
| 28 |
+ media-libs/opencv:=[contrib(+)] |
| 29 |
" |
| 30 |
RDEPEND="${DEPEND}" |
| 31 |
|
| 32 |
@@ -27,7 +27,7 @@ PATCHES=( "${FILESDIR}/${PN}-15.12.2-opencv3.1.patch" ) |
| 33 |
|
| 34 |
src_configure() { |
| 35 |
local mycmakeargs=( |
| 36 |
- -DENABLE_OPENCV3=ON |
| 37 |
+ -DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo yes || echo no) |
| 38 |
) |
| 39 |
|
| 40 |
kde5_src_configure |
| 41 |
|
| 42 |
diff --git a/kde-apps/libkface/libkface-16.08.49.9999.ebuild b/kde-apps/libkface/libkface-16.08.49.9999.ebuild |
| 43 |
index 5ad984c..e468ce7 100644 |
| 44 |
--- a/kde-apps/libkface/libkface-16.08.49.9999.ebuild |
| 45 |
+++ b/kde-apps/libkface/libkface-16.08.49.9999.ebuild |
| 46 |
@@ -19,7 +19,7 @@ DEPEND=" |
| 47 |
$(add_qt_dep qtsql) |
| 48 |
$(add_qt_dep qtwidgets) |
| 49 |
$(add_qt_dep qtxml) |
| 50 |
- >=media-libs/opencv-3:=[contrib] |
| 51 |
+ media-libs/opencv:=[contrib(+)] |
| 52 |
" |
| 53 |
RDEPEND="${DEPEND}" |
| 54 |
|
| 55 |
@@ -27,7 +27,7 @@ PATCHES=( "${FILESDIR}/${PN}-15.12.2-opencv3.1.patch" ) |
| 56 |
|
| 57 |
src_configure() { |
| 58 |
local mycmakeargs=( |
| 59 |
- -DENABLE_OPENCV3=ON |
| 60 |
+ -DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo yes || echo no) |
| 61 |
) |
| 62 |
|
| 63 |
kde5_src_configure |
| 64 |
|
| 65 |
diff --git a/kde-apps/libkface/libkface-9999.ebuild b/kde-apps/libkface/libkface-9999.ebuild |
| 66 |
index 5ad984c..e468ce7 100644 |
| 67 |
--- a/kde-apps/libkface/libkface-9999.ebuild |
| 68 |
+++ b/kde-apps/libkface/libkface-9999.ebuild |
| 69 |
@@ -19,7 +19,7 @@ DEPEND=" |
| 70 |
$(add_qt_dep qtsql) |
| 71 |
$(add_qt_dep qtwidgets) |
| 72 |
$(add_qt_dep qtxml) |
| 73 |
- >=media-libs/opencv-3:=[contrib] |
| 74 |
+ media-libs/opencv:=[contrib(+)] |
| 75 |
" |
| 76 |
RDEPEND="${DEPEND}" |
| 77 |
|
| 78 |
@@ -27,7 +27,7 @@ PATCHES=( "${FILESDIR}/${PN}-15.12.2-opencv3.1.patch" ) |
| 79 |
|
| 80 |
src_configure() { |
| 81 |
local mycmakeargs=( |
| 82 |
- -DENABLE_OPENCV3=ON |
| 83 |
+ -DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo yes || echo no) |
| 84 |
) |
| 85 |
|
| 86 |
kde5_src_configure |
Archives