gentoo resync : 15.12.2019

6 files changed, 3 insertions, 264 deletions

diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index bdd607008fcc..04c8ced7704d 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,10 +1,5 @@
-AUX digikam-6.2.0-cmake.patch 2011 BLAKE2B da9e459cd8c7f89d986166cf19dde36d599565f573831057c0d68706c05f4b49240215e159d36e377f16b178c7de04e713bdfb3214bd83e114cbbd5b40f4f37a SHA512 44a63a08da538bee35efc965789b463455646c3ee9ed8fbe6f22591155c20b623e48838af52f8b521a35b3548fe44909516a15a4d815347e61de71d07bbfad17
-AUX digikam-6.2.0-googlephoto-upload.patch 1072 BLAKE2B 5384a259b2fdd15cf195fed8f5aa1a16a0af3932af1e2226b3bfd2be95d19f6fee003fd9d3344c0921ff5655d22ea4f30f98e8ed7c1e5dee1d4b91d4d031562e SHA512 c71ab51371e45538f33ba9603eabdc8e3e518f7e38aa274407d90f216a14f6071066f388291d072fca46eb6589e3cafe0eb5b78f3bb3520ca9aa85add092d265
-AUX digikam-6.2.0-imagemagick-7.0.8.60.patch 641 BLAKE2B c2a7261a92cb757aa39f2ccb5a561b8cb34563540e1c0e84662a056dad66e17c941a77ee9d42b168e83d18f72786e9bf49e741f73bf20c714496fad80ad22987 SHA512 d1ecf5a25a3cdf542ababa6d4306bf6bce25b5f04e8f880460a8a67f4f4eac283f139b82848a085a28dc16b0a8a9310a3ed294d110105b0562239ef21ce6e442
 AUX digikam-6.3.0-cmake.patch 2038 BLAKE2B 73c6c7d008c3b76f9347f4192d435e10aa3607abf62436372ef131ac034ef538c1baa8d0d03e6b587b771fb766fa3286c649a6ffc7640a2f21e292b1e524cab6 SHA512 c8e6d2fd6c18d8c8e8733dffd1e0e2fb66b8bf3496aa6f767a4c633a56733c85bc53bdceaf689e84beca672a5013a02349cfca73d9f1e89a99252c7bac526a4d
 AUX digikam-6.3.0-googlephoto-import-crash.patch 2815 BLAKE2B e39efa7815aef3f7b165e0915610e54af188479af3bef140717d5d903e557bb0da49fa493e06df9a76b9695df7ebe84cbf6132674209f45476da0a1d4752ceb7 SHA512 523dc9add1ee5b9ffb675c1983e8f54624b7537dbec567a60661fdd58b045978f2a794a47093f5a3d268e4aa159a8064cd6b261798bf19cfeb5241fd5ce4cdb8
-DIST digikam-6.2.0.tar.xz 339472960 BLAKE2B 0db48839474d599a364fba73cad751b889fe6f37c88323d1feddce67acb0ecad306c67976e1524328e6aaf33464c9dd35b1b85cf3c41ba72be9cef664e30d520 SHA512 05667c91af290df0eabd3b18a7c6741ded3f1b01b0a9cb572d6df79f25787d0291624760d6c0fa23bd36665a94bc7ccba845c117ee381de7edff97d1d4158e56
 DIST digikam-6.3.0.tar.xz 335641824 BLAKE2B 1ecddeee653d6b97570aa3616c6dd0a951210983400fe8aca19ee9e01aef29820f0ab32e3cbc2e92e833868f0f652c5bdd0809324437b6fa778dfdaf04ea3c83 SHA512 9463d7a8351acae32e2fa77c96026d1cb60e56fcc20ad2b71ac7461ff1e5e2e02ca0ef8a12e4d5ae2324aa66e185cdf5b237d6330f4741691876977e773511ce
-EBUILD digikam-6.2.0.ebuild 4166 BLAKE2B 7dda2079c57b887ba01a6243c6f5d4506baa4eb285b218d05c2ee6de84f1d1014154a621bcfc4c4980ec1dd5d4d1c2d3d6c80a33187b1e52638e9c67fb041ac5 SHA512 ee99c9c55687aa28283179c92e6e9fc1e19027206fe0ff3a51541da23bb024297c1d03c9ab59039f481820856ae44de03f4958db26333f3a9f0976c3729d8ea0
-EBUILD digikam-6.3.0-r1.ebuild 4258 BLAKE2B bff44f4ffbc3a535aaab5182d92f069bd4feb05e5f1b8a64f175792e05b7dafa1cbf7f09aaaa1c5563671df02731746a858561e486fb297e1f7f976a68932fe4 SHA512 3d5564fbad31fc8e16edad3afed3ede2f7e50f92899660364a4914d99cc60b18d06bddf77546812e2f54637815b2bc5176d65a944d77d8279535d7da8ae3e7ac
+EBUILD digikam-6.3.0-r1.ebuild 4255 BLAKE2B fcdff7cb0211901c20caf4197a09f0a58e6956c4bc6006a688106283f84b78fe0892c4050f9a33bb2b3bd8e577d2315f94a23e2f28e86b232193e3de5cf8769c SHA512 3444df820862f4c76b9c16e3073eabf27f3dfe9266469ce377fe51264d77de4de51555eeb9ad5c6e32f0ace1deb901d3a1d8cb1df7322b5ce1bd505684bd778a
 MISC metadata.xml 1256 BLAKE2B c3899279a6382ac2b2a12f5b94938db2324093bd63e0db8e3f82bb56ea9944d4369b793f7fa039c2c08af1887e4cc51d58f4e89a57c81b18cb5f896ef4cd0a5c SHA512 9b220b4271d0cb7b9fd5549fec165c4bc20c250cc66ce14ecb3cb16d0eb8355f35d0e585d9d800ed70437b3cd5434bcacc7dfd783f2a5683dbe1b1b3ce48356f
diff --git a/media-gfx/digikam/digikam-6.2.0.ebuild b/media-gfx/digikam/digikam-6.2.0.ebuild
deleted file mode 100644
index b91dd599e0f1..000000000000
--- a/media-gfx/digikam/digikam-6.2.0.ebuild
+++ /dev/null
@@ -1,151 +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}-googlephoto-upload.patch"
-	"${FILESDIR}/${P}-cmake.patch"
-	"${FILESDIR}/${P}-imagemagick-7.0.8.60.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-r1.ebuild b/media-gfx/digikam/digikam-6.3.0-r1.ebuild
index 6ba0fe7a630e..8b30b380b54e 100644
--- a/media-gfx/digikam/digikam-6.3.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-6.3.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	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"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
@@ -71,7 +71,7 @@ COMMON_DEPEND="
 		$(add_frameworks_dep kcalendarcore)
 		$(add_kdeapps_dep kcalcore)
 	) )
-	dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contrib_dnn] )
+	dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contribdnn] )
 	gphoto2? ( media-libs/libgphoto2:= )
 	imagemagick? ( media-gfx/imagemagick:= )
 	lensfun? ( media-libs/lensfun )
diff --git a/media-gfx/digikam/files/digikam-6.2.0-cmake.patch b/media-gfx/digikam/files/digikam-6.2.0-cmake.patch
deleted file mode 100644
index f25dd6306afa..000000000000
--- a/media-gfx/digikam/files/digikam-6.2.0-cmake.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From d915828e4db2e7b40e799abc01a6fdb683d2b921 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 17 Feb 2019 23:51:03 +0100
-Subject: [PATCH] Un-break optional Qt5 detection
-
----
- core/CMakeLists.txt | 26 ++++++++++----------------
- 1 file changed, 10 insertions(+), 16 deletions(-)
-
-diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
-index c04ee1a9c3..c3762437e6 100644
---- a/core/CMakeLists.txt
-+++ b/core/CMakeLists.txt
-@@ -136,16 +136,14 @@ find_package(Qt5 ${QT_MIN_VERSION}
- )
- 
- if(ENABLE_QWEBENGINE)
--    find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebEngineWidgets)
-+    find_package(Qt5WebEngineWidgets ${QT_MIN_VERSION} NO_MODULE)
- else()
--    find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebKitWidgets)
-+    find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} NO_MODULE)
- endif()
- 
--find_package(Qt5 ${QT_MIN_VERSION}
--             OPTIONAL_COMPONENTS
--             DBus
--             OpenGL
--)
-+find_package(Qt5DBus ${QT_MIN_VERSION})
-+
-+find_package(Qt5OpenGL ${QT_MIN_VERSION})
- 
- if(ENABLE_DBUS)
-     if(NOT Qt5DBus_FOUND)
-@@ -156,14 +154,10 @@ endif()
- # Dependencies For unit tests and CLI test tools
- 
- if(BUILD_TESTING)
--    find_package(Qt5 ${QT_MIN_VERSION}
--                 NO_MODULE COMPONENTS
--                 Test
--    )
--    find_package(Qt5 ${QT_MIN_VERSION}
--                 OPTIONAL_COMPONENTS
--                 Qml WebView  # Optional, for 'sialis' O2 library test tool.
--    )
-+    find_package(Qt5Test ${QT_MIN_VERSION} NO_MODULE)
-+    # Optional, for 'sialis' O2 library test tool.
-+    find_package(Qt5Qml ${QT_MIN_VERSION} NO_MODULE)
-+    find_package(Qt5WebView ${QT_MIN_VERSION} NO_MODULE)
- endif()
- 
- find_package(KF5 ${KF5_MIN_VERSION}
-@@ -335,7 +329,7 @@ endif()
- find_package(X11)
- 
- if(X11_FOUND)
--    find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS X11Extras)
-+    find_package(Qt5X11Extras ${QT_MIN_VERSION} NO_MODULE)
-     set(HAVE_X11 TRUE)
- else()
-     set(HAVE_X11 FALSE)
--- 
-2.22.0
-
diff --git a/media-gfx/digikam/files/digikam-6.2.0-googlephoto-upload.patch b/media-gfx/digikam/files/digikam-6.2.0-googlephoto-upload.patch
deleted file mode 100644
index 1c182ed7c9e7..000000000000
--- a/media-gfx/digikam/files/digikam-6.2.0-googlephoto-upload.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 19490eb10de0444219e8b525bb75513c046d184d Mon Sep 17 00:00:00 2001
-From: Maik Qualmann <metzpinguin@gmail.com>
-Date: Wed, 7 Aug 2019 19:52:13 +0200
-Subject: [PATCH] fix upload error to Google Photo when description contains
- quotes BUGS: 410692 FIXED-IN: 6.3.0
-
----
- core/dplugins/generic/webservices/google/gswindow.cpp | 1 +
- 1 files changed, 1 insertions(+)
-
-diff --git a/core/dplugins/generic/webservices/google/gswindow.cpp b/core/dplugins/generic/webservices/google/gswindow.cpp
-index a03e683e65..a80eac5cdb 100644
---- a/core/dplugins/generic/webservices/google/gswindow.cpp
-+++ b/core/dplugins/generic/webservices/google/gswindow.cpp
-@@ -594,6 +594,7 @@ void GSWindow::slotStartTransfer()
-                 QStringList descriptions = QStringList() << info.title() << info.comment();
-                 descriptions.removeAll(QLatin1String(""));
-                 temp.description         = descriptions.join(QLatin1String("\n\n"));
-+                temp.description.replace(QLatin1Char('"'), QLatin1String("\\\""));
-                 break;
-         }
- 
--- 
-2.22.0
-
diff --git a/media-gfx/digikam/files/digikam-6.2.0-imagemagick-7.0.8.60.patch b/media-gfx/digikam/files/digikam-6.2.0-imagemagick-7.0.8.60.patch
deleted file mode 100644
index 264da2c34f29..000000000000
--- a/media-gfx/digikam/files/digikam-6.2.0-imagemagick-7.0.8.60.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/core/tests/dimg/magickloader.cpp	
-+++ a/core/tests/dimg/magickloader.cpp	
-@@ -139,7 +139,11 @@ int main(int argc, char** argv)
-         if (inf->encoder) mode.append(QLatin1Char('W'));
-         else              mode.append(QLatin1Char('-'));
- 
-+#if( (MagickLibVersion >= 0x708) && defined(magick_module) ) /* defined since 7.0.8.60 */
-+        QString module = QLatin1String(inf->magick_module);
-+#else
-         QString module = QLatin1String(inf->module);
-+#endif
-         QString mime   = QMimeDatabase().mimeTypeForFile(QFileInfo(QString::fromLatin1("foo.%1").arg(module))).name();
- 
-         if (module != QLatin1String("DNG")  &&
\ No newline at end of file