From b8c7370a682e4e29cda623222d17a790c01c3642 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 7 Aug 2024 12:37:21 +0100
Subject: gentoo auto-resync : 07:08:2024 - 12:37:20

---
 app-text/Manifest.gz                               | Bin 50437 -> 50434 bytes
 app-text/aspell/Manifest                           |   2 +
 app-text/aspell/aspell-0.60.8.1-r1.ebuild          | 113 +++++
 .../aspell/files/aspell-0.60.8.1-gcc-15-fix.patch  |  39 ++
 app-text/barcode/Manifest                          |   2 +-
 app-text/barcode/metadata.xml                      |  11 +-
 app-text/calibre/Manifest                          |  23 +-
 app-text/calibre/calibre-5.44.0-r3.ebuild          |   6 +-
 app-text/calibre/calibre-5.44.0-r5.ebuild          | 265 +++++++++++
 app-text/calibre/calibre-7.10.0.ebuild             | 243 ----------
 app-text/calibre/calibre-7.11.0.ebuild             | 243 ----------
 app-text/calibre/calibre-7.12.0.ebuild             | 243 ----------
 app-text/calibre/calibre-7.13.0.ebuild             |   2 +-
 app-text/calibre/calibre-7.14.0.ebuild             | 243 ----------
 app-text/calibre/calibre-7.16.0.ebuild             | 243 ++++++++++
 app-text/calibre/files/calibre-5.44.0-icu75.patch  |  28 ++
 .../files/calibre-5.44.0-xss-backport.patch        |  33 ++
 .../e9cc00560a28f56a303cca97630ab58e519dd9c8.patch |  35 ++
 app-text/ebook2cw/Manifest                         |   2 +-
 app-text/ebook2cw/ebook2cw-0.8.5.ebuild            |   5 +-
 app-text/epspdf/Manifest                           |   2 +-
 app-text/epspdf/epspdf-0.6.5.1.ebuild              |   2 +-
 app-text/html2text/Manifest                        |   1 +
 app-text/html2text/html2text-2.2.3-r1.ebuild       |  25 +
 app-text/htmlrecode/Manifest                       |   2 +-
 app-text/htmlrecode/htmlrecode-1.3.1-r1.ebuild     |  41 --
 app-text/htmlrecode/htmlrecode-1.3.1-r2.ebuild     |  42 ++
 app-text/katarakt/Manifest                         |   6 +-
 app-text/katarakt/katarakt-0.2.ebuild              |   9 +-
 app-text/katarakt/metadata.xml                     |   2 +-
 app-text/master-pdf-editor/Manifest                |   2 +
 .../master-pdf-editor-5.9.85.ebuild                |  45 ++
 app-text/mythes/Manifest                           |   2 +-
 app-text/mythes/metadata.xml                       |   2 +-
 app-text/pandoc-bin/Manifest                       |  11 +-
 app-text/pandoc-bin/pandoc-bin-3.1.13.ebuild       |  62 ---
 app-text/pandoc-bin/pandoc-bin-3.2.1.ebuild        |   2 +-
 app-text/pandoc-bin/pandoc-bin-3.2.ebuild          |  62 ---
 app-text/pandoc-bin/pandoc-bin-3.3.ebuild          |  62 +++
 app-text/pastebinit/Manifest                       |   2 +-
 app-text/pastebinit/pastebinit-1.7.0.ebuild        |   2 +-
 app-text/pdfjam/Manifest                           |   2 +-
 app-text/pdfjam/pdfjam-3.10-r1.ebuild              |   2 +-
 app-text/poppler/Manifest                          |   2 +-
 app-text/poppler/poppler-24.06.1.ebuild            |   2 +-
 app-text/restview/Manifest                         |   5 +-
 .../restview/files/restview-3.0.1-test-fixes.patch | 171 +++++++
 app-text/restview/restview-3.0.0.ebuild            |  29 --
 app-text/restview/restview-3.0.1.ebuild            |  33 ++
 app-text/texlive-core/Manifest                     |   1 +
 app-text/texlive-core/texlive-core-2023-r10.ebuild | 501 +++++++++++++++++++++
 app-text/texlive/Manifest                          |   2 +-
 app-text/texlive/texlive-2023-r1.ebuild            |   6 +-
 app-text/xpdf/Manifest                             |   1 -
 app-text/xpdf/xpdf-4.04-r1.ebuild                  | 161 -------
 app-text/zeal/Manifest                             |   5 +
 .../zeal/files/add-missing-qt-components.patch     |  10 +
 app-text/zeal/files/disable-werror.patch           |  12 +
 app-text/zeal/files/qt6.patch                      |  11 +
 app-text/zeal/zeal-0.7.1.ebuild                    |  57 +++
 60 files changed, 1790 insertions(+), 1390 deletions(-)
 create mode 100644 app-text/aspell/aspell-0.60.8.1-r1.ebuild
 create mode 100644 app-text/aspell/files/aspell-0.60.8.1-gcc-15-fix.patch
 create mode 100644 app-text/calibre/calibre-5.44.0-r5.ebuild
 delete mode 100644 app-text/calibre/calibre-7.10.0.ebuild
 delete mode 100644 app-text/calibre/calibre-7.11.0.ebuild
 delete mode 100644 app-text/calibre/calibre-7.12.0.ebuild
 delete mode 100644 app-text/calibre/calibre-7.14.0.ebuild
 create mode 100644 app-text/calibre/calibre-7.16.0.ebuild
 create mode 100644 app-text/calibre/files/calibre-5.44.0-icu75.patch
 create mode 100644 app-text/calibre/files/calibre-5.44.0-xss-backport.patch
 create mode 100644 app-text/calibre/files/e9cc00560a28f56a303cca97630ab58e519dd9c8.patch
 create mode 100644 app-text/html2text/html2text-2.2.3-r1.ebuild
 delete mode 100644 app-text/htmlrecode/htmlrecode-1.3.1-r1.ebuild
 create mode 100644 app-text/htmlrecode/htmlrecode-1.3.1-r2.ebuild
 create mode 100644 app-text/master-pdf-editor/master-pdf-editor-5.9.85.ebuild
 delete mode 100644 app-text/pandoc-bin/pandoc-bin-3.1.13.ebuild
 delete mode 100644 app-text/pandoc-bin/pandoc-bin-3.2.ebuild
 create mode 100644 app-text/pandoc-bin/pandoc-bin-3.3.ebuild
 create mode 100644 app-text/restview/files/restview-3.0.1-test-fixes.patch
 delete mode 100644 app-text/restview/restview-3.0.0.ebuild
 create mode 100644 app-text/restview/restview-3.0.1.ebuild
 create mode 100644 app-text/texlive-core/texlive-core-2023-r10.ebuild
 delete mode 100644 app-text/xpdf/xpdf-4.04-r1.ebuild
 create mode 100644 app-text/zeal/files/add-missing-qt-components.patch
 create mode 100644 app-text/zeal/files/disable-werror.patch
 create mode 100644 app-text/zeal/files/qt6.patch
 create mode 100644 app-text/zeal/zeal-0.7.1.ebuild

(limited to 'app-text')

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 6a257649aa9c..f0e95b843482 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest
index f24ebf3f0b86..e5bfab6c544c 100644
--- a/app-text/aspell/Manifest
+++ b/app-text/aspell/Manifest
@@ -3,6 +3,8 @@ AUX aspell-0.60.5-solaris.patch 538 BLAKE2B bafba6f85217bca2f27382ce6f25d511e2db
 AUX aspell-0.60.6-darwin-bundles.patch 967 BLAKE2B 2b159dbac972ad9a246723fd7fbbdd34d611ac1647828fc9ee7afdc70bef326bb11794e80ecfc1b14166fcedc199d880fbc83e54824d333cd2590873a14ae03e SHA512 d1725c48b0fcb77131ad7d8804afd87fc9552993552bbee52164ad9d8b49e9e3ddd6d78b1a519ab242462e4f66f32b375e995aca1feb88faaddb5c036f6cf6eb
 AUX aspell-0.60.6.1-clang.patch 1288 BLAKE2B fa2da2471f3ec3c6d5c9a98c0afd000bd86cd116b8380ea7ef2acdd1ffb1bf4f241fa60222b2228c60cfd643bb5f310c5671a649e71850ec830ec6d5fcc44cf8 SHA512 453e46b6057dc9fba5e80aa9a3c569f5aa2bc04deeebc4951539e6f251babfba0f6ea2e4f51c59d6e870bf69b1ef7d03b76816d7557a6b673ed0d276f0b3244f
 AUX aspell-0.60.6.1-unicode.patch 8273 BLAKE2B ceadde03ffb1904e58c76074444013d2517a20dafeb5847963b6d8e3dbd4ab7fb00fe0d13fd26d3381edeb4e68b2feefb2c8b44186336bdfe197d483920dd509 SHA512 8601183d2e84801c193f5a4412e021ff79ccd27e031c0e8ec85a879619868d13389cb60fb0f4fa971114da64645dd4fc5cbe480f49e88d575826cf429a533b98
+AUX aspell-0.60.8.1-gcc-15-fix.patch 1848 BLAKE2B e61fb13c0fe4b16e69c70d286f505682fe7f0a296a64c7176df6c81d494816424cc7bb914ee11ef8f0a76ab58ea9fad9dcb605a3e810617ad6f35d489a039ddf SHA512 47b282de19f85a040cd3d43fff642e36c63306f0f5fcadcf6e5245e9a094c45990557a386169de4ad0acc923c2295c946187b56d86ea175049208f166853359d
 DIST aspell-0.60.8.1.tar.gz 3567205 BLAKE2B b7e2045658d9553beef9a7fb69264fdd5be22b5b8abce93baf08111ca5bb3e0bfedb9f351d0e4cde9d41e20960b584d8f02c0df02268cf282c925edc8ffbab8d SHA512 80fa9d7f5f4b8bf66388825ae28403713a2e3eda81fc31f2f452c3e2fe8349cd0fa8f0e4d0d3f8cffe215817229af25aa7be2dba358cb9cdc97e9d2834ba5ca7
+EBUILD aspell-0.60.8.1-r1.ebuild 2804 BLAKE2B 653c8427ebf72b568e6e2bfca9700dc1a4a6d0e773192ea1dd03e834b7f7c4340eca309d3531b569d6c9ffb36eed3f6bb4296b39d8599aeb48d814b4bc036749 SHA512 555bb2ccae016692ca532d4afd534ba5479a9bbc94cf50a0b3a63184ccc48253ad4993ec94617bb8dfe676821ab6da72bfd43b3d657663a9ab710b53e9341b84
 EBUILD aspell-0.60.8.1.ebuild 2750 BLAKE2B ce187cf0893da0140e49f8e440b19fd5f022777e6cb7f1f089795b179227e2b0f81894983301dda3ffd1eb5c03b5b78c9dc73be38a7fd80ae472b313721a9ff2 SHA512 3a2ee75e8d0b4c78d5c56a111e1c46fdc9552a8ef66a0ab31d6c97dfa5079cbadde78d0dd6b7530007b401ac839cd726d6aeebec01dd6c3efc37bb0f0b3ac304
 MISC metadata.xml 334 BLAKE2B 21076177b3c8b9885a962e3b809ac5dbd0499a32cd9dd8c2a656fc2f98a2ee17dd605890dd36b4567e9adda542762f4031cd53e4b72c67f712a8a8a015541504 SHA512 698c5fc0cb978c79d99db139581aad79016445eb0edae71b604792127d0a7c1e6c40f614df0afbad154ff0402cbf5685a1949ebf7fc5163b2298b05430c9d0ac
diff --git a/app-text/aspell/aspell-0.60.8.1-r1.ebuild b/app-text/aspell/aspell-0.60.8.1-r1.ebuild
new file mode 100644
index 000000000000..9a89d92f72db
--- /dev/null
+++ b/app-text/aspell/aspell-0.60.8.1-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic libtool
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Free and Open Source spell checker designed to replace Ispell"
+HOMEPAGE="http://aspell.net/"
+SRC_URI="mirror://gnu/aspell/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="nls unicode"
+
+# All available language app-dicts/aspell-* packages.
+LANGUAGES=( af am ar ast az be bg bn br ca cs csb cy da de de-1901 el en eo es et fa
+	fi fo fr fy ga gd gl grc gu gv he hi hil hr hsb hu hus hy ia id is it kn ku
+	ky la lt lv mg mi mk ml mn mr ms mt nb nds nl nn no ny or pa pl pt-PT pt-BR
+	qu ro ru rw sc sk sl sr sv sw ta te tet tk tl tn tr uk uz vi wa yi zu
+)
+
+for LANG in ${LANGUAGES[@]}; do
+	IUSE+=" l10n_${LANG}"
+
+	case ${LANG} in
+		de-1901)
+			DICT="de-alt"
+			;;
+		pt-BR)
+			DICT="pt-br"
+			;;
+		pt-PT)
+			DICT="pt"
+			;;
+		*)
+			DICT="${LANG}"
+			;;
+	esac
+
+	PDEPEND+=" l10n_${LANG}? ( app-dicts/aspell-${DICT} )"
+done
+unset DICT LANG LANGUAGES
+
+RDEPEND="
+	sys-libs/ncurses:=[unicode(+)?]
+	nls? ( virtual/libintl )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+HTML_DOCS=( manual/aspell{,-dev}.html )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.60.5-nls.patch"
+	"${FILESDIR}/${PN}-0.60.5-solaris.patch"
+	"${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch"
+	"${FILESDIR}/${PN}-0.60.6.1-clang.patch"
+	"${FILESDIR}/${PN}-0.60.6.1-unicode.patch"
+	"${FILESDIR}/${PN}-0.60.8.1-gcc-15-fix.patch"
+)
+
+src_prepare() {
+	default
+
+	rm m4/lt* m4/libtool.m4 || die
+	eautoreconf
+	elibtoolize --reverse-deps
+
+	# Parallel install of libtool libraries doesn't always work.
+	# https://lists.gnu.org/archive/html/libtool/2011-03/msg00003.html
+	# This has to be after automake has run so that we don't clobber
+	# the default target that automake creates for us.
+	echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in || die
+
+	# The unicode patch breaks on Darwin as NCURSES_WIDECHAR won't get set any more.
+	[[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-musl* ]] && use unicode && append-cppflags -DNCURSES_WIDECHAR=1
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_enable nls)
+		$(use_enable unicode)
+		--sysconfdir="${EPREFIX}"/etc/aspell
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	docinto examples
+	dodoc "${S}"/examples/*.c
+
+	# Install Aspell/Ispell compatibility scripts.
+	newbin scripts/ispell ispell-aspell
+	newbin scripts/spell spell-aspell
+
+	# As static build has been disabled,
+	# all .la files can be deleted unconditionally.
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/app-text/aspell/files/aspell-0.60.8.1-gcc-15-fix.patch b/app-text/aspell/files/aspell-0.60.8.1-gcc-15-fix.patch
new file mode 100644
index 000000000000..e16b196b599f
--- /dev/null
+++ b/app-text/aspell/files/aspell-0.60.8.1-gcc-15-fix.patch
@@ -0,0 +1,39 @@
+https://git.savannah.gnu.org/cgit/aspell.git/commit/?id=ee6cbb12ff36a1e6618d7388a78dd4e0a2b44041
+
+From ee6cbb12ff36a1e6618d7388a78dd4e0a2b44041 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sun, 21 Jul 2024 22:01:50 +0100
+Subject: modules/speller/default/vector_hash-t.hpp: fix gcc-15 build
+
+Uncoming `gcc-15` added extra checks for template instantiation that is
+guaranteed to fail in
+  https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=313afcfdabeab3e6705ac0bd1273627075be0023
+
+As a result `aspell` build now fails as:
+
+    In file included from modules/speller/default/readonly_ws.cpp:51:
+    modules/speller/default/vector_hash-t.hpp: In member function 'void aspeller::VectorHashTable<Parms>::recalc_size()':
+    modules/speller/default/vector_hash-t.hpp:186:43: error: 'class aspeller::VectorHashTable<Parms>' has no member named 'e'
+      186 |     for (iterator i = begin(); i != this->e; ++i, ++this->_size);
+          |                                           ^
+    modules/speller/default/vector_hash-t.hpp:186:59: error: 'class aspeller::VectorHashTable<Parms>' has no member named '_size'; did you mean 'size'?
+      186 |     for (iterator i = begin(); i != this->e; ++i, ++this->_size);
+          |                                                           ^~~~~
+          |                                                           size
+
+It looks like `_size` is `size_` mis-spelling and `e` was not introduced
+here.
+--- a/modules/speller/default/vector_hash-t.hpp
++++ b/modules/speller/default/vector_hash-t.hpp
+@@ -183,7 +183,7 @@ namespace aspeller {
+   template<class Parms>
+   void VectorHashTable<Parms>::recalc_size() {
+     size_ = 0;
+-    for (iterator i = begin(); i != this->e; ++i, ++this->_size);
++    for (iterator i = begin(), e = end(); i != e; ++i, ++size_);
+   }
+ 
+ }
+-- 
+cgit v1.1
+
diff --git a/app-text/barcode/Manifest b/app-text/barcode/Manifest
index d4768d5898a1..bd130733e894 100644
--- a/app-text/barcode/Manifest
+++ b/app-text/barcode/Manifest
@@ -3,4 +3,4 @@ AUX barcode-0.99-install-static-lib.patch 331 BLAKE2B 72b6a5a31ce3c450587ae7603f
 AUX barcode-0.99-not-a-literal-string.patch 672 BLAKE2B 8a93d8791e875b5b0134a6ad4ee951d6ffda4dbad71a1ae67ad59d6b7dab9726fe37f2c0607e03b2be86eecd6aba4865eab7565bf20f7ae105abb6fceb5bcef8 SHA512 779a05faa1db79dede4fe38a2443a74c7f1dec0f4fdf8b62c4331cab1ac135a22d89d28f2e263ea36b942d548cb9cb57d8ab7e0943513bee4509c620308f89de
 DIST barcode-0.99.tar.xz 586028 BLAKE2B a6ef5a4f0061bd0f0cb65a791516383259f317801e9f5ea02c626735cd3ed5f00e0a92502b9b5e3dcb8ea95c313e10f5abf9c172e1094111dea7f3cfb45ec032 SHA512 1f3015ee9cb2e57e38e56fa48fa3a38fa355821801bad3132d3e87b5b88db4f167986c33dc044317cbf18bb62062af36e946daab98235ff7015a00937c8dd41e
 EBUILD barcode-0.99-r1.ebuild 807 BLAKE2B bbf49cd6a50e9d1f7683699314cfa6d97a3e68a0b6b15ac941d170d1ae6a2cf2debac9b6aa444f09d0b2263f4331a5fd5579b8eeb74dde0c1c953ebdf3f84d3f SHA512 a3fbe4c6c6c05c73874bafda3b35dc9761e52058cf2f964b95815d1b268c35d1652e0d875fe033def8608905e32a49691b5c1826285c8e49d2e5ee4f1e2a7dd8
-MISC metadata.xml 332 BLAKE2B cbd827ae4db4f4230f7ce483ada7e58d976fd4fa5a508e35725ce97dac038416fdb73969f0bdbfe313ae85ddcc8fc9e43bbd5959af3105de8b162abce1267fd3 SHA512 2268bd4b0e057e8a1bddb53e1bb1d82f69d28f62cd02f297b55fe1403c1ded3294912009464ef3b21a3831ccede5c496f24a2c60a11fbfb4586d20fe527fa34a
+MISC metadata.xml 242 BLAKE2B f2bbccc25191a0dbd34a112f759c9439778e4f3994284ad4a71102b1b8cc51af32273e80816980aaa046fdf267a45d65e69d3d3d565a93b9d0111b6c788aae47 SHA512 72ffa43e45f84cb79a949f361685c1012ccc5d546fef520d47f4ed247478b4bf52495f6bce2db963dfb2882c9786a5c2a493c32e93fc17649be152013f01fb55
diff --git a/app-text/barcode/metadata.xml b/app-text/barcode/metadata.xml
index b4e14c04b700..d2ff668c8768 100644
--- a/app-text/barcode/metadata.xml
+++ b/app-text/barcode/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>tamiko@gentoo.org</email>
-    <name>Matthias Maier</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="savannah">barcode</remote-id>
-  </upstream>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="savannah">barcode</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index aefe12396be3..9ca23a6239b0 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -2,25 +2,20 @@ AUX 0001-HTML-Input-Dont-add-resources-that-exist-outside-the.patch 2420 BLAKE2B
 AUX calibre-2.9.0-no_updates_dialog.patch 1661 BLAKE2B c75fc49a621e8dbd16ee1bad748110399cf09a404b4a905d3f723bac1827787e4749f464ba026700b6e5b3cc0ee646a92de00f1f58d10cf12dc9bc91195ee8b6 SHA512 9663b95ed64bdc2bc40692922384d1c6073177eee58a49c412883c4d2ae098e4e0b4ea51b80443108b7c0c3e4f3fda60c00fc3be4d0b62a5d79d982697927235
 AUX calibre-5.35.0-jxr-test.patch 827 BLAKE2B 0a94ac5b12ee2ec732d3ff68979c2060b0b218eee27409b3c351a9cc0b6bccce2260b8b387b442ae10f31483b20bd6d672f7d5424f7d9a8297a1bd14af2f7793 SHA512 259a3b4882bf0fbb01cb22974e219a621a2b337d6f638234a806148b11142fdbf9ac36ae38e71fcb7e18bd61362b34cf3c221ba1df317ec6ea8668591ad2d3ff
 AUX calibre-5.44.0-Fix-compatibility-with-zeroconf-0.73.patch 1065 BLAKE2B 7a74b7d7788340f96b326619f5e2bd916ff21644f0554b2507fcea439eec8217b8b002a2da3b99021fa576a6d3a6fd15d82222f005b8a4fbf37ab5016f33bdb9 SHA512 13f6fc949cc8c5c66013c772cd40429a679fa067d7828cc02e416ecbd556eafb56bebc80bc85a8b442feb3e6b94518450252e701e6426f5a2cde9d102312cf87
+AUX calibre-5.44.0-icu75.patch 1294 BLAKE2B 1f05f84e5653a7c3d9162fc1dc7d91fc73b3346323e05d3c379227deece394e0754a6c2d72223ef2453abf5b062ba3ad3b4705b110bd333e643fa0a35d0a0ad4 SHA512 3eecadbd27cb178f630b80b789d3e3a437d95e883b429473414fd08d9a412a9c32201b7b859d28446523426caff292580c244a86a1b7bb117fa2b7281fd15b5f
+AUX calibre-5.44.0-xss-backport.patch 1272 BLAKE2B 65be0f6b97b387b37faa86f79d84e150f0a2801a8f2bde95497ebf4f292f95a56bf9c49613d727446dfa9afdef6a4f108a28e1c02cb4343bbc717834ae544896 SHA512 d8ae8fbe64c40169efd4a2f090c194d5a032b2d7072b6f7763932597b227fb12f88712290fd902cf639d40fff48a8806226037d6bb89e8bb4d1a7a79d4bdc21f
 AUX calibre-7.0.0-jxr-test.patch 935 BLAKE2B bc38ea2f2d10ec4859ee03ab5d18048df4cf0af5ce4076efc013013bc975966390d618c43ce621675e3b8ee8f929bfaebaa72cf6bb7d8dea544bca77d9772b60 SHA512 db8da42fdcf5b5d5dfad35c128e394cf8f51e57dda6cd1a482803429738515fc1a8b338c711679a11acb93678f35f10883e1bf282e1443ccaafe2eb470fbbfee
 AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcdc857ad468a9b74788326e9424f6ab9058be344dbbac8e49d343f5a1e53ddb486f2018b77319a7f8f713cf4 SHA512 12ef793a5b6ffd4413f780a13cad63927a95f15d17d85d4229eb5005ead68e51779abb822f9898ab5ae8c2094affeec1f9e85c34f109499739e6726b7641542a
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
+AUX e9cc00560a28f56a303cca97630ab58e519dd9c8.patch 1335 BLAKE2B eb71cb5510d2259bbc7a4fe7b54652bb543aa3d26816654da7e22a6effb0c81770a91eccccecff5fe711d0495ff5b1ab378231e3cb10dd18f3faeb301acab1ba SHA512 211ea8c0fab1de5bd076eb965eda51ee1330a69e54251fc6a16e5aa0d6ef7721aea14a57a27eb75a99c8e37418aa15bd311e6f4d03f1f05d80cd87d2f00fb995
 DIST calibre-5.44.0.tar.xz 41015696 BLAKE2B c7053e728da20fccfa981ed4f56e24a4d5b382b7687c92ecb039b078fd4828de0529380093e4ab33f77d78aa54a59758c1620cf8f918937a9a64f13decdf77ee SHA512 3d79e76d820cd1a41605dfd4c1d992599a6e4a759e57a8383d42d86982177e4539313f59e647758ab1896ce5874cb2a93c7678bf962e332c44171651aabf0230
 DIST calibre-5.44.0.tar.xz.sig 566 BLAKE2B 413b95855d79bdb5b17ca5d760f834006797b4d3e413604f27d351a3392e16d647e772dc063306bf973e1156c34f68cb38152a66164bca849ebed5484e7f6065 SHA512 59957bf35a73f218241bf76cc86994d5af87cea11d3b0800e83f157bf0b2cfcaf4b6c1314562e74a1141d0c167fdb1619cb9a90e93b67f55dd55ceed77045059
-DIST calibre-7.10.0.tar.xz 44201168 BLAKE2B 9d851ae6cbf0efd16790351720e1e86efb3dc6efc9d7c29b4e471aa99c7ff46969d594e97a2aca13ca096e77e2ae399f6e888c6846da84f7e093493ad32487a6 SHA512 f01d4c57af7f8390c17231ebc6f2fee4b331a8f143337a128119b8585b6e269b5d531a5245c6f418a8ec51ee440f99ce978b0d102f28cc955a2d31911db3b107
-DIST calibre-7.10.0.tar.xz.sig 566 BLAKE2B ef5aceae5e181e1f1e22e4ef90248e54a77bc35a9da51a152408d11833c35a1e1f131d68c8dbb39303446a6a695694b4aa3b84c16eddd273f79f84bae3a7f073 SHA512 23aa5d044524d23f3bb0cab8cbee1a12f3f147cf1a557703f36eec59e651b63cd6185484515accb4456c3dc3adfb9918eb6b88cd9d205a016232347f1db0ebd1
-DIST calibre-7.11.0.tar.xz 44329708 BLAKE2B 0c5a1ccafb9c192b7f25998174f2b9ea3571d63a6aeca274d72e7e8e8ed27b433a209d805fd35079f01a72201cb01e741f95d8c83265ea39d3c191bf41dab93f SHA512 93216323d23919ce37f3983304f0d5e88847833c52a00a8a780db1c95860d814298358347848a439ff006827742a7c19171ed4d3e3569cd03296a682200e8160
-DIST calibre-7.11.0.tar.xz.sig 566 BLAKE2B 2b035fd2a31f5954de229c932c4aca58c0850a3fdfa793932ef81bd84c4612e65ad12138684932714a85e7be68d21cd808f4008d096121d047ae9bf053b893ca SHA512 ffca64e38e5e402c8fc146dff850a67e0644dcf665c5b0d36f9c9ade6702a980f11dcdf73147412c6ee384110fa8a27168fe5c759ba4754005647f8f656a543b
-DIST calibre-7.12.0.tar.xz 44341928 BLAKE2B 18d3178b9daafaa674949b29528d055dea4e13aad937b8b75e22ac7ec9f9df1aa5c6bd5ca76b151347461077d2e2fc7888a9b46d1c727059db97ea49cb396b1f SHA512 ee654260d7047f0579a659b8907439a407fb561affcef84141126840452e7b98d10bb5e0a69e0cc809d9ba68729570900a0e7251f18b2056a94b0213880f1363
-DIST calibre-7.12.0.tar.xz.sig 566 BLAKE2B 3fb90d638b00e1a9bf481b16e947cf855e89f4c13f5614ef2003fb0447c1131dc4d1a6101dde7e413bc1b9b5ca3812d3f090f00a0f4e14e8029f5b2896286b23 SHA512 12c78975b175f08208a4e7d2b9734b2f886d0cd3804b1d2f32f87190b648a79bf4eac6b0650b74c0e93682ff60f74be74d86a5c02d7e5bd1615c0799b9f6020a
 DIST calibre-7.13.0.tar.xz 44331860 BLAKE2B d5d9d04740dff52e59af0efff30e1044d52d188d58a91a9c8191084e021218feffca15cbde27f12a742e38d6db49168c6c6b64b1df9de5384c1b361ef66ba10b SHA512 b64bba8b6982e2f41b6e1e1d9392a07f15307781a1da3b2f2daca464f1d1303a7ff44af398c0c0edc84dda8090cd47461bf1570daa8ba12496661eae2f3c3bca
 DIST calibre-7.13.0.tar.xz.sig 566 BLAKE2B 40ee9d53eb658623f0047601ddf26bde232b9f4575309faa09ab2ea74b70d8c43fa82a7dc80bb322fca908923661ed8ec33050917196c0f22ff490f9348b266f SHA512 6943ea01c30c8c2ed49f115873cbe1d75484a79deedf734d77ba2326b6f2a2d35994b0219d8e81789e46e8a56d01a19efe8f124c8ebb546b86fa287d8449bf6e
-DIST calibre-7.14.0.tar.xz 44318744 BLAKE2B 3ade17216f3e79440cb113754c54295c3b0c2d09186300475c73d06d5cd592fa3962250ccafb9a26adb63d248f182e8da7c83415e38c506e36e327697aa5bc60 SHA512 718e83f9c11fd9e6a75cb2cee7172bf434ed642fc1e0db23ac6a7a1c7b01264fcd7f8840c12cb5f8184cc31c25c79f0d87255d8e1441b4cffaa9c88e90d4a663
-DIST calibre-7.14.0.tar.xz.sig 566 BLAKE2B 79dad9f35bbd1bc6d06aa8e5cd1a9f9f4ab40f4044795bf285e81b0db02f36e6a1583726ae573c8d43a51577c6e55c96b9a59a0a94d223f4bb7e4d382dfb95d5 SHA512 25ea452efbef8f47498e75ed0485489bd5c97dfbcb6246ec19d5e7ec3b78aa5fad6f8ffac873fdc36f650c755e8011779a3cc326f719e88ad96697d19a7f2cc0
-EBUILD calibre-5.44.0-r3.ebuild 8840 BLAKE2B 7c52f8b0295e74684f14576a9162251738a485b2e8ff2e0628209aa899d6fcd6e163a19ba56d95b174b77937bd4245f7a9fd4db03d09fccd3d1f7fb79f0e58da SHA512 75271d1150dd0cc0f5b5f54e6d9a01d856efd99279d15444b3c93d6c9e88c2260554b135e913f8c16862cb111f8718a4289cb0c276f7c76f867ec4d183e4e88f
-EBUILD calibre-7.10.0.ebuild 7987 BLAKE2B 15c5678554e68f5187d228175e6f65548a1ea9807bf06b7020c8e11b41a7a3e6fd03100d86ca32abc296c300309df7d9165364539cbaec15ca56c1dce03278e9 SHA512 af7c748f66e8a76338d96d20fa7d91d9d09b1bc00d8d187c9b44f952e827fbca63a3eb3d9d81302ce8b84ba911fe4ef711cba9df5b8d4a2dd9ed6d06f3b04c2d
-EBUILD calibre-7.11.0.ebuild 7987 BLAKE2B 15c5678554e68f5187d228175e6f65548a1ea9807bf06b7020c8e11b41a7a3e6fd03100d86ca32abc296c300309df7d9165364539cbaec15ca56c1dce03278e9 SHA512 af7c748f66e8a76338d96d20fa7d91d9d09b1bc00d8d187c9b44f952e827fbca63a3eb3d9d81302ce8b84ba911fe4ef711cba9df5b8d4a2dd9ed6d06f3b04c2d
-EBUILD calibre-7.12.0.ebuild 7987 BLAKE2B 15c5678554e68f5187d228175e6f65548a1ea9807bf06b7020c8e11b41a7a3e6fd03100d86ca32abc296c300309df7d9165364539cbaec15ca56c1dce03278e9 SHA512 af7c748f66e8a76338d96d20fa7d91d9d09b1bc00d8d187c9b44f952e827fbca63a3eb3d9d81302ce8b84ba911fe4ef711cba9df5b8d4a2dd9ed6d06f3b04c2d
-EBUILD calibre-7.13.0.ebuild 7988 BLAKE2B 5776c54bb55d812bd5e70d3f5a21ccd539bb1c64de9187bbe6c8c637ff359d7956cacfcefcc08a6dd41b0bb5df5ed703b54b474c6c5b36d81c3e9a143d45b42a SHA512 cb6518a1d2cd9a71c2b41c47bda28c4ca404578b86b424f0db91bf1a70a8665aa260de79633c64e98e46b18ae74f6f9aa9fddbf33aac19b691bc56899518c390
-EBUILD calibre-7.14.0.ebuild 7988 BLAKE2B 5776c54bb55d812bd5e70d3f5a21ccd539bb1c64de9187bbe6c8c637ff359d7956cacfcefcc08a6dd41b0bb5df5ed703b54b474c6c5b36d81c3e9a143d45b42a SHA512 cb6518a1d2cd9a71c2b41c47bda28c4ca404578b86b424f0db91bf1a70a8665aa260de79633c64e98e46b18ae74f6f9aa9fddbf33aac19b691bc56899518c390
+DIST calibre-7.16.0.tar.xz 44833684 BLAKE2B 2b609a0d014d43998f693a69c10f6d8b0165bf97f8c9d388cf4e1e398e7254b300d53b26e5ec24af651e03bb625bb088331dc77aa2ed6edea13de2beb0e75339 SHA512 5ea11badd972422299ce143e2aa33f58f7abcfd2837acba47d2a7aa6f0997a711245273205ed043c783e5e82bbaaf7cab44e5c03c00e274a03a4ba29be53a708
+DIST calibre-7.16.0.tar.xz.sig 566 BLAKE2B 1d09e8dd49ad53c88632dc23573fa9cd5403d45a308598ac4ed7d4f2dd5a84cc3ae6812ac652ff4a98fc5d67589ad1584411f7746b6b98468bf03a35a0585de6 SHA512 91f3897d95d234a8d673006273974d32cb6c5aa4953d247700d6d89d511c9b1450dc8e222eabf5d1e4d82de206e425ee440defaff38d1ca83efdbf4bcada7c7c
+EBUILD calibre-5.44.0-r3.ebuild 8986 BLAKE2B 3055654a1132d06eb936157d827a147a32be85a0a181ef04b9937375413bfdf7fcf5595c0e60b19a813ef167e40bc5e2f3ab115cfb9c167621ba6b68b9eacfe8 SHA512 486f7b728ecc6fdf2834fdbffc5d46c0dd27a83f73af65aab435f083486726f00b321f6bd2c350dd0bb0676596e0a3602c11a2c65700c89e121e88edbe706e25
+EBUILD calibre-5.44.0-r5.ebuild 8978 BLAKE2B aefccace3b939a72817f8c9cf36f4687d492af4ea84f8b588199dab1134989ebf030ddcf7609c834f4ea3b313dfb403e50af8c5e007309f0b3aa6e036128706b SHA512 63cadd04ff3ffb9b2d27fde04caf7caf43f981dd012cacd36569efc305db15aca09ddaf1875308368a8001e6b047cf44f55ff6a513d9d03428963fb171d4c45b
+EBUILD calibre-7.13.0.ebuild 7987 BLAKE2B 15c5678554e68f5187d228175e6f65548a1ea9807bf06b7020c8e11b41a7a3e6fd03100d86ca32abc296c300309df7d9165364539cbaec15ca56c1dce03278e9 SHA512 af7c748f66e8a76338d96d20fa7d91d9d09b1bc00d8d187c9b44f952e827fbca63a3eb3d9d81302ce8b84ba911fe4ef711cba9df5b8d4a2dd9ed6d06f3b04c2d
+EBUILD calibre-7.16.0.ebuild 7987 BLAKE2B 15c5678554e68f5187d228175e6f65548a1ea9807bf06b7020c8e11b41a7a3e6fd03100d86ca32abc296c300309df7d9165364539cbaec15ca56c1dce03278e9 SHA512 af7c748f66e8a76338d96d20fa7d91d9d09b1bc00d8d187c9b44f952e827fbca63a3eb3d9d81302ce8b84ba911fe4ef711cba9df5b8d4a2dd9ed6d06f3b04c2d
 MISC metadata.xml 745 BLAKE2B 2e1e831d9e6a1f32596b4544a7237c020e2c027a3e872fc517e2557bd8b1be6d0ddb0335f5266159c0e0fbb8776e8d048916e716b77cd011da14bbd51779922d SHA512 3d0ef51069731cac8f751af461367d74151df517cab48c0fd66f1c3a2fab1d3a92f9a06118c700dd782fddbe0055bd379bd79f81f2dbb1adcc5b2a22a443e94d
diff --git a/app-text/calibre/calibre-5.44.0-r3.ebuild b/app-text/calibre/calibre-5.44.0-r3.ebuild
index 34e4e197b419..1ca560b39c37 100644
--- a/app-text/calibre/calibre-5.44.0-r3.ebuild
+++ b/app-text/calibre/calibre-5.44.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="ipv6(+),sqlite,ssl"
 
 inherit toolchain-funcs python-single-r1 qmake-utils verify-sig xdg-utils
@@ -130,6 +130,10 @@ PATCHES=(
 
 	# Security backport for CVE-2023-46303
 	"${FILESDIR}"/0001-HTML-Input-Dont-add-resources-that-exist-outside-the.patch
+	# bug #936270
+	"${FILESDIR}"/${P}-icu75.patch
+	# backport test-only fix for lxml 5
+	"${FILESDIR}"/e9cc00560a28f56a303cca97630ab58e519dd9c8.patch
 )
 
 src_prepare() {
diff --git a/app-text/calibre/calibre-5.44.0-r5.ebuild b/app-text/calibre/calibre-5.44.0-r5.ebuild
new file mode 100644
index 000000000000..73941b1a26cd
--- /dev/null
+++ b/app-text/calibre/calibre-5.44.0-r5.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit edo toolchain-funcs python-single-r1 qmake-utils verify-sig xdg
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="
+	https://download.calibre-ebook.com/${PV}/${P}.tar.xz
+	verify-sig? ( https://calibre-ebook.com/signatures/${P}.tar.xz.sig )
+"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kovidgoyal.gpg
+
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="ios speech +system-mathjax test +udisks unrar"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Qt slotted dependencies are used because the libheadless.so plugin links to
+# QT_*_PRIVATE_ABI. It only uses core/gui/dbus.
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/hunspell-1.7:=
+	>=app-text/podofo-0.9.6_pre20171027:=
+	<app-text/podofo-0.10:=
+	app-text/poppler[utils]
+	dev-libs/hyphen:=
+	>=dev-libs/icu-57.1:=
+	dev-libs/openssl:=
+	dev-libs/snowball-stemmer:=
+	$(python_gen_cond_dep '
+		>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/cchardet[${PYTHON_USEDEP}]
+		>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
+		dev-python/dnspython[${PYTHON_USEDEP}]
+		>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
+		>=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
+		>=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
+		dev-python/jeepney[${PYTHON_USEDEP}]
+		>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
+		dev-python/lxml-html-clean[${PYTHON_USEDEP}]
+		>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+		>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}]
+		>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-3.2.0[jpeg,truetype,webp,zlib,${PYTHON_USEDEP}]
+		>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
+		>=dev-python/pychm-0.8.6[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+		>=dev-python/PyQt5-5.15.5_pre2107091435[gui,widgets,network,printsupport,svg,${PYTHON_USEDEP}]
+		>=dev-python/PyQtWebEngine-5.15.5_pre2108100905[${PYTHON_USEDEP}]
+		dev-python/regex[${PYTHON_USEDEP}]
+		dev-python/zeroconf[${PYTHON_USEDEP}]
+	')
+	dev-qt/qtimageformats:5
+	dev-qt/qtcore:5=
+	dev-qt/qtdbus:5=
+	dev-qt/qtgui:5=[jpeg,png]
+	dev-qt/qtwidgets:5
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
+	media-fonts/liberation-fonts
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.11:=
+	>=media-gfx/optipng-0.7.6
+	virtual/libusb:1=
+	x11-misc/shared-mime-info
+	>=x11-misc/xdg-utils-1.0.2-r2
+	ios? (
+		>=app-pda/usbmuxd-1.0.8
+		>=app-pda/libimobiledevice-1.2.0
+	)
+	speech? ( $(python_gen_cond_dep 'app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]') )
+	system-mathjax? ( >=dev-libs/mathjax-3:= )
+	udisks? ( virtual/libudev )
+	unrar? ( dev-python/unrardll )
+"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( sys-fs/udisks:2 )"
+DEPEND="${COMMON_DEPEND}
+	test? ( $(python_gen_cond_dep '>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]') )
+"
+BDEPEND="$(python_gen_cond_dep '
+		>=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}]
+		>=dev-python/sip-5[${PYTHON_USEDEP}]
+	')
+	>=virtual/podofo-build-0.9.6_pre20171027
+	<virtual/podofo-build-0.10
+	virtual/pkgconfig
+	system-mathjax? ( dev-lang/rapydscript-ng )
+	verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )
+"
+
+PATCHES=(
+	# Skip calling a binary (JxrDecApp) from libjxr which is used for tests
+	# We don't (yet?) package libjxr and it seems to be dead upstream
+	# (last commit in 2017)
+	"${FILESDIR}/${PN}-5.35.0-jxr-test.patch"
+
+	# fix compatibility with recent versions of zeroconf
+	"${FILESDIR}"/${PN}-5.44.0-Fix-compatibility-with-zeroconf-0.73.patch
+
+	# Security backport for CVE-2023-46303
+	"${FILESDIR}"/0001-HTML-Input-Dont-add-resources-that-exist-outside-the.patch
+	# bug #936270
+	"${FILESDIR}"/${P}-icu75.patch
+	# backport test-only fix for lxml 5
+	"${FILESDIR}"/e9cc00560a28f56a303cca97630ab58e519dd9c8.patch
+	# Security backport for CVE-2024-7008
+	"${FILESDIR}"/${P}-xss-backport.patch
+)
+
+src_prepare() {
+	default
+
+	# Warning:
+	#
+	# While it might be rather tempting to add yet another sed here,
+	# please don't. There have been several bugs in Gentoo's packaging
+	# of calibre from seds-which-become-stale. Please consider
+	# creating a patch instead, but in any case, run the test suite
+	# and ensure it passes.
+	#
+	# If in doubt about a problem, checking Fedora's packaging is recommended.
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed failed to patch install.py"
+	sed -e "/^            os.chdir(os.path.join(src_dir, 'build'))$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', os.path.join(os.path.basename(src_dir), 'Makefile')])" \
+		-e "s|open(self.j(bdir, '.qmake.conf'), 'wb').close()|open(self.j(bdir, '.qmake.conf'), 'wb').write(b'QMAKE_LFLAGS += ${LDFLAGS}')|" \
+		-i setup/build.py || die "sed failed to patch build.py"
+
+	# This is only ever used at build time. It contains a small embedded copy
+	# of the rapydscript-ng compiler usable inside of qtwebengine, if you don't
+	# have rapydscript-ng (a nodejs package) itself installed. Its only purpose
+	# is to build some resources that come bundled in dist tarballs already...
+	# and which we may also need to regenerate e.g. to use system-mathjax.
+	#
+	# However, running qtwebengine violates the portage sandbox (among other
+	# things, it tries to create directories in /usr! amazing) so this is a
+	# wash anyway. The only real solution here is to package rapydscript-ng.
+	#
+	# We do not need it at build time, and *no one* needs it at install time.
+	# Delete the cruft.
+	rm -r resources/rapydscript/ || die
+}
+
+src_compile() {
+	# TODO: get qmake called by setup.py to respect CC and CXX too
+	tc-export CC CXX
+
+	# bug 821871
+	local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)"
+	export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}"
+	export QMAKE="$(qt5_get_bindir)/qmake"
+
+	edo ${EPYTHON} setup.py build
+	edo ${EPYTHON} setup.py gui
+
+	# A few different resources are bundled in the distfile by default, because
+	# not all systems necessarily have them. We un-vendor them, using the
+	# upstream integrated approach if possible. See setup/revendor.py and
+	# consider migrating other resources to this if they do not use it, in
+	# *preference* over manual rm'ing.
+	edo ${EPYTHON} setup.py liberation_fonts \
+		--path-to-liberation_fonts "${EPREFIX}"/usr/share/fonts/liberation-fonts \
+		--system-liberation_fonts
+	if use system-mathjax; then
+		edo ${EPYTHON} setup.py mathjax --path-to-mathjax "${EPREFIX}"/usr/share/mathjax --system-mathjax
+		edo ${EPYTHON} setup.py rapydscript
+	fi
+}
+
+src_test() {
+	# Skipped tests:
+	local _test_excludes=(
+		# unpackaged Python dependency: py7zr
+		7z
+		# tests if a completely unused module is bundled
+		pycryptodome
+
+		$(usev !speech speech_dispatcher)
+		$(usev !unrar test_unrar)
+
+		# undocumented reasons
+		test_mem_leaks
+		test_searching
+	)
+
+	edo ${PYTHON} setup.py test "${_test_excludes[@]/#/--exclude-test-name=}"
+}
+
+src_install() {
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANG LANGUAGE ${!LC_*}
+	export LC_ALL=C.utf8 # bug #709682
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export CALIBRE_CONFIG_DIRECTORY="${HOME}/.config/calibre"
+	mkdir -p "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	addpredict /dev/dri #665310
+
+	# If this directory doesn't exist, zsh completion won't install
+	dodir /usr/share/zsh/site-functions
+
+	edo "${PYTHON}" setup.py install \
+		--staging-root="${ED}/usr" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--staging-libdir="${ED}/usr/$(get_libdir)" \
+		--system-plugins-location="${EPREFIX}/usr/share/calibre/system-plugins"
+
+	cp -r man-pages/ "${ED}"/usr/share/man || die
+
+	find "${ED}"/usr/share -type d -empty -delete || die
+
+	python_fix_shebang "${ED}/usr/bin"
+
+	python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)"
+
+	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+}
diff --git a/app-text/calibre/calibre-7.10.0.ebuild b/app-text/calibre/calibre-7.10.0.ebuild
deleted file mode 100644
index 27ed594b785c..000000000000
--- a/app-text/calibre/calibre-7.10.0.ebuild
+++ /dev/null
@@ -1,243 +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} )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit edo toolchain-funcs python-single-r1 qmake-utils verify-sig xdg
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="
-	https://download.calibre-ebook.com/${PV}/${P}.tar.xz
-	verify-sig? ( https://calibre-ebook.com/signatures/${P}.tar.xz.sig )
-"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kovidgoyal.gpg
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="+font-subsetting ios speech +system-mathjax test +udisks unrar"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Qt slotted dependencies are used because the libheadless.so plugin links to
-# QT_*_PRIVATE_ABI. It only uses core/gui/dbus.
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-i18n/uchardet
-	>=app-text/hunspell-1.7:=
-	>=app-text/podofo-0.10.0:=
-	app-text/poppler[utils]
-	dev-libs/hyphen:=
-	>=dev-libs/icu-57.1:=
-	dev-libs/openssl:=
-	dev-libs/snowball-stemmer:=
-	$(python_gen_cond_dep '
-		>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
-		dev-python/dnspython[${PYTHON_USEDEP}]
-		>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
-		>=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
-		>=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
-		dev-python/jeepney[${PYTHON_USEDEP}]
-		>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
-		dev-python/lxml-html-clean[${PYTHON_USEDEP}]
-		>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-		>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
-		>=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}]
-		>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
-		>=dev-python/pillow-3.2.0[jpeg,truetype,webp,zlib,${PYTHON_USEDEP}]
-		>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
-		>=dev-python/pychm-0.8.6[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
-		>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-		dev-python/PyQt6[gui,network,opengl,printsupport,quick,svg,widgets,${PYTHON_USEDEP}]
-		dev-python/PyQt6-WebEngine[widgets,${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]
-		dev-python/xxhash[${PYTHON_USEDEP}]
-		>=dev-python/zeroconf-0.75.0[${PYTHON_USEDEP}]
-	')
-	dev-qt/qtbase:6=[gui,widgets]
-	dev-qt/qtimageformats:6
-	dev-util/desktop-file-utils
-	dev-util/gtk-update-icon-cache
-	media-fonts/liberation-fonts
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.11:=
-	>=media-gfx/optipng-0.7.6
-	virtual/libusb:1=
-	x11-misc/shared-mime-info
-	>=x11-misc/xdg-utils-1.0.2-r2
-	font-subsetting? ( $(python_gen_cond_dep 'dev-python/fonttools[${PYTHON_USEDEP}]') )
-	ios? (
-		>=app-pda/usbmuxd-1.0.8
-		>=app-pda/libimobiledevice-1.2.0
-	)
-	speech? ( $(python_gen_cond_dep 'app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]') )
-	system-mathjax? ( >=dev-libs/mathjax-3:= )
-	udisks? ( virtual/libudev )
-	unrar? ( dev-python/unrardll )
-"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( sys-fs/udisks:2 )"
-DEPEND="${COMMON_DEPEND}
-	test? ( $(python_gen_cond_dep '>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]') )
-"
-BDEPEND="$(python_gen_cond_dep '
-		>=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}]
-		>=dev-python/sip-5[${PYTHON_USEDEP}]
-	')
-	virtual/pkgconfig
-	system-mathjax? ( dev-lang/rapydscript-ng )
-	verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )
-"
-
-PATCHES=(
-	# Skip calling a binary (JxrDecApp) from libjxr which is used for tests
-	# We don't (yet?) package libjxr and it seems to be dead upstream
-	# (last commit in 2017)
-	"${FILESDIR}/${PN}-7.0.0-jxr-test.patch"
-)
-
-src_prepare() {
-	default
-
-	# Warning:
-	#
-	# While it might be rather tempting to add yet another sed here,
-	# please don't. There have been several bugs in Gentoo's packaging
-	# of calibre from seds-which-become-stale. Please consider
-	# creating a patch instead, but in any case, run the test suite
-	# and ensure it passes.
-	#
-	# If in doubt about a problem, checking Fedora's packaging is recommended.
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	# This is only ever used at build time. It contains a small embedded copy
-	# of the rapydscript-ng compiler usable inside of qtwebengine, if you don't
-	# have rapydscript-ng (a nodejs package) itself installed. Its only purpose
-	# is to build some resources that come bundled in dist tarballs already...
-	# and which we may also need to regenerate e.g. to use system-mathjax.
-	#
-	# However, running qtwebengine violates the portage sandbox (among other
-	# things, it tries to create directories in /usr! amazing) so this is a
-	# wash anyway. The only real solution here is to package rapydscript-ng.
-	#
-	# We do not need it at build time, and *no one* needs it at install time.
-	# Delete the cruft.
-	rm -r resources/rapydscript/ || die
-}
-
-src_compile() {
-	# TODO: get qmake called by setup.py to respect CC and CXX too
-	tc-export CC CXX
-
-	# bug 821871
-	local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)"
-	export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}"
-	export QMAKE="$(qt6_get_bindir)/qmake"
-
-	edo ${EPYTHON} setup.py build
-	edo ${EPYTHON} setup.py gui
-
-	# A few different resources are bundled in the distfile by default, because
-	# not all systems necessarily have them. We un-vendor them, using the
-	# upstream integrated approach if possible. See setup/revendor.py and
-	# consider migrating other resources to this if they do not use it, in
-	# *preference* over manual rm'ing.
-	edo ${EPYTHON} setup.py liberation_fonts \
-		--path-to-liberation_fonts "${EPREFIX}"/usr/share/fonts/liberation-fonts \
-		--system-liberation_fonts
-	if use system-mathjax; then
-		edo ${EPYTHON} setup.py mathjax --path-to-mathjax "${EPREFIX}"/usr/share/mathjax --system-mathjax
-		edo ${EPYTHON} setup.py rapydscript
-	fi
-}
-
-src_test() {
-	# Skipped tests:
-	local _test_excludes=(
-		# unpackaged Python dependency: py7zr
-		7z
-		# unpackaged Python dependency: pyzstd
-		test_zstd
-		# tests if a completely unused module is bundled
-		pycryptodome
-
-		$(usev !speech speech_dispatcher)
-		$(usev !unrar test_unrar)
-
-		# undocumented reasons
-		test_mem_leaks
-		test_searching
-	)
-
-	edo ${PYTHON} setup.py test "${_test_excludes[@]/#/--exclude-test-name=}"
-}
-
-src_install() {
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANG LANGUAGE ${!LC_*}
-	export LC_ALL=C.utf8 # bug #709682
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export CALIBRE_CONFIG_DIRECTORY="${HOME}/.config/calibre"
-	mkdir -p "${CALIBRE_CONFIG_DIRECTORY}" || die
-
-	addpredict /dev/dri #665310
-
-	# If this directory doesn't exist, zsh completion won't install
-	dodir /usr/share/zsh/site-functions
-
-	edo "${PYTHON}" setup.py install \
-		--staging-root="${ED}/usr" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--staging-libdir="${ED}/usr/$(get_libdir)" \
-		--system-plugins-location="${EPREFIX}/usr/share/calibre/system-plugins"
-
-	cp -r man-pages/ "${ED}"/usr/share/man || die
-
-	find "${ED}"/usr/share -type d -empty -delete || die
-
-	python_fix_shebang "${ED}/usr/bin"
-
-	python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)"
-
-	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-}
diff --git a/app-text/calibre/calibre-7.11.0.ebuild b/app-text/calibre/calibre-7.11.0.ebuild
deleted file mode 100644
index 27ed594b785c..000000000000
--- a/app-text/calibre/calibre-7.11.0.ebuild
+++ /dev/null
@@ -1,243 +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} )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit edo toolchain-funcs python-single-r1 qmake-utils verify-sig xdg
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="
-	https://download.calibre-ebook.com/${PV}/${P}.tar.xz
-	verify-sig? ( https://calibre-ebook.com/signatures/${P}.tar.xz.sig )
-"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kovidgoyal.gpg
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="+font-subsetting ios speech +system-mathjax test +udisks unrar"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Qt slotted dependencies are used because the libheadless.so plugin links to
-# QT_*_PRIVATE_ABI. It only uses core/gui/dbus.
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-i18n/uchardet
-	>=app-text/hunspell-1.7:=
-	>=app-text/podofo-0.10.0:=
-	app-text/poppler[utils]
-	dev-libs/hyphen:=
-	>=dev-libs/icu-57.1:=
-	dev-libs/openssl:=
-	dev-libs/snowball-stemmer:=
-	$(python_gen_cond_dep '
-		>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
-		dev-python/dnspython[${PYTHON_USEDEP}]
-		>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
-		>=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
-		>=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
-		dev-python/jeepney[${PYTHON_USEDEP}]
-		>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
-		dev-python/lxml-html-clean[${PYTHON_USEDEP}]
-		>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-		>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
-		>=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}]
-		>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
-		>=dev-python/pillow-3.2.0[jpeg,truetype,webp,zlib,${PYTHON_USEDEP}]
-		>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
-		>=dev-python/pychm-0.8.6[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
-		>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-		dev-python/PyQt6[gui,network,opengl,printsupport,quick,svg,widgets,${PYTHON_USEDEP}]
-		dev-python/PyQt6-WebEngine[widgets,${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]
-		dev-python/xxhash[${PYTHON_USEDEP}]
-		>=dev-python/zeroconf-0.75.0[${PYTHON_USEDEP}]
-	')
-	dev-qt/qtbase:6=[gui,widgets]
-	dev-qt/qtimageformats:6
-	dev-util/desktop-file-utils
-	dev-util/gtk-update-icon-cache
-	media-fonts/liberation-fonts
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.11:=
-	>=media-gfx/optipng-0.7.6
-	virtual/libusb:1=
-	x11-misc/shared-mime-info
-	>=x11-misc/xdg-utils-1.0.2-r2
-	font-subsetting? ( $(python_gen_cond_dep 'dev-python/fonttools[${PYTHON_USEDEP}]') )
-	ios? (
-		>=app-pda/usbmuxd-1.0.8
-		>=app-pda/libimobiledevice-1.2.0
-	)
-	speech? ( $(python_gen_cond_dep 'app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]') )
-	system-mathjax? ( >=dev-libs/mathjax-3:= )
-	udisks? ( virtual/libudev )
-	unrar? ( dev-python/unrardll )
-"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( sys-fs/udisks:2 )"
-DEPEND="${COMMON_DEPEND}
-	test? ( $(python_gen_cond_dep '>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]') )
-"
-BDEPEND="$(python_gen_cond_dep '
-		>=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}]
-		>=dev-python/sip-5[${PYTHON_USEDEP}]
-	')
-	virtual/pkgconfig
-	system-mathjax? ( dev-lang/rapydscript-ng )
-	verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )
-"
-
-PATCHES=(
-	# Skip calling a binary (JxrDecApp) from libjxr which is used for tests
-	# We don't (yet?) package libjxr and it seems to be dead upstream
-	# (last commit in 2017)
-	"${FILESDIR}/${PN}-7.0.0-jxr-test.patch"
-)
-
-src_prepare() {
-	default
-
-	# Warning:
-	#
-	# While it might be rather tempting to add yet another sed here,
-	# please don't. There have been several bugs in Gentoo's packaging
-	# of calibre from seds-which-become-stale. Please consider
-	# creating a patch instead, but in any case, run the test suite
-	# and ensure it passes.
-	#
-	# If in doubt about a problem, checking Fedora's packaging is recommended.
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	# This is only ever used at build time. It contains a small embedded copy
-	# of the rapydscript-ng compiler usable inside of qtwebengine, if you don't
-	# have rapydscript-ng (a nodejs package) itself installed. Its only purpose
-	# is to build some resources that come bundled in dist tarballs already...
-	# and which we may also need to regenerate e.g. to use system-mathjax.
-	#
-	# However, running qtwebengine violates the portage sandbox (among other
-	# things, it tries to create directories in /usr! amazing) so this is a
-	# wash anyway. The only real solution here is to package rapydscript-ng.
-	#
-	# We do not need it at build time, and *no one* needs it at install time.
-	# Delete the cruft.
-	rm -r resources/rapydscript/ || die
-}
-
-src_compile() {
-	# TODO: get qmake called by setup.py to respect CC and CXX too
-	tc-export CC CXX
-
-	# bug 821871
-	local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)"
-	export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}"
-	export QMAKE="$(qt6_get_bindir)/qmake"
-
-	edo ${EPYTHON} setup.py build
-	edo ${EPYTHON} setup.py gui
-
-	# A few different resources are bundled in the distfile by default, because
-	# not all systems necessarily have them. We un-vendor them, using the
-	# upstream integrated approach if possible. See setup/revendor.py and
-	# consider migrating other resources to this if they do not use it, in
-	# *preference* over manual rm'ing.
-	edo ${EPYTHON} setup.py liberation_fonts \
-		--path-to-liberation_fonts "${EPREFIX}"/usr/share/fonts/liberation-fonts \
-		--system-liberation_fonts
-	if use system-mathjax; then
-		edo ${EPYTHON} setup.py mathjax --path-to-mathjax "${EPREFIX}"/usr/share/mathjax --system-mathjax
-		edo ${EPYTHON} setup.py rapydscript
-	fi
-}
-
-src_test() {
-	# Skipped tests:
-	local _test_excludes=(
-		# unpackaged Python dependency: py7zr
-		7z
-		# unpackaged Python dependency: pyzstd
-		test_zstd
-		# tests if a completely unused module is bundled
-		pycryptodome
-
-		$(usev !speech speech_dispatcher)
-		$(usev !unrar test_unrar)
-
-		# undocumented reasons
-		test_mem_leaks
-		test_searching
-	)
-
-	edo ${PYTHON} setup.py test "${_test_excludes[@]/#/--exclude-test-name=}"
-}
-
-src_install() {
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANG LANGUAGE ${!LC_*}
-	export LC_ALL=C.utf8 # bug #709682
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export CALIBRE_CONFIG_DIRECTORY="${HOME}/.config/calibre"
-	mkdir -p "${CALIBRE_CONFIG_DIRECTORY}" || die
-
-	addpredict /dev/dri #665310
-
-	# If this directory doesn't exist, zsh completion won't install
-	dodir /usr/share/zsh/site-functions
-
-	edo "${PYTHON}" setup.py install \
-		--staging-root="${ED}/usr" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--staging-libdir="${ED}/usr/$(get_libdir)" \
-		--system-plugins-location="${EPREFIX}/usr/share/calibre/system-plugins"
-
-	cp -r man-pages/ "${ED}"/usr/share/man || die
-
-	find "${ED}"/usr/share -type d -empty -delete || die
-
-	python_fix_shebang "${ED}/usr/bin"
-
-	python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)"
-
-	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-}
diff --git a/app-text/calibre/calibre-7.12.0.ebuild b/app-text/calibre/calibre-7.12.0.ebuild
deleted file mode 100644
index 27ed594b785c..000000000000
--- a/app-text/calibre/calibre-7.12.0.ebuild
+++ /dev/null
@@ -1,243 +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} )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit edo toolchain-funcs python-single-r1 qmake-utils verify-sig xdg
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="
-	https://download.calibre-ebook.com/${PV}/${P}.tar.xz
-	verify-sig? ( https://calibre-ebook.com/signatures/${P}.tar.xz.sig )
-"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kovidgoyal.gpg
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="+font-subsetting ios speech +system-mathjax test +udisks unrar"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Qt slotted dependencies are used because the libheadless.so plugin links to
-# QT_*_PRIVATE_ABI. It only uses core/gui/dbus.
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-i18n/uchardet
-	>=app-text/hunspell-1.7:=
-	>=app-text/podofo-0.10.0:=
-	app-text/poppler[utils]
-	dev-libs/hyphen:=
-	>=dev-libs/icu-57.1:=
-	dev-libs/openssl:=
-	dev-libs/snowball-stemmer:=
-	$(python_gen_cond_dep '
-		>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
-		dev-python/dnspython[${PYTHON_USEDEP}]
-		>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
-		>=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
-		>=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
-		dev-python/jeepney[${PYTHON_USEDEP}]
-		>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
-		dev-python/lxml-html-clean[${PYTHON_USEDEP}]
-		>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-		>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
-		>=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}]
-		>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
-		>=dev-python/pillow-3.2.0[jpeg,truetype,webp,zlib,${PYTHON_USEDEP}]
-		>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
-		>=dev-python/pychm-0.8.6[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
-		>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-		dev-python/PyQt6[gui,network,opengl,printsupport,quick,svg,widgets,${PYTHON_USEDEP}]
-		dev-python/PyQt6-WebEngine[widgets,${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]
-		dev-python/xxhash[${PYTHON_USEDEP}]
-		>=dev-python/zeroconf-0.75.0[${PYTHON_USEDEP}]
-	')
-	dev-qt/qtbase:6=[gui,widgets]
-	dev-qt/qtimageformats:6
-	dev-util/desktop-file-utils
-	dev-util/gtk-update-icon-cache
-	media-fonts/liberation-fonts
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.11:=
-	>=media-gfx/optipng-0.7.6
-	virtual/libusb:1=
-	x11-misc/shared-mime-info
-	>=x11-misc/xdg-utils-1.0.2-r2
-	font-subsetting? ( $(python_gen_cond_dep 'dev-python/fonttools[${PYTHON_USEDEP}]') )
-	ios? (
-		>=app-pda/usbmuxd-1.0.8
-		>=app-pda/libimobiledevice-1.2.0
-	)
-	speech? ( $(python_gen_cond_dep 'app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]') )
-	system-mathjax? ( >=dev-libs/mathjax-3:= )
-	udisks? ( virtual/libudev )
-	unrar? ( dev-python/unrardll )
-"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( sys-fs/udisks:2 )"
-DEPEND="${COMMON_DEPEND}
-	test? ( $(python_gen_cond_dep '>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]') )
-"
-BDEPEND="$(python_gen_cond_dep '
-		>=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}]
-		>=dev-python/sip-5[${PYTHON_USEDEP}]
-	')
-	virtual/pkgconfig
-	system-mathjax? ( dev-lang/rapydscript-ng )
-	verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )
-"
-
-PATCHES=(
-	# Skip calling a binary (JxrDecApp) from libjxr which is used for tests
-	# We don't (yet?) package libjxr and it seems to be dead upstream
-	# (last commit in 2017)
-	"${FILESDIR}/${PN}-7.0.0-jxr-test.patch"
-)
-
-src_prepare() {
-	default
-
-	# Warning:
-	#
-	# While it might be rather tempting to add yet another sed here,
-	# please don't. There have been several bugs in Gentoo's packaging
-	# of calibre from seds-which-become-stale. Please consider
-	# creating a patch instead, but in any case, run the test suite
-	# and ensure it passes.
-	#
-	# If in doubt about a problem, checking Fedora's packaging is recommended.
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	# This is only ever used at build time. It contains a small embedded copy
-	# of the rapydscript-ng compiler usable inside of qtwebengine, if you don't
-	# have rapydscript-ng (a nodejs package) itself installed. Its only purpose
-	# is to build some resources that come bundled in dist tarballs already...
-	# and which we may also need to regenerate e.g. to use system-mathjax.
-	#
-	# However, running qtwebengine violates the portage sandbox (among other
-	# things, it tries to create directories in /usr! amazing) so this is a
-	# wash anyway. The only real solution here is to package rapydscript-ng.
-	#
-	# We do not need it at build time, and *no one* needs it at install time.
-	# Delete the cruft.
-	rm -r resources/rapydscript/ || die
-}
-
-src_compile() {
-	# TODO: get qmake called by setup.py to respect CC and CXX too
-	tc-export CC CXX
-
-	# bug 821871
-	local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)"
-	export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}"
-	export QMAKE="$(qt6_get_bindir)/qmake"
-
-	edo ${EPYTHON} setup.py build
-	edo ${EPYTHON} setup.py gui
-
-	# A few different resources are bundled in the distfile by default, because
-	# not all systems necessarily have them. We un-vendor them, using the
-	# upstream integrated approach if possible. See setup/revendor.py and
-	# consider migrating other resources to this if they do not use it, in
-	# *preference* over manual rm'ing.
-	edo ${EPYTHON} setup.py liberation_fonts \
-		--path-to-liberation_fonts "${EPREFIX}"/usr/share/fonts/liberation-fonts \
-		--system-liberation_fonts
-	if use system-mathjax; then
-		edo ${EPYTHON} setup.py mathjax --path-to-mathjax "${EPREFIX}"/usr/share/mathjax --system-mathjax
-		edo ${EPYTHON} setup.py rapydscript
-	fi
-}
-
-src_test() {
-	# Skipped tests:
-	local _test_excludes=(
-		# unpackaged Python dependency: py7zr
-		7z
-		# unpackaged Python dependency: pyzstd
-		test_zstd
-		# tests if a completely unused module is bundled
-		pycryptodome
-
-		$(usev !speech speech_dispatcher)
-		$(usev !unrar test_unrar)
-
-		# undocumented reasons
-		test_mem_leaks
-		test_searching
-	)
-
-	edo ${PYTHON} setup.py test "${_test_excludes[@]/#/--exclude-test-name=}"
-}
-
-src_install() {
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANG LANGUAGE ${!LC_*}
-	export LC_ALL=C.utf8 # bug #709682
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export CALIBRE_CONFIG_DIRECTORY="${HOME}/.config/calibre"
-	mkdir -p "${CALIBRE_CONFIG_DIRECTORY}" || die
-
-	addpredict /dev/dri #665310
-
-	# If this directory doesn't exist, zsh completion won't install
-	dodir /usr/share/zsh/site-functions
-
-	edo "${PYTHON}" setup.py install \
-		--staging-root="${ED}/usr" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--staging-libdir="${ED}/usr/$(get_libdir)" \
-		--system-plugins-location="${EPREFIX}/usr/share/calibre/system-plugins"
-
-	cp -r man-pages/ "${ED}"/usr/share/man || die
-
-	find "${ED}"/usr/share -type d -empty -delete || die
-
-	python_fix_shebang "${ED}/usr/bin"
-
-	python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)"
-
-	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-}
diff --git a/app-text/calibre/calibre-7.13.0.ebuild b/app-text/calibre/calibre-7.13.0.ebuild
index e42daca289d1..27ed594b785c 100644
--- a/app-text/calibre/calibre-7.13.0.ebuild
+++ b/app-text/calibre/calibre-7.13.0.ebuild
@@ -36,7 +36,7 @@ LICENSE="
 	PSF-2
 "
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="+font-subsetting ios speech +system-mathjax test +udisks unrar"
 
 RESTRICT="!test? ( test )"
diff --git a/app-text/calibre/calibre-7.14.0.ebuild b/app-text/calibre/calibre-7.14.0.ebuild
deleted file mode 100644
index e42daca289d1..000000000000
--- a/app-text/calibre/calibre-7.14.0.ebuild
+++ /dev/null
@@ -1,243 +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} )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit edo toolchain-funcs python-single-r1 qmake-utils verify-sig xdg
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="
-	https://download.calibre-ebook.com/${PV}/${P}.tar.xz
-	verify-sig? ( https://calibre-ebook.com/signatures/${P}.tar.xz.sig )
-"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kovidgoyal.gpg
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="+font-subsetting ios speech +system-mathjax test +udisks unrar"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Qt slotted dependencies are used because the libheadless.so plugin links to
-# QT_*_PRIVATE_ABI. It only uses core/gui/dbus.
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-i18n/uchardet
-	>=app-text/hunspell-1.7:=
-	>=app-text/podofo-0.10.0:=
-	app-text/poppler[utils]
-	dev-libs/hyphen:=
-	>=dev-libs/icu-57.1:=
-	dev-libs/openssl:=
-	dev-libs/snowball-stemmer:=
-	$(python_gen_cond_dep '
-		>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
-		dev-python/dnspython[${PYTHON_USEDEP}]
-		>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
-		>=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
-		>=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
-		dev-python/jeepney[${PYTHON_USEDEP}]
-		>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
-		dev-python/lxml-html-clean[${PYTHON_USEDEP}]
-		>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-		>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
-		>=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}]
-		>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
-		>=dev-python/pillow-3.2.0[jpeg,truetype,webp,zlib,${PYTHON_USEDEP}]
-		>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
-		>=dev-python/pychm-0.8.6[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
-		>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-		dev-python/PyQt6[gui,network,opengl,printsupport,quick,svg,widgets,${PYTHON_USEDEP}]
-		dev-python/PyQt6-WebEngine[widgets,${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]
-		dev-python/xxhash[${PYTHON_USEDEP}]
-		>=dev-python/zeroconf-0.75.0[${PYTHON_USEDEP}]
-	')
-	dev-qt/qtbase:6=[gui,widgets]
-	dev-qt/qtimageformats:6
-	dev-util/desktop-file-utils
-	dev-util/gtk-update-icon-cache
-	media-fonts/liberation-fonts
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.11:=
-	>=media-gfx/optipng-0.7.6
-	virtual/libusb:1=
-	x11-misc/shared-mime-info
-	>=x11-misc/xdg-utils-1.0.2-r2
-	font-subsetting? ( $(python_gen_cond_dep 'dev-python/fonttools[${PYTHON_USEDEP}]') )
-	ios? (
-		>=app-pda/usbmuxd-1.0.8
-		>=app-pda/libimobiledevice-1.2.0
-	)
-	speech? ( $(python_gen_cond_dep 'app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]') )
-	system-mathjax? ( >=dev-libs/mathjax-3:= )
-	udisks? ( virtual/libudev )
-	unrar? ( dev-python/unrardll )
-"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( sys-fs/udisks:2 )"
-DEPEND="${COMMON_DEPEND}
-	test? ( $(python_gen_cond_dep '>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]') )
-"
-BDEPEND="$(python_gen_cond_dep '
-		>=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}]
-		>=dev-python/sip-5[${PYTHON_USEDEP}]
-	')
-	virtual/pkgconfig
-	system-mathjax? ( dev-lang/rapydscript-ng )
-	verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )
-"
-
-PATCHES=(
-	# Skip calling a binary (JxrDecApp) from libjxr which is used for tests
-	# We don't (yet?) package libjxr and it seems to be dead upstream
-	# (last commit in 2017)
-	"${FILESDIR}/${PN}-7.0.0-jxr-test.patch"
-)
-
-src_prepare() {
-	default
-
-	# Warning:
-	#
-	# While it might be rather tempting to add yet another sed here,
-	# please don't. There have been several bugs in Gentoo's packaging
-	# of calibre from seds-which-become-stale. Please consider
-	# creating a patch instead, but in any case, run the test suite
-	# and ensure it passes.
-	#
-	# If in doubt about a problem, checking Fedora's packaging is recommended.
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	# This is only ever used at build time. It contains a small embedded copy
-	# of the rapydscript-ng compiler usable inside of qtwebengine, if you don't
-	# have rapydscript-ng (a nodejs package) itself installed. Its only purpose
-	# is to build some resources that come bundled in dist tarballs already...
-	# and which we may also need to regenerate e.g. to use system-mathjax.
-	#
-	# However, running qtwebengine violates the portage sandbox (among other
-	# things, it tries to create directories in /usr! amazing) so this is a
-	# wash anyway. The only real solution here is to package rapydscript-ng.
-	#
-	# We do not need it at build time, and *no one* needs it at install time.
-	# Delete the cruft.
-	rm -r resources/rapydscript/ || die
-}
-
-src_compile() {
-	# TODO: get qmake called by setup.py to respect CC and CXX too
-	tc-export CC CXX
-
-	# bug 821871
-	local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)"
-	export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}"
-	export QMAKE="$(qt6_get_bindir)/qmake"
-
-	edo ${EPYTHON} setup.py build
-	edo ${EPYTHON} setup.py gui
-
-	# A few different resources are bundled in the distfile by default, because
-	# not all systems necessarily have them. We un-vendor them, using the
-	# upstream integrated approach if possible. See setup/revendor.py and
-	# consider migrating other resources to this if they do not use it, in
-	# *preference* over manual rm'ing.
-	edo ${EPYTHON} setup.py liberation_fonts \
-		--path-to-liberation_fonts "${EPREFIX}"/usr/share/fonts/liberation-fonts \
-		--system-liberation_fonts
-	if use system-mathjax; then
-		edo ${EPYTHON} setup.py mathjax --path-to-mathjax "${EPREFIX}"/usr/share/mathjax --system-mathjax
-		edo ${EPYTHON} setup.py rapydscript
-	fi
-}
-
-src_test() {
-	# Skipped tests:
-	local _test_excludes=(
-		# unpackaged Python dependency: py7zr
-		7z
-		# unpackaged Python dependency: pyzstd
-		test_zstd
-		# tests if a completely unused module is bundled
-		pycryptodome
-
-		$(usev !speech speech_dispatcher)
-		$(usev !unrar test_unrar)
-
-		# undocumented reasons
-		test_mem_leaks
-		test_searching
-	)
-
-	edo ${PYTHON} setup.py test "${_test_excludes[@]/#/--exclude-test-name=}"
-}
-
-src_install() {
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANG LANGUAGE ${!LC_*}
-	export LC_ALL=C.utf8 # bug #709682
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export CALIBRE_CONFIG_DIRECTORY="${HOME}/.config/calibre"
-	mkdir -p "${CALIBRE_CONFIG_DIRECTORY}" || die
-
-	addpredict /dev/dri #665310
-
-	# If this directory doesn't exist, zsh completion won't install
-	dodir /usr/share/zsh/site-functions
-
-	edo "${PYTHON}" setup.py install \
-		--staging-root="${ED}/usr" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--staging-libdir="${ED}/usr/$(get_libdir)" \
-		--system-plugins-location="${EPREFIX}/usr/share/calibre/system-plugins"
-
-	cp -r man-pages/ "${ED}"/usr/share/man || die
-
-	find "${ED}"/usr/share -type d -empty -delete || die
-
-	python_fix_shebang "${ED}/usr/bin"
-
-	python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)"
-
-	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-}
diff --git a/app-text/calibre/calibre-7.16.0.ebuild b/app-text/calibre/calibre-7.16.0.ebuild
new file mode 100644
index 000000000000..27ed594b785c
--- /dev/null
+++ b/app-text/calibre/calibre-7.16.0.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit edo toolchain-funcs python-single-r1 qmake-utils verify-sig xdg
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="
+	https://download.calibre-ebook.com/${PV}/${P}.tar.xz
+	verify-sig? ( https://calibre-ebook.com/signatures/${P}.tar.xz.sig )
+"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kovidgoyal.gpg
+
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+"
+SLOT="0"
+KEYWORDS="amd64 ~arm64"
+IUSE="+font-subsetting ios speech +system-mathjax test +udisks unrar"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Qt slotted dependencies are used because the libheadless.so plugin links to
+# QT_*_PRIVATE_ABI. It only uses core/gui/dbus.
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-i18n/uchardet
+	>=app-text/hunspell-1.7:=
+	>=app-text/podofo-0.10.0:=
+	app-text/poppler[utils]
+	dev-libs/hyphen:=
+	>=dev-libs/icu-57.1:=
+	dev-libs/openssl:=
+	dev-libs/snowball-stemmer:=
+	$(python_gen_cond_dep '
+		>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
+		dev-python/dnspython[${PYTHON_USEDEP}]
+		>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
+		>=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
+		>=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
+		dev-python/jeepney[${PYTHON_USEDEP}]
+		>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
+		dev-python/lxml-html-clean[${PYTHON_USEDEP}]
+		>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+		>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}]
+		>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-3.2.0[jpeg,truetype,webp,zlib,${PYTHON_USEDEP}]
+		>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
+		>=dev-python/pychm-0.8.6[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+		dev-python/PyQt6[gui,network,opengl,printsupport,quick,svg,widgets,${PYTHON_USEDEP}]
+		dev-python/PyQt6-WebEngine[widgets,${PYTHON_USEDEP}]
+		dev-python/regex[${PYTHON_USEDEP}]
+		dev-python/xxhash[${PYTHON_USEDEP}]
+		>=dev-python/zeroconf-0.75.0[${PYTHON_USEDEP}]
+	')
+	dev-qt/qtbase:6=[gui,widgets]
+	dev-qt/qtimageformats:6
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
+	media-fonts/liberation-fonts
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.11:=
+	>=media-gfx/optipng-0.7.6
+	virtual/libusb:1=
+	x11-misc/shared-mime-info
+	>=x11-misc/xdg-utils-1.0.2-r2
+	font-subsetting? ( $(python_gen_cond_dep 'dev-python/fonttools[${PYTHON_USEDEP}]') )
+	ios? (
+		>=app-pda/usbmuxd-1.0.8
+		>=app-pda/libimobiledevice-1.2.0
+	)
+	speech? ( $(python_gen_cond_dep 'app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]') )
+	system-mathjax? ( >=dev-libs/mathjax-3:= )
+	udisks? ( virtual/libudev )
+	unrar? ( dev-python/unrardll )
+"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( sys-fs/udisks:2 )"
+DEPEND="${COMMON_DEPEND}
+	test? ( $(python_gen_cond_dep '>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]') )
+"
+BDEPEND="$(python_gen_cond_dep '
+		>=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}]
+		>=dev-python/sip-5[${PYTHON_USEDEP}]
+	')
+	virtual/pkgconfig
+	system-mathjax? ( dev-lang/rapydscript-ng )
+	verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )
+"
+
+PATCHES=(
+	# Skip calling a binary (JxrDecApp) from libjxr which is used for tests
+	# We don't (yet?) package libjxr and it seems to be dead upstream
+	# (last commit in 2017)
+	"${FILESDIR}/${PN}-7.0.0-jxr-test.patch"
+)
+
+src_prepare() {
+	default
+
+	# Warning:
+	#
+	# While it might be rather tempting to add yet another sed here,
+	# please don't. There have been several bugs in Gentoo's packaging
+	# of calibre from seds-which-become-stale. Please consider
+	# creating a patch instead, but in any case, run the test suite
+	# and ensure it passes.
+	#
+	# If in doubt about a problem, checking Fedora's packaging is recommended.
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed failed to patch install.py"
+
+	# This is only ever used at build time. It contains a small embedded copy
+	# of the rapydscript-ng compiler usable inside of qtwebengine, if you don't
+	# have rapydscript-ng (a nodejs package) itself installed. Its only purpose
+	# is to build some resources that come bundled in dist tarballs already...
+	# and which we may also need to regenerate e.g. to use system-mathjax.
+	#
+	# However, running qtwebengine violates the portage sandbox (among other
+	# things, it tries to create directories in /usr! amazing) so this is a
+	# wash anyway. The only real solution here is to package rapydscript-ng.
+	#
+	# We do not need it at build time, and *no one* needs it at install time.
+	# Delete the cruft.
+	rm -r resources/rapydscript/ || die
+}
+
+src_compile() {
+	# TODO: get qmake called by setup.py to respect CC and CXX too
+	tc-export CC CXX
+
+	# bug 821871
+	local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)"
+	export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}"
+	export QMAKE="$(qt6_get_bindir)/qmake"
+
+	edo ${EPYTHON} setup.py build
+	edo ${EPYTHON} setup.py gui
+
+	# A few different resources are bundled in the distfile by default, because
+	# not all systems necessarily have them. We un-vendor them, using the
+	# upstream integrated approach if possible. See setup/revendor.py and
+	# consider migrating other resources to this if they do not use it, in
+	# *preference* over manual rm'ing.
+	edo ${EPYTHON} setup.py liberation_fonts \
+		--path-to-liberation_fonts "${EPREFIX}"/usr/share/fonts/liberation-fonts \
+		--system-liberation_fonts
+	if use system-mathjax; then
+		edo ${EPYTHON} setup.py mathjax --path-to-mathjax "${EPREFIX}"/usr/share/mathjax --system-mathjax
+		edo ${EPYTHON} setup.py rapydscript
+	fi
+}
+
+src_test() {
+	# Skipped tests:
+	local _test_excludes=(
+		# unpackaged Python dependency: py7zr
+		7z
+		# unpackaged Python dependency: pyzstd
+		test_zstd
+		# tests if a completely unused module is bundled
+		pycryptodome
+
+		$(usev !speech speech_dispatcher)
+		$(usev !unrar test_unrar)
+
+		# undocumented reasons
+		test_mem_leaks
+		test_searching
+	)
+
+	edo ${PYTHON} setup.py test "${_test_excludes[@]/#/--exclude-test-name=}"
+}
+
+src_install() {
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANG LANGUAGE ${!LC_*}
+	export LC_ALL=C.utf8 # bug #709682
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export CALIBRE_CONFIG_DIRECTORY="${HOME}/.config/calibre"
+	mkdir -p "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	addpredict /dev/dri #665310
+
+	# If this directory doesn't exist, zsh completion won't install
+	dodir /usr/share/zsh/site-functions
+
+	edo "${PYTHON}" setup.py install \
+		--staging-root="${ED}/usr" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--staging-libdir="${ED}/usr/$(get_libdir)" \
+		--system-plugins-location="${EPREFIX}/usr/share/calibre/system-plugins"
+
+	cp -r man-pages/ "${ED}"/usr/share/man || die
+
+	find "${ED}"/usr/share -type d -empty -delete || die
+
+	python_fix_shebang "${ED}/usr/bin"
+
+	python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)"
+
+	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+}
diff --git a/app-text/calibre/files/calibre-5.44.0-icu75.patch b/app-text/calibre/files/calibre-5.44.0-icu75.patch
new file mode 100644
index 000000000000..3f79a9b4f79f
--- /dev/null
+++ b/app-text/calibre/files/calibre-5.44.0-icu75.patch
@@ -0,0 +1,28 @@
+logical changes backported from:
+https://github.com/kovidgoyal/calibre/commit/a3d3d8d33e314ccabb5099e78e4056a79b7c9aa2
+https://bugs.gentoo.org/936270
+
+diff -rup a/setup/build.py b/setup/build.py
+--- a/setup/build.py	2022-06-17 04:35:27.000000000 +0200
++++ b/setup/build.py	2024-07-19 11:51:56.374389213 +0200
+@@ -65,6 +65,8 @@ class Extension:
+                     self.cflags.insert(0, '-std=c++11')
+                 elif kwargs.get('needs_c++14'):
+                     self.cflags.insert(0, '-std=c++14')
++                elif kwargs.get('needs_c++17'):
++                    self.cflags.insert(0, '-std=c++17')
+             else:
+                 if kwargs.get('needs_c99'):
+                     self.cflags.insert(0, '-std=c99')
+diff -rup a/setup/extensions.json b/setup/extensions.json
+--- a/setup/extensions.json	2022-06-17 04:35:27.000000000 +0200
++++ b/setup/extensions.json	2024-07-19 11:52:11.253389395 +0200
+@@ -75,7 +75,7 @@
+         "name": "sqlite_extension",
+         "headers": "calibre/utils/cpp_binding.h",
+         "sources": "calibre/db/sqlite_extension.cpp",
+-		"needs_c++14": true,
++		"needs_c++17": true,
+         "libraries": "icudata icui18n icuuc icuio stemmer",
+         "windows_libraries": "icudt icuin icuuc icuio libstemmer",
+         "lib_dirs": "!icu_lib_dirs",
diff --git a/app-text/calibre/files/calibre-5.44.0-xss-backport.patch b/app-text/calibre/files/calibre-5.44.0-xss-backport.patch
new file mode 100644
index 000000000000..83bb8cca8cf5
--- /dev/null
+++ b/app-text/calibre/files/calibre-5.44.0-xss-backport.patch
@@ -0,0 +1,33 @@
+Changelog:
+
+Only relevant if you embed the calibre server within a larger server, it
+means attackers who can convince users to click on a specially crafted
+link, can run JavaScript code with the same origin as the larger server
+calibre is embedded in.
+
+From e75f85919a3c3a5f2d87861050d8483d66561c06 Mon Sep 17 00:00:00 2001
+From: Kovid Goyal <kovid@kovidgoyal.net>
+Date: Tue, 30 Jul 2024 13:40:21 +0530
+Subject: [PATCH] Fix #2075130 [Private
+ bug](https://bugs.launchpad.net/calibre/+bug/2075130)
+
+---
+ src/calibre/srv/legacy.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/calibre/srv/legacy.py b/src/calibre/srv/legacy.py
+index 055228ebee..85586b07a6 100644
+--- a/src/calibre/srv/legacy.py
++++ b/src/calibre/srv/legacy.py
+@@ -255,7 +255,7 @@ def browse(ctx, rd, rest):
+     if rest.startswith('book/'):
+         # implementation of https://bugs.launchpad.net/calibre/+bug/1698411
+         # redirect old server book URLs to new URLs
+-        redirect = ctx.url_for(None) + '#book_id=' + rest[5:] + "&amp;panel=book_details"
++        redirect = ctx.url_for(None) + '#book_id=' + int(rest[5:]) + "&amp;panel=book_details"
+         from lxml import etree as ET
+         return html(ctx, rd, endpoint,
+                  E.html(E.head(
+-- 
+2.44.2
+
diff --git a/app-text/calibre/files/e9cc00560a28f56a303cca97630ab58e519dd9c8.patch b/app-text/calibre/files/e9cc00560a28f56a303cca97630ab58e519dd9c8.patch
new file mode 100644
index 000000000000..deae34e201e3
--- /dev/null
+++ b/app-text/calibre/files/e9cc00560a28f56a303cca97630ab58e519dd9c8.patch
@@ -0,0 +1,35 @@
+From e9cc00560a28f56a303cca97630ab58e519dd9c8 Mon Sep 17 00:00:00 2001
+From: Kovid Goyal <kovid@kovidgoyal.net>
+Date: Mon, 8 Jan 2024 09:12:35 +0530
+Subject: [PATCH] Fix #2048475 [Tests fail with lxml
+ 5.0](https://bugs.launchpad.net/calibre/+bug/2048475)
+
+---
+ src/calibre/utils/xml_parse.py | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/calibre/utils/xml_parse.py b/src/calibre/utils/xml_parse.py
+index a31c6ed83ed7..339538b90057 100644
+--- a/src/calibre/utils/xml_parse.py
++++ b/src/calibre/utils/xml_parse.py
+@@ -36,6 +36,11 @@ def safe_xml_fromstring(string_or_bytes, recover=True):
+     return ans
+ 
+ 
++def unsafe_xml_fromstring(string_or_bytes):
++    parser = etree.XMLParser(resolve_entities=True)
++    return fs(string_or_bytes, parser=parser)
++
++
+ def find_tests():
+     import unittest, tempfile, os
+     from calibre.constants import iswindows
+@@ -61,7 +66,7 @@ def t(tid, val, expected, safe=True):
+                 raw = templ.format(id=tid, val=val)
+                 err = None
+                 try:
+-                    root = safe_xml_fromstring(raw) if safe else etree.fromstring(raw)
++                    root = safe_xml_fromstring(raw) if safe else unsafe_xml_fromstring(raw)
+                 except Exception as e:
+                     err = str(e)
+                     root = None
diff --git a/app-text/ebook2cw/Manifest b/app-text/ebook2cw/Manifest
index 947fd984fe7d..4e8169a8f210 100644
--- a/app-text/ebook2cw/Manifest
+++ b/app-text/ebook2cw/Manifest
@@ -1,3 +1,3 @@
 DIST ebook2cw-0.8.5.tar.gz 34619 BLAKE2B 898a8bb6307a10c33085aca9d172cc145ec9fd1ccb8e76b2be051fd144097ff78f554c01af7540943e2042002b70b25106f615d7e3e9fcfa4f1dfde9cf7f5244 SHA512 88f1b42f1d9e96d34b923e31d78b597d00e2696cf4361fb7b2ebeda791f5e6df14bb60d152036d179c16ddceb35577f136a4bc959171faebc0fb5e0ea1877e4b
-EBUILD ebook2cw-0.8.5.ebuild 671 BLAKE2B 19702fcc9ced7df5291d41f9c881a914a9557959e422f5cfb847d4e59e9b3dd9cc31ae6390f1a170cab7a331a6fd86ef4f6a233d18035043d570c40e9b874175 SHA512 082d599828afac3198b576e52a4817a6c206ea683067bc5fcb0fbe244aa66bb86c233817fe89f698e5be1c0b9360304c41649488101a76c64797d619daa1cb9a
+EBUILD ebook2cw-0.8.5.ebuild 661 BLAKE2B 6e469ec0978189c521e7547991a0b4580e168cb802d6be98f53bbd1407c2fce1c494c11afaf12c23c8c2391bb5e34bfd6a717df4a6817a7b13dd08674b4e6a67 SHA512 2670a767b6d2e5ec9bff5d7df359056b66a3e9781ae744e31953f7b386587a19b1991c2e3386a54e2eb6e24c8c3d29138089b5c116c9bc2ca95a153cd8e40e77
 MISC metadata.xml 250 BLAKE2B 73afdd27824ddad49c748f845fb81e8b64d10b29a271175198b7c893096d6d5c64bf736446ec01c9679b7978925de4df8159761e1c3fdb83436468c882a72f85 SHA512 f5d1c70de88ecdf2edd6f5d68f44e26fd99705a91c52269b39c03240b06ab1d8299d03a2af5828c8f22198ec1188f14f957064c8459f27a8f2efea25398bdf4d
diff --git a/app-text/ebook2cw/ebook2cw-0.8.5.ebuild b/app-text/ebook2cw/ebook2cw-0.8.5.ebuild
index 9ff5b441d55c..74457d2ebded 100644
--- a/app-text/ebook2cw/ebook2cw-0.8.5.ebuild
+++ b/app-text/ebook2cw/ebook2cw-0.8.5.ebuild
@@ -9,14 +9,13 @@ SRC_URI="https://fkurz.net/ham/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
+KEYWORDS="amd64"
 
 DEPEND="
 	media-sound/lame
 	media-libs/libvorbis
 	media-libs/libogg
-	"
+"
 
 src_prepare() {
 	# avoid prestripping of 'qrq' binary
diff --git a/app-text/epspdf/Manifest b/app-text/epspdf/Manifest
index 93c29d992e26..f76d9c26432b 100644
--- a/app-text/epspdf/Manifest
+++ b/app-text/epspdf/Manifest
@@ -2,6 +2,6 @@ DIST epspdf-0.6.5.1.zip 445167 BLAKE2B 2e1ee1e04e8731fdfb085596a463b897714a460f7
 DIST epspdf-0.6.5.zip 331312 BLAKE2B 3bd2c9cd432172c38efe33d08068f20fddf169d5d7bc94c9f1720cf379de9ba54aedb1cb6fd438b721c2e98f24dfd1ca4b3dab5c1fe01a71791748f952832ac9 SHA512 28ef12546a957c62fd94b405b53359898d46c825bad8fd2167b5ab23bb2a6ea457ccbcc8263b31574e128ebe56e21b30fae27d406397df3fdc1506a088ab41f4
 DIST epspdf.0.6.3.tgz 335975 BLAKE2B aacd6e222bfe74636dba796fd6e878fa9970f469d096eb77acf4a336a0ab5620629de7ba1c763afa62b181887724db55be57d1929a041a945c7d74ea3028d6de SHA512 ddb0d8c17b6b0bbb934312e6253a2b689d2545c892af989efac9782022c501109f2ff57bb2ea7c26d63d7747e2a510c18bd22a6076bb7137fe0252c38b2125ea
 EBUILD epspdf-0.6.3-r1.ebuild 1299 BLAKE2B acc7cf4acdc3e533f261b6cb4d64fc95c43550bdf9267daa6255fe6a4d64c9be5ca17c88ab661e12b41978ab58bf84490d6ce95546cfc1f799598b9e6f32791c SHA512 8a02dba4944b8bead5a545db55a098ddb1e7957b5c5065adba1c5eeedf3e76a0e2e534ded715bf6e06eec313f3ffa100039f62b379c87ed1a30d9f38018afb9f
-EBUILD epspdf-0.6.5.1.ebuild 1369 BLAKE2B a01a79f68a2bbdc4db7bd5c08a828b38ad191050ae7fbb158436f49665740b614ce27d3ce1de201bf96738d650602b63e831afb72c1ef3175228e13950678c27 SHA512 545a00458cd7a907ecbbebc7b47f1edc4e431052d146957ebbced1ef732cd9b0c7736ce236df331554c976c5ce49f04efe77a5521c6572afcfb315867357537d
+EBUILD epspdf-0.6.5.1.ebuild 1365 BLAKE2B d89183bd036c936ce8ba7a786205e3ecb0f5f6356c23c0e5190462091fa6d59b260825384da034d05356aaf90a1a6c9ee64eafdb111844954da552beb8bb35d6 SHA512 b8f6d2ea5c8b743fadef597eacb819ae7a73cef7e6a62a3cf066437a08f16baf02754c4587ddebfbf69620ed004f5430f77c92658311277f6445d2bf35b3a2ae
 EBUILD epspdf-0.6.5.ebuild 1318 BLAKE2B f7d54124a7b2c56179c21f3e1e70ad5b15728e5650a41394d89392748c6fb0758d20c4a1cb5e9d6df3dfebbdead2f19ac6635311e74642187f2dbf31040b2a28 SHA512 e14ec3bedf7357bc6c1e9e5d425e3a61ee0624f5b4b281dae7901d0e72ea8f900b2bfb634f562b18596e6afd9e8bbfbacb59c5bc248dc09c4fcf59bf23f906ab
 MISC metadata.xml 246 BLAKE2B b56c934f8eecd3492d6abe15cf5883fdbc1979c37abbc5ad196e345ee17bb865db5eab10ac7de93bbfce94c4e865bf6b86d5f8bc081b5cb1d3d58d1158b81921 SHA512 b61f56c5e078714565ff9e33c81217e788f78bae9cf10d6ca78a82703a8e08119dff3afa68306eced0b7c62db9220d28efa4c9782e943c991e30b25b9ead82f5
diff --git a/app-text/epspdf/epspdf-0.6.5.1.ebuild b/app-text/epspdf/epspdf-0.6.5.1.ebuild
index 08f18bc91d82..95cce8070594 100644
--- a/app-text/epspdf/epspdf-0.6.5.1.ebuild
+++ b/app-text/epspdf/epspdf-0.6.5.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc tk"
 
 RDEPEND="
diff --git a/app-text/html2text/Manifest b/app-text/html2text/Manifest
index 20a2fe59c5c7..8b1f85145263 100644
--- a/app-text/html2text/Manifest
+++ b/app-text/html2text/Manifest
@@ -1,5 +1,6 @@
 DIST html2text-2.1.1.tar.gz 172655 BLAKE2B ab112e41b9cb08664ae9cba2b137b59e67769b2c8cd758022e9b650a2cbd1788064ada1949e9efddc591c819b0c86890e22504bebde68c2973c353b6fa85da33 SHA512 e7fbd795b06895d866e3379c343860dc8816d5069b476cd13abeb066ba1ad222050863c1d52c6b2c05d426a17af7b427913341c8205964b21f18a3d26c3528c4
 DIST html2text-2.2.3.tar.gz 329841 BLAKE2B 311defd6aa6affc6f1ad59d9971f0315b6f2d748b4ae26e2c5f61cbd090ff76f0f0df7155acb1ec5c0114a6b6253eb27fc73d327162dca2a144afae74cdf4afa SHA512 ff851abdc0f672d6bf8de494d6595362d5b71eeb03f4f761e32afb50bb75fe12c0cede8c7ca4ca7290b1c9e0f08aaff9821946dd272e1a30ce3b585e452cf6ec
 EBUILD html2text-2.1.1.ebuild 889 BLAKE2B 2cfb411255c612699631c5e25d62055f8cd67bf0d69ec3b17380d173311338ff8b07edc894d65ac23998d89041c0f91d550206839b42574b7ea709a0f6dd8732 SHA512 b3859f9758680fd85934b17e3fdccd45589ab5bcc574dd4cbfa327269bd92d6ec173b02d61908b579c4273fd98561e98a2f054adb28329f05c83c1cc0d98489a
+EBUILD html2text-2.2.3-r1.ebuild 642 BLAKE2B 30fe78de8b9acc82d392c28ee9340cd813a7596f79c1ac90448c5faea1eec6f32560857eb36b876651497033601fe7953c0818bc4c094a93ecebd24424a2ca94 SHA512 2bbd4f0fbfd490bea42de9a7e51a5d8fca5865f3036c5b1a6646c2cc55c4103de565af6b5d5964117ef61bb36ff70818b256893b9af7b6f1d19728e07d4d6de7
 EBUILD html2text-2.2.3.ebuild 667 BLAKE2B a2042fcfc0d95631896629db64f44eeccef1375c372551d95d0ad0ebdf77adc29ef628b7f12b483a1165ee57bac6c70757cce110d107ed9b0d25b8415b7fda2e SHA512 077bad82be394f4302dcdd2ad04ac2d2106f187817f03fc3f0d52e804836742883855a5843a468010c82470826fb608ed7cd5e87922427b3d02bb65ff4dc9f58
 MISC metadata.xml 331 BLAKE2B 43e61ec021521aaae0dcdbbcef0a40be6da311dd188cf64c66a8dc5c4191befa9955c669cec80d1d9dd0ed584f35e8f3076a0a1d9986e9453c3d96a0cc3ae921 SHA512 dd843839ec2124a68865214d5d2b71d5af631c26bf86fd37f48af940ccd9aa5f1543c9e6232b44119edd7ca429ea869df2acdbf9faafd1454936e23a52d721cf
diff --git a/app-text/html2text/html2text-2.2.3-r1.ebuild b/app-text/html2text/html2text-2.2.3-r1.ebuild
new file mode 100644
index 000000000000..9bd222dc8965
--- /dev/null
+++ b/app-text/html2text/html2text-2.2.3-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/grobian/html2text.git"
+else
+	SRC_URI="https://github.com/grobian/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+DESCRIPTION="HTML to text converter"
+HOMEPAGE="https://github.com/grobian/html2text"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="virtual/libiconv"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	emake check
+}
diff --git a/app-text/htmlrecode/Manifest b/app-text/htmlrecode/Manifest
index 9dfe7b35299f..d611c8061558 100644
--- a/app-text/htmlrecode/Manifest
+++ b/app-text/htmlrecode/Manifest
@@ -1,4 +1,4 @@
 AUX htmlrecode-1.3.1-ar.patch 187 BLAKE2B 2931aec68270d9c9bd91c494eea1598915713eb5d80433e95f12a1fa4f432bc0238eb02f77361090ea8525aaab9027b753b62bb6b44109e4f83659de5efc8d10 SHA512 a49a858d317a8eaaf5ac5079763e04f043c5471519dd7f362ccb621ec43b13841c31a24436d255f5386982bd78ae6182ad7c5bf990e4c4164ec800ac616a9df8
 DIST htmlrecode-1.3.1.tar.bz2 51387 BLAKE2B 7aee0e5c6c5c3c599ccaff76c7bd2e36b63857e96429c582eeda5f16cce6c1ceeb1bff929c4ea03f8bb6ad0154b92a90e53132334c7e59f365e5541b87c65e97 SHA512 180b9c2a1214007bd3163d5df7bcf15c299f452b78f0383a01d85d48212d8ae32c2b5598f44c40ce54b332c26f3ee5c448c614fbae383ec9a326e44f69b0ad10
-EBUILD htmlrecode-1.3.1-r1.ebuild 774 BLAKE2B f3f4931263c7c6e64c6657b80082a9efbec307311974c4ae536d52791f622a8982ce1107b5b359c3666125adbb35d4c37979a4f404494774f774ad4ef1a087d5 SHA512 43618c5df87e122fdcecbf85c29c56b14c781e105a5fe54e2179aa553391845fdbecd5826ccef749892507c0b6792977387f66ebc7f514d8b3310ee79d650351
+EBUILD htmlrecode-1.3.1-r2.ebuild 788 BLAKE2B 23d62f18e2d006e04c067ccb3cd763c2555f8bca4fdbe002058c91ab7da6d25aa49b971aefc835dbd4cd8d99c25e6029d6a3514ce1684116e450a3abd65fab0c SHA512 1d4eea2e84de340db41fb01512a91a0bc2085387d828f7a4341cbc697a323e5c8ad48830472cf745c781ee2234dd85b299f4a79ccbf7c9f0adbe671effadfb0a
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-text/htmlrecode/htmlrecode-1.3.1-r1.ebuild b/app-text/htmlrecode/htmlrecode-1.3.1-r1.ebuild
deleted file mode 100644
index 4b9258115b94..000000000000
--- a/app-text/htmlrecode/htmlrecode-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Recodes HTML file using a new character set"
-HOMEPAGE="https://bisqwit.iki.fi/source/htmlrecode.html"
-SRC_URI="https://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/${P}-ar.patch" )
-
-src_prepare() {
-	touch .depend argh/.depend || die
-	default
-}
-
-src_configure() { :; }
-
-src_compile() {
-	local makeopts=(
-		AR="$(tc-getAR)"
-		CPPDEBUG=
-		CXX="$(tc-getCXX)"
-		CXXFLAGS="${CXXFLAGS}"
-		LDFLAGS="${LDFLAGS}"
-	)
-	emake "${makeopts[@]}" -C argh libargh.a
-	emake "${makeopts[@]}" htmlrecode
-}
-
-src_install() {
-	dobin htmlrecode
-	dodoc README.html
-}
diff --git a/app-text/htmlrecode/htmlrecode-1.3.1-r2.ebuild b/app-text/htmlrecode/htmlrecode-1.3.1-r2.ebuild
new file mode 100644
index 000000000000..1f436003b80a
--- /dev/null
+++ b/app-text/htmlrecode/htmlrecode-1.3.1-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Recodes HTML file using a new character set"
+HOMEPAGE="https://bisqwit.iki.fi/source/htmlrecode.html"
+SRC_URI="https://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+BDEPEND="dev-lang/perl"
+
+PATCHES=( "${FILESDIR}/${P}-ar.patch" )
+
+src_prepare() {
+	touch .depend argh/.depend || die
+	default
+}
+
+src_configure() { :; }
+
+src_compile() {
+	local makeopts=(
+		AR="$(tc-getAR)"
+		CPPDEBUG=
+		CXX="$(tc-getCXX)"
+		CXXFLAGS="${CXXFLAGS}"
+		LDFLAGS="${LDFLAGS}"
+	)
+	emake "${makeopts[@]}" -C argh libargh.a
+	emake "${makeopts[@]}" htmlrecode
+}
+
+src_install() {
+	dobin htmlrecode
+	dodoc README.html
+}
diff --git a/app-text/katarakt/Manifest b/app-text/katarakt/Manifest
index 97400ac7eca2..67eaff90be23 100644
--- a/app-text/katarakt/Manifest
+++ b/app-text/katarakt/Manifest
@@ -1,5 +1,5 @@
 AUX katarakt-0.2-install.patch 671 BLAKE2B bd647ae915a46d5bf80e1df24c44dbfe5d14ae1eaa9c8db965de24c1cb6b89ba2dd4f7fc86e3e41091af1d62e2fb328c986b1a12419c455a9e87d89381fdd57b SHA512 33400a5114547409e33aa86d43293c98d696e383a190529e34dfd32e36f9c0effd1652648954b5eb5572e80070ef007d1fa6a047c0e4e4e117dca9a5589cfa6d
 AUX katarakt-0.2-poppler.patch 1344 BLAKE2B ade342298b369a1f6a405a849dba2f1a088dbbf202fd713bbb871efe16ab751682aac4ccac91fe740af5126e1eb840814f48f53aa45b66d1ac84896a4626a685 SHA512 8724ea6be2ab6a2efd448406b169662c16b751d723c6bf0a4270c3a425b37630c22b09d019769979b8f57475d2f436b033e89868b3ed7be094120518b5d91752
-DIST katarakt-v0.2.tar.gz 52004 BLAKE2B af014425bbf9c36350f4c10e57d9668f4a362d786c660f032381f6cf68b006d384c88bb0f4cabee4c0bc8e5f01ad25a44ef38d100ddfdfe955a442313b77b322 SHA512 a07054e0e9915f6239b8149bbd08c8b5ec095b0e9ffb54e03761ad9e59914f66166e4b8359298721a6b46c2bcf5114f40ad117c4826a32660c1fba28f69b8e68
-EBUILD katarakt-0.2.ebuild 884 BLAKE2B d2bf53d81e5b5786c3e56a99d3bb6e4c63dd9440743227fe60ae2fb6d0ba7875c1bbd162ca8d2ba12164112912e95ca7069c37c66154c716e169e7ce3f97b413 SHA512 33a9d5aeb8a79df5494af73d7d54f13b690b2b9dfc0ff5df032b0a6d8a5d4dfba584897a955cc58967772b839f788b914149abf8e0e979fe8fb5a61aa3f50c85
-MISC metadata.xml 1036 BLAKE2B fad9496039867e698ee44024a200a8fc77025c8ef7427a6d2903fe898204d0c04324daab893d3f653b0863bd1651f2000c43a323a2a9f6e860853979a2de4015 SHA512 c8874b9aa44646129e1798c59ef1a87607280637a6f8a2715c6af009d9b5990d66aab743a0e108626823cb705fd932058ff27b52083c98f533aac4243353dbe4
+DIST katarakt-v0.2.tar.bz2 44034 BLAKE2B 97a4f35c37664065983985d5529e69c4cfe3143943ceb2d5ad6bc8ae708ed075bcdc77dfcc50578acc5776119db909077a730bd7ddf23cbf44abc127df0e5f85 SHA512 fbab92f2ecd832c18330bb805abd772b3ea039bf61fba5b5e909c3ceabae5df5ee4753db3422d8633ed57a76fb4e4831e00ee85bcac36d3dc6b32ca8bb58e435
+EBUILD katarakt-0.2.ebuild 884 BLAKE2B 2667f98060b7617793ad76db3d0b7e0edb42ef716b6a12b928c3adfc4047ed95e30ad7c494973b5287fcc16e207d854ad2926d1c9627c1405e2c047d91ea1b2b SHA512 49fcc502ad99680ae1689dc03abcc38de1b3e5778a3ace0488bc2d458e143145a52c01f83f0b4ee1d6465718cf1d92519f6e71a1b5c492d9799634a1d36c8ad0
+MISC metadata.xml 1026 BLAKE2B 66e7f9bd6d7dabe31e1e65a919d08abc4bc61202f793c49c514b49c0e96eab48251656c8f72ffba87f1744f82e64abb352feb5d95db0060dd9ef5c6bc00fd29c SHA512 ad919f342c8f54f82406b4d17b69b98a893255a1abcc8b0fbbf12bedd565a604689e6a7f7ef0a3cd252559e7f384455d87a9fd6efe5f528ff03b1f8f6da7d7a8
diff --git a/app-text/katarakt/katarakt-0.2.ebuild b/app-text/katarakt/katarakt-0.2.ebuild
index 161ff49aee54..2107baaedbd4 100644
--- a/app-text/katarakt/katarakt-0.2.ebuild
+++ b/app-text/katarakt/katarakt-0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,10 +9,11 @@ MY_P="${PN}-v${PV}"
 
 DESCRIPTION="A simple PDF viewer designed to use as much available screen space as possible"
 HOMEPAGE="https://gitlab.cs.fau.de/Qui_Sum/katarakt"
-SRC_URI="https://gitlab.cs.fau.de/Qui_Sum/${PN}/-/archive/v${PV}/${MY_P}.tar.gz"
+SRC_URI="https://gitlab.cs.fau.de/Qui_Sum/${PN}/-/archive/v${PV}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
 
-SLOT="0"
 LICENSE="BSD-2"
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 BDEPEND="
@@ -30,8 +31,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
 PATCHES=(
 	"${FILESDIR}/${P}-install.patch"
 	"${FILESDIR}/${P}-poppler.patch"
diff --git a/app-text/katarakt/metadata.xml b/app-text/katarakt/metadata.xml
index 7a3b0ef78c18..ff290da13d09 100644
--- a/app-text/katarakt/metadata.xml
+++ b/app-text/katarakt/metadata.xml
@@ -9,7 +9,7 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
-  <longdescription lang="en">
+  <longdescription>
     katarakt is a simple PDF viewer. It is designed to use as much available
     screen space as possible.
 
diff --git a/app-text/master-pdf-editor/Manifest b/app-text/master-pdf-editor/Manifest
index efb77c719fc8..4976f849f926 100644
--- a/app-text/master-pdf-editor/Manifest
+++ b/app-text/master-pdf-editor/Manifest
@@ -1,6 +1,8 @@
 AUX mpe5 105 BLAKE2B 011a381d5edd222d08560e501814cbb5f66ab61294f18f87851a04dc00ad0b67b91c660a9b5d31c2fdaeeb42ab81f6dc8abfc51e4ed4b8a75d8dd7a6ac5e1f22 SHA512 704a06e58f250bc1e7ae2722d9875fe86248045f01906eb37e553c6379d9606fe5322876685bcd8bc1548a4b687b5e1153d9c7fdf96421a203ca5a7a47b3e787
 DIST master-pdf-editor-5.9.82-qt5.x86_64.tar.gz 80442378 BLAKE2B bd6357097451595388be3471b291ceb23b6815ed9ce68956223860c089265ae3693cee1c90f94e567e26b3a0f11b8dee8c2cf40e0184141e2539b44303d6a4c4 SHA512 d4613b5d5353e3bd39bcf953adff2d086e20de6a627e5e6dade62cb7887254b949659174ee3ba86ac525d2373fcedbdb286dc83ffca910c577cbf9ccc14ced39
 DIST master-pdf-editor-5.9.84.x86_64-qt5_include.tar.gz 82574581 BLAKE2B 53f21f11043f97c177010712b375101e29e2078a434e5791691e566b30d6a7b910ba735039b1ffd05c284e21fa478a3c1977b9bef6fe28c563bf5616f6379433 SHA512 9eca9f6504a919c1d8c00f51795c603b955cd69b02b05ad72943eb4561226ec5045f61f28f39e5a97b9c46ec9a6f49f64e92d2f6ee76b69ca09d84135b67f020
+DIST master-pdf-editor-5.9.85-qt5.x86_64-qt_include.tar.gz 61727253 BLAKE2B baf438bcbd250aec1df3a471ae146c5410a5511473cc6e2d0d07e1d9752fbdde6caf3ddd2eab19f0afff3f9d5cc083ffea9f8464c743dc7b603bec191703f1b0 SHA512 a66f905f7afa7ec40d076b1544d5cf18bfd547212123c297e79bf2403b69ec91c39f3ef6fb298b53bc2df4d580db5025c6af64e3031fe286fb9b9d59f2483139
 EBUILD master-pdf-editor-5.9.82.ebuild 1157 BLAKE2B 2c83452b284f8c5fc23a8d0978087c2119294c7e176cb796c702ee50aba6948c5cd47c90ceb2975a7fffb83325e8fe3183e6bdfcd06ac19020ed62ac560405c9 SHA512 fc2833fe6b625381d7d5a62df3ed5e980fd442aba3eb058eedc6367d01303478b72ca41fbed1ec8d04176802d519f512ab6104a0160e5375275153fe59c37d80
 EBUILD master-pdf-editor-5.9.84.ebuild 1212 BLAKE2B b3fa97e8aa878080f594fd4d393b18257b92449b0f9136ad9609c95f4520e77a969095f8cba24acac26f80696e0c0220e780201300b2c6e2bd780105aa382221 SHA512 a57d1095bde8d3fe291c27c93989f05c87de73a8be35903e6294df4c540e344aff57408df07e0c6e04eeee4142041b667ef6db26864ed475f52ef1e190b365d7
+EBUILD master-pdf-editor-5.9.85.ebuild 1215 BLAKE2B 812e0a08a6d8f6d7760c3dde0a8effaddaca811184b6fcaa3c6d6d82e41d9a7eb5a44d57d1e644f717da9da0012e0035e797a8be29f0294505f2149d45970c13 SHA512 848e5a4835c989b157b421958cf0072392db453372dadf9b022713aa7b36490934dd341b3d1d385ca6d7e9446f74a05974e885dedc69e102e6d7ae068f4573bd
 MISC metadata.xml 505 BLAKE2B cb11cc17b77dc142cbce601c834eb526a6359fd2d0bf851fd97e5a7ce87da6d1e6b4880c3ef1fee85a82ddae4cfbbf4975473739debaeeb40c7653f2a2a479cc SHA512 edd9ef885ad8fd09e9f85e52196be1eb10427cb1680fae8fe3464ff350cbce74cfef3cb16908cbb18164e72dc10ba96960da04ea7a67c969239bc4ef158de314
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.9.85.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.9.85.ebuild
new file mode 100644
index 000000000000..5eeaa3fa535e
--- /dev/null
+++ b/app-text/master-pdf-editor/master-pdf-editor-5.9.85.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop xdg
+
+DESCRIPTION="A complete solution for viewing and editing PDF files"
+HOMEPAGE="https://code-industry.net/free-pdf-editor/"
+SRC_URI="https://code-industry.net/public/${P}-qt5.x86_64-qt_include.tar.gz"
+S="${WORKDIR}/${PN}-${PV%%.*}"
+
+LICENSE="master-pdf-editor"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+
+RDEPEND="
+	sys-libs/glibc
+	dev-libs/pkcs11-helper
+	>=dev-qt/qtcore-5.12.9:5
+	>=dev-qt/qtgui-5.12.9:5
+	>=dev-qt/qtnetwork-5.12.9:5
+	>=dev-qt/qtprintsupport-5.12.9:5
+	>=dev-qt/qtsvg-5.12.9:5
+	dev-qt/qtwidgets:5
+	media-libs/libglvnd
+	>=media-gfx/sane-backends-1.0
+"
+
+QA_PREBUILT="opt/${PN}/masterpdfeditor5"
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r fonts help iconengines imageformats lang platforms platformthemes stamps templates masterpdfeditor5.png
+	exeinto /opt/${PN}
+	doexe masterpdfeditor5 masterpdfeditor5.sh
+	exeinto /opt/bin
+	doexe "${FILESDIR}"/mpe5
+
+	make_desktop_entry "mpe5 %f" \
+		"Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \
+		"Office;Graphics;Viewer" \
+		"MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
+}
diff --git a/app-text/mythes/Manifest b/app-text/mythes/Manifest
index e0f6daba011d..2af13e4220c5 100644
--- a/app-text/mythes/Manifest
+++ b/app-text/mythes/Manifest
@@ -1,3 +1,3 @@
 DIST mythes-1.2.5.tar.xz 2891852 BLAKE2B e292e49187a9b225fdcfccb467afed0b8ce90769bbefe331d7d7f026f2dd6686543b14f3666af5b1693198467206c53da0bbd030420d87c94315f9da769f45a6 SHA512 304fd05619e0ae02c9c29d92a6ada8f4a85f41f331b87b8820728c1919f3dd9c5cd951dbef9a27e649466f94dc5daa19350c9fd09c90d49b198b73b1f9eb770e
 EBUILD mythes-1.2.5.ebuild 642 BLAKE2B 66b9e88ea9c3c0a75fce301709224535f25b9ee11783f399a1eaa23e688db787b90026198eeb8428bc8e2c134292e207a238feccee9224c24be9125a71e4cf2a SHA512 7dff207b29d80276f809e0f348f53984b1472ad6538604c02f383dffc2b2a7346ab2f4c20eb77565be7756f98bcec1b425e62a87e26235396d95e34be0855c94
-MISC metadata.xml 334 BLAKE2B 3a21f7641aa43f9511100ee4a5e64ebd87a30146c27c5b60dc0dd12c3f3fc609a32b5c57f1efcd724731b5ac86a38ffff20f323bfbbcf4793c1586e8e5b9943a SHA512 ef0d056d5b5840698bda3ad0ebc3cc5aa74b51b726c838a3720db45bba8efdd78ef3c0d46d3f6b929390a3204de566d3beed15aa1c32566b75866b338ba50ccb
+MISC metadata.xml 336 BLAKE2B 7c672b1884d0c65cae7ebece1dc75e09935c146c795de76019c33bab05b2ae5107df4bb9b16f6b6e608594c63c76c1896164eac5feab91e9a691a8843cf4bf36 SHA512 029705ac83a8fb9748bf986d14a53c6556cd7b8042288eda364a6e5058813af9750056e2b5556c0bab764ffdf9a11ff0b67c00f4ec99302485a85ddcc40a3f04
diff --git a/app-text/mythes/metadata.xml b/app-text/mythes/metadata.xml
index 8acbf740b37a..96ada836c02f 100644
--- a/app-text/mythes/metadata.xml
+++ b/app-text/mythes/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo Office project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">hunspell</remote-id>
+		<remote-id type="github">hunspell/mythes</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/pandoc-bin/Manifest b/app-text/pandoc-bin/Manifest
index 0db1a8926009..e2e8989a27ab 100644
--- a/app-text/pandoc-bin/Manifest
+++ b/app-text/pandoc-bin/Manifest
@@ -1,10 +1,7 @@
-DIST pandoc-3.1.13-linux-amd64.tar.gz 32092762 BLAKE2B 87e55905550cc6289241b399faa0ae65e913bf1105ba6309a7b7ed63685cc43f267b065c811a335b0774a3b7d6f082f607015f8558b66c8098591513e26c6f4c SHA512 68986e691895770ad51018e5643a02fb848517a1ab68dd0cd99e8511a2a681f9c2bcf1ebc0088c39e1c0f8ebbf4032795b2427696f92ef4a64eab18b7aa588c2
-DIST pandoc-3.1.13-linux-arm64.tar.gz 34869977 BLAKE2B 485a33645c580edf28ebbcee4ce67fa9c7bebb84d4771b0ba23a6b78beb9b92e125d2e8024b061a6b6da839b96969add6f27d420a102ad01305c9a9a120e5478 SHA512 36253cc908c147ee7cda398c52f4ec0a7493e7f0525a3f97cba7cf53e39cf3fd225ecb2f77508fae7c59aa6c79ca85644b9759a0eb0dc918f86fb2049e17858a
-DIST pandoc-3.2-linux-amd64.tar.gz 32159847 BLAKE2B 5eec253ba208925fe5cab08151e4ec5566db7cda13db7562d19fceafa1e5b898e5e3174df8c6af0f0f1f6494b48011806f2def55c11460b7bda8b152199ad95c SHA512 b3236fc265c54290e2e913980a1f7a7133a2f3a1f9381c7fbe28437f4c034b6c83edb3ab1ebf39ddb59bea8085c7e97eff4de013b5f30c283464a6d8df780b70
-DIST pandoc-3.2-linux-arm64.tar.gz 34897786 BLAKE2B 656c74f2cb820a0391e462e2e92c44f274cb3a9fc8faee8f5f07d7edec70b74e6484c7842248ae9cf13a5c32c99b0b6be1824247b8b8a565599dea5486ed9d0b SHA512 dd88a7aff58a52d7f69a710dc5e6a457332296a2d9b027247fa94d626ac6a682e16c4b1540c74b4aafc719a0ec7169bd1634f98a6c2e5b904800022f451329f0
 DIST pandoc-3.2.1-linux-amd64.tar.gz 32117390 BLAKE2B a927de6467bf48f18c54f0b9846f0060aada3284ca7b4b77c46f7111b760a62babdc8846e543b55a5c9b1d6eede365888c348cf853ea25e31023790661f8faab SHA512 44f4fcf49e69a4a45c135ea5bfc8fbd41afa59f9f367232fddd1a9141629faacd4b8e29bf90e495d517b9c3830ce392807853886be4188e2fb27a61240c8dea6
 DIST pandoc-3.2.1-linux-arm64.tar.gz 34812370 BLAKE2B 7d18f3749bdaf25a0305ba2b6927c2fc64efc9f6c7ee16d1b82bf063ff872e1ed5b22f346fdd45094b4245b0930659e840d8f41de4198d0831a2e4003088a63f SHA512 4bf651ecade55b4b3880a63a97586fb2602a51550c45853a0ebcd59def000095b42018fbbc20a707ade85854c45c88ce38ebb80d5c7f0101e6b465b951f21f0c
-EBUILD pandoc-bin-3.1.13.ebuild 1450 BLAKE2B b846905663c51f8aa082e7cb261e69a91f1cb55c6d09c92b1b3fbe9f9fedf2777550f1ca46b965717ae97ff50b0a928e86eb7ca8d2cc4808fd160ede4895cfba SHA512 b00d55d61794115f6b923a6d0ce7aa13dd828bf355ca1d7219b858c947b73b1df02e45d346a747bbe2ca0b74ea1e529aea89d13e31a7df4ff4cd5e25fda58495
-EBUILD pandoc-bin-3.2.1.ebuild 1452 BLAKE2B b395d96764270ec8a80dc554570200efe107fd2c204370c3331593a2d2a28d766c76773a29986dbeae2a0c74e214129ee3275e46c0da0c136792b0a680e6b634 SHA512 8d31de85f20cd3fb581f5948bdd7a92b8f2c103dbbcaa09241de5d9ba87011ad819decbc8717f824aa789f39449f0e1e791c502ef8f41aaa048825fbbacc32c9
-EBUILD pandoc-bin-3.2.ebuild 1450 BLAKE2B b846905663c51f8aa082e7cb261e69a91f1cb55c6d09c92b1b3fbe9f9fedf2777550f1ca46b965717ae97ff50b0a928e86eb7ca8d2cc4808fd160ede4895cfba SHA512 b00d55d61794115f6b923a6d0ce7aa13dd828bf355ca1d7219b858c947b73b1df02e45d346a747bbe2ca0b74ea1e529aea89d13e31a7df4ff4cd5e25fda58495
+DIST pandoc-3.3-linux-amd64.tar.gz 32140122 BLAKE2B eda93f6a127e40d3ef064604385558fdd4e98c497bd65a845062e6daa988f5bf4cda952a0025835a918b5d7c693d299e4ef7a4244ebce065e48571442f199494 SHA512 4dbf051707fe6d2a6e4d46e32ef000a684edd724059059578950d808114f234bef009725f77b5c9ce44b6feb21bdaf9ac16196bb272b9a79456dd5f67b84cbb9
+DIST pandoc-3.3-linux-arm64.tar.gz 34838805 BLAKE2B a81e590d862aa3c7832425cba67d3622805373dbee5c1a36e52e80326d28251d2076ec95392b0bea62c5154c6f59e2f60d2195b64d0fe6688313437f76f678c4 SHA512 e2c42c2af49dffd05506dc268d929214b85559560140da163145b72dce4dd8fd2f22b8e3278dfdaf0d90f7caba8a8d5a56443362054d508437326b7fc1dfcb93
+EBUILD pandoc-bin-3.2.1.ebuild 1450 BLAKE2B b846905663c51f8aa082e7cb261e69a91f1cb55c6d09c92b1b3fbe9f9fedf2777550f1ca46b965717ae97ff50b0a928e86eb7ca8d2cc4808fd160ede4895cfba SHA512 b00d55d61794115f6b923a6d0ce7aa13dd828bf355ca1d7219b858c947b73b1df02e45d346a747bbe2ca0b74ea1e529aea89d13e31a7df4ff4cd5e25fda58495
+EBUILD pandoc-bin-3.3.ebuild 1452 BLAKE2B b395d96764270ec8a80dc554570200efe107fd2c204370c3331593a2d2a28d766c76773a29986dbeae2a0c74e214129ee3275e46c0da0c136792b0a680e6b634 SHA512 8d31de85f20cd3fb581f5948bdd7a92b8f2c103dbbcaa09241de5d9ba87011ad819decbc8717f824aa789f39449f0e1e791c502ef8f41aaa048825fbbacc32c9
 MISC metadata.xml 986 BLAKE2B 10ab442c2f7892545054ba2747c0cde115d9d875673c077d2cefcd035e2ecd6d04f2aef05ef9ca58a2150a983079ad8fbdc6910ca93fc14977409041e5f20201 SHA512 c8e241d4d7bba0a6f36320517d18fbb99922e32970d7771d5bbc80a8ecf5086f8f7d1eadd0188d457412a66db898d044074b4d4f0301aab1e19cd1213e562375
diff --git a/app-text/pandoc-bin/pandoc-bin-3.1.13.ebuild b/app-text/pandoc-bin/pandoc-bin-3.1.13.ebuild
deleted file mode 100644
index 1a9e4cefd9f7..000000000000
--- a/app-text/pandoc-bin/pandoc-bin-3.1.13.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=${PN//-bin/}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Conversion between markup formats (binary package)"
-HOMEPAGE="https://pandoc.org/
-	https://github.com/jgm/pandoc/"
-
-BASE_URI="https://github.com/jgm/${MY_PN}/releases/download/${PV}/${MY_P}"
-SRC_URI="
-	amd64? ( ${BASE_URI}-linux-amd64.tar.gz )
-	arm64? ( ${BASE_URI}-linux-arm64.tar.gz )
-"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="-* amd64 arm64"
-IUSE="+pandoc-symlink"
-
-RDEPEND="
-	pandoc-symlink? (
-		!${CATEGORY}/${MY_PN}
-		!app-text/pandoc-cli
-		!dev-haskell/pandoc
-	)
-"
-
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
-
-src_unpack() {
-	default
-
-	# Manpages are gzipped.
-	unpack "${S}"/share/man/man1/*.1.gz
-}
-
-src_install() {
-	exeinto /usr/bin
-	newexe bin/${MY_PN} ${PN}
-	dosym ${PN} /usr/bin/pandoc-lua-bin
-	dosym ${PN} /usr/bin/pandoc-server-bin
-
-	newman "${WORKDIR}"/${MY_PN}-lua.1 pandoc-lua-bin.1
-	newman "${WORKDIR}"/${MY_PN}-server.1 pandoc-server-bin.1
-	newman "${WORKDIR}"/${MY_PN}.1 ${PN}.1
-
-	if use pandoc-symlink ; then
-		dosym ${PN} /usr/bin/${MY_PN}
-		dosym pandoc-lua-bin /usr/bin/${MY_PN}-lua
-		dosym pandoc-server-bin /usr/bin/${MY_PN}-server
-
-		dosym ${PN}.1 /usr/share/man/man1/${MY_PN}.1
-		dosym pandoc-lua-bin.1 /usr/share/man/man1/${MY_PN}-lua.1
-		dosym pandoc-server-bin.1 /usr/share/man/man1/${MY_PN}-server.1
-	fi
-}
diff --git a/app-text/pandoc-bin/pandoc-bin-3.2.1.ebuild b/app-text/pandoc-bin/pandoc-bin-3.2.1.ebuild
index 6c205a599708..1a9e4cefd9f7 100644
--- a/app-text/pandoc-bin/pandoc-bin-3.2.1.ebuild
+++ b/app-text/pandoc-bin/pandoc-bin-3.2.1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm64"
+KEYWORDS="-* amd64 arm64"
 IUSE="+pandoc-symlink"
 
 RDEPEND="
diff --git a/app-text/pandoc-bin/pandoc-bin-3.2.ebuild b/app-text/pandoc-bin/pandoc-bin-3.2.ebuild
deleted file mode 100644
index 1a9e4cefd9f7..000000000000
--- a/app-text/pandoc-bin/pandoc-bin-3.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=${PN//-bin/}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Conversion between markup formats (binary package)"
-HOMEPAGE="https://pandoc.org/
-	https://github.com/jgm/pandoc/"
-
-BASE_URI="https://github.com/jgm/${MY_PN}/releases/download/${PV}/${MY_P}"
-SRC_URI="
-	amd64? ( ${BASE_URI}-linux-amd64.tar.gz )
-	arm64? ( ${BASE_URI}-linux-arm64.tar.gz )
-"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="-* amd64 arm64"
-IUSE="+pandoc-symlink"
-
-RDEPEND="
-	pandoc-symlink? (
-		!${CATEGORY}/${MY_PN}
-		!app-text/pandoc-cli
-		!dev-haskell/pandoc
-	)
-"
-
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
-
-src_unpack() {
-	default
-
-	# Manpages are gzipped.
-	unpack "${S}"/share/man/man1/*.1.gz
-}
-
-src_install() {
-	exeinto /usr/bin
-	newexe bin/${MY_PN} ${PN}
-	dosym ${PN} /usr/bin/pandoc-lua-bin
-	dosym ${PN} /usr/bin/pandoc-server-bin
-
-	newman "${WORKDIR}"/${MY_PN}-lua.1 pandoc-lua-bin.1
-	newman "${WORKDIR}"/${MY_PN}-server.1 pandoc-server-bin.1
-	newman "${WORKDIR}"/${MY_PN}.1 ${PN}.1
-
-	if use pandoc-symlink ; then
-		dosym ${PN} /usr/bin/${MY_PN}
-		dosym pandoc-lua-bin /usr/bin/${MY_PN}-lua
-		dosym pandoc-server-bin /usr/bin/${MY_PN}-server
-
-		dosym ${PN}.1 /usr/share/man/man1/${MY_PN}.1
-		dosym pandoc-lua-bin.1 /usr/share/man/man1/${MY_PN}-lua.1
-		dosym pandoc-server-bin.1 /usr/share/man/man1/${MY_PN}-server.1
-	fi
-}
diff --git a/app-text/pandoc-bin/pandoc-bin-3.3.ebuild b/app-text/pandoc-bin/pandoc-bin-3.3.ebuild
new file mode 100644
index 000000000000..6c205a599708
--- /dev/null
+++ b/app-text/pandoc-bin/pandoc-bin-3.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=${PN//-bin/}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Conversion between markup formats (binary package)"
+HOMEPAGE="https://pandoc.org/
+	https://github.com/jgm/pandoc/"
+
+BASE_URI="https://github.com/jgm/${MY_PN}/releases/download/${PV}/${MY_P}"
+SRC_URI="
+	amd64? ( ${BASE_URI}-linux-amd64.tar.gz )
+	arm64? ( ${BASE_URI}-linux-arm64.tar.gz )
+"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm64"
+IUSE="+pandoc-symlink"
+
+RDEPEND="
+	pandoc-symlink? (
+		!${CATEGORY}/${MY_PN}
+		!app-text/pandoc-cli
+		!dev-haskell/pandoc
+	)
+"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
+
+src_unpack() {
+	default
+
+	# Manpages are gzipped.
+	unpack "${S}"/share/man/man1/*.1.gz
+}
+
+src_install() {
+	exeinto /usr/bin
+	newexe bin/${MY_PN} ${PN}
+	dosym ${PN} /usr/bin/pandoc-lua-bin
+	dosym ${PN} /usr/bin/pandoc-server-bin
+
+	newman "${WORKDIR}"/${MY_PN}-lua.1 pandoc-lua-bin.1
+	newman "${WORKDIR}"/${MY_PN}-server.1 pandoc-server-bin.1
+	newman "${WORKDIR}"/${MY_PN}.1 ${PN}.1
+
+	if use pandoc-symlink ; then
+		dosym ${PN} /usr/bin/${MY_PN}
+		dosym pandoc-lua-bin /usr/bin/${MY_PN}-lua
+		dosym pandoc-server-bin /usr/bin/${MY_PN}-server
+
+		dosym ${PN}.1 /usr/share/man/man1/${MY_PN}.1
+		dosym pandoc-lua-bin.1 /usr/share/man/man1/${MY_PN}-lua.1
+		dosym pandoc-server-bin.1 /usr/share/man/man1/${MY_PN}-server.1
+	fi
+}
diff --git a/app-text/pastebinit/Manifest b/app-text/pastebinit/Manifest
index d6c11c70b4f2..73ae55dc577c 100644
--- a/app-text/pastebinit/Manifest
+++ b/app-text/pastebinit/Manifest
@@ -4,5 +4,5 @@ DIST pastebinit-1.7.0.tar.gz 54026 BLAKE2B 11d049333cd08866765ccd22292d1c13e1324
 DIST pastebinit_1.5.1.orig.tar.gz 51448 BLAKE2B a5cfa13c770e234d6e08d4f0b662c09398a5f20ac4e3f7c10ab086261923851239a3e6c1bda78ba6ba810f95cd90e6517b74aa41c5b5e3d50bca5b8c100aa594 SHA512 02b7faa54862d240eac3a8edaae2edb895cbb476cbf89dc71514a5a0a42aa2b0d26f07e5485627d1deb61f62e37018459e4d072bd4aacc886f259fced35e352c
 EBUILD pastebinit-1.5.1-r1.ebuild 1507 BLAKE2B 273d73391a9f5be527c323a539bdc3f07c222fc9bc266be82bbe4ff695c5ef9657b41cef810c9132bdcf82f6c456d5056cc76d2bbb9bf8a5c3ac84cfaa543062 SHA512 f1f769347d704bff655f0ed4285f4a439a242f8d70f0a25e14dba2cac06acb30ca2d38aa7e9199b64cabf5cffb44791db988ef7a9c7845e45741135585def50e
 EBUILD pastebinit-1.6.2.ebuild 1319 BLAKE2B 21138fd01ea65555664714f9c5c5309152ee919effbcc1ba2325bc7d0fd31e0f002aa16ac1041cf46f1348f277cc31cddefba69580fc684e7e6204e08a0aa992 SHA512 f86603a6233c3e2e734626a1550fe7c16c03fad3fe2f6fccb9e092070f5fc6ef288c1f4dc0c88ed7a49a08e99589d6457eb784cf0a052c93c20702d9b8b40449
-EBUILD pastebinit-1.7.0.ebuild 1318 BLAKE2B e865ab6c4ab7ee64688f9b9b6c3ac8a1ad20110bd0a8e70851dc40b166970fc22f8013a28122a9880210b2feebb9b14284c19d106631b90c0804a679662749e6 SHA512 328decbf4a04e7f62d2357b13a32d50fb2fca48bbc8df821afed088b1e6869462a79d973a0e7b1b8a47bbf17472ffb6928cd24583ebb7dc445556be4fe1937ac
+EBUILD pastebinit-1.7.0.ebuild 1316 BLAKE2B fb745c01ffbf331e262cc900496af54a3dd5d38b027bb9e83ca7bf3973bc37f5198137d8b9c93f9b6a46259f306511a30a58ce34ba12528bafc904db13846cf8 SHA512 ba3c7047f7d4b764aeb9553561fdd25b84e6f182224c8b5fc805df9fb548c8a1fa0150a87f98315cb27e9c76cd587eded3f508fc05ec45130a36964800bb6d3d
 MISC metadata.xml 329 BLAKE2B 231c5095d0163f6e8d88a96db132c8d8fe6e51b8c6e4ab02103c16c777096676d7b3b2a0b304840dd7b3ebcd5498d8ea94395be1075ae70ae3e7783623a7f855 SHA512 3130c3eb7d1c11976d3f3704ea7e520d9e82c676bce2e6207482a1660c9da5b0c55cdc7df1a7b744106c3b925760df168c0b02d5475a3c406e231d058ef4079c
diff --git a/app-text/pastebinit/pastebinit-1.7.0.ebuild b/app-text/pastebinit/pastebinit-1.7.0.ebuild
index 6c79a36cb184..9a5d17a145f9 100644
--- a/app-text/pastebinit/pastebinit-1.7.0.ebuild
+++ b/app-text/pastebinit/pastebinit-1.7.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="man"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-text/pdfjam/Manifest b/app-text/pdfjam/Manifest
index 954288fced61..b145db6d2110 100644
--- a/app-text/pdfjam/Manifest
+++ b/app-text/pdfjam/Manifest
@@ -2,5 +2,5 @@ DIST pdfjam-3.10.tar.gz 121928 BLAKE2B 5ff82abba43becb2792ff9e6a13dd3458d4b884e9
 DIST pdfjam-extra-20191118.tar.gz 15457 BLAKE2B 3d673ba68a1ee89cec7af0ec7d7fc61c8993b9ae328d3362a6bbbae47cbda2caa2e8f4ecd28424dd894c31d14754228b067389b61fa7845cfe5dfc0e2b5d9b8d SHA512 1d02abb9d81baf6edf3e51e2c7838df191a7a18b4b50518ee1ae3108020a274d7608570654ab540539d3717e51ef10f548c83c3480681bc20c9702280f694b8f
 DIST pdfjam_208.tgz 180725 BLAKE2B 903ce4f0874c9fc9ad23f3db37b882596589d6470dfe9289f65a72fb66ff843bbd49b52086d7b2d2cbbfb1b6406cbbda64d46b933a853d5d681ef88d4033372c SHA512 728c8d304c6d2af773980d20ef4a4be6e0a5dad286ad8cd00be9b1687f5024e00032a750c10c74dcd24431f081368d02b76f03cc5bb1c8725a060cd70be0fd8c
 EBUILD pdfjam-2.08-r1.ebuild 580 BLAKE2B d0367b12ec9ea725c34344861ce30139300ee73e6a188ecbeca277317280fed958251143a499b440d8fc6f72172f44e86d638171cea65df521e34b29af1faf72 SHA512 100bfa41a19e74306c47bbe9adbf1cb9ba4c08640cc3a0ef86581040ccb845ad6416e47339606bf63179c41a236f75f9d582b3b2ca73bce47fb4860771d0123e
-EBUILD pdfjam-3.10-r1.ebuild 1207 BLAKE2B c002f02b1fb77d9266a98d25e2be6c7ade602c56df27635ae57c495c7442e645d080ae7af1cdae94a81383035d892dd90743209c1956d472772ce9561beb0abb SHA512 da683884f92d61bd8f438f797460c1e5505ce30a674aef78a83bd5df234796b9c473353ab771c11ebcdc2741c2a8d283d36b58fbd1962785893a0304813b3676
+EBUILD pdfjam-3.10-r1.ebuild 1203 BLAKE2B ec806236bb195eb95920a757e92756e6bf0d90599f2db07e8d03812d97d28689c6bbc35ac6785679f67cc55fbac18c0aa45460168c086162d0b8c5030e150b19 SHA512 cfb1488c32581e96389e23b79c5f84c79c34d0195d3b55c4933864422ce1e71c11eb54a73fc2f7e4fc99054a19b9a29f8fedc22469582c35bcbd0019c7f9683e
 MISC metadata.xml 469 BLAKE2B c5f8cba1558d58746f91337019ab4eebeb93ed31f6f6da2793f12920c0244cee950c198cda5b1a389e42a5dffcce43a7071be23997daf7eb98e455abcd23f275 SHA512 3f6904a801d58b785031126357f963a8c73b182b4afab144f2b365084c466e2ce0460a47aef5e8d49a160512575269f440363448cc839bcd5caeeff6ba751b56
diff --git a/app-text/pdfjam/pdfjam-3.10-r1.ebuild b/app-text/pdfjam/pdfjam-3.10-r1.ebuild
index 81f7ef951dbc..17b322c27d8c 100644
--- a/app-text/pdfjam/pdfjam-3.10-r1.ebuild
+++ b/app-text/pdfjam/pdfjam-3.10-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 IUSE="extra test"
 RESTRICT="!test? ( test )"
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 0e6b70cc6f65..a31d9530d884 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -10,7 +10,7 @@ DIST poppler-24.07.0.tar.xz.sig 833 BLAKE2B c903a8f84c65c187f2f976eb83059722ef52
 DIST poppler-test-400f3ff05b2b1c0ae17797a0bd50e75e35c1f1b1.tar.bz2 5199265 BLAKE2B d58f6ee7b44ca45291c205f9619db3833871f5789dd6a4e3ccc9acce2b6d7967a6b8596e3f32b7b35ba3d185976e8b9c8a998071c4451bb5ce674825a4005d6d SHA512 5bf5d99956fa0a6a93e0b0dc4713ecd8810811eca35514cc5765ffaafb9485f64f94b21487afa46c16eaf66326fcb999e792b8121eeb188e7e33a32a4798fb76
 DIST poppler-test-ff3133cdb6cb496ee1d2c3231bfa35006a5e8410.tar.bz2 5207226 BLAKE2B 15153457989a53301bcdc3468ab2b06b637457199004651b39ea848f488f8a2ba594ce2e36091de4fd06fc0a52b783c6b2ee243ac5d95ce1e9db7483ea880829 SHA512 335cd3d55fc6e28331e791e5b63a08d293abc70764a9f314b2c590c26a5a78b38243c74f988bb95afffe0bdcc54dee1e633dbf1672b19a290be40a298e16995f
 EBUILD poppler-24.04.0.ebuild 4417 BLAKE2B 407d85bd4d2865ace153236758eecad6ae6d5fc149f719c89edb4aad0ec59da434479cf490da90db7f5c1324ade5a1f106a48f861ee482d38ce237d11a650dfd SHA512 f01c512d9ff207bfa6b27095f36530d76aa992422de7b7c65056ec4b8f43e0f9d51b7c245731810cb9cc963bbed2751d435159261bbaccdf08e6bbc21651fe2f
-EBUILD poppler-24.06.1.ebuild 4464 BLAKE2B 6b7d0921a9853e9929a34deb8dc6f08b7cb6e6b681ab5320566669d32d777f7551247669fa4640a394dc18624a5053233d627a73a527e5dbe7edf42f1f00ba63 SHA512 739e77bdf973c7118184d9c0f966731c7a756675156249290532b1cf13deb8beaba718223875063dc860ec407f01dd9bf25d1bd67c4b10100a87e7ed8cf90894
+EBUILD poppler-24.06.1.ebuild 4463 BLAKE2B d9e2f1a71d72218aef0914c9537520ff447e8abcc235120735fcd9a299a5e71380b1c9599990d4cebbb7859397f1c1f99841850a0f9f98b9e8be24dced7faf52 SHA512 298c7c3a05882bf5aaf8231d922a520b3c1baf1e14ebb54049d96ac22a9d64417a4cafc40566dbfa8935bc57d687852077cbd439bddf6928c40fa3dac1f5edf8
 EBUILD poppler-24.07.0.ebuild 4470 BLAKE2B 23deceacbece8bfe874ebb9bd22e4c44e7b32309bf58f387af23dfa32e6c2d2040e5639822ac122d9b11f35c07fc4e40fbed08883c6cc7545ba57f6e2c55e9e6 SHA512 fd79c65d1b99e0f159e719355749d73821eec2cc7029ee0802edac6381f3405c89cea4bbee02ec5a2d8a1deaeaad226d148affb4a6690e3e403ed3a19da67bb8
 EBUILD poppler-9999.ebuild 4470 BLAKE2B 23deceacbece8bfe874ebb9bd22e4c44e7b32309bf58f387af23dfa32e6c2d2040e5639822ac122d9b11f35c07fc4e40fbed08883c6cc7545ba57f6e2c55e9e6 SHA512 fd79c65d1b99e0f159e719355749d73821eec2cc7029ee0802edac6381f3405c89cea4bbee02ec5a2d8a1deaeaad226d148affb4a6690e3e403ed3a19da67bb8
 MISC metadata.xml 1230 BLAKE2B e537b88babbb0c4ef5355c57c226d1c27b8b058e85c437962afe3610cf7dcdd4fea4a7694e508314cc5111d7bf09dc67881f0268a5cc8c2ce1e569a6f8c7699d SHA512 92b0a2fb9bf788eab1187657485698322cec7623da7b861ed5134089d0f3fc05f42138f734aa78bb811679203af2c6bf0dad7e78a091d5a51ba16a2aac60a227
diff --git a/app-text/poppler/poppler-24.06.1.ebuild b/app-text/poppler/poppler-24.06.1.ebuild
index 02379496931b..bb7ab3e3a6d6 100644
--- a/app-text/poppler/poppler-24.06.1.ebuild
+++ b/app-text/poppler/poppler-24.06.1.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 ~ia64 ~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 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	SLOT="0/138"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/restview/Manifest b/app-text/restview/Manifest
index 225ab27239c7..b48d08d4dadc 100644
--- a/app-text/restview/Manifest
+++ b/app-text/restview/Manifest
@@ -1,3 +1,4 @@
-DIST restview-3.0.0.tar.gz 49774 BLAKE2B 21a8a25964b995287ce8c584424eae8db5d6190ebf60a435a9af50a9995083fba61d5ccd1a06b1eb193590bc68219f98298a4773fab565bd711cca1eacd8149b SHA512 55b053f03964eb637245810894e970e16a3d1be4587e44802410afbb5c046921e7f3c07825e4f7889569d2f7a980f0a320835d0c2994bb5df0d66c3ebcffc797
-EBUILD restview-3.0.0.ebuild 574 BLAKE2B 64d16f5ded10739b965fb74eca9b9662e002537beecc2a54476fbf6bf16a3ce8a1f5807777e13498b84aa9cb7fe38f531df460115bbfa8615797313f76e9f274 SHA512 15f1bd6666ee1ed0d27161da5963cd03ced5e4baa4a5facc0d61a928753ffcacbec2b2a65f472d6c71c229843bb276062bace86761d469097a20c747360389f7
+AUX restview-3.0.1-test-fixes.patch 6546 BLAKE2B 6beb109b1ec2814288e79ae424f8eee79dc1a771633eaf18e2173820862835203b502e2e107008d1333341621a4b5e10da91fac41c6dfc23b3318a69e792c1c6 SHA512 c7bf15dc96b973b26a8d8ddf9b65bb202eda0a5a3bc2cf4a726926db2fb473f9895bd8e9f43b06b2b42b30c7f94a9e73a51233c0a7e297993731657916e789f4
+DIST restview-3.0.1.tar.gz 49922 BLAKE2B 1a216442c8b9b1325cdcfea3e1de003333b805e5bae534142dcf136f08163a353629e05a886b127e205616b49411f64d29c96cb1d47a8c070de75a500de76853 SHA512 bf45e962b57b5703bd13edfd485e99ea59c0ea8b5f5a9cbb7b3d1c75939387b57ce5b0d88c5cbaa28b967e920139b03d299c256f48254e63837e60c8c828dea3
+EBUILD restview-3.0.1.ebuild 624 BLAKE2B 631078e42994ca0aba5a877568fa6fbdb2dca7af01861282bff741acf6dac14aca3a958a462cc3117550e384891a792e1cdae79b1e5d16f77a1e06f1ba849eb1 SHA512 c54f8f69aecc40ec1778cc56504eddd7d03e2fbd6fbb3324bc692ed9809ca5ecf495b1813f88508d058124b1c5a80f20f376a4aa2fffd32d2051e31c6626ac95
 MISC metadata.xml 295 BLAKE2B f50260f0437974897d227dae55ad1ff3e9b42ba20aa031a36199eca055cde73081655ddfa1456d0accc0dd75a8dfb8d31af7dae1af98acc8126e21198ee70333 SHA512 becbf06fec999f5cc5a0a18494d793c8c68cb31c33396b0a47de4bd2532e39c2d421806011feeaed0807bf5a7a7fdd67561e9db4922738bfcdcb6c74711ae304
diff --git a/app-text/restview/files/restview-3.0.1-test-fixes.patch b/app-text/restview/files/restview-3.0.1-test-fixes.patch
new file mode 100644
index 000000000000..ff856132ed93
--- /dev/null
+++ b/app-text/restview/files/restview-3.0.1-test-fixes.patch
@@ -0,0 +1,171 @@
+From 6a1d6b44ee400431d75ed2326bd0b4f35d4727fa Mon Sep 17 00:00:00 2001
+From: Marius Gedminas <marius@gedmin.as>
+Date: Mon, 21 Aug 2023 13:11:43 +0300
+Subject: [PATCH 1/2] Fix tests
+
+Not sure why they broke (new docutils release on PyPI)?  Doctests were a
+bad idea.
+
+Upstream-commit: https://github.com/mgedmin/restview/commit/6a1d6b44ee400431d75ed2326bd0b4f35d4727fa
+
+diff --git a/src/restview/tests.py b/src/restview/tests.py
+index 71aeb77..d129835 100644
+--- a/src/restview/tests.py
++++ b/src/restview/tests.py
+@@ -540,7 +540,7 @@ def doctest_RestViewer_rest_to_html():
+         ... This is an inline literal: ``README.txt``.
+         ... ''', settings={'cloak_email_addresses': True}).strip())
+         ... # doctest: +ELLIPSIS,+REPORT_NDIFF
+-        <?xml version="1.0" encoding="utf-8" ?>
++        <?xml version="1.0" encoding="utf-8"...?>
+         <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+         <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+         <head>
+@@ -584,35 +584,11 @@ def doctest_RestViewer_rest_to_html():
+ def doctest_RestViewer_rest_to_html_css_url():
+     """Test for RestViewer.rest_to_html
+ 
+-    XXX: this shows pygments styles inlined *after* the external css, which
+-    means it's hard to override them!
+-
+         >>> viewer = RestViewer('.')
+         >>> viewer.stylesheets = 'http://example.com/my.css'
+-        >>> print(viewer.rest_to_html(b'''
+-        ... Some text
+-        ... ''').strip())
+-        ... # doctest: +ELLIPSIS,+REPORT_NDIFF
+-        <?xml version="1.0" encoding="utf-8" ?>
+-        <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+-        <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+-        <head>
+-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+-        ...
+-        <title>...</title>
++        >>> html = viewer.rest_to_html(b'Some text')
++        >>> grep('stylesheet', html)
+         <link rel="stylesheet" href="http://example.com/my.css" type="text/css" />
+-        <style type="text/css">
+-        ...
+-        </style>
+-        </head>
+-        <body>
+-        <div class="document">
+-        <BLANKLINE>
+-        <BLANKLINE>
+-        <p>Some text</p>
+-        </div>
+-        </body>
+-        </html>
+ 
+     """
+ 
+@@ -720,32 +696,16 @@ def doctest_RestViewer_rest_to_html_pypi_strict():
+         >>> viewer = RestViewer('.')
+         >>> viewer.stylesheets = None
+         >>> viewer.pypi_strict = True
+-        >>> print(viewer.rest_to_html(b'''
++        >>> html = viewer.rest_to_html(b'''
+         ... Hello
+         ... -----
+         ...
+         ... `This is fine <http://www.example.com>`__.
+         ...
+-        ... ''').strip().replace("&quot;", '"'))
+-        ... # doctest: +ELLIPSIS,+REPORT_NDIFF
+-        <?xml version="1.0" encoding="utf-8" ?>
+-        <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+-        <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+-        <head>
+-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+-        ...
++        ... ''')
++        >>> grep('Hello', html)
+         <title>Hello</title>
+-        <style type="text/css">
+-        ...
+-        </head>
+-        <body>
+-        <div class="document" id="hello">
+         <h1 class="title">Hello</h1>
+-        <BLANKLINE>
+-        <p><a href="http://www.example.com" rel="nofollow">This is fine</a>.</p>
+-        </div>
+-        </body>
+-        </html>
+ 
+     """
+ 
+@@ -1031,6 +991,12 @@ class TestMain(unittest.TestCase):
+                       serve_called=True, browser_launched=True)
+ 
+ 
++def grep(needle, haystack):
++    for line in haystack.splitlines():
++        if needle in line:
++            print(line)
++
++
+ def test_suite():
+     return unittest.TestSuite([
+         unittest.defaultTestLoader.loadTestsFromName(__name__),
+-- 
+2.44.2
+
+
+From 2827a754b8706f3286d1aec07a95faf6c8e7ab84 Mon Sep 17 00:00:00 2001
+From: Marius Gedminas <marius@gedmin.as>
+Date: Wed, 31 Aug 2022 13:46:44 +0300
+Subject: [PATCH 2/2] Fix test failures with new docutils
+
+This probably introduces a dependency of docutils >= 0.19 for the test
+suite, but I don't want to make it a requirement for pip install.
+---
+
+This is backported upstream commit [1]. The issue is not related to
+docutils but >=dev-python/readme-renderer-37.0, see [2].
+
+[1] https://github.com/mgedmin/restview/commit/5033eacb1d5552e496a0da46f6a474a38b414f21
+[2] https://github.com/mgedmin/restview/issues/65#issuecomment-1377180524
+
+diff --git a/src/restview/tests.py b/src/restview/tests.py
+index d129835..a7f36d5 100644
+--- a/src/restview/tests.py
++++ b/src/restview/tests.py
+@@ -541,10 +541,9 @@ def doctest_RestViewer_rest_to_html():
+         ... ''', settings={'cloak_email_addresses': True}).strip())
+         ... # doctest: +ELLIPSIS,+REPORT_NDIFF
+         <?xml version="1.0" encoding="utf-8"...?>
+-        <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
++        <!DOCTYPE html...>
+         <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+         <head>
+-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+         ...
+         <title>example</title>
+         <style type="text/css">
+@@ -556,7 +555,7 @@ def doctest_RestViewer_rest_to_html():
+         </style>
+         </head>
+         <body>
+-        <div class="document" id="example">
++        <main id="example">
+         <h1 class="title">example</h1>
+         <BLANKLINE>
+         <p>This is a doctest:</p>
+@@ -570,11 +569,9 @@ def doctest_RestViewer_rest_to_html():
+         <p>This is a reference: <a class="reference external" href="http://example.com/README.rst">README.rst</a></p>
+         <p>This is an email: <a class="reference external" href="mailto:marius&#37;&#52;&#48;gedmin&#46;as">marius<span>&#64;</span>gedmin<span>&#46;</span>as</a></p>
+         <p>This is a literal block:</p>
+-        <pre class="literal-block">
+-        See <a href="CHANGES.rst">CHANGES.rst</a>, mkay?
+-        </pre>
++        <pre class="literal-block">See <a href="CHANGES.rst">CHANGES.rst</a>, mkay?</pre>
+         <p>This is an inline literal: <tt class="docutils literal"><a href="README.txt">README.txt</a></tt>.</p>
+-        </div>
++        </main>
+         </body>
+         </html>
+ 
+-- 
+2.44.2
+
diff --git a/app-text/restview/restview-3.0.0.ebuild b/app-text/restview/restview-3.0.0.ebuild
deleted file mode 100644
index b26aed69c63b..000000000000
--- a/app-text/restview/restview-3.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="reStructuredText viewer"
-HOMEPAGE="
-	https://mg.pov.lt/restview/
-	https://pypi.org/project/restview/
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/readme-renderer[${PYTHON_USEDEP}]
-"
-
-DOCS=( README.rst CHANGES.rst )
-
-distutils_enable_tests pytest
diff --git a/app-text/restview/restview-3.0.1.ebuild b/app-text/restview/restview-3.0.1.ebuild
new file mode 100644
index 000000000000..116c10e73c04
--- /dev/null
+++ b/app-text/restview/restview-3.0.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="reStructuredText viewer"
+HOMEPAGE="
+	https://mg.pov.lt/restview/
+	https://pypi.org/project/restview/
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/readme-renderer[${PYTHON_USEDEP}]
+"
+
+DOCS=( README.rst CHANGES.rst )
+
+PATCHES=(
+	"${FILESDIR}/${P}-test-fixes.patch"
+)
+
+distutils_enable_tests pytest
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 634c64350984..f45f99cade89 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -250,5 +250,6 @@ DIST xml2pmx.doc.r57972.tar.xz 15512 BLAKE2B dafe9dabe542a746a962a02fd04a4831815
 DIST xml2pmx.r57972.tar.xz 496 BLAKE2B 52d22c6616dc74d3e6600ef18449af31b2c286be9fe0bcacdffa2daa260f409baf8c7af1ce8444486b2fe3e21a05ec22aed280a55f227a1693b27ff3c55eed8b SHA512 9545fb5ca0e95788afab79d8a29336f337619adbcac68472bb5de6af6c54187f19bda655232175223168891c064f6fadc67c4ab8f5a0256e2c55e1a65c5e6f6b
 EBUILD texlive-core-2021-r6.ebuild 12511 BLAKE2B 51190f811e16c159cf9be948c77d3d2925ed5b2778fe51f56f074d468a42175413cadfeb4e1038178a47f3333d7e8396fa009d1315ecae94f7cadc2e5f0708fc SHA512 92ce1e0a2d44a5774c3f32110279f3396d70c470d09491dc01414a787947a98cfacd965494bb0f598599004dfb64a28ce63d12c5a099155d331b5c819b783fe0
 EBUILD texlive-core-2021-r7.ebuild 12751 BLAKE2B aac931564addf57c38992c535852a04c40665e84530d2c508fb12fad973a66b67c0a3c115629b1b71d3c4a305922d112fa284580784d7ee77f0fc8cddc878c59 SHA512 fceaa2bbdd60f39e3cf7a97b7316783eb0a11b93b7d528bf517e0907968bf5cccf4564829e494fd54125bbf0627385ae73857c065f4a57ee9d3a916a2838bdd6
+EBUILD texlive-core-2023-r10.ebuild 13501 BLAKE2B 5f800ae6c1434effecac15e670c05f6b511f84a1900407149ed33515cb23c43eb5cc8cbd6c21373aeaf641768e56506c6d98332c2b257f20e65967e46cc671ac SHA512 e27d1f5df66979e1dae4f20514cb6af043f1664a6e33ce598d382afe39b2984454ad15f6ad016cd98b03265225d6fecfc9ead3d3d62972a9486b1939bd1f2a87
 EBUILD texlive-core-2023-r9.ebuild 13471 BLAKE2B 57b57500c3e95ee4cd46d397d1aa279dc803040bd3eb543dc00e32ba1970f073599bc9bbaeea6f38e5feace5bb81b1ff3ef679a5034ac80b7dadce31101ae91c SHA512 4a651081288da97a2e5bf87968ef483a326e30f3566da078ec84e9daab5761ce01abdf72990148f3f46374eff1b99d30a48528f06a0e49c2f6979199512b3399
 MISC metadata.xml 763 BLAKE2B 32e271e244979763c3ed20da203b4a6fdd1646b1b5e92ea0fd3a3172e7f633cec56b55a4a638fa1f98394d4fa1ca443c3949528d30a5bf2564edc9979cc77515 SHA512 efe8b04dc9ea326a12eadccc2f5432563b0b87434028a7f2e671124d3fb08cbb384cd022471d44fec466f8558bab4344d2cbb47fe7e49461bbc802f4416c33e0
diff --git a/app-text/texlive-core/texlive-core-2023-r10.ebuild b/app-text/texlive-core/texlive-core-2023-r10.ebuild
new file mode 100644
index 000000000000..bc05744ea47f
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2023-r10.ebuild
@@ -0,0 +1,501 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TL_SOURCE_VERSION=20230311
+inherit flag-o-matic toolchain-funcs libtool texlive-common
+
+MY_P=${PN%-core}-${TL_SOURCE_VERSION}-source
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="https://tug.org/texlive/"
+GENTOO_TEX_PATCHES_NUM=5
+SRC_URI="
+	https://mirrors.ctan.org/systems/texlive/Source/${MY_P}.tar.xz
+	https://gitweb.gentoo.org/proj/tex-patches.git/snapshot/tex-patches-${GENTOO_TEX_PATCHES_NUM}.tar.bz2
+		-> gentoo-tex-patches-${GENTOO_TEX_PATCHES_NUM}.tar.bz2
+	https://raw.githubusercontent.com/debian-tex/texlive-bin/58a00e704a15ec3dd8abbf3826f28207eb095251/debian/patches/1054218.patch
+		-> ${PN}-2023-pdflatex-big-endian-fix.patch
+"
+
+# Macros that are not a part of texlive-sources or or pulled in from collection-binextra
+# but still needed for other packages during installation.
+TL_CORE_EXTRA_CONTENTS="
+	autosp.r58211
+	axodraw2.r58155
+	chktex.r64797
+	detex.r66186
+	dvi2tty.r66186
+	dvidvi.r65952
+	dviljk.r66186
+	dvipdfmx.r69127
+	dvipos.r66186
+	gsftopk.r52851
+	hyphen-base.r68321
+	lacheck.r66186
+	m-tx.r64182
+	makeindex.r62517
+	pmx.r65926
+	texdoctk.r62186
+	texlive-scripts.r69754
+	texlive-scripts-extra.r62517
+	texlive.infra.r69740
+	tpic2pdftex.r52851
+	upmendex.r66381
+	velthuis.r66186
+	vlna.r66186
+	xindy.r65958
+	xml2pmx.r57972
+"
+TL_CORE_EXTRA_DOC_CONTENTS="
+	autosp.doc.r58211
+	axodraw2.doc.r58155
+	chktex.doc.r64797
+	detex.doc.r66186
+	dvi2tty.doc.r66186
+	dvidvi.doc.r65952
+	dviljk.doc.r66186
+	dvipdfmx.doc.r69127
+	dvipos.doc.r66186
+	gsftopk.doc.r52851
+	lacheck.doc.r66186
+	m-tx.doc.r64182
+	makeindex.doc.r62517
+	pmx.doc.r65926
+	texdoctk.doc.r62186
+	texlive-scripts.doc.r69754
+	texlive-scripts-extra.doc.r62517
+	texlive.infra.doc.r69740
+	tpic2pdftex.doc.r52851
+	upmendex.doc.r66381
+	velthuis.doc.r66186
+	vlna.doc.r66186
+	xindy.doc.r65958
+	xml2pmx.doc.r57972
+"
+TL_CORE_EXTRA_SRC_CONTENTS="
+	axodraw2.source.r58155
+"
+
+TEXLIVE_MODULE_BINSCRIPTS="
+	texmf-dist/scripts/m-tx/m-tx.lua
+	texmf-dist/scripts/texlive/fmtutil-sys.sh
+	texmf-dist/scripts/texlive/fmtutil-user.sh
+	texmf-dist/scripts/texlive/fmtutil.pl
+	texmf-dist/scripts/texlive/mktexlsr
+	texmf-dist/scripts/texlive/mktexmf
+	texmf-dist/scripts/texlive/mktexpk
+	texmf-dist/scripts/texlive/mktextfm
+	texmf-dist/scripts/texlive/rungs.lua
+	texmf-dist/scripts/texlive/tlmgr.pl
+	texmf-dist/scripts/texlive/updmap-sys.sh
+	texmf-dist/scripts/texlive/updmap-user.sh
+	texmf-dist/scripts/texlive/updmap.pl
+	texmf-dist/scripts/texlive-extra/allcm.sh
+	texmf-dist/scripts/texlive-extra/allneeded.sh
+	texmf-dist/scripts/texlive-extra/dvi2fax.sh
+	texmf-dist/scripts/texlive-extra/dvired.sh
+	texmf-dist/scripts/texlive-extra/e2pall.pl
+	texmf-dist/scripts/texlive-extra/kpsetool.sh
+	texmf-dist/scripts/texlive-extra/kpsewhere.sh
+	texmf-dist/scripts/texlive-extra/ps2frag.sh
+	texmf-dist/scripts/texlive-extra/pslatex.sh
+	texmf-dist/scripts/texlive-extra/texconfig-dialog.sh
+	texmf-dist/scripts/texlive-extra/texconfig-sys.sh
+	texmf-dist/scripts/texlive-extra/texconfig.sh
+	texmf-dist/scripts/texlive-extra/texlinks.sh
+"
+
+TEXLIVE_MODULE_BINLINKS="
+	fmtutil:mktexfmt
+	mktexlsr:texhash
+	allcm:allec
+	kpsetool:kpsexpand
+	kpsetool:kpsepath
+"
+texlive-common_append_to_src_uri TL_CORE_EXTRA_CONTENTS
+
+SRC_URI+=" doc? ( "
+texlive-common_append_to_src_uri TL_CORE_EXTRA_DOC_CONTENTS
+SRC_URI+=" )"
+
+SRC_URI+=" source? ( "
+texlive-common_append_to_src_uri TL_CORE_EXTRA_SRC_CONTENTS
+SRC_URI+=" )"
+
+S="${WORKDIR}/${MY_P}"
+LICENSE="BSD GPL-1+ GPL-2 GPL-2+ GPL-3+ MIT TeX-other-free"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+IUSE="cjk X doc source tk +luajittex xetex xindy"
+
+TEXMF_PATH=/usr/share/texmf-dist
+MODULAR_X_DEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libXmu
+	)"
+
+COMMON_DEPEND="
+	${MODULAR_X_DEPEND}
+	sys-libs/zlib
+	>=media-libs/harfbuzz-1.4.5:=[icu,graphite]
+	>=media-libs/libpng-1.2.43-r2:0=
+	media-libs/gd[png]
+	media-gfx/graphite2:=
+	media-gfx/potrace:=
+	>=x11-libs/cairo-1.12
+	>=x11-libs/pixman-0.18
+	dev-libs/zziplib:=
+	app-text/libpaper:=
+	dev-libs/gmp:=
+	dev-libs/mpfr:=
+	>=dev-libs/ptexenc-1.4.3
+	xetex? (
+		>=app-text/teckit-2.5.10
+		media-libs/fontconfig
+	)
+	xindy? ( dev-lisp/clisp:= )
+	media-libs/freetype:2
+	>=dev-libs/icu-50:=
+	>=dev-libs/kpathsea-6.3.5:=
+"
+
+BDEPEND="
+	sys-apps/ed
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+"
+
+# !<dev-texlive/texlive-langother-2023 see https://bugs.gentoo.org/928307
+RDEPEND="
+	${COMMON_DEPEND}
+	virtual/perl-Getopt-Long
+	dev-perl/File-HomeDir
+	dev-perl/Log-Dispatch
+	dev-perl/Unicode-LineBreak
+	dev-perl/YAML-Tiny
+	tk? (
+		dev-lang/tk
+		dev-perl/Tk
+	)
+	!<dev-texlive/texlive-basic-2023
+	!<dev-texlive/texlive-mathscience-2023
+	!<dev-texlive/texlive-langother-2023
+	!<dev-texlive/texlive-music-2023
+"
+
+BUILDDIR="${WORKDIR}/${P}_build"
+
+RELOC_TARGET=texmf-dist
+
+src_prepare() {
+	mkdir "${BUILDDIR}" || die "failed to create build dir"
+
+	cd "${WORKDIR}" || die
+
+	# From texlive-module.eclass.
+	sed -n -e 's:\s*RELOC/::p' tlpkg/tlpobj/* > "${T}/reloclist" || die
+	sed -e 's/\/[^/]*$//' -e "s:^:${RELOC_TARGET}/:" "${T}/reloclist" |
+		sort -u |
+		xargs mkdir -p || die
+	local i
+	while read -r i; do
+		mv "${i}" "${RELOC_TARGET}/${i%/*}" || die
+	done < "${T}/reloclist"
+	mv "${WORKDIR}"/texmf* "${S}" || die "failed to move texmf files"
+
+	cd "${S}" || die
+
+	TL_KPATHSEA_INCLUDES=$($(tc-getPKG_CONFIG) kpathsea --variable=includedir || die "failed to invoke pkg-config")
+	sed -i \
+		-e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${TL_KPATHSEA_INCLUDES}\"," \
+		texk/web2c/configure || die
+
+	local patch_dir="${WORKDIR}/tex-patches-${GENTOO_TEX_PATCHES_NUM}"
+	eapply "${patch_dir}"
+
+	# Can be dropped in texlive 2024
+	# https://git.texlive.info/texlive/commit/?id=c45afdc843154fcb09b583f54a2f802c6069b50e
+	eapply "${DISTDIR}"/texlive-core-2023-pdflatex-big-endian-fix.patch
+
+	default
+
+	elibtoolize
+
+	# Drop this once cairo's autoconf patches are gone. See
+	# https://bugs.gentoo.org/927714#c4 and https://bugs.gentoo.org/853121.
+	"${S}"/reautoconf libs/cairo || die
+}
+
+src_configure() {
+	# TODO: report upstream
+	# bug #915223
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	# It fails on alpha without this
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Too many regexps use A-Z a-z constructs, what causes problems with locales
+	# that don't have the same alphabetical order than ascii. Bug #242430
+	# So we set LC_ALL to C in order to avoid problems.
+	export LC_ALL=C
+
+	# Disable freetype-config as this is considered obsolete.
+	# Also only pkg-config works for prefix as described in bug #690094
+	export ac_cv_prog_ac_ct_FT2_CONFIG=no
+
+	local my_conf=(
+		--bindir="${EPREFIX}"/usr/bin
+		--datadir="${BUILDDIR}"
+		--with-system-freetype2
+		--with-system-zlib
+		--with-system-libpng
+		--with-system-teckit
+		--with-system-kpathsea
+		--with-kpathsea-includes="${TL_KPATHSEA_INCLUDES}"
+		--with-system-icu
+		--with-system-ptexenc
+		--with-system-harfbuzz
+		--with-system-graphite2
+		--with-system-cairo
+		--with-system-pixman
+		--with-system-zziplib
+		--with-system-libpaper
+		--with-system-gmp
+		--with-system-gd
+		--with-system-mpfr
+		--with-system-potrace
+		--disable-multiplatform
+		--enable-chktex
+		--enable-epsfwin
+		--enable-detex
+		--enable-dvi2tty
+		--enable-mftalkwin
+		--enable-regiswin
+		--enable-shared
+		--enable-tektronixwin
+		--enable-unitermwin
+		--enable-vlna
+		--disable-psutils
+		--disable-t1utils
+		--enable-ipc
+		--disable-bibtex-x
+		--disable-dvipng
+		--disable-dvipsk
+		--disable-lcdf-typetools
+		--disable-ps2pk
+		--disable-ttf2pk2
+		--disable-tex4htk
+		--disable-cjkutils
+		--disable-xdvik
+		--enable-luatex
+		--disable-dvisvgm
+		--disable-ps2eps
+		--disable-static
+		--disable-native-texlive-build
+		--disable-largefile
+		--disable-xindy-docs
+		--disable-xindy-rules
+		--with-banner-add=" Gentoo Linux"
+		$(use_enable luajittex)
+		$(use_enable luajittex luajithbtex)
+		$(use_enable luajittex mfluajit)
+		$(use_enable xetex)
+		$(use_enable cjk dviout-util)
+		$(use_enable cjk ptex)
+		$(use_enable cjk eptex)
+		$(use_enable cjk uptex)
+		$(use_enable cjk euptex)
+		$(use_enable cjk mendexk)
+		$(use_enable cjk makejvf)
+		$(use_enable cjk pmp)
+		$(use_enable cjk upmp)
+		$(use_enable tk texdoctk)
+		$(use_with X x)
+		$(use_enable xindy)
+		--enable-ptex=no
+		--enable-autosp=yes
+		--enable-axodraw2=yes
+		--enable-devnag=yes
+		--enable-lacheck=yes
+		--enable-m-tx=yes
+		--enable-pmx=yes
+		--enable-tpic2pdftex=yes
+		--with-clisp-runtime=system
+		--enable-xml2pmx=yes
+		$(use_enable X xpdfopen)
+		--enable-web2c=yes
+		--enable-afm2pl=yes
+		--enable-dvidvi=yes
+		--enable-dviljk=yes
+		--enable-dvipdfm-x
+		--enable-dvipos=yes
+		--enable-gregorio=yes
+		--enable-gsftopk=yes
+		--enable-makeindexk=yes
+		--enable-musixtnt=yes
+		--enable-seetexk=yes
+		--enable-ttfdump=yes
+		--enable-upmendex=yes
+		--enable-texlive=yes
+		--enable-linked-scripts=no
+		# web2c afm2pl chktex dtl dvi2tty dvidvi dviljk dviout-util dvipdfm-x gregorio
+	)
+
+	# Enable the following on version bumps. While it makes the build
+	# always fail, presumably because texlive passes these configure
+	# options to sub-configures, it still points out dropped
+	# options. See https://bugs.gentoo.org/828591
+	my_conf+=(
+		# --enable-option-checking=fatal
+	)
+
+	tc-export CC CXX AR RANLIB
+	cd "${BUILDDIR}" || die
+	ECONF_SOURCE="${S}" \
+		econf -C "${my_conf[@]}"
+}
+
+src_compile() {
+	cd "${BUILDDIR}" || die
+	tc-export CC CXX AR RANLIB
+
+	emake AR="$(tc-getAR)" SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
+
+	cd "${S}" || die
+	# Mimic updmap --syncwithtrees to enable only fonts installed
+	# Code copied from updmap script
+	while read -r i; do
+		texlive-common_is_file_present_in_texmf "${i}" || echo "${i}"
+	done > "${T}/updmap_update" < <(grep -E '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@')
+	{
+		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+	} > "${T}/updmap_update2"
+	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
+		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
+}
+
+src_test() {
+	cd "${BUILDDIR}" || die
+
+	sed -i \
+		-e 's;uptexdir/nissya.test;;' \
+		-e 's;uptexdir/upbibtex.test;;' \
+		texk/web2c/Makefile || die
+	sed -i \
+		-e 's;dvispc.test;;' \
+		texk/dviout-util/Makefile || die
+
+	# TODO: Drop -j1 when bumping to texlive-2024
+	# https://bugs.gentoo.org/935825
+	emake check -j1
+}
+
+src_install() {
+	cd "${BUILDDIR}" || die
+	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
+
+	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
+
+	cd "${S}" || die
+	dodir /usr/share # just in case
+	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+
+	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
+	# exist. Instead, it is called mf, so we symlink it to please everything.
+	use X || dosym mf /usr/bin/mf-nowin
+
+	docinto texk
+	cd "${S}/texk" || die
+	dodoc ChangeLog README
+
+	docinto dviljk
+	cd "${S}/texk/dviljk" || die
+	dodoc ChangeLog README NEWS
+
+	docinto makeindexk
+	cd "${S}/texk/makeindexk" || die
+	dodoc ChangeLog NOTES README
+
+	docinto web2c
+	cd "${S}/texk/web2c" || die
+	dodoc ChangeLog NEWS PROJECTS README
+
+	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
+
+	newenvd - 98texlive <<-EOF
+	CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"
+	EOF
+
+	# populate /etc/texmf
+	keepdir /etc/texmf/web2c
+
+	# take care of updmap.cfg and language.d files
+	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
+
+	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
+
+	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
+	# by texmf-update
+	rm "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf" || die
+
+	if use cjk; then
+		rm "${ED}/usr/bin/"{,u}ptex || die
+	fi
+
+	if ! use xindy; then
+		rm -rf "${ED}{TEXMF_PATH}"/{,scripts,doc}/xindy
+		rm "${ED}"/usr/share/tlpkg/tlpobj/xindy.* || die
+	fi
+
+	dobin_texmf_scripts ${TEXLIVE_MODULE_BINSCRIPTS}
+
+	dodir "/usr/bin"
+	for i in ${TEXLIVE_MODULE_BINLINKS} ; do
+		if [[ ! -f ${ED}/usr/bin/${i%:*} ]]; then
+			die "Trying to install an invalid BINLINK ${i%:*}. This should not happen. Please file a bug."
+		fi
+
+		dosym "${i%:*}" "/usr/bin/${i#*:}"
+	done
+
+	texlive-common_handle_config_files
+
+	# the virtex symlink is not installed
+	# The links has to be relative, since the targets
+	# is not present at this stage and MacOS doesn't
+	# like non-existing targets
+	dosym tex /usr/bin/virtex
+	dosym pdftex /usr/bin/pdfvirtex
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	# Note that the etexmf-update and efmtutil-sys use nonfatal. We are
+	# pkg_postinst, so invoking die will merely print an error message
+	# but not abort the installation as it already happened. However,
+	# unlike the texlive modules, we observed fmtutil-sys failures in
+	# texlive-core.
+
+	# TODO: Research the rationale of calling etexmf-update and
+	# eftmutil-sys here and the reasons why it sometimes fails.
+	nonfatal etexmf-update
+	nonfatal efmtutil-sys
+
+	texlive-common_update_tlpdb
+}
+
+pkg_postrm() {
+	texlive-common_update_tlpdb
+}
diff --git a/app-text/texlive/Manifest b/app-text/texlive/Manifest
index 6f9721dbac95..ddc43b7f0b9d 100644
--- a/app-text/texlive/Manifest
+++ b/app-text/texlive/Manifest
@@ -1,4 +1,4 @@
 EBUILD texlive-2021-r1.ebuild 6650 BLAKE2B eaad4704c0c974f9d15ee90aa70d0dd6fa69883c2bf65e0e71216f4ca6084bfb57601cbd5dc53000d2654848c52f40a4d5d8af9f2ae58a9540257ee93b7a2a2f SHA512 e9c17f0549ce4eef1adb81956c064e31b0e8029e1fa256ca716ecf2e84b91456f0c7c4c8849c7316e80a15b3a17b8ec14989904bf9bb7ffe736a606270a1689c
-EBUILD texlive-2023-r1.ebuild 6516 BLAKE2B ee777da96d5b70f3f04a8c908074c39e21042e925baf71b7131777b773b2bef37fbb8579f896b7dcfc596f5dbb7939cc82f791a9ad58caf7a08753bda91e774d SHA512 1b43487352a3271f35f5faafdd48bc9033678f8045fc48ce7ad8aa58e44b404d0b078a3044b0c142ee6f1e80ad4d90ad3913fb53cdd6205cf51fd69417531849
+EBUILD texlive-2023-r1.ebuild 6500 BLAKE2B 715a3f1200c6b97d0a0d9fd87a31b5bb9a70e0beecdc0d131edc86bda35725930a16d65f71ad2363d71311d9b68f7fd1fa27c4d2180507b507712b3ce5ee1f6f SHA512 cb12acf4167777d742f468c288f2d231d8fa5c1bb606753cf5b58ad07158cd59202245f84d2193bdef23846575987935063bf2d9d6288ae9c865c0f11b0ff5fa
 EBUILD texlive-2023.ebuild 6448 BLAKE2B f982d2a0ac13c901339dfb939f316266480ad4d0d80aaafed5bc67b425d658f171c898ade7e4b233498aee353dcef268aef5a6dd9b01a09415d83661d0970d46 SHA512 9226df8af54170b292762a86b54d27c0ab84987a4d1ad4964024a316d93649c5b967e401af7dbfa3ec31015b5a00a7dbb77cb557890d2af1c2ea8c38d86f4aeb
 MISC metadata.xml 1836 BLAKE2B 049796d51021c108b7310ffadd3c572842aab1c77c25897fc8972b06dc5e1b4895c3501b1b4c4de487821ee961f781c2159b436de6c5a8d411e30097de5be68f SHA512 9752e9d0a1e3f1ee518fa390c52d607f20463053cfd29909fd92bb1482cfe3dee5bec4140865d2151caa5459a60f53646f6218ed743f692c65ecc49610469cf3
diff --git a/app-text/texlive/texlive-2023-r1.ebuild b/app-text/texlive/texlive-2023-r1.ebuild
index d2f55d5383fe..947ddd5379ea 100644
--- a/app-text/texlive/texlive-2023-r1.ebuild
+++ b/app-text/texlive/texlive-2023-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DESCRIPTION="A complete TeX distribution"
-HOMEPAGE="http://tug.org/texlive/"
+HOMEPAGE="https://tug.org/texlive/"
 
 LICENSE="metapackage"
 SLOT="0"
@@ -21,8 +21,8 @@ done
 
 TEXLIVE_CAT="dev-texlive"
 
-DEPEND=">=app-text/texlive-core-${PV}"
-RDEPEND="${DEPEND}
+RDEPEND="
+	>=app-text/texlive-core-${PV}
 	app-text/psutils
 	>=${TEXLIVE_CAT}/texlive-fontutils-${PV}
 	media-gfx/sam2p
diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index 00df14bb5bb3..e280645a4adf 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -22,7 +22,6 @@ DIST xpdf-korean-20231205.tar.gz 809244 BLAKE2B f24d521d17d675a1054aed0df12b4105
 DIST xpdf-latin2.tar.gz 1431 BLAKE2B db8c823c4e90643b9d08c9a4106f479470236a00115d2dc6f3a71da4bc9b5e33561da5ac5dce81cbf5fc943a65572f3595601f6e9f31a3fba9bc0d35f28e0016 SHA512 5fe0b60bfac7f0f4a26e3e7216de5043f6b94446f464c984b7c25431ec01a5912952c0dc66bb2c7159c9f63e4805689c6cfc761086aad9e59f1f21d0cddb5d15
 DIST xpdf-thai.tar.gz 1878 BLAKE2B dbcc2aa2652c40c2220688767a58cadcfbe39310d6c2664b98392a03b00de6d558fa3f333a085e7c6ff3476b6ffcd98fcc228eeb8dd59e905f870c8a39143ac9 SHA512 5584b590e34da29285c379e3b7a7243c28241ec6fddb3e4a8e2e7bf88b8f7aaae3483061d12c332a1ff042ec5e2b31869a67d60512ac48f7903c5e2fc871aa87
 DIST xpdf-turkish.tar.gz 1137 BLAKE2B f735e9842361a5a73fabe40aa4e9cb552475d3751df3e885c5a1a68e0de8ca7b5a031e6332495f70abdc1e943fa615f09185e9ba22922f37f02e42f59ddfc57c SHA512 a73e90bce8f2a12154b06ef29333a45d96258c0d653d5cb15afd2e5ad9e79a9b617e5f8ebeb20bde545684d50f3bc1349800c99f70c863bdd502c24c266b4fb1
-EBUILD xpdf-4.04-r1.ebuild 4121 BLAKE2B 918e321bb50511e69e792581c9c1e9a28c4b82965520ddd8f8e4c80adf49bd6b781d94c9fccf01a0b55b7a30dd4e5205e0747a3ad63bb79533b1e032a1299eab SHA512 7863ab3f65d77b541beceb80324d2a3c9f49fc6f7c0f0fc2d03ed5f0b40e0a7b50d7cd97477a616b16c7b1572a3a700b2fea3015cb96255b633682eb84982033
 EBUILD xpdf-4.04-r2.ebuild 4164 BLAKE2B cdfeb410fc2cfe5d100aee08cf14961dd82e13ffa5814c6f4c4ebbd3da890e0dd2bf30bff13b34b15f68fb77c2deffc897ef2cd35687d6cd545108ddf84acd11 SHA512 47b99d180a0b062a60a1c495aa6d2dbd217eb361e242db1246c808deb855a95a2ddc22a54b7776f57c12175226ae4876499b28bfde3e5969445393571d9061e5
 EBUILD xpdf-4.05.ebuild 4215 BLAKE2B 6c144238a4eb787ee3f9fc491c1ecfd124f236f7e68d9eeda44bf46dd09e7cf2e0e440243ed8c370be8f41035b41cc866d3bfdac215d457c5e76011b0be4317b SHA512 3d93115b2ae36577ae2272269a4e3e5a957a9d6fb1ebe7b47e887d8bd9f50603c9c3ba52005960200596187efde790b96860ccfd69e873dd35ff29be2225e57c
 MISC metadata.xml 1011 BLAKE2B a35854c110678bcc8c46a1a8a8823f93b2552b6349c3ab75829aeddd201a446dd73d72e166db112f9d8a808082822982956ec36d53600f139603d56bf72a3208 SHA512 230517c08a5b36fd2bc4135ea50405ed3eb73becd5f5747b94229389cc5f61227bd8b61004239f30fd1dae314a6da37434b370db12aacea5d1643610e0a36699
diff --git a/app-text/xpdf/xpdf-4.04-r1.ebuild b/app-text/xpdf/xpdf-4.04-r1.ebuild
deleted file mode 100644
index a9265208e02a..000000000000
--- a/app-text/xpdf/xpdf-4.04-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/xpdf.asc
-inherit cmake desktop verify-sig xdg
-
-DESCRIPTION="The PDF viewer and tools"
-HOMEPAGE="https://www.xpdfreader.com"
-SRC_URI="https://dl.xpdfreader.com/${P}.tar.gz
-	i18n? (
-		https://dl.xpdfreader.com/xpdf-arabic.tar.gz
-		https://dl.xpdfreader.com/xpdf-chinese-simplified.tar.gz -> xpdf-chinese-simplified-20201222.tar.gz
-		https://dl.xpdfreader.com/xpdf-chinese-traditional.tar.gz -> xpdf-chinese-traditional-20201222.tar.gz
-		https://dl.xpdfreader.com/xpdf-cyrillic.tar.gz
-		https://dl.xpdfreader.com/xpdf-greek.tar.gz
-		https://dl.xpdfreader.com/xpdf-hebrew.tar.gz
-		https://dl.xpdfreader.com/xpdf-japanese.tar.gz -> xpdf-japanese-20201222.tar.gz
-		https://dl.xpdfreader.com/xpdf-korean.tar.gz -> xpdf-korean-20201222.tar.gz
-		https://dl.xpdfreader.com/xpdf-latin2.tar.gz
-		https://dl.xpdfreader.com/xpdf-thai.tar.gz
-		https://dl.xpdfreader.com/xpdf-turkish.tar.gz
-	)
-	verify-sig? ( https://dl.xpdfreader.com/${P}.tar.gz.sig )"
-
-LICENSE="|| ( GPL-2 GPL-3 ) i18n? ( BSD )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect utils"
-
-BDEPEND="
-	icons? ( gnome-base/librsvg )
-	verify-sig? ( sec-keys/openpgp-keys-xpdf )
-"
-DEPEND="
-	cups? (
-		dev-qt/qtprintsupport:5[cups]
-		net-print/cups
-	)
-	fontconfig? ( media-libs/fontconfig )
-	libpaper? ( app-text/libpaper:= )
-	utils? ( png? ( media-libs/libpng:0 ) )
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	media-libs/freetype
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtsvg:5
-	media-fonts/urw-fonts
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-automagic.patch
-	"${FILESDIR}"/${PN}-visibility.patch
-	"${FILESDIR}"/${PN}-shared-libs.patch
-	"${FILESDIR}"/${PN}-4.04-libpaper-2.patch
-)
-
-DOCS=( ANNOUNCE CHANGES README )
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.sig}
-	fi
-	default
-}
-
-src_prepare() {
-	sed -i \
-		"s|/usr/local/etc|${EPREFIX}/etc|;
-		 s|/usr/local|${EPREFIX}/usr|" \
-		doc/sample-xpdfrc || die
-
-	if use i18n; then
-		sed -i "s|/usr/local|${EPREFIX}/usr|" "${WORKDIR}"/*/add-to-xpdfrc || die
-	fi
-
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DA4_PAPER=$(usex metric)
-		-DNO_FONTCONFIG=$(usex fontconfig off on)
-		-DNO_TEXT_SELECT=$(usex textselect off on)
-		-DOPI_SUPPORT=$(usex opi)
-		-DSPLASH_CMYK=$(usex cmyk)
-		-DWITH_LIBPAPER=$(usex libpaper)
-		-DWITH_LIBPNG=$(usex png)
-		-DXPDFWIDGET_PRINTING=$(usex cups)
-		-DSYSTEM_XPDFRC="${EPREFIX}/etc/xpdfrc"
-		# Bug 910166
-		# https://forum.xpdfreader.com/viewtopic.php?p=45052#p45052
-		# Likely fixed in 4.05
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=ON
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use icons; then
-		sizes="16 22 24 32 36 48 64 72 96 128 192 256 512"
-		cd xpdf-qt
-		mkdir $sizes
-		local i
-		for i in $sizes; do
-			rsvg-convert xpdf-icon.svg -w $i -h $i -o $i/xpdf.png
-		done
-	fi
-}
-
-src_install() {
-	cmake_src_install
-
-	domenu "${FILESDIR}/xpdf.desktop"
-	newicon -s scalable xpdf-qt/xpdf-icon.svg xpdf.svg
-	if use icons; then
-		local i
-		for i in $sizes; do
-			doicon -s $i xpdf-qt/$i/xpdf.png
-		done
-		unset sizes
-	fi
-
-	insinto /etc
-	newins doc/sample-xpdfrc xpdfrc
-
-	local d i
-	if use utils; then
-		for d in "bin" "share/man/man1"; do
-			pushd "${ED}/usr/${d}" || die
-			for i in pdf*; do
-				mv "${i}" "x${i}" || die
-			done
-			popd || die
-		done
-
-		einfo "PDF utilities were renamed from pdf* to xpdf* to avoid file collisions"
-		einfo "with other packages"
-	else
-		rm -rf "${ED}"/usr/bin/pdf* \
-			   "${ED}"/usr/share/man/man1/pdf* \
-			   "${ED}"/usr/$(get_libdir) || die
-	fi
-
-	if use i18n; then
-		for i in arabic chinese-simplified chinese-traditional cyrillic greek \
-				 hebrew japanese korean latin2 thai turkish; do
-			insinto "/usr/share/xpdf/${i}"
-			doins -r $(find -O3 "${WORKDIR}/xpdf-${i}" -maxdepth 1 -mindepth 1 \
-				! -name README ! -name add-to-xpdfrc || die)
-
-			cat "${WORKDIR}/xpdf-${i}/add-to-xpdfrc" >> "${ED}/etc/xpdfrc" || die
-		done
-	fi
-}
diff --git a/app-text/zeal/Manifest b/app-text/zeal/Manifest
index 747a45380b20..10ff2340883b 100644
--- a/app-text/zeal/Manifest
+++ b/app-text/zeal/Manifest
@@ -1,5 +1,10 @@
 AUX 0002-settings-disable-checking-for-updates-by-default.patch 1080 BLAKE2B 07b40bdd13fe6e7a4efa24a17a1b734be50ec8e289c74278ae3f718c05388a4b36b064922798c4ec2e4f69e9dd49f3cd24d39c98adb0274914b28fcd42016a36 SHA512 bd5e7369bc5878df9c6dff093d710e73b8ed1a4e2c3a6927a26f5fbf97725fd695a90f197bf46d229b38a16c40e19308f8e058fd9819177c62cd7fbaae7e370d
+AUX add-missing-qt-components.patch 532 BLAKE2B 278d3ff4d5833d4b5e63be4fe8bb9942fa764aa97426d415793436b431d8ecd3cc44b687d2b594ec5eedcf44661174d15283b4d2f7a235278c499ec64c97c446 SHA512 3dbaf47a8d197f6892a430bba0f8e89410923fe405a1d5318c0081e66784fc125e29254f81a0da4fba31a38f60858dde35309ec7e3fa0f8f64423631f8fa6fa5
+AUX disable-werror.patch 245 BLAKE2B 187197e65082ce3724569fde73a4d737ff24881cf80d9383d4c83e17c2c8d23667bdf4fabcc12eb5e65186896e1cb66123fa1704299ef3eecf5288e64a4ef900 SHA512 de53fecba780c088e3dc0dc2d69a2e1a48cade216b048b55078eb4dd6758962aa2a353f7981bcd21a6f117de6c0d233dae438c157d0eff129e93669acaa42f84
+AUX qt6.patch 404 BLAKE2B bc757d9ee15e4a85750bc6762107bcce5b7bfd71988738ef08120744d0c9d846bf8dc97946bb76e7439dde49ce6ad4150bfa96b66e0f7a406000caf9eaf43437 SHA512 5fc4ebeedcba98aec13e150eb1a3a1ba82490537431ab765944ee323ae243ec94fa7cc451fa4aeb86edc8892f4a796cff1bb2fb21083cf1902b84ad11fde43e4
 AUX zeal-0.6.1_p20200815-fix-sidebar-static-lib.patch 742 BLAKE2B 6c104f3f9708a53e2d19699f38a28f0298808014f0be49aad14f2aee58636528be6d2174ea3d68065cb76f1c8b27091a6cd45d259f2e1418a59ad1e63ea9d1e0 SHA512 0d1e7a7b61670ced6b873537a1bd5a73e8c84572bfec0692477c7d59803b93a9b79fb42bc90f368284acc66583164d0a0482ecd34cb02617a82b6c402dbfd46a
 DIST zeal-0.6.1_p20200815.tar.gz 1180048 BLAKE2B 22a6ee7985516f2204de0603374944c101fa77339a6c83b8a33633fa51e25890f39d672f3d804adb8c41b9ffc2ad7971ce16f90dacb1160f1868ed3f8768aad2 SHA512 fa08c88a40f2f75847db4950c2b027262304bb8b63b95d497786fa2c3a90aa0c488fc3ebe494afe70353a2dd93a181bf2d8fa752a7241e572045c6728ea99f2d
+DIST zeal-0.7.1.tar.gz 1195333 BLAKE2B 56e6d56e152ed94559d15ba4a5dd7972466db75a4d760640b55b532ba3ed325a429e8e03f450efaa3e24f09af68ff5b43463d9b8f21b8a9bd11e23a3841780c4 SHA512 bf2b5e2878b349ec4e5e74377a2a74e263d5f20649f152f194375547c5e69b3e6115c9d0f103acad7f087b20456d888a3be9f7ce1aa232206bba7e0ed38d252b
 EBUILD zeal-0.6.1_p20200815-r1.ebuild 1149 BLAKE2B 58d3bf11e5860776bab0b4d8acfd235923116b75606bfe80a133a2d11876b09e19894e7066523c09f683272614d659693a1268f827a0495f1d08c98d3cb2d751 SHA512 1417c839787e230b3b79e159cfb52162f5b16852dd91182878a282766ca3dc8465d1db5070091d416528aa778fab8fcf8bedd72517e31ceb162219d47b18c323
+EBUILD zeal-0.7.1.ebuild 1144 BLAKE2B ccfa1322c4993c73ce002cd2479ed327aeadd22ba140572e141d44fcbd4d81fe82fcacad857f79ba2bd8c20080bffa08ca0193e1f3d97ef68be51589631d6bae SHA512 29351d4a132e70e5b1f42d06380488c602ecf5344640fe791b1adab0c0f9275cbac0da44ba3e7831ae4fa848082a675125490e7547f5d04dbebebf586a08790a
 MISC metadata.xml 249 BLAKE2B f4b1ccdb1ff03c3f0e6ed64ed43735ecf7a28c4f1423318cc73b98f1c7381b9c2b43d536b54a0dc4e3bd1a513901ea5bf79aacf2e093d183e5891a2e076d7cee SHA512 47df3d0e94b419d5a06a7b6c5b41b4d75bc6c0c868dca5c0722e358618afc34bc2cc354d6f6c416438783b57cf187af15736181e28a740d8722ded775d167489
diff --git a/app-text/zeal/files/add-missing-qt-components.patch b/app-text/zeal/files/add-missing-qt-components.patch
new file mode 100644
index 000000000000..423bfed0b081
--- /dev/null
+++ b/app-text/zeal/files/add-missing-qt-components.patch
@@ -0,0 +1,10 @@
+Backport of https://github.com/zealdocs/zeal/pull/1644
+Done manually because CMakeLists.txt has CRLF line endings in release tarball.
+--- a/src/app/CMakeLists.txt
++++ b/src/app/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets REQUIRED)
++find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Concurrent WebEngineWidgets Widgets REQUIRED)
+ if (Qt${QT_VERSION_MAJOR}Widgets_VERSION VERSION_LESS QT_MINIMUM_VERSION)
+     message(FATAL_ERROR "Qt version >= ${QT_MINIMUM_VERSION} is required.")
+ endif()
diff --git a/app-text/zeal/files/disable-werror.patch b/app-text/zeal/files/disable-werror.patch
new file mode 100644
index 000000000000..e1811d3098de
--- /dev/null
+++ b/app-text/zeal/files/disable-werror.patch
@@ -0,0 +1,12 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -59,9 +59,5 @@
+     VERBATIM
+ )
+ 
+-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.24.0")
+-    set(CMAKE_COMPILE_WARNING_AS_ERROR ON)
+-endif()
+-
+ add_subdirectory(assets)
+ add_subdirectory(src)
diff --git a/app-text/zeal/files/qt6.patch b/app-text/zeal/files/qt6.patch
new file mode 100644
index 000000000000..1312d63abb6f
--- /dev/null
+++ b/app-text/zeal/files/qt6.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -22,7 +22,7 @@
+ set(PROJECT_COPYRIGHT "© 2013-2024 Oleg Shparber and other contributors")
+ 
+ # Find available major Qt version. It will be stored in QT_VERSION_MAJOR.
+-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
++find_package(QT NAMES Qt6 REQUIRED COMPONENTS Core)
+ if(QT_VERSION_MAJOR EQUAL 6)
+     set(QT_MINIMUM_VERSION 6.2.0)
+ else()
diff --git a/app-text/zeal/zeal-0.7.1.ebuild b/app-text/zeal/zeal-0.7.1.ebuild
new file mode 100644
index 000000000000..517aa25b87d1
--- /dev/null
+++ b/app-text/zeal/zeal-0.7.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake edos2unix xdg-utils
+
+DESCRIPTION="Offline documentation browser inspired by Dash"
+HOMEPAGE="https://zealdocs.org/"
+SRC_URI="https://github.com/zealdocs/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	app-arch/libarchive:=
+	dev-db/sqlite:3
+	dev-qt/qtbase:6[concurrent,gui,network,widgets]
+	dev-qt/qtwebchannel:6
+	dev-qt/qtwebengine:6[widgets]
+	x11-libs/libX11
+	x11-libs/libxcb:=
+	x11-libs/xcb-util-keysyms
+"
+RDEPEND="${DEPEND}
+	x11-themes/hicolor-icon-theme
+"
+BDEPEND="kde-frameworks/extra-cmake-modules"
+
+PATCHES=(
+	"${FILESDIR}/disable-werror.patch"
+	"${FILESDIR}/qt6.patch"
+	"${FILESDIR}/add-missing-qt-components.patch"
+)
+
+src_prepare() {
+	edos2unix "${S}/assets/freedesktop/org.zealdocs.zeal.desktop"
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DZEAL_RELEASE_BUILD=ON
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
-- 
cgit v1.2.3