| 1 |
commit: 5adfeb262745a36edb3c688d8feccf5d127e7130 |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Jan 31 23:08:02 2016 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 31 23:08:02 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5adfeb26 |
| 7 |
|
| 8 |
media-gfx/digikam: EAPI=6, small fixes |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.27 |
| 11 |
|
| 12 |
media-gfx/digikam/digikam-9999.ebuild | 20 ++++++++++---------- |
| 13 |
1 file changed, 10 insertions(+), 10 deletions(-) |
| 14 |
|
| 15 |
diff --git a/media-gfx/digikam/digikam-9999.ebuild b/media-gfx/digikam/digikam-9999.ebuild |
| 16 |
index f289368..f791349 100644 |
| 17 |
--- a/media-gfx/digikam/digikam-9999.ebuild |
| 18 |
+++ b/media-gfx/digikam/digikam-9999.ebuild |
| 19 |
@@ -2,7 +2,7 @@ |
| 20 |
# Distributed under the terms of the GNU General Public License v2 |
| 21 |
# $Id$ |
| 22 |
|
| 23 |
-EAPI=5 |
| 24 |
+EAPI=6 |
| 25 |
|
| 26 |
KDE_DOXYGEN="true" |
| 27 |
KDE_TEST="true" |
| 28 |
@@ -37,8 +37,6 @@ COMMON_DEPEND=" |
| 29 |
$(add_frameworks_dep kxmlgui) |
| 30 |
$(add_frameworks_dep solid) |
| 31 |
$(add_kdeapps_dep libkexiv2) |
| 32 |
- dev-libs/boost[threads] |
| 33 |
- dev-libs/expat |
| 34 |
$(add_qt_dep qtconcurrent) |
| 35 |
$(add_qt_dep qtdbus) |
| 36 |
$(add_qt_dep qtgui) |
| 37 |
@@ -48,6 +46,8 @@ COMMON_DEPEND=" |
| 38 |
$(add_qt_dep qtwebkit) |
| 39 |
$(add_qt_dep qtwidgets) |
| 40 |
$(add_qt_dep qtxml) |
| 41 |
+ dev-libs/boost[threads] |
| 42 |
+ dev-libs/expat |
| 43 |
>=media-gfx/exiv2-0.24:= |
| 44 |
media-libs/jasper |
| 45 |
media-libs/lcms:2 |
| 46 |
@@ -72,7 +72,7 @@ COMMON_DEPEND=" |
| 47 |
) |
| 48 |
semantic-desktop? ( $(add_frameworks_dep kfilemetadata) ) |
| 49 |
mysql? ( virtual/mysql ) |
| 50 |
- video? ( dev-qt/qtmultimedia[widgets] ) |
| 51 |
+ video? ( $(add_qt_dep qtmultimedia 'widgets') ) |
| 52 |
X? ( |
| 53 |
$(add_qt_dep qtx11extras) |
| 54 |
x11-libs/libX11 |
| 55 |
@@ -109,13 +109,13 @@ src_configure() { |
| 56 |
# LQR = only allows to choose between bundled/external |
| 57 |
local mycmakeargs=( |
| 58 |
-DENABLE_OPENCV3=ON |
| 59 |
- $(cmake-utils_use_enable addressbook AKONADICONTACTSUPPORT) |
| 60 |
- $(cmake-utils_use_enable semantic-desktop KFILEMETADATASUPPORT) |
| 61 |
- $(cmake-utils_use_enable mysql MYSQLSUPPORT) |
| 62 |
- $(cmake-utils_use_enable video MEDIAPLAYER) |
| 63 |
- $(cmake-utils_use_find_package gphoto2) |
| 64 |
+ -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) |
| 65 |
+ -DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop) |
| 66 |
+ -DENABLE_MYSQLSUPPORT=$(usex mysql) |
| 67 |
+ -DENABLE_MEDIAPLAYER=$(usex video) |
| 68 |
+ $(cmake-utils_use_find_package gphoto2 Gphoto2) |
| 69 |
$(cmake-utils_use_find_package lensfun LensFun) |
| 70 |
- $(cmake-utils_use_find_package marble) |
| 71 |
+ $(cmake-utils_use_find_package marble Marble) |
| 72 |
$(cmake-utils_use_find_package X X11) |
| 73 |
) |
Archives