Adding metadata

12 files changed, 486 insertions, 88 deletions

diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index e8e22dddf7a8..2f75f00a8f39 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -1 +1,2 @@
 DIST asymptote-3.06.src.tgz 41459813 BLAKE2B 22fb641398522e6e16697048d34b7c1b75eaa3e47f56f648ab2eaaa886806715026d7af535901637f8bfbf0f8e9aab2d56897db74dd43a87025ad696525cabec SHA512 d0dfc3ecefe9b46a52c194cf80e2efe36845cce67e3bad7eee6b30e00629145cbefbdfabab6a6950e1a711eb801c7a815491b6755b2714722f030b58bec44e2e
+DIST asymptote-3.10.src.tgz 26724037 BLAKE2B a2409c9ca2069c4928070b1d62899d3c4d2f87ca621db8072298560a9436d08097fb45a8adf674801dbc24c4a733b902c7f1bed7287e8a5367082b58c7b7f8bf SHA512 6db6a0689703a1d8cc211666f657501d302dd0cf1a9fb7f86c61903cde2f549347dde6f34a1bd873b52061f313fb6a100396cc7f09a5e6a5285201d6922a014a
diff --git a/media-gfx/asymptote/asymptote-3.10.ebuild b/media-gfx/asymptote/asymptote-3.10.ebuild
new file mode 100644
index 000000000000..916a70e44973
--- /dev/null
+++ b/media-gfx/asymptote/asymptote-3.10.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+# latex-package does not support EAPI 9
+
+PYTHON_COMPAT=( python3_{10..14} )
+inherit autotools elisp-common latex-package python-r1
+
+DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
+HOMEPAGE="https://asymptote.sourceforge.io/ https://github.com/vectorgraphics/asymptote/"
+SRC_URI="https://downloads.sourceforge.net/asymptote/${P}.src.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+IUSE="context curl doc emacs examples fftw gsl gui +imagemagick latex lsp +opengl python sigsegv svg test vim-syntax"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.4-r5:0=
+	>=sys-libs/readline-4.3-r5:0=
+	net-libs/libtirpc:=
+	imagemagick? ( media-gfx/imagemagick[png] )
+	opengl? ( media-libs/mesa[X] media-libs/freeglut media-libs/glew:0 media-libs/glm )
+	svg? ( app-text/dvisvgm )
+	sigsegv? ( dev-libs/libsigsegv )
+	fftw? ( >=sci-libs/fftw-3.0.1:= )
+	gsl? ( sci-libs/gsl:= )
+	python? ( ${PYTHON_DEPS} )
+	curl? ( net-misc/curl )
+	lsp? (
+		dev-libs/boost
+		dev-libs/rapidjson
+		dev-libs/utfcpp
+	)
+	gui? (
+		${PYTHON_DEPS}
+		dev-python/pyside[${PYTHON_USEDEP},gui,widgets,svg]
+		dev-python/cson
+		dev-python/numpy
+		>=gnome-base/librsvg-2.40
+	)
+	latex? (
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+	)
+	context? ( dev-texlive/texlive-context )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+DEPEND="${RDEPEND}
+	gui? ( dev-python/pyside[${PYTHON_USEDEP},tools] )
+	doc? (
+		media-gfx/imagemagick[png]
+		virtual/texi2dvi
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		app-text/ghostscript-gpl )
+	test? ( app-text/ghostscript-gpl )"
+
+TEXMF=/usr/share/texmf-site
+
+PATCHES=(
+	# Changing pdf, ps, image viewers to xdg-open
+	"${FILESDIR}/${PN}-2.92-xdg-utils.patch"
+
+	# Bug #322473
+	"${FILESDIR}/${PN}-2.70-info.patch"
+)
+
+src_prepare() {
+	sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \
+		-i configure.ac \
+		|| die "sed configure.ac failed"
+
+	default
+	eautoreconf
+	pushd gc > /dev/null || die "pushd gc failed"
+	eautoreconf
+	popd > /dev/null || die
+}
+
+src_configure() {
+	# for the CPPFLAGS see
+	# https://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349
+	econf \
+		CPPFLAGS=-DHAVE_SYS_TYPES_H \
+		CFLAGS="${CXXFLAGS}" \
+		--disable-gc-debug \
+		--disable-gc-full-debug \
+		--with-latex=/usr/share/texmf-site/tex/latex \
+		--with-context=/usr/share/texmf-site/tex/context \
+		--disable-offscreen \
+		$(use_enable curl) \
+		$(use_enable lsp) \
+		$(use_enable fftw) \
+		$(use_enable gsl) \
+		$(use_enable opengl gl) \
+		$(use_enable sigsegv)
+	pushd gc > /dev/null || die "pushd gc failed"
+	econf
+	popd > /dev/null || die
+}
+
+src_compile() {
+	addpredict /proc # for /proc/*/clear_refs
+	default
+
+	emake doc/version.texi
+	cd doc || die
+	emake asy.1
+	einfo "Making info"
+	emake ${PN}.info
+	if use doc; then
+		cd FAQ || die
+		emake
+		cd .. || die
+		# pdf
+		einfo "Making pdf docs"
+		export VARTEXFONTS="${T}"/fonts
+		# see bug #260606
+		emake -j1 asymptote.pdf
+		emake CAD.pdf asy-latex.pdf asyRefCard.pdf
+	fi
+	cd .. || die
+
+	if use emacs; then
+		einfo "Compiling emacs lisp files"
+		elisp-compile base/*.el
+	fi
+}
+
+src_install() {
+	# the program
+	dobin asy
+
+	# .asy files
+	insinto /usr/share/${PN}
+	doins -r base/*.asy base/*.js base/*.sh base/*.ps base/shaders base/webgl
+	chmod 755 "${D}"/usr/share/${PN}/shaders/*
+
+	# documentation
+	dodoc README
+	cd doc || die
+	doman asy.1
+	doinfo ${PN}.info
+	if use doc; then
+		dodoc FAQ/asy-faq.ascii
+		dodoc CAD.pdf asy-latex.pdf asyRefCard.pdf asymptote.pdf
+	fi
+	cd .. || die
+
+	# asymptote.py
+	if use python; then
+		python_moduleinto ${PN}
+		python_foreach_impl python_domodule base/${PN}.py
+	fi
+
+	# gui
+	if use gui; then
+		cd GUI || die
+		python_setup
+		sed -e 1d -i xasy.py
+		echo "#!/usr/bin/env ${EPYTHON}" > xasy1
+		cat xasy1 xasy.py > xasy
+		rm xasy1 xasy.py
+		mv xasy xasy.py
+		cd .. || die
+		python_moduleinto ${PN}
+		python_domodule GUI
+		chmod 755 "${D}/$(python_get_sitedir)/${PN}/GUI/xasy.py"
+		dosym "$(python_get_sitedir)/${PN}/GUI/xasy.py" /usr/bin/xasy
+		doman doc/xasy.1x
+	fi
+
+	# examples
+	if use examples; then
+		docinto examples
+		dodoc \
+			examples/*.asy \
+			examples/*.views \
+			examples/*.dat \
+			examples/*.bib \
+			examples/*.png \
+			examples/*.pdb1 \
+			doc/*.asy \
+			doc/*.csv \
+			doc/*.dat \
+			doc/pixel.pdf \
+			doc/extra/*.asy
+		docinto examples/animations
+		cd examples/animations || die
+		dodoc *.asy *.u3d
+		cd ../.. || die
+	fi
+
+	# LaTeX style
+	if use latex; then
+		cd doc || die
+		insinto "${TEXMF}"/tex/latex/${PN}
+		doins *.sty latexmkrc
+		if use examples; then
+			docinto examples
+			dodoc latexusage.tex externalprc.tex
+			docinto examples/animations
+			dodoc ../examples/animations/*.tex
+		fi
+		cd .. || die
+	fi
+
+	# ConTeXt
+	if use context; then
+		insinto /usr/share/texmf-site/tex/context
+		doins doc/colo-asy.tex
+	fi
+
+	# emacs mode
+	if use emacs; then
+		elisp-install ${PN} base/*.el base/*.elc
+		elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
+	fi
+
+	# vim syntax
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins base/asy.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins base/asy_filetype.vim
+	fi
+}
+
+pkg_postinst() {
+	use latex && latex-package_rehash
+	use emacs && elisp-site-regen
+
+	elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer'
+	elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer'
+}
+
+pkg_postrm() {
+	use latex && latex-package_rehash
+	use emacs && elisp-site-regen
+}
diff --git a/media-gfx/inkscape/files/inkscape-1.4.4-poppler-26.05.patch b/media-gfx/inkscape/files/inkscape-1.4.4-poppler-26.05.patch
new file mode 100644
index 000000000000..182a2380ee20
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-1.4.4-poppler-26.05.patch
@@ -0,0 +1,71 @@
+From 1e98c3da1eec9d608f09132d641f5e817a8bf4b1 Mon Sep 17 00:00:00 2001
+From: Varasina Farmadani <sina@sinanonym.my.id>
+Date: Mon, 11 May 2026 02:29:05 +0700
+Subject: [PATCH] fix: support for popler >= 26.05 font encoding change
+
+Poppler version 26.05.0 changed the return type of
+gfx8bit->getEncoding() from char** to const std::array<const char*,256>&.
+this caused a compilation error due to type incompatibility:
+    error: assigning to 'char **' from incompatible type 'const std::array<const char *, 256>
+    error: no viable conversion from 'const std::array<const char *, 256>' to 'char **'
+
+Commented out the duplicate resize() line - dilfridge@gentoo.org
+
+---
+ .../pdfinput/poppler-cairo-font-engine.cpp        | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/src/extension/internal/pdfinput/poppler-cairo-font-engine.cpp b/src/extension/internal/pdfinput/poppler-cairo-font-engine.cpp
+index a022ce63c8..cb339a3009 100644
+--- a/src/extension/internal/pdfinput/poppler-cairo-font-engine.cpp
++++ b/src/extension/internal/pdfinput/poppler-cairo-font-engine.cpp
+@@ -314,7 +314,11 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref, FT_Li
+ #else
+     GfxFontLoc *fontLoc;
+ #endif
++#if POPPLER_CHECK_VERSION(26, 5, 0)
++    const char * const *enc;
++#else
+     char **enc;
++#endif
+     const char *name;
+ #if POPPLER_CHECK_VERSION(25, 7, 0)
+     std::unique_ptr<FoFiType1C> ff1c;
+@@ -386,8 +390,13 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref, FT_Li
+                 goto err2;
+             }
+ 
++#if POPPLER_CHECK_VERSION(26, 5, 0)
++            enc = gfx8bit->getEncoding().data();
++#else
+             enc = gfx8bit->getEncoding();
++#endif
+ 
++        // codeToGID.resize(256);
+             codeToGID.resize(256);
+             for (i = 0; i < 256; ++i) {
+                 codeToGID[i] = 0;
+@@ -678,7 +687,7 @@ CairoType3Font *CairoType3Font::create(GfxFont *gfxFont, PDFDoc *doc, CairoFontE
+ #endif
+ 
+     std::vector<int> codeToGID;
+-    char *name;
++    const char *name;
+ 
+     Dict *charProcs = gfx8bit->getCharProcs();
+     Ref ref = *gfxFont->getID();
+@@ -695,7 +704,11 @@ CairoType3Font *CairoType3Font::create(GfxFont *gfxFont, PDFDoc *doc, CairoFontE
+ 
+     cairo_font_face_set_user_data(font_face, &type3_font_key, (void *)info, _free_type3_font_info);
+ 
++#if POPPLER_CHECK_VERSION(26, 5, 0)
++    const char * const *enc = gfx8bit->getEncoding().data();
++#else
+     char **enc = gfx8bit->getEncoding();
++#endif
+     codeToGID.resize(256);
+     for (int i = 0; i < 256; ++i) {
+         codeToGID[i] = 0;
+-- 
+GitLab
+
diff --git a/media-gfx/inkscape/inkscape-1.4.4.ebuild b/media-gfx/inkscape/inkscape-1.4.4.ebuild
index 3321365c4fc7..e5ba7d56fcb4 100644
--- a/media-gfx/inkscape/inkscape-1.4.4.ebuild
+++ b/media-gfx/inkscape/inkscape-1.4.4.ebuild
@@ -115,6 +115,7 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4.3-libcroco-cmake-minreqver-3.12.patch # bug 965915
 	"${FILESDIR}"/${PN}-1.4.4-respect-EPYTHON.patch # bug 924747
+	"${FILESDIR}"/${PN}-1.4.4-poppler-26.05.patch   # bug 974462
 )
 
 pkg_pretend() {
diff --git a/media-gfx/tuxpaint-stamps/Manifest b/media-gfx/tuxpaint-stamps/Manifest
index 0b8f42a84756..fe0041d231d1 100644
--- a/media-gfx/tuxpaint-stamps/Manifest
+++ b/media-gfx/tuxpaint-stamps/Manifest
@@ -1,4 +1,2 @@
-DIST tuxpaint-stamps-2009.06.28.tar.gz 48273629 BLAKE2B a9c11b846d60bb4de5bfaa721a24254fb6510bfddeca54f398ebf941f2fd74f546eaf3cdf7cd65932835e2e72993d6627f6247c7dc4a4488d2d2b2174c04455a SHA512 ca059275484bec045c4f2bad414ea5359d2a8812cc1c8d1e11ad8f3b7e63e107c1fccc347291ffe95d81a5192b39198c56d319ef6a0f475fb128d9a2d0e5e027
-DIST tuxpaint-stamps-2021.11.25.tar.gz 193603076 BLAKE2B 16cf8e9792261608bb77fdb97ba9828671a44b6ba939c5644e9d1c256bc2f9055becf70a336a8acd8b5b8f5e07d1f51a3a39eb7aeb267450ac6d848a500cbb0e SHA512 db353ad0635a0f06960d0ec0c1eabda26bffa4672e5c56099ed02c2db9e109b4dbdd17327eadce8a1779b5d0fe51503988b56dafd4e47e9ad4f978e2a7ba2c10
-DIST tuxpaint-stamps-2022.06.04.tar.gz 215615180 BLAKE2B a01428a1bbb0acc623f533bd2ae36527740e7a8032d5576109c36d4f8c8d3d7d1e9ed8ceaa8f9a3e15f7f932634033bee7c6336184727a3afdafb6bb8eb93731 SHA512 a02b4265b436fb48dd1e06e57c238c78f90a4894691795772a93ffb2287ee6c608e1fb75ff93527d29c73aea1a10ecb3c8acf9e1325ff01aecc443bd01fa6bb8
 DIST tuxpaint-stamps-2023.04.02.tar.gz 221833740 BLAKE2B cf7e2976e2906d1598edf311d7353ae8856a308041d0353d5c35aa391f365bb823db2685af2d84057eb19b40e2a395788a60c02e5c96ce4b89669403439d30b1 SHA512 57ebc9ffbbd087ec191bfcdbb09fdecc9b2f7167393aeeecae85ca90ca9b14de44c0a1677bcd57945cf00a8dc413ed908c80f933e151ffb6acd1a849ed7dc222
+DIST tuxpaint-stamps-2024.10.25.tar.gz 93171315 BLAKE2B c5cbb79c02b3d3f342f8734e2c00437805d56b5b5c5610f9019de32ac5c02267bf01d25526ae2c67d83533186d6f226c0f54a50473bf1af1ce56288b125b6379 SHA512 a99bfcc094ef7594958034dbacfb92391d44b34d77090829098fae2c62406d68b04ba4cd71ad2af86e4ed7b7d0f46773415cf941c7fdf3e4ccd43ee131e5e4b5
diff --git a/media-gfx/tuxpaint-stamps/files/tuxpaint-stamps-20090628-make-382.patch b/media-gfx/tuxpaint-stamps/files/tuxpaint-stamps-20090628-make-382.patch
deleted file mode 100644
index e3a595df5f4b..000000000000
--- a/media-gfx/tuxpaint-stamps/files/tuxpaint-stamps-20090628-make-382.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.gentoo.org/334569
-
---- a/Makefile
-+++ b/Makefile
-@@ -79,9 +79,7 @@
- 	@rm -rf "build/tuxpaint-stamps-$(VER_DATE)" "build/tuxpaint-stamps-$(VER_DATE).tar.gz"
- 	@-if [ -d build ] ; then rmdir build ; fi
- 
--releasedir: build/tuxpaint-stamps-$(VER_DATE)
--
--build/tuxpaint-stamps-$(VER_DATE):
-+releasedir:
- 	@echo
- 	@echo "Creating release directory"
- 	@echo
diff --git a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20090628-r1.ebuild b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20090628-r1.ebuild
deleted file mode 100644
index 77e7bbc0e46b..000000000000
--- a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20090628-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P=${PN}-${PV:0:4}.${PV:4:2}.${PV:6:2}
-
-DESCRIPTION="Set of 'Rubber Stamp' images which can be used within Tux Paint"
-HOMEPAGE="http://www.tuxpaint.org/"
-SRC_URI="https://downloads.sourceforge.net/tuxpaint/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="media-gfx/tuxpaint"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${P}-make-382.patch
-}
-
-src_install() {
-	emake PREFIX="${D}/usr" install-all
-
-	rm -f docs/COPYING.txt || die
-	dodoc docs/*.txt
-}
diff --git a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild
deleted file mode 100644
index 927e0bd4c4a5..000000000000
--- a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P=${PN}-${PV:0:4}.${PV:4:2}.${PV:6:2}
-
-DESCRIPTION="Set of 'Rubber Stamp' images which can be used within Tux Paint"
-HOMEPAGE="http://www.tuxpaint.org/"
-SRC_URI="https://downloads.sourceforge.net/tuxpaint/${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="media-gfx/tuxpaint"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-make-382.patch
-)
-
-src_install() {
-	emake PREFIX="${D}/usr" install-all
-
-	rm -f docs/COPYING.txt || die
-	dodoc docs/*.txt
-}
diff --git a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20220604.ebuild b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20241025.ebuild
index 0cf7868ad5bf..fdb6d94a5751 100644
--- a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20220604.ebuild
+++ b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20241025.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="media-gfx/tuxpaint"
 DEPEND="${RDEPEND}"
@@ -24,6 +24,6 @@ PATCHES=(
 src_install() {
 	emake PREFIX="${D}/usr" install-all
 
-	rm docs/COPYING.txt || die
+	rm docs/COPYING.txt || die "Failed to rm docs/COPYING.txt"
 	dodoc docs/*.txt
 }
diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index 5a7935a9caa0..d8f889f152ed 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -1 +1,2 @@
 DIST tuxpaint-0.9.31.tar.gz 21733142 BLAKE2B 00041eacd062ac4e535451d4b4a6ac6d92fb7a0b6328dad4c7424b1bf0b95f0d3d2915e5ed7392cbf2f36174e56ceff5fadcf795c3368b3f2a958d794ce0b66a SHA512 7a3df8dce3e354cc22af34d55546de6e033e8ed4f44530b89986c3e1a07961e5e1a132f12f2d3fc5b699c500e7b9e7ab3503d2bafc5041d9fb2dbc8d1479b79f
+DIST tuxpaint-0.9.35.tar.gz 25674042 BLAKE2B f0e307eafaef447b99c54dadeb9ec6f9df52b2e8407cce8453b7551275a7d5ff2c56611ec91326d307fd9dfe53a2a121b11d9134d93be2c442fb1ce45d94a7b4 SHA512 20c1f4dc6e9d5e007a140977c6e92299c3d5bf1a62bda07b0cc54c399bb8e7d8273d627426e9abba4014d2e8b2d9e72d4549b396f2740a34c84582ed0efe4f45
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.35-Makefile.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.35-Makefile.patch
new file mode 100644
index 000000000000..197f8bd579cd
--- /dev/null
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.35-Makefile.patch
@@ -0,0 +1,156 @@
+# Replace "lib" with GENTOO_LIBDIR, remove .gz suffixes and
+# replace ImageMagick calls by GraphicsMagick calls.
+--- a/Makefile
++++ b/Makefile
+@@ -126,7 +126,7 @@ ifdef HOST
+     # We set PKG_CONFIG_LIBDIR instead of PKG_CONFIG_PATH because we want to
+     # *change* where pkg-config looks for .pc files instead of adding to the
+     # default path which may have libraries that aren't for HOST.
+-    export PKG_CONFIG_LIBDIR:=$(HOSTROOT)/lib/pkgconfig
++    export PKG_CONFIG_LIBDIR:=$(HOSTROOT)/$(GENTOO_LIBDIR)/pkgconfig
+   endif
+ endif
+ 
+@@ -198,7 +198,7 @@ os2_ARCH_CFLAGS:=
+ macos_ARCH_CFLAGS:=-isysroot $(SDKROOT) -I$(SDKROOT)/usr/include -I$(HOSTROOT)/include -mmacosx-version-min=$(MINVER) -arch $(subst $() $(), -arch ,$(ARCHS)) -w -headerpad_max_install_names -DHAVE_STRCASESTR
+ ios_ARCH_CFLAGS:=-isysroot $(SDKROOT) -I$(SDKROOT)/usr/include -I$(HOSTROOT)/include $(MINVEROPT) -arch $(subst $() $(), -arch ,$(ARCHS)) -w -fPIC -DHAVE_STRCASESTR -DUNLINK_ONLY
+ beos_ARCH_CFLAGS:=
+-linux_ARCH_CFLAGS:=
++linux_ARCH_CFLAGS:=${CFLAGS}
+ netbsd_ARCH_CFLAGS:=-DHAVE_STRCASESTR
+ ARCH_CFLAGS:=$($(OS)_ARCH_CFLAGS)
+ 
+@@ -207,7 +207,7 @@ os2_ARCH_LDFLAGS:=-Zomf -Zmap -Zargs-wild -D__ST_MT_ERRNO__
+ macos_ARCH_LDFLAGS:=-isysroot $(SDKROOT) -L$(HOSTROOT)/lib -mmacosx-version-min=$(MINVER) -arch $(subst $() $(), -arch ,$(ARCHS))
+ ios_ARCH_LDFLAGS:=-isysroot $(SDKROOT) -L$(HOSTROOT)/lib $(MINVEROPT) -arch $(subst $() $(), -arch ,$(ARCHS))
+ beos_ARCH_LDFLAGS:=
+-linux_ARCH_LDFLAGS:=
++linux_ARCH_LDFLAGS:=${LDFLAGS}
+ netbsd_ARCH_LDFLAGS:=
+ ARCH_LDFLAGS:=$($(OS)_ARCH_LDFLAGS)
+ 
+@@ -250,7 +250,7 @@ windows_PREFIX:=/usr/local
+ os2_PREFIX:=c:/extras/tuxpaint
+ macos_PREFIX:=Resources
+ ios_PREFIX:=.
+-linux_PREFIX:=/usr/local
++linux_PREFIX:=${EPREFIX}/usr
+ netbsd_PREFIX:=/usr/local
+ PREFIX:=$($(OS)_PREFIX)
+ 
+@@ -285,7 +285,7 @@ LIBDIR=$(PREFIX)
+ 
+ # Magic Tool plug-ins
+ INCLUDE_PREFIX:=$(DESTDIR)$(PREFIX)/include
+-MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/lib$(LIBDIRSUFFIX)/tuxpaint/plugins
++MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/$(GENTOO_LIBDIR)/tuxpaint/plugins
+ 
+ # Docs and man page:
+ DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-$(VER_VERSION)
+@@ -425,7 +425,7 @@ MOUSE_CFLAGS:=-Isrc/$(MOUSEDIR) -D$(CURSOR_SHAPES)_CURSOR_SHAPES
+ # are 132x80.  On larger screens, they will be bigger (since the New dialog
+ # is always 4x4 thumbnails); therefore, generating larger thumbs, which can
+ # be still be scaled down fairly quickly (esp. complicated SVG ones).
+-CONVERT_OPTS:=-alpha Background -alpha Off +depth -resize "!264x160" -background white -interlace none
++CONVERT_OPTS:=-resize 264x160 -background white -extent 0x0 -interlace none
+ 
+ .SUFFIXES:
+ 
+@@ -619,11 +619,7 @@ endif
+ windows_ARCH_INSTALL:=
+ macos_ARCH_INSTALL:=install-macbundle
+ ios_ARCH_INSTALL:=install-iosbundle
+-ifeq ($(PACKAGE_ONLY),yes)
+-	linux_ARCH_INSTALL:=install-pkgxdg install-man install-importscript install-bash-completion
+-else
+-	linux_ARCH_INSTALL:=install-xdg install-man install-importscript install-bash-completion
+-endif
++linux_ARCH_INSTALL:=install-man install-importscript install-bash-completion
+ ARCH_INSTALL:=$($(OS)_ARCH_INSTALL)
+ 
+ # "make install" installs all of the various parts
+@@ -790,12 +786,12 @@ uninstall:	uninstall-i18n
+ 	-rm $(BIN_PREFIX)/tuxpaint-import
+ 	-rm -r $(DATA_PREFIX)
+ 	-rm -r $(DOC_PREFIX)
+-	-rm $(MAN_PREFIX)/man1/tuxpaint.1.gz
+-	-rm $(MAN_PREFIX)/*/man1/tuxpaint.1.gz
+-	-rm $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
+-	-rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1.gz
+-	-rm $(MAN_PREFIX)/man1/tp-magic-config.1.gz
+-	-rm $(MAN_PREFIX)/*/man1/tp-magic-config.1.gz
++	-rm $(MAN_PREFIX)/man1/tuxpaint.1
++	-rm $(MAN_PREFIX)/*/man1/tuxpaint.1
++	-rm $(MAN_PREFIX)/man1/tuxpaint-import.1
++	-rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1
++	-rm $(MAN_PREFIX)/man1/tp-magic-config.1
++	-rm $(MAN_PREFIX)/*/man1/tp-magic-config.1
+ 	-rm -f -r $(CONFDIR)
+ 	-rm $(COMPLETIONDIR)/tuxpaint-completion.bash
+ 	-rm $(COMPLETIONDIR)/010_tuxpaint-completion.bash
+@@ -902,11 +898,11 @@ $(THUMB_STARTERS):
+ 	@mkdir -p starters/.thumbs
+ 	@if [ "x" != "x"$(STARTER_BACK_NAME) ] ; \
+ 	then \
+-		composite $(STARTER_NAME) $(STARTER_BACK_NAME) obj/tmp_$(notdir $(STARTER_NAME)).png ; \
+-		$(CONVERT) $(CONVERT_OPTS) obj/tmp_$(notdir $(STARTER_NAME)).png $@ 2> /dev/null ; \
++		gm composite $(STARTER_NAME) $(STARTER_BACK_NAME) obj/tmp_$(notdir $(STARTER_NAME)).png 2> /dev/null ; \
++		gm convert $(CONVERT_OPTS) obj/tmp_$(notdir $(STARTER_NAME)).png $@ || echo "($@ failed)" ; \
+ 		rm obj/tmp_$(notdir $(STARTER_NAME)).png ; \
+ 	else \
+-		$(CONVERT) $(CONVERT_OPTS) $(STARTER_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm -f $@ ) ; \
++		gm convert $(CONVERT_OPTS) $(STARTER_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \
+ 	fi
+ 
+ $(INSTALLED_THUMB_STARTERS): $(DATA_PREFIX)/%: % install-example-starters-dirs
+@@ -961,7 +957,7 @@ TEMPLATE_NAME=$(or $(wildcard $(subst templates/.thumbs,templates,$(@:-t.png=.sv
+ $(THUMB_TEMPLATES):
+ 	@printf "."
+ 	@mkdir -p templates/.thumbs
+-	@$(CONVERT) $(CONVERT_OPTS) $(TEMPLATE_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm -f $@ ) ; \
++	@gm convert $(CONVERT_OPTS) $(TEMPLATE_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \
+ 
+ $(INSTALLED_THUMB_TEMPLATES): $(DATA_PREFIX)/%: %
+ 	@install -D -m 644 $< $@ || ( echo "NO THUMB $<" )
+@@ -1108,9 +1104,9 @@ install-dlls:
+ 	@cp -R win32/etc/ $(BIN_PREFIX)
+ 	@echo
+ 	@echo "...Installing Library Modules..."
+-	@mkdir -p $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
+-	@cp $(MINGW_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
+-	@strip -s $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
++	@mkdir -p $(BIN_PREFIX)/$(GENTOO_LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders
++	@cp $(MINGW_DIR)/$(GENTOO_LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
++	@strip -s $(BIN_PREFIX)/$(GENTOO_LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
+ 
+ # Install symlink:
+ .PHONY: install-haiku
+@@ -1186,24 +1182,20 @@ install-man:
+ 	@install -d $(MAN_PREFIX)/man1
+ 	@# tuxpaint.1
+ 	@cp man/en/tuxpaint.1 $(MAN_PREFIX)/man1/
+-	@gzip -f $(MAN_PREFIX)/man1/tuxpaint.1
+-	@chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1.gz
++	@chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1
+ 	@# tuxpaint-import.1
+ 	@cp man/en/tuxpaint-import.1 $(MAN_PREFIX)/man1/
+-	@gzip -f $(MAN_PREFIX)/man1/tuxpaint-import.1
+-	@chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
++	@chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1
+ 	@# tp-magic-config.1
+ 	@cp man/en/tp-magic-config.1 $(MAN_PREFIX)/man1/
+-	@gzip -f $(MAN_PREFIX)/man1/tp-magic-config.1
+-	@chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1.gz
++	@chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1
+ 	@echo
+ 	for l in `ls -d man/*.UTF-8 | cut -d '/' -f 2`; do \
+ 		DEST=$(MAN_PREFIX)/$$l/man1 ; \
+ 		echo "...Installing $$l man pages into $$DEST..." ; \
+ 		install -d $$DEST ; \
+ 		cp man/$$l/tuxpaint.1 $$DEST ; \
+-		gzip -f $$DEST/tuxpaint.1 ; \
+-		chmod a+rx,g-w,o-w $$DEST/tuxpaint.1.gz ; \
++		chmod a+rx,g-w,o-w $$DEST/tuxpaint.1 ; \
+ 	done
+ 	@# FIXME: The other man pages aren't localizable yet -bjk 2021.08.14
+ 
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.31.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.35.ebuild
index a4bbbd9d7552..619a6585e3ce 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.31.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.35.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="
 	app-text/libpaper:=
@@ -42,21 +42,21 @@ PATCHES=(
 )
 
 src_compile() {
-	emake CC="$(tc-getCC)" GENTOO_LIBDIR="$(get_libdir)"
+	emake CC="$(tc-getCC)" GENTOO_LIBDIR="$(get_libdir)" PF="${PF}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" GENTOO_LIBDIR="$(get_libdir)" install
+	emake DESTDIR="${D}" DOC_PREFIX="${ED}/usr/share/doc/${PF}" GENTOO_LIBDIR="$(get_libdir)" install
+
 	local file size
 	for file in data/images/icon[0-9]*x[0-9]*.png; do
 		size=${file##*/icon}
 		size=${size%%x*}
 		newicon -s "${size}" "${file}" tux4kids-tuxpaint.png
 	done
+
 	newmenu src/tuxpaint.desktop tux4kids-tuxpaint.desktop
-	docinto /usr/share/doc/${PF}
-	dodoc docs/*.txt
-	dodoc docs/en/*.txt
+	dodoc docs/*.txt docs/en/*.txt
 }
 
 pkg_postinst() {