8 files changed, 186 insertions, 12 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index f1e60c5f3222..3fc0b5dadd75 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest
index dc50f54a8fd8..9b322669e63a 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -1,3 +1,5 @@
 DIST eog-plugins-42.3.tar.xz 134284 BLAKE2B 903ee1af89d48c46ab12d1330b4605cd78db573d59d5fc6ba34c27a8b017ce90c2af0b55009e5ecec61229dbdd8852bc4ecc5b10e6a2d2391c06e8244f7b24da SHA512 af680fe7cc83d3b3ae6782127edf90cf2a89093030f15d22fe5ff81eb165a493dc487b32a41383c36b72ce188c8f49b3f52ca3b991d24faa9667b0317bff414f
+DIST eog-plugins-44.0.tar.xz 134544 BLAKE2B db384d949f2a63cb0fcdf1bdfb8ed4c5c97af88d21079af5de7560b3c3bab231a6361ae459727a9b9f31b49e63f7cd227f465a1a7b8e2bc55e8d7a08f0335ed9 SHA512 2955830aa60a3518869ec1af7a9f0c455277b0a571cb14a5e5926b52b80ed0443e91f28e270feffcf26066e1e9b6080c9a457b55175051c20838c8b80e2da195
 EBUILD eog-plugins-42.3.ebuild 1789 BLAKE2B 1149b7fea1b066da0e515b47f6ff1d1b97a659c1c52573d83a1bb3f48bd0cd348acaf96c68859573d0606f113f84c7828471ba4a80d31ee1e04de3297d8ad8fb SHA512 1bd3e4cd02d4fd1424ee05450a55b5322b1bd6f3112d81be4d68d5c88ae1be3fbd6f37f8181464825561ede86913ec3ea3f24a7f0fbc87b58e05f21df375abc1
+EBUILD eog-plugins-44.0.ebuild 1791 BLAKE2B a73a744b43885eb5b499cd8f58893511738fb64302a197db5bba9af607c4cf1c7c162d23929e8404f6ee6b481117d8af45b42335d7b0dc0fb1e89d7d1d9d3018 SHA512 2dbdc7d5cce87e190a3935c4719f4b1986e9c90c8c1c784eda9f81945347c9d9430bf2221729245bdf204769134682f6efa7e23bbeb9115d03cd34a2fe93bacc
 MISC metadata.xml 541 BLAKE2B ee4eb7e0faf9345c05620ca09bcd761ef02bd5d5b38485b6fa17cfb52f5b602dac9f598876de728e8a9d9e223f28e6a73afa34b8bcbccb376c41785a53f252f2 SHA512 46ffc768901c97363eb9cbbf3ec1b06b0ccfe8ce99be944866d4459383c0778a151f94437f16254b8955742d4c2f863fb63dc34cf49368e7fb49da8aa788612b
diff --git a/media-gfx/eog-plugins/eog-plugins-44.0.ebuild b/media-gfx/eog-plugins/eog-plugins-44.0.ebuild
new file mode 100644
index 000000000000..1a40b2451460
--- /dev/null
+++ b/media-gfx/eog-plugins/eog-plugins-44.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit gnome.org meson python-single-r1
+
+DESCRIPTION="Eye of GNOME plugins"
+HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins https://gitlab.gnome.org/GNOME/eog-plugins"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+exif map picasa +python test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	map? ( exif )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	>=dev-libs/glib-2.53.4:2
+	>=dev-libs/libpeas-1.14.1
+	>=media-gfx/eog-41.0:1
+	exif? ( >=media-libs/libexif-0.6.16 )
+	map? (
+		media-libs/libchamplain:0.12[gtk]
+		>=media-libs/clutter-1.9.4:1.0
+		>=media-libs/clutter-gtk-1.1.2:1.0
+	)
+	picasa? ( >=dev-libs/libgdata-0.9.1:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/glib[dbus]
+		dev-libs/libpeas:=[gtk,python,${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+		')
+		gnome-base/gsettings-desktop-schemas
+		media-gfx/eog[introspection]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/appstream-glib )"
+BDEPEND="
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use exif plugin_exif-display)
+		$(meson_use python plugin_export-to-folder)
+		-Dplugin_fit-to-width=true
+		$(meson_use python plugin_fullscreenbg)
+		-Dplugin_light-theme=true
+		$(meson_use map plugin_map)
+		$(meson_use python plugin_maximize-windows)
+		$(meson_use picasa plugin_postasa)
+		-Dplugin_postr=false
+		$(meson_use python plugin_pythonconsole)
+		-Dplugin_send-by-mail=true
+		$(meson_use python plugin_slideshowshuffle)
+	)
+	meson_src_configure
+}
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 99afa767515f..313a5576fc1b 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,5 +1,7 @@
 DIST eog-43.2.tar.xz 4655416 BLAKE2B 9909fc3da58541191b25959be20e53987f5633c97e003b0c97c4029a7cd6084d3675d75584664a023ca45897982d3cfe2668b6dc94a34b22a249b15a87307470 SHA512 aa3bb2e2684140f6a35770f6f6b80f64f09ff0f36f25ddc561c9cbbf6f22fdb4bbb1a48392a29d59dcf4852c224146ac847c62c8196e9198b34e7015bf4bb760
+DIST eog-44.0.tar.xz 4655396 BLAKE2B 96cedcd03bf29c5052566b6a52b901d30f6d4d8a1950caa20b99cb0df2f97da8422c4884def724f441cf01f071d0caadd803e7e7cfa2b6ed2d3073c66cd825d2 SHA512 8bd54b53100c0a8e596dec070f8a711fbc2a0caf396afb5b2d8ba45f86215c1823736a3b898d0460ac91204d1cf1a492ec993e66a025af167e3dc4aec3149b2d
 DIST eog-44.beta.tar.xz 4654948 BLAKE2B 30965b2d0f7fb6e82e6f151e0e64cb8c9898129d1a4918427b828a4bef413bed1b51bf24a79d34148cd7755649d992ab294c3de24e8bc5c5a97ec150a832220a SHA512 ba9732a99e2ab68c32c898cff8c2edecc585eb1bf16756164dd0fff94a5552e93f8cbf63cf8cea5cc36a3b1785cfc77ef7573892f5a653b897d9b13118b03bab
 EBUILD eog-43.2.ebuild 1743 BLAKE2B 952c727ba75f45f52fbf47f14f24bffab43ae27dd5429ec378b76dbb7565825f17a127bcd1e623184bcd5c81e26a01738601f589188f6c869063aaef56117d8e SHA512 55c933f1a0a0dd5829186705d427815ee08be0b93d86546b764e6a20c61e697d9edbebd3cfdef5cfb9d9cf9ea56957aaa694d828a03b676de6df2d64fac44de2
+EBUILD eog-44.0.ebuild 1746 BLAKE2B 94e8bfa5612fd45420aec173bcb754845e13d94001a10f1a325fd4bb6f669b821c6c15dcc5ba8cec67a867847486db68b36aee04de7ba3cea02d69bf92072f0f SHA512 9a7517b9d9c9ec577654891b3fce00418792116f6c2463ffa61246deade17007cc4a3da84190b3fe804ec00bceb269696225c7623cee65473f438bce5cfe81e4
 EBUILD eog-44_beta.ebuild 1850 BLAKE2B 5c2369409c8597bba0d38a57e25fdc0c1b7d7e01e492777f66d315ec7c16625fb75306260febcbb3f605645cbd0227ad4a7a16f56736160b2ddd094e2cd47283 SHA512 af2a8a168843115ea6fe289ecda8ae7d6bc39b1cda69f162ae2a6efcd063ff0f63ef565da0a225ac8c6f4e03fd865ec0578934a11d6ed085b9abb7dc7780b684
 MISC metadata.xml 580 BLAKE2B 7d6bf08b37ed06abb82e92621725ab2cbc9d0b28e5c50cd9dd25e449e98212da4911da450d5e80f6d2efd3cb65981b2726e69f48ae54fc7a0dd4363c896b9086 SHA512 3ae60a59ef2e07fd78b836eb828c0b9e37e49ea6115c52215b86dafff9cb6990567659a31cfb1e06e58890cf598c98065df1e473dc7994fef0ae950081c27a54
diff --git a/media-gfx/eog/eog-44.0.ebuild b/media-gfx/eog/eog-44.0.ebuild
new file mode 100644
index 000000000000..01a9802618ea
--- /dev/null
+++ b/media-gfx/eog/eog-44.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="The Eye of GNOME image viewer"
+HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome https://gitlab.gnome.org/GNOME/eog"
+
+LICENSE="GPL-2+"
+SLOT="1"
+
+IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
+REQUIRED_USE="
+	exif? ( jpeg )
+	gtk-doc? ( introspection )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.53.4:2
+	>=dev-libs/libpeas-0.7.4[gtk]
+	>=gnome-base/gnome-desktop-2.91.2:3=
+	>=gnome-base/gsettings-desktop-schemas-42_beta
+	>=x11-misc/shared-mime-info-0.20
+	>=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
+	>=x11-libs/gtk+-3.24.15:3[introspection,X]
+	>=gui-libs/libhandy-1.5.0:1
+	sys-libs/zlib
+
+	exif? ( >=media-libs/libexif-0.6.14 )
+	lcms? ( media-libs/lcms:2 )
+	xmp? ( media-libs/exempi:2= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	svg? ( >=gnome-base/librsvg-2.44.0:2 )
+
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? (
+		dev-util/gi-docgen
+		app-text/docbook-xml-dtd:4.1.2
+	)
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use exif libexif)
+		$(meson_use lcms cms)
+		$(meson_use xmp)
+		$(meson_use jpeg libjpeg)
+		$(meson_use svg librsvg)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		-Dinstalled_tests=false
+		-Dlibportal=false # As of 40.3, all libportal usages are flatpak-specific
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/xsane/Manifest b/media-gfx/xsane/Manifest
index 38294d6a3df0..92b2af399db0 100644
--- a/media-gfx/xsane/Manifest
+++ b/media-gfx/xsane/Manifest
@@ -1,6 +1,7 @@
+AUX xsane-0.999-configure-clang16.patch 220 BLAKE2B b345b740e9fce550a162799e62f4a4bdcdf888082af0016896bb798525766d250a79905d3efafdf0fac8a9cbef2684255fb569cec92108e6a6726dfd87c5c264 SHA512 bcb42c31fa7d22733c5efbd8d4a598a5e22c199d2a06ead5175b4124882f08a6d7c1d20cdb25e5a098a9623e9216dae5729c4be2c02d752e83ad5e143f9d5db0
 AUX xsane-0.999-lcms2.patch 11788 BLAKE2B 2a7f40e1d430b74f29c201e850ee5520395a6a6d906323125c084effb9a52720d1a1d38d2a3680986a05787170818011342a7fcde225f4d1f70cdf36c6a9d8a1 SHA512 bdb5f078d7a36702b327b01f8c6d4259d52252968e5d287ce17aed18adb0bb89420049609242ee89048cb8e4012a0dd04ba29fa994570014d3c62b098e33508b
 DIST xsane-0.998-patches-3.tar.xz 54480 BLAKE2B 8c77bf0304e60114fa964e337640b61e7c353a6b6f9ad5bc3c87fd5324440b27e58a45aef7df2f16d5faa63692b9f8b22cca7d5dbf21dd6a1cac8572e668cf65 SHA512 e0a85e536502fef66526f12d7607381d07a2a53953f200b298afd1225f85657dfa3550f37b1ee7827739cb2b00333ab926a146c6424ec2543b691f0945300b68
 DIST xsane-0.999.tar.gz 2950621 BLAKE2B a8490981b7da497934f0334874fb65d2d3f2a7d9153825544672a39780bd8c4bfabee6bda134bd7b37b07947d1f01f283fb7242552b0e6342cab5a70484a5488 SHA512 73ec961fce1a86b5d6f5bac0995d222785eb4b077dc8e72492b092d2bf4500455426e80e4d27233721cd38ec84f77fb9f92190a6afe45bdaf7ffd1ee50b431ed
 DIST xsane-256x256.png 18478 BLAKE2B 5661d68fab2c5f7219f0de9e2c2c811ef5fba6f5472e85d98f6f3a10bb058c1d26597d15c2aa8ab59c52060a62b571aafc2daafcef4bb8edd0445cf875ec0ca3 SHA512 7bd63a701a4776b395689799ad98b7619917a9b40367c980bebaa116e6c5c2bfeffb8b996a8295b07f3483aa689c9040d8a68bb21376af65b1c0e8f69294f2e5
-EBUILD xsane-0.999-r4.ebuild 1998 BLAKE2B fee45d3148313c68e97ee82ded7055d4408c195d87655e4d8c10db6d9e25f1726d07bfe128743cf85c8266a38ae126bdb9efbe14411fc60da759c77adea03cbb SHA512 105b2d74e59aef57e35a053d3de8d4cba7ee19c44d077a3e751a93a73024fd5f6ae03a56e2e59ab5abccd6291bbe7468047570e1239c8fa9968bb1864ec8ba4e
+EBUILD xsane-0.999-r5.ebuild 2120 BLAKE2B 87b5ac88788256a19612c28670ed2d073daaf13c154255580c42204466625c31734244266a30bddfc028deb2cd4a83c0b17af0f5b080c60b4949a92aaffcef59 SHA512 8377c831b80593d9c9b6948c6afaff0ae93a3c9943ab5d70c01428c76ce2288225e3127e85327f934a06193294204f2c095d6f43740be3a937bf1ae33164a719
 MISC metadata.xml 371 BLAKE2B 2816d22902bed33d3af4bc8df476953a4bfd8e4f08411d2da60af273c966ffe692f155eaaf5cfb8dc79b78d0f82ef117cabdf1e315b051cbe216fe451da98400 SHA512 2def02aa540182ef68f99c7c327b1f6607ff6cb151bb44e232338549da82ef5b60d7096ad6212f4fd6d7aeb93063dca9ca994bec95fcfe0133e674e4ec5b6922
diff --git a/media-gfx/xsane/files/xsane-0.999-configure-clang16.patch b/media-gfx/xsane/files/xsane-0.999-configure-clang16.patch
new file mode 100644
index 000000000000..0e0ee342a3de
--- /dev/null
+++ b/media-gfx/xsane/files/xsane-0.999-configure-clang16.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/885311
+https://bugs.gentoo.org/899806
+--- a/m4/sane.m4
++++ b/m4/sane.m4
+@@ -44,6 +44,7 @@ dnl
+       AC_TRY_RUN([
+ #include <sane/sane.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ int 
+ main ()
diff --git a/media-gfx/xsane/xsane-0.999-r4.ebuild b/media-gfx/xsane/xsane-0.999-r5.ebuild
index 78d35099cfd2..351830dee66a 100644
--- a/media-gfx/xsane/xsane-0.999-r4.ebuild
+++ b/media-gfx/xsane/xsane-0.999-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,8 +18,10 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls jpeg png tiff gimp lcms ocr"
 
-RDEPEND="
+DEPEND="
+	dev-libs/glib:2
 	media-gfx/sane-backends
+	sys-libs/zlib
 	x11-libs/gtk+:2
 	x11-misc/xdg-utils
 	jpeg? ( media-libs/libjpeg-turbo:= )
@@ -28,27 +30,31 @@ RDEPEND="
 	gimp? ( media-gfx/gimp:0/2 )
 	lcms? ( media-libs/lcms:2 )
 "
+RDEPEND="${DEPEND}"
 PDEPEND="ocr? ( app-text/gocr )"
-DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	# Apply multiple fixes from different distributions
+	"${WORKDIR}"/${PN}-0.998-patches-3
+	# Add support for lcms-2 (from Fedora)
+	"${FILESDIR}"/${PN}-0.999-lcms2.patch
+	# See bug #885311 and bug #899806
+	"${FILESDIR}"/${PN}-0.999-configure-clang16.patch
+)
+
 src_prepare() {
 	default
 
-	strip-linguas -i po/ #609672
+	# bug #609672
+	strip-linguas -i po/
 
-	# Apply multiple fixes from different distributions
-	eapply "${WORKDIR}/${PN}-0.998-patches-3"/
-
-	# Fix compability with libpng15 wrt #377363
+	# Fix compability with libpng15 (bug #377363)
 	sed -i -e 's:png_ptr->jmpbuf:png_jmpbuf(png_ptr):' src/xsane-save.c || die
 
 	# Fix AR calling directly (bug #442606)
 	sed -i -e 's:ar r:$(AR) r:' lib/Makefile.in || die
 
-	# Add support for lcms-2 (from Fedora)
-	eapply "${FILESDIR}/${PN}-0.999-lcms2.patch"
-
 	AT_M4DIR="m4" eautoreconf
 }