gentoo auto-resync : 03:08:2023 - 22:54:30

6 files changed, 2 insertions, 328 deletions

diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 4e17adcbef19..cd7bdacc398f 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,10 +1,5 @@
-AUX digikam-7.10.0-gcc13.patch 728 BLAKE2B bb1322359978ba019689c1874a63a6ae218b34c664c909def58bd509667c9c840ec06f1334c66caff1673052bcbbd73cda2f394fdd2d0f827705df0774297a76 SHA512 a610c682ba2b6aad2580d83e8d5e1d5f6fc9d104f784c80d8938cd7a049b1c85fe336c71ffc46b4772b2febe2b0ab994be3ae7de3e289d6f1236b5310b4f6c8e
-AUX digikam-7.8.0-cmake.patch 4066 BLAKE2B 3f18ad5c25629cf7f32ced42c55875e3158a68083c28ca70c5b6a32795117339aebf930753f82ad21cc57990d4a0f030f39583a7b318433e3feb47ed1c4a3ddd SHA512 83626bdeacb91afd069ce4b9023f4a62154a53b2de569fb24286153fd5083a1970e3b34d37abae61ed77928d9f22bde84622ad67fd8659fefd105c1c15ed34d0
-AUX digikam-7.9.0-akonadi-23.04.patch 1030 BLAKE2B 11996d57bfd2647a604d28f7fa976aeaa9cbe4329f266e813944320b3bdd7b1b8761685b670bbb4499181a77b5b8da49e65d4218014ce5e0124ff3dae346228a SHA512 52fbf63e46f50fde477266bc0b30888ae7bf83f6986294c17307705f536468889d312eba61647e125431dee4331cbd56a458c2999f31d29a0b1c989586732d6e
 AUX digikam-8.1.0-cmake.patch 5948 BLAKE2B c1fde60bf77039a4d4a974a9112237e014b27cbbdae0348965dcff97377e5a4929dc04a6c12e71e38534554e0bf55ef5cdd0e4a1c099996ca237f7dc3acb44f3 SHA512 65bbba111168809a6afea5c001b2af6cab8a04f9547abcec8adcd535d4631b28e274e0a93279519f7fef5b92aec1019e09973ec92e27d55a4292b7557ddcd4df
 AUX digikam-8.1.0-fix-config-for-scaling-high-res-icons.patch 1613 BLAKE2B 774c24f498c37ccc9a3eca7165734b870861f38b7d196f3b7ad75eef4340854be3c20988fc043b6e7c3a6ac53bf7529834f28daf8fabed9d8692dbd60016e65f SHA512 31197b360de14d858379cfd2a937a0a2a21e16b60ad7a82aafa3fb67ddeb2a3e9ecdf190fa4bec1a97bb912c44ed594104b1a5df40f1c317ea1b0e9f8e76cae3
-DIST digiKam-7.10.0.tar.xz 349238192 BLAKE2B 527d0c3ca2e2cc2ac4d3eff11ab4e6556d21f29c78b13f92c7a80ab2775c2ba838b0d94f1fd402533dc249148049be365e7f3798eb9a973ee9d38d682f33df64 SHA512 1a5f045161253d73c4012fa949ec718fcc6c6b292ee0557c8015bea81c95fa39d3034ad46a40fdb64221f59832dc8ecdc724e93929ad2c0e35cc51fc82d28f27
 DIST digiKam-8.1.0.tar.xz 35712348 BLAKE2B 0feaa66ec27b0c2a9e776f26c02987554e8653cda29ca1982182ec1a0f70783808cd2e269dcee1f2b65e6e29ba3bc483a2284a6a485c0b7cc46ae80dd2f87069 SHA512 cbf5a776b4138f4f05d074721324b046dfa07ddc01259f569ae46c46a6d5b0b00824ef0962a09041081703348e4defecf15cff800b2c6cf5e04a0e7e963a3ef4
-EBUILD digikam-7.10.0-r1.ebuild 4085 BLAKE2B 34243cd0aefd7d2468f1d84c825d4f1961862006ceac7bef3af74a6086de9413d12d60c054668084d5262590f723c5c5d6de8f6547b6cb4a031327b175825fdf SHA512 b89f4c518bb0f1db489f1457cd9e09472f01b52097d9cebe7b88bf595f1a02dbd8e0f80979cc1883c7da25cb469917e222e72117edae4890e1c135ede1e5d050
-EBUILD digikam-8.1.0-r1.ebuild 4337 BLAKE2B f1ecd86a25c01eab8c289d75f076df6a2fae488da55b036816fd40782c769c0228c4b9a5bd3dc3eb03e83f9f2914bfa4f79853a69169fe88763e22c64a485747 SHA512 421aa3095a72e8da4b16b01f4e917d4a73b3f06c77bb78d530720fad6145bf50e5e2baf87a96c49387cb0b525a3f695ab4373489c57528917ca7a35b89c8816e
+EBUILD digikam-8.1.0-r1.ebuild 4336 BLAKE2B 061ea80c923e46f72b296805b3772a585c5574880f622a6e8dd419fc1e3c819eb069127b67e355ef0fc472bb18f23e6dc69ec8c3ed4ccd53b0cf94edac1e85c8 SHA512 028b4cd48bfd08f5f919794eb8216a063d6f3ddbf0e87024a0ca0afb840bf532548d54f5378465b2a48ac79519d736314475eee8c1bcc64d93ecd717c37c3414
 MISC metadata.xml 955 BLAKE2B 49eb64d1179383122e4fe65b2edc22929b46dba0fdb44cbd6230b33268143a9c7d4dc56a7414029864bce0a06c60c56476abc0264f151fad356020b5998b79e3 SHA512 dbe088987df5f09a8d166a293423f006eb97ab57fd0415871dc30a1a066e33a7e9e4c13a5608dd69dd96b06082bac5c216c7d9506ca60d326ab10ade96b6af39
diff --git a/media-gfx/digikam/digikam-7.10.0-r1.ebuild b/media-gfx/digikam/digikam-7.10.0-r1.ebuild
deleted file mode 100644
index 5dc278727087..000000000000
--- a/media-gfx/digikam/digikam-7.10.0-r1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.88.0
-QTMIN=5.15.5
-inherit ecm kde.org toolchain-funcs
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	if [[ ${PV} =~ beta[0-9]$ ]]; then
-		SRC_URI="mirror://kde/unstable/${PN}/"
-	else
-		SRC_URI="mirror://kde/stable/${PN}/${PV}/"
-	fi
-	SRC_URI+="digiKam-${PV/_/-}.tar.xz"
-	KEYWORDS="amd64 ~x86"
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-DESCRIPTION="Digital photo management application"
-HOMEPAGE="https://www.digikam.org/"
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mysql opengl openmp +panorama scanner semantic-desktop X"
-
-# bug 366505
-RESTRICT="test"
-
-COMMON_DEPEND="
-	dev-libs/expat
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[mysql?]
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=media-gfx/exiv2-0.27:=[xmp]
-	media-libs/lcms:2
-	media-libs/libjpeg-turbo:=
-	media-libs/liblqr
-	media-libs/libpng:=
-	>=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d]
-	media-libs/tiff:=
-	addressbook? (
-		>=kde-apps/akonadi-contacts-19.04.3:5
-		>=kde-frameworks/kcontacts-${KFMIN}:5
-	)
-	calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 )
-	gphoto2? ( media-libs/libgphoto2:= )
-	heif? (
-		media-libs/libheif:=
-		media-libs/x265:=
-	)
-	imagemagick? ( media-gfx/imagemagick:= )
-	lensfun? ( media-libs/lensfun )
-	marble? (
-		>=dev-qt/qtconcurrent-${QTMIN}:5
-		>=kde-apps/marble-19.04.3:5
-		>=kde-frameworks/kbookmarks-${KFMIN}:5
-	)
-	opengl? (
-		>=dev-qt/qtopengl-${QTMIN}:5
-		virtual/opengl
-	)
-	panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
-	scanner? ( >=kde-apps/libksane-19.04.3:5 )
-	semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/eigen:3
-	dev-libs/boost
-	addressbook? ( >=kde-apps/akonadi-19.04.3:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	mysql? ( virtual/mysql[server(+)] )
-	panorama? ( media-gfx/hugin )
-"
-BDEPEND="
-	sys-devel/gettext
-	panorama? (
-		sys-devel/bison
-		sys-devel/flex
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-7.8.0-cmake.patch"
-	"${FILESDIR}/${PN}-7.9.0-akonadi-23.04.patch" # bug 904976
-	"${FILESDIR}/${P}-gcc13.patch"
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	ecm_pkg_pretend
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	ecm_pkg_setup
-}
-
-# FIXME: Unbundle libraw (libs/rawengine/libraw)
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=OFF # bug 698192
-		-DENABLE_APPSTYLES=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
-		-DENABLE_MEDIAPLAYER=OFF # bug 758641, last-rited
-		-DENABLE_QWEBENGINE=ON
-		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
-		$(cmake_use_find_package calendar KF5CalendarCore)
-		$(cmake_use_find_package gphoto2 Gphoto2)
-		$(cmake_use_find_package heif Libheif)
-		$(cmake_use_find_package imagemagick ImageMagick)
-		$(cmake_use_find_package lensfun LensFun)
-		$(cmake_use_find_package marble Marble)
-		-DENABLE_MYSQLSUPPORT=$(usex mysql)
-		-DENABLE_INTERNALMYSQL=$(usex mysql)
-		$(cmake_use_find_package opengl OpenGL)
-		$(cmake_use_find_package panorama KF5ThreadWeaver)
-		$(cmake_use_find_package scanner KF5Sane)
-		-DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-gfx/digikam/digikam-8.1.0-r1.ebuild b/media-gfx/digikam/digikam-8.1.0-r1.ebuild
index 25088c00bc1d..3eebbe374fb0 100644
--- a/media-gfx/digikam/digikam-8.1.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-8.1.0-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
 		SRC_URI="mirror://kde/stable/${PN}/${PV}/"
 	fi
 	SRC_URI+="digiKam-${PV/_/-}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 	S="${WORKDIR}/${PN}-${PV/_/-}"
 fi
 
diff --git a/media-gfx/digikam/files/digikam-7.10.0-gcc13.patch b/media-gfx/digikam/files/digikam-7.10.0-gcc13.patch
deleted file mode 100644
index 98e78df74d8c..000000000000
--- a/media-gfx/digikam/files/digikam-7.10.0-gcc13.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9c4fed4b5562c777fc6639ead9bcc95faacdb992 Mon Sep 17 00:00:00 2001
-From: Maik Qualmann <metzpinguin@gmail.com>
-Date: Sun, 26 Mar 2023 13:19:40 +0200
-Subject: [PATCH] fix compile DNG-SDK with GCC13
-
----
- core/libs/dngwriter/extra/dng_sdk/dng_string.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp b/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp
-index 4e76fc4c86a..7814aff145d 100644
---- a/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp
-+++ b/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp
-@@ -27,7 +27,7 @@
- #   endif
- #endif
- 
--#if qiPhone || qAndroid
-+#if qLinux || qiPhone || qAndroid
- #include <ctype.h> // for isdigit
- #endif
- 
--- 
-GitLab
-
diff --git a/media-gfx/digikam/files/digikam-7.8.0-cmake.patch b/media-gfx/digikam/files/digikam-7.8.0-cmake.patch
deleted file mode 100644
index d698626e8c7e..000000000000
--- a/media-gfx/digikam/files/digikam-7.8.0-cmake.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 618e3f3ba195a3b50812d1184ebf90555d659055 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/KF5 detection
-
-And if we enable an option, make the necessary libraries REQUIRED.
----
- core/CMakeLists.txt | 50 +++++++++++++--------------------------------
- 1 file changed, 14 insertions(+), 36 deletions(-)
-
-diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
-index de599ee881..8aef35e062 100644
---- a/core/CMakeLists.txt
-+++ b/core/CMakeLists.txt
-@@ -65,17 +65,14 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED
- )
- 
- if(ENABLE_QWEBENGINE)
--    find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS WebEngineWidgets)
-+    find_package(Qt5WebEngineWidgets ${QT_MIN_VERSION} REQUIRED NO_MODULE)
- else()
--    find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS WebKitWidgets)
-+    find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} REQUIRED NO_MODULE)
- endif()
- 
--find_package(Qt5 ${QT_MIN_VERSION}
--             OPTIONAL_COMPONENTS
--             DBus
--             OpenGL
--             XmlPatterns                # For Rajce plugin
--)
-+find_package(Qt5DBus ${QT_MIN_VERSION})
-+find_package(Qt5OpenGL ${QT_MIN_VERSION})
-+find_package(Qt5XmlPatterns ${QT_MIN_VERSION}) # For Rajce plugin
- 
- if(ENABLE_DBUS)
-     if(NOT Qt5DBus_FOUND)
-@@ -86,16 +83,11 @@ endif()
- # Dependencies For unit tests and CLI test tools
- 
- if(BUILD_TESTING)
--    find_package(Qt5 ${QT_MIN_VERSION} REQUIRED
--                 NO_MODULE COMPONENTS
--                 Test
--    )
-+    find_package(Qt5Test ${QT_MIN_VERSION} NO_MODULE)
- 
--    find_package(Qt5 ${QT_MIN_VERSION}
--                 QUIET
--                 OPTIONAL_COMPONENTS
--                 Qml WebView  # Optional, for 'sialis' O2 library test tool.
--    )
-+    # Optional, for 'sialis' O2 library test tool.
-+    find_package(Qt5Qml ${QT_MIN_VERSION} QUIET NO_MODULE)
-+    find_package(Qt5WebView ${QT_MIN_VERSION} QUIET NO_MODULE)
- endif()
- 
- find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
-@@ -121,7 +113,7 @@ find_package(KF5 ${KF5_MIN_VERSION} QUIET
- if(ENABLE_KFILEMETADATASUPPORT)
- 
-     find_package(KF5 ${KF5_MIN_VERSION}
--                 QUIET
-+                 REQUIRED
-                  OPTIONAL_COMPONENTS
-                  FileMetaData           # For Plasma destop file indexer support.
-     )
-@@ -130,7 +122,7 @@ endif()
- 
- if(ENABLE_AKONADICONTACTSUPPORT)
- 
--    find_package(KF5 ${AKONADI_MIN_VERSION} QUIET
-+    find_package(KF5 ${AKONADI_MIN_VERSION} REQUIRED
-                  OPTIONAL_COMPONENTS
-                  AkonadiContact         # For KDE Mail Contacts support.
-                  Contacts               # API for contacts/address book data.
-@@ -138,28 +130,14 @@ if(ENABLE_AKONADICONTACTSUPPORT)
- 
- endif()
- 
--find_package(KF5 ${KSANE_MIN_VERSION} QUIET
--             OPTIONAL_COMPONENTS
--             Sane                   # For digital scanner support.
--)
-+find_package(KF5Sane ${KSANE_MIN_VERSION} QUIET) # For digital scanner support.
- 
--find_package(KF5 ${CALENDAR_MIN_VERSION} QUIET
--             OPTIONAL_COMPONENTS
--             CalendarCore           # For Calendar tool.
--)
-+find_package(KF5CalendarCore ${CALENDAR_MIN_VERSION} QUIET) # For Calendar tool.
- 
- if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
-     set(HAVE_KCALENDAR_QDATETIME TRUE)
- endif()
- 
--if(ENABLE_AKONADICONTACTSUPPORT AND (NOT KF5AkonadiContact_FOUND OR NOT KF5Contacts_FOUND))
--    set(ENABLE_AKONADICONTACTSUPPORT OFF)
--endif()
--
--if(ENABLE_KFILEMETADATASUPPORT AND NOT KF5FileMetaData_FOUND)
--    set(ENABLE_KFILEMETADATASUPPORT OFF)
--endif()
--
- # Check if KIO have been compiled with KIOWidgets. digiKam only needs this one.
- if(KF5KIO_FOUND)
-     get_target_property(KIOWidgets_INCLUDE_DIRS KF5::KIOWidgets
-@@ -296,7 +274,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.37.3
-
diff --git a/media-gfx/digikam/files/digikam-7.9.0-akonadi-23.04.patch b/media-gfx/digikam/files/digikam-7.9.0-akonadi-23.04.patch
deleted file mode 100644
index d9b46a7966f0..000000000000
--- a/media-gfx/digikam/files/digikam-7.9.0-akonadi-23.04.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5b4ba173f6a84a8be1131b1523dc42df95171ec7 Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Thu, 20 Apr 2023 17:49:44 +0200
-Subject: [PATCH] Fix build with akonadi 23.04
-
-In KDE PIM 23.04 the KF5:: targets have been renamed to KPim5::
-While the KF5:: targets are kept for backwards compatibility, they no longer recursively include other KF5:: targets.
-We need to search for Akonadi explicitly so that the KF5::AkonadiCore target is defined.
----
- core/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
-index 4cb33d2f9e6..610033425cd 100644
---- a/core/CMakeLists.txt
-+++ b/core/CMakeLists.txt
-@@ -124,6 +124,7 @@ if(ENABLE_AKONADICONTACTSUPPORT)
- 
-     find_package(KF5 ${AKONADI_MIN_VERSION} QUIET REQUIRED
-                  OPTIONAL_COMPONENTS
-+                 Akonadi
-                  AkonadiContact         # For KDE Mail Contacts support.
-                  Contacts               # API for contacts/address book data.
-     )
--- 
-GitLab
-