12 files changed, 166 insertions, 151 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 561ec78ed43c..7b68b7d80e6b 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index 141de44bbe2e..bdf157711bae 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,5 +1,3 @@
-DIST cherrytree_1.1.4.tar.xz 4714968 BLAKE2B 98cb6c20f5f957420b01352f3b1ba86768010e64583d94130e878eca747350c5eab11107ef3719c65f3a6126127b31e4d0e5807f90548f9f8819cd16f0f299f1 SHA512 053871386b4fd5e9964082421c63a10f332942fb1b29e5145b18858a1219ad55e108235dda279bdbf9b3516fd17502c55357e196a327232a6d82aaa1e06598d9
 DIST cherrytree_1.2.0.tar.xz 4735884 BLAKE2B 47f2aef52bb1fea23be8f5db3d2ec9f4c6a596bb6136350098f870688e34e5662241f188f1c94331af2119b59546c95fbe8254bdbb187990b514f9d21fd76214 SHA512 729e8227eb1f0616e110153ac2139cc7019ed5e1a949c8be40fd2235ee5d2e0f0b1925c57d72c9b443852e5b80a50793e4e903b7df41da8e95a172210f7ec035
-EBUILD cherrytree-1.1.4-r2.ebuild 1657 BLAKE2B 893c2c23d9d3346d7888124f8dd05a4afd1d1c1e069cf369958bcba4913a5000475749a60d73b0568a07587856a21718774ede97856d2d30ca17be8503aa5e8d SHA512 e214bd9137cf08741a4b66b97625a3ceebf494b0485cbaf10363de2c76ad03c04efc57ca3b7595b386afbd2ee3f1e4679c1d4c9bddd8f9f3b5a892ccd4b09b0b
 EBUILD cherrytree-1.2.0.ebuild 1878 BLAKE2B 9462cf2f125334c117ddd367860a8c23bcfbaee114a78087398ab312d6c4852c483d8a2a29726e9422cbe29ac317ea9d2a604cc2f01e640736ff7a2fa0979a2a SHA512 d0123c79d87fafb00cc28dc8718446f1a1adcfe6105df88eb2f839921057e247909b95f94b5302794055dbac79ff092b63ba3601fd7a5f96d8bf3d382ea66d6e
 MISC metadata.xml 482 BLAKE2B 713d79e5a3073dc38016d007e1a102331915d7fc43836cab0008e91e42d292bd49d0138fd323beb987b146a3544d9bce089327799f7d54a44fcd22b38e82a371 SHA512 a2c6293f00f971c760dc2554ab289f532927a1e6b9deadff72fd9e537ee338d8804820defd58d7dec1b18db0b5b8541dba2a8aeec54607f6b8c72ed1e86835a0
diff --git a/app-text/cherrytree/cherrytree-1.1.4-r2.ebuild b/app-text/cherrytree/cherrytree-1.1.4-r2.ebuild
deleted file mode 100644
index b15546fb1a6e..000000000000
--- a/app-text/cherrytree/cherrytree-1.1.4-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2023-2024 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 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"
-
-# Has deps that aren't available in ::gentoo repo
-RESTRICT="test"
-
-# <dev-libs/libfmt-11 https://github.com/giuspen/cherrytree/issues/2548
-RDEPEND="app-i18n/uchardet
-	app-text/gspell:=
-	>=dev-cpp/glibmm-2.64.2:2
-	dev-cpp/gtkmm:3.0
-	dev-cpp/gtksourceviewmm:3.0
-	dev-cpp/libxmlpp:2.6
-	dev-cpp/pangomm:1.4
-	dev-db/sqlite:3
-	dev-libs/fribidi
-	dev-libs/glib:2
-	<dev-libs/libfmt-11:=
-	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-util/cpputest )"
-
-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
-	)
-
-	cmake_src_configure
-}
diff --git a/app-text/cmark/Manifest b/app-text/cmark/Manifest
index 9d7ae9ee1093..84366930eee8 100644
--- a/app-text/cmark/Manifest
+++ b/app-text/cmark/Manifest
@@ -1,6 +1,4 @@
 AUX cmark-0.31.0_fix_api_test.patch 635 BLAKE2B 8dab955156da6958fb80acfa88bf6eb658fc0e4cd863fd1bb845655730c34b834c7e864aa3480c9e5fa2baebeac795d8356b8fb9e9db4af3c99c1299d84c61fc SHA512 3e9cdbc1205b722b979a39c09606c6b83f57dc44b8f855094204782896e81e24703eae65255515422d3324e375080e98d33a24ca55b681eff55cd5a4912df0a0
-DIST cmark-0.31.0.tar.gz 251922 BLAKE2B 9532255066cd21e99de430787f261b3014c4d270e8243aa258bb9c90cf2ccfd7138dcff2e15f576cc28ee6b6b7901c0f321f5ead6a9202e06b4223288f326897 SHA512 768d456147cb8f5cf36e8122213ad053098201e118109a316518a6a5e721ac94f62af29abe1e69120c84bdc227a5c320803ea2cf320c6d9a719d62909b6533bd
 DIST cmark-0.31.1.tar.gz 264170 BLAKE2B c1de1cf035ff5c706455889413c8cfdaa4b5da39a333d21ed77e2091d1a2f5ef9c90c34100c18be62426aea68c2d5ce157719964a761312f7e4b11e05dae0024 SHA512 3b4f8b47d8ea270078ab986aa22fc32b227786459bd33c7225aac578d8dd014e3d8788a6add60ea10571fdb4c7dc6a1ece960815a02f04f153b1775c73ccff8f
-EBUILD cmark-0.31.0.ebuild 805 BLAKE2B df315aaf9288f605d214043eb5ab8d52850c1e9c938ac4360acf894262e2d64425e97f12f43e96afd1392711da5f72e3e1d5851886da52135ccd458e77f08b7c SHA512 0c3ab8e1b097d3c2c9f22ce2f0582bc203c59f242d8533ceb1e95893fc846112de25768013e9ed20761fca1e1e04c51c49bd2d7da4c9cbca11020cca03b0b20a
 EBUILD cmark-0.31.1-r1.ebuild 806 BLAKE2B 28b7890be47131431dc05e4cd590a214b98c9c1a3b92b29b1cb899de6ae69f03bec8027715518daf96644c6e342cc528bc7a853ac2fa74268fefc9354a340ec7 SHA512 9846156f7e091ba34239caeb150fa359275a79136d848165b797e7541cb1b5050143bae801800b0ca019e17d862ce7fc6a6170992c802019ae1081cda8f1c961
 MISC metadata.xml 504 BLAKE2B 5b9b29ddcf02b115bc37aeb217236e5092363991b75247f7d7c5da7e7fe0c5bf15ff0a397b332faefd2b150ff9cc239d4996caf6131306240efd641bffe52431 SHA512 f2ebd2271483a1847c63df11e0e6fa057abe8f19323d86f0632904e03ae321b1e689a98ab941e4d7ebaa50ee9220242f1488b35b08f73cec736df5c0a0024713
diff --git a/app-text/cmark/cmark-0.31.0.ebuild b/app-text/cmark/cmark-0.31.0.ebuild
deleted file mode 100644
index f6fdacd7aa06..000000000000
--- a/app-text/cmark/cmark-0.31.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake python-any-r1
-
-DESCRIPTION="CommonMark parsing and rendering library and program in C"
-HOMEPAGE="https://github.com/commonmark/cmark"
-SRC_URI="https://github.com/commonmark/cmark/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( ${PYTHON_DEPS} )"
-
-PATCHES=(
-	"${FILESDIR}/cmark-0.31.0_fix_api_test.patch"
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMARK_LIB_FUZZER=OFF
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake_src_configure
-}
diff --git a/app-text/doxygen/Manifest b/app-text/doxygen/Manifest
index 0f69dc7aef59..ffbf39bae7e7 100644
--- a/app-text/doxygen/Manifest
+++ b/app-text/doxygen/Manifest
@@ -1,6 +1,8 @@
 AUX doxygen-1.9.4-link_with_pthread.patch 1116 BLAKE2B 864adde5d9c0c852dba8fdaee9021f16e7e119a660d5d8657f320686c0d86c29b5695f367c2af2846e9861bca5a70889b6dd56a9734485527ae504a134e30594 SHA512 f9a1089585f83a09b89c813f51bbb7914fb27be2b3e554148387fd322c88153c2aca1af4215d90b6f2fc9eae25814085fb468f0ef2dacfa092662a4609d52929
 AUX doxygen-1.9.8-suppress-unused-option-libcxx.patch 828 BLAKE2B db41297d3ad3fca9dc5097871185f98c965ccda7e22f8c31e0b9a69fc83c90dfd32125371cb3e42ebb6b0867cc9746b03ef656861aea14dc8d17e1e7ea09780f SHA512 6c6599ddf35720abb3872fed3a82e8796edc4e6623f9e5b3930e600772c6346bab776074fc8edb20d6d9ac7c21d6c0cb86b12295c9b7649322b876bc6737065d
 DIST doxygen-1.13.0.src.tar.gz 8502031 BLAKE2B 8a12ed632772b48d07ea4edf16032f491e05b4718d38160ebc1f3d8de1cdf96bca827da28048907cf538a286757ddf56c503fbe08dcfc5a17cc72fea7233a466 SHA512 f6cae74bd8df9c6c2ba3fa21fc33926e6d5eba65101776f84c1fa056d9231d69e232a30d7702b53a284543fc4765edadb10f4d4b4a46314fa08580963d9226fb
+DIST doxygen-1.13.2.src.tar.gz 8512178 BLAKE2B d1a5051b49924580cf2e4f58df12da6ff6f9f02490957b1a1562a7587763ab32bac11b0c7d3456d6fee48e7284ee8a265e90d1862a40af2c6deb9d1ebdef72e9 SHA512 7b6b3285706e10c0b27230503b83cc669aec83ebc3ef9cc1087d5e36118fd726a5368d567dd553ba01acf4d739cdbb41c5e66af4541fc8e51effbbdaa241c812
 EBUILD doxygen-1.13.0-r1.ebuild 3842 BLAKE2B 06a0c38ea6d50b597afb3ddd24d17d728692e977bc488b02ec8b7c77368c7336f228de67b98a25d9ff69921d99d68b9b61355c70b2108fe32796cd5028e7349d SHA512 f192eee35b46ff6733c205b6a968a237399af68b48371de4b72f223bea1572629ee355b0059fc657a9d1e4eabd1b6f6d73ad3b266ac3c06ee8e4aa7b3f3ceb61
+EBUILD doxygen-1.13.2.ebuild 3853 BLAKE2B c2a277d38298da0183bad2eb2eb9e4eda3523ac41f338a97949405a9cd2f68861d187c73a48d1dcbf12c70bf189afab98093907ab3a7af0a13abf3da8de1a208 SHA512 ab215c9808f921f2d3b387e73915b46d6cc68e1cf88cb939e2de3b0b8fcda979d1b7192f43524fc55d39904d2bcab025cf7b391a315b433c67e0481dfce9047b
 EBUILD doxygen-9999.ebuild 3864 BLAKE2B 32c06fca3d8b363a86e4e865de58d8c9e140f08a026acb0c4cd0b640d67a0c7e5a905231f85bb870e63bf90450ea5298737bb6034a8e118ff1cfd5b3d975dcb7 SHA512 0f6c1862a8854e48661dbe1aeab12ace71f00390b1c59c60372424a3bcf6d3e9ba76e73d8b966027de2f42d3d21b9ce13e820cf09678fdb93439352c53e80863
 MISC metadata.xml 1024 BLAKE2B bf8c898a0c93f684154b8e76a3014ebd421e60ce3d1b2da444a56397b517bcb84c61bb62cc703c7ddb3ac536887eb797009d5a5db3c0813dd0bc919b10aaaa0c SHA512 0a90ba5706304caba3adf091418349d0c067b60b185de3df6d9fcfa0b0304dcb0511cbe5f9127bd2c7908ab6c6b6d55aba93b820e57d68fd3b52cefec0e86842
diff --git a/app-text/doxygen/doxygen-1.13.2.ebuild b/app-text/doxygen/doxygen-1.13.2.ebuild
new file mode 100644
index 000000000000..151d76d843dc
--- /dev/null
+++ b/app-text/doxygen/doxygen-1.13.2.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 18 19 20 )
+LLVM_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit cmake flag-o-matic llvm-r1 python-any-r1
+
+DESCRIPTION="Documentation system for most programming languages"
+HOMEPAGE="https://www.doxygen.nl/"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
+else
+	SRC_URI="https://doxygen.nl/files/${P}.src.tar.gz"
+	SRC_URI+=" https://downloads.sourceforge.net/doxygen/rel-${PV}/${P}.src.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+# GPL-2 also for bundled libmscgen
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="clang debug doc dot doxysearch gui test"
+# - We need TeX for tests, bug #765472
+# - We keep the odd construct of noop USE=test because of
+#   the special relationship b/t RESTRICT & USE for tests.
+#   Also, it's a hint which avoids tests being silently skipped during arch testing.
+REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} ) test? ( doc )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-alternatives/yacc
+	app-alternatives/lex
+	${PYTHON_DEPS}
+"
+RDEPEND="
+	app-text/ghostscript-gpl
+	dev-db/sqlite:3
+	dev-lang/perl
+	dev-libs/libfmt:=
+	dev-libs/spdlog:=
+	virtual/libiconv
+	clang? (
+		$(llvm_gen_dep '
+			llvm-core/clang:${LLVM_SLOT}=
+			llvm-core/llvm:${LLVM_SLOT}=
+		')
+	)
+	dot? (
+		media-gfx/graphviz[freetype(+)]
+	)
+	doc? (
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-plaingeneric
+	)
+	doxysearch? ( dev-libs/xapian:= )
+	gui? ( dev-qt/qtbase:6[gui,widgets,xml] )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.9.4-link_with_pthread.patch"
+	"${FILESDIR}/${PN}-1.9.8-suppress-unused-option-libcxx.patch"
+)
+
+DOCS=( LANGUAGE.HOWTO README.md )
+
+pkg_setup() {
+	use clang && llvm-r1_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Call dot with -Teps instead of -Tps for EPS generation - bug #282150
+	sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
+
+	# fix pdf doc
+	sed -i.orig -e "s:g_kowal:g kowal:" \
+		doc/maintainers.txt || die
+
+	if is-flagq "-O3" ; then
+		# TODO: Investigate this and report a bug accordingly...
+		ewarn "Compiling with -O3 is known to produce incorrectly"
+		ewarn "optimized code which breaks doxygen. Using -O2 instead."
+		replace-flags "-O3" "-O2"
+	fi
+}
+
+src_configure() {
+	# Very slow to compile, bug #920092
+	filter-flags -fipa-pta
+	# -Wodr warnings, see bug #854357 and https://github.com/doxygen/doxygen/issues/9287
+	filter-lto
+
+	local mycmakeargs=(
+		-Duse_libclang=$(usex clang)
+		# Let the user choose instead, see also bug #822615
+		-Duse_libc++=OFF
+		-Dbuild_doc=$(usex doc)
+		-Dbuild_search=$(usex doxysearch)
+		-Dbuild_wizard=$(usex gui)
+		-Dforce_qt=Qt6
+		-Duse_sys_spdlog=ON
+		-Duse_sys_sqlite3=ON
+		-DBUILD_SHARED_LIBS=OFF
+		-DGIT_EXECUTABLE="false"
+
+		# Noisy and irrelevant downstream
+		-Wno-dev
+	)
+
+	use doc && mycmakeargs+=(
+		-DDOC_INSTALL_DIR="share/doc/${P}"
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		export VARTEXFONTS="${T}/fonts" # bug #564944
+
+		if ! use dot; then
+			sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
+				{testing/Doxyfile,doc/Doxyfile} \
+				|| die "disabling dot failed"
+		fi
+
+		# -j1 for bug #770070
+		cmake_src_compile docs -j1
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	# manpages are only automatically installed when docs are
+	# https://github.com/doxygen/doxygen/pull/10647
+	doman doc/doxygen.1
+	use gui && doman doc/doxywizard.1
+	use doxysearch && {
+		doman doc/doxyindexer.1
+		doman doc/doxysearch.1
+	}
+}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index f91dbe2e75f6..9f9b33357681 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -13,7 +13,7 @@ DIST poppler-25.03.0.tar.xz.sig 833 BLAKE2B 0304c7b3a53b77463e82ed5118e21dea1d84
 DIST poppler-test-91ee031c882634c36f2f0f2f14eb6646dd542fb9.tar.bz2 5281593 BLAKE2B 84f7be67073bf485ace8e81ffcb6cb402fb288a4bb8c1793bbdbb79f74ef47b4264dd3a0a37635a59ce493d3224628ecd836180c7a5542ac8aed3af158d280f3 SHA512 e1672b5b1d80187fdcbf063b02bebe9f3a38aea989694940c2fd899da489f373ade8e370a3096e9803ba40c488a8dfcca56bfba3140b8c77cdceb9f9d3217b4a
 DIST poppler-test-ff3133cdb6cb496ee1d2c3231bfa35006a5e8410.tar.bz2 5207226 BLAKE2B 15153457989a53301bcdc3468ab2b06b637457199004651b39ea848f488f8a2ba594ce2e36091de4fd06fc0a52b783c6b2ee243ac5d95ce1e9db7483ea880829 SHA512 335cd3d55fc6e28331e791e5b63a08d293abc70764a9f314b2c590c26a5a78b38243c74f988bb95afffe0bdcc54dee1e633dbf1672b19a290be40a298e16995f
 EBUILD poppler-24.11.0-r1.ebuild 4601 BLAKE2B 445cb55f547da3a3c4b0ddfadb7caebf54f82c5d50a5695e54b41443b4c1d362d424de98733a1c8fd9366dac6c254741a394e179dbcde927dbc1f437af283ee6 SHA512 0d05d9637903b61c9ed0095a3f9555cdb6609ef5ea15224f103976c08ad43996ca6261ff25976968f3007d619fdb44fabe145787fd4a30052fd0fc9be6230673
-EBUILD poppler-25.02.0.ebuild 4453 BLAKE2B c718387154f83fa8a8bac940fb65e2a2823ad4c3aeff5854a74afdd9d8c997f0e56bd23d9e929750f8bac421d702164beb5fa55aa1b59498ee839f9abc65abd7 SHA512 8d7f4a549003d33c5f6ce5e3ac62656ac85a3e6f5a859f91ae9d1f710b93d44de722decf072744be21998ee8109082548124c9402230938140bed31d7341f277
+EBUILD poppler-25.02.0.ebuild 4452 BLAKE2B 2fba24d4c8cf79d0b0bd7a47ce82b1e8f788634e7d95efe18489458e6e5a77581bb50e0f7950ec07b3d59c0358fce879454631f06edae0be7fb33068f72de2c8 SHA512 ea8733ad05fe58658e05cd732c7cd74461041245f2e2e746eaf8d3ef1fc86a147cc67129c8d631af0cc57851b8f0925ea5b70ef1aa34428e2781dab42a7a78b7
 EBUILD poppler-25.03.0.ebuild 4455 BLAKE2B bd6e106f93cc49072a9a820f85a74f45d3a97e56640e43d624d50ff5d865150f2576ae8b1f73a8b3476848725599e436d11f76a11d4927245ca240600872d26e SHA512 6c60f2e115454cbe99f1c5021b4e3b7b626174bb1307b58482cb4ad0503eb292232ecd461603a467d313257507e4d7c40c81891369dd2d548d89b2fb925c97ef
 EBUILD poppler-9999.ebuild 4455 BLAKE2B bd6e106f93cc49072a9a820f85a74f45d3a97e56640e43d624d50ff5d865150f2576ae8b1f73a8b3476848725599e436d11f76a11d4927245ca240600872d26e SHA512 6c60f2e115454cbe99f1c5021b4e3b7b626174bb1307b58482cb4ad0503eb292232ecd461603a467d313257507e4d7c40c81891369dd2d548d89b2fb925c97ef
 MISC metadata.xml 1230 BLAKE2B e537b88babbb0c4ef5355c57c226d1c27b8b058e85c437962afe3610cf7dcdd4fea4a7694e508314cc5111d7bf09dc67881f0268a5cc8c2ce1e569a6f8c7699d SHA512 92b0a2fb9bf788eab1187657485698322cec7623da7b861ed5134089d0f3fc05f42138f734aa78bb811679203af2c6bf0dad7e78a091d5a51ba16a2aac60a227
diff --git a/app-text/poppler/poppler-25.02.0.ebuild b/app-text/poppler/poppler-25.02.0.ebuild
index 14b877a194c5..fdb275b68bd8 100644
--- a/app-text/poppler/poppler-25.02.0.ebuild
+++ b/app-text/poppler/poppler-25.02.0.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
 	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	SLOT="0/146"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/robodoc/Manifest b/app-text/robodoc/Manifest
index 88c638ffb683..d873c3aa204f 100644
--- a/app-text/robodoc/Manifest
+++ b/app-text/robodoc/Manifest
@@ -1,5 +1,4 @@
 AUX robodoc-4.99.43_clean_libc.patch 388 BLAKE2B 394a16b5d0ae62318ddb6ed423aa5194ce03409cb1999494ce69325704cbf9204001b846f4dd71bbec5d579c6a0fd26c728625c7627a2f58c11efb44024bc037 SHA512 a81332d40cbb3fc638beb3867d0a31bf78f9d33b567a81b1effae38c6db67b7952faab8e2f62059e2d95e9cd70d18ccdcd8d75aad2e6744cd8e9f35701a4dc9c
 DIST robodoc-4.99.43.tar.gz 310182 BLAKE2B f8f83c50f51e1f690068b881b51a91369bba3c6b1a9be534fd50887abbf6f06cd90706039865bd0ffdd454b4776ab6e5a1d62dbaf12f459bf1eca0e5872f7e29 SHA512 b9d8758512f6921ca773574ed57763b6eaa203134f13839b8b6f89072bb9a5c0b061bcde816ca8cc64ec72aab7566465ffb0ff2f6a0ead66b50058cb5974fff6
 EBUILD robodoc-4.99.43-r1.ebuild 620 BLAKE2B 6c75df0757db56ebaab1e68ed715aa08fc17a44642a289859bce562c01233e5696d6e2e563f7f39670de8615c4fa29ee9c9425bcd661f6588f9042b827d8dee5 SHA512 8f3c03a4cae79f4795c1828988071c4ee5b39fa222465944687fcc52a235c0780cb648bcccca2d11606be4624e5c1f573789da422b5e33cc7dda7bc9aab1acd0
-EBUILD robodoc-4.99.43.ebuild 570 BLAKE2B f4f805f0bf9cf74fbb6ae70ce65a9d3798a84855ea38d2b3c376eb91de0396f71727f21a0036af952e5ab239b18070ef511b4227d8ac7d3359bf35ea91d82fcd SHA512 3eefa446ac0fd6e89043dd2ab9fcb3c5be48bfb978ba3ac784e8dced8533ae9634d9d9ee7c69be7b5c9621fdec711c2fa1e2a892073940bbfab7d42b4491fa2e
-MISC metadata.xml 488 BLAKE2B 2247f70c8c42040cb5bae328e66f4eb311650729cb6bbe4ca8c2c9ffc2abd0cb42ad8a482ae8abf3b508daf946d8eb8dd9cd7c8c0ce6f10bd0f5ec711658c68b SHA512 7d8ea350dba406d1a0c24cc2dc56d8409032f1f18a9c93b18f751ac8200bcba1db0090fc1d320da84b38666c9819224968d1dfe55fb1fa875582e57f6b3fa53f
+MISC metadata.xml 566 BLAKE2B 7cf545a64b3f4b0692bf521b633cd09a02bc2408f0cbd74d1333d11ddcdd3defaaf6839198dd8c7c6611e87c03724076f23b0b24a8e60592c8a8220f95f1f8e1 SHA512 0f3770dfbc59527468f987a693d37693ad62cd1f835589a42a63139674c24b77b343d2f4e9ce97b842083298baaf8eba7bdeb1dfd8fff00cdfebd9d45ee6c495
diff --git a/app-text/robodoc/metadata.xml b/app-text/robodoc/metadata.xml
index dcd3426ebeb1..cda73d2e370b 100644
--- a/app-text/robodoc/metadata.xml
+++ b/app-text/robodoc/metadata.xml
@@ -9,6 +9,9 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">gumpu/ROBODoc</remote-id>
+	</upstream>
 	<use>
 		<flag name="examples">Installs usage examples in /usr/share for Perl</flag>
 	</use>
diff --git a/app-text/robodoc/robodoc-4.99.43.ebuild b/app-text/robodoc/robodoc-4.99.43.ebuild
deleted file mode 100644
index 2055ffdc5a0a..000000000000
--- a/app-text/robodoc/robodoc-4.99.43.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Automating Software Documentation"
-HOMEPAGE="https://www.xs4all.nl/~rfsber/Robo/robodoc.html"
-SRC_URI="https://rfsber.home.xs4all.nl/Robo/archives/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND=">=dev-util/ctags-5.3.1"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	default
-
-	insinto /usr/share/${PN}
-	doins Contributions/*
-
-	if use examples; then
-		insinto /usr/share/${PN}
-		doins -r Examples/PerlExample
-	fi
-}