gentoo auto-resync : 16:03:2024 - 18:48:51

16 files changed, 14 insertions, 542 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index b7515f26df73..1c7f935e717f 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index aaccd8a9c7b3..3098b0c3d9e3 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,7 +1,5 @@
-AUX darktable-3.0.2_cmake-march-autodetection.patch 908 BLAKE2B aa1c0cedfe1f267332f11b9a8f38ce368af02b7e4f9751b128b7af91dcdfb066a0529ae126d41a34bc3fc66f336924f3376f270674bcc7e0912d2e23d46ec83b SHA512 da1f10e86b7b9e2a3f317d620a58ebed156a5c6e0f22f429da617cb176d1c18d6d1b6706c1444c9007ccb776bc6b951e3560214e89e95b4050899ec692b74dde
 AUX darktable-3.4.0_jsonschema-automagic.patch 891 BLAKE2B b0abdd7ea80a446e2556daf06f78343deeb781a12b670f3c3d2f8a34ec9877e16991f6a105c90d58f437915b30bd8bddfb995d515bc73563a44f3807258c9fee SHA512 57cdf87586c6382347334577fff71d415be0123ad101c073535e9d4e87e7edac275272e0b3be91bd34965bacf1f6166cfc64af34b4cdedfb27b409e27bc3bdc9
 AUX darktable-3.4.1_libxcf-cmake.patch 788 BLAKE2B b6ecb84de804b0bf16f907f825d93d00a62c1d996077514b3e55f370347f47e561707cb8da6a270aa42c3320142437691cc8b132718c485b5b7df40068d41ee5 SHA512 d94247c4f2c3b4894bd6455cd036a62ef5edb90a77bf8f930efc3e540d00712000fe8eeb7d4c937fa826aef1dd129448223c8696ff094e823894b17ef2669a4e
-AUX darktable-4.2.1-exiv2-0.28.patch 9139 BLAKE2B 82eb190e1fe9d93af8bce40fdfd7647e69bf620915d5d1cc76faefda17577f7480c7c5b9649b2f5ce7efb86b274b19c426393e2c943383637fe8c18a9ceac372 SHA512 dcdfdf9d62983428c4b0bfc87a747a437cd07cc640cba948309095680c077f118da1a4208362b76eba14044ad0fd8dabbb3715335d30e35e2f84a171ca275c6e
 AUX darktable-4.2.1_cmake-musl.patch 796 BLAKE2B 2e26cc969f01dc948f4f92f42c768a28bb879b3592d98dc1de0c3b5b7335a2985fbb5659c58b421fbca896b1f2585a5cb993b5cdf3ee6f87d9834afe3fd1a23a SHA512 82c7a4f6d6112fa024503a99e05d3050922b120821c93922ae846f9da6b02cd6f2e27315448c20ed1032c5526b85cb6d01dd6eec5109db1af3f8e92e4818ea06
 AUX darktable-4.4.2_fix-has-attribute-musl.patch 779 BLAKE2B d22e3cc6a28f9b0df574f1e512926868c7dd921b57dacb0934fdbfe934fb14ccb5cb16cbef49646a00c9be183af4f426e8d656389e2a87bb1c8247a8d64fd4f8 SHA512 70e0bf5fd3fee861490c651b2d2e94f3c187852bbd4e71972873d4ad4d426156e0785d1ed96ee65d641333357aa9048852b056985d6678f1efe98026a3e1474b
 DIST darktable-4.6.0.tar.xz 6129572 BLAKE2B 170d874f6a35c4fe5a5555f308bc541885968b8b5535402f8087ad4d47ee93f3d22a78c633f9b3e14584d1925a7dd682a5f3e2bd187ef2f58d0dc2a407b9bb27 SHA512 825a63c9b8bd7420f5c4b53a9281587be92088e1cd617faaf1de2b455503092cc7476872803a1d82c7bf57fcc57f85a40fc4af8ca04367e48719030f08726df7
diff --git a/media-gfx/darktable/files/darktable-3.0.2_cmake-march-autodetection.patch b/media-gfx/darktable/files/darktable-3.0.2_cmake-march-autodetection.patch
deleted file mode 100644
index 8ad4f0e9329f..000000000000
--- a/media-gfx/darktable/files/darktable-3.0.2_cmake-march-autodetection.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Darktable and RawSpeed upstream support two build modes: if BINARY_PACKAGE_BUILD==1
-they pass -mtune=generic to the compiler, otherwise they use -march=native.
-In either case, these options override externally set CFLAGS.
-
-Disable this behaviour so that the users' settings provided to the ebuild by Portage
-are respected.
-
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -521,7 +521,7 @@
-     set(DT_REQ_INSTRUCTIONS "-msse2")
-   endif()
- 
--  include(march-mtune)
-+  set(MARCH "")
- 
-   #if(NOT BUILD_SSE2_CODEPATHS)
-   #  set(MARCH "${MARCH} -mno-sse2 -D__DISABLE_SSE2__ -U__SSE2__ -D__DISABLE_SSE__ -U__SSE__")
---- a/src/external/rawspeed/cmake/compiler-flags.cmake
-+++ b/src/external/rawspeed/cmake/compiler-flags.cmake
-@@ -1,5 +1,4 @@
- include(CheckCXXCompilerFlag)
--include(CpuMarch)
- include(CheckCXXCompilerFlagAndEnableIt)
- 
- # yes, need to keep both the CMAKE_CXX_FLAGS and CMAKE_CXX_STANDARD.
diff --git a/media-gfx/darktable/files/darktable-4.2.1-exiv2-0.28.patch b/media-gfx/darktable/files/darktable-4.2.1-exiv2-0.28.patch
deleted file mode 100644
index 1be8577ae369..000000000000
--- a/media-gfx/darktable/files/darktable-4.2.1-exiv2-0.28.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-diff --git a/src/common/exif.cc b/src/common/exif.cc
-index 484ebf2207..91ea8e64d0 100644
---- a/src/common/exif.cc
-+++ b/src/common/exif.cc
-@@ -80,6 +80,11 @@ extern "C" {
- 
- #define DT_XMP_EXIF_VERSION 5
- 
-+#if EXIV2_TEST_VERSION(0,28,0)
-+#define AnyError Error
-+#define toLong toInt64
-+#endif
-+
- // persistent list of exiv2 tags. set up in dt_init()
- static GList *exiv2_taglist = NULL;
- 
-@@ -2658,39 +2663,39 @@ static GList *read_history_v2(Exiv2::XmpData &xmpData, const char *filename)
-       if(g_str_has_prefix(key_iter, "darktable:operation"))
-       {
-         current_entry->have_operation = TRUE;
--        current_entry->operation = g_strdup(history->value().toString().c_str());
-+        current_entry->operation = g_strdup(history->toString().c_str());
-       }
-       else if(g_str_has_prefix(key_iter, "darktable:num"))
-       {
--        current_entry->num = history->value().toLong();
-+        current_entry->num = history->toLong();
-       }
-       else if(g_str_has_prefix(key_iter, "darktable:enabled"))
-       {
--        current_entry->enabled = history->value().toLong() == 1;
-+        current_entry->enabled = history->toLong() == 1;
-       }
-       else if(g_str_has_prefix(key_iter, "darktable:modversion"))
-       {
-         current_entry->have_modversion = TRUE;
--        current_entry->modversion = history->value().toLong();
-+        current_entry->modversion = history->toLong();
-       }
-       else if(g_str_has_prefix(key_iter, "darktable:params"))
-       {
-         current_entry->have_params = TRUE;
--        current_entry->params = dt_exif_xmp_decode(history->value().toString().c_str(), history->value().size(),
-+        current_entry->params = dt_exif_xmp_decode(history->toString().c_str(), history->size(),
-                                                    &current_entry->params_len);
-       }
-       else if(g_str_has_prefix(key_iter, "darktable:multi_name"))
-       {
--        current_entry->multi_name = g_strdup(history->value().toString().c_str());
-+        current_entry->multi_name = g_strdup(history->toString().c_str());
-       }
-       else if(g_str_has_prefix(key_iter, "darktable:multi_priority"))
-       {
--        current_entry->multi_priority = history->value().toLong();
-+        current_entry->multi_priority = history->toLong();
-       }
-       else if(g_str_has_prefix(key_iter, "darktable:iop_order"))
-       {
-         // we ensure reading the iop_order as a high precision float
--        string str = g_strdup(history->value().toString().c_str());
-+        string str = g_strdup(history->toString().c_str());
-         static const std::locale& c_locale = std::locale("C");
-         std::istringstream istring(str);
-         istring.imbue(c_locale);
-@@ -2698,12 +2703,12 @@ static GList *read_history_v2(Exiv2::XmpData &xmpData, const char *filename)
-       }
-       else if(g_str_has_prefix(key_iter, "darktable:blendop_version"))
-       {
--        current_entry->blendop_version = history->value().toLong();
-+        current_entry->blendop_version = history->toLong();
-       }
-       else if(g_str_has_prefix(key_iter, "darktable:blendop_params"))
-       {
--        current_entry->blendop_params = dt_exif_xmp_decode(history->value().toString().c_str(),
--                                                           history->value().size(),
-+        current_entry->blendop_params = dt_exif_xmp_decode(history->toString().c_str(),
-+                                                           history->size(),
-                                                            &current_entry->blendop_params_len);
-       }
-     }
-@@ -2858,35 +2863,35 @@ static GList *read_masks_v3(Exiv2::XmpData &xmpData, const char *filename, const
-       // go on reading things into current_entry
-       if(g_str_has_prefix(key_iter, "darktable:mask_num"))
-       {
--        current_entry->mask_num = history->value().toLong();
-+        current_entry->mask_num = history->toLong();
-       }
-       else if(g_str_has_prefix(key_iter, "darktable:mask_id"))
-       {
--        current_entry->mask_id = history->value().toLong();
-+        current_entry->mask_id = history->toLong();
-       }
-       else if(g_str_has_prefix(key_iter, "darktable:mask_type"))
-       {
--        current_entry->mask_type = history->value().toLong();
-+        current_entry->mask_type = history->toLong();
-       }
-       else if(g_str_has_prefix(key_iter, "darktable:mask_name"))
-       {
--        current_entry->mask_name = g_strdup(history->value().toString().c_str());
-+        current_entry->mask_name = g_strdup(history->toString().c_str());
-       }
-       else if(g_str_has_prefix(key_iter, "darktable:mask_version"))
-       {
--        current_entry->mask_version = history->value().toLong();
-+        current_entry->mask_version = history->toLong();
-       }
-       else if(g_str_has_prefix(key_iter, "darktable:mask_points"))
-       {
--        current_entry->mask_points = dt_exif_xmp_decode(history->value().toString().c_str(), history->value().size(), &current_entry->mask_points_len);
-+        current_entry->mask_points = dt_exif_xmp_decode(history->toString().c_str(), history->size(), &current_entry->mask_points_len);
-       }
-       else if(g_str_has_prefix(key_iter, "darktable:mask_nb"))
-       {
--        current_entry->mask_nb = history->value().toLong();
-+        current_entry->mask_nb = history->toLong();
-       }
-       else if(g_str_has_prefix(key_iter, "darktable:mask_src"))
-       {
--        current_entry->mask_src = dt_exif_xmp_decode(history->value().toString().c_str(), history->value().size(), &current_entry->mask_src_len);
-+        current_entry->mask_src = dt_exif_xmp_decode(history->toString().c_str(), history->size(), &current_entry->mask_src_len);
-       }
- 
-     }
-@@ -4060,7 +4065,11 @@ char *dt_exif_xmp_read_string(const int imgid)
-       std::string xmpPacket;
- 
-       Exiv2::DataBuf buf = Exiv2::readFile(WIDEN(input_filename));
-+#if EXIV2_TEST_VERSION(0,28,0)
-+      xmpPacket.assign(buf.c_str(), buf.size());
-+#else
-       xmpPacket.assign(reinterpret_cast<char *>(buf.pData_), buf.size_);
-+#endif
-       Exiv2::XmpParser::decode(xmpData, xmpPacket);
-       // because XmpSeq or XmpBag are added to the list, we first have
-       // to remove these so that we don't end up with a string of duplicates
-@@ -4076,7 +4085,11 @@ char *dt_exif_xmp_read_string(const int imgid)
-       std::string xmpPacket;
- 
-       Exiv2::DataBuf buf = Exiv2::readFile(WIDEN(input_filename));
-+#if EXIV2_TEST_VERSION(0,28,0)
-+      xmpPacket.assign(buf.c_str(), buf.size());
-+#else
-       xmpPacket.assign(reinterpret_cast<char *>(buf.pData_), buf.size_);
-+#endif
-       Exiv2::XmpParser::decode(sidecarXmpData, xmpPacket);
- 
-       for(Exiv2::XmpData::const_iterator it = sidecarXmpData.begin(); it != sidecarXmpData.end(); ++it)
-@@ -4204,7 +4217,11 @@ int dt_exif_xmp_attach_export(const int imgid, const char *filename, void *metad
-       std::string xmpPacket;
- 
-       Exiv2::DataBuf buf = Exiv2::readFile(WIDEN(input_filename));
-+#if EXIV2_TEST_VERSION(0,28,0)
-+      xmpPacket.assign(buf.c_str(), buf.size());
-+#else
-       xmpPacket.assign(reinterpret_cast<char *>(buf.pData_), buf.size_);
-+#endif
-       Exiv2::XmpParser::decode(sidecarXmpData, xmpPacket);
- 
-       for(Exiv2::XmpData::const_iterator it = sidecarXmpData.begin(); it != sidecarXmpData.end(); ++it)
-@@ -4371,7 +4388,7 @@ int dt_exif_xmp_attach_export(const int imgid, const char *filename, void *metad
-     catch(Exiv2::AnyError &e)
-     {
- #if EXIV2_TEST_VERSION(0,27,0)
--      if(e.code() == Exiv2::kerTooLargeJpegSegment)
-+      if(e.code() == Exiv2::ErrorCode::kerTooLargeJpegSegment)
- #else
-       if(e.code() == 37)
- #endif
-@@ -4437,7 +4454,11 @@ int dt_exif_xmp_write(const int imgid, const char *filename)
-       }
- 
-       Exiv2::DataBuf buf = Exiv2::readFile(WIDEN(filename));
-+#if EXIV2_TEST_VERSION(0,28,0)
-+      xmpPacket.assign(buf.c_str(), buf.size());
-+#else
-       xmpPacket.assign(reinterpret_cast<char *>(buf.pData_), buf.size_);
-+#endif
-       Exiv2::XmpParser::decode(xmpData, xmpPacket);
-       // because XmpSeq or XmpBag are added to the list, we first have
-       // to remove these so that we don't end up with a string of duplicates
-diff --git a/tools/basecurve/exif-wrapper.cpp b/tools/basecurve/exif-wrapper.cpp
-index f4d4d46e12..41bb021012 100644
---- a/tools/basecurve/exif-wrapper.cpp
-+++ b/tools/basecurve/exif-wrapper.cpp
-@@ -19,6 +19,7 @@
- #include <exiv2/exif.hpp>
- #include <exiv2/error.hpp>
- #include <exiv2/image.hpp>
-+#include <exiv2/version.hpp>
- 
- #include <cstdio>
- #include <cassert>
-@@ -36,13 +37,21 @@ exif_get_ascii_datafield(
- 
-   try
-   {
-+#if EXIV2_TEST_VERSION(0,28,0)
-+    Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(filename);
-+#else
-     Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename);
-+#endif
-     assert(image.get() != 0);
-     image->readMetadata();
- 
-     Exiv2::ExifData &exifData = image->exifData();
- 
-+#if EXIV2_TEST_VERSION(0,28,0)
-+    Exiv2::Value::UniquePtr val = exifData[key].getValue();
-+#else
-     Exiv2::Value::AutoPtr val = exifData[key].getValue();
-+#endif
- 
-     if (val->typeId() != Exiv2::asciiString)
-     {
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 5d145721e13e..30c62bc87488 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,5 +1,3 @@
-AUX digikam-8.1.0-cmake.patch 6067 BLAKE2B fbb3c441dd0214417fda0650997300bc9a53cab10c58fa29d3f0d5bf331b877a126a9d2577a230ff397355610dfa7f7a6a689e625c371b60448674ba8ca05c35 SHA512 2b042cd0264e521d9b353a05a1aac0a78e1b9b4f4f00aa58d68f2f4fd3940cc17bfb5025ac730c71b96d59cd4abae4f816c552ac0cd58aec3a7f9dc9b1de7415
-AUX digikam-8.1.0-fix-config-for-scaling-high-res-icons.patch 1613 BLAKE2B 774c24f498c37ccc9a3eca7165734b870861f38b7d196f3b7ad75eef4340854be3c20988fc043b6e7c3a6ac53bf7529834f28daf8fabed9d8692dbd60016e65f SHA512 31197b360de14d858379cfd2a937a0a2a21e16b60ad7a82aafa3fb67ddeb2a3e9ecdf190fa4bec1a97bb912c44ed594104b1a5df40f1c317ea1b0e9f8e76cae3
 AUX digikam-8.2.0-akonadi.patch 5940 BLAKE2B 80261f43d9365dcc533926ea60d432956576d84afceea5fb6b9a660efd02b414a904cac8677333ac56d6746ec1b04a71ffaebaad40005c400cd8d2b3695a6147 SHA512 99bf267d3e16bcc5c085a2b05db558a4ff59eda6f0b68b69841ca835e3ba1e620eeb2ac0f3a01d981d8a50704d33538f20344a2f74d4c10214e01da1c863a52e
 AUX digikam-8.2.0-cmake.patch 6440 BLAKE2B 8542ff5edf0d16a701b7d82452a1d2c4d86d05f7b33726898e2a910e687c7a92cc017b5e7701eac7fca94b1cb61755a467ad5ef75fb99482f9da2849d91dcf91 SHA512 0c3a3256d21bacfe0df02d001551cb9eef69c123618067171936f9a33d27a7aaabf31af17ad12087d1807e8cc1643d8146907344e13166d70337645e460f9852
 DIST digiKam-8.2.0.tar.xz 48172600 BLAKE2B 436f8dcd905ff993cfde3e358e27ac23cb4ad49d24a6328cda209a742874e9fcbc12da507095e2f75a167b653bb1d9e579438bf517e2911f2cb32705230023f1 SHA512 a34c5bde0e579b5f6de1fe90977e01bc385e5c28155d24db09e3cdfe7958c979d2e27cbce402d6c5b70f952fc0ead88318dfa025bb67e540c4d763cb139db7bb
diff --git a/media-gfx/digikam/files/digikam-8.1.0-cmake.patch b/media-gfx/digikam/files/digikam-8.1.0-cmake.patch
deleted file mode 100644
index 8e1f71e661a1..000000000000
--- a/media-gfx/digikam/files/digikam-8.1.0-cmake.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-From 5171575601ebc553cb747a2757caf63b433820b3 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 Qt/KF5 detection
-
-And if we enable an option, make the necessary libraries REQUIRED.
----
- core/cmake/rules/RulesKDEFramework.cmake | 41 +++--------------
- core/cmake/rules/RulesQtFramework.cmake  | 58 +++++-------------------
- core/cmake/rules/RulesX11.cmake          |  7 +--
- 3 files changed, 19 insertions(+), 87 deletions(-)
-
-diff --git a/core/cmake/rules/RulesKDEFramework.cmake b/core/cmake/rules/RulesKDEFramework.cmake
-index 610033425c..3ea9b1351d 100644
---- a/core/cmake/rules/RulesKDEFramework.cmake
-+++ b/core/cmake/rules/RulesKDEFramework.cmake
-@@ -26,35 +26,20 @@ find_package(KF5 ${KF5_MIN_VERSION} QUIET
- )
- 
- if(ENABLE_KFILEMETADATASUPPORT)
--
--    find_package(KF5 ${KF5_MIN_VERSION} QUIET
--                                        OPTIONAL_COMPONENTS
--                                        FileMetaData            # For Plasma destop file indexer support.
--    )
--
-+    # For Plasma desktop file indexer support.
-+    find_package(KF5FileMetaData ${KF5_MIN_VERSION} REQUIRED)
- endif()
- 
- 
- if(ENABLE_AKONADICONTACTSUPPORT)
--
--    find_package(KF5 ${AKONADI_MIN_VERSION} QUIET
--                                            OPTIONAL_COMPONENTS
--                                            Akonadi
--                                            AkonadiContact      # For KDE Mail Contacts support.
--                                            Contacts            # API for contacts/address book data.
--    )
--
-+    find_package(KF5Akonadi ${AKONADI_MIN_VERSION} REQUIRED)
-+    find_package(KF5AkonadiContact ${AKONADI_MIN_VERSION} REQUIRED) # For KDE Mail Contacts support.
-+    find_package(KF5Contacts ${AKONADI_MIN_VERSION} REQUIRED)       # API for contacts/address book data.
- 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)
- 
-@@ -62,18 +47,6 @@ if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
- 
- 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)
-diff --git a/core/cmake/rules/RulesQtFramework.cmake b/core/cmake/rules/RulesQtFramework.cmake
-index e6e1670ed3..1ab57af4d4 100644
---- a/core/cmake/rules/RulesQtFramework.cmake
-+++ b/core/cmake/rules/RulesQtFramework.cmake
-@@ -18,47 +18,19 @@ find_package(Qt${QT_VERSION_MAJOR} REQUIRED
- )
- 
- if(ENABLE_QWEBENGINE)
--
--    find_package(Qt${QT_VERSION_MAJOR} REQUIRED
--                                       NO_MODULE
--                                       COMPONENTS
--                                       WebEngineWidgets
--    )
--
-+    find_package(Qt${QT_VERSION_MAJOR}WebEngineWidgets REQUIRED NO_MODULE)
- else()
--
--    find_package(Qt${QT_VERSION_MAJOR} REQUIRED
--                                       NO_MODULE
--                                       COMPONENTS
--                                       WebKitWidgets
--    )
--
-+    find_package(Qt${QT_VERSION_MAJOR}WebKitWidgets REQUIRED NO_MODULE)
- endif()
- 
--find_package(Qt${QT_VERSION_MAJOR}
--             OPTIONAL_COMPONENTS
--             DBus
--             OpenGL
--)
-+find_package(Qt${QT_VERSION_MAJOR}DBus)
-+find_package(Qt${QT_VERSION_MAJOR}OpenGL)
- 
- if(Qt6_FOUND)
--
--    find_package(Qt${QT_VERSION_MAJOR} REQUIRED
--                 NO_MODULE COMPONENTS
--                 StateMachine
--    )
--    find_package(Qt${QT_VERSION_MAJOR}
--                 OPTIONAL_COMPONENTS
--                 OpenGLWidgets
--    )
--
-+    find_package(Qt${QT_VERSION_MAJOR}StateMachine REQUIRED NO_MODULE)
-+    find_package(Qt${QT_VERSION_MAJOR}OpenGLWidgets)
- else()
--
--    find_package(Qt${QT_VERSION_MAJOR}
--                 OPTIONAL_COMPONENTS
--                 XmlPatterns                # For Rajce plugin
--    )
--
-+    find_package(Qt${QT_VERSION_MAJOR}XmlPatterns) # For Rajce plugin
- endif()
- 
- if(ENABLE_DBUS)
-@@ -74,17 +46,9 @@ endif()
- # Qt Dependencies For unit tests and CLI test tools
- 
- if(BUILD_TESTING)
-+    find_package(Qt${QT_VERSION_MAJOR}Test REQUIRED NO_MODULE)
- 
--    find_package(Qt${QT_VERSION_MAJOR} REQUIRED
--                                       NO_MODULE
--                                       COMPONENTS
--                                       Test
--    )
--
--    find_package(Qt${QT_VERSION_MAJOR}
--                 QUIET
--                 OPTIONAL_COMPONENTS
--                 Qml WebView  # Optional, for 'sialis' O2 library test tool.
--    )
--
-+    # Optional, for 'sialis' O2 library test tool.
-+    find_package(Qt${QT_VERSION_MAJOR}Qml QUIET NO_MODULE)
-+    find_package(Qt${QT_VERSION_MAJOR}WebView QUIET NO_MODULE)
- endif()
-diff --git a/core/cmake/rules/RulesX11.cmake b/core/cmake/rules/RulesX11.cmake
-index d7659eed34..9c145970b2 100644
---- a/core/cmake/rules/RulesX11.cmake
-+++ b/core/cmake/rules/RulesX11.cmake
-@@ -11,12 +11,7 @@ find_package(X11)
- if(X11_FOUND)
- 
-     if(NOT Qt6_FOUND)
--
--        find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE
--                                           COMPONENTS
--                                           X11Extras
--        )
--
-+        find_package(Qt5X11Extras ${QT_MIN_VERSION} NO_MODULE)
-     endif()
- 
-     set(HAVE_X11 TRUE)
--- 
-2.42.0
-
diff --git a/media-gfx/digikam/files/digikam-8.1.0-fix-config-for-scaling-high-res-icons.patch b/media-gfx/digikam/files/digikam-8.1.0-fix-config-for-scaling-high-res-icons.patch
deleted file mode 100644
index 3ec2889d4090..000000000000
--- a/media-gfx/digikam/files/digikam-8.1.0-fix-config-for-scaling-high-res-icons.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 35e5817353709c5c16521fee116bb3c70196aa0f Mon Sep 17 00:00:00 2001
-From: Maik Qualmann <metzpinguin@gmail.com>
-Date: Tue, 18 Jul 2023 18:31:51 +0200
-Subject: [PATCH] for a new config under Linux scaling and high-resolution
- icons are enabled BUGS: 457272 FIXED-IN: 8.2.0
-
----
- core/utilities/setup/misc/systemsettings.cpp | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/core/utilities/setup/misc/systemsettings.cpp b/core/utilities/setup/misc/systemsettings.cpp
-index f4e15803a11..c164bb0cd36 100644
---- a/core/utilities/setup/misc/systemsettings.cpp
-+++ b/core/utilities/setup/misc/systemsettings.cpp
-@@ -22,6 +22,7 @@
- // Local includes
- 
- #include "digikam_debug.h"
-+#include "digikam_config.h"
- 
- namespace Digikam
- {
-@@ -56,8 +57,19 @@ void SystemSettings::readSettings()
-     QSettings settings(m_path, QSettings::IniFormat);
- 
-     settings.beginGroup(QLatin1String("System"));
-+
-+#ifdef Q_OS_LINUX
-+
-+    useHighDpiScaling = settings.value(QLatin1String("useHighDpiScaling"), true).toBool();
-+    useHighDpiPixmaps = settings.value(QLatin1String("useHighDpiPixmaps"), true).toBool();
-+
-+#else
-+
-     useHighDpiScaling = settings.value(QLatin1String("useHighDpiScaling"), false).toBool();
-     useHighDpiPixmaps = settings.value(QLatin1String("useHighDpiPixmaps"), false).toBool();
-+
-+#endif
-+
-     disableFaceEngine = settings.value(QLatin1String("disableFaceEngine"), false).toBool();
-     enableLogging     = settings.value(QLatin1String("enableLogging"),     false).toBool();
-     disableOpenCL     = settings.value(QLatin1String("disableOpenCL"),     true).toBool();
--- 
-GitLab
-
diff --git a/media-gfx/gifsicle/Manifest b/media-gfx/gifsicle/Manifest
index 7f010f99e007..a85cdfe10a3c 100644
--- a/media-gfx/gifsicle/Manifest
+++ b/media-gfx/gifsicle/Manifest
@@ -2,5 +2,5 @@ AUX gifsicle-1.94-CVE-2023-46009.patch 3192 BLAKE2B 01926ce195db5f9ef1a5e7bd3d10
 DIST gifsicle-1.93.tar.gz 578194 BLAKE2B c5635fc736e2fd97278ab97377663f9702d2891cab5e19b16fa1aa53412ae48945d82ee42e9690208532cb854c99397ec4c1a11d4521454d8d40efd9adfd9d2a SHA512 1ace2c9597a405d69bb9dfa24764a3d7c7dd9864e1832d25a4a7ad2e32780038206b889711846d6e4dbc7189482d0d03874f18d86966ebffbc4ee10569c390d3
 DIST gifsicle-1.94.tar.gz 579194 BLAKE2B 0d6a734d6340938579633061cbff1f702c33adf7c206d3120488fa4a14eb69ef2f5838ee42b92cb371fa39398b57114c6315308d83fd951c399d9d6c3b3986d0 SHA512 5dc84332d929bc765b642f31fb79ed2998b193985070513cb3e412bca519c7c6065537c14df13e9860ae09dc5c66a06ca5475b1fdee62cd9509d42a5e2d0c9b6
 EBUILD gifsicle-1.93.ebuild 639 BLAKE2B 9c8080193dfaf712da47ac9855142d171861e9568849065e30f03fcc6be0318afc62708f3b3795ba49ef0facc375c77f269a6da2915d055d7f85fca2dec683a1 SHA512 cd058a074484f0aab0730acc8b09b79443e8db055d3f0429279fb0f519cbfb1ea4620209fffaf5a2d0d30e2f44c057be7cb36214cf63afd1274c20c616928a2e
-EBUILD gifsicle-1.94.ebuild 690 BLAKE2B 77c92ca2ab00cf6d2ed1595924701e7fafaa658f08c906a744559f11587e4428ecd1b0956c1828146d84c4a6e47410ecd80ca076f40780ce596ab346c060fac1 SHA512 78d4247589a5a309f0e1a0056c7601e60ae7071c49b5ec4e6d72ffed4cc0ea49078401369081e65de98ab7c35c6318408265ac52e1890b1e0653cc5938ad948b
+EBUILD gifsicle-1.94.ebuild 692 BLAKE2B 5fb85a58d2314fec8932e3a6a454af6f62fe6c3ebb972dc20e3dd6217c311a79ac2ff3047aebd4c5345d284d7fe53e97207d63c9dad0f8544a1536acd78dc5d2 SHA512 e450adba95543e25644809d1ac2efcc323ce341923e218e35014c060099b39f9c5fd9e138e6fb16f8727832c1ba218642bccd8c965f67db1b50e893ba633d8aa
 MISC metadata.xml 248 BLAKE2B da21909c8724c7dd7cf27c3ee2fc6a032610f4863f0ff1fc4ff62d317bd8293b4ce63bf4b2f929d8768dcd449aa00aa927033b26e9dca357247aa9361bc3327e SHA512 28c710eb4b97dc08e939fa72c3ee2f834df2743f0146a7a6163a51bdf1166669bbaf05c4716a208d1b393504118150172b9d744bcc41ce23dd85e90599b731e8
diff --git a/media-gfx/gifsicle/gifsicle-1.94.ebuild b/media-gfx/gifsicle/gifsicle-1.94.ebuild
index 90af58f49fad..039993f58ea2 100644
--- a/media-gfx/gifsicle/gifsicle-1.94.ebuild
+++ b/media-gfx/gifsicle/gifsicle-1.94.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="X"
 
-PATCHES=( "${FILESDIR}/$P-CVE-2023-46009.patch" )
+PATCHES=( "${FILESDIR}/${P}-CVE-2023-46009.patch" )
 
 RDEPEND="
 	X? (
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 120a928e600e..8959f4660cba 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,6 +1,4 @@
-AUX imagemagick-7.1.1.24-c99.patch 1796 BLAKE2B 38b6834affb557d24d05a0242e249e73ec6b1994c2eb1d8fa1e81eed758a38f8383c2c0ac2af3746f4835dd7065c295e077d22033293316ebd747fc886bb2c48 SHA512 1977ab84a0b53fbeafa4c95ef7d2d792ab3459685e0ee96871cd75440a8f190c7d0e6adb639fa75db33d80efe09010f5d08ef443ccd8d458faa95fdde980ccc4
 AUX imagemagick-9999-nocputuning.patch 327 BLAKE2B 5b9b732a434733fa5ab1b554bf7e5516260e8a8f243ab8bc61f95f6833185c3a997f5b046dc24690aeebfad925e0e180d98791aae1ad910e9aa069f0108dbd89 SHA512 647c367470deaaaa1ee14a02f80c8ed63de294ea7211a9010fad029bc9b254e27bc41c461561c28c2e24166fc17d0023238755160f8f22af641b0858e4bdceea
-AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
 DIST ImageMagick-6.9.13-3.tar.xz 9616088 BLAKE2B 9682bc15c42199c266cc8d9152099a96a4e66154b9c74cd7c72993c3d9edd8aa6123d64ae6852d520c9a346a27ee27120a4d2b4f7973c279006d7570666c4080 SHA512 3e061c8a7bec0c49db9e990858257ff092500430d382bcad0c76aaa8d531bd2c13b727a52f060fc6051a0217f41f254570d23a4301c15a7af547e13f148a4ca9
 DIST ImageMagick-7.1.1-25.tar.xz 10557080 BLAKE2B 833c450c87e4a1650b6d71e2d8abeea74ad6f0afa7ec6f0cba9c5bb39044cf17c6b94959d65f121a18faa8ae6ad8b8921b48700f5b6269df9d9b0e7049b22e04 SHA512 0c4a34f6ada5310af248c2e569900604c50295ecdcbc1dd7e5c4375cc68277ec9cac6786db8fa42d3783c2c68468cf88e0413fa60e4ac40d06818bfd34dcf09e
diff --git a/media-gfx/imagemagick/files/imagemagick-7.1.1.24-c99.patch b/media-gfx/imagemagick/files/imagemagick-7.1.1.24-c99.patch
deleted file mode 100644
index affcb61f1fed..000000000000
--- a/media-gfx/imagemagick/files/imagemagick-7.1.1.24-c99.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-https://bugs.gentoo.org/920788
-
-From f6e90ad1a649c4032b957fa101d30c14de3b7e5d Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Wed, 27 Dec 2023 22:37:42 +0000
-Subject: [PATCH] configure.ac: fixup LFS check for autoconf-2.72
-
-There are two problems with the check:
-1) The 'unknown' case has a problem which is rejected by stricter C compilers
-because it has -Wimplicit-int and -Wimplicit-function-declaration warnings. Fix that.
-
-2) For the 'other' case, we were using the value of ac_cv_sys_file_offset_bits for
--D_FILE_OFFSET_BITS to pass down into the Perl module build, but autoconf-2.72
-drops the use of ac_cv_sys_file_offset_bits in cf09f48841b66fe76f606dd6018bb3a93242a7c9,
-so this ends up defining '-D_FILE_OFFSET_BITS=' which then breaks the build.
-
-I've added a hack for 2) to preserve the old behavior.
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- configure.ac | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 57c21edb77..99aa9c21af 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -503,7 +503,8 @@ if test "$enable_largefile" != no; then
-     unknown)
-         AC_MSG_CHECKING([for native large file support])
-         AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <unistd.h>
--          main () {
-+          #include <stdlib.h>
-+          int main () {
-           exit(!(sizeof(off_t) == 8));
-         }])],
-         [ac_cv_sys_file_offset_bits=64; AC_DEFINE(_FILE_OFFSET_BITS,64)
-@@ -511,6 +512,9 @@ if test "$enable_largefile" != no; then
-         [AC_MSG_RESULT([no])])
-         ;;
-     *)
-+        if test "$ac_cv_sys_file_offset_bits" = ''; then
-+            ac_cv_sys_file_offset_bits=64;
-+        fi
-         LFS_CPPFLAGS="$LFS_CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
-         ;;
-     esac
diff --git a/media-gfx/imagemagick/files/policy-hardening.snippet b/media-gfx/imagemagick/files/policy-hardening.snippet
deleted file mode 100644
index c1a91b0b8744..000000000000
--- a/media-gfx/imagemagick/files/policy-hardening.snippet
+++ /dev/null
@@ -1,9 +0,0 @@
-<policymap>
-  <!-- https://www.kb.cert.org/vuls/id/332928 mitigation / https://bugs.gentoo.org/664236 -->
-  <policy domain="coder" rights="none" pattern="PS" />
-  <policy domain="coder" rights="none" pattern="PS2" />
-  <policy domain="coder" rights="none" pattern="PS3" />
-  <policy domain="coder" rights="none" pattern="EPS" />
-  <policy domain="coder" rights="none" pattern="PDF" />
-  <policy domain="coder" rights="none" pattern="XPS" />
-
diff --git a/media-gfx/sxiv/Manifest b/media-gfx/sxiv/Manifest
index a525b434190b..16ec81c3af40 100644
--- a/media-gfx/sxiv/Manifest
+++ b/media-gfx/sxiv/Manifest
@@ -1,5 +1,5 @@
 AUX sxiv-25-makefile.patch 251 BLAKE2B 05b96799c7e94c2a907158becfbd3d0844a3919f75e7c4e6e8f994ec2881f173919c34625d80357882b28157f72ea6d0bbd6331473c6b213857c3e8a5db92bad SHA512 8e7b30bb73b87981b2d2c4e9bff8f62b5e59d341410dee0d4ecb889a0f39cfb38539a8d6ef2a738517ab5034c035e6588a4d2b7220bd408a2dd040f6cb8d7088
 DIST sxiv-26.tar.gz 48569 BLAKE2B a73707e2fd699b53e38ddc48710a73b945d4e102743567283d7351c92c513e4e57a32c409267593a2c5808caf811b7caeb555f8ba2762f1cc76a421aceff0e95 SHA512 c4bd56ea14e520ea9b116e275009f2089e5c434d6894281215b09d07572b2d3190c3c3eca015a2933328d704afb7d443a66e858b4e6904a3d4d45378b35d22cb
-EBUILD sxiv-26.ebuild 1275 BLAKE2B f53d1cfe89adecb7fff2418c6e81c7bca2186150fe587738d683249b26e489eeb7d47b607c5095ed215cfa0319ae842e1c2a74e64d8224d8c7403adb87e7b23a SHA512 17c7bc3ff1f2a7b4ba22082486d43fcbf52a1718ffd881e7b9d2d1af21fb6d46b314d8a1dcc31e5848c21b12051c70f55d7fee2afec923c5caef3f8628261584
-EBUILD sxiv-9999.ebuild 1272 BLAKE2B 81f7884dea3b59cfcee4582a293ed46d39376fd08f72b5580aa368f9c5ea892dae3458eb5eee0cf9fe39fc43b349d5f8ec554cceae5800ad698b5e9d64d6a6fd SHA512 8c42a605588a5d5637608d1dda4f66e61b8e726c8e13cdc30f329322ee512e86ddcef0a3406931064eb34a7590667f235cd1b4709c09120888fce71bf2d0d1b9
-MISC metadata.xml 246 BLAKE2B 8f6e149387bfcb25dec5e3e0b2b3a2fd12565074950c9a9cfba6cae40fcb96223a4336c2dbf2ead6ef441b4b5ae7c58ba099f4d245595d1966ddc57cda36bacf SHA512 43b56a758a48740bda40929d959dca5b2131347743424824ed6ad810273b682df178f27c72e255852cf5f3bb38cfc6ede4b21dda8fb1098dcd92137895631cf9
+EBUILD sxiv-26.ebuild 1269 BLAKE2B a0b0b8ce87c89880c1178851d35e4b91da60a881260c79e7459776c3caade214258bd03b4fb96d800b3babe8f489e4f0b93e29bae45bf59a5ab9fa32130cd355 SHA512 8545378db759030ec1d768eb1a46be81a64ec662e250386d92a58a1c08fe13fa2cb3300b1d076eb4d7bc6bd4670c0d42322cb011c731c09ec099a02824754688
+EBUILD sxiv-9999.ebuild 1266 BLAKE2B 763b6673b358d2fae495e4509042d670fb406f27acb4557e9c259a929d05c4f482e20a1b0c226e76a8caab2390acedf3b22db1ee2dc05f79d41313d251f61162 SHA512 e36dc294b6a29021881d64fa48fd0dd93fc6adfd1761c358af51371c32281228f3519fdc8cc775dc9e925e762183a39e8075b667d2e4845c325a2670c7f86a0e
+MISC metadata.xml 244 BLAKE2B d7b28da2563099a3ae3aeaf6611e870f638d650a8997223ceb22cd178af94887d38f3082b4c357b463b309641d08d4b64f9db86e167f57ec4f80a6655565d41b SHA512 390c1b4771442a67506cdc8dbd5ff7ca2673af0635539e4cf6f7c252d29dd91b7e667f07992b412fd70649397ee9bc11fa0f3382e04ba74d3a7102a3ef15d194
diff --git a/media-gfx/sxiv/metadata.xml b/media-gfx/sxiv/metadata.xml
index cb4cee647502..dd8ba70a330e 100644
--- a/media-gfx/sxiv/metadata.xml
+++ b/media-gfx/sxiv/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
-		<remote-id type="github">muennich/sxiv</remote-id>
+		<remote-id type="github">xyb3rt/sxiv</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/sxiv/sxiv-26.ebuild b/media-gfx/sxiv/sxiv-26.ebuild
index 65a298e1cf21..831d84532319 100644
--- a/media-gfx/sxiv/sxiv-26.ebuild
+++ b/media-gfx/sxiv/sxiv-26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,15 +6,15 @@ EAPI=7
 inherit desktop xdg-utils savedconfig toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/muennich/sxiv.git"
+	EGIT_REPO_URI="https://github.com/xyb3rt/sxiv.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/muennich/sxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/xyb3rt/sxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 arm64 ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Simple (or small or suckless) X Image Viewer"
-HOMEPAGE="https://github.com/muennich/sxiv/"
+HOMEPAGE="https://github.com/xyb3rt/sxiv/"
 
 LICENSE="GPL-2+ public-domain"
 SLOT="0"
diff --git a/media-gfx/sxiv/sxiv-9999.ebuild b/media-gfx/sxiv/sxiv-9999.ebuild
index 587eeb6bcc32..79d85908dc89 100644
--- a/media-gfx/sxiv/sxiv-9999.ebuild
+++ b/media-gfx/sxiv/sxiv-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,15 +6,15 @@ EAPI=7
 inherit desktop xdg-utils savedconfig toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/muennich/sxiv.git"
+	EGIT_REPO_URI="https://github.com/xyb3rt/sxiv.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/muennich/sxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/xyb3rt/sxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Simple (or small or suckless) X Image Viewer"
-HOMEPAGE="https://github.com/muennich/sxiv/"
+HOMEPAGE="https://github.com/xyb3rt/sxiv/"
 
 LICENSE="GPL-2+ public-domain"
 SLOT="0"