commit:     8fe384bcef80e8f0e51afb352bdc6ddd6d8fcb1b
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 10 13:09:42 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Nov 10 13:50:18 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fe384bc

app-text/calibre: Drop old

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 app-text/calibre/Manifest                          |   6 -
 app-text/calibre/calibre-1.47.ebuild               | 223 ------------------
 app-text/calibre/calibre-1.48-r1.ebuild            | 248 ---------------------
 app-text/calibre/calibre-2.27.0.ebuild             | 229 -------------------
 app-text/calibre/calibre-2.31.0.ebuild             | 229 -------------------
 app-text/calibre/calibre-2.33.0.ebuild             | 228 -------------------
 app-text/calibre/calibre-2.34.0.ebuild             | 228 -------------------
 app-text/calibre/calibre-2.35.0-r1.ebuild          | 228 -------------------
 app-text/calibre/calibre-2.35.0.ebuild             | 231 -------------------
 .../files/calibre-1.34-no_updates_dialog.patch     |  37 ---
 10 files changed, 1887 deletions(-)

diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index aaa5862..9d612e9 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,8 +1,2 @@
 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.27.0.tar.xz 36776876 SHA256 
6567d58a9878f4ad30756c5ce984fe555393fd94167cb23e279c2a83450e2d8e SHA512 
0a87549e40f6a3da5489e29fd6969a16ca1e2d8e52ee4d1520ec146b973c3bf4aac73b182b6bb8a0d520137ebe71804543d65ca313ae1560064258c7fa9ff5fa
 WHIRLPOOL 
11f5157c6e1121b68f50f0a923956e6130233aa04790a61ead3dd36ef601cceb15f6d58e5434e0d94cddbbcdc0f9ea84bfb0fa3839752795d8b6271d39679c90
-DIST calibre-2.31.0.tar.xz 37521892 SHA256 
7f7e181d3247e41a1122d572a1980fc4ab1926a393aaafe3e26f5345c4602490 SHA512 
099450acb2df68800b810ce19d6c8f650b3484d37ebbf30d74f5b26b3724db326d4c4c0d6cc960bd685adfe24e08bc380449b3ee0957275aad76e95fdf60a910
 WHIRLPOOL 
0673f3caf8c7fd2252d40d2c2a9b5cf886c03afe9a725317031570aaf7f0a8177cb698a34882ba0344de40cdd30826a93f8504d1ef82da88329fee83708b2033
-DIST calibre-2.33.0.tar.xz 37269672 SHA256 
0917248454d120f0a3c6c1aec90ad88818ccc1b7747935acce263a272b8b3548 SHA512 
1bc63baecd1c1cd3c239b89c102696d39bd7975860bfc3d9fd6cd4bfdbe1e3b81ed6ec40ff3999568d9b0be3fa46efe0490d1c86edf52d67a84fdc7a890e9525
 WHIRLPOOL 
f59ce44f513730675d59fdf42bce4d7c142c39fcd3e148215686604bbf5c9ac18af1dde7f923c25b68edaec6fa3cccce1f4d5066ea7e1c0361491e94e1d6cd93
-DIST calibre-2.34.0.tar.xz 38329660 SHA256 
714687deadef951238dc9e7e8f5d67fbb3293522e694aeee3537cbf3a5887012 SHA512 
62fbaea1f36a650600cb137acf31c112b374f29dbfc2304365a55971341882eab99f219b3533f4d159957a06d03232cc670868127008ffefd0d40257f636c027
 WHIRLPOOL 
6bcb92c6616efa3732f5c41b37f9348caba4ae1acef1e0d80cc3b1ceb00f79b68f6fb2fa8dde254020cc28070e3e03828afccd1eead6a785b5717974f5790821
 DIST calibre-2.35.0.tar.xz 37470944 SHA256 
7d883c7ed5cf7c3c2e53c4d18e3a67c15d8a0d3425df57919adb57132860518f SHA512 
a693c23e93ad1086fe70b0cc7dcf43b1a9c004f045a3c2fac42f6a4b9f231d4f1e7b55c8bae133ac48389d4e233e245deb958365e9c0283cd8668f0f5a2326a2
 WHIRLPOOL 
b07308d7bb9803a3a882aaf4143d287352aafae69383276d6ee95f7b92a8f65c50c8a5cdc6c242ae87d8faf13ad830fcea9e27364749614219bb221a3d6ac36a

diff --git a/app-text/calibre/calibre-1.47.ebuild 
b/app-text/calibre/calibre-1.47.ebuild
deleted file mode 100644
index f1296bd..0000000
--- a/app-text/calibre/calibre-1.47.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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"
-
-COMMON_DEPEND="
-       >=app-text/podofo-0.8.2:=
-       >=app-text/poppler-0.20.2:=[qt4,xpdf-headers(+)]
-       >=dev-lang/python-2.7.1:2.7[sqlite,ssl]
-       >=dev-libs/chmlib-0.40:=
-       >=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: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/PyQt4-4.9.6[X,svg,webkit,python_targets_python2_7(-)]
-       dev-qt/qtdbus:4=
-       dev-qt/qtsvg:4=
-       media-fonts/liberation-fonts
-       >=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=
-       dev-python/pillow[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"
-
-S=${WORKDIR}/${PN}
-
-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"
-
-       # 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
-       epatch \
-               "${FILESDIR}/${PN}-1.34-no_updates_dialog.patch" \
-               "${FILESDIR}/${PN}-disable_plugins.patch"
-
-       # 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"
-}
-
-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}
-       exit 0
-       EOF
-
-       cp "${T}"/{kbuildsycoca,update-mime-database}
-       chmod +x "${T}"/{kbuildsycoca,update-mime-database}
-
-       # 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_CONFIG_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"
-
-#      dobashcomp "${ED}"usr/share/bash-completion/completions/calibre
-#      rm -r "${ED}"usr/share/bash-completion
-       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-1.48-r1.ebuild 
b/app-text/calibre/calibre-1.48-r1.ebuild
deleted file mode 100644
index 9166fb2..0000000
--- a/app-text/calibre/calibre-1.48-r1.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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: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}]
-       <dev-python/PyQt4-4.11.3[X,svg,webkit,${PYTHON_USEDEP}]
-       dev-python/netifaces[${PYTHON_USEDEP}]
-       dev-qt/qtdbus:4=
-       dev-qt/qtsvg:4=
-       media-fonts/liberation-fonts
-       >=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=
-       dev-python/pillow[${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
-}

diff --git a/app-text/calibre/calibre-2.27.0.ebuild 
b/app-text/calibre/calibre-2.27.0.ebuild
deleted file mode 100644
index 83f81ca..0000000
--- a/app-text/calibre/calibre-2.27.0.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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"
-
-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/glib:2
-       >=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/dnspython-1.6.0: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-1.2.0[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/psutil[python_targets_python2_7(-)]
-       >=dev-python/pygments-2.0.1[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(-)]
-       dev-qt/qtcore:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
-       media-fonts/liberation-fonts
-       >=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=
-       dev-python/pillow[python_targets_python2_7(-)]
-       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"
-
-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.31.0.ebuild 
b/app-text/calibre/calibre-2.31.0.ebuild
deleted file mode 100644
index 83f81ca..0000000
--- a/app-text/calibre/calibre-2.31.0.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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"
-
-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/glib:2
-       >=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/dnspython-1.6.0: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-1.2.0[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/psutil[python_targets_python2_7(-)]
-       >=dev-python/pygments-2.0.1[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(-)]
-       dev-qt/qtcore:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
-       media-fonts/liberation-fonts
-       >=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=
-       dev-python/pillow[python_targets_python2_7(-)]
-       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"
-
-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.33.0.ebuild 
b/app-text/calibre/calibre-2.33.0.ebuild
deleted file mode 100644
index 0e337a7..0000000
--- a/app-text/calibre/calibre-2.33.0.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="http://calibre-ebook.com/";
-SRC_URI="http://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
-       unRAR
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="+udisks"
-
-COMMON_DEPEND="
-       >=app-text/podofo-0.8.2:=
-       >=app-text/poppler-0.26.5[qt5]
-       >=dev-lang/python-2.7.9:2.7[sqlite,ssl]
-       >=dev-libs/chmlib-0.40:=
-       dev-libs/glib:2
-       >=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/dnspython-1.6.0: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-1.2.0[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/psutil[python_targets_python2_7(-)]
-       >=dev-python/pygments-2.0.1[python_targets_python2_7(-)]
-       >=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)]
-       
>=dev-python/PyQt5-5.3.1[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)]
-       dev-qt/qtcore:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
-       media-fonts/liberation-fonts
-       >=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=
-       dev-python/pillow[python_targets_python2_7(-)]
-       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"
-
-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.34.0.ebuild 
b/app-text/calibre/calibre-2.34.0.ebuild
deleted file mode 100644
index 0e337a7..0000000
--- a/app-text/calibre/calibre-2.34.0.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="http://calibre-ebook.com/";
-SRC_URI="http://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
-       unRAR
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="+udisks"
-
-COMMON_DEPEND="
-       >=app-text/podofo-0.8.2:=
-       >=app-text/poppler-0.26.5[qt5]
-       >=dev-lang/python-2.7.9:2.7[sqlite,ssl]
-       >=dev-libs/chmlib-0.40:=
-       dev-libs/glib:2
-       >=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/dnspython-1.6.0: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-1.2.0[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/psutil[python_targets_python2_7(-)]
-       >=dev-python/pygments-2.0.1[python_targets_python2_7(-)]
-       >=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)]
-       
>=dev-python/PyQt5-5.3.1[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)]
-       dev-qt/qtcore:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
-       media-fonts/liberation-fonts
-       >=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=
-       dev-python/pillow[python_targets_python2_7(-)]
-       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"
-
-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.35.0-r1.ebuild 
b/app-text/calibre/calibre-2.35.0-r1.ebuild
deleted file mode 100644
index 0c31d15..0000000
--- a/app-text/calibre/calibre-2.35.0-r1.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="http://calibre-ebook.com/";
-SRC_URI="http://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
-       unRAR
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="+udisks"
-
-COMMON_DEPEND="
-       >=app-text/podofo-0.8.2:=
-       >=app-text/poppler-0.26.5[qt5]
-       >=dev-lang/python-2.7.9:2.7[sqlite,ssl]
-       >=dev-libs/chmlib-0.40:=
-       dev-libs/glib:2
-       >=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(-)]
-       virtual/python-dnspython[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-1.2.0[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/psutil[python_targets_python2_7(-)]
-       >=dev-python/pygments-2.0.1[python_targets_python2_7(-)]
-       >=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)]
-       
>=dev-python/PyQt5-5.3.1[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)]
-       dev-qt/qtcore:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
-       media-fonts/liberation-fonts
-       >=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=
-       dev-python/pillow[python_targets_python2_7(-)]
-       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"
-
-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.35.0.ebuild 
b/app-text/calibre/calibre-2.35.0.ebuild
deleted file mode 100644
index 04d305e..0000000
--- a/app-text/calibre/calibre-2.35.0.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="http://calibre-ebook.com/";
-SRC_URI="http://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
-       unRAR
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="+udisks"
-
-COMMON_DEPEND="
-       >=app-text/podofo-0.8.2:=
-       >=app-text/poppler-0.26.5[qt5]
-       >=dev-lang/python-2.7.9:2.7[sqlite,ssl]
-       >=dev-libs/chmlib-0.40:=
-       dev-libs/glib:2
-       >=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/dnspython-1.6.0:0[python_targets_python2_7(-)]
-               virtual/python-dnspython[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-1.2.0[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/psutil[python_targets_python2_7(-)]
-       >=dev-python/pygments-2.0.1[python_targets_python2_7(-)]
-       >=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)]
-       
>=dev-python/PyQt5-5.3.1[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)]
-       dev-qt/qtcore:5
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
-       media-fonts/liberation-fonts
-       >=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=
-       dev-python/pillow[python_targets_python2_7(-)]
-       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"
-
-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/files/calibre-1.34-no_updates_dialog.patch 
b/app-text/calibre/files/calibre-1.34-no_updates_dialog.patch
deleted file mode 100644
index dd6b394..0000000
--- a/app-text/calibre/files/calibre-1.34-no_updates_dialog.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/src/calibre/gui2/main.py 2014-01-17 11:49:16.000000000 +0800
-+++ b/src/calibre/gui2/main.py 2014-01-18 18:28:53.322911344 +0800
-@@ -37,8 +37,9 @@
-                       help=_('Start minimized to system tray.'))
-     parser.add_option('-v', '--verbose', default=0, action='count',
-                       help=_('Ignored, do not use. Present only for legacy 
reasons'))
--    parser.add_option('--no-update-check', default=False, action='store_true',
--            help=_('Do not check for updates'))
-+    parser.add_option('--update-check', dest='no_update_check', default=True,
-+            action='store_false',
-+            help=_('Check for updates'))
-     parser.add_option('--ignore-plugins', default=False, action='store_true',
-             help=_('Ignore custom plugins, useful if you installed a plugin'
-                 ' that is preventing calibre from starting'))
---- a/src/calibre/gui2/update.py       2014-04-24 22:02:21.000000000 -0400
-+++ b/src/calibre/gui2/update.py       2014-05-01 12:02:27.631316967 -0400
-@@ -139,6 +139,8 @@
-             self.update_checker.update_found.connect(self.update_found,
-                     type=Qt.QueuedConnection)
-             self.update_checker.start()
-+        else:
-+            self.update_checker = None
- 
-     def recalc_update_label(self, number_of_plugin_updates):
-         self.update_found('%s%s%d'%(self.last_newest_calibre_version, VSEP,
---- a/src/calibre/gui2/ui.py   2014-04-24 22:02:21.000000000 -0400
-+++ b/src/calibre/gui2/ui.py   2014-05-01 11:53:58.371307671 -0400
-@@ -858,7 +858,8 @@
-         if write_settings:
-             self.write_settings()
-         self.check_messages_timer.stop()
--        self.update_checker.terminate()
-+        if self.update_checker is not None:
-+            self.update_checker.terminate()
-         self.listener.close()
-         self.job_manager.server.close()
-         self.job_manager.threaded_server.close()

Reply via email to