media-gfx/digikam: remove 5.3.0

Package-Manager: Portage-2.3.5, Repoman-2.3.2

8 files changed, 0 insertions, 761 deletions

diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index aa72b433e7d9..0ccca3cbdd04 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,2 +1 @@
-DIST digikam-5.3.0.tar.xz 121417224 SHA256 b36cfa27278936d41ab5f33c99fe9ccdfd545eada3e1e32efe9f9e3fdf2c3e5c SHA512 6190944d09badec6ddac194f2029e86d0ef658e08a6a120f04c86109dc2b9d9cd2e772a900d09781b563fcd0caaff186fb5fd6cde9744ce3b4e8dcc9ff29d421 WHIRLPOOL c1c0987e23587356968484d936a0a99f10d6e6ce004ffe1f5eb4d0a42b59fc1e84ec4a03f491c91c93be172ab6b78444c684221fb515e1562cc76bcc61346158
 DIST digikam-5.5.0.tar.xz 129499600 SHA256 df9cbf1b8dbfb9235cebc97e77c02fcb1498c5a905c7fd3b9fb42fd7accc6252 SHA512 3c64774916d4804d932009ba3753d387ecf31e9e3d435c580497d3badb6cc3e57ab5ef1a2334a23379d0987d96dd107be4f01adbb63039f4510aa94ac6d71344 WHIRLPOOL e67b444975ad37e939b2f62bba949bcafb41eee2975470daa02e4ffdd62c6c792b6656edf4811daead52fdc1bf064951fbec7b687192e5d5ee542d5d706140be
diff --git a/media-gfx/digikam/digikam-5.3.0-r1.ebuild b/media-gfx/digikam/digikam-5.3.0-r1.ebuild
deleted file mode 100644
index 60fe095ca33f..000000000000
--- a/media-gfx/digikam/digikam-5.3.0-r1.ebuild
+++ /dev/null
@@ -1,172 +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 video 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
-
-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.0.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) )
-	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 )
-	opengl? (
-		$(add_qt_dep qtopengl)
-		virtual/opengl
-	)
-	panorama? ( $(add_frameworks_dep threadweaver) )
-	scanner? ( $(add_kdeapps_dep libksane) )
-	semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
-	video? ( $(add_qt_dep qtmultimedia 'widgets') )
-	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}-db-lock.patch"
-	"${FILESDIR}/${P}-clang.patch"
-	"${FILESDIR}/${P}-kf-5.31.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=$(usex video)
-		-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.3.0-r2.ebuild b/media-gfx/digikam/digikam-5.3.0-r2.ebuild
deleted file mode 100644
index 3f924d9469aa..000000000000
--- a/media-gfx/digikam/digikam-5.3.0-r2.ebuild
+++ /dev/null
@@ -1,173 +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 video 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
-
-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.0.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) )
-	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 )
-	opengl? (
-		$(add_qt_dep qtopengl)
-		virtual/opengl
-	)
-	panorama? ( $(add_frameworks_dep threadweaver) )
-	scanner? ( $(add_kdeapps_dep libksane) )
-	semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
-	video? ( $(add_qt_dep qtmultimedia 'widgets') )
-	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}-db-lock.patch"
-	"${FILESDIR}/${P}-clang.patch"
-	"${FILESDIR}/${P}-kf-5.31.patch"
-	"${FILESDIR}/${P}-redeyes-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_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=$(usex video)
-		-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/files/digikam-5.3.0-clang.patch b/media-gfx/digikam/files/digikam-5.3.0-clang.patch
deleted file mode 100644
index b4af04cd19e2..000000000000
--- a/media-gfx/digikam/files/digikam-5.3.0-clang.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-commit 86cd0d1d89c8b4d13f06dc8a353bdd99f13c4758
-Author: Gilles Caulier <caulier.gilles@gmail.com>
-Date:   Wed Jan 18 10:13:20 2017 +0100
-
-    Fix compilation with clang
-
-diff --git a/libs/database/imagehistory/imagehistorygraph_boost.h b/libs/database/imagehistory/imagehistorygraph_boost.h
-index 4ba89c9..d7e6c77 100644
---- a/libs/database/imagehistory/imagehistorygraph_boost.h
-+++ b/libs/database/imagehistory/imagehistorygraph_boost.h
-@@ -28,7 +28,7 @@
- #include "digikam_config.h"
- 
- // Pragma directives to reduce warnings from Boost header files.
--#if not defined(__APPLE__) && defined(__GNUC__)
-+#if !defined(__APPLE__) && defined(__GNUC__)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
- #endif
-@@ -1554,7 +1554,7 @@ protected:
- } // namespace Digikam
- 
- // Restore warnings
--#if not defined(__APPLE__) && defined(__GNUC__)
-+#if !defined(__APPLE__) && defined(__GNUC__)
- #pragma GCC diagnostic pop
- #endif
- 
-diff --git a/libs/dimg/filters/greycstoration/greycstorationfilter.cpp b/libs/dimg/filters/greycstoration/greycstorationfilter.cpp
-index f5d0640..91e443d 100644
---- a/libs/dimg/filters/greycstoration/greycstorationfilter.cpp
-+++ b/libs/dimg/filters/greycstoration/greycstorationfilter.cpp
-@@ -52,7 +52,7 @@
- #define GREYSTORATION_USING_GFACT 1
- 
- // Pragma directives to reduce warnings from CImg header files.
--#if not defined(__APPLE__) && defined(__GNUC__)
-+#if !defined(__APPLE__) && defined(__GNUC__)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
- #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
-@@ -71,7 +71,7 @@
- #include "cimg/CImg.h"
- 
- // Restore warnings
--#if not defined(__APPLE__) && defined(__GNUC__)
-+#if !defined(__APPLE__) && defined(__GNUC__)
- #pragma GCC diagnostic pop
- #endif
- 
-diff --git a/libs/dimg/filters/randomnumbergenerator.cpp b/libs/dimg/filters/randomnumbergenerator.cpp
-index 93d7cc4..d7b2ed8 100644
---- a/libs/dimg/filters/randomnumbergenerator.cpp
-+++ b/libs/dimg/filters/randomnumbergenerator.cpp
-@@ -26,7 +26,7 @@
- // Boost includes
- 
- // Pragma directives to reduce warnings from Boost header files.
--#if not defined(__APPLE__) && defined(__GNUC__)
-+#if !defined(__APPLE__) && defined(__GNUC__)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wundef"
- #endif
-@@ -44,7 +44,7 @@
- #include <boost/random/variate_generator.hpp>
- 
- // Restore warnings
--#if not defined(__APPLE__) && defined(__GNUC__)
-+#if !defined(__APPLE__) && defined(__GNUC__)
- #pragma GCC diagnostic pop
- #endif
- 
-diff --git a/libs/dimg/filters/sharp/matrix.cpp b/libs/dimg/filters/sharp/matrix.cpp
-index 4f32aa3..1a3c65a 100644
---- a/libs/dimg/filters/sharp/matrix.cpp
-+++ b/libs/dimg/filters/sharp/matrix.cpp
-@@ -43,7 +43,7 @@
- // Eigen includes
- 
- // Pragma directives to reduce warnings from Eigen header files.
--#if not defined(__APPLE__) && defined(__GNUC__)
-+#if !defined(__APPLE__) && defined(__GNUC__)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-@@ -53,7 +53,7 @@
- #include <Eigen/LU>
- 
- // Restore warnings
--#if not defined(__APPLE__) && defined(__GNUC__)
-+#if !defined(__APPLE__) && defined(__GNUC__)
- #pragma GCC diagnostic pop
- #endif
- 
-diff --git a/libs/dmetadata/metaengine_p.cpp b/libs/dmetadata/metaengine_p.cpp
-index 2c83b58..2b44e06 100644
---- a/libs/dmetadata/metaengine_p.cpp
-+++ b/libs/dmetadata/metaengine_p.cpp
-@@ -49,7 +49,7 @@ extern "C"
- #include "digikam_debug.h"
- 
- // Pragma directives to reduce warnings from Exiv2.
--#if not defined(__APPLE__) && defined(__GNUC__)
-+#if !defined(__APPLE__) && defined(__GNUC__)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
- #endif
-@@ -723,7 +723,7 @@ void MetaEngine::Private::loadSidecarData(Exiv2::Image::AutoPtr xmpsidecar)
- }  // namespace Digikam
- 
- // Restore warnings
--#if not defined(__APPLE__) && defined(__GNUC__)
-+#if !defined(__APPLE__) && defined(__GNUC__)
- #pragma GCC diagnostic pop
- #endif
- 
-diff --git a/libs/jpegutils/jpegutils.cpp b/libs/jpegutils/jpegutils.cpp
-index c823f40..60c7469 100644
---- a/libs/jpegutils/jpegutils.cpp
-+++ b/libs/jpegutils/jpegutils.cpp
-@@ -53,7 +53,7 @@ extern "C"
- }
- 
- // Pragma directives to reduce warnings from libjpeg transupp header file.
--#if not defined(__APPLE__) && defined(__GNUC__)
-+#if !defined(__APPLE__) && defined(__GNUC__)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wunused-parameter"
- #endif
-@@ -69,7 +69,7 @@ extern "C"
- }
- 
- // Restore warnings
--#if not defined(__APPLE__) && defined(__GNUC__)
-+#if !defined(__APPLE__) && defined(__GNUC__)
- #pragma GCC diagnostic pop
- #endif
- 
-diff --git a/libs/rawengine/drawdecoder_p.h b/libs/rawengine/drawdecoder_p.h
-index a27e199..ea653b4 100644
---- a/libs/rawengine/drawdecoder_p.h
-+++ b/libs/rawengine/drawdecoder_p.h
-@@ -31,7 +31,7 @@
- #include <QByteArray>
- 
- // Pragma directives to reduce warnings from LibRaw header files.
--#if not defined(__APPLE__) && defined(__GNUC__)
-+#if !defined(__APPLE__) && defined(__GNUC__)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
- #endif
-@@ -46,7 +46,7 @@
- #include <libraw.h>
- 
- // Restore warnings
--#if not defined(__APPLE__) && defined(__GNUC__)
-+#if !defined(__APPLE__) && defined(__GNUC__)
- #pragma GCC diagnostic pop
- #endif
- 
diff --git a/media-gfx/digikam/files/digikam-5.3.0-db-lock.patch b/media-gfx/digikam/files/digikam-5.3.0-db-lock.patch
deleted file mode 100644
index 50223f011846..000000000000
--- a/media-gfx/digikam/files/digikam-5.3.0-db-lock.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From f37ef2c195b61a43a40e9cbb7f119fdc8e9d38f4 Mon Sep 17 00:00:00 2001
-From: Maik Qualmann <metzpinguin@gmail.com>
-Date: Sat, 10 Dec 2016 11:16:50 +0100
-Subject: fix locked database with BQM
-
----
- utilities/queuemanager/manager/actionthread.cpp | 27 ++++++++++++++++++++++---
- utilities/queuemanager/manager/actionthread.h   |  1 +
- utilities/queuemanager/manager/task.cpp         | 24 +++++-----------------
- 3 files changed, 30 insertions(+), 22 deletions(-)
-
-diff --git a/utilities/queuemanager/manager/actionthread.cpp b/utilities/queuemanager/manager/actionthread.cpp
-index 48c3fa3..141bb3d 100644
---- a/utilities/queuemanager/manager/actionthread.cpp
-+++ b/utilities/queuemanager/manager/actionthread.cpp
-@@ -28,6 +28,7 @@
- 
- #include "digikam_debug.h"
- #include "digikam_config.h"
-+#include "collectionscanner.h"
- #include "task.h"
- 
- namespace Digikam
-@@ -82,7 +83,7 @@ void ActionThread::processQueueItems(const QList<AssignedBatchTools>& items)
- {
-     ActionJobCollection collection;
- 
--    for(int i = 0 ; i < items.size() ; i++)
-+    for (int i = 0 ; i < items.size() ; i++)
-     {
-         Task* const t = new Task();
-         t->setSettings(d->settings);
-@@ -92,10 +93,12 @@ void ActionThread::processQueueItems(const QList<AssignedBatchTools>& items)
-                 this, SIGNAL(signalStarting(Digikam::ActionData)));
- 
-         connect(t, SIGNAL(signalFinished(Digikam::ActionData)),
--                this, SIGNAL(signalFinished(Digikam::ActionData)));
-+                this, SLOT(slotUpdateImageInfo(Digikam::ActionData)),
-+                Qt::BlockingQueuedConnection);
- 
-         connect(this, SIGNAL(signalCancelTask()),
--                t, SLOT(slotCancel()), Qt::QueuedConnection);
-+                t, SLOT(slotCancel()),
-+                Qt::QueuedConnection);
- 
-         collection.insert(t, 0);
-     }
-@@ -111,6 +114,24 @@ void ActionThread::cancel()
-     ActionThreadBase::cancel();
- }
- 
-+void ActionThread::slotUpdateImageInfo(const Digikam::ActionData& ad)
-+{
-+    if (ad.status == ActionData::BatchDone)
-+    {
-+        CollectionScanner scanner;
-+        ImageInfo source = ImageInfo::fromUrl(ad.fileUrl);
-+        qlonglong id     = scanner.scanFile(ad.destUrl.toLocalFile(), CollectionScanner::NormalScan);
-+        ImageInfo info(id);
-+        QDateTime dateTime = info.dateTime();
-+        // Copy the digiKam attributes from original file to the new file
-+        CollectionScanner::copyFileProperties(source, info);
-+        // Restore date time from new file
-+        info.setDateTime(dateTime);
-+    }
-+
-+    emit signalFinished(ad);
-+}
-+
- void ActionThread::slotThreadFinished()
- {
-     if (isEmpty())
-diff --git a/utilities/queuemanager/manager/actionthread.h b/utilities/queuemanager/manager/actionthread.h
-index 8cb848b..3375c2e 100644
---- a/utilities/queuemanager/manager/actionthread.h
-+++ b/utilities/queuemanager/manager/actionthread.h
-@@ -72,6 +72,7 @@ Q_SIGNALS:
- 
- private Q_SLOTS:
- 
-+    void slotUpdateImageInfo(const Digikam::ActionData& ad);
-     void slotThreadFinished();
- 
- private:
-diff --git a/utilities/queuemanager/manager/task.cpp b/utilities/queuemanager/manager/task.cpp
-index a94b4f9..4c6b710 100644
---- a/utilities/queuemanager/manager/task.cpp
-+++ b/utilities/queuemanager/manager/task.cpp
-@@ -46,10 +46,8 @@ extern "C"
- #include "dimg.h"
- #include "dmetadata.h"
- #include "imageinfo.h"
--#include "fileactionmngr.h"
- #include "batchtool.h"
- #include "batchtoolsmanager.h"
--#include "collectionscanner.h"
- #include "fileoperation.h"
- 
- namespace Digikam
-@@ -245,27 +243,15 @@ void Task::run()
-             }
-         }
- 
--        if (!FileOperation::localFileRename(d->tools.m_itemUrl.toLocalFile(),
--                                            outUrl.toLocalFile(),
--                                            dest.toLocalFile()))
-+        if (FileOperation::localFileRename(d->tools.m_itemUrl.toLocalFile(),
-+                                           outUrl.toLocalFile(),
-+                                           dest.toLocalFile()))
-         {
--            emitActionData(ActionData::BatchFailed, i18n("Failed to create file..."), dest);
-+            emitActionData(ActionData::BatchDone, i18n("Item processed successfully %1", renameMess), dest);
-         }
-         else
-         {
--            // -- Now copy the digiKam attributes from original file to the new file ------------
--
--            CollectionScanner scanner;
--            qlonglong id = scanner.scanFile(dest.toLocalFile(), CollectionScanner::NormalScan);
--
--            ImageInfo destInfo(id);
--            CollectionScanner::copyFileProperties(source, destInfo);
--
--            // -- Read again new file that the database is up to date ---------------------------
--
--            scanner.scanFile(destInfo, CollectionScanner::Rescan);
--
--            emitActionData(ActionData::BatchDone, i18n("Item processed successfully %1", renameMess), dest);
-+            emitActionData(ActionData::BatchFailed, i18n("Failed to create file..."), dest);
-         }
-     }
-     else
--- 
-cgit v0.11.2
-
diff --git a/media-gfx/digikam/files/digikam-5.3.0-kf-5.31.patch b/media-gfx/digikam/files/digikam-5.3.0-kf-5.31.patch
deleted file mode 100644
index ab648ef3daf0..000000000000
--- a/media-gfx/digikam/files/digikam-5.3.0-kf-5.31.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-commit 3793b47b6f57a627911bcce819b1ecc2dc9e422a
-Author: Kevin Funk <kfunk@kde.org>
-Date:   Wed Jan 18 13:34:55 2017 +0100
-
-    Fix compilation with new KDECompilerSettings.cmake
-
-diff --git a/app/utils/libopencv.h.cmake.in b/app/utils/libopencv.h.cmake.in
-index cc58b7c..6abf642 100644
---- a/app/utils/libopencv.h.cmake.in
-+++ b/app/utils/libopencv.h.cmake.in
-@@ -27,7 +27,7 @@
- #define LIB_OPEN_CV_H
- 
- // Pragma directives to reduce warnings from OpenCV header files.
--#if not defined(__APPLE__) && defined(__GNUC__)
-+#if !defined(__APPLE__) && defined(__GNUC__)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
- #pragma GCC diagnostic ignored "-Woverloaded-virtual"
-@@ -82,7 +82,7 @@
- #endif
- 
- // Restore warnings
--#if not defined(__APPLE__) && defined(__GNUC__)
-+#if !defined(__APPLE__) && defined(__GNUC__)
- #pragma GCC diagnostic pop
- #endif
- 
-diff --git a/libs/database/CMakeLists.txt b/libs/database/CMakeLists.txt
-index c5d9c27..14a7180 100644
---- a/libs/database/CMakeLists.txt
-+++ b/libs/database/CMakeLists.txt
-@@ -10,6 +10,9 @@ if (POLICY CMP0063)
-     cmake_policy(SET CMP0063 NEW)
- endif (POLICY CMP0063)
- 
-+# Boost uses operator names (and, not, ...)
-+string(REPLACE "-fno-operator-names" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-+
- set(libdatabasecore_SRCS
-     server/databaseserverstarter.cpp
-     server/databaseservererror.cpp
-diff --git a/libs/dimg/CMakeLists.txt b/libs/dimg/CMakeLists.txt
-index 3bcada5..04a0a22 100644
---- a/libs/dimg/CMakeLists.txt
-+++ b/libs/dimg/CMakeLists.txt
-@@ -11,6 +11,9 @@ endif (POLICY CMP0063)
- 
- kde_enable_exceptions()
- 
-+# Boost uses operator names (and, not, ...)
-+string(REPLACE "-fno-operator-names" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-+
- set(libdimg_SRCS
-     dimg.cpp
-     drawdecoding.cpp
-commit b318820530a4f001bc6621532b5416bf3c4a43cf
-Author: Kevin Funk <kfunk@kde.org>
-Date:   Wed Jan 18 15:20:36 2017 +0100
-
-    tests/dimg needs -fno-operator-names dropped, too
-
-diff --git a/tests/dimg/CMakeLists.txt b/tests/dimg/CMakeLists.txt
-index 6d9e6d6..5133f88 100644
---- a/tests/dimg/CMakeLists.txt
-+++ b/tests/dimg/CMakeLists.txt
-@@ -8,6 +8,9 @@ if (POLICY CMP0063)
-     cmake_policy(SET CMP0063 NEW)
- endif (POLICY CMP0063)
- 
-+# Boost uses operator names (and, not, ...)
-+string(REPLACE "-fno-operator-names" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-+
- include_directories(
-     $<TARGET_PROPERTY:KF5::XmlGui,INTERFACE_INCLUDE_DIRECTORIES>
-     $<TARGET_PROPERTY:KF5::I18n,INTERFACE_INCLUDE_DIRECTORIES>
diff --git a/media-gfx/digikam/files/digikam-5.3.0-redeyes-crash.patch b/media-gfx/digikam/files/digikam-5.3.0-redeyes-crash.patch
deleted file mode 100644
index 055f9be3acd1..000000000000
--- a/media-gfx/digikam/files/digikam-5.3.0-redeyes-crash.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-commit 1dad795deb0fbfcef5ad4932f7ade781d35ce17e
-Author: Maik Qualmann <metzpinguin@gmail.com>
-Date:   Wed Nov 23 19:37:46 2016 +0100
-
-    fix not found shapepredictor.dat file
-    BUGS: 372831
-    FIXED-IN: 5.4.0
-
-diff --git a/libs/dimg/filters/redeye/redeyecorrectionfilter.cpp b/libs/dimg/filters/redeye/redeyecorrectionfilter.cpp
-index 1cbaefc..a834208 100644
---- a/libs/dimg/filters/redeye/redeyecorrectionfilter.cpp
-+++ b/libs/dimg/filters/redeye/redeyecorrectionfilter.cpp
-@@ -99,14 +99,14 @@ RedEyeCorrectionFilter::~RedEyeCorrectionFilter()
- 
- void RedEyeCorrectionFilter::filterImage()
- {
--    if (d->sp == 0)
-+    if (!d->sp)
-     {
-         // Loading the shape predictor model
- 
--        QList<QString> path = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
--                                                        QString::fromLatin1("digikam/facesengine"),
--                                                        QStandardPaths::LocateDirectory);
--        QFile model(*path.begin() + QLatin1String("/ShapePredictor.dat"));
-+        QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
-+                                              QLatin1String("digikam/facesengine/shapepredictor.dat"));
-+
-+        QFile model(path);
- 
-         if (model.open(QIODevice::ReadOnly))
-         {
-@@ -116,6 +116,10 @@ void RedEyeCorrectionFilter::filterImage()
-             dataStream >> *temp;
-             d->sp = temp;
-         }
-+        else
-+        {
-+            return;
-+        }
-     }
- 
-     cv::Mat intermediateImage;
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index faac150cd067..00059c9b9d39 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -15,6 +15,5 @@
 		<flag name="marble">Enable support for geolocation using <pkg>kde-apps/marble</pkg></flag>
 		<flag name="panorama">Build the panorama plugin which requires <pkg>media-gfx/hugin</pkg></flag>
 		<flag name="semantic-desktop">Enable <pkg>kde-frameworks/kfilemetadata</pkg> support</flag>
-		<flag name="video">Enable video player support</flag>
 	</use>
 </pkgmetadata>