7 files changed, 183 insertions, 5 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index c732027cd24e..776540f400dc 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/chafa/Manifest b/media-gfx/chafa/Manifest
index 496ddfee5556..2d371993f6cd 100644
--- a/media-gfx/chafa/Manifest
+++ b/media-gfx/chafa/Manifest
@@ -1,5 +1,7 @@
 DIST chafa-1.12.5.tar.xz 939792 BLAKE2B 82fbcd7b071dba8534fdd391b6ce22f6de63b1e3eb30228ba1ce6e751c442efbc4a5141d30fa767cc0789b01518da016a4245f9c560837530daa4d92534a9eca SHA512 d0b719294bdc8880f2c65c1bd777ac0eb98d47d48147bc6f883f1917d4f9a6b246c4e9365bc0128b1332d4a268611ac7e479f346f13c49d2e56ff4f446f22d94
 DIST chafa-1.14.1.tar.xz 991656 BLAKE2B 1a7ba4c7d3958396c89b7b2f2873b4c1dfcf5209ae0d53fd0b2e014c3012a316a2d197a2f593c230e02bed01ed3119d6d0659d21b5f5d02dacd7eaaa626f2cb8 SHA512 61872acc3370318ab1a363cd21839978825d722d64225f968fd12acae1b7cf4a9be0f011fa2ab69a62cf61e32f095bb47aaf9d8796b97f25844703e7dfdfea35
+DIST chafa-1.14.5.tar.xz 993572 BLAKE2B 9d3a3a6e9a4c6aa1f2cd9e71c835eda43b4b0abbeedf659e72e4cf6eda5c4b9497253937b21d7dcb622a1dfc1febc402814291f8941ce33bfa2b9d0b92fedff0 SHA512 1ed6bb475f539e4bc310ef1a32c087430584f964533e08b1c1e0eaec7376902b579cbf716a4825df4da02ae0d56ac71926ba1681cab314057b41eb93df0ea8a4
 EBUILD chafa-1.12.5-r1.ebuild 1083 BLAKE2B cc02a07997dba904e0ba7841b4ed25846bdeec242204dcd4a2f2fd071c3d9f2e235486983fd2f32cea45781d6ac017cb6b4c4f624edcfbb6c24c7f9b1e92a7bc SHA512 d0131c1a979f1f27dcb76736180713a7e9e1f196420e129dc7dc3b3105f35cb1d434d1ff3a02ba9062d24a13123b34b9f283bd6f2e319db9afe083a351243815
 EBUILD chafa-1.14.1.ebuild 1017 BLAKE2B 1a484415610709600ab38955d4f38f947631a1c9da97cf435aa1ff0e143e3da12a17aaebd2895f7b14e13d789f022b514e7de5b58d1fc7dd484cb6512e55b2c9 SHA512 5f09b3202d1b7893fcb80caee639433c47e17d81c11a6013e5450859414fa9054fe9fdfc45477c9bd0a181accb98af056b94e53896ba18604c1d6d65d75b9cd3
+EBUILD chafa-1.14.5.ebuild 1020 BLAKE2B 9c577493cdb4f63635c480a6395ea8c5c4c2aaca4d7a401c33eaa0083c78e6788604d50553f9ccc5970d667bd573bfbc5ca1daf7db75954e21be968c3881cc2a SHA512 b93067cdb164e0ca801d798b075e2b51980dd46b0038d150d5fad1e5c00219275d790139209cb0b741eff5bb21c0cd4515bbbadbd36826bd23dad1f3bc239b13
 MISC metadata.xml 316 BLAKE2B 2a0c72d22e04271cea1887a17cd6a61b0aadb0ae6bf53385e2aae5ae4add3b47a32892dabdab8a328a78a89a63aee2d62fd47de97f389ed7eb15cbe0dde1ea24 SHA512 aa9c46f2b48f8b5413492a32e0bc7397cbd3acc23d040e6f77a05428bc964e1412345e7516be5406261f00665e16e89f1bd00b93f0f2757466514a82762fd01b
diff --git a/media-gfx/chafa/chafa-1.14.5.ebuild b/media-gfx/chafa/chafa-1.14.5.ebuild
new file mode 100644
index 000000000000..e5bb353e9502
--- /dev/null
+++ b/media-gfx/chafa/chafa-1.14.5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic libtool
+
+DESCRIPTION="versatile and fast Unicode/ASCII/ANSI graphics renderer"
+HOMEPAGE="https://hpjansson.org/chafa/ https://github.com/hpjansson/chafa"
+SRC_URI="https://hpjansson.org/chafa/releases/${P}.tar.xz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+tools webp"
+
+RDEPEND="
+	dev-libs/glib:2
+	tools? ( >=media-libs/freetype-2.0.0 )
+	webp? ( media-libs/libwebp:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# checking for intrinsics, will fail where not supported. bug #927102
+	_mm_popcnt_u64
+)
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+src_configure() {
+	# bug 909429
+	use webp && append-ldflags -lwebp
+
+	econf \
+		--disable-man \
+		$(use_with tools) \
+		$(use_with webp)
+}
+
+src_install() {
+	default
+
+	use tools && doman docs/chafa.1
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-gfx/icoutils/Manifest b/media-gfx/icoutils/Manifest
index 2d6e6b1807ba..eed967965ea6 100644
--- a/media-gfx/icoutils/Manifest
+++ b/media-gfx/icoutils/Manifest
@@ -1,5 +1,6 @@
-AUX icoutils-0.29.1-gettext.patch 354 BLAKE2B f165b759526678524344a516a0953c028c70941c776f53c780597f17a241c1469b6b6b3ce409153f045470ce4d9d896a44cbcf3b0557950f9138e08bd95ee451 SHA512 d5efb49f9ba8411b682047fc5de3a9605c89c5d8f9a0fa67b7de52719630187f36abf7ffc7cc1e53481c7474c0b7e5d8b3074a81fca02061c4685053c9cb221f
+AUX icoutils-0.29.1-gettext.patch 352 BLAKE2B 149c41c38e6936ea0056fd35671479084a51325a9e8c7da0c602d87519052358c79a153ab3aafa54df58d24a581a7685cc7dc15e5dc35b6fe68cb84f4ce28bc2 SHA512 ef8d4b79ace8f37e8ce3f5e6dd0eed3064d6083147be82d84db065a9b4906c9f059f84979344f15a3adb0448f04521302e6006b1a91a28b57546fe7d1003ef91
 AUX icoutils-0.29.1-locale.patch 831 BLAKE2B c24a99e4c186759f3c40e1635f919a9f802af28971c803b31a67b4e990206b0aaf4f7787204599b45888a6615c4bfd7c777bfbada6d67248c6e8e4cf033bdf07 SHA512 bcb0ef117c7f1434e63e411d270a2cad8e4d0ad214c7bd516494c7718b605234ad5920b9e16c5627c98e8e1065bc2550e55b1e2e8b846a5854999419c999107b
+AUX icoutils-0.32.3-c23.patch 4071 BLAKE2B 2a00c61b15fc5da03a176970020e5faf80f3ad485a51b92c92e0976fafdcce4d172757d001cea1883352e30c7250d0ffe87ac52c000c2a07200b155ecc09ee4a SHA512 0a434341eb97de423f6e48906b11753dadd8fb8f36348ffb764a7619271769f5b848840fe18a71607b65368bd080ba3aa9c7e1d568fd0c43690fa3d4623f73e5
 DIST icoutils-0.32.3.tar.bz2 609286 BLAKE2B 0d65fbadb08e4f2e7a60b5ffd4bc14dc82e90abf0a56ddb89f9717a479ab45a50b9747c986c954c3a01e4d8a51d8396ec9d8796dc4a1d7430cb3169c13e06e13 SHA512 982a051a5dc4a63bb2a9f23e78e5a88e481e5c7a9c25789253e1c396e40d4c093e5a9b399966d660e4f2da21ce15d539cb9d20bfd8126b1138f148b86baa6726
-EBUILD icoutils-0.32.3.ebuild 1030 BLAKE2B 4100e00445221d1115516833970e9a5b50f4c5354af63978b815492a108699d66b4c6e221a6ab1e72d5ff3429659455a8c206d09df7ad450eef7efbbe738e09e SHA512 520a38a9a864699ae87e1fa4122c6c60aec07f54a54f0b3b9d1299664d7b2ddf94b66fbe0342c73ecbf117e8d59bcd43f7e78afa83b2a1ac6322808525ca0017
+EBUILD icoutils-0.32.3.ebuild 1069 BLAKE2B 001e91b7d0acf8209c916bf8a4f369deac44a7a270941bab650f04ec315f088c4e509bbc5b70f5f6431d50f198089211280a24aa5feb40aadebe70a61b0be09c SHA512 919e0abc73da15971c59dc8404de2efb1cf5934c1fac0d72909325e3deec401c574f23468a8c037e25ba449880848305905420a3ce1a43365fa48174e44caf16
 MISC metadata.xml 255 BLAKE2B 4900a3d64ae1bb7a07d43b3b26635e28ce8c495f9800764930bb2abe1061127e91e313a8d0f68ade5f4ed98ea5e24bb39360a1611d0b50055a01215758d6c659 SHA512 6409162d659a1bc391c9e24d27f79bad3bc6c006a36d7de65b1b71ef6810e769dc22f2e1fde0893b517abb7a1d1dcc09a4c65aa229363508ad66d1c2d4b869dd
diff --git a/media-gfx/icoutils/files/icoutils-0.29.1-gettext.patch b/media-gfx/icoutils/files/icoutils-0.29.1-gettext.patch
index 4aa4c44cc3ce..304f489e7e82 100644
--- a/media-gfx/icoutils/files/icoutils-0.29.1-gettext.patch
+++ b/media-gfx/icoutils/files/icoutils-0.29.1-gettext.patch
@@ -7,7 +7,7 @@ Index: icoutils-0.29.1/configure.ac
  # Gettext
  AM_GNU_GETTEXT([external])
 -# AM_GNU_GETTEXT_VERSION(0.14.1)
-+AM_GNU_GETTEXT_VERSION(0.14.1)
++AM_GNU_GETTEXT_VERSION(0.21)
  
  # Checks for header files.
  AC_HEADER_STDC
diff --git a/media-gfx/icoutils/files/icoutils-0.32.3-c23.patch b/media-gfx/icoutils/files/icoutils-0.32.3-c23.patch
new file mode 100644
index 000000000000..5a873853438b
--- /dev/null
+++ b/media-gfx/icoutils/files/icoutils-0.32.3-c23.patch
@@ -0,0 +1,121 @@
+https://sources.debian.org/patches/icoutils/0.32.3-6/c23-iterators.patch/
+
+From 697da54703b28eb6476f5a8ea922620c5d9968ee Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@debian.org>
+Date: Tue, 18 Feb 2025 10:01:05 +0000
+Subject: Specify arguments in function declarations for iterators
+
+GCC 15 rejected the previous code, since it is no longer valid in C23.
+
+Forwarded: https://savannah.nongnu.org/bugs/index.php?66812
+Bug: https://savannah.nongnu.org/bugs/index.php?66812
+Bug-Debian: https://bugs.debian.org/1096829
+Last-Update: 2025-02-18
+
+Patch-Name: c23-iterators.patch
+--- a/common/hmap.c
++++ b/common/hmap.c
+@@ -363,7 +363,7 @@ hmap_iterator(HMap *map, HMapIterator *it)
+  * function. But no other entry.
+  */
+ void
+-hmap_foreach_value(HMap *map, void (*iterator)())
++hmap_foreach_value(HMap *map, void (*iterator)(void *))
+ {
+     uint32_t c;
+ 
+@@ -378,7 +378,7 @@ hmap_foreach_value(HMap *map, void (*iterator)())
+ }
+ 
+ void
+-hmap_foreach_key(HMap *map, void (*iterator)())
++hmap_foreach_key(HMap *map, void (*iterator)(void *))
+ {
+     uint32_t c;
+ 
+--- a/common/hmap.h
++++ b/common/hmap.h
+@@ -50,8 +50,8 @@ void *hmap_put(HMap *map, void *key, void *value);
+ bool hmap_contains_key(HMap *map, const void *key);
+ void *hmap_remove(HMap *map, const void *key);
+ void hmap_iterator(HMap *map, HMapIterator *it);
+-void hmap_foreach_key(HMap *map, void (*iterator)());
+-void hmap_foreach_value(HMap *map, void (*iterator)());
++void hmap_foreach_key(HMap *map, void (*iterator)(void *));
++void hmap_foreach_value(HMap *map, void (*iterator)(void *));
+ void hmap_clear(HMap *map);
+ size_t hmap_size(HMap *map);
+ void hmap_set_hash_fn(HMap *map, hash_fn_t hash);
+--- a/common/llist.c
++++ b/common/llist.c
+@@ -445,7 +445,7 @@ llist_is_empty(LList *list)
+ }
+ 
+ void
+-llist_iterate(LList *list, void (*iterator_func)())
++llist_iterate(LList *list, void (*iterator_func)(void *))
+ {
+ 	LNode *entry;
+ 	for (entry = list->first; entry != NULL; entry = entry->next)
+--- a/common/llist.h
++++ b/common/llist.h
+@@ -68,7 +68,7 @@ LList *llist_clone(LList *list);
+ void **llist_to_array(LList *list);
+ void **llist_to_null_terminated_array(LList *list);
+ 
+-void llist_iterate(LList *list, void (*iterator_func)());
++void llist_iterate(LList *list, void (*iterator_func)(void *));
+ void llist_iterator(LList *list, LListIterator *it);
+ 
+ void llist_reverse(LList *list);
+--- a/common/tmap.c
++++ b/common/tmap.c
+@@ -512,7 +512,7 @@ predecessor(TMapNode *node)
+ #endif
+ 
+ static void
+-tmap_foreach_nodes_key(TMapNode *node, void (*iterator)())
++tmap_foreach_nodes_key(TMapNode *node, void (*iterator)(void *))
+ {
+     if (node->left != &nil)
+     	tmap_foreach_nodes_key(node->left, iterator);
+@@ -522,7 +522,7 @@ tmap_foreach_nodes_key(TMapNode *node, void (*iterator)())
+ }
+ 
+ static void
+-tmap_foreach_nodes_value(TMapNode *node, void (*iterator)())
++tmap_foreach_nodes_value(TMapNode *node, void (*iterator)(void *))
+ {
+     if (node->left != &nil)
+     	tmap_foreach_nodes_value(node->left, iterator);
+@@ -532,14 +532,14 @@ tmap_foreach_nodes_value(TMapNode *node, void (*iterator)())
+ }
+ 
+ void
+-tmap_foreach_key(TMap *map, void (*iterator)())
++tmap_foreach_key(TMap *map, void (*iterator)(void *))
+ {
+     if (map->root != &nil)
+ 	tmap_foreach_nodes_key(map->root, iterator);
+ }
+ 
+ void
+-tmap_foreach_value(TMap *map, void (*iterator)())
++tmap_foreach_value(TMap *map, void (*iterator)(void *))
+ {
+     if (map->root != &nil)
+ 	tmap_foreach_nodes_value(map->root, iterator);
+--- a/common/tmap.h
++++ b/common/tmap.h
+@@ -51,8 +51,8 @@ void *tmap_remove(TMap *map, const void *key);
+ void tmap_iterator(TMap *map, TMapIterator *it); /* value iterator */
+ bool tmap_iterator_partial(TMap *map, TMapIterator *it, const void *match, comparison_fn_t comparator);
+ void tmap_clear(TMap *map);
+-void tmap_foreach_key(TMap *map, void (*iterator)());
+-void tmap_foreach_value(TMap *map, void (*iterator)());
++void tmap_foreach_key(TMap *map, void (*iterator)(void *));
++void tmap_foreach_value(TMap *map, void (*iterator)(void *));
+ 
+ #ifdef ENABLE_TMAP_TESTING
+ #include <stdio.h>
+
diff --git a/media-gfx/icoutils/icoutils-0.32.3.ebuild b/media-gfx/icoutils/icoutils-0.32.3.ebuild
index e7c31f106332..bd63648d1821 100644
--- a/media-gfx/icoutils/icoutils-0.32.3.ebuild
+++ b/media-gfx/icoutils/icoutils-0.32.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,7 +28,10 @@ DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS ChangeLog NEWS README TODO )
 
-PATCHES=( "${FILESDIR}"/${PN}-0.29.1-{locale,gettext}.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.29.1-{locale,gettext}.patch
+	"${FILESDIR}"/${PN}-0.32.3-c23.patch
+)
 
 src_prepare() {
 	default