14 files changed, 179 insertions, 197 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 2b775d4b6dd6..5551ed46fda1 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 284685aae110..68675706b523 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -3,7 +3,7 @@ AUX gimp-2.99.12_fix_libheif-1.13_build.patch 2309 BLAKE2B 32d4edf87f20f9fc0b783
 DIST gimp-2.10.32.tar.bz2 31397425 BLAKE2B 3887e2e29ebfd5dcfa671a9d1549180d11bd5e3656c6854ff4130c6c6e6ca9479df075981e09b9b6b97e47dd1fcd939fea726ca09c08c040ebd1998d80e61771 SHA512 aa999c1ec388154965f84d995a9b5517e9c38608d03a0d0bb6ec9fa55de946f9da106e7d6f7c02052b61d2b6806e7a378e786539f0de5b5ffaa2fcd1bbd9c7f1
 DIST gimp-2.99.12.tar.xz 24282140 BLAKE2B 2174e1d50941071ea6e96f0e3f315484867aa90ae06cbcdc7b30914f959c1a15a7e7ea34ba22ce09a973b29acf1277e3a4519d744140c3fcabc59f31dc3ebf43 SHA512 4b87dd40eccc39c560e69a90b4042b1b19506e9ae52e5079ace442325b54bf7c47477662197da8f7655c12aad16e08bae60d11cf269684b8aa291e978d246917
 DIST gimp-2.99.14.tar.xz 24346236 BLAKE2B 087e28621c736a6ad8241c0f36334c6c5af53cb945711b089d15b54292ffcb7713be229591b8ccf79d06f7c7ede0919ceecad4deb511b20822a4f68ccfa1df49 SHA512 6ea3ca27cb0c830042ad42789d3017989dda195ebbdff38793afbee720f2986d489bec39c077b84889c847c0afc1bc7a2fec2e916574ae08aec42019715cb204
-EBUILD gimp-2.10.32-r1.ebuild 5663 BLAKE2B af3ad36266514ec26c3a54e5cee8a9c21e2787155e07c9b0dcdcdba934d80b37f0fa46ad93d40a48a881583a87ce1db2b2dac28314322bae958b39e78257e17f SHA512 7ec1e0135aca81c43e9ccc34fec1f09a620652ca7aff942768c53238124e9e79727392b0ad61a146da253ff33b1aba31695a6222c7596f6aabb0d21becda2773
+EBUILD gimp-2.10.32-r1.ebuild 5670 BLAKE2B ccac85ed24fde8dd940f3b0378c80918f30e427b144c918e8288d18009bcd7de52551fff68ce3606857b4341d617caaf60e5a5dccebba59de53320cfb0c05143 SHA512 8c0962b687d93e3ebfa1a81e446d24223d6b333a9229fba85e4b4217583c6da64a628d109421be18a505400e8784eab13ed4c991fa816e68d525c8e580e2eb62
 EBUILD gimp-2.99.12-r1.ebuild 6876 BLAKE2B ee13b540db02b9da3e252d43899f56f2ada50391afcc2cf2c2b59ffca63cfd075e5c3ee28659d826612c02df3f4d46cdaee233df11d7c994b8ac8f61610bf3b4 SHA512 40f3862738b6eaa5df9a2d201493f4041a3f333f9f10c12562321319a2c4593501080d37c9c86e24716bb84fcbd51a928fc0e014afcb06a9cac4af1bdc968d99
 EBUILD gimp-2.99.14.ebuild 6891 BLAKE2B 4dc6c9ad91829b9236da517dc1ef9ff2954caceb938525b4808bfa82e867b73364e78ebadb7db7cf3f58d1ac8976b5b81e6b90e3bacf610623e172f4a00701c8 SHA512 de43df894c60c50fe91e7812076ead65673b9323cefaed277d6c284dfe2efabb0797c04e83b7f888507a63c62d654c5d2f56a3aa98893333156690014181f468
 EBUILD gimp-9999.ebuild 6711 BLAKE2B 198f6ad24569900a028965c64c503d413ee1a7e971491b81280b619b4e53d96648bd8958aa991c35c703f36c5b5ced17eb45adf492fee7d8cd621a3f9171c396 SHA512 4d06204a670ff5348abda91e6ec82857505feed5c740ea606893355ecefb65509dfda8355b079ab1e48d7091bd270ac55714b1ea4edfb3261aa6097f476f73a9
diff --git a/media-gfx/gimp/gimp-2.10.32-r1.ebuild b/media-gfx/gimp/gimp-2.10.32-r1.ebuild
index c4ab0e971612..948f18a1b6ad 100644
--- a/media-gfx/gimp/gimp-2.10.32-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.10.32-r1.ebuild
@@ -12,7 +12,7 @@ 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 ~ppc ppc64 ~riscv x86"
+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"
 
diff --git a/media-gfx/gnome-raw-thumbnailer/Manifest b/media-gfx/gnome-raw-thumbnailer/Manifest
deleted file mode 100644
index e6d4529a3401..000000000000
--- a/media-gfx/gnome-raw-thumbnailer/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX gnome-raw-thumbnailer-3.0.0-deprecation-warning.patch 1715 BLAKE2B 62d10ead92443f3bc998242bae5eb460f9e035ab09bcd67d3d90ffbb1b94b3737364f1aeb47e183cf190283fccbc71f5506b0b059e53dd88599df1f72cbc3c9a SHA512 412e7cabc34431730b60efe5c88514c1c60b691f7b305ac408adb7403f3c2795c6712b5b058f83b17d6bc80240656af1edae3ad68ededa5e7e971af9038158ce
-AUX gnome-raw-thumbnailer-3.0.0-fix-downscale.patch 1030 BLAKE2B 49c4e566963e31f7f6293cc420157e0e33a8cfdd169e65771019fd00acf2d8a760c522ce6f0c2a2c13052804ed726b2eb35e378a43a1110328ea694449cfdf77 SHA512 b4985090dad9a06087d2b598eed03333a80d71343a244db3c08fc0f5ef1fc8baae1969b0cdaad460cdd54106173fdd9aa52086203727e823e20bb830deee1242
-AUX gnome-raw-thumbnailer-3.0.0-libopenraw-0.1.patch 696 BLAKE2B c790781d81b5e4b4793c2a2f4aea2893b964e607b5cfc55eb658defb4748c7958558ae85435c0d18986f7267ac58b8c8b41471ce7cdcae7b04100f0c23d560b0 SHA512 ac12cf060a1f40abecb2ff86429766662632e1a448dd84c5205c8def987d7e20c1738402cfd7d6c76b4a5f908872c77ddc046e6379705c1e69277543828bdab7
-DIST raw-thumbnailer-3.0.0.tar.bz2 270499 BLAKE2B e08d78ba44f160ba1903b78b5e85d9237610c81ac9a63c25c7b2c308139b8e18c9041e2c35aaf44eb87017be17f7bb3968798e165c28349703a5306a78999bbd SHA512 b6b477af0ec604e100a67829bc9262a3aa54db9beb644e60a9ae95f916fd641ad7ccaa908fc6458be2eee60ecdb47bda9449720bc078f1c4fe0135fabf0bd9eb
-EBUILD gnome-raw-thumbnailer-3.0.0-r2.ebuild 895 BLAKE2B 4f11e50097b2df64ff1e7f6a5abb4fdee156155817a2a59ca5c95d866d34b9b8bc6af6793261fb7c95586a811f08630b6132735a9f58a846282b56d273cb7938 SHA512 ae3a0350f3671e189e10e43317f17787f55aedba0cef2fe9f00475b116dfba4cf43bd782c8557b549c850c646554c27a96c9fa4e51601eb17f1ac9f805c40845
-MISC metadata.xml 364 BLAKE2B 7214e31fd5d108076a63ad2aaa27eafff46e91ebf543cd3e35fc20fe317d95a1424e8138c23d569d073bb782c630a12dd885ed41d1f0d64fa14c17778fb351d4 SHA512 3a2ee74828178d16b05cab37c6e9c889698f1457e71f5c33a8351a08d18a951a641308ba698bf51c87fbe8a0f08f27f58c58e64a12123472149873c4f72d5703
diff --git a/media-gfx/gnome-raw-thumbnailer/files/gnome-raw-thumbnailer-3.0.0-deprecation-warning.patch b/media-gfx/gnome-raw-thumbnailer/files/gnome-raw-thumbnailer-3.0.0-deprecation-warning.patch
deleted file mode 100644
index 8fddadb435ab..000000000000
--- a/media-gfx/gnome-raw-thumbnailer/files/gnome-raw-thumbnailer-3.0.0-deprecation-warning.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From e769ad77617a3456f0f4aee9418ef6bdbab40403 Mon Sep 17 00:00:00 2001
-From: Anton Keks <anton@codeborne.com>
-Date: Thu, 2 Jan 2014 23:14:55 +0200
-Subject: [PATCH 1/8] fix deprecation warnings
-
----
- src/raw-thumbnailer.c | 11 ++---------
- 1 file changed, 2 insertions(+), 9 deletions(-)
-
-diff --git a/src/raw-thumbnailer.c b/src/raw-thumbnailer.c
-index d638102..b32bc49 100644
---- a/src/raw-thumbnailer.c
-+++ b/src/raw-thumbnailer.c
-@@ -64,7 +64,7 @@ save_pixbuf (GdkPixbuf *pixbuf, const char *path, int size)
-   }
-   else {
-     small = pixbuf;
--    gdk_pixbuf_ref (small);
-+    g_object_ref (small);
-   }
-   
-   a_width = g_strdup_printf ("%d", width);
-@@ -88,14 +88,11 @@ save_pixbuf (GdkPixbuf *pixbuf, const char *path, int size)
-   g_free(a_height);
-   
-   if (small) {
--    gdk_pixbuf_unref (small);
-+    g_object_unref (small);
-   }
-   return;
- }
- 
--
--
--
- static const GOptionEntry entries[] = {
-   { "jpeg", 'j',  0, G_OPTION_ARG_NONE, &jpeg_output, "Output the thumbnail as a JPEG instead of PNG", NULL },
-   { "size", 's', 0, G_OPTION_ARG_INT, &output_size, "Size of the thumbnail in pixels", NULL },
-@@ -107,8 +104,6 @@ static const GOptionEntry entries[] = {
-   { NULL }
- };
- 
--
--
- int main (int argc, char ** argv)
- {
-   const char *output_name;
-@@ -121,7 +116,6 @@ int main (int argc, char ** argv)
-   
-   context = g_option_context_new ("Thumbnail camera RAW files.");
-   g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
--  g_type_init ();
-   
-   if (g_option_context_parse (context, &argc, &argv, &err) == FALSE) {
-     g_print ("couldn't parse command-line options: %s\n", err->message);
-@@ -161,4 +155,3 @@ int main (int argc, char ** argv)
-   return 0;
- }
- 
--
--- 
-2.12.2
-
diff --git a/media-gfx/gnome-raw-thumbnailer/files/gnome-raw-thumbnailer-3.0.0-fix-downscale.patch b/media-gfx/gnome-raw-thumbnailer/files/gnome-raw-thumbnailer-3.0.0-fix-downscale.patch
deleted file mode 100644
index def91cb3fb39..000000000000
--- a/media-gfx/gnome-raw-thumbnailer/files/gnome-raw-thumbnailer-3.0.0-fix-downscale.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 5a03b1a9ffece1d38cc0cf91c599975b9f2b028e Mon Sep 17 00:00:00 2001
-From: Anton Keks <anton@codeborne.com>
-Date: Thu, 2 Jan 2014 23:44:03 +0200
-Subject: [PATCH 1/7] downscale thumbnail if requested size is smaller than it
- is, do not hardcode 128
-
----
- src/raw-thumbnailer.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/raw-thumbnailer.c b/src/raw-thumbnailer.c
-index b32bc49..135dbe3 100644
---- a/src/raw-thumbnailer.c
-+++ b/src/raw-thumbnailer.c
-@@ -47,7 +47,7 @@ save_pixbuf (GdkPixbuf *pixbuf, const char *path, int size)
-   height = gdk_pixbuf_get_height (pixbuf);
-   width = gdk_pixbuf_get_width (pixbuf);
-   
--  if (size <= 128) {
-+  if (size < height || size < width) {
-     int d_width, d_height;
-     
-     if (width > height) {
-@@ -143,7 +143,7 @@ int main (int argc, char ** argv)
-   
-   char* inputfname = g_filename_from_uri (uri, NULL, NULL);
-   g_free(uri);
--  
-+
-   pixbuf = or_gdkpixbuf_extract_rotated_thumbnail(inputfname, output_size);
-   g_free(inputfname);
-   
--- 
-2.12.2
-
diff --git a/media-gfx/gnome-raw-thumbnailer/files/gnome-raw-thumbnailer-3.0.0-libopenraw-0.1.patch b/media-gfx/gnome-raw-thumbnailer/files/gnome-raw-thumbnailer-3.0.0-libopenraw-0.1.patch
deleted file mode 100644
index 50e5433809a0..000000000000
--- a/media-gfx/gnome-raw-thumbnailer/files/gnome-raw-thumbnailer-3.0.0-libopenraw-0.1.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5cc4ad36b9f25f6973ae48166595d201f215a012 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 16 Apr 2017 16:50:00 +0200
-Subject: [PATCH] Update pkgconfig name of libopenraw
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0f637b5..26dbf5a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -22,7 +22,7 @@ PKG_CHECK_MODULES(GNOME, gdk-pixbuf-2.0 gio-2.0 glib-2.0)
- AC_SUBST(GNOME_CFLAGS)
- AC_SUBST(GNOME_LIBS)
- 
--PKG_CHECK_MODULES(OPENRAW, libopenraw-gnome-1.0 >= 0.0.9)
-+PKG_CHECK_MODULES(OPENRAW, libopenraw-gnome-0.1 >= 0.1.0)
- AC_SUBST(OPENRAW_CFLAGS)
- AC_SUBST(OPENRAW_LIBS)
- 
--- 
-2.12.2
-
diff --git a/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r2.ebuild b/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r2.ebuild
deleted file mode 100644
index 45f4ea3f8cc7..000000000000
--- a/media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnome2
-
-MY_P="${PN/gnome-}-${PV}"
-
-DESCRIPTION="A lightweight and fast raw image thumbnailer for GNOME"
-HOMEPAGE="https://libopenraw.pages.freedesktop.org/raw-thumbnailer/"
-SRC_URI="https://libopenraw.freedesktop.org/download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/libopenraw-0.1.0:=[gtk]
-	>=x11-libs/gdk-pixbuf-2:2
-	>=dev-libs/glib-2.26:2
-	!media-gfx/raw-thumbnailer
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-deprecation-warning.patch
-	"${FILESDIR}"/${P}-fix-downscale.patch
-	"${FILESDIR}"/${P}-libopenraw-0.1.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/media-gfx/gnome-raw-thumbnailer/metadata.xml b/media-gfx/gnome-raw-thumbnailer/metadata.xml
deleted file mode 100644
index 5be4d9a9688f..000000000000
--- a/media-gfx/gnome-raw-thumbnailer/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>gnome@gentoo.org</email>
-    <name>Gentoo GNOME Desktop</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="gnome-gitlab">Archive/gnome-raw-thumbnailer</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/media-gfx/mypaint-brushes/Manifest b/media-gfx/mypaint-brushes/Manifest
index d609643c8d85..8dd24e10a201 100644
--- a/media-gfx/mypaint-brushes/Manifest
+++ b/media-gfx/mypaint-brushes/Manifest
@@ -1,3 +1,3 @@
 DIST mypaint-brushes-2.0.2.tar.xz 1522216 BLAKE2B ba274d9abcac51bba3b8e7d4489893eef62e2b35ee8d0607d476d022150d92944693cae6d1ddb9f4f9b01f229f050f4ccf7416a0ef0fe27e9e0f5e84a4e2c56f SHA512 bae870e930381b818165e5e39d38b25782d5744c9a507a71dab37ae7ca2d4502896057f919a16eb9305d803a01db3a948a735d5c5b850893997a9afd6403144b
-EBUILD mypaint-brushes-2.0.2-r1.ebuild 500 BLAKE2B 624d6859923d0aec28910979c48347619abfb8e82b59d1e88fa4148e0aa35d2cc657a7df996936b65a300252918a50ed0f387a01995558b57b5a634ec572a8dc SHA512 efa3635e18048aa02a1b33abef6a9a1a25ae2d9a9cf1f7945907a4c94d1d7e709795bc96e598ce279debdf47deddf025e2d4bde63c30005d980421b0e49ed4be
+EBUILD mypaint-brushes-2.0.2-r1.ebuild 507 BLAKE2B 5d4fa4645221b2adeea62343cb90d4480197b60ef0599b843285f6ecfd8b30ad9d36df9909ae5d865aaa8c8db74517eabbf1801daabcdad7c3dbeccc74a3d4d1 SHA512 a0d672a106eda28524aef40e4a4278d0ab8c201415091d07c1bfe5c3738c678112dbec3e3c8d711995a543d4f7e6a7f74ce841c272e807d37be14120603f98bf
 MISC metadata.xml 352 BLAKE2B 2ab3826fec46744aceb8210d0892c4d928cb818db4bd2704c156ca74c4c85bc8778e8212ae07010a0f87876b9448bae139f988465b9b5f2e50f62061c860d31d SHA512 bf153d124d449c2b4e870b2aad73ab45708f622c09d37a42975dfa5e1c42005009bf6c0d361bc03cab7fee76ba0a811877a7518cc6b84cfe1fc941e9a41c2921
diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2-r1.ebuild b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2-r1.ebuild
index 64652b5f63be..0b8ac9f4982c 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2-r1.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mypaint/mypaint-brushes/releases/download/v${PV}/${P
 
 LICENSE="CC0-1.0"
 SLOT="2.0" # due to pkgconfig name "mypaint-brushes-2.0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv x86"
 
 src_prepare() {
 	default
diff --git a/media-gfx/tgif/Manifest b/media-gfx/tgif/Manifest
index 4967f1c2dd6a..96cafabd4848 100644
--- a/media-gfx/tgif/Manifest
+++ b/media-gfx/tgif/Manifest
@@ -1,4 +1,5 @@
+AUX tgif-4.2.5-implicit-int.patch 5730 BLAKE2B 52d364f7af5df7d7cc4365320cbedc5405a96b2bd9072a3f516c00544035080412fa669e3a4a3ee168c170e54aaa48a671c11c2ac11b1ec5d94f244941adc2b6 SHA512 0f87964fa5a885dffcdd30a406b1310db8b8813054abe8b507fbfe497843ccc26769e8721904d1a28dee45e47f6db847832fd133ed4b59c04b9adc8759fe8147
 AUX tgif-4.2.5-wformat-security.patch 19741 BLAKE2B 53633a5012d4f49bb42654c8237c4bee08fcac5525a69b0967f3fb2a7bdfe58d6a402f74d2af5505d876e9acfa1b3014ac1e7261b00f027b0e5b15c609ada0a8 SHA512 881ef034698a0e632c257a185346cb22218b93f8668fabf0169cb1a6c59ce0ad7a81ab5e4093610a3cbd360304a007067862d672622bed7a852db93f584d3d7f
 DIST tgif-QPL-4.2.5.tar.gz 3093619 BLAKE2B 8d858c357a7c51185ee22f0e2005bd4a7c96270c701bf603fd7e6bea012794892e460d5e9dfbfdbbc17a3e6accb5f4afbc3baadc4e3315e6dd5b4e676f1ce5bf SHA512 7b007620190883e30216407bf31c4142493bbd270b4babc282994dec37d221d79f0b1cadc9efda9bc337eb323254e69beee2d4c4873877e7321df41922f456ef
-EBUILD tgif-4.2.5-r2.ebuild 913 BLAKE2B 36527a99c24ad76444424449f7474266d6c7c817740156a0507e994b736a03ebdaf9cb914fefa472f9977701af3bd025efbb784e8c993cd455359dead787a191 SHA512 260b5e4dec1f33a1cf3d01769fd052efeb25c4f226027429c363aea40f54004396a3effa1117ce04ce02e40a7c89661d53acb0669fcb50b99e8d1d397d6667f1
+EBUILD tgif-4.2.5-r3.ebuild 1021 BLAKE2B 5e3d4b2c13ae9b065a67d8d6feff4248382fe7b565e287497f8f18c4ee93e5be9fe23359f340507a6d7c77c9aed234f294a0278652fd10caff72660db184b688 SHA512 9e3e648b2fe9f44fcf8f35126c603a1b77791a01a2c1bd1a17049f53ece0798d325f1485661d296475c6effda54b847f51bff89f240f446c4dfd5c6903926cc8
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/media-gfx/tgif/files/tgif-4.2.5-implicit-int.patch b/media-gfx/tgif/files/tgif-4.2.5-implicit-int.patch
new file mode 100644
index 000000000000..60a0ca2175ad
--- /dev/null
+++ b/media-gfx/tgif/files/tgif-4.2.5-implicit-int.patch
@@ -0,0 +1,153 @@
+https://bugs.gentoo.org/881325
+https://bugzilla.redhat.com/show_bug.cgi?id=2148487
+https://src.fedoraproject.org/rpms/tgif/blob/ba3fa76ca8fde5c83569a703b849c8921923712f/f/tgif-c99.patch
+--- a/exec.c
++++ b/exec.c
+@@ -518,6 +518,7 @@ int AppendToTmpStr(psz)
+ 
+ int AppendToTmpStr2(psz1, psz2, tg2)
+    char *psz1, *psz2;
++   int tg2;
+ {
+    int len1=strlen(psz1), len2=strlen(psz2), rc=0;
+    char *psz=(char*)malloc((len1+len2+1)*sizeof(char));
+--- a/file.c
++++ b/file.c
+@@ -4725,6 +4725,7 @@ int LoadFile(FullName, ObjFile, GzippedObjFile)
+    int ObjFile; /* equals TRUE if the file is an OBJ file */
+                 /* equals FALSE if the file is a SYM or PIN file */
+                 /* equals -1 if the file is an temporary OBJ file */
++   int GzippedObjFile;
+ {
+    struct ObjRec *obj_ptr=NULL;
+    char tmp_filename[MAXPATHLENGTH+1], tmp_filefullpath[MAXPATHLENGTH+1];
+--- a/import.c
++++ b/import.c
+@@ -1373,7 +1373,7 @@ int ConvertGifToPpm6(pszGifPath, pszPpm6Path, ppm6_path_sz)
+ static
+ int FinishImport(remote_file, remote_tmp_fname, local_fname, which, pn_image_w,
+       pn_image_h)
+-   int remote_file, *pn_image_w, *pn_image_h;
++   int remote_file, which, *pn_image_w, *pn_image_h;
+    char *remote_tmp_fname, *local_fname;
+ {
+    char xpm_fname[MAXPATHLENGTH+1], *rest=NULL, *psz_format=NULL;
+--- a/polygon.c
++++ b/polygon.c
+@@ -1007,7 +1007,7 @@ void ContinueForStructSplinePolygonControlPoints(OrigX, OrigY, LastX, LastY,
+ static
+ void EraseStructSplineLinesForContAndUpdateSvs(OrigX, OrigY, grid_x, grid_y,
+       pev, num_pts, psv, sn, psv2, sn2, pipt_prev, pipt_first)
+-   int OrigX, OrigY, grid_x, grid_y, sn, sn2;
++   int OrigX, OrigY, grid_x, grid_y, num_pts, sn, sn2;
+    XEvent *pev;
+    XPoint **psv, **psv2;
+    IntPointTriplet *pipt_prev, *pipt_first;
+--- a/rect.c
++++ b/rect.c
+@@ -37,7 +37,7 @@
+ 
+ void DumpRectPath(FP, LtX, LtY, RbX, RbY, Indent, LastLF)
+    FILE *FP;
+-   int LtX, LtY, RbX, RbY, Indent;
++   int LtX, LtY, RbX, RbY, Indent, LastLF;
+ {
+    register int i;
+ 
+--- a/ruler.c
++++ b/ruler.c
+@@ -510,6 +510,7 @@ void DrawHRuleTick(XOff)
+ 
+ static
+ void DrawVRuleTick(YOff)
++    int YOff;
+ {
+    XDrawLine(mainDisplay, vRuleWindow, revDefaultGC, 0, YOff, rulerLen, YOff);
+ }
+--- a/scroll.c
++++ b/scroll.c
+@@ -153,7 +153,8 @@ int TgPressButtonLoop(dpy, win, pbbox, psbci)
+ 
+ int TgGetScrollHit(x, y, orientation, scroll_area_w, scroll_area_h,
+       start_frac, length, total, pn_btn_offset)
+-   int x, y, scroll_area_w, scroll_area_h, length, total, *pn_btn_offset;
++   int x, y, orientation, scroll_area_w, scroll_area_h, length, total,
++   	*pn_btn_offset;
+    double start_frac;
+ {
+    int block_start=0, block_size=0, min_block_size=1+(windowPadding<<1);
+@@ -211,7 +212,7 @@ void TgDrawScrollBar(dpy, win, orientation, x_off, y_off, scroll_area_w,
+       scroll_area_h, start_frac, length, total)
+    Display *dpy;
+    Window win;
+-   int x_off, y_off, scroll_area_w, scroll_area_h, length, total;
++   int orientation, x_off, y_off, scroll_area_w, scroll_area_h, length, total;
+    double start_frac;
+ {
+    int block_start=0, block_size=0, min_block_size=1+(windowPadding<<1);
+--- a/spline.c
++++ b/spline.c
+@@ -795,7 +795,7 @@ typedef struct MultiSplineRec {
+ } *MultiSplineRecPtr;
+ 
+ XPoint *MakeMultiSplinePolyVertex(Curved, N, Smooth, XOff, YOff, NumVs, Vs)
+-   int *N, XOff, YOff, NumVs;
++   int Curved, *N, XOff, YOff, NumVs;
+    char *Smooth;
+    IntPoint *Vs;
+ {
+--- a/stretch.c
++++ b/stretch.c
+@@ -4247,7 +4247,7 @@ void SizeAnObj(ObjPtr, TopOwner, AbsW, AbsH)
+ 
+ static
+ void DoSizeAllSelToGivenWidthHeight(abs_w, abs_h, do_width, do_height)
+-   int abs_h, do_width, do_height;
++   int abs_w, abs_h, do_width, do_height;
+ {
+    struct SelRec *saved_top_sel=topSel, *saved_bot_sel=botSel, *sel_ptr=NULL;
+    int saved_h_align=horiAlign, saved_v_align=vertAlign, num_to_resize=0;
+--- a/tdgtbtn.c
++++ b/tdgtbtn.c
+@@ -491,7 +491,7 @@ TdgtBtn *CreateTdgtBtn(parent_win, parent_tidgetinfo, ctl_id, x, y, w, h, h_pad,
+       v_pad, btn_type, btn_style, state, font_style, str, pmosi)
+    Window parent_win;
+    TidgetInfo *parent_tidgetinfo;
+-   int ctl_id, x, y, w, h, h_pad, v_pad, state, font_style;
++   int ctl_id, x, y, w, h, h_pad, v_pad, btn_type, btn_style, state, font_style;
+    char *str;
+    MouseOverStatusInfo *pmosi;
+ {
+--- a/tdgtlist.c
++++ b/tdgtlist.c
+@@ -1039,7 +1039,8 @@ TdgtList *CreateTdgtList(parent_win, parent_tidgetinfo, ctl_id, x, y, w, h_pad,
+       v_pad, num_visible_lines, can_select, multicolor, auto_scroll_on_insert)
+    Window parent_win;
+    TidgetInfo *parent_tidgetinfo;
+-   int ctl_id, x, y, w, h_pad, v_pad, num_visible_lines, auto_scroll_on_insert;
++   int ctl_id, x, y, w, h_pad, v_pad, num_visible_lines, can_select,
++   	multicolor, auto_scroll_on_insert;
+ {
+    int bg_pixel=(threeDLook ? myLtGryPixel : myBgPixel), h=0, content_h=0;
+    TdgtList *pTdgtList=NULL;
+--- a/text.c
++++ b/text.c
+@@ -2059,7 +2059,7 @@ void HandleClickOnText(drag, from_cursor_keys, x_off, y_off,
+       pressed_in_same_text, obj_ptr, double_clicked, saved_text_highlight,
+       skip_post_processing, click_time)
+    int drag, from_cursor_keys, x_off, y_off, pressed_in_same_text;
+-   int double_clicked, saved_text_highlight;
++   int double_clicked, saved_text_highlight, skip_post_processing;
+    struct ObjRec *obj_ptr;
+    Time click_time;
+ {
+@@ -4760,7 +4760,7 @@ int ReadTextLines(FP, ObjPtr, text_ptr, color_str, num_lines, has_ps_bitmap,
+    char *color_str;
+    int num_lines, has_ps_bitmap, cur_sb_font, cur_db_font;
+    int double_byte, db_mod_bytes, db_vertical, direction;
+-   int x, baseline_y, *pn_max_len, *pn_max_h;
++   int x, baseline_y, text_w, *pn_max_len, *pn_max_h;
+    /*
+     * (Note: text_w is only used for fileVersion <= 36)
+     */
+
diff --git a/media-gfx/tgif/tgif-4.2.5-r2.ebuild b/media-gfx/tgif/tgif-4.2.5-r3.ebuild
index 8bed92678866..64fe95e20c46 100644
--- a/media-gfx/tgif/tgif-4.2.5-r2.ebuild
+++ b/media-gfx/tgif/tgif-4.2.5-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools flag-o-matic
 
@@ -10,36 +10,46 @@ MY_P="${PN}-QPL-${PV}"
 DESCRIPTION="Xlib base 2-D drawing facility under X11"
 HOMEPAGE="http://bourbon.usc.edu/tgif/index.html"
 SRC_URI="ftp://bourbon.usc.edu/pub/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="QPL-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
-DEPEND="sys-libs/zlib
+DEPEND="
+	sys-libs/zlib
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXmu
-	x11-libs/libXt"
-RDEPEND="${DEPEND}
-	media-libs/netpbm"
+	x11-libs/libXt
+"
+RDEPEND="
+	${DEPEND}
+	media-libs/netpbm
+"
 
 PATCHES=(
 	"${FILESDIR}/${P}-wformat-security.patch"
+	"${FILESDIR}/${P}-implicit-int.patch"
 )
 
-S="${WORKDIR}/${MY_P}"
-
 src_prepare() {
+	default
+
 	sed -i \
 		-e 's/^CFLAGS=/CFLAGS+=/' \
 		-e 's:^TGIFDIR.*:TGIFDIR = $(datadir)/tgif:' \
 		Makefile.am || die 'sed on Makefile.am failed'
 
+	eautoreconf
+}
+
+src_configure() {
+	# bug #881325
+	append-cflags -std=gnu89
 	append-cppflags -D_DONT_USE_MKTEMP -DHAS_STREAMS_SUPPORT
 
 	default
-	eautoreconf
 }