diff options
| author | Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2016-02-01 00:08:02 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2016-02-01 00:08:02 +0100 |
| commit | 5adfeb262745a36edb3c688d8feccf5d127e7130 (patch) | |
| tree | c49666b46cab1361fddbdc82f0f2f996e2ed8aa2 | |
| parent | ac3cdb4f716421c880c2a0128a64bad3b97b2fc9 (diff) | |
| download | kde-5adfeb262745a36edb3c688d8feccf5d127e7130.tar.gz kde-5adfeb262745a36edb3c688d8feccf5d127e7130.tar.bz2 kde-5adfeb262745a36edb3c688d8feccf5d127e7130.zip | |
media-gfx/digikam: EAPI=6, small fixes
Package-Manager: portage-2.2.27
| -rw-r--r-- | media-gfx/digikam/digikam-9999.ebuild | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/media-gfx/digikam/digikam-9999.ebuild b/media-gfx/digikam/digikam-9999.ebuild index f289368b088..f79134977c6 100644 --- a/media-gfx/digikam/digikam-9999.ebuild +++ b/media-gfx/digikam/digikam-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 KDE_DOXYGEN="true" KDE_TEST="true" @@ -37,8 +37,6 @@ COMMON_DEPEND=" $(add_frameworks_dep kxmlgui) $(add_frameworks_dep solid) $(add_kdeapps_dep libkexiv2) - dev-libs/boost[threads] - dev-libs/expat $(add_qt_dep qtconcurrent) $(add_qt_dep qtdbus) $(add_qt_dep qtgui) @@ -48,6 +46,8 @@ COMMON_DEPEND=" $(add_qt_dep qtwebkit) $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) + dev-libs/boost[threads] + dev-libs/expat >=media-gfx/exiv2-0.24:= media-libs/jasper media-libs/lcms:2 @@ -72,7 +72,7 @@ COMMON_DEPEND=" ) semantic-desktop? ( $(add_frameworks_dep kfilemetadata) ) mysql? ( virtual/mysql ) - video? ( dev-qt/qtmultimedia[widgets] ) + video? ( $(add_qt_dep qtmultimedia 'widgets') ) X? ( $(add_qt_dep qtx11extras) x11-libs/libX11 @@ -109,13 +109,13 @@ src_configure() { # LQR = only allows to choose between bundled/external local mycmakeargs=( -DENABLE_OPENCV3=ON - $(cmake-utils_use_enable addressbook AKONADICONTACTSUPPORT) - $(cmake-utils_use_enable semantic-desktop KFILEMETADATASUPPORT) - $(cmake-utils_use_enable mysql MYSQLSUPPORT) - $(cmake-utils_use_enable video MEDIAPLAYER) - $(cmake-utils_use_find_package gphoto2) + -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) + -DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop) + -DENABLE_MYSQLSUPPORT=$(usex mysql) + -DENABLE_MEDIAPLAYER=$(usex video) + $(cmake-utils_use_find_package gphoto2 Gphoto2) $(cmake-utils_use_find_package lensfun LensFun) - $(cmake-utils_use_find_package marble) + $(cmake-utils_use_find_package marble Marble) $(cmake-utils_use_find_package X X11) ) |