commit: 0f0429834eef71b784cd7e8f985626214f922a85
Author: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 11 05:43:15 2025 +0000
Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Thu Aug 14 05:01:57 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f042983
app-text/calibre: drop old
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>
app-text/calibre/Manifest | 2 -
app-text/calibre/calibre-7.26.0.ebuild | 256 ----------------------
app-text/calibre/files/calibre-7.26.0-qt6.9.patch | 44 ----
3 files changed, 302 deletions(-)
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 71975e54da0a..5bd809d0a9be 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,5 +1,3 @@
-DIST calibre-7.26.0.tar.xz 43633708 BLAKE2B
d936ad859f5a64a11b26218a1a72d55e9b7fce82b6ae261376dc55009ac07852d2f8eea771bb401fcc660a9eade9fa89ce2b2dbde1bb9f7e2e0757f84a80aa9f
SHA512
e477a2dcdd1c52074bd5c0df5d79b2b609d76bf9e1cb5e3d32f79a89d6e0e2798cb980e2cf74e126fb2856273a14b0e2e92b39ffca74461569233c0a87968bfe
-DIST calibre-7.26.0.tar.xz.sig 566 BLAKE2B
9ceb7db5cea446a173add6bb9abfcc186fe3b377bebfa7c42b5ed50336bf46d534e034312a1e38fa33bae685635e5533abb0667f3f536cfe30fd74e6c5023367
SHA512
06584ac459e5c5b03ad3e115ecbff867dc4f6666d80a37bd365b815ea9c1d6190bd17ed9787a2dbf79a1dd0a1c6676dd9e98753edde90f3866a3d5edbb26f930
DIST calibre-8.4.0.tar.xz 44113820 BLAKE2B
3580124b04d9aef19c6ac2c1e3bdf5aa86f128a7e0f34a3ae80f07493127ca16b7edc72800cf9b200e926198ed92d5bef671a483d0572a6f6ae67fde64638f2e
SHA512
df998fa31b9e581739872a649669fccf29f34d3ac1b4d0a96c37e08a0b049b1357b56a2af25f2733936e78901dd61b38a24e536e107e7094ada7e60a5c2c56ab
DIST calibre-8.4.0.tar.xz.sig 566 BLAKE2B
7b353272722cfea8e57c274671dde100df7d351e2c5bafb3ab55c221d3290ce45f3627087a91f97b27080f6762596c788bf308ae4b49fe6ebb25d6ee85bf419c
SHA512
7cd17aa5c8be1eb736c1ef8e98f91ecc313ed00da7760e6d234ff9b56a23c1f5a382dff8b3c0b7145443b6c2871f224a6ed47ddd39eaacfb380353c3f78c8344
DIST calibre-8.7.0.tar.xz 45111468 BLAKE2B
2b8042f44422945a027f289015e5c9a42450b94ca0e53cdbaac7d0a2f7f41ea2a19f3e90b702f043a086e7218d4d9a25b441bc5b516c3e7f6454422d2c4accd1
SHA512
12d6f49d09edef8677a966198b0b05da9f8deee3c3ff6980804e13561edc35a515555e6a8cb53be70925bc3bdb8e3714cb018454f4e5da4794105b0fe53bba63
diff --git a/app-text/calibre/calibre-7.26.0.ebuild
b/app-text/calibre/calibre-7.26.0.ebuild
deleted file mode 100644
index 2895dde0894e..000000000000
--- a/app-text/calibre/calibre-7.26.0.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-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="+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/pykakasi[${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
- >=media-video/ffmpeg-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"
- # Backport to fix build w/ qt-6.9 (bug #957106)
- "${FILESDIR}/${P}-qt6.9.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/calibre-7.26.0-qt6.9.patch
b/app-text/calibre/files/calibre-7.26.0-qt6.9.patch
deleted file mode 100644
index ff2f94d98213..000000000000
--- a/app-text/calibre/files/calibre-7.26.0-qt6.9.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-https://bugs.gentoo.org/957106
-https://github.com/kovidgoyal/calibre/commit/30b66dc452d3c08c7e10cc95498e131348d7bbfb
-
-From 30b66dc452d3c08c7e10cc95498e131348d7bbfb Mon Sep 17 00:00:00 2001
-From: Kovid Goyal <[email protected]>
-Date: Sat, 5 Apr 2025 02:59:58 +0530
-Subject: [PATCH] Linux: Fix building with Qt 6.9
-
----
- src/calibre/headless/headless_integration.cpp | 6 ++++++
- src/calibre/headless/headless_integration.h | 1 -
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/calibre/headless/headless_integration.cpp
b/src/calibre/headless/headless_integration.cpp
-index a5dfc869cc66..e96ddeef80fa 100644
---- a/src/calibre/headless/headless_integration.cpp
-+++ b/src/calibre/headless/headless_integration.cpp
-@@ -27,7 +27,13 @@ QT_BEGIN_NAMESPACE
-
-
- #ifndef __APPLE__
-+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
-+#include <QtGui/private/qgenericunixservices_p.h>
- class GenericUnixServices : public QGenericUnixServices {
-+#else
-+#include <QtGui/private/qdesktopunixservices_p.h>
-+class GenericUnixServices : public QDesktopUnixServices {
-+#endif
- /* We must return desktop environment as UNKNOWN otherwise other parts of
- * Qt will try to query the nativeInterface() without checking if it
exists
- * leading to a segfault. For example, defaultHintStyleFromMatch()
queries
-diff --git a/src/calibre/headless/headless_integration.h
b/src/calibre/headless/headless_integration.h
-index f8705facffe8..604669677da4 100644
---- a/src/calibre/headless/headless_integration.h
-+++ b/src/calibre/headless/headless_integration.h
-@@ -3,7 +3,6 @@
- #include <qpa/qplatformintegration.h>
- #include <qpa/qplatformscreen.h>
- #include <qpa/qplatformservices.h>
--#include <QtGui/private/qgenericunixservices_p.h>
- #include <QScopedPointer>
-
- QT_BEGIN_NAMESPACE
-
