diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest index 1dbc52b9dbeee..b7fa4c7a7a327 100644 --- a/app-text/calibre/Manifest +++ b/app-text/calibre/Manifest @@ -1,8 +1,4 @@ DIST calibre-8.15.0.tar.xz 45759104 BLAKE2B ce8ca1a0bd9cbbb916a993b4c139efd1ff49d697aef3088322f06f4bac85d9a9e5d648a664fd75ef621c1e6021a67d6696e2a2a3b58a73651097bf3c6a774ca9 SHA512 7713ae8304e887dad320cddd6eceeec79bdb9de88e23ed2d50c0d2da429e25b2d761646259ffda47682ce07ed556bd47129561bd193c7953bd72867b98b0674c DIST calibre-8.15.0.tar.xz.sig 566 BLAKE2B e994b448ef1f08051d2a4ce254a83d37ec6fe3c99f416c0203b892ac35ee4a26151f07ea838929ed91e4024b6688bff5c26aec587bb39e9bdab185970bced520 SHA512 faff5e863c92e537b19e651aa9082359e530ff3c6412954c6eee339fa5a16614e16e3ee489f2c67e64a08a1c4db55c5dbaae4466caeb694aa8dd63093fd25834 -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 -DIST calibre-8.7.0.tar.xz.sig 566 BLAKE2B 1d24f99f6311d55a5a9f0fc5cd23c17b8f5296f5fb8a8a24125fe8cbdda6ab2b9520bd70c91b1b0f0a3d30281c44c84aa397ed9d6f3447f898fe52e89f756f64 SHA512 6e5d555d622a01b78b9a291640099751cea2658d39d03b0a5d80623fedfd6fe8145c0d53fd90dcbb62fb08d593db086f00c4d531eb499ad9fcbbdac21059b132 DIST calibre-8.9.0.tar.xz 45078452 BLAKE2B af1459c99f93ab9ac73c8fde34a0e4ac179e262978976dd1298f74e26b6a9e28218f87cbebde8a4a5bea913bf5fe1db4bfb083c7a1f14a6c588a7c2e8695f9e7 SHA512 b00fc0d0d5426bd54a4897ff934afbe0e2f3d682b3ad1bbf4c7741f0a093dfb259511b40bb13ce9ac1cb8f6e447cc24229525a171b675edc738fde1272668aab DIST calibre-8.9.0.tar.xz.sig 566 BLAKE2B 83bf8f8545e942ddb3766ce0326128157f5e8d59965a672b91660b85ff4b05cee9c9a72fe96d1aa753e149d8789d84bed7668c4ced4ab8b5b1f11dc44b5e6b1c SHA512 18896b442e6c18ff88d6e4e79ae90a829ef03235937dd9760a58ccb87cfb88d604b949fc5939ab62a1503f189616f2df35ad7c6883ca1a4238a0da0e18cb96c3 diff --git a/app-text/calibre/calibre-8.4.0.ebuild b/app-text/calibre/calibre-8.4.0.ebuild deleted file mode 100644 index 0ed7122b5d8d0..0000000000000 --- a/app-text/calibre/calibre-8.4.0.ebuild +++ /dev/null @@ -1,257 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{11..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 ~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/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 of https://github.com/kovidgoyal/calibre/commit/ae83537ef8b338724d389520ad6fbbebe83d1b0a - "${FILESDIR}/${P}-lfs64.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.UTF-8 # 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-8.7.0.ebuild b/app-text/calibre/calibre-8.7.0.ebuild deleted file mode 100644 index b7f5471f7ba2f..0000000000000 --- a/app-text/calibre/calibre-8.7.0.ebuild +++ /dev/null @@ -1,255 +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 ~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/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" -) - -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 privilege dropping for bug #287067 and generally because desktop - # login user != portage. - sed -e "s:SUDO_:__DISABLED_SUDO_:" \ - -i setup/__init__.py || die - - # 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.UTF-8 # 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-8.9.0.ebuild b/app-text/calibre/calibre-8.9.0.ebuild index 44add51d1b8bb..5b7f92fe2e89f 100644 --- a/app-text/calibre/calibre-8.9.0.ebuild +++ b/app-text/calibre/calibre-8.9.0.ebuild @@ -127,6 +127,7 @@ PATCHES=( # (last commit in 2017) "${FILESDIR}/${PN}-7.0.0-jxr-test.patch" "${FILESDIR}/${PN}-8.9.0-piper.patch" + "${FILESDIR}/${PN}-8.9-qt6.10.patch" ) src_prepare() { diff --git a/app-text/calibre/files/calibre-8.4.0-lfs64.patch b/app-text/calibre/files/calibre-8.4.0-lfs64.patch deleted file mode 100644 index f3663d962db6b..0000000000000 --- a/app-text/calibre/files/calibre-8.4.0-lfs64.patch +++ /dev/null @@ -1,34 +0,0 @@ -From https://github.com/kovidgoyal/calibre/commit/ae83537ef8b338724d389520ad6fbbebe83d1b0a Mon Sep 17 00:00:00 2001 -From: Kovid Goyal -Date: Sat, 7 Jun 2025 07:55:59 +0530 -Subject: [PATCH] pread64() -> pread() - -We dont support 32 bit architectures anymore anyway, but define -_FILE_OFFSET_BITS to be safe, only in speedups.c to minimize an -side-effect risks. - -Fixes #2769 (Define _FILE_OFFSET_BITS=64 and replace usage of pread64) ---- a/src/calibre/utils/speedup.c -+++ b/src/calibre/utils/speedup.c -@@ -1,5 +1,8 @@ - #define UNICODE - #define PY_SSIZE_T_CLEAN -+#ifndef _FILE_OFFSET_BITS -+#define _FILE_OFFSET_BITS 64 -+#endif - - #include - #include -@@ -747,12 +750,8 @@ pread_all(PyObject *self, PyObject *args) { - if (err != ERROR_HANDLE_EOF) saved_errno = err; - break; - } --#else --#ifdef __linux__ -- ssize_t nr = pread64(fd, buf + pos, n - pos, offset); - #else - ssize_t nr = pread(fd, buf + pos, n - pos, offset); --#endif - if (nr < 0) { - if (errno == EINTR || errno == EAGAIN) continue; - saved_errno = errno; diff --git a/app-text/calibre/files/calibre-8.9-qt6.10.patch b/app-text/calibre/files/calibre-8.9-qt6.10.patch new file mode 100644 index 0000000000000..c1b2937d3b662 --- /dev/null +++ b/app-text/calibre/files/calibre-8.9-qt6.10.patch @@ -0,0 +1,105 @@ +From 4c44e8f76f197629af695091c49b1a0efbb30bae Mon Sep 17 00:00:00 2001 +From: Marcin Serwin +Date: Sat, 11 Oct 2025 02:00:04 +0200 +Subject: [PATCH] Fix building with Qt 6.10 + +Qt 6.10 no longer implicitly imports private modules, see https://doc.qt.io/qt-6/whatsnew610.html#build-system-changes. +--- + src/calibre/headless/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/calibre/headless/CMakeLists.txt b/src/calibre/headless/CMakeLists.txt +index c2c8fa88e58f..3fc5d8e4862f 100644 +--- a/src/calibre/headless/CMakeLists.txt ++++ b/src/calibre/headless/CMakeLists.txt +@@ -1,8 +1,8 @@ + cmake_minimum_required(VERSION 3.21) + project(headless) + set(CMAKE_AUTOMOC ON) +-find_package(Qt6Gui REQUIRED) ++find_package(Qt6 REQUIRED COMPONENTS Gui GuiPrivate Core CorePrivate) + add_library(headless MODULE main.cpp headless_backingstore.cpp headless_integration.cpp) + set_property(TARGET headless PROPERTY QT_PLUGIN_TYPE "platforms") + set_property(TARGET headless PROPERTY QT_PLUGIN_CLASS_NAME "HeadlessIntegrationPlugin") +-target_link_libraries(headless PRIVATE Qt::Gui Qt::GuiPrivate Qt::Core Qt::CorePrivate) ++target_link_libraries(headless PRIVATE Qt6::Gui Qt6::GuiPrivate Qt6::Core Qt6::CorePrivate) + + +From 8820bffc86631ca7020177a4998b478141a7b8c1 Mon Sep 17 00:00:00 2001 +From: Kovid Goyal +Date: Sat, 11 Oct 2025 08:26:28 +0530 +Subject: [PATCH] Only change CMakeLists.txt for headless if actually building + with Qt >= 6.10 + +--- + setup/build.py | 18 +++++++++++++++++- + setup/build_environment.py | 3 ++- + src/calibre/headless/CMakeLists.txt | 3 ++- + 3 files changed, 21 insertions(+), 3 deletions(-) + +diff --git a/setup/build.py b/setup/build.py +index 5ed34720dbb9..7816493ad94b 100644 +--- a/setup/build.py ++++ b/setup/build.py +@@ -648,6 +648,22 @@ def build_headless(self): + bdir = self.j(self.build_dir, 'headless') + if os.path.exists(bdir): + shutil.rmtree(bdir) ++ sdir = os.path.join(bdir, 'src') ++ shutil.copytree(os.path.dirname(sources[0]), sdir) ++ with open(os.path.join(sdir, 'CMakeLists.txt'), 'r+') as f: ++ raw = f.read() ++ qt = lazy_load('qt') ++ if qt['version'] >= (6, 10): ++ fp = 'find_package(Qt6 REQUIRED COMPONENTS Gui GuiPrivate Core CorePrivate)' ++ ll = 'target_link_libraries(headless PRIVATE Qt6::Gui Qt6::GuiPrivate Qt6::Core Qt6::CorePrivate)' ++ else: ++ fp = 'find_package(Qt6Gui REQUIRED)' ++ ll = 'target_link_libraries(headless PRIVATE Qt::Gui Qt::GuiPrivate Qt::Core Qt::CorePrivate)' ++ raw = raw.replace('__FIND_GUI__', fp) ++ raw = raw.replace('__LINK_TARGETS__', ll) ++ f.seek(0), f.truncate() ++ f.write(raw) ++ bdir = os.path.join(bdir, 'build') + cmd = [CMAKE] + if is_macos_universal_build: + cmd += ['-DCMAKE_OSX_ARCHITECTURES=x86_64;arm64'] +@@ -657,7 +673,7 @@ def build_headless(self): + cwd = os.getcwd() + os.chdir(bdir) + try: +- self.check_call(cmd + ['-S', os.path.dirname(sources[0])]) ++ self.check_call(cmd + ['-S', sdir]) + self.check_call([self.env.make] + [f'-j{cpu_count or 1}']) + finally: + os.chdir(cwd) +diff --git a/setup/build_environment.py b/setup/build_environment.py +index a0fd7f2dd260..f5ca099d71a1 100644 +--- a/setup/build_environment.py ++++ b/setup/build_environment.py +@@ -119,8 +119,9 @@ def readvar(name): + return re.search(f'^{name}:(.+)$', qraw, flags=re.M).group(1).strip() + + +-qt = {x:readvar(y) for x, y in {'libs':'QT_INSTALL_LIBS', 'plugins':'QT_INSTALL_PLUGINS'}.items()} ++qt = {x:readvar(y) for x, y in {'libs':'QT_INSTALL_LIBS', 'plugins':'QT_INSTALL_PLUGINS', 'version_str': 'QT_VERSION'}.items()} + qmakespec = readvar('QMAKE_SPEC') if iswindows else None ++qt['version'] = tuple(map(int, qt['version_str'].split('.')[:2])) + freetype_lib_dirs = [] + freetype_libs = [] + freetype_inc_dirs = [] +diff --git a/src/calibre/headless/CMakeLists.txt b/src/calibre/headless/CMakeLists.txt +index 3fc5d8e4862f..49b110477b6d 100644 +--- a/src/calibre/headless/CMakeLists.txt ++++ b/src/calibre/headless/CMakeLists.txt +@@ -1,8 +1,9 @@ + cmake_minimum_required(VERSION 3.21) + project(headless) + set(CMAKE_AUTOMOC ON) ++__FIND_GUI__ + find_package(Qt6 REQUIRED COMPONENTS Gui GuiPrivate Core CorePrivate) + add_library(headless MODULE main.cpp headless_backingstore.cpp headless_integration.cpp) + set_property(TARGET headless PROPERTY QT_PLUGIN_TYPE "platforms") + set_property(TARGET headless PROPERTY QT_PLUGIN_CLASS_NAME "HeadlessIntegrationPlugin") +-target_link_libraries(headless PRIVATE Qt6::Gui Qt6::GuiPrivate Qt6::Core Qt6::CorePrivate) ++__LINK_TARGETS__ diff --git a/profiles/package.mask b/profiles/package.mask index 8ada2e7c5b2c2..d565992ab6aa9 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -36,6 +36,13 @@ #--- END OF EXAMPLES --- +# Eli Schwartz (2025-12-15) +# This version has lit a firecracker under the community and attracted +# some ire. The situation is in a state of mild flux, and more generally +# requires further consideration to determine the correct course of +# action. Use at your own risk. +>=app-text/calibre-8.11.0 + # Andreas Sturmlechner (2025-12-21) # Fails to build against Qt 6.10, upstream repository was archived. # Bug #966389. Removal on 2026-01-15