media-gfx/darktable: sync with main tree

Signed-off-by: Markus Meier <maekke@gentoo.org>

6 files changed, 42 insertions, 462 deletions

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 4f47c7a..4a1b51b 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -2,18 +2,10 @@ AUX darktable-3.0.0_find-opencl-header.patch 601 BLAKE2B 0102ea562ec0addb619f06b
 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-3.6.1_openexr.patch 1806 BLAKE2B 3f05c8fbb4dd5a76e98ef3d9a9432fb2c3d98818b5773d0fc007d5203d32b43fea25ec7286f396b4fcb23e02b32ab911ca0c504e8d01c299899e729b02a81d94 SHA512 a782116aa340bd8fd8c1fd98094bee943100f85c1194010b7a92b3aa532ff658f07cddccacdf06b902b74ac86ef1ab3cd07c694c072312e51ddc058caefcb944
-AUX darktable-3.8.0_libs-deps-automagic.patch 1034 BLAKE2B faac12e0c8459f7d5d3291b128a5d43e468a1c0a94d45b1c5c0d0e3fcfc6b740e5522c0c26515fc510f91061ab3aafd861465470b37d053e9d5cbee83989a8b9 SHA512 d59c6f11bcec1480eaee488e48a34b99ebfb9a30c65b9111f6a6241f9264b3602f47fbffef17315cf103bc104a135a0c951dc8ab8fbe7419dd8faaa456c8c4a6
-DIST darktable-3.8.0.tar.xz 5415532 BLAKE2B a2295d9145806720c702d30a334f4d1c483fc651dfda8a39617daed4a71a436bfaa5b6b379f5ec0ee4bbec5f6f5eabbcb589b63644b5698100dd1672710d1531 SHA512 ce95983cbe3ca899103b4f5ee560fdbeeb441dccd453ac4d858b14a25050229e1e780595c66bfb491c88db35c128054f649b365d701ef4b19cf252bd847ffa59
-DIST darktable-3.8.1.tar.xz 5514756 BLAKE2B e17bf4cc8f8d3f3fd6649c66c56777aa1e946a91cec1bc3b4c59ba1285aa16c608f725f549622b740417a8040a7bb5d63b2378997a05c2095f1b6814c05815de SHA512 8b1b0c9e1a0bd9b327d34d28fe33dd1a2c7255864f6fa0c15af364a029aaa3cff5e039ff6461e48d3b4327b7656efe70ad9da12245d3a01d7566545d191448ba
-DIST darktable-4.0.0.tar.xz 5829684 BLAKE2B 91198a47c4dab3368c934815425f430ae5b23e35f585a6c2b70322932cfd7fff19db76bd5f1dd50da81be1b8c9b82b12cb2c6c349e4808432f2ed195a015ecc2 SHA512 16b1cce589bdcd9c47685c9bd4705d35a739cfbad35ec7f414ce38848decc2e156bcbc7fe40f15026851927171072219ee0435e7cc64ca6fd763e479be5b5156
-DIST darktable-usermanual-3.8.de.pdf 32795040 BLAKE2B f8669e1982be19bc739add60d125a5818894a7a4a6414ba15aae5e5df41ec6729c99f907e3008c42acbd6f60bc4a5d33e20d7180621d135f9fd342e6190ae6a5 SHA512 ff77afcc9a20fec36891d4487d167e40d30a1deef6418dc6bb73c94d8171b42e5edc5420457c96e08ab8581175e691f8adf91ef5259367edba55f1441d4a86d3
-DIST darktable-usermanual-3.8.en.pdf 33484632 BLAKE2B 90a4e1021917f5fad7a5a9a58e2fec95af14119ca4b48325f3e5b55e96b89f9d82b8aaa676268a255fa97cf834a109b410004a549d16742a1b33db880c46fb67 SHA512 b21683f200daca3d0ed7c3364d0c6703d976fd800d1d2ffe51df1c6cfcf2188de681cdddbf92962629a3866e18014377a58ea0e54a9fa727b663972b7f1de79a
-DIST darktable-usermanual-3.8.fr.pdf 33479509 BLAKE2B 988824b60277ea0264fec61a1157a1de048cd512a172bc86276a043c06da3a684e971cef04c31122a78b3e7305157331e6cb86cfce7a4dc4dd9dc8697eddf743 SHA512 1383bb54face948bbbad895be2470c1b13ece71c325edf40402b3416a5d9653d2e1f8c4dbfa30edd10f02c1df8b8243c9e86948c5da8d2033e28ee3c6e04bbcc
-DIST darktable-usermanual-3.8.pt_br.pdf 33648057 BLAKE2B afb6d3c1ea6b709e535e10ae2a491fb6a87c84dcfe17823a518931bda0cd8595cda72905cffc01698e60c3df991451a5cccbfcdea82966a506b2d29d61298f09 SHA512 8734a9e6c57ba37f32966873b85584c50968c1c895fa4e9d953e129bb5834f254ca46e20741d5664429ef7d6379e5a35e59f8ecb517ca88ff536b49a8216b603
-DIST darktable-usermanual-3.8.uk.pdf 33663424 BLAKE2B abeb7a04b58e7ef508b415fe11073396c78964e91fbd3face8481cd6b09cf88525b1b6bdd2988bd57d25112cd59c8c05e209931f94004349cf5b8a7a3ca59e39 SHA512 e1a81771006f5d6b7e4088455b6b444ea87b27a788cc196c2bc0b0b5d0afde241ea9e2bdbd3ffe79871f39d756d710d8e16c082a21b1194efb71f78e8724af9a
-EBUILD darktable-3.8.0-r3.ebuild 5232 BLAKE2B b1ae18942affb1cfa231534dc0d23e8e295db1a50e9b09565eeed6ad0e22123341dcd4babd97836387b51061ffb602fb8448572cbb7f0921b094b0f45aae6682 SHA512 79f600f10be1c38c3f5126b1643bf52dc694cde79a3c764065e20cbef0779b3f99db998bfe76d59fbe1b407459025575a4165a522fd87e2757f0ae04780edb8a
-EBUILD darktable-3.8.1-r1.ebuild 5249 BLAKE2B 5c25d8c8ecc92eae8341493deb8fccec064d45cf16250ddde384276283107639afc37f61b2d26611fe507e3e280a30f075c01b4507471976ceddb4bf16944034 SHA512 48cb9a289ace6fd198e646b00b7d4f5c595515f975878674954f8ea4a3e7c3c5297726e684a6a762ca324ff51bba9ced7b3fb4ae100b8f2c68446842bcbfd311
-EBUILD darktable-4.0.0.ebuild 5251 BLAKE2B 16f2ebfc11b6aee31d169266b831d0083fe4382ecc4009658790bee7f33924e58d0525d0abdf360fc09a98faddfca63e4c70f9985e75e9d9b6b6fa214dd9731b SHA512 94ac3aa27455b23468e7af3f2501ababc8d6132feb4d1a23b0c0129b1991d0a0beff830a3aeff3135a4c0785fe2d8d5007b33deac13d4c31e9b51f2c5e0f64f5
+AUX darktable-4.0.1_libs-deps-automagic.patch 968 BLAKE2B e81e63814185d38cd850108492e656c4760b35b76b52424f06c9cf25ee5e33dba1ecd92507827451b1096e7caeb1793ca6877ae70f15d5b1e10c7c986a08bc0e SHA512 c36b21a0eb265a5da0fb75e766ec260bc9ab36d25503ff0d0406dca1cbb9cee04bed96ecb7f4ddb0f5ac2352a85577c458dd28affdd4d3bb5e3cac982022eef9
+DIST darktable-4.0.1.tar.xz 5958392 BLAKE2B 677ee85d8b353e9e4fa015226e7383b98b90b319f99142ce8c146c75b3a65a6f057412e8f2a4741d03c5e0a1bd60156245328380e1446c511ab2fb810077b0a3 SHA512 f7107024e52cedeb7775b410329e15a667c97f115d5722530add7d3d542974df1ceabeb7f33161d31e0388a682825941947fb9da2546ea2865a090acb7448729
+DIST darktable-usermanual-4.0.en.pdf 26585692 BLAKE2B 85083af2227e4e16a658cfce435339410e2cf4f03df1a62cf2a54b743232b82093d8012c1212978f08c021585d5cb4ee4b47d4cbfd399a8a9505d0cb32932618 SHA512 789fb6a309608ad10fccfd61eca24b6176fe9ce8ad53dd9840a7e3175598d9d6b7c8357d4852fc787dbfe80e32e696d680e3a7b9a2663ef4d00ef424d3341fc6
+DIST darktable-usermanual-4.0.uk.pdf 26781033 BLAKE2B 6d73b690dfebc590971325242fdb6d6de5577219eff6b20dec08a3a53a9529cb53031a36fd0ac45b509f4cb885bafdce38ce1f8bd1c4a255aa2a137bc367d87c SHA512 e897bca98470d9d51bdfa807850af5222cbba527ba46df9b713776ebdc5dc8b946758e4c25f1df478c2c01408d08a91467cc75b5a199042b42c93627dc6d9846
+EBUILD darktable-4.0.1-r1.ebuild 5778 BLAKE2B 67016be74606a3580c446135fb5059f82cd3e9ddd05f6b0acb9009b9b7e0e286d9ac73ccf1382511b35e13e03f0b438bc6bf94cbf55d6f8aaa6b54443533714a SHA512 e1debafcc7d037589843a1dc481dc3b2c3b7baf3ed7de27349bfa99fea96366f4926417c8e4929b62dfbfee7f8eba8d019c238654403d4269a7e0d304d1c93d6
 EBUILD darktable-9999.ebuild 4401 BLAKE2B c4c752f2bc76fcaa410cc1c9a36cb8d702871bf8ec5e1babe941559992f1c8573937333d47c6e77a7eb3af309b187616c1ffeec82ad65e0a6934e8e5ed4e02fe SHA512 6192579a10e23a478e36c5a13a1a9b6554dd042e27ec3e7e8d9d12680605214241abffc4651fb6bd9a6427104916eaadb8393d9da84b7162c9970ef1442febf8
-MISC metadata.xml 1378 BLAKE2B 7373550c5362c32832830bd94dbd712f963246805af5119214a43cfe4dfb1aac9e7bb03d4af6f4f1dfae3cc44e09d6ba8baff53d67b5ddd96115c460b5e19ad9 SHA512 ffdc1ff8eb068372b1f24691bb0832d5a845e49b41adf211dec1c2faf0d1a573a0e4c62c38e97758a8f87de15569ce6f3cd2c7a768c95eb0d2b166e30b20ae3a
+MISC metadata.xml 1505 BLAKE2B 71f0b4cf73b6e406dae390c65f0684e83583f14f3792693c611e23be5661a3a3828b47932d5b78dabc96823139791210c53f366f218c6d814ddfd178c0408c8c SHA512 7774ef668135d41d6f4785886a3f7241b0288c4659c017c5e407ad2fea01ecc11fc4fd3d5287c96cc61acdfcece626170081de4458f10f85cdcd186b82c1aa93
diff --git a/media-gfx/darktable/darktable-3.8.0-r3.ebuild b/media-gfx/darktable/darktable-3.8.0-r3.ebuild
deleted file mode 100644
index 5ab72df..0000000
--- a/media-gfx/darktable/darktable-3.8.0-r3.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-4 )
-
-inherit cmake flag-o-matic lua-single toolchain-funcs xdg
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/"
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git"
-
-	LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW"
-else
-	DOC_PV=$(ver_cut 1-2)
-	MY_PV="${PV/_/}"
-	MY_P="${P/_/.}"
-
-	SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-		doc? (
-			https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.en.pdf
-			l10n_de? ( https://docs.darktable.org/usermanual/${DOC_PV}/de/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.de.pdf )
-			l10n_fr? ( https://docs.darktable.org/usermanual/${DOC_PV}/fr/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.fr.pdf )
-			l10n_pt-BR? ( https://docs.darktable.org/usermanual/${DOC_PV}/pt_br/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.pt_br.pdf )
-			l10n_uk? ( https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.uk.pdf )
-		)"
-
-	KEYWORDS="amd64 arm64 -x86"
-	LANGS=" de eo es fi fr he hu it ja pl pt-BR sl uk zh-CN"
-fi
-
-IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc flickr gamepad geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet lto lua midi nls opencl openmp openexr test tools webp
-	${LANGS// / l10n_}"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-python/jsonschema-3.2.0 )"
-DEPEND="dev-db/sqlite:3
-	dev-libs/json-glib
-	dev-libs/libxml2:2
-	>=dev-libs/pugixml-1.8:0=
-	gnome-base/librsvg:2
-	>=media-gfx/exiv2-0.25-r2:0=[xmp]
-	media-libs/lcms:2
-	>=media-libs/lensfun-0.2.3:0=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	net-libs/libsoup:2.4
-	net-misc/curl
-	sys-libs/zlib:=
-	x11-libs/cairo
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/pango
-	avif? ( >=media-libs/libavif-0.8.2:= )
-	colord? ( x11-libs/colord-gtk:0= )
-	cups? ( net-print/cups )
-	flickr? ( media-libs/flickcurl )
-	gamepad? ( media-libs/libsdl2 )
-	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-	gmic? ( media-gfx/gmic )
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	gphoto2? ( media-libs/libgphoto2:= )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lua? ( ${LUA_DEPS} )
-	midi? ( media-libs/portmidi )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:= )
-	webp? ( media-libs/libwebp:0= )"
-RDEPEND="${DEPEND}
-	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.0_find-opencl-header.patch
-	"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
-	"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
-	"${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
-	"${FILESDIR}"/${PN}-3.6.1_openexr.patch
-	"${FILESDIR}"/${PN}-3.8.0_libs-deps-automagic.patch
-)
-
-S="${WORKDIR}/${P/_/~}"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# Bug #695658
-		if tc-is-gcc; then
-			test-flags-CC -floop-block &> /dev/null || \
-				die "Please switch to a gcc version built with USE=graphite"
-		fi
-
-		use openmp && tc-check-openmp
-	fi
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	use cpu_flags_x86_avx && append-flags -mavx
-	use cpu_flags_x86_sse3 && append-flags -msse3
-
-	sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_CURVE_TOOLS=$(usex tools)
-		-DBUILD_NOISE_TOOLS=$(usex tools)
-		-DBUILD_PRINT=$(usex cups)
-		-DCUSTOM_CFLAGS=ON
-		-DDONT_USE_INTERNAL_LUA=ON
-		-DRAWSPEED_ENABLE_LTO=$(usex lto)
-		-DTESTBUILD_OPENCL_PROGRAMS=OFF
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-		-DUSE_COLORD=$(usex colord)
-		-DUSE_FLICKR=$(usex flickr)
-		-DUSE_GMIC=$(usex gmic)
-		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DUSE_KWALLET=$(usex kwallet)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_LUA=$(usex lua)
-		-DUSE_MAP=$(usex geolocation)
-		-DUSE_NLS=$(usex nls)
-		-DUSE_OPENCL=$(usex opencl)
-		-DUSE_OPENEXR=$(usex openexr)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENMP=$(usex openmp)
-		-DUSE_PORTMIDI=$(usex midi)
-		-DUSE_SDL2=$(usex gamepad)
-		-DUSE_WEBP=$(usex webp)
-		-DWANT_JSON_VALIDATION=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	# This USE flag is masked for -9999
-	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.*.pdf
-
-	if use nls; then
-		for lang in ${LANGS} ; do
-			if ! use l10n_${lang}; then
-				rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog
-	elog "When updating a major version,"
-	elog "please bear in mind that your edits will be preserved during this process,"
-	elog "but it will not be possible to downgrade any more."
-	elog
-	ewarn "It will not be possible to downgrade!"
-	ewarn
-}
diff --git a/media-gfx/darktable/darktable-3.8.1-r1.ebuild b/media-gfx/darktable/darktable-3.8.1-r1.ebuild
deleted file mode 100644
index bd7a692..0000000
--- a/media-gfx/darktable/darktable-3.8.1-r1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-4 )
-
-inherit cmake flag-o-matic lua-single toolchain-funcs xdg
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/"
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git"
-
-	LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW"
-else
-	DOC_PV=$(ver_cut 1-2)
-	MY_PV="${PV/_/}"
-	MY_P="${P/_/.}"
-
-	SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-		doc? (
-			https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.en.pdf
-			l10n_de? ( https://docs.darktable.org/usermanual/${DOC_PV}/de/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.de.pdf )
-			l10n_fr? ( https://docs.darktable.org/usermanual/${DOC_PV}/fr/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.fr.pdf )
-			l10n_pt-BR? ( https://docs.darktable.org/usermanual/${DOC_PV}/pt_br/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.pt_br.pdf )
-			l10n_uk? ( https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.uk.pdf )
-		)"
-
-	KEYWORDS="amd64 ~arm64 -x86"
-	LANGS=" de eo es fi fr he hu it ja pl pt-BR sl uk zh-CN"
-fi
-
-IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc flickr gamepad geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet lto lua midi nls opencl openmp openexr test tools webp
-	${LANGS// / l10n_}"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-python/jsonschema-3.2.0 )"
-DEPEND="dev-db/sqlite:3
-	dev-libs/icu:=
-	dev-libs/json-glib
-	dev-libs/libxml2:2
-	>=dev-libs/pugixml-1.8:0=
-	gnome-base/librsvg:2
-	>=media-gfx/exiv2-0.25-r2:0=[xmp]
-	media-libs/lcms:2
-	>=media-libs/lensfun-0.2.3:0=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	net-libs/libsoup:2.4
-	net-misc/curl
-	sys-libs/zlib:=
-	x11-libs/cairo
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/pango
-	avif? ( >=media-libs/libavif-0.8.2:= )
-	colord? ( x11-libs/colord-gtk:0= )
-	cups? ( net-print/cups )
-	flickr? ( media-libs/flickcurl )
-	gamepad? ( media-libs/libsdl2 )
-	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-	gmic? ( media-gfx/gmic )
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	gphoto2? ( media-libs/libgphoto2:= )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lua? ( ${LUA_DEPS} )
-	midi? ( media-libs/portmidi )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:= )
-	webp? ( media-libs/libwebp:0= )"
-RDEPEND="${DEPEND}
-	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.0_find-opencl-header.patch
-	"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
-	"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
-	"${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
-	"${FILESDIR}"/${PN}-3.6.1_openexr.patch
-	"${FILESDIR}"/${PN}-3.8.0_libs-deps-automagic.patch
-)
-
-S="${WORKDIR}/${P/_/~}"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# Bug #695658
-		if tc-is-gcc; then
-			test-flags-CC -floop-block &> /dev/null || \
-				die "Please switch to a gcc version built with USE=graphite"
-		fi
-
-		use openmp && tc-check-openmp
-	fi
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	use cpu_flags_x86_avx && append-flags -mavx
-	use cpu_flags_x86_sse3 && append-flags -msse3
-
-	sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_CURVE_TOOLS=$(usex tools)
-		-DBUILD_NOISE_TOOLS=$(usex tools)
-		-DBUILD_PRINT=$(usex cups)
-		-DCUSTOM_CFLAGS=ON
-		-DDONT_USE_INTERNAL_LUA=ON
-		-DRAWSPEED_ENABLE_LTO=$(usex lto)
-		-DTESTBUILD_OPENCL_PROGRAMS=OFF
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-		-DUSE_COLORD=$(usex colord)
-		-DUSE_FLICKR=$(usex flickr)
-		-DUSE_GMIC=$(usex gmic)
-		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DUSE_KWALLET=$(usex kwallet)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_LUA=$(usex lua)
-		-DUSE_MAP=$(usex geolocation)
-		-DUSE_NLS=$(usex nls)
-		-DUSE_OPENCL=$(usex opencl)
-		-DUSE_OPENEXR=$(usex openexr)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENMP=$(usex openmp)
-		-DUSE_PORTMIDI=$(usex midi)
-		-DUSE_SDL2=$(usex gamepad)
-		-DUSE_WEBP=$(usex webp)
-		-DWANT_JSON_VALIDATION=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	# This USE flag is masked for -9999
-	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.*.pdf
-
-	if use nls; then
-		for lang in ${LANGS} ; do
-			if ! use l10n_${lang}; then
-				rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog
-	elog "When updating a major version,"
-	elog "please bear in mind that your edits will be preserved during this process,"
-	elog "but it will not be possible to downgrade any more."
-	elog
-	ewarn "It will not be possible to downgrade!"
-	ewarn
-}
diff --git a/media-gfx/darktable/darktable-4.0.0.ebuild b/media-gfx/darktable/darktable-4.0.1-r1.ebuild
index 6d208b0..1597b94 100644
--- a/media-gfx/darktable/darktable-4.0.0.ebuild
+++ b/media-gfx/darktable/darktable-4.0.1-r1.ebuild
@@ -18,30 +18,37 @@ if [[ ${PV} == *9999 ]]; then
 
 	LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW"
 else
-	DOC_PV="3.8"
+	DOC_PV=$(ver_cut 1-2)
 	MY_PV="${PV/_/}"
 	MY_P="${P/_/.}"
 
 	SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
 		doc? (
 			https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.en.pdf
-			l10n_de? ( https://docs.darktable.org/usermanual/${DOC_PV}/de/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.de.pdf )
-			l10n_fr? ( https://docs.darktable.org/usermanual/${DOC_PV}/fr/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.fr.pdf )
-			l10n_pt-BR? ( https://docs.darktable.org/usermanual/${DOC_PV}/pt_br/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.pt_br.pdf )
 			l10n_uk? ( https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.uk.pdf )
 		)"
 
-	KEYWORDS="~amd64 ~arm64 -x86"
+	KEYWORDS="amd64 ~arm64 -x86"
 	LANGS=" cs de eo es fi fr he hu it ja nl pt-BR ru sl tr uk zh-CN"
 fi
 
-IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc flickr gamepad geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet lto lua midi nls opencl openmp openexr test tools webp
+IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc flickr gamepad geolocation gmic gnome-keyring gphoto2 graphicsmagick heif jpeg2k kwallet lto lua midi nls opencl openmp openexr test tools webp
 	${LANGS// / l10n_}"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 
 RESTRICT="!test? ( test )"
 
+# It is sometimes requested, by both users and certain devs, to have sys-devel/gcc[graphite]
+# in BDEPEND. This has not been done *on purpose*, for the following reason:
+#  - darktable can also be built with sys-devel/clang so we'd have to have that, as an alternative,
+#    in BDEPEND too
+#  - there are at least two darktable dependencies (media-libs/mesa and virtual/rust) which
+#    by default pull in sys-devel/clang
+#  - as a result of the above, for most gcc users adding the above to BDEPEND is a no-op
+#    (and curiously enough, empirical observations suggest current versions of Portage are
+#    more likely to pull in Clang to build darktable with than to request enabling USE=graphite
+#    on GCC; that might be a bug though)
 BDEPEND="dev-util/intltool
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
@@ -50,14 +57,14 @@ DEPEND="dev-db/sqlite:3
 	dev-libs/icu:=
 	dev-libs/json-glib
 	dev-libs/libxml2:2
-	>=dev-libs/pugixml-1.8:0=
+	>=dev-libs/pugixml-1.8:=
 	gnome-base/librsvg:2
-	>=media-gfx/exiv2-0.25-r2:0=[xmp]
+	>=media-gfx/exiv2-0.25-r2:=[xmp]
 	media-libs/lcms:2
-	>=media-libs/lensfun-0.2.3:0=
+	>=media-libs/lensfun-0.2.3:=
 	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	media-libs/tiff:0
+	media-libs/libpng:=
+	media-libs/tiff:=
 	net-libs/libsoup:2.4
 	net-misc/curl
 	sys-libs/zlib:=
@@ -65,7 +72,7 @@ DEPEND="dev-db/sqlite:3
 	>=x11-libs/gtk+-3.22:3
 	x11-libs/pango
 	avif? ( >=media-libs/libavif-0.8.2:= )
-	colord? ( x11-libs/colord-gtk:0= )
+	colord? ( x11-libs/colord-gtk:= )
 	cups? ( net-print/cups )
 	flickr? ( media-libs/flickcurl )
 	gamepad? ( media-libs/libsdl2 )
@@ -74,12 +81,13 @@ DEPEND="dev-db/sqlite:3
 	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
 	gphoto2? ( media-libs/libgphoto2:= )
 	graphicsmagick? ( media-gfx/graphicsmagick )
+	heif? ( media-libs/libheif:= )
 	jpeg2k? ( media-libs/openjpeg:2= )
 	lua? ( ${LUA_DEPS} )
 	midi? ( media-libs/portmidi )
 	opencl? ( virtual/opencl )
 	openexr? ( media-libs/openexr:= )
-	webp? ( media-libs/libwebp:0= )"
+	webp? ( media-libs/libwebp:= )"
 RDEPEND="${DEPEND}
 	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
 
@@ -88,8 +96,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
 	"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
 	"${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
-	#"${FILESDIR}"/${PN}-3.6.1_openexr.patch
-	"${FILESDIR}"/${PN}-3.8.0_libs-deps-automagic.patch
+	"${FILESDIR}"/${PN}-4.0.1_libs-deps-automagic.patch
 )
 
 S="${WORKDIR}/${P/_/~}"
@@ -98,8 +105,11 @@ pkg_pretend() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
 		# Bug #695658
 		if tc-is-gcc; then
-			test-flags-CC -floop-block &> /dev/null || \
-				die "Please switch to a gcc version built with USE=graphite"
+			if ! test-flags-CC -floop-block &> /dev/null; then
+				eerror "Building ${PN} with GCC requires Graphite support."
+				eerror "Please switch to a version of sys-devel/gcc built with USE=graphite, or use a different compiler."
+				die "Selected compiler is sys-devel/gcc[-graphite]"
+			fi
 		fi
 
 		use openmp && tc-check-openmp
diff --git a/media-gfx/darktable/files/darktable-3.6.1_openexr.patch b/media-gfx/darktable/files/darktable-3.6.1_openexr.patch
deleted file mode 100644
index a5b1fd1..0000000
--- a/media-gfx/darktable/files/darktable-3.6.1_openexr.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-https://bugs.gentoo.org/820041
-
---- a/src/common/imageio_exr.cc
-+++ b/src/common/imageio_exr.cc
-@@ -28,13 +28,13 @@
- #include <stdio.h>
- #include <string.h>
- 
--#include <OpenEXR/ImfChannelList.h>
--#include <OpenEXR/ImfFrameBuffer.h>
--#include <OpenEXR/ImfInputFile.h>
--#include <OpenEXR/ImfStandardAttributes.h>
--#include <OpenEXR/ImfTestFile.h>
--#include <OpenEXR/ImfThreading.h>
--#include <OpenEXR/ImfTiledInputFile.h>
-+#include <ImfChannelList.h>
-+#include <ImfFrameBuffer.h>
-+#include <ImfInputFile.h>
-+#include <ImfStandardAttributes.h>
-+#include <ImfTestFile.h>
-+#include <ImfThreading.h>
-+#include <ImfTiledInputFile.h>
- 
- extern "C" {
- #include "common/colorspaces.h"
---- a/src/common/imageio_exr.hh
-+++ b/src/common/imageio_exr.hh
-@@ -29,12 +29,12 @@
- #include <tr1/memory>
- #endif
- 
--#include <OpenEXR/ImfChannelList.h>
--#include <OpenEXR/ImfFrameBuffer.h>
--#include <OpenEXR/ImfInputFile.h>
--#include <OpenEXR/ImfStandardAttributes.h>
--#include <OpenEXR/ImfTestFile.h>
--#include <OpenEXR/ImfTiledInputFile.h>
-+#include <ImfChannelList.h>
-+#include <ImfFrameBuffer.h>
-+#include <ImfInputFile.h>
-+#include <ImfStandardAttributes.h>
-+#include <ImfTestFile.h>
-+#include <ImfTiledInputFile.h>
- 
- #ifdef OPENEXR_IMF_INTERNAL_NAMESPACE
- #define IMF_NS OPENEXR_IMF_INTERNAL_NAMESPACE
---- a/src/imageio/format/exr.cc
-+++ b/src/imageio/format/exr.cc
-@@ -23,11 +23,11 @@
- #include <cstdlib>
- #include <memory>
- 
--#include <OpenEXR/ImfChannelList.h>
--#include <OpenEXR/ImfFrameBuffer.h>
--#include <OpenEXR/ImfStandardAttributes.h>
--#include <OpenEXR/ImfThreading.h>
--#include <OpenEXR/ImfTiledOutputFile.h>
-+#include <ImfChannelList.h>
-+#include <ImfFrameBuffer.h>
-+#include <ImfStandardAttributes.h>
-+#include <ImfThreading.h>
-+#include <ImfTiledOutputFile.h>
- 
- extern "C" {
- #include "bauhaus/bauhaus.h"
diff --git a/media-gfx/darktable/files/darktable-3.8.0_libs-deps-automagic.patch b/media-gfx/darktable/files/darktable-4.0.1_libs-deps-automagic.patch
index 25b8973..1ea0624 100644
--- a/media-gfx/darktable/files/darktable-3.8.0_libs-deps-automagic.patch
+++ b/media-gfx/darktable/files/darktable-4.0.1_libs-deps-automagic.patch
@@ -1,21 +1,21 @@
 --- a/src/libs/CMakeLists.txt
 +++ b/src/libs/CMakeLists.txt
-@@ -83,11 +83,14 @@
+@@ -84,11 +84,14 @@
  add_library(timeline MODULE "tools/timeline.c")
  add_library(image_infos MODULE "tools/image_infos.c")
  
 +if (USE_PORTMIDI)
  find_path(PORTMIDI_INCLUDE_DIR NAMES portmidi.h
            DOC "The Portmidi include directory"
-+          REQUIRED
++	  REQUIRED
  )
  find_library(PORTMIDI_LIBRARY NAMES portmidi
            DOC "The Portmidi library"
-+          REQUIRED
++	  REQUIRED
  )
  if(PORTMIDI_INCLUDE_DIR)
    add_definitions("-DHAVE_PORTMIDI")
-@@ -96,8 +99,10 @@
+@@ -97,8 +100,10 @@
    add_library(midi MODULE "tools/midi.c")
    target_link_libraries (midi ${PORTMIDI_LIBRARY})
  endif()
@@ -24,12 +24,12 @@
 -find_package(SDL2)
 +if (USE_SDL2)
 +find_package(SDL2 REQUIRED)
- if(SDL2_INCLUDE_DIRS)
+ if(SDL2_FOUND)
    add_definitions("-DHAVE_SDL")
-   include_directories(${SDL2_INCLUDE_DIRS})
-@@ -105,6 +110,7 @@
-   add_library(gamepad MODULE "tools/gamepad.c")
-   target_link_libraries(gamepad ${SDL2_LIBRARIES})
+   set(MODULES ${MODULES} gamepad)
+@@ -110,6 +115,7 @@
+     target_link_libraries(gamepad ${SDL2_LIBRARIES})
+   endif()
  endif()
 +endif()