From 0319295d762cf175e6a8b922bb284e99a54b6409 Mon Sep 17 00:00:00 2001 From: Ben de Groot Date: Sat, 14 Mar 2015 17:50:51 +0000 Subject: [PATCH] version bump; remove old Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x4FDF9CFD2FAC514E! --- app-text/calibre/ChangeLog | 8 +- app-text/calibre/Manifest | 36 ++- app-text/calibre/calibre-2.19.0.ebuild | 233 ------------------ ...re-2.18.0.ebuild => calibre-2.21.0.ebuild} | 42 ++-- 4 files changed, 42 insertions(+), 277 deletions(-) delete mode 100644 app-text/calibre/calibre-2.19.0.ebuild rename app-text/calibre/{calibre-2.18.0.ebuild => calibre-2.21.0.ebuild} (95%) diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog index 47553279cf4f..9229e07d11c5 100644 --- a/app-text/calibre/ChangeLog +++ b/app-text/calibre/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-text/calibre # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.343 2015/03/08 03:31:46 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.344 2015/03/14 17:50:42 yngwin Exp $ + +*calibre-2.21.0 (14 Mar 2015) + + 14 Mar 2015; Ben de Groot +calibre-2.21.0.ebuild, + -calibre-2.18.0.ebuild, -calibre-2.19.0.ebuild: + version bump; remove old *calibre-2.20.0 (08 Mar 2015) diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest index 5f5ee942110f..9842aec1a7a1 100644 --- a/app-text/calibre/Manifest +++ b/app-text/calibre/Manifest @@ -11,33 +11,31 @@ AUX calibre-server.init 1928 SHA256 d5632da5955d1304a0b750850b8933eb053ee3462d0a DIST calibre-1.20.0.tar.xz 32430560 SHA256 475e09b1be4b9977240cbbe6743ab79da4b1f1afe3fe6015d212d868e8f2fac4 SHA512 84ac25080cf4948398b79f9a1af688cca9cf9a5a9200b2aad649f5fda1cd0556be4ade0c8b09ea6ffcc95654eac0aaaa5b8f8ed6ea9830174bc150e64de85e31 WHIRLPOOL 61b6ecde2e3f8679c1afea95dcd152a94ce03522c06dff34b406a5705f6255243f0565fbb5f9bef3ac96d7127190bd1b4363233fa24fafcd0412e061201f6fe8 DIST calibre-1.47.0.tar.xz 36581960 SHA256 efeb71a5bb4742a9c0a99038fdd97baa55c35e8ba5312e19e422c004bbf5b8c2 SHA512 c6131422891bed0615644336ad1dfc52803ff28d7d33994bea4a34f70655d12ab6b638432156665132805a900324742c41f8d5b7963f24eee4b68359fc433ece WHIRLPOOL dac2b04e195206d7956d7bdb5f45b37cd1e7a873db542d26bd0802d886fb9111aba1e603a795d03a2bf3b55d8cdb92671e11dfdc9fdcdc0707e280a380548f0b DIST calibre-1.48.0.tar.xz 35126680 SHA256 e704090f6611c5e374252c3f1b58e077ccd3170a3ea39893e5bf687287abf472 SHA512 0b70f16b10e6c9bbc24955baf74e8fc8e116aaaa1d75d018f5135f657606286de3bfffbebf3b367b2be52708deb05a162de919bba930dcbff59c4ec15c13b28d WHIRLPOOL 1a07a8c916119e92bdf41276db1aef572b704271808bcd6c3a0a4e823c8a76bd2f4267765dee2f378430beec401288b25b35dee6859980adf5b7a9ebe885eff9 -DIST calibre-2.18.0.tar.xz 36196564 SHA256 bd470b1dc3e286912866e83f2fa23646594065102896f8efb6705502a39bc716 SHA512 bad35d108e5a46c56e901c006e07f4897eab82a02ff1cc064763bcee913cac278ba31454a0ea0a047f214810fda52f9a1dc0357849864f3071994f63ca9e44d9 WHIRLPOOL 5f56cc8337e6d0a8d300eb134beaa88884831b96824cceca138057099aac3e576a6c0f5d67fea5e6f58c54d4154d984a05789ba5efc551d0a992142f004bc3a5 -DIST calibre-2.19.0.tar.xz 36149428 SHA256 76318803979456e9dbac5903436ea8a1a47355a22d69f6a44c292e0a510c92a9 SHA512 8535e4fc27b9196a3f72134d73fb0496ee0c95cb0615f4e1c4abf392022498aabfa7abb3cfa24262e03f77710754a2eea53e5a4d906d76ac815bab72567b975e WHIRLPOOL 5593a9f200ea16a140ad6306253dd80521d2f030437bd9b803794050b5f686cefae1a8989747d9741ffb462d424b2a9b94c35c3562efc1a523856b87d232a1f4 DIST calibre-2.20.0.tar.xz 36187720 SHA256 6d529240eb317c34aa82ca85779c9685453e1bb7192652d8d097fcbe8933448c SHA512 3df3f7ba92d81c6ef47efbdb2ab995db0d3f19cee9857836a603c96f7a145657e16e5ed0b5cc5a59a449e1fa2e76d203e70ad2587871ecb38f06ecf75a309350 WHIRLPOOL 3236a89098d4e171f27b7a42e694c9fa3ca628077fbc495b1a911984a1d7670eb43740fa957578e5c145c19416ce0441849ce0c773ed0abd607d7ff54ad710fa +DIST calibre-2.21.0.tar.xz 36415844 SHA256 eb15469ece3f8ac3005f6a0ec1a6ad68b58f185c5e493334ebba2edea578b1a9 SHA512 e6ebd09c8a1d981598e2d7df994682cb8adc1d0f78be1cee4afe750e72e58834ef69d4d95cd2edcd163b12771468ee44c161c66287d17130e8a6451063ca4b6d WHIRLPOOL 1e5da868d73566a0f9779a51655a045b4c1a1ab96b132a735e5e2410ebce826ed9bb72df2b04a6273a25853997836c8a3416da41cea70de8908bbd88a950020c EBUILD calibre-1.20.ebuild 6864 SHA256 f72bad654047edc0d438edbef206230658563b4b4aede88779d34470f40d37ba SHA512 7448c04c3d4ab79da6a25f103ec13f980dae3b65bddd81c71a5d2a369816282e506f89c77b4fccf218f0dad3af4393fa928b90be4eb03c3abc57be4c07e3a98a WHIRLPOOL d9626f4350c65a84974acc361ff3194674c1a8e21d88e3fb7c3e59462dc93e6a73d0fcfb5d77e72952a0ea1e10f7bcaf74e01c7c0de3eabe494d06c690f2801d EBUILD calibre-1.47.ebuild 7928 SHA256 ade95436b733ff6f03bca9389d3c42b45c5786ee62dcf8d3360e0c39adf1fb44 SHA512 13f53ba909b309368b413d16f125e44cb2a9ac0e927b19ba6e898b24f77768a4f862e442846ab4570410a4cc01b4e6a308aa85905b3bfe1ce2eb8d814a38344c WHIRLPOOL 74c4ee4e9cad8936ecd39e8fb3fcbba46c19dc59ab3629165682c51f5eea833885226a798e3949decbd308d5e63a5c937902b2c79215e72592c2ca9f411609cb EBUILD calibre-1.48-r1.ebuild 7828 SHA256 096ce258db2208a54df84876cecd2ae2a88ac17097c6430651b171506228b43c SHA512 0808b869979f3ad50c67bcc8e6e9626a343fcde1f9804036bb104c6697a0fb1046434ce72ffcd491cebfb0eedc1da3b28890cdc6530a94a25266feaab6c1d24a WHIRLPOOL 53fa6241fb283369bff2e7d532e9b2f3f36488139490263ac68b2af5cc67cd3c98caec73c4acc9eba2e818bc7b3e13d2e40faa3537ce8b0978691c61ec5f30a2 -EBUILD calibre-2.18.0.ebuild 8177 SHA256 d08ce902728036eda71a887ee2abdffb4a805bfcf08dccdf7cd0938f840e19ca SHA512 f1e5902f36d45bc527496317192b420f9a0b5bbc12e79a58d4de7441761ed031a16f9c9d2524458d0cf8efb9f05ec51269c58e4ac6ce612caab94b695fe13108 WHIRLPOOL 05fe1ab8f9dd29f85723c05aa29d0001564ef92c8489fc47ea7c02fc67a0e68ddb5927ad2c8b2894587e2d75a63ba2b7d06b944769957d34177e68c6b084de59 -EBUILD calibre-2.19.0.ebuild 8177 SHA256 101724baf97e0b679b7e69b3c5f8b888298b0604d2fa6668ff64befcbfc9f328 SHA512 44bcaf92f4d67a6f648d753d33973f84b1caa35cee8974f6c8ea1c1654768d89d94088516ba7eccdfbe9d0d2a46d24141f58b78d6681c14a3587559468985d61 WHIRLPOOL bb8fde8d314a95f79801762282416397c4165999459b8aa5054f81d01845525e4ebff6c8b6cbbf277993bf6c9ce96f9b0b197356c973875882d5e47271c4efe6 EBUILD calibre-2.20.0.ebuild 7999 SHA256 720773b50106319939441991f3ad1c70bf5486e3f56006bbedd17450e5499a96 SHA512 f2a2f7b3aaf4634fef9c306457315266647a48ed9691d33d2b4a325549fb29f3d542a4e02f90a6fc570688bb6b5c93c4fefdcb2290a0891cc46977b6896429a8 WHIRLPOOL 991f8142829804f00f4ed6d1954450b826de5e2e2c5fc3bca5e4e6542edacdca3ccd7228b2b5b299110f830478b20280bb6a6fb287c98af8815942915a79dea8 -MISC ChangeLog 54963 SHA256 588ed7af0388783795409de84b1d800a7cdda024e5d0f107fd24e7144ab1ea1e SHA512 733ad48452b398ab98f7a244c0ce80cd47751523ee5ed08781d3ab6e2083263ca3d9a64580666f2d65da6fbe6e4d7d30dac3aac554bd4cb56a03ff1d8d25ed84 WHIRLPOOL 1d28b72af24be0230ace31e4d649d536ff39a8fb3ce7226a67246ac4072d91810fcdad38ca1d3e77e2990fd926c19c3251afd18eec44679918dacc6b0b5d764d +EBUILD calibre-2.21.0.ebuild 7999 SHA256 3a22096f1de3c6144c48b9c445e9558f04d98f2b794007e61d47339b45df3f70 SHA512 4aaf25cf65f8333b403bc515659f0ad5f145060245545b3452d60281b330c9dd73fbb7162073b41b97c10e8726b4c0f02dde82ba486fdcd6fb0d7f5529ccb209 WHIRLPOOL e4fd6a8d8fb64faf9df9401854e56ef126546dd887a382970653e28811b39f7641ab16dead7cc3d8aa75af6e15596948ec3c1f684c59be45b63b2749da15d6c3 +MISC ChangeLog 55144 SHA256 bae08251bf4ae3bd92edc2d0359167a4062a4914662ff62d6e70975c1544c705 SHA512 e0a79439037ba67e578c7b7773ce58e24df8a4c680a47bb3510ef96edcf874923fe657589f4008117bf53e6f84db1241e5c02e914247cfbe18a687b009e1e9a8 WHIRLPOOL b6ac12853a4c9077de9a209108b04555d3386227535179ce6608870a46f8bc9ef6fa8ee55a8b6afb914f25d40b3da59dcecf42f7834dc2c9541748eff5abe473 MISC metadata.xml 341 SHA256 796a5a95967784ec0e9295b5745962d2a20dd678fd7425e6bd6414b9b1fbae33 SHA512 0fa9fd10e81ff337e7e7d9a55d492f4cbcee79fd1771497214c39c0c2491759ba0ce7f62a1aade44e2165617da40111d0ba3a3802b679db66f60e66bff70e2ca WHIRLPOOL bd14a2fa77fbf2f7e3e30725ef299809e11696d5779ea80d8252efcd64e79bad7db9c331f8617ce220cfeaa6136e932130db85aeecf35412f99d9957cf3e9f08 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCABmBQJU+8KoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJVBHT5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0 -RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOqLUP/RVPhXaMe9nSxGLZh7Yiq8re -+0WHWWZicecHY0MVXodeUpc/lm+tjtUlNd/c4SVuKYs0uyx9ERHIeR9+C2+Zef6C -Zi8N2/Cr2cULXcvhspKkhmTDonVJqe+bNYOYSxoHwrU0zUIevdf82GWAAxNXyjLA -z0GfOckuu4+gD0K6JAlPWt+emm6LqQA0rb82J25E75HaQFW6M5gvgz45KjB/SRmA -yS2aQsVPLKdpUja/QCGClFUkFB9fDAKPRouSg0csthmNPHUvjfdfM8pJfcRd2H+U -E5TYCyoCchnM+Vg7yxwfnMinBkYktMpcAtaHd/0Y8U2zSlI6JKeBrj0FPov1aTIX -xxXYLtYtvDVjva3a8NLCSxYx8vBD5GVv82FSB8VtvLPoBRbH/zZkj8WD+ED8eLGn -cfsPi8cUQSoZaqsX7ZXMAyuPBU7N/AEr9TZzHo7D3k7YfModgZFgW6Z67dXGNJvs -5qVfGPAChbE2tf5Vc+r+V5TSlfYbLnjqDp4P8wqaRGBPkrvingX0ZH2YByMqLXKi -JBoqhGENExBlMkNm6bERZzdQoFs8ZNpPv4Omr3nUu71VEWYk5h7L/DD44TJBzSpl -4s45sthr4Zm68Vc9+YhrrmqCp902SfiT4JbOxGYLXtOBg7AJoUsz5tjJh8ycnTFP -neD54AUceOvP0eSWieyG -=O+F0 +RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOwFUP/jXlGsIw0LeTKJ1hL2zwvUQy +iZccjROOUQdACCasbn3PV0lrLHIdlo/dVm4mBCScNdr7QdhArQ4bJbz0fy+BK6pP +F1c5pTy3m7CrvROkKnSBd3fXhN2RRTOnW+bLugPS5uDPQhI43m6UeyRvAR/uLHJA +pS8jscNfFNRwGwnGmB89rWOzsiLpoHP1nPfgnEbU0guhTagATEz37h9L0L47+rOu +PHlKO1EwamLbVO2amQE2jBkTiY4rkzNWQ6+k9HSaLNiB5t8GqXZ2jPa6kYtsM5Jl +BQ45Bz2Z1e2ydal3x2Y6KRNgfb+dmAE+zP3S0/ZWLAn+ng8AJ1TcgxCh/1IX3pZW +QqqbG0UO49HjlPuD+5+eDUAPDkzWm6v48cOHtU0IExajwG26djrzLN577/GkTlzg +dhLqbV8Yf81FPA2m+1FKUFbB8OH40A0r8BKPQeJmJKoQbzG028LhMdKIQ1BjLQAf +GUL74uzEhmzNtXGmnd7FDCW+w2YfxdtpMty3BiqibrmwpgPlZUBhnrNSCO+5m++n +Sq3rzhr0PVF1ySuGv95rl1/1JFWwOcA/yfkj0EInYWL2gez4/erseVzZU8+1/paI +rxZgZvGXri+RhpoLilTDPpVzfIpiiY59dPGCyKu2jJPL3IFDMOnIZS4bqlEUwrht +92FP/lV1MHnrKw2b4k/+ +=3vYG -----END PGP SIGNATURE----- diff --git a/app-text/calibre/calibre-2.19.0.ebuild b/app-text/calibre/calibre-2.19.0.ebuild deleted file mode 100644 index 8a39e903831b..000000000000 --- a/app-text/calibre/calibre-2.19.0.ebuild +++ /dev/null @@ -1,233 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-2.19.0.ebuild,v 1.2 2015/02/12 07:26:43 yngwin Exp $ - -EAPI=5 - -inherit eutils fdo-mime bash-completion-r1 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" - -# Note, dropped dep on >=app-text/poppler-0.20.2:=[qt4,xpdf-headers(+)] as #1, its qt5 now, and -# 2, because repoman blew up when it was there, and my installed copy doesnt seem to link to it. - -COMMON_DEPEND=" - >=app-text/podofo-0.8.2:= - >=dev-lang/python-2.7.1:2.7[sqlite,ssl] - >=dev-libs/chmlib-0.40:= - >=dev-libs/icu-4.4:= - dev-libs/glib:2 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - >=media-gfx/imagemagick-6.5.9[jpeg,png] - media-libs/fontconfig - >=media-libs/freetype-2:= - >=media-libs/libmtp-1.1.5:= - sys-libs/zlib - udisks? ( virtual/libudev ) - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrender - >=dev-python/apsw-3.7.17[python_targets_python2_7(-)] - >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)] - dev-python/netifaces[python_targets_python2_7(-)] - >=dev-python/dnspython-1.6.0[python_targets_python2_7(-)] - >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)] - >=dev-python/cssutils-0.9.9[python_targets_python2_7(-)] - >=dev-python/dbus-python-0.82.2[python_targets_python2_7(-)] - >=dev-python/lxml-3.2.1[python_targets_python2_7(-)] - >=dev-python/mechanize-0.1.11[python_targets_python2_7(-)] - >=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)] - >=dev-python/PyQt5-5.2.0[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)] - media-fonts/liberation-fonts - >=media-libs/libwmf-0.2.8 - virtual/libusb:1= - virtual/python-imaging[python_targets_python2_7(-)] - >=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 - >=virtual/podofo-build-0.8.2" - -src_prepare() { - # 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" - - # 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' - - # 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 - epatch \ - "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \ - "${FILESDIR}/${PN}-disable_plugins.patch" -} - -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} - chmod +x "${T}"/{kbuildsycoca,update-mime-database} - - 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}" - - 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 - - dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py - PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \ - "${EPREFIX}"/usr/bin/python2.7 setup.py install \ - --root="${D}" \ - --prefix="${EPREFIX}/usr" \ - --libdir="${EPREFIX}/usr/${libdir}" \ - --staging-root="${ED}usr" \ - --staging-libdir="${ED}usr/${libdir}" || die - - 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 - 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 ${EROOT}usr/share/fonts/liberation-fonts/${x} ]] || continue - ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die - done - - einfo "Converting python shebangs" - while read -r -d $'\0' ; do - local shebang=$(head -n1 "$REPLY") - if [[ ${shebang} == "#!"*python* ]] ; then - sed -i -e "1s:.*:#!${EPREFIX}/usr/bin/python2.7:" "$REPLY" || \ - die "sed failed" - fi - done < <(find "${ED}" -type f -print0) - - einfo "Compiling python modules" - "${EPREFIX}"/usr/bin/python2.7 -m compileall -q -f \ - -d "${EPREFIX}"/usr/lib/calibre "${ED}"usr/lib/calibre || die - - newinitd "${FILESDIR}"/calibre-server.init calibre-server - newconfd "${FILESDIR}"/calibre-server.conf calibre-server -} - -pkg_postinst() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update -} diff --git a/app-text/calibre/calibre-2.18.0.ebuild b/app-text/calibre/calibre-2.21.0.ebuild similarity index 95% rename from app-text/calibre/calibre-2.18.0.ebuild rename to app-text/calibre/calibre-2.21.0.ebuild index d799b0190c13..82c59b1985b9 100644 --- a/app-text/calibre/calibre-2.18.0.ebuild +++ b/app-text/calibre/calibre-2.21.0.ebuild @@ -1,9 +1,8 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-2.18.0.ebuild,v 1.3 2015/02/12 07:26:43 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-2.21.0.ebuild,v 1.1 2015/03/14 17:50:42 yngwin Exp $ EAPI=5 - inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs DESCRIPTION="Ebook management application" @@ -31,52 +30,47 @@ LICENSE=" PSF-2 unRAR " - KEYWORDS="~amd64 ~arm ~x86" SLOT="0" IUSE="+udisks" -# Note, dropped dep on >=app-text/poppler-0.20.2:=[qt4,xpdf-headers(+)] as #1, its qt5 now, and -# 2, because repoman blew up when it was there, and my installed copy doesnt seem to link to it. - COMMON_DEPEND=" >=app-text/podofo-0.8.2:= + >=app-text/poppler-0.26.5[qt5] >=dev-lang/python-2.7.1:2.7[sqlite,ssl] >=dev-libs/chmlib-0.40:= - >=dev-libs/icu-4.4:= dev-libs/glib:2 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - >=media-gfx/imagemagick-6.5.9[jpeg,png] - media-libs/fontconfig - >=media-libs/freetype-2:= - >=media-libs/libmtp-1.1.5:= - sys-libs/zlib - udisks? ( virtual/libudev ) - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrender + >=dev-libs/icu-4.4:= >=dev-python/apsw-3.7.17[python_targets_python2_7(-)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)] - dev-python/netifaces[python_targets_python2_7(-)] >=dev-python/dnspython-1.6.0[python_targets_python2_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)] >=dev-python/cssutils-0.9.9[python_targets_python2_7(-)] >=dev-python/dbus-python-0.82.2[python_targets_python2_7(-)] >=dev-python/lxml-3.2.1[python_targets_python2_7(-)] >=dev-python/mechanize-0.1.11[python_targets_python2_7(-)] + dev-python/netifaces[python_targets_python2_7(-)] >=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)] >=dev-python/PyQt5-5.2.0[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)] - media-fonts/liberation-fonts + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + >=media-gfx/imagemagick-6.5.9[jpeg,png] + media-libs/fontconfig + >=media-libs/freetype-2:= + >=media-libs/libmtp-1.1.5:= >=media-libs/libwmf-0.2.8 + sys-libs/zlib virtual/libusb:1= virtual/python-imaging[python_targets_python2_7(-)] - >=x11-misc/xdg-utils-1.0.2-r2" - + virtual/ttf-fonts + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrender + >=x11-misc/xdg-utils-1.0.2-r2 + udisks? ( virtual/libudev )" RDEPEND="${COMMON_DEPEND} udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )" - DEPEND="${COMMON_DEPEND} >=dev-python/setuptools-0.6_rc5 >=virtual/podofo-build-0.8.2" -- 2.26.2