gentoo auto-resync : 27:02:2025 - 19:26:39

21 files changed, 94 insertions, 1276 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index aefb6b5fb02a..3e8e633ea59c 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 32a6e660f10d..31b362af0ee6 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,32 +1,13 @@
-AUX 0001-HTML-Input-Dont-add-resources-that-exist-outside-the.patch 2420 BLAKE2B eafb4c38c87bdb708905b0c17b9d3466dad76c1f286f702b6c063c9af866ab8dc656af019eb10a70fa841cfda4e47e1eac9276abdd63d23cf2ffe69f377ad110 SHA512 083e7112f6bdabd0f1894a8afacc87a166ffdad7fa9c88683f05991249b2aa18de04c4e5d842991b0b49a6d0d76248093a7f6ed29a3d0c1a6725e8ab512982e7
 AUX 0001-PIL-11.0-changes-its-webp-features-output.patch 1223 BLAKE2B 959dc14e452dd1d19a67976fef43e7fc12ec7739d91710848e9f0cfd24966d553c74521a48a44f3b67d36256ef2041b20b8ee2201a855870270512a5937c36ba SHA512 365f55f94d3657a39a5495604f383e3ecda2ed9c4ab8e783b5117b59f2707f933722939049f4450e7629a3f91ce0c607d968427e6b05b9a00e275980b5b2c2ca
-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-7.17.0-qt-texttospeech.patch 1857 BLAKE2B c043883ffc42314d00754907ccbadbc6f1d4916f4d53b0cfe0a86403d251db26f07b26a169671683fd26816868e4f7538705c57024f1314d863edb39937bcee5 SHA512 246c1e8dc4f423b8d87d8e96b13d695c1efe1bd24c69b06fa82b8d655aad89d206ae1bc5998b9f2d160bcd1b87f4d0af41806ed17de711b445811a159d165a37
 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.16.0.tar.xz 44833684 BLAKE2B 2b609a0d014d43998f693a69c10f6d8b0165bf97f8c9d388cf4e1e398e7254b300d53b26e5ec24af651e03bb625bb088331dc77aa2ed6edea13de2beb0e75339 SHA512 5ea11badd972422299ce143e2aa33f58f7abcfd2837acba47d2a7aa6f0997a711245273205ed043c783e5e82bbaaf7cab44e5c03c00e274a03a4ba29be53a708
-DIST calibre-7.16.0.tar.xz.sig 566 BLAKE2B 1d09e8dd49ad53c88632dc23573fa9cd5403d45a308598ac4ed7d4f2dd5a84cc3ae6812ac652ff4a98fc5d67589ad1584411f7746b6b98468bf03a35a0585de6 SHA512 91f3897d95d234a8d673006273974d32cb6c5aa4953d247700d6d89d511c9b1450dc8e222eabf5d1e4d82de206e425ee440defaff38d1ca83efdbf4bcada7c7c
-DIST calibre-7.17.0.tar.xz 45053400 BLAKE2B 93149c4fab7a25e1239c4b8c72b766e5ffc71eb27d1206225bc8436f26d2c76f9323e0f0f63d8444291f02a5a7e94d4500715398a71df4ab2a5b16e325e7be73 SHA512 916337dc425916110528828bac0fbdc24db9496362c1e8dad67eafdfda42b90174fb6a4352400cd34af0f11268aabed82b166b3e4875f59e317359079e10bf3b
-DIST calibre-7.17.0.tar.xz.sig 566 BLAKE2B c041904919ef300f51ba7363daf7d2bc70fc8bb819ffef157e53c28f91b9716be56b1e95465180ecd67069241a5810b70ac08027f4837426a5426792fab05e49 SHA512 af88bcbf394ac6ec68c40d661545a17e956b31dd7797d1cc8490e090437206902a64c7a642cf1e34184e379c79066843959e1459eb1836bddbd615febbc85c07
-DIST calibre-7.19.0.tar.xz 45057708 BLAKE2B 888ddf4292b8c8931c811eb78d6e9b003139545947f2b7bf63fcd96d96caa050a0f93a30ed0313ccf9b4ebfb25c2df1be7f2806d5117a870d1ac34ad29669e39 SHA512 b1225d6d403a8c4dca321c108d270aa79cf65a450f7db90a4e4df5525e8c1c6eb06b4a2492de7b691f6a1a85ce09361dc3796311c46fa082d6e82829827022a7
-DIST calibre-7.19.0.tar.xz.sig 566 BLAKE2B 35a9f8987f0dfad0a14843f3db61f8b3442692dafdf9d253ed13c2071b7e8d9d4cec8012dad4b59b30013fdda790967cf42594a29c6a9a2a668bccda72ac2e72 SHA512 836a0138ed46b179fefe78bc678f6f8146fe5d8a1eb9111f02bcc804d96253281c918cc4ad7a3a860a3177babac9c6fd4b2e417361e59b7245d19bfa50f3f739
 DIST calibre-7.20.0.tar.xz 44795188 BLAKE2B 2ccb7fcd5acdf9f627d79f5656709a7eddee7545dd2c8a95bbb7d2dc61fb26dcf8c34c3c2d6b1514fdbb6b4d7c3fd3e98be72c778026c7b2bb4a42651c5e664b SHA512 3b6e2d4ed8d0755096b466f4bdcc8b6ca4810398caa2322c1efc30280680ff8b10dc5fb8cb763bed8fee82746e7c51c6f31f56e5d9689d5f43c671442004c532
 DIST calibre-7.20.0.tar.xz.sig 566 BLAKE2B 4d89a7781eb1500969ca75ddf01890bbfea6ecfde4e7173f062be6546e898f68a16e0ff7a3d76e5e17dc0abca617d381de24e18e72f4f05b5965b051f28e6cab SHA512 62dc9964c3a30477e22f832148fdaa57860559e2aaddccff107b37c399854ac3ca84097cd7072c2ee4e57403c7ed17286469f31f6efc3d790f63f438d9c78c79
 DIST calibre-7.21.0.tar.xz 44802864 BLAKE2B f86ce0f310ac5b38f3aa54ca6436ad9c22c465e5608089c0178fcc5ed87d988ffae50d6b760ae4281ce68315998a5e1c426f243b58bfae86a78e5479d824070d SHA512 0c2ee610833df83219c0c33b09e1374a8262f1630ccd48e3c4725c92922a3ac5d102ad83fc213457fb9de3efa4f5a2c98ff6dff039828e1661085a1054d7f631
 DIST calibre-7.21.0.tar.xz.sig 566 BLAKE2B 6410767553809878644ccae960b756b3b0571309bf4cbb61b9282586442243d41d1b2da578f97fbf7fbac573c7e9f84bc293e6b38e921850bce44bc7c87d74c8 SHA512 444492b958a01105cb60e8653f8b0e3c5c27a42876527b642f176a375459d3a5664b601aa8fa64c3d39ae486200cd456cd8691a055f7f7530225df106b1bd074
 DIST calibre-7.22.0.tar.xz 42428392 BLAKE2B e9b7e0dc6e92340ff76d99f44f8265a572d05afadb6b5b06312a6dfbc6b0540d49647686a3fbb367da67a31d680ec8982a46d7baeb2c8371b4eeea1f0eb6c1f8 SHA512 583a1e2bcdd05c350e57cb205fc95eb076210ea5c9156f95a08c63e27f418ecb735c0a68212514edaa05af61e780cf8377a1e1b76a89729ee13b4d5ed34359c7
 DIST calibre-7.22.0.tar.xz.sig 566 BLAKE2B d818c347043efcd8b01f68efdfdae43bf0315d45a7d8c52e8920972b8fa718b9551edb388a0531eb1781c8a959b31a16bb6f1dec517d3415b0a596d50c4d368e SHA512 9e72f286f01bf3ca76d702f0a8415635d5a352e06765f14a50fae828bea3f5c710200eb857075972e1bcfd176c05983421d899a13ef5aa9c3aa7e996bce80e5e
-EBUILD calibre-5.44.0-r5.ebuild 8984 BLAKE2B b5f9a34dadb013f347366ccbe2cc36168b85caf4a466188665d949d6116406664ba533290395046148d24104140aaa94b6caf5027444293c9fe17de43a27b4ca SHA512 43381007298d2f41cad354cd608e6f3b04192bb055836d9175d8c9204832f26d54297b0da0ddea4e6139ae058fb49ff761932978992928885b8197f193749804
-EBUILD calibre-7.16.0.ebuild 7987 BLAKE2B 61535b4bea3c99a8ac5cbe3b6738c91c3bdd0d30780a904102fc1b21799b835e922c034045bbfcf234f3a99890c0fa0203274ccefbdf570254dc946c65ea503b SHA512 090609b21ec694a22a89f27a516e10d5772bc5377c87e0fe2ff0b751c01d2a0cf9c4fa0512541a77e49483cbf7722a83e264b3bb0b45f3ee6f8d73e2b8f7054e
-EBUILD calibre-7.17.0.ebuild 8155 BLAKE2B e8045cf5f3e6557b0027ba84ce2c4e2558a1dd67f6007eee794ac2571c5277ed45b6c45b183d0144fe58c297af405637cb95c54ebdcfaaa96e6a9c117e7c3533 SHA512 07ba8a2a98a960111dec197e415b8ffcd9697a6d7e2278c7b417d6e89864713d7f0b1e7a015b23958f08db8fb5965e1c7502fc79508872c24b979d4b053eae38
-EBUILD calibre-7.19.0.ebuild 8374 BLAKE2B 80659908ab33bf598b3f3706c0c6b57cf477af6953e14f038544920862839864dc3dccc53f029e1fd45a62cc4d9f40719f1306ed44a474c6c8912977616639a6 SHA512 9a469b83c5c36b42e8d3e589a9a56cc7cf7be74bbf2e30f7d0987386de80882c8e8a538d7d873bf175f3bf5eacaf9fef09c93ddffa5e46b5d08aaebcf7d50566
 EBUILD calibre-7.20.0.ebuild 8400 BLAKE2B a36548f91272362a57c6286342855044cb39f7712ddfa9e55a3c72627ababc4eacdca6008741e63df056eb2ca7e5df0f59c22830ab988fcc3a8b683eb232ef79 SHA512 28a5034d892e24d61ffb0e40e0d996ce0a4dbb0faded49240d42803d920917457471efd86dd5706f64ab1075d917432daa9c482da0c3d302dcb78c41487d52a5
 EBUILD calibre-7.21.0.ebuild 8305 BLAKE2B cf08c0f9a5d1046632aa77f7d6e0ce2cb24551e716fe6f4c7614f508c8331841a574337b2678b0b79396f15d02df629247c7da16a90c0e925fb56d3567394230 SHA512 ec7852d1b70a18df376d10ea2d93b1147a3da58f3c635ecd6ac23c90c9f53f79b6da7a71d533334e62fc8b6f5aae6babfbbf8aaa3cc4fdb947516f999f7eda3c
 EBUILD calibre-7.22.0.ebuild 8337 BLAKE2B 34df92e7f1590f5193a5af29d9f11b031567ea46cc819175bdb57cea78ae84bb2fc2127231374d4b0b034ee2c1f58ba45e81a12604997442bc9bdd03c79f2a42 SHA512 615fa750653fb4436f8b7fa3d00c8408b1f2fce60edc49d7e2c4bb5ec401ca0322c1d0e9a00c28bcec81d75208ce1fc2d7bdc3219518547951688bc948c5c069
diff --git a/app-text/calibre/calibre-5.44.0-r5.ebuild b/app-text/calibre/calibre-5.44.0-r5.ebuild
deleted file mode 100644
index 45c3e9cebcf1..000000000000
--- a/app-text/calibre/calibre-5.44.0-r5.ebuild
+++ /dev/null
@@ -1,265 +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"
-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/faust-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.16.0.ebuild b/app-text/calibre/calibre-7.16.0.ebuild
deleted file mode 100644
index 0a7727b1acb2..000000000000
--- a/app-text/calibre/calibre-7.16.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.17.0.ebuild b/app-text/calibre/calibre-7.17.0.ebuild
deleted file mode 100644
index 632c657e358f..000000000000
--- a/app-text/calibre/calibre-7.17.0.ebuild
+++ /dev/null
@@ -1,246 +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"
-	# Don't test availability of PyQt6 tts module, which is not yet used.
-	# Recheck this with future version bumps...
-	"${FILESDIR}"/calibre-7.17.0-qt-texttospeech.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.19.0.ebuild b/app-text/calibre/calibre-7.19.0.ebuild
deleted file mode 100644
index 202e9ca6647d..000000000000
--- a/app-text/calibre/calibre-7.19.0.ebuild
+++ /dev/null
@@ -1,254 +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}]')
-		dev-python/pyqt6[multimedia,speech]
-	)
-	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"
-	# fix tests with pillow 11
-	"${FILESDIR}"/0001-PIL-11.0-changes-its-webp-features-output.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
-		# unpackaged TTS backend (optional at runtime): https://github.com/rhasspy/piper
-		piper
-		# tests if a completely unused module is bundled
-		pycryptodome
-
-		$(usev !speech speech_dispatcher)
-		$(usev !unrar test_unrar)
-
-		# undocumented reasons
-		test_mem_leaks
-		test_searching
-	)
-
-	# Some of these tests weren't practical to split out into distinct tests, so
-	# have a different control mechanism
-	use speech || export SKIP_SPEECH_TESTS=1
-
-	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/0001-HTML-Input-Dont-add-resources-that-exist-outside-the.patch b/app-text/calibre/files/0001-HTML-Input-Dont-add-resources-that-exist-outside-the.patch
deleted file mode 100644
index f33fd3345e27..000000000000
--- a/app-text/calibre/files/0001-HTML-Input-Dont-add-resources-that-exist-outside-the.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 57190699030dc6746320e49695a67ce83c62d549 Mon Sep 17 00:00:00 2001
-From: Kovid Goyal <kovid@kovidgoyal.net>
-Date: Sun, 28 May 2023 14:03:15 +0530
-Subject: [PATCH] HTML Input: Dont add resources that exist outside the folder
- hierarchy rooted at the parent folder of the input HTML file by default
-
-(cherry picked from commit bbbddd2bf4ef4ddb467b0aeb0abe8765ed7f8a6b)
----
- .../ebooks/conversion/plugins/html_input.py      | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/src/calibre/ebooks/conversion/plugins/html_input.py b/src/calibre/ebooks/conversion/plugins/html_input.py
-index 6f9c2084ea..742f3e0279 100644
---- a/src/calibre/ebooks/conversion/plugins/html_input.py
-+++ b/src/calibre/ebooks/conversion/plugins/html_input.py
-@@ -64,6 +64,16 @@ class HTMLInput(InputFormatPlugin):
-                 )
-         ),
- 
-+        OptionRecommendation(name='allow_local_files_outside_root',
-+            recommended_value=False, level=OptionRecommendation.LOW,
-+            help=_('Normally, resources linked to by the HTML file or its children will only be allowed'
-+                   ' if they are in a sub-folder of the original HTML file. This option allows including'
-+                   ' local files from any location on your computer. This can be a security risk if you'
-+                   ' are converting untrusted HTML and expecting to distribute the result of the conversion.'
-+                )
-+        ),
-+
-+
-     }
- 
-     def convert(self, stream, opts, file_ext, log,
-@@ -76,6 +86,7 @@ def convert(self, stream, opts, file_ext, log,
-         if hasattr(stream, 'name'):
-             basedir = os.path.dirname(stream.name)
-             fname = os.path.basename(stream.name)
-+        self.root_dir_of_input = os.path.abspath(basedir) + os.sep
- 
-         if file_ext != 'opf':
-             if opts.dont_package:
-@@ -250,6 +261,11 @@ def link_to_local_path(self, link_, base=None):
-         frag = l.fragment
-         if not link:
-             return None, None
-+        link = os.path.abspath(os.path.realpath(link))
-+        if not link.startswith(self.root_dir_of_input):
-+            if not self.opts.allow_local_files_outside_root:
-+                self.log.warn('Not adding {} as it is outside the document root: {}'.format(link, self.root_dir_of_input))
-+                return None, None
-         return link, frag
- 
-     def resource_adder(self, link_, base=None):
--- 
-2.41.0
-
diff --git a/app-text/calibre/files/calibre-5.35.0-jxr-test.patch b/app-text/calibre/files/calibre-5.35.0-jxr-test.patch
deleted file mode 100644
index bec72c15cb8b..000000000000
--- a/app-text/calibre/files/calibre-5.35.0-jxr-test.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Avoid calling libjxr's JxrDecApp as we currently don't package it.
---- a/src/calibre/utils/img.py
-+++ b/src/calibre/utils/img.py
-@@ -118,8 +118,6 @@
-     i = QImage()
-     if not i.loadFromData(data):
-         q = what(None, data)
--        if q == 'jxr':
--            return load_jxr_data(data)
-         raise NotImage(f'Not a valid image (detected type: {q})')
-     return i
- 
-@@ -645,11 +643,6 @@
-     despeckle_image(img)
-     remove_borders_from_image(img)
-     image_to_data(img, fmt='GIF')
--    raw = subprocess.Popen([get_exe_path('JxrDecApp'), '-h'],
--                           creationflags=subprocess.DETACHED_PROCESS if iswindows else 0,
--                           stdout=subprocess.PIPE).stdout.read()
--    if b'JPEG XR Decoder Utility' not in raw:
--        raise SystemExit('Failed to run JxrDecApp')
- # }}}
- 
- 
diff --git a/app-text/calibre/files/calibre-5.44.0-Fix-compatibility-with-zeroconf-0.73.patch b/app-text/calibre/files/calibre-5.44.0-Fix-compatibility-with-zeroconf-0.73.patch
deleted file mode 100644
index 79af5d94bb59..000000000000
--- a/app-text/calibre/files/calibre-5.44.0-Fix-compatibility-with-zeroconf-0.73.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5d8d85c649b181747d182f676cfd76f843bd61f0 Mon Sep 17 00:00:00 2001
-From: Kovid Goyal <kovid@kovidgoyal.net>
-Date: Sun, 1 Oct 2023 15:08:59 +0530
-Subject: [PATCH] Fix compatibility with zeroconf >= 0.73
-
-Fixes #2038 (fix compatibility with newer zeroconf)
----
- src/calibre/devices/smart_device_app/driver.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py
-index 87608f305b..b41c3a0063 100644
---- a/src/calibre/devices/smart_device_app/driver.py
-+++ b/src/calibre/devices/smart_device_app/driver.py
-@@ -2175,6 +2175,8 @@ def monkeypatch_zeroconf():
-     # "monkeypatch" zeroconf with a function without the check
-     try:
-         from zeroconf._utils.name import service_type_name
-+        # zeroconf 0.73 uses an lru cache so we need __wrapped__
-+        service_type_name = getattr(service_type_name, '__wrapped__', service_type_name)
-         service_type_name.__kwdefaults__['strict'] = False
-     except ImportError:
-         import zeroconf
--- 
-2.41.0
-
diff --git a/app-text/calibre/files/calibre-5.44.0-icu75.patch b/app-text/calibre/files/calibre-5.44.0-icu75.patch
deleted file mode 100644
index 3f79a9b4f79f..000000000000
--- a/app-text/calibre/files/calibre-5.44.0-icu75.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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
deleted file mode 100644
index 83bb8cca8cf5..000000000000
--- a/app-text/calibre/files/calibre-5.44.0-xss-backport.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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/calibre-7.17.0-qt-texttospeech.patch b/app-text/calibre/files/calibre-7.17.0-qt-texttospeech.patch
deleted file mode 100644
index ff50735e4788..000000000000
--- a/app-text/calibre/files/calibre-7.17.0-qt-texttospeech.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 6d87aa054724155c9413e5692fa1f242f9cc0efc Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Fri, 23 Aug 2024 02:20:00 -0400
-Subject: [PATCH] tests: delete qt TTS assert which is not yet used
-
-It will be used in future versions of calibre, and should likely be
-gated on USE=speech.
----
- src/calibre/test_build.py | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/src/calibre/test_build.py b/src/calibre/test_build.py
-index 4f19363680..898caad665 100644
---- a/src/calibre/test_build.py
-+++ b/src/calibre/test_build.py
-@@ -314,7 +314,7 @@ def test_apsw(self):
-     def test_qt(self):
-         if is_sanitized:
-             raise unittest.SkipTest('Skipping Qt build test as sanitizer is enabled')
--        from qt.core import QApplication, QFontDatabase, QImageReader, QLoggingCategory, QNetworkAccessManager, QSslSocket, QTextToSpeech, QTimer
-+        from qt.core import QApplication, QFontDatabase, QImageReader, QLoggingCategory, QNetworkAccessManager, QSslSocket, QTimer
-         QLoggingCategory.setFilterRules('''qt.webenginecontext.debug=true''')
-         if hasattr(os, 'geteuid') and os.geteuid() == 0:
-             # likely a container build, webengine cannot run as root with sandbox
-@@ -348,10 +348,6 @@ def test_qt(self):
-         try:
-             ensure_app()
-             self.assertGreaterEqual(len(QFontDatabase.families()), 5, 'The QPA headless plugin is not able to locate enough system fonts via fontconfig')
--            available_tts_engines = tuple(x for x in QTextToSpeech.availableEngines() if x != 'mock')
--            self.assertTrue(available_tts_engines)
--
--            self.assertGreaterEqual
-             from calibre.ebooks.oeb.transforms.rasterize import rasterize_svg
-             img = rasterize_svg(as_qimage=True)
-             self.assertFalse(img.isNull())
--- 
-2.44.2
-
diff --git a/app-text/calibre/files/e9cc00560a28f56a303cca97630ab58e519dd9c8.patch b/app-text/calibre/files/e9cc00560a28f56a303cca97630ab58e519dd9c8.patch
deleted file mode 100644
index deae34e201e3..000000000000
--- a/app-text/calibre/files/e9cc00560a28f56a303cca97630ab58e519dd9c8.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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/cherrytree/Manifest b/app-text/cherrytree/Manifest
index 0a525c1a51a5..30ff713c0c3c 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,5 +1,5 @@
 DIST cherrytree_1.1.4.tar.xz 4714968 BLAKE2B 98cb6c20f5f957420b01352f3b1ba86768010e64583d94130e878eca747350c5eab11107ef3719c65f3a6126127b31e4d0e5807f90548f9f8819cd16f0f299f1 SHA512 053871386b4fd5e9964082421c63a10f332942fb1b29e5145b18858a1219ad55e108235dda279bdbf9b3516fd17502c55357e196a327232a6d82aaa1e06598d9
 DIST cherrytree_1.2.0.tar.xz 4735884 BLAKE2B 47f2aef52bb1fea23be8f5db3d2ec9f4c6a596bb6136350098f870688e34e5662241f188f1c94331af2119b59546c95fbe8254bdbb187990b514f9d21fd76214 SHA512 729e8227eb1f0616e110153ac2139cc7019ed5e1a949c8be40fd2235ee5d2e0f0b1925c57d72c9b443852e5b80a50793e4e903b7df41da8e95a172210f7ec035
 EBUILD cherrytree-1.1.4-r2.ebuild 1657 BLAKE2B 893c2c23d9d3346d7888124f8dd05a4afd1d1c1e069cf369958bcba4913a5000475749a60d73b0568a07587856a21718774ede97856d2d30ca17be8503aa5e8d SHA512 e214bd9137cf08741a4b66b97625a3ceebf494b0485cbaf10363de2c76ad03c04efc57ca3b7595b386afbd2ee3f1e4679c1d4c9bddd8f9f3b5a892ccd4b09b0b
-EBUILD cherrytree-1.2.0.ebuild 1580 BLAKE2B ee3fda2b702c2dfb75f27155690daf70ad4d21fa20d95b9b1b9ab6679db1ae5a41a207c2926d8322422ee4df6617b17ffb09a292b467046f2ceb98244e9a3d1d SHA512 8c08da5ca6b1e298ec3357525a4cd1256e202c5573eb5f26c6679b76c43e4859726177fdf9b02f594b2bc0bca11e1170693b564d51c9ebe68edc60759b5be93e
+EBUILD cherrytree-1.2.0.ebuild 1832 BLAKE2B ab7f6c4b9575777b7fa4279b743c585190174200dd94d90d5f161e04738827ec7d027183a822b6d0b6d68d031d7f3bd4967130e207b429ceb3839aa4dca8d5dc SHA512 680629f7215503e77fb304d8a586c94bc227961fe1330aea79b1c5e2e2f41004f059e683406a203df20a729d866c38cab8ede5b4e326b121c743800e1feac8d2
 MISC metadata.xml 482 BLAKE2B 713d79e5a3073dc38016d007e1a102331915d7fc43836cab0008e91e42d292bd49d0138fd323beb987b146a3544d9bce089327799f7d54a44fcd22b38e82a371 SHA512 a2c6293f00f971c760dc2554ab289f532927a1e6b9deadff72fd9e537ee338d8804820defd58d7dec1b18db0b5b8541dba2a8aeec54607f6b8c72ed1e86835a0
diff --git a/app-text/cherrytree/cherrytree-1.2.0.ebuild b/app-text/cherrytree/cherrytree-1.2.0.ebuild
index 26f7d785b46a..9c67de85be38 100644
--- a/app-text/cherrytree/cherrytree-1.2.0.ebuild
+++ b/app-text/cherrytree/cherrytree-1.2.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
 
-inherit cmake python-any-r1 xdg
+inherit cmake python-any-r1 virtualx xdg
 
 DESCRIPTION="A hierarchical note taking application (C++ version)"
 HOMEPAGE="https://www.giuspen.com/cherrytree/"
@@ -24,9 +24,6 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE="nls test"
 
-# Has deps that aren't available in ::gentoo repo
-RESTRICT="test"
-
 RDEPEND="app-i18n/uchardet
 	app-text/gspell:=
 	>=dev-cpp/glibmm-2.64.2:2
@@ -53,7 +50,7 @@ DEPEND="${PYTHON_DEPS}
 BDEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
-	test? ( dev-util/cpputest )"
+	test? ( dev-cpp/gtest )"
 
 src_prepare() {
 	# disable compress man pages
@@ -71,7 +68,16 @@ src_configure() {
 		-DUSE_NLS=$(usex nls)
 		-DBUILD_TESTING=$(usex test)
 		-DUSE_SHARED_FMT_SPDLOG=ON
+		-DAUTO_RUN_TESTING=OFF
+		-DUSE_SHARED_GTEST_GMOCK=$(usex test)
 	)
 
 	cmake_src_configure
 }
+
+src_test() {
+	# the export test suite fails if more than one job is used for testing, so
+	# we force it to a single job here, for more detail see
+	# https://github.com/giuspen/cherrytree/pull/2663
+	MAKEOPTS="${MAKEOPTS} -j1" virtx cmake_src_test
+}
diff --git a/app-text/doxygen/Manifest b/app-text/doxygen/Manifest
index 7a7cd701de03..ba157fcc8300 100644
--- a/app-text/doxygen/Manifest
+++ b/app-text/doxygen/Manifest
@@ -9,7 +9,7 @@ DIST doxygen-1.12.0.src.tar.gz 8472577 BLAKE2B de823aa8dee0e22ec49bbb97cf5b53272
 DIST doxygen-1.13.0.src.tar.gz 8502031 BLAKE2B 8a12ed632772b48d07ea4edf16032f491e05b4718d38160ebc1f3d8de1cdf96bca827da28048907cf538a286757ddf56c503fbe08dcfc5a17cc72fea7233a466 SHA512 f6cae74bd8df9c6c2ba3fa21fc33926e6d5eba65101776f84c1fa056d9231d69e232a30d7702b53a284543fc4765edadb10f4d4b4a46314fa08580963d9226fb
 DIST doxygen-1.9.8.src.tar.gz 8087770 BLAKE2B 9b93bd394e9fdafef1c274596f790db0956028332a945e0359b7b24440aefa5362b2126649c529e71341bba172cd1fa514455567ffffd37243a740a1ffbc1944 SHA512 edcd382538ecf0afd9d1c891afe302092cd541a30840dda6b00dc0f1d6c5b39a696ab98042c5bb4012c1c051609bfdbfa7d29e3098a72f6cb504d90097767ebb
 EBUILD doxygen-1.12.0.ebuild 3968 BLAKE2B 6f1b3a29c479004da7e4d4d173c9297d0c19bb1a50464bfceb8f0275511b7a97bb9c52032512ecbad36e197d0c7882c7db4ef10e67dbc0dc2b6b3696bc3d232a SHA512 7525d30f8c4c49c39af4c914d08b28d90cfdcf299674a8ddb5680225538bd11609022b58513bc494c6893e440426b467b7d814529d7a0f415cc4a592bbd6756e
-EBUILD doxygen-1.13.0-r1.ebuild 3844 BLAKE2B ba4d250bab2f864214f79b52c6ee655422c5bea75308c20551bbf8e4eb73bae9b0f879c6bcaeeaeadf06378e2e6211fe5e4404a9ea7dd0cc58f503b1d00a443a SHA512 360f02423ef6d80b444f628b00e95c67324186a5713d254a1cbadd89ef27f9030e58ae3c3e2ca01a25dc754603a52f9c89fd20c6a51e051f8876edc1dc125fa9
+EBUILD doxygen-1.13.0-r1.ebuild 3843 BLAKE2B 8664f15ba4d80ad95ca88812967835a8e2d098e57a0f2bf1c3adcaaef64b89fae05c01cdceb97dfbd45fc63add5426dffc61f02de43f6e51eef8c4f1607176be SHA512 e5e8908809eb7a580c852d502aae420a513510ba05e27cba54deda6f1c7aa37eaf903d657734f8eecb96bb1f82e8a67581878c93a831c39e553ecaa286e7ff73
 EBUILD doxygen-1.9.8.ebuild 3661 BLAKE2B 90a4b15cae44e314f7af465ced451a5baf44b08da1fd8c24a944edccdc5451dcb36d1a6427df30acef801e7e628312b754a53cde970bdb39515758187463e000 SHA512 b74e699222b29cc0b0a37ab7cf149ffd598242401f889ab1e5b58fb2ec7bfa6851395e4a62bcda972482d5842aafb1c4c21ea1b478265e5c48846aeded08f6e4
 EBUILD doxygen-9999.ebuild 3864 BLAKE2B 32c06fca3d8b363a86e4e865de58d8c9e140f08a026acb0c4cd0b640d67a0c7e5a905231f85bb870e63bf90450ea5298737bb6034a8e118ff1cfd5b3d975dcb7 SHA512 0f6c1862a8854e48661dbe1aeab12ace71f00390b1c59c60372424a3bcf6d3e9ba76e73d8b966027de2f42d3d21b9ce13e820cf09678fdb93439352c53e80863
 MISC metadata.xml 1024 BLAKE2B bf8c898a0c93f684154b8e76a3014ebd421e60ce3d1b2da444a56397b517bcb84c61bb62cc703c7ddb3ac536887eb797009d5a5db3c0813dd0bc919b10aaaa0c SHA512 0a90ba5706304caba3adf091418349d0c067b60b185de3df6d9fcfa0b0304dcb0511cbe5f9127bd2c7908ab6c6b6d55aba93b820e57d68fd3b52cefec0e86842
diff --git a/app-text/doxygen/doxygen-1.13.0-r1.ebuild b/app-text/doxygen/doxygen-1.13.0-r1.ebuild
index f552df01593d..0642da2173dc 100644
--- a/app-text/doxygen/doxygen-1.13.0-r1.ebuild
+++ b/app-text/doxygen/doxygen-1.13.0-r1.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://doxygen.nl/files/${P}.src.tar.gz"
 	SRC_URI+=" https://downloads.sourceforge.net/doxygen/rel-${PV}/${P}.src.tar.gz"
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 # GPL-2 also for bundled libmscgen
diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
index 4fa26576d709..4187cf50c692 100644
--- a/app-text/sword/Manifest
+++ b/app-text/sword/Manifest
@@ -1,3 +1,5 @@
+AUX sword-1.9.0-cflags.patch 733 BLAKE2B a448c5e7ed7f71e8ba54a42fc85e2920c1f4a7f6c4ad0980871ca3dcff125ea8f0e38075b3cc9f63613c88f3fa1915984852cca477154078c8bd5056bf8ee265 SHA512 7260b06c517de59338bcdb208f780cdfc14d32e041f4e0c23da6c91ac73e1a27ab86579de6cde2254d9fac761ae73295c05080948714365f13b745366bbfc9d1
 DIST sword-1.9.0.tar.gz 2606652 BLAKE2B cd0fd85267c81410dc6acdc45594688ac1855a6160f5d39d38e225982e1440433fbdc75f22eee52291fcbf1ef92b8ca5a40652a98d7cafbfc9186e6d132ef236 SHA512 9ed3fbb5024af1f93b1473bae0d95534d02a5b00b3c9d41a0f855cee8106dc4e330844080adbee7c3f74c0e5ce1480bf16c87c842421337a341f641bae11137f
 EBUILD sword-1.9.0-r1.ebuild 1115 BLAKE2B 6bbc7ea865cd5cfb80b030ba402f99193505e1d3103fc1a81b38afa22850611dd5ed4420fd56b7d0cb398b4547e719acc672b9b414c12c614ffee384c45dd08e SHA512 74811e9c182bd6a80391d30e71483ec599de79ad50e62208735860d0bc3b73b3d28152c653eb997e3ded38d9c84b93f047a98cd3e99aa18965fc98686584125d
-MISC metadata.xml 516 BLAKE2B 04db57dbb4d4a5389581d21ce8584b5e8ea345cd7ec56cf88e42efd1beeb6c7c0d0c362db7e8f06857d73b6c49666c70227882c7796177a5513340be10e459b8 SHA512 a5aac11169734f12dce0d96a22b8a63f611f89c2fd46fbd9d6d7e35aef2516b675ecb4680386c890cd59742187ca67ecd55bf31c2d87433f7b90ab771ac68119
+EBUILD sword-1.9.0-r2.ebuild 1464 BLAKE2B 6e0cedba9dac7a919523352b11a151086f89534764b6093f65996371e0903e516d5db2539bb4980433d7b5dc3276b63c89939139e2c840a2dd63a806b50d732d SHA512 e645cd95194195fc33dcf7229da9c1a916e9232dad7e0efbb954e6dabe5ee409fdb6cf063ff3b1a5d4d0ec7888760c4f270ddd5ea7dbb6fad2c60516884b310a
+MISC metadata.xml 631 BLAKE2B 90cbfa421d9758272f4d801a20f338f9a9bc7d0a40003f81a3e31defbe33d2cb40223ea8ef4ed14d08cf02fe3e8a71c93ab7c62cf2db77055721cc5d799d8468 SHA512 e3b2f814cbd66d0f0c254019b3dec649bb0709ea924d9aa909ae2a5fc9c506373a2be46ca624382018b4b5a28302e4e8d5d74c0762738fa003c83eaaf81c08ef
diff --git a/app-text/sword/files/sword-1.9.0-cflags.patch b/app-text/sword/files/sword-1.9.0-cflags.patch
new file mode 100644
index 000000000000..5966fe69de4d
--- /dev/null
+++ b/app-text/sword/files/sword-1.9.0-cflags.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -174,10 +174,10 @@
+ ELSE(MSVC)
+ 	SET(CMAKE_C_FLAGS_DEBUG            "-g3 -Wall -O0 ${CMAKE_C_FLAGS}")
+ 	SET(CMAKE_C_FLAGS_RELEASE          "-O3 ${CMAKE_C_FLAGS}")
+-	SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O3 -g ${CMAKE_C_FLAGS}")
++	SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "${CMAKE_C_FLAGS}")
+ 	SET(CMAKE_CXX_FLAGS_DEBUG          "-g3 -Wall -O0 ${CMAKE_CXX_FLAGS}")
+ 	SET(CMAKE_CXX_FLAGS_RELEASE        "-O3 ${CMAKE_CXX_FLAGS}")
+-	SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g ${CMAKE_CXX_FLAGS}")
++	SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS}")
+ ENDIF(MSVC)
+ ##############################################################################################
+ # Setting libraries and includes
diff --git a/app-text/sword/metadata.xml b/app-text/sword/metadata.xml
index cc4b6313e0c0..1e5f7dd2bb68 100644
--- a/app-text/sword/metadata.xml
+++ b/app-text/sword/metadata.xml
@@ -9,5 +9,6 @@ societies to write new Bible software more quickly and easily.
 	</longdescription>
 	<use>
 		<flag name="clucene">Use <pkg>dev-cpp/clucene</pkg> for lucene search support</flag>
+		<flag name="utils">CLI (diatheke) and conversion utilities for bible documents in SWORD supported formats</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-text/sword/sword-1.9.0-r2.ebuild b/app-text/sword/sword-1.9.0-r2.ebuild
new file mode 100644
index 000000000000..e64123de6e9e
--- /dev/null
+++ b/app-text/sword/sword-1.9.0-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Library for Bible reading software"
+HOMEPAGE="https://www.crosswire.org/sword/"
+SRC_URI="https://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos"
+IUSE="clucene curl icu test utils"
+REQUIRED_USE="test? ( curl icu utils )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-arch/bzip2
+	app-arch/xz-utils
+	sys-libs/zlib
+	curl? ( net-misc/curl )
+	icu? ( dev-libs/icu:= )
+	clucene? ( dev-cpp/clucene:1 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.0-cflags.patch
+)
+
+DOCS=( AUTHORS CODINGSTYLE ChangeLog README examples/ samples/ )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH="ON"
+		# default is shared and static
+		-DLIBSWORD_LIBRARY_TYPE="Shared"
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}/etc"
+		-DSWORD_BUILD_TESTS=$(usex test)
+		-DSWORD_BUILD_UTILS=$(usev !utils No)
+		-DSWORD_NO_CLUCENE=$(usev !clucene Yes)
+		-DWITH_CLUCENE=$(usex clucene)
+		-DSWORD_NO_CURL=$(usev !curl Yes)
+		-DWITH_CURL=$(usex curl)
+		-DSWORD_NO_ICU=$(usev !icu Yes)
+		-DWITH_ICU=$(usex icu)
+		-DWITH_ZLIB=1
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LD_LIBRARY_PATH="${BUILD_DIR}"
+	cmake_src_test
+}