diff options
Diffstat (limited to 'app-text/calibre')
-rw-r--r-- | app-text/calibre/Manifest | 6 | ||||
-rw-r--r-- | app-text/calibre/calibre-3.26.1-r1.ebuild (renamed from app-text/calibre/calibre-4.1.0-r1.ebuild) | 94 | ||||
-rw-r--r-- | app-text/calibre/calibre-3.47.1.ebuild | 2 |
3 files changed, 61 insertions, 41 deletions
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest index c87c361fb6ae..fe5fd525d41c 100644 --- a/app-text/calibre/Manifest +++ b/app-text/calibre/Manifest @@ -2,10 +2,10 @@ AUX calibre-2.9.0-no_updates_dialog.patch 1661 BLAKE2B c75fc49a621e8dbd16ee1bad7 AUX calibre-disable_plugins.patch 1042 BLAKE2B 92a56016c2c54f1b156bc91031420594445545b98b701f7cce99cf4bb86847eebad1ccebdc20a0d1b67f9fa88a9250fc4926d7c04cb36405323388b3171cf502 SHA512 c152ddd92728a89db10c75a4d00a968bf119bef68da8b9116c76827e3cdc8f8a7e5c45fbb973f6ca8db1f79e461518351ce2d47e5e059c282f36d2df499d1629 AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcdc857ad468a9b74788326e9424f6ab9058be344dbbac8e49d343f5a1e53ddb486f2018b77319a7f8f713cf4 SHA512 12ef793a5b6ffd4413f780a13cad63927a95f15d17d85d4229eb5005ead68e51779abb822f9898ab5ae8c2094affeec1f9e85c34f109499739e6726b7641542a AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a +DIST calibre-3.26.1.tar.xz 39109660 BLAKE2B 0e98c273b8a5dfafea7a7027de3f83ad25ab835edadedf78b7e9bc356bcac8937d915944f2ab6503b414c49b4e792e090e7bd2433a4e86373bf115720ed78b0a SHA512 893e36b101defaca29281b4bd072aafc1c4cb20a9cd3ee06a0b68fbe6b39cab34952799939ac4f54c77148c87861c5ab4ddff84f5ec8c2274ae7fa6424259ff5 DIST calibre-3.47.1.tar.xz 38710008 BLAKE2B 60915345dd756d085386af61128e92569304be64aadbc21b69973e93adf3fb5cc88f7250153c238ecf423546f408bfc094b5bce329a54e7f080f831c4a8c23c1 SHA512 010796b3ac3fc6adcdf26dbc7966946be0f48b2684e1317da11d77fa55151d1f6ad2b86adf3c8eced5559823567e6672bfdfd953c17e6cc978894544131fb6bd DIST calibre-3.48.0.tar.xz 38777408 BLAKE2B 9a7fae20487ae93120cfdc06a312a42d54d68935fdd2bc18dc41be5f8d359c79eae24e0409ba8e7f4df85e2f073f80ce6bab56cba0638cead6693600fa93cb41 SHA512 6cee28fb560e2e00b8ac2f32756f094146c6fe744cfc343d68f1fb54b3f8b0ca16129a5b35018af54a103790faa2eb03ac186c01003f21c874d2ed5218441220 -DIST calibre-4.1.0.tar.xz 36231016 BLAKE2B 85987b8b8b37deb40f9ebb7d918e15e9a763cca00cf26eab841d0035309bd066f675d50d1ca94cb65e512d1964bac4241b3006aa38cac14ec0cb5e2d6416d2a8 SHA512 9a4766ccec830e553b5165f9a3b1111a6b4d0dbadee8b6a6547fef1dc3ca51adc886d9c3d751af23f4ff3a30a0fe03606c70ab57245ea38bfb486c111fd0e82e -EBUILD calibre-3.47.1.ebuild 8350 BLAKE2B d59300c7f0fc9a85c5a2862b0ce844c76e83a30cec434351e1df98d3741cd0a21dff80a52548903d25da29421121e220d8ee02a3f629f56bb11f7b3f9f5873c8 SHA512 53f70f860b5e8b9e33ac49a598c03b6e3a075b03377461008ca77a0ae2518d0e899c1af19fca611850e3e16c6efb5cfce1241afa2cdce0cba82c704fcec05d9f +EBUILD calibre-3.26.1-r1.ebuild 9203 BLAKE2B 9e3bc1630f915a8548e1480f0b00d6acb4001dee3be5a5119dd9b2eb8b984c4eecaa0a0742e550a36eca359e8806d2444d21f8bf344321c11ffeca59e7e10877 SHA512 98407a3605b58125ca783dadbe7dfed5f3bb526f816d79a167fb0358202cc56870601d16b7eae46d2464a0f64761168d9f0a00d69a5a184e17d705eb540afb97 +EBUILD calibre-3.47.1.ebuild 8352 BLAKE2B 92a2d894b2ad0966588854cdece96930aa85e240699eb185cc32a4b7ec0b3e98c34e7cac2490c44b1909bc1e4fc92f7d5094ed8f6159e08ae22ef98d7156f06c SHA512 df60b94324ccfe704195af5a6188ea6a793767e342e058b1f5039f52ae7fab6b16e95266a0876f6ea8118b5e4a014d7d1e3636b58280d611ae94918e359763d4 EBUILD calibre-3.48.0.ebuild 8352 BLAKE2B 92a2d894b2ad0966588854cdece96930aa85e240699eb185cc32a4b7ec0b3e98c34e7cac2490c44b1909bc1e4fc92f7d5094ed8f6159e08ae22ef98d7156f06c SHA512 df60b94324ccfe704195af5a6188ea6a793767e342e058b1f5039f52ae7fab6b16e95266a0876f6ea8118b5e4a014d7d1e3636b58280d611ae94918e359763d4 -EBUILD calibre-4.1.0-r1.ebuild 8451 BLAKE2B e464f58bea125fa5651adc2226d853a702c0ca6af0b32382bd33899874023f8a94fbe4f799f121900312ed4f57c4322e8252bedb90559eaaeae29396ee7e6be0 SHA512 5f17a88f540a62249f180024216d4fb36a7d3e0d832fa45a62cda72ea2b5cf7e9433fa19244a7134f42ab1abc8e1e0e52e63ee9ead526a8ba0cd2f95aa9cb4de MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5 diff --git a/app-text/calibre/calibre-4.1.0-r1.ebuild b/app-text/calibre/calibre-3.26.1-r1.ebuild index a435558ef333..c92715c1e5f5 100644 --- a/app-text/calibre/calibre-4.1.0-r1.ebuild +++ b/app-text/calibre/calibre-3.26.1-r1.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=6 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="sqlite,ssl" -inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils +inherit eutils bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1 xdg-utils DESCRIPTION="Ebook management application" HOMEPAGE="https://calibre-ebook.com/" @@ -31,47 +31,42 @@ LICENSE=" OFL-1.1 PSF-2 " -KEYWORDS="~amd64 ~arm ~x86" +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/podofo-0.8.2:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= >=dev-libs/icu-57.1:= dev-libs/libinput:= - >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}] + >=dev-python/apsw-3.13.0[${PYTHON_USEDEP}] >=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}] - >=dev-python/chardet-3.0.3[${PYTHON_USEDEP}] + dev-python/chardet[${PYTHON_USEDEP}] >=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}] - >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}] + >=dev-python/cssutils-1.0.1[${PYTHON_USEDEP}] >=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 dev-python/dnspython[${PYTHON_USEDEP}] - >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}] - >=dev-python/html5-parser-0.4.3[${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.5.6[${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/pygments-2.3.1[${PYTHON_USEDEP}] + dev-python/html5-parser[${PYTHON_USEDEP}] + >=dev-python/lxml-3.2.1[${PYTHON_USEDEP}] + >=dev-python/mechanize-0.2.5[${PYTHON_USEDEP}] + dev-python/msgpack[${PYTHON_USEDEP}] + dev-python/netifaces[${PYTHON_USEDEP}] + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + >=dev-python/pygments-2.1.3[${PYTHON_USEDEP}] >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}] - >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}] - >=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}] + >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}] dev-python/regex[${PYTHON_USEDEP}] dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= - >=dev-qt/qtwebengine-5.12 dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache @@ -81,7 +76,7 @@ COMMON_DEPEND="${PYTHON_DEPS} >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 - >=sys-libs/zlib-1.2.11:= + sys-libs/zlib:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= @@ -99,7 +94,7 @@ RDEPEND="${COMMON_DEPEND} DEPEND="${COMMON_DEPEND} >=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}] dev-python/sip[${PYTHON_USEDEP}] - >=virtual/podofo-build-0.9.6_pre20171027 + >=virtual/podofo-build-0.9.4 virtual/pkgconfig" pkg_pretend() { @@ -154,6 +149,15 @@ src_prepare() { find "${S}" -type f -name \*.py -exec \ sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \ || die "could not sed bundled beautifulsoup out of the source tree" + + # avoid failure of xdg tools to recognize vendor prefix + sed -e "s|xdg-icon-resource install|xdg-icon-resource install --novendor|" \ + -e "s|'xdg-mime', 'install'|'xdg-mime', 'install', '--novendor'|" \ + -e "s|'xdg-desktop-menu', 'install'|'xdg-desktop-menu', 'install', '--novendor'|" \ + -i "${S}"/src/calibre/linux.py || die 'sed failed' + + # don't create/install uninstaller + sed '/self\.create_uninstaller()/d' -i src/calibre/linux.py || die } src_install() { @@ -180,8 +184,7 @@ src_install() { # 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 #684484 + export -n LANGUAGE # Bug #295672 - Avoid sandbox violation in ~/.config by forcing # variables to point to our fake temporary $HOME. @@ -197,18 +200,34 @@ src_install() { local libdir=$(get_libdir) [[ -n $libdir ]] || die "get_libdir returned an empty string" - addpredict /dev/dri #665310 + # Bug #472690 - Avoid sandbox violation for /dev/dri/card0. + local x + for x in /dev/dri/card[0-9] ; do + [[ -e ${x} ]] && addpredict ${x} + done PATH=${T}:${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 + --staging-root="${ED}usr" \ + --staging-libdir="${ED}usr/${libdir}" || die + + # The menu entries end up here due to '--mode user' being added to + # xdg-* options in src_prepare. + dodir /usr/share/mime/packages + chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local + mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ || + die "failed to register mime types" + dodir /usr/share/icons + mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ || + die "failed to install icon files" + + domenu "${HOME}"/.local/share/applications/*.desktop || + die "failed to install .desktop menu files" - rm "${ED}/usr/share/applications/defaults.list" || die - find "${ED}"/usr/share -type d -empty -delete + find "${ED}"usr/share -type d -empty -delete cd "${ED}"/usr/share/calibre/fonts/liberation || die local x @@ -218,10 +237,10 @@ src_install() { done einfo "Converting python shebangs" - python_fix_shebang --force "${ED}" + python_fix_shebang "${ED}" einfo "Compiling python modules" - python_optimize "${ED}"/usr/lib/calibre + python_optimize "${ED}"usr/lib/calibre newinitd "${FILESDIR}"/calibre-server-3.init calibre-server newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server @@ -243,17 +262,18 @@ src_install() { } pkg_preinst() { + gnome2_icon_savelist # 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}" + 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 + for x in "${EROOT%/}${CALIBRE_LIB_DIR}"/*; do if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then elog "Purging '${x}'" rm -rf "${x}" @@ -261,11 +281,11 @@ pkg_postinst() { done xdg_desktop_database_update xdg_mimeinfo_database_update - xdg_icon_cache_update + gnome2_icon_cache_update } pkg_postrm() { xdg_desktop_database_update xdg_mimeinfo_database_update - xdg_icon_cache_update + gnome2_icon_cache_update } diff --git a/app-text/calibre/calibre-3.47.1.ebuild b/app-text/calibre/calibre-3.47.1.ebuild index c798de6c6e21..9b8c29fcc23b 100644 --- a/app-text/calibre/calibre-3.47.1.ebuild +++ b/app-text/calibre/calibre-3.47.1.ebuild @@ -31,7 +31,7 @@ LICENSE=" OFL-1.1 PSF-2 " -KEYWORDS="amd64 ~arm x86" +KEYWORDS="~amd64 ~arm ~x86" SLOT="0" IUSE="ios +udisks" |