From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 25D8F58973 for ; Mon, 1 Feb 2016 12:59:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 88C5F21C02F; Mon, 1 Feb 2016 12:59:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E3A7F21C02F for ; Mon, 1 Feb 2016 12:59:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 245AB340C6F for ; Mon, 1 Feb 2016 12:59:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E48EE8EB for ; Mon, 1 Feb 2016 12:59:43 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1454281682.5adfeb262745a36edb3c688d8feccf5d127e7130.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: media-gfx/digikam/ X-VCS-Repository: proj/kde X-VCS-Files: media-gfx/digikam/digikam-9999.ebuild X-VCS-Directories: media-gfx/digikam/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 5adfeb262745a36edb3c688d8feccf5d127e7130 X-VCS-Branch: master Date: Mon, 1 Feb 2016 12:59:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 389c8975-2404-4226-b816-7d6d8188ec6f X-Archives-Hash: 9fa54ff773a012adddc9c844ec67a131 commit: 5adfeb262745a36edb3c688d8feccf5d127e7130 Author: Andreas Sturmlechner gmail com> AuthorDate: Sun Jan 31 23:08:02 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Sun Jan 31 23:08:02 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5adfeb26 media-gfx/digikam: EAPI=6, small fixes Package-Manager: portage-2.2.27 media-gfx/digikam/digikam-9999.ebuild | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/media-gfx/digikam/digikam-9999.ebuild b/media-gfx/digikam/digikam-9999.ebuild index f289368..f791349 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) )