From dc7cbdfa65fd814b3b9aa3c56257da201109e807 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 5 Apr 2019 21:17:31 +0100 Subject: gentoo resync : 05.04.2019 --- app-text/calibre/Manifest | 6 +- app-text/calibre/calibre-3.26.1.ebuild | 3 +- app-text/calibre/calibre-3.38.1.ebuild | 288 --------------------------------- app-text/calibre/calibre-3.40.1.ebuild | 1 + 4 files changed, 5 insertions(+), 293 deletions(-) delete mode 100644 app-text/calibre/calibre-3.38.1.ebuild (limited to 'app-text/calibre') diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest index b8f9809c1957..3dbc496ebc7b 100644 --- a/app-text/calibre/Manifest +++ b/app-text/calibre/Manifest @@ -3,9 +3,7 @@ AUX calibre-disable_plugins.patch 1042 BLAKE2B 92a56016c2c54f1b156bc910314205944 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.38.1.tar.xz 38193788 BLAKE2B a42a8c3a628246def1f27488db729fc5a859bbadea344d04aec7d2ddc347bc97706d623ba522ad960bf239debe62eee126367417067e4a7c1d427af50584fd37 SHA512 4ce1453ff50894adafd027e9bad7cbd557b9b13d5939e53b8476083bb221f1c84cabc465c46f7b6361bcef60ed8da2d96dbfe9670ebf372e4864195e4748ee18 DIST calibre-3.40.1.tar.xz 38365300 BLAKE2B 5b1b8624d81d8a60d954b3871e46ae5dad8a49a7efb6e986cfef133da6da249fa8b36d1eed3840322ddec9c8144772c1e9504e114d27774096a9939f2a58a326 SHA512 1333c24e384ccae79d264055e1e84b8a13919e68d9290a277e07bb7f3b4579d15090859b50945672c155a438a2bf9e5f088f094bc30781af7c5d0d9ccd7226f4 -EBUILD calibre-3.26.1.ebuild 9281 BLAKE2B 8eaf92eb0c23c1b500105c74841aaf1980f71d7f3d01f5af76a0bf906a904d3df17ed71a5b01d150a70c1fd53b431f66de9a8c3a055a26b086dd60b714e535c0 SHA512 2194ef543af3296766c960768dbe8e6330d89583318052ad56a8a35df5704c88deec235c1dbfe042bc4c99df8ff94b48fd87f3b15b012c288a87f891433d49a5 -EBUILD calibre-3.38.1.ebuild 9248 BLAKE2B 9524bb3feaf25473ee99c4c829e23ad586e0752e342ff0d1243da3ce15e65ee73e949cdced9395e2c5d757d8e094a4ddbbd524f78ea35179fdd927f85ea9f277 SHA512 b284b207b18f29229ac277900dc88e0f26b8da082591605d5cef9da7053b324d5b0c5379aa823504bfa731d3b0007bf16824bcb91cc24decb31c3ad71c266357 -EBUILD calibre-3.40.1.ebuild 9347 BLAKE2B aa2f85e4fca55174dd56f149bbf7871afcd3bfb8bea66ab333c3673fe5fca9bb8d6e26a8099e9e55fcc4d1933b961d7c7770231cd98c20eb5df861dc19bfc522 SHA512 c8fe8f932eb75b9439316cbbe9d22cb199c096dc5f65897781c4bcb42a57d1bcb427472bc6af43febe4b2da4297e3f2e6bfb7a5e87319f1b5a99dc4c7926c836 +EBUILD calibre-3.26.1.ebuild 9312 BLAKE2B b9e7712133717e608f2d6195fb3f4cc88a40f6628f74e7ae08294bc75bbb7ac42e29f7b07db77712028bc12b71950ffa3782a17dd028a7fa0e083cd2a58f733b SHA512 6a5297715b33057a539ddf46d195cdbef6a8fe9cc4f183dbc2dd78ec55352da288c904a969417c53b38db3500f4a2fb88df741fd1a0c54df11739b1e27471eb0 +EBUILD calibre-3.40.1.ebuild 9381 BLAKE2B dadfa37da609ea5134a8c88393c4f3a00a6136bd6b68e5e1ba46a35b3e92799328167a5292c0fc3123f83410bb06df64a15b81c80a5875685cc016cfac8186b8 SHA512 9ba128d123b602935c3426413b698ecd20f267731f84f1e373d8baf160435c57f81d71f3f967a3baf9cecb97eb0964368687f09c781ab9d684cd11c070c57dba MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5 diff --git a/app-text/calibre/calibre-3.26.1.ebuild b/app-text/calibre/calibre-3.26.1.ebuild index f761e9c5d83a..c9008b5e8020 100644 --- a/app-text/calibre/calibre-3.26.1.ebuild +++ b/app-text/calibre/calibre-3.26.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -93,6 +93,7 @@ RDEPEND="${COMMON_DEPEND} udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )" DEPEND="${COMMON_DEPEND} >=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}] + dev-python/sip[${PYTHON_USEDEP}] >=virtual/podofo-build-0.9.4 virtual/pkgconfig" diff --git a/app-text/calibre/calibre-3.38.1.ebuild b/app-text/calibre/calibre-3.38.1.ebuild deleted file mode 100644 index e2e786499117..000000000000 --- a/app-text/calibre/calibre-3.38.1.ebuild +++ /dev/null @@ -1,288 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite,ssl" - -inherit eutils bash-completion-r1 gnome2-utils multilib 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/podofo-0.9.6_pre20171027:= - >=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.13.0[${PYTHON_USEDEP}] - >=dev-python/beautifulsoup-3.0.5:python-2[${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-libs/dbus-glib-0.106 - >=sys-apps/dbus-1.10.8 - >=dev-python/html5-parser-0.4.3[${PYTHON_USEDEP}] - >=dev-python/lxml-3.8.0[${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.1.3[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.5.3[${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/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= - virtual/python-dnspython[${PYTHON_USEDEP}] - 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 sys-fs/udisks:0 ) )" -DEPEND="${COMMON_DEPEND} - >=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}] - >=virtual/podofo-build-0.9.6_pre20171027 - virtual/pkgconfig" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary && $(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'])" \ - -i setup/build.py || die "sed failed to patch build.py" - - # use system beautifulsoup, instead of bundled - rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \ - || die "could not remove bundled beautifulsoup" - 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() { - # Bypass kbuildsycoca and update-mime-database in order to - # avoid sandbox violations if xdg-mime tries to call them. - cat - > "${T}/kbuildsycoca" <<-EOF - #!${BASH} - echo $0 : $@ - exit 0 - EOF - - cp "${T}"/{kbuildsycoca,update-mime-database} || die - chmod +x "${T}"/{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 LANGUAGE - - # 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 - - #dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py - #dodir $(python_get_sitedir) - 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 - - # 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" - - 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 "${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() { - 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}" -} - -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 - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} diff --git a/app-text/calibre/calibre-3.40.1.ebuild b/app-text/calibre/calibre-3.40.1.ebuild index a35d78bdf209..cd10ca04cdca 100644 --- a/app-text/calibre/calibre-3.40.1.ebuild +++ b/app-text/calibre/calibre-3.40.1.ebuild @@ -95,6 +95,7 @@ RDEPEND="${COMMON_DEPEND} udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )" DEPEND="${COMMON_DEPEND} >=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}] + dev-python/sip[${PYTHON_USEDEP}] >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig" -- cgit v1.2.3