commit: a0ca413275e10a2297a6c02fd28e3a21ee91c7df Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Fri Oct 22 06:24:01 2021 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Fri Oct 22 06:29:09 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0ca4132
app-text/calibre: Bump to version 5.30.0 Closes: https://bugs.gentoo.org/818433 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> app-text/calibre/Manifest | 1 + app-text/calibre/calibre-5.30.0.ebuild | 263 +++++++++++++++++++++ .../calibre/files/calibre-disable_plugins.patch | 8 +- 3 files changed, 265 insertions(+), 7 deletions(-) diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest index d6a70bbcecb..b964061e63a 100644 --- a/app-text/calibre/Manifest +++ b/app-text/calibre/Manifest @@ -1,3 +1,4 @@ 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.25.0.tar.xz 36849112 BLAKE2B f9cb423317ea1f5b22e7f3540708fd4fa6e7dff2d6d2c667755c74c4f46b72f52aac7672933c51efaf56a5ef57e573c8927649fe30570481c2057e5f757cdfde SHA512 7913fec188d8a8c40cf2768671836f6431d233ac53d1d683222a12f8a753a11cc4023fcfc1dd5ca8b27fd049fb579563b1cdd89624b824ce4eec7b438e25006e +DIST calibre-5.30.0.tar.xz 37002224 BLAKE2B dc034c54a6ebee838652fe10b467bf8408f8dabd759108d617e2c9f64109e92afe0f2994c5df480ec4346c596361ccb63d0aaab2796edc4993ae0eef4222ba6d SHA512 c2d435ec9a8cfd5f76439f229cd9a7a7f4e829e44d9f2ff37003faf8a925df40cd77471d72d05a8d145bfc104bf92dbdd67ddacabc84e6e3cad055887530d8bd diff --git a/app-text/calibre/calibre-5.30.0.ebuild b/app-text/calibre/calibre-5.30.0.ebuild new file mode 100644 index 00000000000..40fa50fcc40 --- /dev/null +++ b/app-text/calibre/calibre-5.30.0.ebuild @@ -0,0 +1,263 @@ +# Copyright 1999-2021 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 bash-completion-r1 desktop 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 ' + >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}] + dev-python/beautifulsoup4[${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/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} + $(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" + +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() { + # no_updates: do not annoy user with "new version is availible all the time + # disable_plugins: walking sec-hole, wait for upstream to use GHNS interface + eapply \ + "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \ + "${FILESDIR}/${PN}-disable_plugins.patch" + + eapply_user + + # 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 "/^ self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\ +\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \ +'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \ +'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \ +'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \ +'-i', '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_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/files/calibre-disable_plugins.patch b/app-text/calibre/files/calibre-disable_plugins.patch index 9ef1dd04251..9bd6893a4ae 100644 --- a/app-text/calibre/files/calibre-disable_plugins.patch +++ b/app-text/calibre/files/calibre-disable_plugins.patch @@ -6,12 +6,6 @@ Index: calibre-0.8.29+dfsg/src/calibre/gui2/actions/preferences.py =================================================================== --- calibre-0.8.29+dfsg.orig/src/calibre/gui2/actions/preferences.py 2011-12-16 05:49:14.000000000 +0100 +++ calibre-0.8.29+dfsg/src/calibre/gui2/actions/preferences.py 2011-12-20 19:29:04.798468930 +0100 -@@ -28,8 +28,6 @@ - pm.addAction(QIcon(I('config.png')), _('Preferences'), self.do_config) - cm('welcome wizard', _('Run welcome wizard'), - icon='wizard.png', triggered=self.gui.run_wizard) +@@ -33,2 +32,0 @@ - cm('plugin updater', _('Get plugins to enhance calibre'), - icon='plugins/plugin_updater.png', triggered=self.get_plugins) - if not DEBUG: - pm.addSeparator() - cm('restart', _('Restart in debug mode'), icon='debug.png',
