gentoo auto-resync : 17:07:2024 - 12:28:31

author: V3n3RiX <venerix@koprulu.sector> 2024-07-17 12:28:32 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2024-07-17 12:28:32 +0100
commit: 16857b69f990738d17bc5842e3e49a6e82d1428d (patch)
tree: 09af7d330926974197aa59536133e026de791874 /media-gfx
parent: b6fa31c964a602f8461a77d5b83355e8750c12eb (diff)
15 files changed, 352 insertions, 571 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index b2f15791f502..334b8365a9bd 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index b71778691624..22b152b55837 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,5 +1,8 @@
 AUX digikam-8.3.0-cmake-addressbook.patch 1245 BLAKE2B 22365de2072c5ce5e2eac3bc1d7138e820166b977e5894f29addcdb00ae3329c47965b2b7930a4725b01789add63b4416083e6e358ca6ffb4a0d60f3e80ad52c SHA512 a872aed53811642407c98e20f423cf5381a117e96d4e95d309da6f116a13aa2584671ef20af3e1059c3ed7e09fec178fdb77e7afecde21077252bb2c8f116158
 AUX digikam-8.3.0-cmake.patch 6775 BLAKE2B 1c93e204bd3b5f3d73ecf812ee851e0a3a9bb3e414e41afbc0a072bf05e6b615a147e545f6a16e8e218e1f910e9f1667e012bc35e06eab7d192f4c8c8d814746 SHA512 42707d0bff593114de412697a037cfaccfbfc568ba3a90b3b68a3cbdba32d79e5e61d2e8cd6f185c2543cac4c6de66f36e5f549908781243064b17aececba72b
+AUX digikam-8.4.0-cmake.patch 7429 BLAKE2B 20d79867086e390c2a571bae76f2023e4ec5f26bdc137f28be6ec8eff54ba2c5e84ec15191ceed83eb8e9415a522165f5931cf6d972e1537806cbb6d7e22bbf0 SHA512 fd38773ce49a31d3fcd0d477c5e180b42d1a2ea586b41534b7dd3d08653fea4020af30bce3b20ba14c4a2710cde3fecbd13fbe8fcfd33bdca6b82989cf431214
 DIST digiKam-8.3.0-1.tar.xz 55664168 BLAKE2B 46b0f26bb781d370c1046fd6de6afb0a0878175f9722a2fc9ed23aad89eb0671f8b219bb7c169ccd22d440ce493d958304a5a527a733862fe4e2c5cd07da8a21 SHA512 c2fdcecafa68641f08b31286d1b9c44828164a0a0bea607fb64a71c73ff53417cdfefa110245adab164fae8ea0980ea86cd69d693dcd43a96bb188197dc78fcd
+DIST digiKam-8.4.0.tar.xz 58025616 BLAKE2B 33441e023cd9d6edba2e7c01e482a6eea7a6b1972b6bad0fc804fb3e94f97cc62e2663690137b2445fb7043789b7e942d830b71209385de77ccffe57d22d09ff SHA512 4342d18a7c04ab239821de3cf908f8e7d676598778f0174164aa336e8cfdc0a76327d31c64e6c4e47dcf0d6fbef46b01918312e4622ce3359888a9a94948a22b
 EBUILD digikam-8.3.0.ebuild 4193 BLAKE2B bdaf2e8e960067f18bc85513a2ed3ca17f235d86de490b8f53cc969ea25f115804a0f659dc19d6756ea1085692e917e1caf26d1e8e569295be4cb2941949d2ea SHA512 7dac2a6e459ca160c1b7cad2955b725123714cf7cc1f5a9a88666c378d7b8c5fd083e8712262de5c20ac599677b425d4ffa4810a7c5abe891eb52f51917f25d6
-MISC metadata.xml 987 BLAKE2B c06da5014c71156e7cbffc5e57d530287b881c793dffa8c6c7f563518cb7572c6de245066c7700767e27f36c4d4745277c1f6d01188f02a0e4da0ff125e8abde SHA512 9c3a8d4c11de1a12b386ef1ceeeb3dcf67c29a19a4eea20d8d442ba9997f267ef1c96a9cb38e11bf49c44dea427879683dae38f656e9654a50cfcdd849983c20
+EBUILD digikam-8.4.0.ebuild 4256 BLAKE2B f4c6dec1386dc07267182c1068558b9a3ff4784adea63e1a53b906e0a097b0c45b05bd0425eaad1e1585e39def92610eab6efbad4659f618f48dff254dfded1c SHA512 33f69e5c75f814cf70fd16321635abc1e6ebe5fb8492dab17cdc42beee4e29241c3e4a64777d9cd168a20baa58d5fafd6c772c326940d9711bdb5b680e0c5c5a
+MISC metadata.xml 922 BLAKE2B 230932621f619b704122e3c1e4dbfe090bfad7f7722e41fb8d0b7bd6dd124d7d72139852ed016e34e099877c995cfdb0fb460194535824d2f0c13426dd65296c SHA512 457f3ec2b0479f8f686e3bf0b9f771f8bee205bd661a86226238ae9a3b557c52ec462663d45617872a83ce3717e74bcdbe74d5c2f9e4ab391bcb76a72082aec4
diff --git a/media-gfx/digikam/digikam-8.4.0.ebuild b/media-gfx/digikam/digikam-8.4.0.ebuild
new file mode 100644
index 000000000000..a118da4e0919
--- /dev/null
+++ b/media-gfx/digikam/digikam-8.4.0.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.115.0
+QTMIN=5.15.12
+inherit ecm kde.org toolchain-funcs
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	TARNAME="digiKam-${PV/_/-}"
+	if [[ ${PV} =~ beta[0-9]$ ]]; then
+		SRC_URI="mirror://kde/unstable/${PN}/${TARNAME}.tar.xz"
+	else
+		SRC_URI="mirror://kde/stable/${PN}/${PV}/${TARNAME}.tar.xz"
+	fi
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Digital photo management application"
+HOMEPAGE="https://www.digikam.org/"
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="addressbook calendar geolocation gphoto2 heif +imagemagick jpegxl +lensfun mysql opengl openmp +panorama scanner semantic-desktop spell"
+
+# 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/qtnetworkauth-${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/qtx11extras-${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.1:=[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:=
+	x11-libs/libX11
+	addressbook? (
+		>=kde-apps/akonadi-contacts-23.08.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:= )
+	jpegxl? ( media-libs/libjxl:= )
+	lensfun? ( media-libs/lensfun )
+	opengl? (
+		>=dev-qt/qtopengl-${QTMIN}:5
+		virtual/opengl
+	)
+	panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
+	scanner? ( >=kde-apps/libksane-23.08.3:5 )
+	semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
+	spell? ( >=kde-frameworks/sonnet-${KFMIN}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:3
+	dev-libs/boost
+	addressbook? ( >=kde-apps/akonadi-23.08.3:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/exiftool
+	mysql? ( virtual/mysql[server(+)] )
+	panorama? ( media-gfx/hugin )
+"
+BDEPEND="
+	sys-devel/gettext
+	panorama? (
+		app-alternatives/lex
+		app-alternatives/yacc
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-cmake.patch"
+	"${FILESDIR}/${PN}-8.3.0-cmake-addressbook.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_WITH_QT6=OFF # KF6 not stable upstream yet
+		-DBUILD_TESTING=OFF # bug 698192
+		-DENABLE_APPSTYLES=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
+		-DENABLE_MEDIAPLAYER=OFF # bug 758641; bundled as of 8.0, KDE-bug 448681
+		-DENABLE_SHOWFOTO=ON # built unconditionally so far, new option since 8.0
+		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
+		$(cmake_use_find_package calendar KF5CalendarCore)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake_use_find_package gphoto2 Gphoto2)
+		$(cmake_use_find_package heif Libheif)
+		$(cmake_use_find_package imagemagick ImageMagick)
+		$(cmake_use_find_package jpegxl Libjxl)
+		$(cmake_use_find_package lensfun LensFun)
+		-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)
+		$(cmake_use_find_package spell KF5Sonnet)
+		-DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)
+	)
+
+	ecm_src_configure
+}
diff --git a/media-gfx/digikam/files/digikam-8.4.0-cmake.patch b/media-gfx/digikam/files/digikam-8.4.0-cmake.patch
new file mode 100644
index 000000000000..4584d23182d1
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-8.4.0-cmake.patch
@@ -0,0 +1,199 @@
+From c498aad87e42405ca25cb6f2f1b4068ed1862c27 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/KF detection
+
+And if we enable an option, make the necessary libraries REQUIRED.
+---
+ core/cmake/rules/RulesKDEFramework.cmake | 60 ++++--------------------
+ core/cmake/rules/RulesQtFramework.cmake  | 51 +++++---------------
+ core/cmake/rules/RulesX11.cmake          |  7 +--
+ 3 files changed, 20 insertions(+), 98 deletions(-)
+
+diff --git a/core/cmake/rules/RulesKDEFramework.cmake b/core/cmake/rules/RulesKDEFramework.cmake
+index 775ae32fec..ec438f9673 100644
+--- a/core/cmake/rules/RulesKDEFramework.cmake
++++ b/core/cmake/rules/RulesKDEFramework.cmake
+@@ -26,43 +26,18 @@ find_package(KF${QT_VERSION_MAJOR} ${KF${QT_VERSION_MAJOR}_MIN_VERSION} QUIET
+ )
+ 
+ if(ENABLE_KFILEMETADATASUPPORT)
+-
+-    find_package(KF${QT_VERSION_MAJOR} ${KF${QT_VERSION_MAJOR}_MIN_VERSION} QUIET
+-                                        OPTIONAL_COMPONENTS
+-                                        FileMetaData            # For Plasma desktop file indexer support.
+-    )
+-
++    # For Plasma desktop file indexer support.
++    find_package(KF${QT_VERSION_MAJOR}FileMetaData ${KF${QT_VERSION_MAJOR}_MIN_VERSION} REQUIRED)
+ endif()
+ 
+ if(ENABLE_AKONADICONTACTSUPPORT)
+-
++    find_package(KF${QT_VERSION_MAJOR}Contacts ${KF${QT_VERSION_MAJOR}_MIN_VERSION} REQUIRED) # API for contacts/address book data.
++    find_package(KPim${QT_VERSION_MAJOR}Akonadi ${AKONADI_MIN_VERSION} REQUIRED)
+     if(Qt6_FOUND)
+-
+-        find_package(KPim${QT_VERSION_MAJOR} ${AKONADI_MIN_VERSION} QUIET
+-                                                OPTIONAL_COMPONENTS
+-                                                Akonadi
+-                                                AkonadiContactCore  # For KDE Mail Contacts support.
+-        )
+-        find_package(KF${QT_VERSION_MAJOR} ${AKONADI_MIN_VERSION} QUIET
+-                                                OPTIONAL_COMPONENTS
+-                                                Contacts            # API for contacts/address book data.
+-        )
+-        find_package(KPim${QT_VERSION_MAJOR}Akonadi ${AKONADI_MIN_VERSION} QUIET)
+-        find_package(KPim${QT_VERSION_MAJOR}AkonadiContactCore ${AKONADI_MIN_VERSION} QUIET)
+-
++        find_package(KPim${QT_VERSION_MAJOR}AkonadiContactCore ${AKONADI_MIN_VERSION} REQUIRED)
+     else()
+-
+-        find_package(KF${QT_VERSION_MAJOR} ${AKONADI_MIN_VERSION} QUIET
+-                                                OPTIONAL_COMPONENTS
+-                                                Akonadi
+-                                                AkonadiContact      # For KDE Mail Contacts support.
+-                                                Contacts            # API for contacts/address book data.
+-        )
+-        find_package(KPim${QT_VERSION_MAJOR}Akonadi ${AKONADI_MIN_VERSION} QUIET)
+-        find_package(KPim${QT_VERSION_MAJOR}AkonadiContact ${AKONADI_MIN_VERSION} QUIET)
+-
++        find_package(KPim${QT_VERSION_MAJOR}AkonadiContact ${AKONADI_MIN_VERSION} REQUIRED) # For KDE Mail Contacts support.
+     endif()
+-
+ endif()
+ 
+ if(Qt6_FOUND)
+@@ -71,17 +46,11 @@ if(Qt6_FOUND)
+ 
+ else()
+ 
+-    find_package(KF${QT_VERSION_MAJOR} ${KSANE_MIN_VERSION} QUIET
+-                                       OPTIONAL_COMPONENTS
+-                                       Sane                      # For digital scanner support.
+-    )
++    find_package(KF${QT_VERSION_MAJOR}Sane ${KSANE_MIN_VERSION} QUIET) # For digital scanner support.
+ 
+ endif()
+ 
+-find_package(KF${QT_VERSION_MAJOR} ${CALENDAR_MIN_VERSION} QUIET
+-                                         OPTIONAL_COMPONENTS
+-                                         CalendarCore           # For Calendar tool.
+-)
++find_package(KF${QT_VERSION_MAJOR}CalendarCore ${CALENDAR_MIN_VERSION} QUIET) # For Calendar tool.
+ 
+ if ("${KF${QT_VERSION_MAJOR}CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
+ 
+@@ -89,19 +58,6 @@ if ("${KF${QT_VERSION_MAJOR}CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
+ 
+ endif()
+ 
+-if(ENABLE_AKONADICONTACTSUPPORT AND
+-   (NOT (KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND OR KPim${QT_VERSION_MAJOR}AkonadiContactCore_FOUND) OR NOT KF${QT_VERSION_MAJOR}Contacts_FOUND))
+-
+-    set(ENABLE_AKONADICONTACTSUPPORT OFF)
+-
+-endif()
+-
+-if(ENABLE_KFILEMETADATASUPPORT AND NOT KF${QT_VERSION_MAJOR}FileMetaData_FOUND)
+-
+-    set(ENABLE_KFILEMETADATASUPPORT OFF)
+-
+-endif()
+-
+ # Check if KIO have been compiled with KIOWidgets. digiKam only needs this one.
+ 
+ if(ENABLE_KIO)
+diff --git a/core/cmake/rules/RulesQtFramework.cmake b/core/cmake/rules/RulesQtFramework.cmake
+index 9fa839c414..9267c6651e 100644
+--- a/core/cmake/rules/RulesQtFramework.cmake
++++ b/core/cmake/rules/RulesQtFramework.cmake
+@@ -18,38 +18,17 @@ find_package(Qt${QT_VERSION_MAJOR} REQUIRED
+              Svg
+ )
+ 
+-find_package(Qt${QT_VERSION_MAJOR} REQUIRED
+-                                   NO_MODULE
+-                                   COMPONENTS
+-                                   WebEngineWidgets
+-)
++find_package(Qt${QT_VERSION_MAJOR}WebEngineWidgets REQUIRED NO_MODULE)
+ 
+-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
+-                 SvgWidgets
+-    )
+-
+-    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}SvgWidgets 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)
+@@ -65,17 +44,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 d7830f3923..4401a57c87 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.45.2
+
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index 13d34044a893..0a9720425415 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -15,7 +15,6 @@
 	<use>
 		<flag name="addressbook">Enable akonadi contact integration</flag>
 		<flag name="imagemagick">Enable support for additional image formats such as XCF, FITS, HEIC etc.</flag>
-		<flag name="mediaplayer">Enable integrated video player</flag>
 		<flag name="lensfun">Enable support for <pkg>media-libs/lensfun</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>
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 0a2d089c4e56..7b73accd088d 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,19 +1,6 @@
-AUX geeqie-2.1-exiv2-0.28.0.patch 5556 BLAKE2B 3af45f27984d789dc1618b348dabfa3cb7264fcce257f1f6dcf69aa7b37a11f48b5ddf9dfdd3f4f630da2583571bf228e95bf98729a13290f133c18c468651c7 SHA512 9e63688935b1f3c3bc33c238201b5cb5508a91df2c58020656a31edb88f22b2e53e6abcd61fa7b1634a772cc7cc1ce7307f57e93fbdc8a7beb2d63c1dc44df6f
-AUX geeqie-2.1-locale.patch 522 BLAKE2B f676a4b2b0acb6184c66657314974f61413172bef3290d05d2764afae48b476fc40892012d1af93f02454de127a5b38cec240057ad20c3a6a63e11e354906b75 SHA512 c9d402fd9bb5d49a1f4219e33e24a16d656a6ba0a3eaddd6864debab09b3742927a89892e2fffe3c6726abe3f6b2bc6baae9af1ecf035f5a02ff3f9b5ad6ce59
-AUX geeqie-2.1-lua_hpp.patch 344 BLAKE2B 8206ef3ec5faf9b94efe57413905dedef5046b0d90056864e33b2adb876ca4bb3867417a24e4f6956d14923b3ee119ee5e8379f314cffe8ade2c1102bcb3c1de SHA512 599f9b63fad24bd292a393ead338894c6330b82fc3e02e71e16f7a85b49fa0ed564677444b5d78d68b4ac91ad04e8a6c237e3119031e1307ab089ae37e6eb838
-AUX geeqie-2.3-locale.patch 336 BLAKE2B 26d6712244e382be5981ad0c940828565e066aca961fd2fb4815bea26fe020c9ca95475b8f661f649e7a0ca54fdeea17aefcef2327e99f076646888b0fc3bf1a SHA512 00900c3740b1200db4eb515f0c5d77ac73d284e879d7c0dd36297953dc12149c65cc383ecc2837f55881dbf62e1ab0cedc0c6f58ff9e5aba1e73bd6a9314b2d8
 AUX geeqie-2.3-test-ancillary.patch 630 BLAKE2B a997e60c3fd6fe78b72019babbf2ad7d9f4fccea275cc95903925ed7ed1e0486da2d82e76e0afd43f82932c123ee03891878bf68d0ef5d714528806f206db45a SHA512 69aa64bf6945f6cd11b6ccd93052c5589f332f55d3e022e5b23b0e5eee0fada4764c54b7dffa75b8e5432f5c7d4c27384992cdd61a18c779feede4827f2be5ff
-DIST geeqie-2.1-docs.tar.xz 333756 BLAKE2B 2e569f4000befdaecebd6df9c94c59b8d9e05743343b1ba2ab647a228cc595b71369173cd0e7b798227a0843d493eb7d59be19b8259015239cfcdf8b5a40d339 SHA512 f1701e1f7550dc58d2d65f35da09284958b1d92f60568a8774831025525c835d2a03a48fd582052d3fca9cd2c15d935e30baf3f6599f624bf3dbccfeb606745d
-DIST geeqie-2.1.tar.xz 1800612 BLAKE2B 60190532eb8830e12acf06e39046dd04ccf28ac5d3679f2063e6f6e102add0d398dfc70a57a758d0c16483d5314ec88cb56b54829103ad938b29ac1500f86fdc SHA512 1812234d349536626433bbb7670cd45ef5ce328bf58f603af8eb4a01f7d3db2557d5a812714b12a9b49559aa1fe1c186ceddf2f632c2b303d64d36ad746a2d2f
-DIST geeqie-2.2-docs.tar.xz 356976 BLAKE2B 3bca2815a6f177a2f38b9a66ff6fa95dba510aa2afb36d5d6c9f6841c0c1b25c4f9aad7d45ef57d911f0caa2a8499a06aba2ccaf7e279382bf4304c88f11ea13 SHA512 0f89995573b02e82c715dcdf4d71a309691885ad785f1297d2fee01aff00f2aed43c9cff6900bddfa1a727598934ba7bb0ced32b0c86c6f1a115271a8a81592a
-DIST geeqie-2.2.tar.xz 2169096 BLAKE2B fe7f21f5842ac7824ec37f0775d31e8dcd05934809f7bdd84d7dcb749d25976055050f42a8cea3cd414fb3c7e60055c9fa32b93cfef2af62de68f4d44af425c8 SHA512 7d03493b463a1949cbc5e377927abc4bc6fa62914e8cdddb30a832cb9c6caad579f5ba5bd2b8b0913b77063300c9c5ac1f7e671ddfb2ce18d8a8d0efcfb51dbe
-DIST geeqie-2.3-docs.tar.xz 362412 BLAKE2B e05adbd6b277cfccae20c2ed7840e447016b32a9bf5c5ad6feb143993b4856fbb623feb6684a21c235ad846923463bed45cf887b1854189f01a46c3961f26a18 SHA512 cab4739adecd1dcb9cde3a58a2e2c2262f4014bc7594ae22af69b8bdbb14f6849b1e2267646301f31ebde76b2b2abc05e75aac3325e35cb88f9dc40703f2d943
-DIST geeqie-2.3.tar.xz 2184604 BLAKE2B dbd2d52d146d373a9694a7371a8ac44571e63895cf6cea7acb549a1135b4cf5869737cdf780ca6afdb14eda1338cb275791eaac1cd7596ed58eb07759cf75778 SHA512 9f45974d12c1f193a4a3624064b967fc06cf9c906c45160a4945a8f6a9d814b929b92c45a35006c7f1b20fa5fe360858f24fd54adbcd8863c3e7d787a3429899
 DIST geeqie-2.4-docs.tar.xz 364536 BLAKE2B 688720808c8e4543455259966aef726bf56a821890a78e4757d9d1fd02ce67217461808d9697b331b2a94841bf3581b25242a7e5c9c9a3f5b02209a566b09c16 SHA512 07bca33c347f448ee853ea60daf22c9cdace458b6ce6b3f4ced9b343a965370c51d7a872d5279852b7a83a1de51c8529a668f7d62a031bcec1fdde8b9bfbf9cb
 DIST geeqie-2.4.tar.xz 2178572 BLAKE2B df24f0b5d443cbd2033c0b382fe0d846c9073e8966aa736f647e34930e44083b9e44252c554578548a13c12c1b1a5a48bb7795f2fda8b8688a63ef402a257334 SHA512 7e0f5dff21e38a41adf0a793bd82652c5d639e84ab49403517f4b1dae042bfc5f4d02e54b54928e04a2397300acb04b130347df0be5637ee48634f5865ad346b
-EBUILD geeqie-2.1-r1.ebuild 3277 BLAKE2B e9a43ed274613dd5a98552d1d83768cffbc0be641d1661d6bd9b5d4b599e210d48dd6fe771c03d90abfc895bd582901e1ac0c4c224edbe96c6139f75e0b40e87 SHA512 f1a090d18fe0f6bb6ab3f7ecb6c42a996fcfbe05457f97ae00cff4d44da057107acd982616ffc307208bc893235ec5b1bcaeee79eefbae177a445a1f465e54da
-EBUILD geeqie-2.2.ebuild 3284 BLAKE2B 3c81435058a54a3da139b128db23b2adc7a378c9fb6a7f81cc9405b427ad66696f94c42bf39fb65583d79a8ac7428c2130a4e780410643fe6511457d4b3bea67 SHA512 db41ac9bfe390f64c6352a33f9c2181d3fe27d0e15c256cabef7ab026d4398342f0de05c4f29466634ec419d07f2c13b6294551e27dcb47df66c221f55aa6641
-EBUILD geeqie-2.3.ebuild 3376 BLAKE2B 515083b0ecb99fa9c2d6f92d9df2ef9c8f1e72436c290bb02311cfe73bcb0a92f0334df33c1453a709cf94277cddb99deaf9ba9276895524ec42126ef44616f5 SHA512 4906e493fe819d29e6c94dcb452b8f2382a0e01f59b60b8fb0afd0ac8c79f27c2befd23ed6366fd4e76a6da6dafc75d24aaab552f93ca0fad7a3b38f5d6c4e7d
 EBUILD geeqie-2.4.ebuild 3340 BLAKE2B 62a26c71d0d3e2c71fff2c6761f69bd5b6e82a364ff5f5c391eaa688b2ff5668a36b68d104155a7b3c2dd364ef15301abe494401fca2b0cf556f2501b38085fa SHA512 ab810bd8277a102a72569909d0d925095141438d341cf3d592e4a4c3336a7e7d9a6d344dee87c2cdfd8fe13c7443e471e2aa79954b54545996a65b46a9d52905
 EBUILD geeqie-9999.ebuild 3055 BLAKE2B 450d32bd793aa6436b3ab676758758e57f1bd34fa38ceafbd14a3df436611cc0f25a1c93f05f51104089e2c76a82f2605f00467e0aedf41032645d5e236f6421 SHA512 c1695fa7e9fe635f5799677c13014f4792ca2463654d1faeb967fd9fa6f89a757892316386797590632f3a233eb19daff8e724cd59d937294e2f48c79246d26c
 MISC metadata.xml 816 BLAKE2B ed50c576f068626d95d99899b17508b7c48567707ff020988dc611be9b482893f008f904ce460565ed0f263c76f2e274640f6e662f827d0879de5a59a93e8c3b SHA512 45458e31201d1baee61f48fe452c3577bcb74fea6569d1afdd8787aff6714d3400f501d1dc6b3de31ea1d5151326d48593f5bb219ec5cfed603cfe8835690dcd
diff --git a/media-gfx/geeqie/files/geeqie-2.1-exiv2-0.28.0.patch b/media-gfx/geeqie/files/geeqie-2.1-exiv2-0.28.0.patch
deleted file mode 100644
index 13b6a171257d..000000000000
--- a/media-gfx/geeqie/files/geeqie-2.1-exiv2-0.28.0.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From c45cca777aa3477eaf297db99f337e18d9683c61 Mon Sep 17 00:00:00 2001
-From: Kevin Backhouse <kevinbackhouse@github.com>
-Date: Wed, 21 Jun 2023 12:23:33 +0100
-Subject: [PATCH] Add ExifData as extra argument to
- exif_item_get_data_as_text().
-
----
- src/advanced-exif.cc | 2 +-
- src/exif-common.cc   | 2 +-
- src/exif.cc          | 8 ++++----
- src/exif.h           | 2 +-
- src/exiv2.cc         | 4 ++--
- 5 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/src/advanced-exif.cc b/src/advanced-exif.cc
-index 79a54b12..e3d3067a 100644
---- a/src/advanced-exif.cc
-+++ b/src/advanced-exif.cc
-@@ -120,7 +120,7 @@ static void advanced_exif_update(ExifWin *ew)
- 		tag = g_strdup_printf("0x%04x", exif_item_get_tag_id(item));
- 		tag_name = exif_item_get_tag_name(item);
- 		format = exif_item_get_format_name(item, TRUE);
--		text = exif_item_get_data_as_text(item);
-+		text = exif_item_get_data_as_text(item, exif);
- 		utf8_text = utf8_validate_or_convert(text);
- 		g_free(text);
- 		elements = g_strdup_printf("%d", exif_item_get_elements(item));
-diff --git a/src/exif-common.cc b/src/exif-common.cc
-index 6a4c9740..b6f07ca6 100644
---- a/src/exif-common.cc
-+++ b/src/exif-common.cc
-@@ -995,7 +995,7 @@ gchar *exif_get_data_as_text(ExifData *exif, const gchar *key)
- 	if (key_valid) return text;
- 
- 	item = exif_get_item(exif, key);
--	if (item) return exif_item_get_data_as_text(item);
-+	if (item) return exif_item_get_data_as_text(item, exif);
- 
- 	return nullptr;
- }
-diff --git a/src/exif.cc b/src/exif.cc
-index 8708ff53..cda2cb1a 100644
---- a/src/exif.cc
-+++ b/src/exif.cc
-@@ -1454,7 +1454,7 @@ gchar *exif_item_get_string(ExifItem *item, gint UNUSED(idx))
- 	return exif_item_get_data_as_text_full(item, METADATA_PLAIN);
- }
- 
--gchar *exif_item_get_data_as_text(ExifItem *item)
-+gchar *exif_item_get_data_as_text(ExifItem *item, ExifData *exif)
- {
- 	return exif_item_get_data_as_text_full(item, METADATA_FORMATTED);
- }
-@@ -1527,11 +1527,11 @@ gchar *exif_get_tag_description_by_key(const gchar *key)
- 	return NULL;
- }
- 
--static void exif_write_item(FILE *f, ExifItem *item)
-+static void exif_write_item(FILE *f, ExifItem *item, ExifData *exif)
- {
- 	gchar *text;
- 
--	text = exif_item_get_data_as_text(item);
-+	text = exif_item_get_data_as_text(item, exif);
- 	if (text)
- 		{
- 		gchar *tag = exif_item_get_tag_name(item);
-@@ -1578,7 +1578,7 @@ void exif_write_data_list(ExifData *exif, FILE *f, gint human_readable_list)
- 			item = (ExifItem*)(work->data);
- 			work = work->next;
- 
--			exif_write_item(f, item);
-+			exif_write_item(f, item, exif);
- 			}
- 		}
- 	g_fprintf(f, "----------------------------------------------------\n");
-diff --git a/src/exif.h b/src/exif.h
-index fcc7d8f5..4b03c201 100644
---- a/src/exif.h
-+++ b/src/exif.h
-@@ -136,7 +136,7 @@ gchar *exif_item_get_data(ExifItem *item, guint *data_len);
- gchar *exif_item_get_description(ExifItem *item);
- guint exif_item_get_format_id(ExifItem *item);
- const gchar *exif_item_get_format_name(ExifItem *item, gboolean brief);
--gchar *exif_item_get_data_as_text(ExifItem *item);
-+gchar *exif_item_get_data_as_text(ExifItem *item, ExifData *exif);
- gint exif_item_get_integer(ExifItem *item, gint *value);
- ExifRational *exif_item_get_rational(ExifItem *item, gint *sign, guint n);
- 
-diff --git a/src/exiv2.cc b/src/exiv2.cc
-index 33b779e7..dc62e8e0 100644
---- a/src/exiv2.cc
-+++ b/src/exiv2.cc
-@@ -778,13 +778,13 @@ const char *exif_item_get_format_name(ExifItem *item, gboolean UNUSED(brief))
- }
- 
- 
--gchar *exif_item_get_data_as_text(ExifItem *item)
-+gchar *exif_item_get_data_as_text(ExifItem *item, ExifData *exif)
- {
- 	try {
- 		if (!item) return nullptr;
- 		auto metadatum = reinterpret_cast<Exiv2::Metadatum *>(item);
- #if EXIV2_TEST_VERSION(0,17,0)
--		return utf8_validate_or_convert(metadatum->print().c_str());
-+		return utf8_validate_or_convert(metadatum->print(&exif->exifData()).c_str());
- #else
- 		std::stringstream str;
- 		Exiv2::Exifdatum *exifdatum;
-From b04f7cd0546976dc4f7ea440648ac0eedd8df3ce Mon Sep 17 00:00:00 2001
-From: Colin Clark <colin.clark@cclark.uk>
-Date: Wed, 21 Jun 2023 14:24:41 +0100
-Subject: [PATCH] Remove exiv2 0.28.0 restriction
-
-https://github.com/BestImageViewer/geeqie/pull/1119
-
-The bug was fixed in the above commit.
----
- meson.build | 12 ++----------
- 1 file changed, 2 insertions(+), 10 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index a4cab49c..412399fe 100644
---- a/meson.build
-+++ b/meson.build
-@@ -280,15 +280,7 @@ else
- endif
- 
- exiv2_dep = []
--# See https://github.com/BestImageViewer/geeqie/issues/1090
--# for the reason for 0.28.0 exclusion
--req_version = ['>=0.11', '!=0.28.0']
--
--req_version_str = ''
--foreach req_version_str_ : req_version
--    req_version_str += req_version_str_
--endforeach
--
-+req_version = '>=0.11'
- option = get_option('exiv2')
- if not option.disabled()
-     exiv2_dep = dependency('exiv2', version : req_version, required : get_option('exiv2'))
-@@ -296,7 +288,7 @@ if not option.disabled()
-         conf_data.set('HAVE_EXIV2', 1)
-         summary({'exiv2' : ['image metadata processed by exiv2:', true]}, section : 'Configuration', bool_yn : true)
-     else
--        summary({'exiv2' : ['exiv2 ' + req_version_str + ' not found - image data not processed by exiv2:', false]}, section : 'Configuration', bool_yn : true)
-+        summary({'exiv2' : ['exiv2 ' + req_version + ' not found - image data not processed by exiv2:', false]}, section : 'Configuration', bool_yn : true)
-     endif
- else
-     summary({'exiv2' : ['disabled - image data processed by exiv2:', false]}, section : 'Configuration', bool_yn : true)
diff --git a/media-gfx/geeqie/files/geeqie-2.1-locale.patch b/media-gfx/geeqie/files/geeqie-2.1-locale.patch
deleted file mode 100644
index 10ae6b0169c5..000000000000
--- a/media-gfx/geeqie/files/geeqie-2.1-locale.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 01d8762d45a2f3871cfd09176edbccdbe73a6767 Mon Sep 17 00:00:00 2001
-From: Thomas Klausner <wiz@gatalith.at>
-Date: Sat, 17 Jun 2023 18:47:28 +0200
-Subject: [PATCH] Add missing header for setlocale().
-
----
- src/misc.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/misc.cc b/src/misc.cc
-index 9942605ce..a2ad3eb69 100644
---- a/src/misc.cc
-+++ b/src/misc.cc
-@@ -18,6 +18,8 @@
-  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#include <locale.h>
-+
- #include "main.h"
- #include "misc.h"
- 
diff --git a/media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch b/media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch
deleted file mode 100644
index a0c816b5fb3c..000000000000
--- a/media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch
+++ /dev/null
@@ -1,19 +0,0 @@
----
- src/lua.cc | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/src/lua.cc b/src/lua.cc
-index 84aa549a..458b658a 100644
---- a/src/lua.cc
-+++ b/src/lua.cc
-@@ -24,9 +24,7 @@
- 
- #define _XOPEN_SOURCE
- 
--#include <lua.h>
--#include <lauxlib.h>
--#include <lualib.h>
-+#include <lua.hpp>
- 
- #include <stdio.h>
- #include <glib.h>
diff --git a/media-gfx/geeqie/files/geeqie-2.3-locale.patch b/media-gfx/geeqie/files/geeqie-2.3-locale.patch
deleted file mode 100644
index 05f8bdcfdaea..000000000000
--- a/media-gfx/geeqie/files/geeqie-2.3-locale.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur geeqie-2.3.orig/src/misc.cc geeqie-2.3/src/misc.cc
---- geeqie-2.3.orig/src/misc.cc	2024-03-06 16:56:22.000000000 +0100
-+++ geeqie-2.3/src/misc.cc	2024-03-25 21:03:18.655779225 +0100
-@@ -23,6 +23,7 @@
- #include <sys/stat.h>
- #include <unistd.h>
- 
-+#include <clocale>
- #include <cstdio>
- #include <cstdlib>
- #include <cstring>
diff --git a/media-gfx/geeqie/geeqie-2.1-r1.ebuild b/media-gfx/geeqie/geeqie-2.1-r1.ebuild
deleted file mode 100644
index 2a7751b70258..000000000000
--- a/media-gfx/geeqie/geeqie-2.1-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-LUA_COMPAT=( lua5-{3,4} )
-
-inherit flag-o-matic lua-single meson optfeature xdg
-
-DESCRIPTION="A lightweight GTK image viewer forked from GQview"
-HOMEPAGE="http://www.geeqie.org"
-SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz
-	https://dev.gentoo.org/~voyageur/distfiles/${P}-docs.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc x86"
-IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip"
-
-RDEPEND="gnome-extra/zenity
-	virtual/libintl
-	x11-libs/gtk+:3
-	djvu? ( app-text/djvu )
-	exif? ( >=media-gfx/exiv2-0.17:=[xmp?] )
-	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
-	heif? ( >=media-libs/libheif-1.3.2 )
-	jpeg2k? ( >=media-libs/openjpeg-2.3.0:2= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	jpegxl? ( >=media-libs/libjxl-0.3.7:= )
-	lcms? ( media-libs/lcms:2 )
-	lua? ( ${LUA_DEPS} )
-	map? ( media-libs/clutter-gtk
-		media-libs/libchamplain:0.12[gtk] )
-	pdf? ( >=app-text/poppler-0.62[cairo] )
-	raw? ( >=media-libs/libraw-0.20:= )
-	spell? ( app-text/gspell )
-	tiff? ( media-libs/tiff:= )
-	webp? ( gui-libs/gdk-pixbuf-loader-webp:= )
-	zip? ( >=app-arch/libarchive-3.4.0 )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	|| ( dev-util/xxdi app-editors/vim-core )
-	dev-util/glib-utils
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-locale.patch
-	"${FILESDIR}"/${P}-lua_hpp.patch
-	"${FILESDIR}"/${P}-exiv2-0.28.0.patch
-)
-
-pkg_setup() {
-	# Do not require setting LUA_SINGLE_TARGET if lua is not used
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Disable doc build - not useful most of the time per upstream
-	sed -e "/subdir('doc')/d" -i meson.build || die
-}
-
-src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/585432
-	# https://github.com/BestImageViewer/geeqie/issues/1270
-	filter-lto
-
-	local emesonargs=(
-		-Dgq_helpdir="share/doc/${PF}"
-		-Dgq_htmldir="share/doc/${PF}/html"
-		$(meson_use debug)
-		$(meson_feature djvu)
-		$(meson_feature exif exiv2)
-		$(meson_feature ffmpegthumbnailer videothumbnailer)
-		$(meson_feature heif)
-		$(meson_feature jpeg)
-		$(meson_feature jpeg2k j2k)
-		$(meson_feature jpegxl)
-		$(meson_feature lcms cms)
-		$(meson_feature lua)
-		$(meson_feature map gps-map)
-		$(meson_feature pdf)
-		$(meson_feature raw libraw)
-		$(meson_feature spell)
-		$(meson_feature tiff)
-		$(meson_feature zip archive)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Manually generated ChangeLog
-	dodoc "${WORKDIR}"/${P}-docs/*
-
-	# The application needs access to some uncompressed doc files.
-	docompress -x /usr/share/doc/${PF}/AUTHORS
-	docompress -x /usr/share/doc/${PF}/ChangeLog
-	docompress -x /usr/share/doc/${PF}/README.md
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "Camera import and tethered photography plugins" media-gfx/gphoto2
-	optfeature "Lens ID plugin" media-libs/exiftool
-	optfeature "Image crop plugin" "media-libs/exiftool media-gfx/imagemagick"
-	optfeature "Image rotate plugin (JPEG)" media-gfx/fbida
-	optfeature "Image rotate plugin (TIFF/PNG)" media-gfx/imagemagick
-	optfeature "Print preview functionality" app-text/evince
-}
diff --git a/media-gfx/geeqie/geeqie-2.2.ebuild b/media-gfx/geeqie/geeqie-2.2.ebuild
deleted file mode 100644
index db97d02cdbaa..000000000000
--- a/media-gfx/geeqie/geeqie-2.2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-LUA_COMPAT=( lua5-{3,4} )
-
-inherit flag-o-matic lua-single meson optfeature xdg
-
-DESCRIPTION="A lightweight GTK image viewer forked from GQview"
-HOMEPAGE="http://www.geeqie.org"
-SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz
-	https://dev.gentoo.org/~voyageur/distfiles/${P}-docs.tar.xz"
-# Doc build:
-# clone git at matching tag
-# mkdir build; ./gen_changelog.sh . build;
-# pandoc README.md -o build/README.html
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
-IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip"
-
-RDEPEND="gnome-extra/zenity
-	virtual/libintl
-	x11-libs/gtk+:3
-	djvu? ( app-text/djvu )
-	exif? ( >=media-gfx/exiv2-0.17:=[xmp?] )
-	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
-	heif? ( >=media-libs/libheif-1.3.2 )
-	jpeg2k? ( >=media-libs/openjpeg-2.3.0:2= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	jpegxl? ( >=media-libs/libjxl-0.3.7:= )
-	lcms? ( media-libs/lcms:2 )
-	lua? ( ${LUA_DEPS} )
-	map? ( media-libs/clutter-gtk
-		media-libs/libchamplain:0.12[gtk] )
-	pdf? ( >=app-text/poppler-0.62[cairo] )
-	raw? ( >=media-libs/libraw-0.20:= )
-	spell? ( app-text/gspell )
-	tiff? ( media-libs/tiff:= )
-	webp? ( gui-libs/gdk-pixbuf-loader-webp:= )
-	zip? ( >=app-arch/libarchive-3.4.0 )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	|| ( dev-util/xxdi app-editors/vim-core )
-	dev-util/glib-utils
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-pkg_setup() {
-	# Do not require setting LUA_SINGLE_TARGET if lua is not used
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Disable doc build - not useful most of the time per upstream
-	sed -e "/subdir('doc')/d" -i meson.build || die
-}
-
-src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/585432
-	# https://github.com/BestImageViewer/geeqie/issues/1270
-	filter-lto
-
-	local emesonargs=(
-		-Dgq_helpdir="share/doc/${PF}"
-		-Dgq_htmldir="share/doc/${PF}/html"
-		$(meson_use debug)
-		$(meson_feature djvu)
-		$(meson_feature exif exiv2)
-		$(meson_feature ffmpegthumbnailer videothumbnailer)
-		$(meson_feature heif)
-		$(meson_feature jpeg)
-		$(meson_feature jpeg2k j2k)
-		$(meson_feature jpegxl)
-		$(meson_feature lcms cms)
-		$(meson_feature lua)
-		$(meson_feature map gps-map)
-		$(meson_feature pdf)
-		$(meson_feature raw libraw)
-		$(meson_feature spell)
-		$(meson_feature tiff)
-		$(meson_feature zip archive)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Manually generated ChangeLog
-	dodoc "${WORKDIR}"/${P}-docs/*
-
-	# The application needs access to some uncompressed doc files.
-	docompress -x /usr/share/doc/${PF}/AUTHORS
-	docompress -x /usr/share/doc/${PF}/ChangeLog
-	docompress -x /usr/share/doc/${PF}/README.md
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "Camera import and tethered photography plugins" media-gfx/gphoto2
-	optfeature "Lens ID plugin" media-libs/exiftool
-	optfeature "Image crop plugin" "media-libs/exiftool media-gfx/imagemagick"
-	optfeature "Image rotate plugin (JPEG)" media-gfx/fbida
-	optfeature "Image rotate plugin (TIFF/PNG)" media-gfx/imagemagick
-	optfeature "Print preview functionality" app-text/evince
-}
diff --git a/media-gfx/geeqie/geeqie-2.3.ebuild b/media-gfx/geeqie/geeqie-2.3.ebuild
deleted file mode 100644
index dae22816e4fd..000000000000
--- a/media-gfx/geeqie/geeqie-2.3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-LUA_COMPAT=( lua5-{3,4} )
-
-inherit flag-o-matic lua-single meson optfeature xdg
-
-DESCRIPTION="A lightweight GTK image viewer forked from GQview"
-HOMEPAGE="http://www.geeqie.org"
-SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz
-	https://dev.gentoo.org/~voyageur/distfiles/${P}-docs.tar.xz"
-# Doc build:
-# clone git at matching tag
-# mkdir build; ./gen_changelog.sh . build;
-# pandoc README.md -o build/README.html
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
-IUSE="debug djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip"
-
-RDEPEND="gnome-extra/zenity
-	virtual/libintl
-	x11-libs/gtk+:3
-	djvu? ( app-text/djvu )
-	exif? ( >=media-gfx/exiv2-0.17:=[xmp?] )
-	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
-	heif? ( >=media-libs/libheif-1.3.2 )
-	jpeg2k? ( >=media-libs/openjpeg-2.3.0:2= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	jpegxl? ( >=media-libs/libjxl-0.3.7:= )
-	lcms? ( media-libs/lcms:2 )
-	lua? ( ${LUA_DEPS} )
-	map? ( media-libs/clutter-gtk
-		media-libs/libchamplain:0.12[gtk] )
-	pdf? ( >=app-text/poppler-0.62[cairo] )
-	raw? ( >=media-libs/libraw-0.20:= )
-	spell? ( app-text/gspell )
-	tiff? ( media-libs/tiff:= )
-	webp? ( gui-libs/gdk-pixbuf-loader-webp:= )
-	zip? ( >=app-arch/libarchive-3.4.0 )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	|| ( dev-util/xxdi app-editors/vim-core )
-	dev-util/glib-utils
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.3-test-ancillary.patch
-	"${FILESDIR}"/${P}-locale.patch
-	)
-
-pkg_setup() {
-	# Do not require setting LUA_SINGLE_TARGET if lua is not used
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Disable doc build - not useful most of the time per upstream
-	sed -e "/subdir('doc')/d" -i meson.build || die
-}
-
-src_configure() {
-	# -Werror=odr
-	# https://bugs.gentoo.org/585432
-	# https://github.com/BestImageViewer/geeqie/issues/1270
-	filter-lto
-
-	local emesonargs=(
-		-Dgq_helpdir="share/doc/${PF}"
-		-Dgq_htmldir="share/doc/${PF}/html"
-		$(meson_use debug)
-		$(meson_feature djvu)
-		$(meson_feature exif exiv2)
-		$(meson_feature ffmpegthumbnailer videothumbnailer)
-		$(meson_feature heif)
-		$(meson_feature jpeg)
-		$(meson_feature jpeg2k j2k)
-		$(meson_feature jpegxl)
-		$(meson_feature lcms cms)
-		$(meson_feature lua)
-		$(meson_feature map gps-map)
-		$(meson_feature pdf)
-		$(meson_feature raw libraw)
-		$(meson_feature spell)
-		$(meson_feature tiff)
-		$(meson_feature zip archive)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Manually generated ChangeLog
-	dodoc "${WORKDIR}"/${P}-docs/*
-
-	# The application needs access to some uncompressed doc files.
-	docompress -x /usr/share/doc/${PF}/AUTHORS
-	docompress -x /usr/share/doc/${PF}/ChangeLog
-	docompress -x /usr/share/doc/${PF}/README.md
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "Camera import and tethered photography plugins" media-gfx/gphoto2
-	optfeature "Lens ID plugin" media-libs/exiftool
-	optfeature "Image crop plugin" "media-libs/exiftool media-gfx/imagemagick"
-	optfeature "Image rotate plugin (JPEG)" media-gfx/fbida
-	optfeature "Image rotate plugin (TIFF/PNG)" media-gfx/imagemagick
-	optfeature "Print preview functionality" app-text/evince
-}
diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest
index 99580fd41bd2..f5dfdcc70665 100644
--- a/media-gfx/mypaint/Manifest
+++ b/media-gfx/mypaint/Manifest
@@ -3,5 +3,5 @@ AUX mypaint-2.0.1-python3.11.patch 3968 BLAKE2B 02318c3543bc66fc1ffd89af02f00c0e
 AUX mypaint-2.0.1-r1-build-system.patch 638 BLAKE2B 8e0209eb8fdba535cb8c0075e183681b0d8f8a11613cf7c3d2ddb5e20954d6c95da3ef3824063ac55bb11feda38cdf00eb8190cf76ca7753d2432d870926194b SHA512 8c088a089408542f57ef0fb608a63ae6fa0cce5392cb309376198813d35f5c3e54466945419984973af77e11f5bc4908961b5e81982a32fbef04c081df1b0349
 AUX mypaint-2.0.1-setuptools.patch 2647 BLAKE2B e9212c40830e51ed8abe217204ce3bcad65fac99c7ad00f38ae6275eb404c3464598672431a6c857f7de42950830a63f25bcfcb5f19685a443f963251ed1a9be SHA512 4d834558ab0e5419aae98a2a8f30c285d330392d3627e21d25def869b16e2ef4100d45d6a78b3f1714bd72e1e7b8cb7de24f89893c6c98d87bcefe74aff5965a
 DIST mypaint-2.0.1.tar.xz 7295048 BLAKE2B 813a939f95ea6887c57d8c0868e33e9bc8b1b95746d5ecd793d4fd13a32198ee5a445cfdd2691a15e944bfb0099d6ac624dff320ae29465db5b1e0d197bedb30 SHA512 449beddcc6da5d720c9efbeac94a466ed0057bd1962d42ebb419190e8b7fd8ffd341327408467fc5da47920f9d0da1fd6d78233a0dda88de5f5d52d53d9ab562
-EBUILD mypaint-2.0.1-r3.ebuild 1904 BLAKE2B bd6e32a57a00297629e2e361c51bb2a3ce9c818bed7721dd9cdd4fb95d4293abdd920b126b9c48a7dd71f2fa94d1570f53dd1a9297982c52b3cf745dd7bab91b SHA512 5813e65c1c4b020cc6c8afbb696024c05f0d90951dbc1bd0a60fbbcddee3d9d0db1b63a3fdd8e9521a9ebd00ff4be146e7b730b2bf4ee62473e1b181587d55d0
+EBUILD mypaint-2.0.1-r3.ebuild 1904 BLAKE2B a28d89927f8fff5bc64a6090f227b999d427b7a2947e3bede049d98f61142513b76b314f80edbb14c960b130e801da23c2a1af4f4f33edb63f9f311411121126 SHA512 c6968dc9f7812da07bc78138e5b4b53f764fc432127bc1d6ded38add7f60908f9ecace973ea02effe60d7e1cb51122bf07ec0b7bcce236b88b995be743187e76
 MISC metadata.xml 320 BLAKE2B 17a66707a8182c8eb1a0206b8ec86cdc307ce2d965beb66aa08e3e2b31700eebc05213b7e27e98aef40e566fd028561476d6f614aeb2a0450f560801f187b060 SHA512 cb54ae739d86722c2959d8ff63d8f20394b0611ef3f3a6587e517f3de6625748201659d782e6ec8ca65e55c285a6ff52408b3586088ce2546ba42872dfd07133
diff --git a/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild b/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild
index 3ddd273019c8..8f03d4e44e6c 100644
--- a/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild
+++ b/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit desktop distutils-r1 xdg
author	V3n3RiX <venerix@koprulu.sector>	2024-07-17 12:28:32 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2024-07-17 12:28:32 +0100
commit	16857b69f990738d17bc5842e3e49a6e82d1428d (patch)
tree	09af7d330926974197aa59536133e026de791874 /media-gfx
parent	b6fa31c964a602f8461a77d5b83355e8750c12eb (diff)