gentoo auto-resync : 26:02:2024 - 23:40:45

4 files changed, 2 insertions, 491 deletions

diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 1b552c9bcbf2..2b494729b998 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -7,10 +7,6 @@ AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcd
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
 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-6.29.0.tar.xz 41487064 BLAKE2B 55472db2f510465f32729fe2f5ccd1127f8df8d548a0141c0cbeae50cc17d836cde04c7c69228da4e81512b7438a527922a6a42149bf3b852f7fc2666ef41ec9 SHA512 32f5d03d68ba4a2f5572cab1acf68ddc46cbda83edfaba0dc0d793d950060fa54cdb85ba4f5700a56895f915ed126617f2e0b74ca200836b812ad765c9d298e8
-DIST calibre-6.29.0.tar.xz.sig 566 BLAKE2B d1ef0a7bbff1959206ab5bff2638e2c5618e342ba189e764894d964493d1e2d0fead74e27d07248251f69573c477333a734c98ec523385e2de33fce526413e0b SHA512 9c1a3408e34ef95b81e9459ce29ae99fdd44df40d438c7107df4840080c6945bdd06270fc17162ce3d04a12c84462de8fe5bc32633bd09f68d65ded761d6f199
-DIST calibre-7.2.0.tar.xz 41856900 BLAKE2B e0c4f2c89ce5ccb3383ce3af1fdbfd5d38e3dfbcce4c3cc611205654c88f319150644ca428b55d55c23be94e9bc9fc50aa211af9435d9d67d14d8e878cfd707e SHA512 97d6e146842541ab362e1c80e58b914325fe54342fc4cc79272a6056f17c16366a03f5131f22dac3b633d4b6157742a95061e050d9f3ffca11f35fd140111b3e
-DIST calibre-7.2.0.tar.xz.sig 566 BLAKE2B 9ba79d2352917a7f53140a56d1b3f68ee21cb41ae8eeb2e12d00da917f802f6cd245127e118dee270129aaa8af26a7b140a4b215d41ee405d8c85068acd66875 SHA512 854e567b6f6c376e0dcf05eff9d387924f79a7ef0a0855ec683160e16c9160e2dfa3a1cfe7de2bf9370c21c009f239e59f0fba4aea67a4f05dacf45f2289710e
 DIST calibre-7.3.0.tar.xz 42834448 BLAKE2B 7f39882def6d9b7d48cf79b49074c5a038a157e3f1840bbc4d610a0e2d3e8767b0a07b2ffa744c531c41dfad48c249fdad9b8860ce70ff45667de6fbc1d4c4bd SHA512 ec6ec032fc731f5ec636f098c930130ee17a261506e59e20980dd53d63e61841dac2c25eabd05f7a8408b7a4b6e7789f4c98599226bb0934b924cfae3a8fe6d7
 DIST calibre-7.3.0.tar.xz.sig 566 BLAKE2B b70b764bafcf955050648aa62c1d95df1cf4e92ccb7281270a037c3c41e2ba3c4512c76e6d43eabd18ae34872c3d5f0b2db0e738c47440ec58dcae8091422368 SHA512 0361013cf978ee458016e15e7fc0f736c60b08277bae25758fd6b3b7fbca7a0a698d753462852d12cbd0a38cee3d518e64042eba79ce16b4402c772c1965d22d
 DIST calibre-7.4.0.tar.xz 43177588 BLAKE2B f8a9ce0444e252e5e9e1fddd8b744327eb6d693ff900d5212ee7d36963c73ddf8ecb0e23fcce9d7033a1d1f726f4d80fa64fc2cbce30f621e9e6eaac62c88f29 SHA512 afa286d77c5d39c07df94731d26cf3f3ad79b088fa0d95d64af1d3408d341c91c06181588a548e338df69a10ee0298c4ea1f391ab88e0ec46663d9b32acb2367
@@ -18,9 +14,7 @@ DIST calibre-7.4.0.tar.xz.sig 566 BLAKE2B 2209bf4634cd8801ac9ecec577ca27f461edf8
 DIST calibre-7.5.0.tar.xz 43270664 BLAKE2B ff23027bb5d026b77dffa11a4192436270acb52fbfddd941958eb07f70eed181c555f1c25f22da17ce96004fd45b4c27c8ccfbb2db8f68cd021d538b5dcf76d1 SHA512 e59e5908af484d428eb7fe2d8d3b32f7254070b64214fe3d43310ff944d304bb95dc69a73763f6406eda27b0db7a8de604c4868f5ff2f7cfb4953319f188a764
 DIST calibre-7.5.0.tar.xz.sig 566 BLAKE2B 3fed90c450c3c4838d92e0b2d3f25c0f90cac50bd397dac2631a288f25c938761942dfb3ee67d73dc5e7fe52644912765db41a895b2558fae59948d05a7e09d0 SHA512 6525d46798237830ca84100ff0b9a4d3ab608207a14013e4f546abc744c7262678fe24f86ff58e3c72a601bb70fb71f952beb38f27fdeff58c3ce857ce101137
 EBUILD calibre-5.44.0-r3.ebuild 8840 BLAKE2B e391fd8baf637882693b9c11b43d2b7e102c8a91767d46210f36a30617d641dcf57146b79230beddf9260ed4db10942b8496458f03b6d9acd24d4ffe0867ed68 SHA512 369964a397b4caccdd060163ad4b15cb6212cbebd021dd1ea8646c9e4a08e25da73bdcaa664f3a23eca0205fcb31d8feaf4abdd655f8cdc00c0608db46535220
-EBUILD calibre-6.29.0.ebuild 7885 BLAKE2B 26b0636fb1af52da1518b0874f40338d013cf5a4af8e5c174b1de2dd184243dee749c71cff1b0c6a6c8dfb2e68ce467ad54723847ce21727725543ec289273ae SHA512 f1644a3568873d87611e13ccb16d9d1656b4c35867c6cbdcf7f5a9ec3c72a281cfb857e0d7a75aa296866dea0e42b4e786d09859b4d6d0923d31a93cf75738fd
-EBUILD calibre-7.2.0.ebuild 7938 BLAKE2B 37982aa313d24a8711b69d18a0be6ed2c2fe2968934aa0b039d3819c327c306ccbdb3f5ab72831cff4231e72eb2c9c6200cc8e5ff6ec127df6fb15adb03089bf SHA512 3496b140e2fb2512993ae867228ebed4726d350bbc107925bc8911bc5f9e06175442243f7fe9d21c025416baec89c4e9ae1250ba8ff0f60a05bf28027ae22685
 EBUILD calibre-7.3.0.ebuild 7938 BLAKE2B 37982aa313d24a8711b69d18a0be6ed2c2fe2968934aa0b039d3819c327c306ccbdb3f5ab72831cff4231e72eb2c9c6200cc8e5ff6ec127df6fb15adb03089bf SHA512 3496b140e2fb2512993ae867228ebed4726d350bbc107925bc8911bc5f9e06175442243f7fe9d21c025416baec89c4e9ae1250ba8ff0f60a05bf28027ae22685
-EBUILD calibre-7.4.0.ebuild 7939 BLAKE2B cb96feb6f1d465243b5391bb642584b752ff6fff3822fb3e47cd345abeb4e32a9ae78021e72fc8a69fb30096099e0527b314c02386a59ed88c667924d591e5cb SHA512 b3c8ff5c7d6d5a07bbc432ccbc3a06ce6bb484e2754f1259fd4e5dc67487724ed55b5087803ba510fc911428d2df775249e0ada95fb2fa194c6f6a0d6c14ecee
+EBUILD calibre-7.4.0.ebuild 7938 BLAKE2B 37982aa313d24a8711b69d18a0be6ed2c2fe2968934aa0b039d3819c327c306ccbdb3f5ab72831cff4231e72eb2c9c6200cc8e5ff6ec127df6fb15adb03089bf SHA512 3496b140e2fb2512993ae867228ebed4726d350bbc107925bc8911bc5f9e06175442243f7fe9d21c025416baec89c4e9ae1250ba8ff0f60a05bf28027ae22685
 EBUILD calibre-7.5.0.ebuild 7941 BLAKE2B a4b8f1463fa257bf8e9d7a10a675c1652c8cc67f1330f1606244cffde6b7ef9651070bd1839f2eddcb9e107f72110bc057b8006ff7f5d4032e486ba655a65862 SHA512 7f8c702176baddc3efc69701dc1c87d59e7561c02d2d10a9bca5736c9bf29164bcd7bc3ec5b346f90364aaa889a84b95061d4197c14792fc5afd93147890fca0
 MISC metadata.xml 751 BLAKE2B 6421ae0198af28bc4f1e5dfc5ee999ccbde3b8b4c519ffce696cad1b064913261e568018b2777a0c82483c82a83a49dad24991a05cc8c5ae9674f86c09b025e1 SHA512 6df006c27490bda4b3e874f7d169eda893e5c441551b79b4cd062ff0aff5d84d154058fe3ac75e3da18cfbef40ed2636a1caf2bd2f040f9ca7d6600c7fca3f76
diff --git a/app-text/calibre/calibre-6.29.0.ebuild b/app-text/calibre/calibre-6.29.0.ebuild
deleted file mode 100644
index aaa650656467..000000000000
--- a/app-text/calibre/calibre-6.29.0.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-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
-"
-KEYWORDS="amd64"
-SLOT="0"
-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/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/zeroconf[${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}-5.35.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.2.0.ebuild b/app-text/calibre/calibre-7.2.0.ebuild
deleted file mode 100644
index 1427b8c15600..000000000000
--- a/app-text/calibre/calibre-7.2.0.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-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
-"
-KEYWORDS="amd64 ~arm64"
-SLOT="0"
-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/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.4.0.ebuild b/app-text/calibre/calibre-7.4.0.ebuild
index 8411e1a90741..1427b8c15600 100644
--- a/app-text/calibre/calibre-7.4.0.ebuild
+++ b/app-text/calibre/calibre-7.4.0.ebuild
@@ -35,7 +35,7 @@ LICENSE="
 	OFL-1.1
 	PSF-2
 "
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 SLOT="0"
 IUSE="+font-subsetting ios speech +system-mathjax test +udisks unrar"