13 files changed, 144 insertions, 107 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index a83ee0a70b66..95b302edb6af 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index d1355e522a01..63a5a223c822 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1,6 +1,6 @@
 DIST ansifilter-2.21.tar.bz2 434994 BLAKE2B 57d85bf0b1feabf6665b4b84e6b2418985c72a12a62e0e8f39f1b5f32190b64f3224dbe84d124631a8adfe08a1699c59b072a963770d44b09f9a97662ca0b274 SHA512 9bdaf7ec769ec58258c27723ae1aab5f8227b61fe8b8ddb4b429787819c7e40f8a911daacd21427b93e2668555e97b2dc28d502c971ba496a3b50a1eeec5fbb1
 DIST ansifilter-2.21.tar.bz2.asc 488 BLAKE2B 80fdedbe258417cd9eb858bbb342583a00e1cc2bf7344c30cbdbccb5a781770ecc73ae237ad03701d19a97b6c1eb7f0b49c02307533725d56b54141fd67b3c99 SHA512 f58d355aaa1362912ebae214bb6b6f5d355a6cf3fbc9ad42e8d2be8d3f0106a8eb2f7e2db69460f92816f57f5a6b33b28ad21d2c86301686975b6ad3b49c2a59
 DIST ansifilter2_logo_256.png 54539 BLAKE2B f8b98e22b08c62769bc679f17b3f9d2faeee806d95af3b4a4876e4938813694a4924ed4684163e962d94d3f1efdd31facdae4c3eb75c98322da228bdf0a130be SHA512 ff6f76a91a4809289f90db2bcefc01e772e043a478d7f84b33b4313ed163692e7d2f87880e5fdb64f0e419f6c1ef6ec85240f5a9984223e9059f0803be313de5
-EBUILD ansifilter-2.21-r1.ebuild 1875 BLAKE2B 7f577d80bdf6de746f3c98dc9be263ea332ba1f61ddc8f1912ffaccf83108e62ad5cc13bf60c3b89dde80d15c93b543c419f236b10e01fe5d3ac067ee28a7137 SHA512 42a9d37f1975746cb2ce6e0a75f73dce700455d6202bc5fe9f0e97decdf057bd36ebf3a28755a49cd23ded0cf505dc0651080fda839f1edeb9b248ed36019692
+EBUILD ansifilter-2.21-r1.ebuild 1868 BLAKE2B 40953482e294e0344f5b1d075754dd22134953d54b56085c49f7d940c39686bae59c2c8ef9543c992aa7bf242d520f6daf1e57f3e2c60259ebf38380a46b7cbb SHA512 9dc45cf9a5f696072fa23f3f4a3982ead55bfbed7481d13051ea28cd1a8e15346900625f02954bc299e371c7786047f0b340d767cea52f1826ee486ee56e1e9f
 EBUILD ansifilter-2.21.ebuild 1895 BLAKE2B 101795679e488b606e3b644afc7ecfdd8d2b0e35bce1e9018510ccb14b10cc17fcba06095f39f86002df7a9e55bec786738a6ab5ec817c47da4b03c781ab88b8 SHA512 1ef32f28d1166da3a0c5efffede21a808df802ae2d973106ff5e9931678609f427fb487c44d37af441d0e0ddfd7c241b384b80da5a1a1c8db54720971b816647
 MISC metadata.xml 330 BLAKE2B bd53d42fa198c95c42d3775b1fcc44b3f0ebff17e6da2397ecedd7f11feab092213e91d4851314e930c263d218a0f360e877b81aec08926176dd313288eedc9e SHA512 499715ace48f835425baf484bc305545933046c6318fa16ac52f8ad363802e0c589b76a40e1b7036c1b204f55d3c069297877b199921fa4c2fe1a55ee9795848
diff --git a/app-text/ansifilter/ansifilter-2.21-r1.ebuild b/app-text/ansifilter/ansifilter-2.21-r1.ebuild
index 9765dda9cfcd..0f535d8ca97e 100644
--- a/app-text/ansifilter/ansifilter-2.21-r1.ebuild
+++ b/app-text/ansifilter/ansifilter-2.21-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="gui"
 
 DEPEND="
diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index bdf157711bae..76df3c78351c 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,3 +1,5 @@
 DIST cherrytree_1.2.0.tar.xz 4735884 BLAKE2B 47f2aef52bb1fea23be8f5db3d2ec9f4c6a596bb6136350098f870688e34e5662241f188f1c94331af2119b59546c95fbe8254bdbb187990b514f9d21fd76214 SHA512 729e8227eb1f0616e110153ac2139cc7019ed5e1a949c8be40fd2235ee5d2e0f0b1925c57d72c9b443852e5b80a50793e4e903b7df41da8e95a172210f7ec035
+DIST cherrytree_1.3.0.tar.xz 4749468 BLAKE2B 31c953e114f704316bca09f32e13cfeb7e1f0147ba3e5f9a72e07fa1c808577be926f18dc3aa868c912a369b0cbc28630bc54136fd98f9d4d3d63248b33ef3ee SHA512 e7b061aed33ad55c1fc7f7dd43b01db6c36ba414c32f996c86c9a64899e6d0cf7825637350c8dcf252d5495b8d956a675b34607854177d6f01615ad9d4953c78
 EBUILD cherrytree-1.2.0.ebuild 1878 BLAKE2B 9462cf2f125334c117ddd367860a8c23bcfbaee114a78087398ab312d6c4852c483d8a2a29726e9422cbe29ac317ea9d2a604cc2f01e640736ff7a2fa0979a2a SHA512 d0123c79d87fafb00cc28dc8718446f1a1adcfe6105df88eb2f839921057e247909b95f94b5302794055dbac79ff092b63ba3601fd7a5f96d8bf3d382ea66d6e
+EBUILD cherrytree-1.3.0.ebuild 1878 BLAKE2B 9462cf2f125334c117ddd367860a8c23bcfbaee114a78087398ab312d6c4852c483d8a2a29726e9422cbe29ac317ea9d2a604cc2f01e640736ff7a2fa0979a2a SHA512 d0123c79d87fafb00cc28dc8718446f1a1adcfe6105df88eb2f839921057e247909b95f94b5302794055dbac79ff092b63ba3601fd7a5f96d8bf3d382ea66d6e
 MISC metadata.xml 482 BLAKE2B 713d79e5a3073dc38016d007e1a102331915d7fc43836cab0008e91e42d292bd49d0138fd323beb987b146a3544d9bce089327799f7d54a44fcd22b38e82a371 SHA512 a2c6293f00f971c760dc2554ab289f532927a1e6b9deadff72fd9e537ee338d8804820defd58d7dec1b18db0b5b8541dba2a8aeec54607f6b8c72ed1e86835a0
diff --git a/app-text/cherrytree/cherrytree-1.3.0.ebuild b/app-text/cherrytree/cherrytree-1.3.0.ebuild
new file mode 100644
index 000000000000..d2e8464e00c5
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-1.3.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cmake python-any-r1 virtualx xdg
+
+DESCRIPTION="A hierarchical note taking application (C++ version)"
+HOMEPAGE="https://www.giuspen.com/cherrytree/"
+
+SRC_URI="https://github.com/giuspen/${PN}/releases/download/v${PV}/${P/-/_}.tar.xz"
+S="${WORKDIR}"/${P/-/_}
+
+# GPL-3 — future/src/ct (CherryTree)
+# LGPL-2.1 — future/src/7za (7zip)
+# MIT — future/src/fmt (libfmt)
+LICENSE="GPL-3 LGPL-2.1 MIT"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE="nls test"
+
+RDEPEND="app-i18n/uchardet
+	app-text/gspell:=
+	>=dev-cpp/glibmm-2.64.2:2
+	dev-cpp/gtkmm:3.0
+	x11-libs/gtksourceview:4
+	dev-cpp/libxmlpp:2.6
+	dev-cpp/pangomm:1.4
+	dev-db/sqlite:3
+	dev-libs/fribidi
+	dev-libs/glib:2
+	dev-libs/libfmt:=
+	dev-libs/libsigc++:2
+	dev-libs/libxml2:2
+	>=dev-libs/spdlog-1.5:=
+	>=x11-libs/vte-0.70.2:2.91
+	net-misc/curl
+	x11-libs/cairo[X]
+	x11-libs/gtk+:3[X]
+	x11-libs/pango[X]"
+
+DEPEND="${PYTHON_DEPS}
+	${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( dev-cpp/gtest )"
+
+src_prepare() {
+	# disable compress man pages
+	sed -i -e \
+		'/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
+		CMakeLists.txt || die
+
+	# python_fix_shebang .
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPYTHON_EXEC="${PYTHON}"
+		-DUSE_NLS=$(usex nls)
+		-DBUILD_TESTING=$(usex test)
+		-DUSE_SHARED_FMT_SPDLOG=ON
+		-DUSE_SHARED_GTEST_GMOCK=$(usex test)
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			-DAUTO_RUN_TESTING=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# the export test suite fails if more than one job is used for testing, so
+	# we force it to a single job here, for more detail see
+	# https://github.com/giuspen/cherrytree/pull/2663
+	MAKEOPTS="${MAKEOPTS} -j1" virtx cmake_src_test
+}
diff --git a/app-text/dblatex/Manifest b/app-text/dblatex/Manifest
index ab4eae37e4cc..fddf9a167d32 100644
--- a/app-text/dblatex/Manifest
+++ b/app-text/dblatex/Manifest
@@ -6,7 +6,6 @@ AUX dblatex-0.3.11-setup.patch 1751 BLAKE2B a83e41c4fa68eaee1b6e80404cd5486e64f1
 AUX dblatex-0.3.12-adjust-submodule-imports.patch 1995 BLAKE2B 11b5fdf9142b0e417bb401882cbcb753298fa94860b43c66c7b35b359905830aef7b635d9e2b67d5641d5056cd4361b193db379c5166fb18fbf9b397d54124d4 SHA512 d4cfe2a676a04d4d100c9ef70f180f3412f9276f52c87cc38ad53844d94f14159b995cef13b853148b1f97a990487f5bd3bb010b5c0f08e0afe1e3fe2b4b6d11
 AUX dblatex-0.3.12-replace-imp-by-importlib.patch 3883 BLAKE2B a747ece1ec3717ba14d107eca93789464b6383ab652b37de8dcec691af39b38685870d579caeed90741c1ee4dd319a2c8a32cf1e038aca9445740b99afaa116f SHA512 6d5f7b3b3573f28c2d42ad9dbd1cd3866f9e997b0acc0c09caa5329b54cd591c158ddaf26a39d690b8511b35d046f5f1a2e2a6e91601503952f190fdb8f3449c
 DIST dblatex3-0.3.12.tar.bz2 1693272 BLAKE2B 9310ce5db3b5f92e183f2656c5b1881edaf0208ae4f78f853332c844258fa38d443921fc42c03301773b1451ce272a538c305d765acbdc6eafbdcf25ebf5d2d3 SHA512 5bfa774c8dbe362775f6bbb5e1196e5a2bb1af239778133c12ddc725406ced67f3ff422433a2a1aa02d4431e9be58ba12e918379deb81fcd5b96533d2bdf029a
-EBUILD dblatex-0.3.12-r2.ebuild 1981 BLAKE2B f1b2547b670fb94ad68479fa313f179f13e1f79838bb1b1a95905314dd984b1287e3bdca7f49d57305de7df5e3ea6a5f0b402a4da020b35bb5f383e76762ebcf SHA512 81e0d4f295a293ebdb08ae058ecf6af2bd104226449c0722bed0937b5b7abb49d4cc5d8a3c7bd0f021b3897dd99b24ba4862a52104025fbcbde192ecdcc52ebf
 EBUILD dblatex-0.3.12-r3.ebuild 2478 BLAKE2B 56749775ddedac8883b5ddb8212e51a4d25da13f9d726372859b45df8e87df6806a2bff16ef26317537c934ad97011a37aaac37a27661f79f58044c76b20f680 SHA512 e8479eb98f3df57f3314d51ae21b404926f09489a231e332f75d20f2b49545d340a40cc366aaf744985a894cd87f2e9c40b1726b593edf5e95ff9efb4013d16e
 EBUILD dblatex-0.3.12-r4.ebuild 2489 BLAKE2B 0edb4c09298248f0533fd998ba65cf7df76ae3883284f31f42979888e4dc48dedfac36c4f24d31187d6b7e2d7536dd00eadb9eef722ceff2c9ea1e76c23f1bcd SHA512 9d5008490a6b5873d55b51953c8c307810ddd5598ad117385ae1522d36692ee5c4f1629522e162685b92a9e25214741b7232962a68d11008c2bce8b3d151ed7b
 MISC metadata.xml 908 BLAKE2B e13f176739b3fb7a63a5eaeb704afa1c0b4e9740ea25dec54656c283cf9f8f614096aae407df8822414e054eaad0082c738c0a5a2acc91a51ce3f6b729fc37d6 SHA512 a39c4073b4cec1753724d16bcca023c9306eeac79bc7f008c6e090f85c4661733810c9864b91b9552fbbec242c01a312780ee780d11724ce26399bad3c9a0899
diff --git a/app-text/dblatex/dblatex-0.3.12-r2.ebuild b/app-text/dblatex/dblatex-0.3.12-r2.ebuild
deleted file mode 100644
index ea320f817ecb..000000000000
--- a/app-text/dblatex/dblatex-0.3.12-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-# Breaks installation of /usr/bin/dblatex, bug #906788
-#DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Transform DocBook using TeX macros"
-HOMEPAGE="http://dblatex.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/project/dblatex/dblatex/${P}/${PN}3-${PV}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="inkscape test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-text/docbook-xml-dtd:4.5
-	dev-libs/kpathsea
-	dev-libs/libxslt
-	dev-libs/libxslt
-	dev-texlive/texlive-fontutils
-	dev-texlive/texlive-latex
-	dev-texlive/texlive-latexextra
-	dev-texlive/texlive-latexrecommended
-	dev-texlive/texlive-mathscience
-	dev-texlive/texlive-pictures
-	dev-texlive/texlive-xetex
-	gnome-base/librsvg
-	media-gfx/imagemagick
-	>=media-gfx/fig2dev-3.2.9-r1
-	inkscape? ( media-gfx/inkscape )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}
-	test? ( ~${CATEGORY}/${P} )"
-
-S="${WORKDIR}/${PN}3-${PV}"
-
-PATCHES=(
-	 "${FILESDIR}/${PN}-0.3.11-path-logging.patch"
-	 "${FILESDIR}/${PN}-0.3.11-setup.patch"
-	 "${FILESDIR}/${PN}-0.3.11-encode.patch"
-)
-
-python_prepare_all() {
-	# Manual page is precomressed, but we will use our own compression later.
-	gunzip docs/manpage/dblatex.1.gz || die
-	# If we dont have inkscape we need to use an alternative SVG converter
-	use inkscape || eapply "${FILESDIR}/${PN}-0.3.11-no-inkscape-dependency.patch"
-	# If we use inscape however we want to make dblatex compatible with v1.0
-	use inkscape && eapply "${FILESDIR}/${PN}-0.3.11-inkscape-1.0.patch"
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	# Move package documentation to a folder name containing version number
-	mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${PF} || die
-}
-
-python_test_all() {
-	emake -C tests/mathml
-}
diff --git a/app-text/pdfjam/Manifest b/app-text/pdfjam/Manifest
index 77ca83ac3525..8c5484952889 100644
--- a/app-text/pdfjam/Manifest
+++ b/app-text/pdfjam/Manifest
@@ -2,5 +2,5 @@ DIST pdfjam-3.12.tar.gz 162802 BLAKE2B d22e78cdb1e0135b2d2a9d1269a7467417a2fd3f9
 DIST pdfjam-4.1.tar.gz 801493 BLAKE2B 1fabd8aac3fb071afca3c7835a29e42c5c95363abbb1c5ba4267656ec96afafca90708b2f81005c3ecfe63b61ca93ad702a6c25315a68029260e94000dfdb73e SHA512 a3eab360165796b2a66014cbbd66103520f2688085986ff449b24b354f8ba5f3ab53a72b1361fddbb2ed3bfb0ef68e6d4ca6453a1b383c2ed47a4140c0b977ed
 DIST pdfjam-extra-20191118.tar.gz 15457 BLAKE2B 3d673ba68a1ee89cec7af0ec7d7fc61c8993b9ae328d3362a6bbbae47cbda2caa2e8f4ecd28424dd894c31d14754228b067389b61fa7845cfe5dfc0e2b5d9b8d SHA512 1d02abb9d81baf6edf3e51e2c7838df191a7a18b4b50518ee1ae3108020a274d7608570654ab540539d3717e51ef10f548c83c3480681bc20c9702280f694b8f
 EBUILD pdfjam-3.12.ebuild 1190 BLAKE2B e3878a2d7d242ffc1707c5cde6e5be5ff82abcf4aebf6806a84eae17f557c3001e96346bfe14b1383a5233751744cc9129da38d4406f00d5d8ff4ef0acd8b4db SHA512 b0a7682170b0a1bd9c06af5967753f26e43e4b95b67eb9eb9ed46570bb3c7507efff9cc9bd79eecadc718010193c384378d7526e635934024df8262c337576af
-EBUILD pdfjam-4.1.ebuild 1359 BLAKE2B bc982529d7414793f895856aae9592651b4a013538a9bb9fad8658731aff2619f054f355d55bc46d775882a69f885f5816a55734497d5c944435e60ad9758d1d SHA512 5719d90a70d340a7777a578b363c6b260ef59c65bb85e3911a485eeecc51def4dd53019e97c646c8d38c7d9311ce6285092d11b83300b1969687ab08517b8187
+EBUILD pdfjam-4.1.ebuild 1443 BLAKE2B cee0926eee9b04e2d642af2835c84762510c3655ddb0c3b26947fb51995583650a74912c24197029b46a560631ffa7cc43a76030709803feaf00ae065366504d SHA512 665347bc7fd26a6cd10798b054a378decd5ef83303784f1b136902952ee38854937e15060c2bdbe6016211554413dfd05ee5f657a47ebacfa0de34b38261ad3f
 MISC metadata.xml 1249 BLAKE2B cdd9ced8fe4339e9f5805874c29e4edb76405ceed9fbce30061104a698ef43e605e9c8f2cf6abccc4f389ba8a7b345987d4333422affc456533fa2b9b6137d1c SHA512 d0a2042633da1862a859f63f9f86c584b587748e98a635ffa5e6f94d2ed58f27b4ab9e5b215d65f00b12c4c1b6d2337f68d828d1915418f5e7c76c1c226245d5
diff --git a/app-text/pdfjam/pdfjam-4.1.ebuild b/app-text/pdfjam/pdfjam-4.1.ebuild
index 87c5e6a0d6f9..d814bb82def3 100644
--- a/app-text/pdfjam/pdfjam-4.1.ebuild
+++ b/app-text/pdfjam/pdfjam-4.1.ebuild
@@ -25,9 +25,17 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc
 IUSE="extra test"
 RESTRICT="!test? ( test )"
 
-DEPEND="virtual/latex-base"
+COMMON_DEPEND="
+	virtual/latex-base
+"
+DEPEND="
+	${COMMON_DEPEND}
+	test? (
+		app-text/texlive[xetex]
+	)
+"
 RDEPEND="
-	${DEPEND}
+	${COMMON_DEPEND}
 	!<dev-texlive/texlive-binextra-2023_p69527-r4
 "
 
diff --git a/app-text/xmltoman/Manifest b/app-text/xmltoman/Manifest
index 80c350d72fdf..6b52e377e181 100644
--- a/app-text/xmltoman/Manifest
+++ b/app-text/xmltoman/Manifest
@@ -1,4 +1,5 @@
 AUX xmltoman-0.6-generate-man-pages.patch 2083 BLAKE2B 3f4136a06607d0c1b0d07acc5d82b977b1e3d1097d08bb29d8a626e1d5d86493892e58001fdd2946c5de96e62702bef5fc4f982507e89d5ac4069933d8638196 SHA512 879c11f14b33a3b134817c62a6f6e6470213e7aa7663b1676444746ab177b5b750114b5023dfa563fd85997ca0c7f7f2683264d0d1f985f363365529941a2ed7
 DIST xmltoman-0.6.tar.gz 15862 BLAKE2B f33ebfb1dfdd0f055f18e68f923e96c07495740e361cec2ba7a10a63889b6b6c4c851f3df6b74947b24811403d2745dbdc7e5d2d67d3566ec65b7be6fae616c8 SHA512 f2b0689ca37212253eaa127c3a2c299facac7c3909991b8872da0adf0fbb34aa02c32144c485135c06c17b1ac5e5753d627969e97ae4938e6dcee9ddbd79582d
+EBUILD xmltoman-0.6-r1.ebuild 884 BLAKE2B 3cf55bb201c4cc42707f321e07220947867c9f9beaddb524f3ac8a95ccabe0c8291afb04e7c7c16829da0bb0e0cef31ec261cda4c050f941953471c2f7ca4921 SHA512 5645752e412898ec53b38f2db333b4840d0480733b7d33a0ca9d24a8919af60e2859e4dc39fa6dac4e5d783d2a5e97996e13456ccbc776849e14589b98c3171c
 EBUILD xmltoman-0.6.ebuild 811 BLAKE2B eafa39f122297306b44575d9664df52fc36bc7f36ad1cd606c7a2aa9d7dacfb8f1827703dccba47760b3594c67dc47d6a03b5d55322fba6025e6941660bfbdc1 SHA512 faaef9ca2163b97c3ecad854ba80173fc7398fac11fcf710e2e500c8290356e8452d505e6bba0a06ffb07d2b9f9f878bffeb753470e8cc49e03ac884a779311a
 MISC metadata.xml 299 BLAKE2B 5bb9887ce9510e2a71a5b30e8b2ada78236ec6f2489bf27d6536b47fcdcaae262b7ada77d3f0f8b00f7a2223e7344a4f130f4636a1c61d64bebb923c916c2d6e SHA512 6fef6c50b720fd2aec25ede9b037c5973de9f4e41383c2836f27f42e68b73c32dcac0d31e1a9ec209d5d685e50ccd8c8347ec0822530be23624bd98d2b9f3095
diff --git a/app-text/xmltoman/xmltoman-0.6-r1.ebuild b/app-text/xmltoman/xmltoman-0.6-r1.ebuild
new file mode 100644
index 000000000000..896552e103db
--- /dev/null
+++ b/app-text/xmltoman/xmltoman-0.6-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit prefix
+
+DESCRIPTION="Simple scripts for converting xml to groff or html"
+HOMEPAGE="https://sourceforge.net/projects/xmltoman/"
+SRC_URI="https://github.com/atsb/xmltoman/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/XML-Parser
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-generate-man-pages.patch
+)
+
+src_prepare() {
+	hprefixify xmltoman
+	default
+}
+
+src_install() {
+	# 'make install' requires GNU install, upstream is dead and carrying
+	# a patch is more space than redoing it here
+	dobin xmltoman xmlmantohtml
+
+	insinto /usr/share/xmltoman
+	doins xmltoman.{css,dtd,xsl}
+
+	dodoc README
+	doman xmltoman.1 xmlmantohtml.1
+}
diff --git a/app-text/zathura-djvu/Manifest b/app-text/zathura-djvu/Manifest
index 7cd8d270092a..d535109320de 100644
--- a/app-text/zathura-djvu/Manifest
+++ b/app-text/zathura-djvu/Manifest
@@ -1,6 +1,4 @@
 DIST zathura-djvu-0.2.10.tar.xz 9408 BLAKE2B f779eeeba40abe444960716b8c14c51c32a3830a3f779074ea773bd9ff0d71736433ed29862bdf137a34ebb934bb562aa14031c07dda5cf97ddf278e47feb750 SHA512 c743e60588e07fe18f7da8db1ae9ae997ffb50ef696258f1901523159ff4d29e5649b13d6e52f53cf79f19429083308390c0b4923081451bf5c4bfb9ac6e8903
-DIST zathura-djvu-0.2.9.tar.xz 8976 BLAKE2B f0a798e9473ad2d09bdf171f4689231d73fa1e1bbaa0faa750feb82db2e2b029a86bf759e642f92c0ba438ee88b9178969e5d2aec4f30d9cb049bd3bcd69639e SHA512 3c2815e7f1cdfb9fc594dc6ad65359245f322e5fa27f018fb9431747e4d474734f5efd134aaeb9dabde09b01de603b1d1dc7aede883b1ef81266e067b0490726
 EBUILD zathura-djvu-0.2.10.ebuild 715 BLAKE2B dd86b6db7140238f5b9a140134f7cffef8ef4ba9698a8ce215be947f317f954b1e19ede8affb071ced2a7432cb348e1d50ca57732436b790f10b307742be26db SHA512 596bc562b7159dc284174923bc645ffe216925c1f4a7f6439ff73410bb0c32f8a7182eceddf3ba12bffb45f7c0ba703b7a1aeb793742efcddbaf7f96ca4ba0b0
-EBUILD zathura-djvu-0.2.9.ebuild 630 BLAKE2B f6f9e996a739a30893f0bc3e00592a29d2a01d1307c4e8db8156746e12e0e8fc9a99ca1d31a373c7f66944e5ef2ff69a54c20e4941fc633af4c08dcbb3d05574 SHA512 11665cc089c5766d685a7b0f409df1e46c551a107b31b0744019d8790c5791f588f1501a60292d7efb571ea809a613d53ecf93f144a8093e551d45e185dd089b
 EBUILD zathura-djvu-9999.ebuild 693 BLAKE2B 5ade67b24ecb828488674da1ebe10aca91dcfb9200013504ee887d157cbdaf037d7f798a80ba64a2e4f87c7f0861ab7f423fde65f7991269b94c9b2d970f4cee SHA512 d4a4df64d14be748ee12f9f1cc2699307c310a3a6864ab0a8b0d23a1191cabf5c0ab64f817744d728800fb2ff7f8ed0cb68a199b4aafb4647e1ebc22b854fd46
 MISC metadata.xml 650 BLAKE2B c91b23bc839a7e3f00b21f73a02d83912321e292de99c824797ed653c28bf66b52c6df39fec769e141231b1d2e2b595df95347e8c221fec6511f654901d6bd35 SHA512 1cb10b8e25b744b259ed71d896bb9cd971fc9e225cfb7ae59af9addd963d46994524a4587db6b096b13fae63087ecb94e75ad83abb16d829901f8d2b0371a0a7
diff --git a/app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild b/app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild
deleted file mode 100644
index 392cfe24b681..000000000000
--- a/app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-djvu.git"
-	EGIT_BRANCH="develop"
-else
-	KEYWORDS="amd64 arm ~riscv x86"
-	SRC_URI="https://pwmt.org/projects/zathura-djvu/download/${P}.tar.xz"
-fi
-
-DESCRIPTION="DjVu plug-in for zathura"
-HOMEPAGE="https://pwmt.org/projects/zathura-djvu/"
-
-LICENSE="ZLIB"
-SLOT="0"
-
-RDEPEND="app-text/djvu
-	>=app-text/zathura-0.3.9
-	dev-libs/girara
-	dev-libs/glib:2
-	x11-libs/cairo"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"