From 3c20ca44f0a70c8337bb6c133a78ff2b50c89ad3 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Thu, 10 Oct 2019 00:25:33 +0200 Subject: media-gfx/digikam: Accept kde-frameworks/{kcalendarcore,kcontacts} Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner --- media-gfx/digikam/digikam-6.3.0-r1.ebuild | 156 ++++++++++++++++++++++++++++++ media-gfx/digikam/digikam-6.3.0.ebuild | 150 ---------------------------- 2 files changed, 156 insertions(+), 150 deletions(-) create mode 100644 media-gfx/digikam/digikam-6.3.0-r1.ebuild delete mode 100644 media-gfx/digikam/digikam-6.3.0.ebuild (limited to 'media-gfx/digikam') diff --git a/media-gfx/digikam/digikam-6.3.0-r1.ebuild b/media-gfx/digikam/digikam-6.3.0-r1.ebuild new file mode 100644 index 000000000000..df968b3029c2 --- /dev/null +++ b/media-gfx/digikam/digikam-6.3.0-r1.ebuild @@ -0,0 +1,156 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_MIN_VERSION=3.14.3 +inherit kde5 toolchain-funcs + +if [[ ${KDE_BUILD_TYPE} != live ]]; then + MY_PV=${PV/_/-} + MY_P=${PN}-${MY_PV} + SRC_BRANCH=stable + [[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable + SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${PV}/${MY_P}.tar.xz" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${MY_P}" +fi + +DESCRIPTION="Digital photo management application" +HOMEPAGE="https://www.digikam.org/" + +LICENSE="GPL-2" +IUSE="addressbook calendar dnn +imagemagick gphoto2 +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X" + +BDEPEND=" + sys-devel/gettext + panorama? ( + sys-devel/bison + sys-devel/flex + ) +" +COMMON_DEPEND=" + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep knotifyconfig) + $(add_frameworks_dep kservice) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep solid) + $(add_qt_dep qtconcurrent) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui '-gles2') + $(add_qt_dep qtnetwork) + $(add_qt_dep qtprintsupport) + $(add_qt_dep qtsql 'mysql?') + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + $(add_qt_dep qtxmlpatterns) + dev-libs/expat + >=media-gfx/exiv2-0.26:= + media-libs/lcms:2 + media-libs/liblqr + media-libs/libpng:0= + >=media-libs/opencv-3.1.0:= + media-libs/tiff:0 + virtual/jpeg:0 + addressbook? ( + || ( + $(add_frameworks_dep kcontacts) + $(add_kdeapps_dep kcontacts) + ) + $(add_kdeapps_dep akonadi-contacts) + ) + calendar? ( || ( + $(add_frameworks_dep kcalendarcore) + $(add_kdeapps_dep kcalcore) + ) ) + dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contrib_dnn] ) + gphoto2? ( media-libs/libgphoto2:= ) + imagemagick? ( media-gfx/imagemagick:= ) + lensfun? ( media-libs/lensfun ) + marble? ( + $(add_frameworks_dep kbookmarks) + $(add_kdeapps_dep marble) + $(add_qt_dep qtconcurrent) + ) + mediaplayer? ( + media-libs/qtav[opengl] + !libav? ( media-video/ffmpeg:= ) + libav? ( media-video/libav:= ) + ) + opengl? ( + $(add_qt_dep qtopengl) + virtual/opengl + ) + panorama? ( $(add_frameworks_dep threadweaver) ) + scanner? ( $(add_kdeapps_dep libksane) ) + semantic-desktop? ( $(add_frameworks_dep kfilemetadata) ) + vkontakte? ( net-libs/libkvkontakte:5 ) + !webkit? ( $(add_qt_dep qtwebengine 'widgets') ) + webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) + X? ( + $(add_qt_dep qtx11extras) + x11-libs/libX11 + ) +" +DEPEND="${COMMON_DEPEND} + dev-cpp/eigen:3 + dev-libs/boost[threads] +" +RDEPEND="${COMMON_DEPEND} + mysql? ( virtual/mysql[server] ) + panorama? ( media-gfx/hugin ) +" + +RESTRICT+=" test" +# bug 366505 + +PATCHES=( + "${FILESDIR}/${P}-cmake.patch" + "${FILESDIR}/${P}-googlephoto-import-crash.patch" +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + kde5_pkg_pretend +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + kde5_pkg_setup +} + +# FIXME: Unbundle libraw (libs/rawengine/libraw) +src_configure() { + local mycmakeargs=( + -DENABLE_APPSTYLES=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON + -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) + $(cmake-utils_use_find_package calendar KF5CalendarCore) + -DENABLE_FACESENGINE_DNN=$(usex dnn) + $(cmake-utils_use_find_package gphoto2 Gphoto2) + $(cmake-utils_use_find_package imagemagick ImageMagick) + $(cmake-utils_use_find_package lensfun LensFun) + $(cmake-utils_use_find_package marble Marble) + -DENABLE_MEDIAPLAYER=$(usex mediaplayer) + $(cmake-utils_use_find_package mediaplayer QtAV) + -DENABLE_MYSQLSUPPORT=$(usex mysql) + -DENABLE_INTERNALMYSQL=$(usex mysql) + $(cmake-utils_use_find_package opengl OpenGL) + $(cmake-utils_use_find_package panorama KF5ThreadWeaver) + $(cmake-utils_use_find_package scanner KF5Sane) + $(cmake-utils_use_find_package semantic-desktop KF5FileMetaData) + $(cmake-utils_use_find_package vkontakte KF5Vkontakte) + -DENABLE_QWEBENGINE=$(usex !webkit) + $(cmake-utils_use_find_package X X11) + ) + + kde5_src_configure +} diff --git a/media-gfx/digikam/digikam-6.3.0.ebuild b/media-gfx/digikam/digikam-6.3.0.ebuild deleted file mode 100644 index 3324004430ee..000000000000 --- a/media-gfx/digikam/digikam-6.3.0.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_MIN_VERSION=3.14.3 -inherit kde5 toolchain-funcs - -if [[ ${KDE_BUILD_TYPE} != live ]]; then - MY_PV=${PV/_/-} - MY_P=${PN}-${MY_PV} - SRC_BRANCH=stable - [[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable - SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${PV}/${MY_P}.tar.xz" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${MY_P}" -fi - -DESCRIPTION="Digital photo management application" -HOMEPAGE="https://www.digikam.org/" - -LICENSE="GPL-2" -IUSE="addressbook calendar dnn +imagemagick gphoto2 +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X" - -BDEPEND=" - sys-devel/gettext - panorama? ( - sys-devel/bison - sys-devel/flex - ) -" -COMMON_DEPEND=" - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep solid) - $(add_qt_dep qtconcurrent) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui '-gles2') - $(add_qt_dep qtnetwork) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtsql 'mysql?') - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - $(add_qt_dep qtxmlpatterns) - dev-libs/expat - >=media-gfx/exiv2-0.26:= - media-libs/lcms:2 - media-libs/liblqr - media-libs/libpng:0= - >=media-libs/opencv-3.1.0:= - media-libs/tiff:0 - virtual/jpeg:0 - addressbook? ( - $(add_kdeapps_dep akonadi-contacts) - $(add_kdeapps_dep kcontacts) - ) - calendar? ( $(add_kdeapps_dep kcalcore) ) - dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contrib_dnn] ) - gphoto2? ( media-libs/libgphoto2:= ) - imagemagick? ( media-gfx/imagemagick:= ) - lensfun? ( media-libs/lensfun ) - marble? ( - $(add_frameworks_dep kbookmarks) - $(add_kdeapps_dep marble) - $(add_qt_dep qtconcurrent) - ) - mediaplayer? ( - media-libs/qtav[opengl] - !libav? ( media-video/ffmpeg:= ) - libav? ( media-video/libav:= ) - ) - opengl? ( - $(add_qt_dep qtopengl) - virtual/opengl - ) - panorama? ( $(add_frameworks_dep threadweaver) ) - scanner? ( $(add_kdeapps_dep libksane) ) - semantic-desktop? ( $(add_frameworks_dep kfilemetadata) ) - vkontakte? ( net-libs/libkvkontakte:5 ) - !webkit? ( $(add_qt_dep qtwebengine 'widgets') ) - webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) - X? ( - $(add_qt_dep qtx11extras) - x11-libs/libX11 - ) -" -DEPEND="${COMMON_DEPEND} - dev-cpp/eigen:3 - dev-libs/boost[threads] -" -RDEPEND="${COMMON_DEPEND} - mysql? ( virtual/mysql[server] ) - panorama? ( media-gfx/hugin ) -" - -RESTRICT+=" test" -# bug 366505 - -PATCHES=( - "${FILESDIR}/${P}-cmake.patch" - "${FILESDIR}/${P}-googlephoto-import-crash.patch" -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - kde5_pkg_pretend -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - kde5_pkg_setup -} - -# FIXME: Unbundle libraw (libs/rawengine/libraw) -src_configure() { - local mycmakeargs=( - -DENABLE_APPSTYLES=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON - -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) - $(cmake-utils_use_find_package calendar KF5CalendarCore) - -DENABLE_FACESENGINE_DNN=$(usex dnn) - $(cmake-utils_use_find_package gphoto2 Gphoto2) - $(cmake-utils_use_find_package imagemagick ImageMagick) - $(cmake-utils_use_find_package lensfun LensFun) - $(cmake-utils_use_find_package marble Marble) - -DENABLE_MEDIAPLAYER=$(usex mediaplayer) - $(cmake-utils_use_find_package mediaplayer QtAV) - -DENABLE_MYSQLSUPPORT=$(usex mysql) - -DENABLE_INTERNALMYSQL=$(usex mysql) - $(cmake-utils_use_find_package opengl OpenGL) - $(cmake-utils_use_find_package panorama KF5ThreadWeaver) - $(cmake-utils_use_find_package scanner KF5Sane) - $(cmake-utils_use_find_package semantic-desktop KF5FileMetaData) - $(cmake-utils_use_find_package vkontakte KF5Vkontakte) - -DENABLE_QWEBENGINE=$(usex !webkit) - $(cmake-utils_use_find_package X X11) - ) - - kde5_src_configure -} -- cgit v1.2.3-65-gdbad