From 9bd54251864651f49e673a08aec9ef79cfe08f04 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 17 Dec 2017 09:07:15 +0000 Subject: gentoo resync : 17.12.2017 --- media-gfx/digikam/Manifest | 4 +- media-gfx/digikam/digikam-5.5.0.ebuild | 169 ------------------------------ media-gfx/digikam/digikam-5.7.0-r1.ebuild | 2 +- 3 files changed, 2 insertions(+), 173 deletions(-) delete mode 100644 media-gfx/digikam/digikam-5.5.0.ebuild (limited to 'media-gfx/digikam') diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index 907fd26586ab..e2a17951876d 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -3,9 +3,7 @@ AUX digikam-5.7.0-kreadconfig5.patch 1068 BLAKE2B 4a19e8c0806e7d4ba6219711385db7 AUX digikam-5.7.0-mariadb-10.2-1.patch 1949 BLAKE2B 5af708e8e6296031752acdb579cc20a502968deb791a1bcc305fe2fef72dd67ff8b7d78bc85a6311a301428167d985f1ccb67b322e80b61c2b22e9909d7324c2 SHA512 13b83b1b32d33955f140345a47dda2d8ef0eb9057e154962f382b415e0bc46ca34ccc9b2fa782b4660eb05c947c8555fae6f9e6828a904c41d66e9a032399f82 AUX digikam-5.7.0-mariadb-10.2-2.patch 3714 BLAKE2B b08c0544def660bfef87c68204bf00dff2661d58877f514fbfbe6bb8c856cfcb72acc10c2f8661a19230b2a4ec92407c401b90af8482ff97fbcce87bd8c7e6d1 SHA512 c7865329b6387f5c4decfa750f3bfeba3d3b61df5c86b35147050d5fbf4c3585cb8ed5e8789b6dcab6f1887dc4322200920b432006d80457edf286cad594ef51 AUX digikam-5.7.0-qt-5.9.3.patch 1137 BLAKE2B bf369d28083de46d11444eea8ddd35ccc1aa8d052bcd48d8da04a14737d404238717cc70eec7681931f46a455f2e1b441fd1851d3df12d19d8f5653fcc9b2847 SHA512 bfd453d6f4212dfd3e2402d0bba73f9498c04264a7199119fe117a9af834aa95bd12ac8cb2df8be063a8120bbfe159d52f96229692ac7258c4128909dbbffe61 -DIST digikam-5.5.0.tar.xz 129499600 BLAKE2B 73722461e1d4cb4dda2d0628abe2f4b7b9811aa588350c46c2323e25a84d1c2d76e2dfd084d590458acf721bb397541e559823564816b374e6b3fd372f980f42 SHA512 3c64774916d4804d932009ba3753d387ecf31e9e3d435c580497d3badb6cc3e57ab5ef1a2334a23379d0987d96dd107be4f01adbb63039f4510aa94ac6d71344 DIST digikam-5.7.0.tar.xz 123315064 BLAKE2B 0879b25e674e39d204038ab629dec36757ae034e3dd7e9a0a3700f9703272c4a972a21c1db5a42c6c294247a1226b1cb9a8b980bb90cdcc12e0cd752459273ef SHA512 626c9854311c637b994325237f171adce3dba39159fb336dfe95f1de287e2d08a3aaddd611eea87e8018047d331aff252b555c382cfbe1d8e14413c51a3849f4 -EBUILD digikam-5.5.0.ebuild 4754 BLAKE2B 15740067a8a2da70baa564d5dbac7af3998c65975dc48938b67c52326ff500fecc35e6d1a7cdaa7e2b75cefca3ab0354d1c45a742b65a6e9bc2f428f6b60dfeb SHA512 19dd72651406bb4f3a899aa2e4e4ea6c650c5b33963bd9c437510c355349baeea89a91e7394868d57f3b73cf24433833428076cf574429dc9224c2799a08ed19 -EBUILD digikam-5.7.0-r1.ebuild 4854 BLAKE2B dd83efcbfb9e76ddeb1a50dd38c48985edf285f0e0812755be54a25d21c451c625947a90c788330beb38f2f68c92585cd430c7192e6d26a0bbeb97fe0cc171ce SHA512 2353dc0b9475e79ffeae9f43c847e4ef87f918f2b1d768496369b9b8eb2d79852f7b957e57b569679f0258e00d4974be71ac223367a6a40cd7b8fa6e404c780e +EBUILD digikam-5.7.0-r1.ebuild 4853 BLAKE2B 45d3b347df857eaf876f72b051aea5a331051853120f9ade856a64fe29e292b7cdca16b2693e490e1551b2ae7e0afddc86c741f6b959bb9b3030c1d13a3cd5f7 SHA512 7f4ec195506d628096c7dcb7428f21e1ef0294b7c6b0b9f1865b18d874579ae7d600efa867afc8022e4384f2147b802bb4a6c856842994bd4e7bb53247de0e54 EBUILD digikam-5.7.0-r2.ebuild 4940 BLAKE2B 7a2ab69cadaf4183411df54924883c8401910b2ebf4825c07f1a73b8f98bdebd780da17d6da52074c1e19bf1dab71311d2a736617f284750428c8d78e0cac55e SHA512 81cba5421883f2f3ceffc0af3b0bb00cbff54f5ebfc2ee01833b10bf522b99f5088d25ce80cbb3698e574ea6bea90ad6e39ec9e9d1f1e11fabdf2a5131a0478c MISC metadata.xml 962 BLAKE2B 918fd2665df0b74bfcac369d306bd8989723db59dd436085ba7ad24e640401b8f39d2005674c4ef85c1875d2b31c9603af9b8ee7465b11f94b09ba9c93a6d9f2 SHA512 c8998f630fca57844cb258b42d6d557c7a6c65f8b0b90caf44225b62827e24eeaaa6defdf1334c7b7c80a1132aac96e178fe3b18ab59035534b605aed4665bab diff --git a/media-gfx/digikam/digikam-5.5.0.ebuild b/media-gfx/digikam/digikam-5.5.0.ebuild deleted file mode 100644 index 89258b8a7dae..000000000000 --- a/media-gfx/digikam/digikam-5.5.0.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -if [[ ${KDE_BUILD_TYPE} != live ]]; then - KDE_HANDBOOK="true" - KDE_TEST="true" -fi -CMAKE_MAKEFILE_GENERATOR="emake" -inherit kde5 toolchain-funcs - -DESCRIPTION="Digital photo management application" -HOMEPAGE="https://www.digikam.org/" - -LICENSE="GPL-2" -KEYWORDS="amd64 x86" -IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble semantic-desktop mysql opengl openmp +panorama scanner X" - -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/${MY_P}.tar.xz" - S="${WORKDIR}/${MY_P}/core" -fi - -# TODO: Package QtAV http://www.qtav.org/ -# video? ( media-video/qtav ) -COMMON_DEPEND=" - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep ki18n) - $(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 qtdbus) - $(add_qt_dep qtgui '-gles2') - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtsql 'mysql?') - $(add_qt_dep qtwebkit) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - dev-libs/expat - media-gfx/exiv2:= - media-libs/lcms:2 - media-libs/liblqr - >=media-libs/libpgf-6.12.27 - media-libs/libpng:0= - media-libs/opencv:=[-qt4(-)] - || ( =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) ) - gphoto2? ( media-libs/libgphoto2:= ) - jpeg2k? ( media-libs/jasper:= ) - kipi? ( $(add_kdeapps_dep libkipi '' '16.03.80') ) - lensfun? ( media-libs/lensfun ) - marble? ( - $(add_frameworks_dep kbookmarks) - $(add_kdeapps_dep marble) - $(add_qt_dep qtconcurrent) - $(add_qt_dep qtnetwork) - ) - mysql? ( virtual/mysql[server] ) - opengl? ( - $(add_qt_dep qtopengl) - virtual/opengl - ) - panorama? ( $(add_frameworks_dep threadweaver) ) - scanner? ( $(add_kdeapps_dep libksane) ) - semantic-desktop? ( $(add_frameworks_dep kfilemetadata) ) - X? ( - $(add_qt_dep qtx11extras) - x11-libs/libX11 - ) -" -DEPEND="${COMMON_DEPEND} - $(add_qt_dep qtconcurrent) - dev-cpp/eigen:3 - dev-libs/boost[threads] - sys-devel/gettext - panorama? ( - sys-devel/bison - sys-devel/flex - ) -" -RDEPEND="${COMMON_DEPEND} - media-plugins/kipi-plugins:5 - panorama? ( media-gfx/hugin ) - !media-gfx/digikam:4 -" - -RESTRICT=test -# bug 366505 - -PATCHES=( "${FILESDIR}/${P}-cmake-3.9.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_prepare() { - if [[ ${KDE_BUILD_TYPE} != live ]]; then - # prepare the translations - mv "${WORKDIR}/${MY_P}/po" po || die - find po -name "*.po" -and -not -name "digikam.po" -delete || die - echo "set_property(GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS 1)" >> CMakeLists.txt || die - echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die - echo "add_subdirectory( po )" >> CMakeLists.txt || die - - if use handbook; then - # subdirs need to be preserved b/c relative paths... - # doc-translated is, in fact, broken, and ignored - mv "${WORKDIR}/${MY_P}/doc/${PN}" doc-default || die - echo "find_package(KF5DocTools REQUIRED)" >> CMakeLists.txt || die - echo "add_subdirectory( doc-default )" >> CMakeLists.txt || die - fi - fi - - if ! use marble; then - punt_bogus_dep Qt5 Network - fi - - kde5_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DENABLE_APPSTYLES=ON - -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) - -DENABLE_MYSQLSUPPORT=$(usex mysql) - -DENABLE_MEDIAPLAYER=OFF - -DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo yes || echo no) - $(cmake-utils_use_find_package calendar KF5CalendarCore) - $(cmake-utils_use_find_package gphoto2 Gphoto2) - $(cmake-utils_use_find_package jpeg2k Jasper) - $(cmake-utils_use_find_package kipi KF5Kipi) - $(cmake-utils_use_find_package lensfun LensFun) - $(cmake-utils_use_find_package marble Marble) - $(cmake-utils_use_find_package opengl OpenGL) - $(cmake-utils_use_find_package openmp OpenMP) - $(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 X X11) - ) - - kde5_src_configure -} diff --git a/media-gfx/digikam/digikam-5.7.0-r1.ebuild b/media-gfx/digikam/digikam-5.7.0-r1.ebuild index 2b9a28dd0213..bb175b60e38c 100644 --- a/media-gfx/digikam/digikam-5.7.0-r1.ebuild +++ b/media-gfx/digikam/digikam-5.7.0-r1.ebuild @@ -17,7 +17,7 @@ LICENSE="GPL-2" IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble mediaplayer semantic-desktop mysql opengl openmp +panorama scanner X" if [[ ${KDE_BUILD_TYPE} != live ]]; then - KEYWORDS="~amd64 x86" + KEYWORDS="amd64 x86" MY_PV=${PV/_/-} MY_P=${PN}-${MY_PV} SRC_BRANCH=stable -- cgit v1.2.3