From 3cf959002ccce7b447904682e59139af64cb9d16 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 23 Nov 2014 12:37:53 +0000 Subject: [PATCH] app-text/calibre: Add workaround for newer PyQt4, #526524; use distutils-r1.eclass, fix installation of bash-completions Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB! --- app-text/calibre/ChangeLog | 8 +- app-text/calibre/Manifest | 35 ++-- app-text/calibre/calibre-1.48-r1.ebuild | 248 ++++++++++++++++++++++++ 3 files changed, 273 insertions(+), 18 deletions(-) create mode 100644 app-text/calibre/calibre-1.48-r1.ebuild diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog index 9623426d7177..d3b760979e72 100644 --- a/app-text/calibre/ChangeLog +++ b/app-text/calibre/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-text/calibre # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.335 2014/11/09 13:18:44 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.336 2014/11/23 12:37:49 jlec Exp $ + +*calibre-1.48-r1 (23 Nov 2014) + + 23 Nov 2014; Justin Lecher +calibre-1.48-r1.ebuild: + Add workaround for newer PyQt4, #526524; use distutils-r1.eclass, fix + installation of bash-completions 09 Nov 2014; Ben de Groot calibre-2.9.0.ebuild: Fix failure of xdg tools to recognize vendor prefix (see bug #521484) diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest index 0891b22779ea..f16773bbdaca 100644 --- a/app-text/calibre/Manifest +++ b/app-text/calibre/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 AUX calibre-1.20-no_updates_dialog.patch 896 SHA256 fdc44ced4670ec51be8bacf796b8d793edc3f2735c235fdb1ba708cd3c9121d5 SHA512 84354a286d1258a9496e9adc68317c3016f1bb4551a090ded372376598dad989d02fe93d578a9c497154d49ec1fda098a9e3740145425a6cdbe80cf956ee8764 WHIRLPOOL 2348ce9d068d571d025abfccb5e07e6c2b4c4682242a1b7e77e777e3bc0e9684a214c80b1fa480214d8302115e7209e87a0b3edd140939274037a31445a17859 AUX calibre-1.34-no_updates_dialog.patch 1902 SHA256 5e7909e814c3f5cc167674e91f8e2a9f19aafbc471d5044e2561cb9b41a2d672 SHA512 cadefae143474d924bbe1c3a2b48976c35cd660ee9762efd5757cdb7928e83ddade7e9a2d29871894efcb0051235491e2be5146ccb19168599c02ce3f6b9f274 WHIRLPOOL b926814819560fd88fe17faaf995856897366436814826311e1b09716e97f3c46082d23a9856a55a471f5ad8233f2a4d7bb3d80ad7d30e77caa1ac5e17ee7bd3 @@ -23,27 +23,28 @@ EBUILD calibre-1.25.ebuild 6866 SHA256 7e91b8f0d570a31b6ad5de2ef50e00938176a4566 EBUILD calibre-1.29.ebuild 6877 SHA256 d90780aff0f34bed24447028ed0893c184f28bb924992c6d3eeec60e613e9083 SHA512 0d65541435f9e5ea40448c8c36e66997e34e86f887f84c2e5b411e0a4f2832847a38e1f8ce2507e81e58c2d02cf14199dcc571c0725251ceee7700d2df5bb719 WHIRLPOOL b242d53362b00556a6b7bd523e3528b72e9415211472bdbd83ab3023cafd5bd251be5f1259218725c504016cd5118a130c6bff5b70b9f839fccd0b2301dcf265 EBUILD calibre-1.43.ebuild 7618 SHA256 dcbdc08725e1aa2d7cf2f59b534dc769716c325b34b6aa28ea0f01e70a4a91b4 SHA512 a1ab94dc6e09500c48f2c536e8cc1d67c5756c0d8628a947b0388e9a8182365941b47dc8633f9a5b017e6a105eb90179dea6423881021ef4ca113c9187fc27e8 WHIRLPOOL 4497c9ff4d73bc5364b0f425462e1f0deb7e44b6a8d4952cc1314ae42fa81ecde9d9e647296ddeacf6a3703c058ba9ce26abbe7110709dbd85880d51ac23a623 EBUILD calibre-1.47.ebuild 7928 SHA256 ade95436b733ff6f03bca9389d3c42b45c5786ee62dcf8d3360e0c39adf1fb44 SHA512 13f53ba909b309368b413d16f125e44cb2a9ac0e927b19ba6e898b24f77768a4f862e442846ab4570410a4cc01b4e6a308aa85905b3bfe1ce2eb8d814a38344c WHIRLPOOL 74c4ee4e9cad8936ecd39e8fb3fcbba46c19dc59ab3629165682c51f5eea833885226a798e3949decbd308d5e63a5c937902b2c79215e72592c2ca9f411609cb +EBUILD calibre-1.48-r1.ebuild 7826 SHA256 1d3639c2f8ebf2e429df6f260400d30157e24bf2ae1357a3fd01d925629c070a SHA512 2b9b04bb14718f41283a443eb649c127e717508af6b823526447e944968bfc032ffef6aeba096d7f4de8cd3cf6e3909246705bf7d4fa3668a8b8b256d198cf0a WHIRLPOOL 01bf2a5553a40dc7e8e431217da97edfb408434ec0861e4650b61f3cbfeb36db4df37f48be12826dd47c31429e4c969be705e3a4df86513623ddcc094c5f3733 EBUILD calibre-1.48.ebuild 7928 SHA256 294a160ad70a49273d2a4a6bbb814426d81cbe5a826616a2810da1dccffc0455 SHA512 31c71cb9f1e05e1f645fdd98080175f0ad9bebab3b5c6482c3216694e3112a2804f4f17308f2a5e2f851c74c5aa690f449a1bf8f8717b441a738dce5e60e2923 WHIRLPOOL 141115e28c2ad2c273edbd54a5113aac5677efcf3738a20e565b4fa051b1161e4ac8278fbf026677681fdc387a6b2c8543991455a97e5179cdf8f47f8bb2406c EBUILD calibre-2.7.0.ebuild 7885 SHA256 37b95a846898f4456dcb855e32b69882e6c5bf455b0e32e646ecf0bd7b0cc796 SHA512 43ffc977a8c79a8180a2f8b520c7a7564d7625ea80ccf767c523b65d0eaf867d4caa8c162a8a03015e57086cc3a55fd416d43c8ae502317cfcac0caaded9f5ab WHIRLPOOL 9b9de3fc99f5d8428597851c05e328052cd11b60dda11b1db5f55a372446033a2f1a16bdcd2e686f911cbf8faf67315af5d8b7fec4f183b33dd2dc0a49176f6e EBUILD calibre-2.9.0.ebuild 8151 SHA256 0ca512e8e7cadf4cd8b9989397061e546002e100ffb32a090179c4652a70e247 SHA512 6af373d39b1eeeae3b0c1db929a68d43b5eaa064228fe2351a05618dd1ee678ba68028cb942490d917a68f6d02c75bc5728c9cd177bcec68e2ed96450ead1fff WHIRLPOOL 1e1b9b7d8e462f7bd67f350454a4d57f147ca4a490bb282a25fcf497c1285d6275b17357557fb472cd739334ac6d076aa08e2c92fd9b3a60cb12dffb4ffd8c6d -MISC ChangeLog 53515 SHA256 8ac35928a927e7c73407ad52bedfaef53feddf7578a7709acf7837e816d061a8 SHA512 cb7e33ea9e33dc8ae3c35ac4aca73afa95409630ace29ea6b0b3d145a829434975443e5f9baba630b82ec1523afc2741b721488996f2ab5c9e8395a81ec636be WHIRLPOOL 21a5fb9899ecc8782189c5ef059ec01c04b8a82ab3e2dbce377354935a1de1e715252e5d20eebe5d280dfe337481d01236ccbb9634ffbab41dc47d934ce90f67 +MISC ChangeLog 53725 SHA256 ccc61bbad23a0824693f1a8114a1bce23505cb2e1998bbdb72f2e2c9b24cee6a SHA512 d52477959c9747e782b303b681ae7f6c628ac838d4ed3493fe5f69d5dbcd429e0ee331f568747e2996a92a1c03c1670eb953c7378162c8c485e1afdfd901cc47 WHIRLPOOL f0c74f48078d0da04914135c45e5c88b6c6e0518d08c777d62d9c7cdedd005fd3ccd19b14781d1571ff9b78d5fa580b4cd397dc172f44ca12bf8a90c90ca2484 MISC metadata.xml 341 SHA256 796a5a95967784ec0e9295b5745962d2a20dd678fd7425e6bd6414b9b1fbae33 SHA512 0fa9fd10e81ff337e7e7d9a55d492f4cbcee79fd1771497214c39c0c2491759ba0ce7f62a1aade44e2165617da40111d0ba3a3802b679db66f60e66bff70e2ca WHIRLPOOL bd14a2fa77fbf2f7e3e30725ef299809e11696d5779ea80d8252efcd64e79bad7db9c331f8617ce220cfeaa6136e932130db85aeecf35412f99d9957cf3e9f08 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCABmBQJUX2m7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOTZFRkUxOEEyRDM1Qzc2QTY0M0Y2QjQw -RjlDNTkwQjdGRjMyNEY2AAoJEA+cWQt/8yT2llMP/2AsQBPNmiRdTBaUV0WXGbwt -xIW32plX0d4oWQHKg+HYcKRWhd3Eq6RY2IrIh+rLn2qlszBejbAj6FKMj1zMh1QW -+aqWIgUOt8/zI2gqCFjV9qX9MnOwUnbJVjsIIYidNh6Psm5UOq7THJMub6u6uzXO -fnn+PzCR4GBC9AfJC9ea2DWCvHS4TJqZCazhDfjukY0FvHy5QO23oCp2L5z8IfbY -0EKeGx6HynbXEc79QYJmJFxYJHuuVkKQzQup0/ziiN/lX+QUW5t5rTHl651+aNrA -qKSMeq8qZamKUNYgSAGvD32Ze1pOZo/po+bNuAAte1X7M7A42ze8pu0mrHIzJbIs -Eay08m8aEdt9yvASVgPkSXl4iOxvyEEVCTEWTGcyTeLekghm2RVtJf8WnhNUjlMd -S0tnJFWhZJskKIQwTLLG/wtuIVRKfe9cqCyqnngUTp1PevS1EMGgnc1EqskCl4g5 -uKBwpw6HH7kW+cxF7fQQH+p781473ydTxZOhQtmIgmGbKEc9Djk6JraSYBZF6VyX -0KcO9UoEu0rCqfjAkdFyGYw17fin/JcF5ytFTRwS5BHNUfOUsoYZLo7Bw2oaHoMN -lkHYtbJ3FRWOJ/eFrktNcbKfEF7yHQvpmLc8QbiVKwdLlOLdG5wxg7uekFvN1cC3 -PHYKDJ2WlLbA/LJkVjOY -=87gg +iQJ8BAEBCgBmBQJUcdUgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC +OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirERwP/RBZcOuGmHoo5JFHRp1BPrjb +qrd3wkLWTVACCDlz+6JqUCt521pcs19tMaD0SUNOwPqCsHztehv8dqOlSx5IpTT3 +ogo0YkecyRv9iJO2Yi4JUllDHqkHyJbmbdEsp02VGcWSZ5Cijkf+gx0p6fokKM76 +u7wtZ7qEx+cuNEJo/4OGMUL8ubSPP4EtDlf3th2TAdZzEkMWmEuSMVpOxTm+ycbw +lvMNVyZVuQL46hpzgCF06sgg/AWiWbW/QJLKGDo+YEnesJQMsmnk8VzPekcmoWn8 +/2SraHGqDE5Pp+uNPDnBTEI1TkPm9avP5jrQMEWChuoq0w17/RZnDkBqb4LQjqNV +XlKCOuSpwZbF+rJtRhIM/6i9Vw+KG48vRpyXTE7jJmvHF1jpRJzyWsD3ajz0/kbC +Hxoox2dWVFrrGMbXs8cKPoRs7V24auijdLuRVcTSnWL+mVJQOgAAZwKT70gdVloG +fCodhcgRMXtvCfAV1DRWuSf6LVNU1OP+8Z5V9n8nXSvmgVavStnz/ufo+m04dUVJ +tFtJhqhgDA0kOd1QVpRrUo8k4k5mR+clsxADHmaNMKPV3u8qB4TcOxWLO6E+wfnC +Fjwo3BwhsUS2u2muTGl49McRJbP7SCuiXFPhMM627m3LG2gp859RHicgFPQwMqfm +vvXHXRJaPe9jetkBh1WV +=Vu9g -----END PGP SIGNATURE----- diff --git a/app-text/calibre/calibre-1.48-r1.ebuild b/app-text/calibre/calibre-1.48-r1.ebuild new file mode 100644 index 000000000000..edda3a5edcd4 --- /dev/null +++ b/app-text/calibre/calibre-1.48-r1.ebuild @@ -0,0 +1,248 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-1.48-r1.ebuild,v 1.1 2014/11/23 12:37:49 jlec Exp $ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="sqlite,ssl" + +inherit bash-completion-r1 distutils-r1 eutils fdo-mime multilib toolchain-funcs + +DESCRIPTION="Ebook management application" +HOMEPAGE="http://calibre-ebook.com/" +[[ ${PV} == ${PV%.*}.${PV#*.} ]] && MY_PV=${PV}.0 || MY_PV=${PV} +SRC_URI="http://sourceforge.net/projects/calibre/files/${MY_PV}/${PN}-${MY_PV}.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 + unRAR +" + +KEYWORDS="~amd64 ~arm ~x86" +SLOT="0" +IUSE="+udisks" + +COMMON_DEPEND=" + >=app-text/podofo-0.8.2:= + >=app-text/poppler-0.20.2:=[qt4,xpdf-headers(+)] + >=dev-libs/chmlib-0.40:= + >=dev-libs/icu-4.4:= + >=dev-python/apsw-3.7.17[${PYTHON_USEDEP}] + >=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}] + >=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}] + >=dev-python/cssutils-0.9.9[${PYTHON_USEDEP}] + >=dev-python/dbus-python-0.82.2[${PYTHON_USEDEP}] + >=dev-python/dnspython-1.6.0[${PYTHON_USEDEP}] + >=dev-python/lxml-3.2.1[${PYTHON_USEDEP}] + >=dev-python/mechanize-0.1.11[${PYTHON_USEDEP}] + >=dev-python/python-dateutil-1.4.1[${PYTHON_USEDEP}] + =media-gfx/imagemagick-6.5.9[jpeg,png] + >=media-libs/freetype-2:= + >=media-libs/libwmf-0.2.8 + >=media-libs/libmtp-1.1.5:= + virtual/libusb:1= + virtual/python-imaging[${PYTHON_USEDEP}] + >=x11-misc/xdg-utils-1.0.2-r2" + +RDEPEND="${COMMON_DEPEND} + udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )" + +DEPEND="${COMMON_DEPEND} + >=dev-python/setuptools-0.6_rc5[${PYTHON_USEDEP}] + >=virtual/podofo-build-0.8.2" + +S="${WORKDIR}"/${PN} + +PATCHES=( + # 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 + # C locale: if LC_ALL=C do not raise an exception when locale cannot be canonicalized + "${FILESDIR}"/${PN}-1.34-no_updates_dialog.patch + "${FILESDIR}"/${PN}-disable_plugins.patch + ) + +export_xdg_dirs() { + # 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" +} + +python_prepare_all() { + # 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|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(qmc + \\[.*\\.pro'\\])$/a\ +\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \ +'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \ +'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \ +'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \ +'-i', 'Makefile'])" \ + -i setup/extensions.py || die "sed failed to patch extensions.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" + + # override install path for bash-completions + local mybcd="${D}/$(get_bashcompdir)" + sed -e "s#^def \(get_bash_completion_path.*\)\$#def \1\n return os.path.join('${mybcd}','calibre')\n\ndef old_\1#" \ + -i "${S}"/src/calibre/linux.py || die "Could not fix bash-completions install path" + + tc-export CC CXX + + distutils-r1_python_prepare_all +} + +python_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} + exit 0 + EOF + + cp "${T}"/{kbuildsycoca,update-mime-database} || die + chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die + + # 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 + + export_xdg_dirs + mkdir -p "${XDG_CONFIG_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die + + # 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 + + dodir $(python_get_sitedir) # for init_calibre.py + PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \ + esetup.py install \ + --root="${D}" \ + --prefix="${EPREFIX}/usr" \ + --libdir="${EPREFIX}/usr/${libdir}" \ + --staging-root="${ED}usr" \ + --staging-libdir="${ED}usr/${libdir}" +} + +python_install_all() { + export_xdg_dirs + + python_replicate_script "${ED}"/usr/bin/* + + grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i || + die "failed to fix harcoded \$D in paths" + + # 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 || die + 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 + + find "${ED}"usr/share -type d -empty -delete || die + + cd "${ED}"/usr/share/calibre/fonts/liberation || die + local x + for x in * ; do + [[ -f ${EROOT}usr/share/fonts/liberation-fonts/${x} ]] || continue + ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die + done + + einfo "Compiling python modules" + python_foreach_impl python_optimize "${ED}"usr/$(get_libdir)/${PN} + + newinitd "${FILESDIR}"/calibre-server.init calibre-server + newconfd "${FILESDIR}"/calibre-server.conf calibre-server + + bashcomp_alias calibre \ + lrf2lrs \ + ebook-meta \ + ebook-polish \ + lrfviewer \ + ebook-viewer \ + ebook-edit \ + fetch-ebook-metadata \ + calibre-smtp \ + calibre-server \ + calibre-debug \ + ebook-device \ + ebook-convert + +} + +pkg_postinst() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update +} + +pkg_postrm() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update +} -- 2.26.2