gentoo auto-resync : 14:09:2022 - 17:11:02

6 files changed, 280 insertions, 11 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 7bc7ac464d11..b8499f97e434 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index dc6cde4894b6..39f494080bb0 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,5 +1,8 @@
 AUX digikam-7.3.0-cmake.patch 4316 BLAKE2B 7da300081ad72f6a3c1f5dc4c5c04bbc67d5cc2b2a876dfe0c72dddde19274060c9f4fb8e723a9ebf023dbd1d7993ccfa96426a26ffd4bd736213a96058ad4df SHA512 a326826ff291e9facae55ad3bbc03e5d7173437c9b9734e3b48a5eb6c18ed2f3e1afcb44a3c0f3a2b77fb67f6d414da1dc03992fa9f70d7307e5864d66e2fff3
 AUX digikam-7.5.0-akonadi-22.04.0.patch 906 BLAKE2B 962e53ffd27428f41ee998b9bd6d94b4541d8f9d66e1e9005b071d8a6fc2250cd0f8cadd2685467c26d76f664dec98fcb0ce8737612d06bb57799097688be08a SHA512 44f33f77b327f384764d74aade0567560f2f8cf34f53a9391da42ade06b08d9edc858c8b48cb0f2677dce8fa195e31d866585ee287a49a765d3fd2f8d5ed3c41
+AUX digikam-7.8.0-cmake.patch 4066 BLAKE2B 3f18ad5c25629cf7f32ced42c55875e3158a68083c28ca70c5b6a32795117339aebf930753f82ad21cc57990d4a0f030f39583a7b318433e3feb47ed1c4a3ddd SHA512 83626bdeacb91afd069ce4b9023f4a62154a53b2de569fb24286153fd5083a1970e3b34d37abae61ed77928d9f22bde84622ad67fd8659fefd105c1c15ed34d0
 DIST digiKam-7.5.0.tar.xz 339573688 BLAKE2B 26014564e9f9d44db65d4588924da2c85897fb514df0a963f51b9fddb1f26ce3ddf18856b2d4b0eb140581ee7948f048986cf79687a31730e29017b5a811a3d6 SHA512 a2f5005b8f8b8cd9ef58a6bd563481a95004fbad7110d13f1ec4d8550311f1765410dda54f5b04c91bde7ec089e145656961c7c70b27242931e78abd698763e9
+DIST digiKam-7.8.0.tar.xz 345431764 BLAKE2B 43fff59b51b98a04ca852cadedafc2792aafa5cf9e90f1ce0ad6174533844c7164e72b623a253d42fc4ea695fa7e4bd6cc954287ac72a35211f9fa564a13cb92 SHA512 d2ec96239760cc06808a73bcbf1a2131653764719d1e23afa8cea8eda449e221b177f2a96ca2a997d1c82a6a4977c4227165c932bdd006d5305cdb4c63f454fc
 EBUILD digikam-7.5.0.ebuild 4078 BLAKE2B 61a01480bb6d12cc15954aa666b43b67578d126ed8e0891e4247291951a3a1ddd110afe24fb14b7848141757c19c7622ae2ac22276fc7d5ea0c62ffe956f5ba3 SHA512 5e8807b8be15cbfc0bef84c54ae9719886dd7b1f54b9a9fcf4075cb5d2a191410ff4ac1ade6324e9c76de1fe4a28715fddea77e1fe6445266145a801162c5255
+EBUILD digikam-7.8.0.ebuild 4048 BLAKE2B 963401532d09894c83b31835ba0ddaff1808d365fad8d639d604dda788a007e1857a61d33f6b08050eab6accf24c6653432f0855b01cab79f280146fdb8d96ad SHA512 914947d161b73844defcf50f0c7dcf5cfffd2ea9aaf6ed81430d063c055f01c68c0754dac4dbfc05f56a9eb6f5f2da3a39a28d0ffaf1ea96ff7b77ad3023a772
 MISC metadata.xml 1166 BLAKE2B 022418e3ce42ac9ec248d5301d20786cd3ddedac61e85b934d9074d9e68fa9511720976620ae84dc2def3961fba307fa9c9d84e5bd90896da7b866b21dfbf7f9 SHA512 1e249e12495dcf72e0eb02f9fa7822112afba627a0b155a2188c382e69a3697cd186757484cd0f559a2985a83ace953a62cbb4e0afb4a6c9551d89053321b3c1
diff --git a/media-gfx/digikam/digikam-7.8.0.ebuild b/media-gfx/digikam/digikam-7.8.0.ebuild
new file mode 100644
index 000000000000..5919dbb0d5d7
--- /dev/null
+++ b/media-gfx/digikam/digikam-7.8.0.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2022 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 mediaplayer 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:0=
+	>=media-libs/opencv-3.3.0:=[contrib,contribdnn]
+	media-libs/tiff:0
+	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
+	)
+	mediaplayer? (
+		media-libs/qtav[opengl(+)]
+		media-video/ffmpeg:=
+	)
+	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
+"
+RDEPEND="${COMMON_DEPEND}
+	mysql? ( virtual/mysql[server(+)] )
+	panorama? ( media-gfx/hugin )
+"
+BDEPEND="
+	sys-devel/gettext
+	panorama? (
+		sys-devel/bison
+		sys-devel/flex
+	)
+"
+
+PATCHES=( "${FILESDIR}/${P}-cmake.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_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_MEDIAPLAYER=$(usex mediaplayer)
+		$(cmake_use_find_package mediaplayer QtAV)
+		-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/files/digikam-7.8.0-cmake.patch b/media-gfx/digikam/files/digikam-7.8.0-cmake.patch
new file mode 100644
index 000000000000..d698626e8c7e
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-7.8.0-cmake.patch
@@ -0,0 +1,119 @@
+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/krita/Manifest b/media-gfx/krita/Manifest
index e545367dfec2..afc52464f830 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,6 +1,6 @@
 AUX krita-4.3.1-tests-optional.patch 2583 BLAKE2B 0b5e577bc17ef6b6487ce82ff4b4bc34064c659a3cf48d12a539c3029dd70f17b0b48a7398b68de6a937adff3af0c2d4a47d0f84fdc7746ec612fb05272d963f SHA512 f16885a72cd5f8f250b03903062c70190367ed409c2582d579bfb1e6ab09514df7f96214ce236e33bb8eec2f3872d887f9c3152f4e524b1719250a9064bf719c
 DIST krita-5.0.8.tar.xz 179344256 BLAKE2B f8a020b726c2b4f7776b3a31d18028d19f274243fa085ca49e46cd06c2d9e4f8f166e4d77018b1bef7ef2820962759f362e3d00274b3bbb33ac1544ce17d5682 SHA512 652a24206f955739dbd188f4c35d10fdfe42bb660f4e046f15a31ee90647786b501e4ad8760c0656b24aa5fbdeda0c009b744dfc16a92cf545c2147a5ad1c777
-DIST krita-5.1.0-RC1.tar.xz 185049352 BLAKE2B 4719fb435fc28da8691bdc572f66521d2dd62e0d4b3dce8e5efd7e8cbb7434be8c08be0ff1265c049e4469dbf03881d34c7e7ad670fb04d3a6ba8570aaa83e0f SHA512 cdbdc4b946ee55a978a0d16e6791fd8fb01ddfaac7008e2f0649729d91d322c0b9cebf676d48870f9a9970c1e8d03e73ab56cc51ab93d6faba400f51e2219020
+DIST krita-5.1.1.tar.xz 185119812 BLAKE2B c59a6431d8711dd5e00c2c7c91e50a9e218acc08c4ddbb33d10f315bbb09f0cbcf57961a56c0b36a5a5fe8815d88d3788b257bddd0c76d730f3e0a4b6abddf5a SHA512 6878e022f1bae183f7565cdeadc3f229d3c0d3997557208b351c5128c4c499b53a120c965760c41ad075b09f017d66ca11046ab34765cccf5463fce7df64bf14
 EBUILD krita-5.0.8-r1.ebuild 3424 BLAKE2B 6a73e394c2d418b52a61fa065b0633fac3c219fa13fc9e4d0ec31aa6fafc0b729743b0554690c2c984871d94939f6e53979a3d3f04bcc438f2378fe547e10894 SHA512 0b602ed9fe2b2e7220825fd23d078375cbe4e5543717553c3627119c41eb381cc19da5b9c5b1137f98e60f74339d299a0f0fb8fae3e32914e77ee8fb883ec464
-EBUILD krita-5.1.0_rc1.ebuild 3646 BLAKE2B 12c3c75e1d49bb4c44bf37ba8ff2a740f58c2f0568c69bbe11f8a3ee379e87760ce693f4e445a7e442f133b1103796091a77a4418e64927204d5a2361d9fda47 SHA512 7bc8724e9cef213865a2f620a71a51df35ebea7d476f6ac96cb5c75c61429097433d4ea7f1686820b98bed1647b672438302beb4ac4122d0f0b10644d8eab067
+EBUILD krita-5.1.1.ebuild 3495 BLAKE2B 60609e71158363cf8bba04599ce42cee9ac1d4c66c5d843ac65fd26a3577c114d36e2339893e0c0dbb3b4ae79764019144fbad80f635d47566fe3b545e14d414 SHA512 ce9b0425cca056b662eb6836cf696c8902d639ca163946039c0700e4ca5ba88bc855bb92867b43832fff33144fd6fdda47579298adf42c6fe704728c4f040b9f
 MISC metadata.xml 939 BLAKE2B cc3728b1d571cf3ac57d07e3c1ef13ba9dd17a7f9efc1cc4755066de96fd9f62c1e031b0ede4f2a2422467118fe35c63f0ddcd35a0e6e981b6ba492dc0ab6d49 SHA512 9001680d354e19d21112608eef725a24978d91d55e6061fd48c8acff451f9a14d379f410d079011dce19142eff534b34c7d8b70ea4c57c7bff71b5c1de1a28a6
diff --git a/media-gfx/krita/krita-5.1.0_rc1.ebuild b/media-gfx/krita/krita-5.1.1.ebuild
index 8339c9414fcb..767fb155def2 100644
--- a/media-gfx/krita/krita-5.1.0_rc1.ebuild
+++ b/media-gfx/krita/krita-5.1.1.ebuild
@@ -6,14 +6,13 @@ EAPI=8
 ECM_TEST="forceoptional"
 PYTHON_COMPAT=( python3_{8..11} )
 KFMIN=5.82.0
-QTMIN=5.15.2
+QTMIN=5.15.5
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/unstable/${PN}/${PV/_rc/-RC}/${PN}-${PV/_rc/-RC}.tar.xz"
-	S="${WORKDIR}/${PN}-${PV/_rc/-RC}"
-	#KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
@@ -21,7 +20,7 @@ HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/"
 
 LICENSE="GPL-3"
 SLOT="5"
-IUSE="color-management fftw gif +gsl heif +jpeg jpegxl +mypaint-brush-engine openexr pdf qtmedia +raw webp"
+IUSE="color-management fftw gif +gsl heif jpegxl +mypaint-brush-engine openexr pdf qtmedia +raw webp"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # bug 630508
@@ -59,6 +58,7 @@ RDEPEND="${PYTHON_DEPS}
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	media-gfx/exiv2:=
 	media-libs/lcms
+	media-libs/libjpeg-turbo:=
 	media-libs/libpng:0=
 	media-libs/tiff:0
 	sys-libs/zlib
@@ -69,8 +69,7 @@ RDEPEND="${PYTHON_DEPS}
 	fftw? ( sci-libs/fftw:3.0= )
 	gif? ( media-libs/giflib )
 	gsl? ( sci-libs/gsl:= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	jpegxl? ( >=media-libs/libjxl-0.7.0 )
+	jpegxl? ( >=media-libs/libjxl-0.7.0_pre20220329 )
 	heif? ( >=media-libs/libheif-1.11:= )
 	mypaint-brush-engine? ( media-libs/libmypaint:= )
 	openexr? ( media-libs/openexr:= )
@@ -109,8 +108,6 @@ src_configure() {
 		$(cmake_use_find_package gif GIF)
 		$(cmake_use_find_package gsl GSL)
 		$(cmake_use_find_package heif HEIF)
-		$(cmake_use_find_package jpeg JPEG)
-		$(cmake_use_find_package jpeg libjpeg-turbo)
 		$(cmake_use_find_package jpegxl JPEGXL)
 		$(cmake_use_find_package mypaint-brush-engine LibMyPaint)
 		$(cmake_use_find_package openexr OpenEXR)