6 files changed, 255 insertions, 2 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 721705ceff63..bd7b5599b31f 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/displaycal-py3/Manifest b/media-gfx/displaycal-py3/Manifest
index cea5c214d789..dd167020a29f 100644
--- a/media-gfx/displaycal-py3/Manifest
+++ b/media-gfx/displaycal-py3/Manifest
@@ -1,5 +1,5 @@
 AUX displaycal-py3-3.9.10-python-3.11.patch 3134 BLAKE2B 3110f39ecab47eff46a97389c2164bfbb2b44f80fd30bb848856dae050738cd6590905b2b9ce603eb9d919f2811674b378b1562396b1437bea8247798868313f SHA512 98bb7ea8a0b29ffbb455f8666183489d1571bdcd1829398ce4535c7581f797582ed7c1a5035b2bdf9a0d19397ef14e5f8068ec2baf5078f64b614c901be48f33
 DIST DisplayCAL-3.9.10.tar.gz 10676033 BLAKE2B 94bfa3ac95bfc16788421fa5b9a31920c40da66d2875e4037b3b20b6792a1005ee9fea11b5325a94ffae845f56583647e42de9d4d7d96d149264a86e6d1158a6 SHA512 fc1b981925c6f4660557d8f0935a62d0112b39664b0c74cdb1a907e0e7b7e3f61ec76986fa2072f8ada1d105ebfa61bb116df75dc10f902ff545db3368634fc5
-EBUILD displaycal-py3-3.9.10-r2.ebuild 1557 BLAKE2B 32317d7097c451c50a3355c9d512e44c95fc94b152cef4bcff59506729900c11c8655831b9c50eba07b531460dd8db3249aef879a6d0ce655c1e468bfda25ffe SHA512 61e6c308fc5d8917de29458e5973166279e4b32d2602b4286e12d1bd1d4ea9fe692bc5db335f5b851f3a5e79a2d2ed85b55d37ffef392e746b3befd034cfdc66
+EBUILD displaycal-py3-3.9.10-r3.ebuild 1635 BLAKE2B 21a1b93ab0c78fc50824f49e1e6a2e4704e9e4fcc6db91eef854c9d119528e5ddfbebafa597e614540aa8143d732925c311211a5d25b24f77d60f69d2c397fd7 SHA512 e85c78550a5eb370d14532aaaa33f2055f657856754b3067c83a51ea48ae5665405f067e0b979956aa5e56d689de819764858b26a76d60699189a1333791f752
 EBUILD displaycal-py3-3.9.10.ebuild 1494 BLAKE2B 9696773d870850429eea8df9d7c62624277f2c0ba2475271c367e5b642124a70c2c5dea38d5916eb0cad8ec028089c76a31c8fb21aa68f2042e76d203b03217f SHA512 c82759379322f0d177365081a7fcc61eb7d258e3e60e149345290c33cd6a054f6586911a1fdbf302b282a1a4eeeb447fcc660a299e71d8a83a2c313832d62af5
 MISC metadata.xml 790 BLAKE2B aa3f32f061f4840bbc0e29c36e6154cc37b85a9fa76a92e7f69a32ccadef16fa5a9680266c35b51c3351c4f4d65e2e1659515550e2366c9c9516e8c26c049694 SHA512 d4fad45e53ac19ede7f26709878ff36b55906a4c642b1ce7ce2e49ef56a1285582700d07170f702263a3a99ea0bfa2c2cfbc842978f565291d3322fb9a6a5c0d
diff --git a/media-gfx/displaycal-py3/displaycal-py3-3.9.10-r2.ebuild b/media-gfx/displaycal-py3/displaycal-py3-3.9.10-r3.ebuild
index d6ac7689141f..6cf08031c321 100644
--- a/media-gfx/displaycal-py3/displaycal-py3-3.9.10-r2.ebuild
+++ b/media-gfx/displaycal-py3/displaycal-py3-3.9.10-r3.ebuild
@@ -28,7 +28,6 @@ PATCHES="${FILESDIR}/${P}-python-3.11.patch"
 
 DEPEND="
 	dev-python/build[${PYTHON_USEDEP}]
-	dev-python/certifi:0[${PYTHON_USEDEP}]
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	dev-python/distro[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
@@ -46,6 +45,9 @@ src_prepare() {
 	# Fix QA warning
 	sed -e 's/license_file/license_files/g' -i setup.cfg || die
 
+	# remove dependency only imported if `sys.platform in ("darwin", "win32")`
+	sed -e '/certifi/d' -i setup.cfg || die
+
 	# Remove x-world MIME
 	sed -i 's|x-world/x-vrml;||g' \
 		misc/displaycal-vrml-to-x3d-converter.desktop || die
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 5167fb5f7b68..233bcda4bcd6 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,3 +1,4 @@
+AUX gimp-2.10.36_fix_strict-aliasing.patch 1077 BLAKE2B 02bfb2b0836a4c8e31caac441c836e652edfce0570648f6db0232e34687621c68fab2b0ecd33b1552c5f9b269beaf41f71b0a6b9a047d148f37eece006ee3fe7 SHA512 e71a70fceb6d7104017306169acf6d5f28061e95498d0b0d21e218b060fd84649b5ac0d3c524f69033cc1d8ea95e7e8e0b91c2367b3b3e8889acd73611f5f3f5
 AUX gimp-2.10_fix_configure_GCC13_implicit_function_declarations.patch 583 BLAKE2B 5c7feb3e666b496ea718d63cd3e8d415604397d0e78c95e4449812b48d7548c3b81d194c955555d7ad516c46012826475191786486140e0516c91bac56df027c SHA512 d90e6bc41bc91114ee8068e2d2cdd8c83e707b30eba876aa7b369c44d0ee125953b387a8f041dd5cb521d0eb16824bb8496a9751595c75c5a76b4cc0b3251cc3
 AUX gimp-2.10_fix_musl_backtrace_backend_switch.patch 535 BLAKE2B 374433568330a4b5167e6f32bd9ecbe44e9ceb4004cce9504586b73dc31c7613d2766ae5615d74b2a51a05ff3592add2e7585b7d63eb43b219ebe6b37193edca SHA512 df0b9b357d085463ac3b791b6131dabfdd33d12e7b77f45f496379d08da1b0e8ae787b9b4b260ec221c22e3302d54b17493175db55514ec3e705782fdb80ec18
 AUX gimp-2.10_fix_test-appdata.patch 902 BLAKE2B 2b1a131d874d65422d8bdd44732b9843d89a570a1ea3c058cdb2a424a7791c686aa0e2ae2a0b472f333f2465f6e1a26750a532e9003933c5dffa1af32343c1dc SHA512 2983e8572f5e8113c9e2f564d31c1a5fe7e11ef273c50d2be739089124c6ec1a457da28222020bbd6015b2cbbcbf403b88d8660b9b35241800deb4fb3ad79067
@@ -6,6 +7,7 @@ DIST gimp-2.10.36.tar.bz2 31532334 BLAKE2B d033cd1407df3399b5968b7e3f7838d288143
 DIST gimp-2.99.16.tar.xz 24969172 BLAKE2B 45050c0e45e7c9e64ee92ac9b3985c05f528205f74f442979dee8b326f41b35de403a2de93edad090dd87987ef446531e01a67ca857ef03403414fc9ac1464dd SHA512 b0da0529b000a7309c9d601977518cd19a7bf50ab41952fa36b83c027042d6901c39d0a6870c16e8a8ad3318207c93d34ee3d50d0e5f35bcabeaa17d91e060ee
 EBUILD gimp-2.10.34-r1.ebuild 5716 BLAKE2B eb80d635f67bb515af112cf5d4b8c9f826480d61490d6d1292d6413bdc64ddf030f09abd6a0e16f6e72c296eac27637579e370594e9e3d24f1b9eb21584bc8f8 SHA512 f0d7e9b2000934ce7ab3e3783fe4095c48a58d5a30a7284b7586bac09481ec69ae7237a00e1c5031d62e3093f4744c200ea9be39186a8debcf0eb2f94567f9b6
 EBUILD gimp-2.10.34-r2.ebuild 5883 BLAKE2B 0703733007c411edbbeaa2b0babbe800196ca0640f854a6880ecb347becc80ed15b39a7ca988439db42ffa939881cd5a2f2c29b0e2bb018841ea09a0d37533af SHA512 bee716dad1765e798dbd3225cd0f59ec0e4885261e17d97e57ad061563165261076e9ad876819344e128fe85d536ba0466260b9fdb190092066b719f5b680ccc
+EBUILD gimp-2.10.36-r1.ebuild 5910 BLAKE2B e848645f62e1cac2b3db535308308de9f2536c30a5862fb886138cd5f3d044cfddb74a3b61afa58f1961da9d9a3accc7c9c81e012b01ee829a33afbab4464309 SHA512 48742a83731015c43380d0a0d8fb7ce24455c0c364bd092adce267c2ada6ea35b10191962b42eb26ff9f970668389479b07d5f7e7d2c5fe639e6156758bd054d
 EBUILD gimp-2.10.36.ebuild 5853 BLAKE2B dce6c1d0cdce4f201109b1e2e13b6a690f5cbd050d36cab1b1d266a76e294d8f96d856115ca4c4681d5e9b3d261f0838cd5fcacbc4ee70e2331fba69dcd5e103 SHA512 839ee7b9383b2091377580afcf9edc8665a6e23da59566d73f2ea9e48c2addede293795f599ece8fce562b9de1f00796c43d97b9a41e3e0f03f5ab3db302bd13
 EBUILD gimp-2.99.16.ebuild 7006 BLAKE2B af6434ed590cfe951ee993507a1f06c906d1ac6c43ada9bbc6bbc0feb61af79fbadeb061c403935979ea198fc5d872b20084f0216bb5ed1eeb035baec4bf9e11 SHA512 bf5f13e1dde99226e4bd84142498781c4410ae994487290acbbe0e2fdbfc88bbe97993044604664078f46df5342625e85d19a132851196bd6100ee6ed88795a8
 EBUILD gimp-9999.ebuild 6940 BLAKE2B a9891b9dbb087e8a46742a8970d81c6420fc0f8ec93f96617f9a4612e2ebdc3e8eff058e4966bafe200938f926695c6e1bd08687a22248680ac66402c0dc871f SHA512 5b9256b0b172aea629d7eedca4831b5d47c9bf07cd83ae9068e8449de416d8ffee8db283dd86b02d805e9d756faebdba4b9618405a3428b45a4b369293e7b469
diff --git a/media-gfx/gimp/files/gimp-2.10.36_fix_strict-aliasing.patch b/media-gfx/gimp/files/gimp-2.10.36_fix_strict-aliasing.patch
new file mode 100644
index 000000000000..2acf31361278
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.10.36_fix_strict-aliasing.patch
@@ -0,0 +1,34 @@
+Gentoo issue: https://bugs.gentoo.org/917497
+Upstream issue: https://gitlab.gnome.org/GNOME/gimp/-/issues/10359
+Upstream patch:
+
+From b45a304df4f038eccb64e098f3643ae35d8f3e77 Mon Sep 17 00:00:00 2001
+From: Alx Sa <cmyk.student@gmail.com>
+Date: Sun, 19 Nov 2023 13:54:00 +0000
+Subject: [PATCH] core: Fix strict-aliasing error on ASE load
+
+Resolves #10359
+
+When compiled with -Werror=strict-aliasing, the build fails
+on this line due to converting pointer datatypes.
+This patch switches to using memcpy () instead.
+---
+ app/core/gimppalette-load.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/app/core/gimppalette-load.c b/app/core/gimppalette-load.c
+index 7605b92fcfb..e9813ebb168 100644
+--- a/app/core/gimppalette-load.c
++++ b/app/core/gimppalette-load.c
+@@ -1095,7 +1095,7 @@ gimp_palette_load_ase (GimpContext   *context,
+ 
+           /* Convert 4 bytes to a 32bit float value */
+           tmp = GINT32_FROM_BE (tmp);
+-          pixels[j] = *(gfloat *) &tmp;
++          memcpy (&pixels[j], &tmp, 4);
+         }
+ 
+       if (! valid_color)
+-- 
+GitLab
+
diff --git a/media-gfx/gimp/gimp-2.10.36-r1.ebuild b/media-gfx/gimp/gimp-2.10.36-r1.ebuild
new file mode 100644
index 000000000000..3a4becc07cfd
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.10.36-r1.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GNOME2_EAUTORECONF=yes
+WANT_AUTOMAKE=
+
+inherit autotools gnome2 toolchain-funcs virtualx
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/"
+SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.bz2"
+LICENSE="GPL-3+ LGPL-3+"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+IUSE="aalib alsa aqua debug doc gnome heif jpeg2k jpegxl mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0
+	>=app-text/poppler-0.50[cairo]
+	>=app-text/poppler-data-0.4.7
+	>=dev-libs/glib-2.56.2:2
+	>=dev-libs/json-glib-1.2.6
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=gnome-base/librsvg-2.40.6:2
+	>=media-gfx/mypaint-brushes-2.0.2:=
+	>=media-libs/babl-0.1.98
+	>=media-libs/fontconfig-2.12.4
+	>=media-libs/freetype-2.1.7
+	>=media-libs/gegl-0.4.40:0.4[cairo]
+	>=media-libs/gexiv2-0.10.6
+	>=media-libs/harfbuzz-0.9.19:=
+	>=media-libs/lcms-2.8:2
+	media-libs/libjpeg-turbo:=
+	>=media-libs/libmypaint-1.6.1:=
+	>=media-libs/libpng-1.6.25:0=
+	>=media-libs/tiff-3.5.7:=
+	net-libs/glib-networking[ssl]
+	sys-libs/zlib
+	>=x11-libs/cairo-1.12.2
+	>=x11-libs/gdk-pixbuf-2.31:2
+	>=x11-libs/gtk+-2.24.32:2
+	x11-libs/libXcursor
+	>=x11-libs/pango-1.29.4
+	aalib? ( media-libs/aalib )
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
+	heif? ( >=media-libs/libheif-1.9.1:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
+	jpegxl? ( >=media-libs/libjxl-0.7.0:= )
+	mng? ( media-libs/libmng:= )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
+	postscript? ( app-text/ghostscript-gpl:= )
+	udev? ( dev-libs/libgudev:= )
+	unwind? ( >=sys-libs/libunwind-1.1.0:= )
+	webp? ( >=media-libs/libwebp-0.6.0:= )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	xpm? ( x11-libs/libXpm )
+"
+
+RDEPEND="
+	${DEPEND}
+	x11-themes/hicolor-icon-theme
+	gnome? ( gnome-base/gvfs )
+"
+
+BDEPEND="
+	>=dev-lang/perl-5.10.0
+	dev-libs/appstream-glib
+	>=dev-util/gtk-doc-am-1
+	dev-util/gtk-update-icon-cache
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.19.8
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+"
+
+DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" # Bugs 685210 (and duplicate 691070)
+	"${FILESDIR}/${PN}-2.10_fix_musl_backtrace_backend_switch.patch" #900148
+	"${FILESDIR}/${PN}-2.10_fix_configure_GCC13_implicit_function_declarations.patch" #899796
+	"${FILESDIR}/${P}_fix_strict-aliasing.patch" #917497
+)
+
+src_prepare() {
+	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
+
+	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+	sed 's/-DGIMP_DISABLE_DEPRECATED/-DGIMP_protect_DISABLE_DEPRECATED/g' -i configure.ac || die #615144
+
+	gnome2_src_prepare  # calls eautoreconf
+
+	sed 's/-DGIMP_protect_DISABLE_DEPRECATED/-DGIMP_DISABLE_DEPRECATED/g' -i configure || die #615144
+	grep -F -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+_adjust_sandbox() {
+	# Bugs #569738 and #591214
+	local nv
+	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
+		# We do not check for existence as they may show up later
+		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
+		addwrite "${nv}"
+	done
+
+	addwrite /dev/dri/  # bugs #574038 and #684886
+	addwrite /dev/ati/  # bug #589198
+	addwrite /proc/mtrr  # bug #589198
+}
+
+src_configure() {
+	_adjust_sandbox
+
+	local myconf=(
+		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+		GDBUS_CODEGEN="${EPREFIX}"/bin/false
+
+		--enable-default-binary
+
+		--disable-check-update
+		--disable-python
+		--enable-mp
+		--with-appdata-test
+		--with-bug-report-url=https://bugs.gentoo.org/
+		--with-xmc
+		--without-libbacktrace
+		--without-webkit
+		--without-xvfb-run
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable debug)
+		$(use_enable vector-icons)
+		$(use_with aalib aa)
+		$(use_with alsa)
+		$(use_with !aqua x)
+		$(use_with heif libheif)
+		$(use_with jpeg2k jpeg2000)
+		$(use_with jpegxl)
+		$(use_with mng libmng)
+		$(use_with openexr)
+		$(use_with postscript gs)
+		$(use_with udev gudev)
+		$(use_with unwind libunwind)
+		$(use_with webp)
+		$(use_with wmf)
+		$(use_with xpm libxpm)
+	)
+
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
+	gnome2_src_compile
+}
+
+# for https://bugs.gentoo.org/664938
+_rename_plugins() {
+	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
+	local prename=gimp-org-
+	(
+		cd "${ED}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die
+		for plugin_slash in $(ls -d1 */); do
+		    plugin=${plugin_slash%/}
+		    if [[ -f ${plugin}/${plugin} ]]; then
+			# NOTE: Folder and file name need to match for Gimp to load that plug-in
+			#       so "file-svg/file-svg" becomes "${prename}file-svg/${prename}file-svg"
+			mv ${plugin}/{,${prename}}${plugin} || die
+			mv {,${prename}}${plugin} || die
+		    fi
+		done
+	)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Workaround for bug #321111 to give GIMP the least
+	# precedence on PDF documents by default
+	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+	local gimp_app_version=$(ver_cut 1-2)
+	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+
+	# Remove gimp devel-docs html files if user doesn't need it
+	if ! use doc; then
+		rm -r "${ED}"/usr/share/gtk-doc || die
+	fi
+
+	_rename_plugins || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}