gentoo resync : 06.04.2022

6 files changed, 13 insertions, 358 deletions

diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 917f571cbd40..14afc3c1a151 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,6 +1,5 @@
 AUX calibre-2.9.0-no_updates_dialog.patch 1661 BLAKE2B c75fc49a621e8dbd16ee1bad748110399cf09a404b4a905d3f723bac1827787e4749f464ba026700b6e5b3cc0ee646a92de00f1f58d10cf12dc9bc91195ee8b6 SHA512 9663b95ed64bdc2bc40692922384d1c6073177eee58a49c412883c4d2ae098e4e0b4ea51b80443108b7c0c3e4f3fda60c00fc3be4d0b62a5d79d982697927235
 AUX calibre-5.16.1-zeroconf.patch 1457 BLAKE2B 104ba007fbb051cf07bf55fcc30f58469e989dc842a4a046c8e212a2f971b27c497346466a15b380080fd54cc8c561bdbad5bbaa5b1917d7f8a748bb289d1b2d SHA512 e15a2659f1663e77a80b9148180b0636228d483cef7395aa0e7a45eb41e57b541bc91c1a87ed1439e3a3e43a167882af5ce6d493e4723220c8665c1d1341e302
-AUX calibre-5.31.0-jxr-test.patch 943 BLAKE2B 39742add85bfb6abbc7d3a01b2018e6c47279ecc3e78d46f70c6e661b77304f2b739a5d44b9b106a0089559043691a3c751c020685abc53ba08a9a8b52fbc76e SHA512 aa1efc13bbbce430832ef20e41634c1f5d833544dc566d102314d80b4f3ce1fb838ca9916c559fcde4401531434bf2095647ee3dc79bcf87cddd56ddb9f347d9
 AUX calibre-5.31.0-qt-image-test.patch 691 BLAKE2B b0eb6e3a5f74277b967d2002ad1090107a4a131fa2c1107fdb9ea0ca8593e7872e73a4c6d657670b5de1a1296567fa87f5a891514e379b83925a8d0c55154bdc SHA512 29a86e8416eff1f47f49790472480ebf6dc4c0dc771d045b0c3ea632e0df6d05f5fe23adac9510135b944757dc84c1f96cae55ef4860dc68bd68ee6a3ab3902b
 AUX calibre-5.35.0-jxr-test.patch 827 BLAKE2B 0a94ac5b12ee2ec732d3ff68979c2060b0b218eee27409b3c351a9cc0b6bccce2260b8b387b442ae10f31483b20bd6d672f7d5424f7d9a8297a1bd14af2f7793 SHA512 259a3b4882bf0fbb01cb22974e219a621a2b337d6f638234a806148b11142fdbf9ac36ae38e71fcb7e18bd61362b34cf3c221ba1df317ec6ea8668591ad2d3ff
 AUX calibre-disable_plugins.patch 709 BLAKE2B bfc3fb85203fd64296793d58099e9d43bd173d3545954960fb72c16d42f5e09d4a99205339012cdcab512d46f0fcb08aa6c9410e848c83782a776accfd654710 SHA512 deaf4ad84aa1d688ae67ba4bd09ab7f163a7a33d498d9e9fe1e6d24f3fb9599757f9d6cb7c3d14953b6a0cda482d1427fc6fb6343d5cfe94223ff6b6e2f4b507
@@ -8,11 +7,9 @@ AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcd
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
 DIST calibre-5.16.0-SIP-v4.patch.xz 6768 BLAKE2B b939233266c7cab0fa71ccdeb748bbcffbf16248081ccf0ab313420fe3898954da71e0796b3d6c44e93c636113221f95fa6affc6be97bf41f4086a909b2849f9 SHA512 eb19e6bb328f60eb4af2c38d54c3d2a09989d41d71d27de10ab5ae443af902c3c12fc70042d4735dd785573cb63bb7d7a10ae5f7ed72afc1e1a9c6aacaf64aec
 DIST calibre-5.16.1.tar.xz 36757204 BLAKE2B 71114eed723180142f5428a680d8c5ceabcd007acbc6a70a9298e45a9f21fc793f0ef86bf60b36c96bbd15e9e3f8d8638d179872fb6ff1f9b9f5e31a93e65ba1 SHA512 41cf29cc32c7af08215baf80609f8f099d44f2b82d34181451cbf3ed1648e07d64712dba9ff0ddec5bad3d342c7d8bde40bb822f6bd5fb93a4b29d25cf188aae
-DIST calibre-5.38.0.tar.xz 38365980 BLAKE2B 1c6939e69abde52426d32ab56a91f9b31f687f1d20792c5b360bf5563d72384db395b29e63d8becc1e196f54522a8643588109891943eb1fa525a5395873bb3e SHA512 2744e9d0d3f6daa578360ffb8334adbc49b4dc41100fbe0820b73e4a5a1e24c70c1e75bf1f03b9590f2a64d6c0c7710b26884356567f51200d5c00fe23ed5772
-DIST calibre-5.39.0.tar.xz 38372008 BLAKE2B e56513c918d7ac3e7f1b28e98dc82c29170577991714185791b0723daa4adbd404a6fac6584c7d2ad7ceafc19ab6aee519ab0c2d5f0bcc66f4de6236d7096b68 SHA512 ea6c739339603abea890a06f43c16522746352bde3abaebd6f2fa64771ec63800a62bd7f0cd47d1c7fb865a6cd73f9ff7522d71d7f4f593247f8eeb93a9263f6
 DIST calibre-5.39.1.tar.xz 38375212 BLAKE2B c9205b84180cdf3e98ca30729815f0c3f6b490e1df855119b3032689417b4218d26ce4c6f56d93d040fd5b88924fc432102c00af3286f85b7d5a72a536ab1ece SHA512 47a3be38a24b9e690102108abd1f2385d792721adec637f6de1cc8504df8cc0e3577786add3f48a10c2bc995320d65370d002afaea6ea13b6131b8b6767f27fa
-EBUILD calibre-5.16.1-r1.ebuild 8515 BLAKE2B c9dc7b66d93d6020cde09a360b0aa92894eafab75e7ca4f18a1a9a9286c6eb4f2af17fb162583fcc05088775abd0fa28ff849888775d964a396ab09cfcc02eea SHA512 cd76c560e8acfeb4e41de7ae8cce3fd4294b54ac7bee585ed562a596791054a7ad2918f09105b86587271002f7690b681ac9bc3e53bf1e5657b80f94aa37cbe9
-EBUILD calibre-5.38.0.ebuild 10398 BLAKE2B 4d0a5485c6d720e270adb31cbc442106c0289a3807d6a18fb0f0c24e519d6f7e15af5ebf978d3f947ccc44703fbea8d2b942117640daab29456241897d1cdf9e SHA512 c8af58ae4cf0a8d7895444eb044fe68fb69919efb0324ea6b4c6fb94ed3b66349deeb60bd03959f10139be3b639b7ce7939de37bd0dded54dd932e1d2cfc9660
-EBUILD calibre-5.39.0.ebuild 10398 BLAKE2B 4d0a5485c6d720e270adb31cbc442106c0289a3807d6a18fb0f0c24e519d6f7e15af5ebf978d3f947ccc44703fbea8d2b942117640daab29456241897d1cdf9e SHA512 c8af58ae4cf0a8d7895444eb044fe68fb69919efb0324ea6b4c6fb94ed3b66349deeb60bd03959f10139be3b639b7ce7939de37bd0dded54dd932e1d2cfc9660
-EBUILD calibre-5.39.1.ebuild 10398 BLAKE2B 4d0a5485c6d720e270adb31cbc442106c0289a3807d6a18fb0f0c24e519d6f7e15af5ebf978d3f947ccc44703fbea8d2b942117640daab29456241897d1cdf9e SHA512 c8af58ae4cf0a8d7895444eb044fe68fb69919efb0324ea6b4c6fb94ed3b66349deeb60bd03959f10139be3b639b7ce7939de37bd0dded54dd932e1d2cfc9660
+DIST calibre-5.40.0.tar.xz 38395684 BLAKE2B ff5289d9042dd114a41b90a0b91a84cba30a79d6778d0b59d2115d03dca93151ce4cd0de5fbe8cc94eb89c6cbaf8268d54680d4a1981be33f94bf332b7afb243 SHA512 06d973a6945cdca6b9eb252c656a4fe5dab15201e4c77f81a1174bdfceeaed1d64d50bde5ea7cfb4e462bb7e32d30ae0bfe166c80b2a3b765641da574fd8ed46
+EBUILD calibre-5.16.1-r1.ebuild 8526 BLAKE2B e9aeb2e4c2f2714a0955fb6dbb80c87666ffc7c92a04578b1294316e1418d992112e87c97f23cbe989a5823937a4918e703cf05abb296f583e8ee734dffd1ca9 SHA512 8d55c8439bc7c78f3e1ce2a0e25301eb690bfe9d15aab1a6f709452e0e6528021114684a9828c7337653e6faba5521aca3931d676ca697a292234bafe73dcfb5
+EBUILD calibre-5.39.1.ebuild 10409 BLAKE2B 5b0ee9258b0ee7faef09a188e42557b2d04e154d7dd4759c1dade17af56295655f71bcab61a794c1e3c30a7bc1764708242f5dd81ec4ddfbd98d14c07c3c0797 SHA512 540c9ff9dd4028d742fb18696b5156d77606b8a17ae5365d0ee7a3249dde716cc6b6ea5cfdd7d28f331e9726257db1d000898fbe8ecf54061706ea5ed19b4bf5
+EBUILD calibre-5.40.0.ebuild 10409 BLAKE2B 5b0ee9258b0ee7faef09a188e42557b2d04e154d7dd4759c1dade17af56295655f71bcab61a794c1e3c30a7bc1764708242f5dd81ec4ddfbd98d14c07c3c0797 SHA512 540c9ff9dd4028d742fb18696b5156d77606b8a17ae5365d0ee7a3249dde716cc6b6ea5cfdd7d28f331e9726257db1d000898fbe8ecf54061706ea5ed19b4bf5
 MISC metadata.xml 304 BLAKE2B 0d93b1c7606c37cb8b7308b507a1d2988a05f780a93ae80c98e021f5af75128954d57b102afc1d96728872c81bf0adc40e32b31197dfa825cd040af3a8739fb7 SHA512 e193c0b78ed4140b695c44d273310207c9f2f745bf31589c69e81230a9eed68fa1c361c1e3f68a60e135ef0628aa480002229871f4a50f4000aea6df7e5f067d
diff --git a/app-text/calibre/calibre-5.16.1-r1.ebuild b/app-text/calibre/calibre-5.16.1-r1.ebuild
index 32b84b85f211..f0ce3cbefb85 100644
--- a/app-text/calibre/calibre-5.16.1-r1.ebuild
+++ b/app-text/calibre/calibre-5.16.1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="ipv6(+),sqlite,ssl"
 
-inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
+inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 qmake-utils xdg-utils
 
 DESCRIPTION="Ebook management application"
 HOMEPAGE="https://calibre-ebook.com/"
@@ -176,7 +176,7 @@ src_install() {
 	cp "${T}"/bin/{kbuildsycoca,update-mime-database} || die
 	chmod +x "${T}"/bin/{kbuildsycoca,update-mime-database} || die
 
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+	export QMAKE="$(qt5_get_bindir)/qmake"
 
 	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
 	# violation with kbuildsycoca as in bug #287067, comment #13.
@@ -207,7 +207,7 @@ src_install() {
 
 	addpredict /dev/dri #665310
 
-	PATH=${T}/bin:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	PATH=${T}/bin:$(qt5_get_bindir):${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
 	"${PYTHON}" setup.py install \
 		--root="${D}" \
 		--prefix="${EPREFIX}/usr" \
diff --git a/app-text/calibre/calibre-5.39.0.ebuild b/app-text/calibre/calibre-5.39.0.ebuild
deleted file mode 100644
index a9f64cfe2e57..000000000000
--- a/app-text/calibre/calibre-5.39.0.ebuild
+++ /dev/null
@@ -1,316 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="ipv6(+),sqlite,ssl"
-
-inherit toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-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 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/hunspell-1.7:=
-	>=app-text/podofo-0.9.6_pre20171027:=
-	>=app-text/poppler-0.26.5[qt5]
-	dev-libs/glib:2=
-	dev-libs/hyphen:=
-	>=dev-libs/icu-57.1:=
-	dev-libs/libinput:=
-	>=dev-libs/dbus-glib-0.106
-	dev-libs/snowball-stemmer:=
-	>=sys-apps/dbus-1.10.8
-	$(python_gen_cond_dep '
-		app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]
-		>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/cchardet[${PYTHON_USEDEP}]
-		>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
-		>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
-		>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
-		>=dev-python/dbus-python-1.2.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[${PYTHON_USEDEP}]
-		>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
-		>=dev-python/pychm-0.8.6[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${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,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
-		>=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}]
-		>=dev-python/PyQtWebEngine-5.15.5_pre2108100905[${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]
-		dev-python/zeroconf[${PYTHON_USEDEP}]
-	')
-	dev-qt/qtcore:5=
-	dev-qt/qtdbus:5=
-	dev-qt/qtgui:5=[jpeg]
-	>=dev-qt/qtwebengine-5.12
-	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-libs/libwmf-0.2.8
-	>=media-gfx/optipng-0.7.6
-	>=sys-libs/zlib-1.2.11:=
-	virtual/libusb:1=
-	x11-libs/libxkbcommon:=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	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
-	)
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( sys-fs/udisks:2 )"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="$(python_gen_cond_dep '
-		>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
-		>=dev-python/sip-5[${PYTHON_USEDEP}]
-	')
-	>=virtual/podofo-build-0.9.6_pre20171027
-	virtual/pkgconfig"
-
-PATCHES=(
-	# Don't prompt the user for updates - they've installed via
-	# an ebuild.
-	"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch"
-
-	# 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"
-
-	# TODO:
-	# test_qt tries to load a bunch of images using Qt and it currently fails
-	# due to some presumably missing dependencies. This is important and
-	# we need to look into it, but at time of writing, none of the tests
-	# are even bring run, so I'd like to return to this later.
-	# We don't want to skip test_qt entirely, so just skip this particular
-	# assert for now.
-	"${FILESDIR}/${PN}-5.31.0-qt-image-test.patch"
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then
-		eerror "Calibre cannot be built with this version of gcc."
-		eerror "You need at least gcc-6.0"
-		die "Your C compiler is too old for this package."
-	fi
-}
-
-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 or Arch Linux's packaging
-	# is recommended, as Arch Linux's PKGBUILD is maintained by a Calibre
-	# contributor. Or just ask them.
-
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|, PreserveMIMEDefaults():|:|" \
-		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|cmd\[2\]|cmd[4]|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# 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"
-}
-
-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}"
-
-	PATH="${T}/bin:${PATH}" ${EPYTHON} setup.py build || die
-}
-
-src_test() {
-	# Skipped tests:
-	# - 7z (unpackaged Python dependency: py7zr)
-	# - test_unrar (unpackaged Python dependency: unrardll)
-	#
-	# Note that we currently have a hack to skip one part of test_qt!
-	# See PATCHES for more.
-	CALIBRE_PY3_PORT=1 ${PYTHON} setup.py test \
-			--exclude-test-name 7z \
-			--exclude-test-name test_mem_leaks \
-			--exclude-test-name test_searching \
-			--exclude-test-name test_unrar || die
-}
-
-src_install() {
-	# calibre works with python 3, so remove the python 2 constraint
-	export CALIBRE_PY3_PORT=1
-
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	mkdir "${T}/bin" || die
-	cat - > "${T}/bin/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/bin/{kbuildsycoca,update-mime-database} || die
-	chmod +x "${T}"/bin/{kbuildsycoca,update-mime-database} || die
-
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# 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 #709682
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	addpredict /dev/dri #665310
-
-	PATH=${T}/bin:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-		"${PYTHON}" setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}/usr" \
-		--staging-libdir="${ED}/usr/${libdir}" || die
-
-	find "${ED}"/usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	python_fix_shebang --force "${ED}"
-
-	einfo "Compiling python modules"
-	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
-}
-
-pkg_preinst() {
-	# Indentify stray directories from upstream's "Binary install"
-	# method (see bug 622728).
-	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
-	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
-		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
-	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
-	local x
-	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
-		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
-			elog "Purging '${x}'"
-			rm -rf "${x}"
-		fi
-	done
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-text/calibre/calibre-5.39.1.ebuild b/app-text/calibre/calibre-5.39.1.ebuild
index a9f64cfe2e57..ec684bf96296 100644
--- a/app-text/calibre/calibre-5.39.1.ebuild
+++ b/app-text/calibre/calibre-5.39.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="ipv6(+),sqlite,ssl"
 
-inherit toolchain-funcs python-single-r1 xdg-utils
+inherit toolchain-funcs python-single-r1 qmake-utils xdg-utils
 
 DESCRIPTION="Ebook management application"
 HOMEPAGE="https://calibre-ebook.com/"
@@ -196,7 +196,7 @@ src_compile() {
 	local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)"
 	export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}"
 
-	PATH="${T}/bin:${PATH}" ${EPYTHON} setup.py build || die
+	PATH="${T}/bin:$(qt5_get_bindir):${PATH}" ${EPYTHON} setup.py build || die
 }
 
 src_test() {
@@ -229,7 +229,7 @@ src_install() {
 	cp "${T}"/bin/{kbuildsycoca,update-mime-database} || die
 	chmod +x "${T}"/bin/{kbuildsycoca,update-mime-database} || die
 
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+	export QMAKE="$(qt5_get_bindir)/qmake"
 
 	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
 	# violation with kbuildsycoca as in bug #287067, comment #13.
diff --git a/app-text/calibre/calibre-5.38.0.ebuild b/app-text/calibre/calibre-5.40.0.ebuild
index a9f64cfe2e57..ec684bf96296 100644
--- a/app-text/calibre/calibre-5.38.0.ebuild
+++ b/app-text/calibre/calibre-5.40.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="ipv6(+),sqlite,ssl"
 
-inherit toolchain-funcs python-single-r1 xdg-utils
+inherit toolchain-funcs python-single-r1 qmake-utils xdg-utils
 
 DESCRIPTION="Ebook management application"
 HOMEPAGE="https://calibre-ebook.com/"
@@ -196,7 +196,7 @@ src_compile() {
 	local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)"
 	export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}"
 
-	PATH="${T}/bin:${PATH}" ${EPYTHON} setup.py build || die
+	PATH="${T}/bin:$(qt5_get_bindir):${PATH}" ${EPYTHON} setup.py build || die
 }
 
 src_test() {
@@ -229,7 +229,7 @@ src_install() {
 	cp "${T}"/bin/{kbuildsycoca,update-mime-database} || die
 	chmod +x "${T}"/bin/{kbuildsycoca,update-mime-database} || die
 
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+	export QMAKE="$(qt5_get_bindir)/qmake"
 
 	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
 	# violation with kbuildsycoca as in bug #287067, comment #13.
diff --git a/app-text/calibre/files/calibre-5.31.0-jxr-test.patch b/app-text/calibre/files/calibre-5.31.0-jxr-test.patch
deleted file mode 100644
index c39508474b68..000000000000
--- a/app-text/calibre/files/calibre-5.31.0-jxr-test.patch
+++ /dev/null
@@ -1,26 +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
-@@ -119,8 +119,6 @@ def image_from_data(data):
-     i = QImage()
-     if not i.loadFromData(data):
-         q = what(None, data)
--        if q == 'jxr':
--            return load_jxr_data(data)
-         raise NotImage('Not a valid image (detected type: {})'.format(q))
-     return i
- 
---- a/src/calibre/utils/img.py
-+++ b/src/calibre/utils/img.py
-@@ -644,11 +644,6 @@ def test():  # {{{
-     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')
- # }}}
- 
-