From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2562D138359 for ; Fri, 21 Aug 2020 04:34:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 43F72E0AF9; Fri, 21 Aug 2020 04:34:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 12EDEE0AF9 for ; Fri, 21 Aug 2020 04:34:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7C40B340C24 for ; Fri, 21 Aug 2020 04:34:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EDA74328 for ; Fri, 21 Aug 2020 04:34:34 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1597984447.8741a26bd857896e7a79c560fe14f98dd7e28994.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/calibre/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/calibre/Manifest app-text/calibre/calibre-4.23.0.ebuild X-VCS-Directories: app-text/calibre/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 8741a26bd857896e7a79c560fe14f98dd7e28994 X-VCS-Branch: master Date: Fri, 21 Aug 2020 04:34:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: baf17552-5ef1-4341-99e7-b733eaa9c3e8 X-Archives-Hash: 15ef8501bb12152c1923084249aac763 commit: 8741a26bd857896e7a79c560fe14f98dd7e28994 Author: Zac Medico gentoo org> AuthorDate: Fri Aug 21 04:20:43 2020 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Aug 21 04:34:07 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8741a26b app-text/calibre: Bump to version 4.23.0 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Zac Medico gentoo.org> app-text/calibre/Manifest | 1 + app-text/calibre/calibre-4.23.0.ebuild | 276 +++++++++++++++++++++++++++++++++ 2 files changed, 277 insertions(+) diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest index 5365d3d7b63..2cca544705d 100644 --- a/app-text/calibre/Manifest +++ b/app-text/calibre/Manifest @@ -2,5 +2,6 @@ DIST calibre-4.17.0-qt-5.15-fontconfig-bug-725020.patch 1222 BLAKE2B 14038b4ea5f DIST calibre-4.20.0.tar.xz 36997620 BLAKE2B 28ee9539eda96809004f4c276c8dceba119122379867f4b9235ad52a3ec68337330c4cbc2e715462f27ea0c3a0c8470609a50273db49a69f69a60e7fbcef11a5 SHA512 97e33c0a4a53c0b799ed76fde6327570d3e6356a812836d204ce0e6f5273715e274fdf2e987a0446b61ce6aceb4ce5cfda9c0cb8a2f2871efd83b76acbc43820 DIST calibre-4.21.0.tar.xz 36937392 BLAKE2B 7797e1b99eefa795a84a1ce913b7739ce6961d58ea28c68e3f5a1b756bbec20c206bd7cab25f1ffacc33f39fed2cc4acf99b5bb90ba88b0607987801770d8b30 SHA512 d2e711d2dec77b41a7930cfd39a7597d1b56fdd57bad44686efdf4be66321565622f42e20dfd844c90cc5f2d6625c17b4e8997b9b4592648af1664fda341bf27 DIST calibre-4.22.0.tar.xz 36924876 BLAKE2B 19576d5cfc1a4ed6a505ef46656675980b6736be01f55874951a9a0c81a70c82e23e723db1d81d13917eaf615e65752a100fbc1cb43bdca0b3c4543e3b17cf43 SHA512 b9db1c72cf010c25563e3f86a75478ac872249034b3c8b09bb8f0c2519487bb78dea821c9e45564fb645d17431bbee96459a28ee036e57830faedea4cd94b423 +DIST calibre-4.23.0.tar.xz 36908740 BLAKE2B 3a950ac2b3aade547bb686cc99b963357e76b5931049ecb4a5e09ddaf1db26c74fa3b4ebd74e42d83f68c5c9827c534c0247a3c6a9b000641a778cfe5ac33599 SHA512 2a512f29ddc2fed7f6a229314a9f7fceac198c9422b3be19078685032f1d1cb3b9258ac2609c33d15da20683c1277ed09419ea1e9bbc70430cdc676f60395719 DIST calibre-4.9.1-bug-731786.patch 1069 BLAKE2B 8b57fb89c9ec2d3a435fbc90f514d45468ceb96b46428efd5d2084cc9bb6137b49dd90dc2f7e574b6d8b8d536728392863046b068c39c8f9bcc3ae23678ac590 SHA512 acd158923bb369270155b3032b033a8387bcb53d1b0ea3e2c0724a40ec0cff6add5fca85649caaf37db0a0878fc3dafacc98b2b641cf10a8d58dc719642c6be5 DIST calibre-4.9.1.tar.xz 37529656 BLAKE2B 5d703ca0c398b43cc26a54e0628d0fe938c6a5027a4fd0c9cac83944e5143eb08439bf79b2098182be7727eaa042748f17866788b02c7744178dce131f6b1d1e SHA512 bf06aa3cbc8d255934f3f7f3ce20b4798edf107ed9f822943d2b4ae7d95473842928ed79f8ba7571f7e0ebdc267c441916d543d5b7630aae5cb151bcc3184b71 diff --git a/app-text/calibre/calibre-4.23.0.ebuild b/app-text/calibre/calibre-4.23.0.ebuild new file mode 100644 index 00000000000..2e529363d2c --- /dev/null +++ b/app-text/calibre/calibre-4.23.0.ebuild @@ -0,0 +1,276 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..8} ) +PYTHON_REQ_USE="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/chmlib-0.40:= + dev-libs/glib:2= + dev-libs/hyphen:= + >=dev-libs/icu-57.1:= + dev-libs/libinput:= + >=dev-libs/dbus-glib-0.106 + >=sys-apps/dbus-1.10.8 + $(python_gen_cond_dep ' + >=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}] + dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}] + >=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}] + >=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}] + >=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}] + >=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}] + dev-python/dnspython[${PYTHON_MULTI_USEDEP}] + >=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}] + >=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}] + >=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}] + >=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}] + >=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}] + >=dev-python/msgpack-0.6.2[${PYTHON_MULTI_USEDEP}] + >=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}] + >=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}] + >=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}] + >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}] + >=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}] + dev-python/regex[${PYTHON_MULTI_USEDEP}] + dev-python/zeroconf[${PYTHON_MULTI_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_MULTI_USEDEP}] + dev-python/sip[${PYTHON_MULTI_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 + + rm "${ED}/usr/share/applications/defaults.list" || 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/lib/calibre + + newinitd "${FILESDIR}"/calibre-server-3.init calibre-server + newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server + + bashcomp_alias calibre \ + lrfviewer \ + calibre-debug \ + ebook-meta \ + calibre-server \ + ebook-viewer \ + ebook-polish \ + fetch-ebook-metadata \ + lrf2lrs \ + ebook-convert \ + ebook-edit \ + calibre-smtp \ + ebook-device + +} + +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 +}