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 AE177138334 for ; Fri, 4 Oct 2019 03:13:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D8463E0814; Fri, 4 Oct 2019 03:13:35 +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 3C6E0E0814 for ; Fri, 4 Oct 2019 03:13:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 1E66B34B8D2 for ; Fri, 4 Oct 2019 03:13:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1A9F47E7 for ; Fri, 4 Oct 2019 03:13:31 +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: <1570158805.df80f898457ad335224a0df6e8a6238cbc79f17f.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-3.26.1-r1.ebuild X-VCS-Directories: app-text/calibre/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: df80f898457ad335224a0df6e8a6238cbc79f17f X-VCS-Branch: master Date: Fri, 4 Oct 2019 03:13:31 +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: 6a581b1f-b409-4930-824f-00b770c957a1 X-Archives-Hash: 9b862b050911813694d54d53b7e47371 commit: df80f898457ad335224a0df6e8a6238cbc79f17f Author: Zac Medico gentoo org> AuthorDate: Fri Oct 4 03:12:25 2019 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Oct 4 03:13:25 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df80f898 app-text/calibre: Remove old version 3.26.1-r1 Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Zac Medico gentoo.org> app-text/calibre/Manifest | 1 - app-text/calibre/calibre-3.26.1-r1.ebuild | 291 ------------------------------ 2 files changed, 292 deletions(-) diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest index 6a82fd81920..338d8585e15 100644 --- a/app-text/calibre/Manifest +++ b/app-text/calibre/Manifest @@ -1,3 +1,2 @@ -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 diff --git a/app-text/calibre/calibre-3.26.1-r1.ebuild b/app-text/calibre/calibre-3.26.1-r1.ebuild deleted file mode 100644 index c92715c1e5f..00000000000 --- a/app-text/calibre/calibre-3.26.1-r1.ebuild +++ /dev/null @@ -1,291 +0,0 @@ -# Copyright 1999-2019 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.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.13.0[${PYTHON_USEDEP}] - >=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}] - dev-python/chardet[${PYTHON_USEDEP}] - >=dev-python/cssselect-0.7.1[${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/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.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:= - 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 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" - -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" - - # 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 - - # 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 -}