public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Eli Schwartz" <eschwartz@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/calibre/files/, app-text/calibre/
Date: Thu, 11 Sep 2025 05:55:21 +0000 (UTC)	[thread overview]
Message-ID: <1757569959.b69f6dd50d0326af4f6e7ecc65e2f3936d5f6a79.eschwartz@gentoo> (raw)

commit:     b69f6dd50d0326af4f6e7ecc65e2f3936d5f6a79
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 11 01:02:32 2025 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Thu Sep 11 05:52:39 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b69f6dd5

app-text/calibre: add 8.9.0

Closes: https://bugs.gentoo.org/961974
Thanks-to: Herbert Wantesh <rauchwolke <AT> gmx.net>
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 app-text/calibre/Manifest                        |   2 +
 app-text/calibre/calibre-8.9.0.ebuild            | 256 +++++++++++++++++++++++
 app-text/calibre/files/calibre-8.9.0-piper.patch |  47 +++++
 3 files changed, 305 insertions(+)

diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 5bd809d0a9be..bddc4898a8c9 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -2,3 +2,5 @@ DIST calibre-8.4.0.tar.xz 44113820 BLAKE2B 3580124b04d9aef19c6ac2c1e3bdf5aa86f12
 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.9.0.ebuild b/app-text/calibre/calibre-8.9.0.ebuild
new file mode 100644
index 000000000000..3b7b0d71b8aa
--- /dev/null
+++ b/app-text/calibre/calibre-8.9.0.ebuild
@@ -0,0 +1,256 @@
+# 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"
+	"${FILESDIR}/${PN}-8.9.0-piper.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.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-8.9.0-piper.patch b/app-text/calibre/files/calibre-8.9.0-piper.patch
new file mode 100644
index 000000000000..149024bf407f
--- /dev/null
+++ b/app-text/calibre/files/calibre-8.9.0-piper.patch
@@ -0,0 +1,47 @@
+piper deps aren't packaged yet, and should be USE conditional anyway
+
+https://bugs.gentoo.org/961974
+
+diff --git a/setup/extensions.json b/setup/extensions.json
+index b39ce6d..c105031 100644
+--- a/setup/extensions.json
++++ b/setup/extensions.json
+@@ -134,14 +134,6 @@
+         "error": "!podofo_error",
+ 		"needs_c++": "17"
+     },
+-    {
+-        "name": "piper",
+-        "sources": "calibre/utils/tts/piper.cpp",
+-		"needs_c++": "17",
+-        "libraries": "!piper_libs",
+-        "lib_dirs": "!piper_lib_dirs",
+-        "inc_dirs": "!piper_inc_dirs"
+-    },
+     {
+         "name": "html_as_json",
+         "sources": "calibre/srv/html_as_json.cpp",
+diff --git a/src/calibre/constants.py b/src/calibre/constants.py
+index fa4b211459..7b27768953 100644
+--- a/src/calibre/constants.py
++++ b/src/calibre/constants.py
+@@ -258,7 +258,6 @@ def __init__(self):
+             'rcc_backend',
+             'icu',
+             'speedup',
+-            'piper',
+             'html_as_json',
+             'fast_css_transform',
+             'fast_html_entities',
+diff --git a/src/calibre/utils/run_tests.py b/src/calibre/utils/run_tests.py
+index ffd0f95c04..c80a35f83d 100644
+--- a/src/calibre/utils/run_tests.py
++++ b/src/calibre/utils/run_tests.py
+@@ -192,6 +192,7 @@ def test_import_of_all_python_modules(self):
+             }
+         if 'SKIP_SPEECH_TESTS' in os.environ:
+             exclude_packages.add('calibre.gui2.tts')
++            exclude_modules.add('calibre.utils.tts.piper')
+         if not isbsd:
+             exclude_modules.add('calibre.devices.usbms.hal')
+         d = os.path.dirname


             reply	other threads:[~2025-09-11  5:55 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-09-11  5:55 Eli Schwartz [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-07-22 19:37 [gentoo-commits] repo/gentoo:master commit in: app-text/calibre/files/, app-text/calibre/ Eli Schwartz
2025-06-08 16:42 Eli Schwartz
2025-02-26 20:10 Andreas Sturmlechner
2025-02-26 20:10 Andreas Sturmlechner
2024-08-23  7:20 Eli Schwartz
2024-07-31  3:53 Eli Schwartz
2024-07-21 21:18 Eli Schwartz
2023-11-28  0:40 Zac Medico
2023-11-24 16:55 Sam James
2023-02-09 10:25 Andreas Sturmlechner
2021-11-02 22:45 Sam James
2021-10-22  6:29 Zac Medico
2021-08-26 23:58 Sam James
2021-06-14 18:13 Zac Medico
2020-11-28 22:50 Andreas K. Hüttel
2017-06-26  8:05 Zac Medico
2017-04-24  0:05 Zac Medico

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1757569959.b69f6dd50d0326af4f6e7ecc65e2f3936d5f6a79.eschwartz@gentoo \
    --to=eschwartz@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox