From: Ben de Groot <yngwin@gentoo.org>
Date: Sat, 2 May 2015 14:39:22 +0000 (+0000)
Subject: Version bump. Fix bug #548356. Remove old.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=ed70c2b102ca89e85f11d90bfaa0ec456ce8bd58;p=gentoo.git

Version bump. Fix bug #548356. Remove old.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x4FDF9CFD2FAC514E!
---

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 3acfc10dfd36..e0815ffb1b5a 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.345 2015/04/18 14:25:29 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.346 2015/05/02 14:39:13 yngwin Exp $
+
+*calibre-2.27.0 (02 May 2015)
+
+  02 May 2015; Ben de Groot <yngwin@gentoo.org> +calibre-2.27.0.ebuild,
+  -calibre-2.21.0.ebuild, -calibre-2.25.0.ebuild:
+  Version bump. Fix bug #548356. Remove old.
 
 *calibre-2.25.0 (18 Apr 2015)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index c39ed40cc644..a088bb513be8 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -11,31 +11,29 @@ 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.21.0.tar.xz 36415844 SHA256 eb15469ece3f8ac3005f6a0ec1a6ad68b58f185c5e493334ebba2edea578b1a9 SHA512 e6ebd09c8a1d981598e2d7df994682cb8adc1d0f78be1cee4afe750e72e58834ef69d4d95cd2edcd163b12771468ee44c161c66287d17130e8a6451063ca4b6d WHIRLPOOL 1e5da868d73566a0f9779a51655a045b4c1a1ab96b132a735e5e2410ebce826ed9bb72df2b04a6273a25853997836c8a3416da41cea70de8908bbd88a950020c
-DIST calibre-2.25.0.tar.xz 36706108 SHA256 208bfb6990428ac7c5b4f5105474d3787f7dec7caf1b0a8b2513ded41ab7ec40 SHA512 1cf909e6ce9b2438497ad20d334a913e188713d6040d5f89e41ad28b443e053eee5080de11ef6578c2ff4b5f902105b1c3f2b63c479a9eac1aa1db7ad15e1d1d WHIRLPOOL 4f30193b04b159fa9fce8891ae05565a04cba79f58b96d5cd9c8b48e14f8ae860ac2582228037cdf40154da5d8bdcf04d2d0f924a9f93f4375eb23c84eba2571
+DIST calibre-2.27.0.tar.xz 36776876 SHA256 6567d58a9878f4ad30756c5ce984fe555393fd94167cb23e279c2a83450e2d8e SHA512 0a87549e40f6a3da5489e29fd6969a16ca1e2d8e52ee4d1520ec146b973c3bf4aac73b182b6bb8a0d520137ebe71804543d65ca313ae1560064258c7fa9ff5fa WHIRLPOOL 11f5157c6e1121b68f50f0a923956e6130233aa04790a61ead3dd36ef601cceb15f6d58e5434e0d94cddbbcdc0f9ea84bfb0fa3839752795d8b6271d39679c90
 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.21.0.ebuild 7999 SHA256 3a22096f1de3c6144c48b9c445e9558f04d98f2b794007e61d47339b45df3f70 SHA512 4aaf25cf65f8333b403bc515659f0ad5f145060245545b3452d60281b330c9dd73fbb7162073b41b97c10e8726b4c0f02dde82ba486fdcd6fb0d7f5529ccb209 WHIRLPOOL e4fd6a8d8fb64faf9df9401854e56ef126546dd887a382970653e28811b39f7641ab16dead7cc3d8aa75af6e15596948ec3c1f684c59be45b63b2749da15d6c3
-EBUILD calibre-2.25.0.ebuild 8104 SHA256 536ca966d316a737e7b670a57ba361266123b8645037dca825735d84226ab333 SHA512 71f24d0404007f75cb493cd81fa4c2edef15e1c11ff25c16524eb2e9df94018f4526f100e4b2fa216d56970b34950be44bc08f16203b660da13db63a488035ea WHIRLPOOL e7ed4977315adbebf9f04c08fe3a47ee86bf7a0ca383cfed07b3a560f3bf6ec05462ec010f4db5f9d13041ef168bb72eb30b0eea742bd67c237f6709475c75d9
-MISC ChangeLog 55301 SHA256 a21257ac780bd120903614ff185666663861b6569bba4d434e810c9fd71e3898 SHA512 3c141fce13f6118928864b5901442d3309e426780e362612864b05f7225e9d38f35145475e97c4bead530cc173c16ef692798be92a654f8f967e4f488faf05d5 WHIRLPOOL d2013bf503fa750a773e399b59f37809627290bb07ff016cee58060b8cbd765077db2ca65e8f26d0bf2b0802b8ed9baf7960faadd9f72687684e1f59f2ed92a3
+EBUILD calibre-2.27.0.ebuild 8115 SHA256 976d399e78ca6b8605fd194cc14664897d5a6f74fc31b6f91a91d1bee9d593f3 SHA512 8997472aeee360563899ea919bf798d41d420b44529f26f814b22274590132829fd30a026d3d0425ddbffc8b781963ebe9d4c062d27b6632c53b6f56362470e0 WHIRLPOOL d0fbcb681dbfcbcfbc2683d9f0e7c3f69445b8a9784de8dbac5381d7d7b9d4f8bbb53aab7f92dd16f453b3347b77b2ffd56aba1272402654d71ddf1b49317985
+MISC ChangeLog 55500 SHA256 a1a21b901e050f88780d19e69101e2bab0f6ba01fcda9c16eac9c409d2fe81ef SHA512 fc6f5dc53ea9ca62c8169c74739002b634886dc927a43328a35c34ea43208f325c9303f947c9cb8cae0285c3f7e7ed9c36e2cdceaaab5b00fbe6b4a0a501e419 WHIRLPOOL 77573f1c9daf1202f49ed6127174b7ee9ae9817fb09c5861885d6232e486f6de465efca5b5f5a651a3517faabc111a54e65bb72f7c8454e0cb72d25f1c0a3b9b
 MISC metadata.xml 341 SHA256 796a5a95967784ec0e9295b5745962d2a20dd678fd7425e6bd6414b9b1fbae33 SHA512 0fa9fd10e81ff337e7e7d9a55d492f4cbcee79fd1771497214c39c0c2491759ba0ce7f62a1aade44e2165617da40111d0ba3a3802b679db66f60e66bff70e2ca WHIRLPOOL bd14a2fa77fbf2f7e3e30725ef299809e11696d5779ea80d8252efcd64e79bad7db9c331f8617ce220cfeaa6136e932130db85aeecf35412f99d9957cf3e9f08
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVMmlcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVROGUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
-RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOS6sQAKKwNkY58wcOdtFBml4we8TH
-nIFc/+ex41Mf0S0OtpXHFLJQJj1jJVvO+1QlfK+wXEEV9Q0PGnvkEdokVyjc4Pwn
-AA4Wiysj3YrI9UakbG8FkIlJKJrslYBh7VtX8IS+j9ww4dKaIcbuTtkvdqIjfetd
-FlGs1N7NV/B+oZodqFWhkMXSjAi29vi/mwds+8Yzkp6/vch+7rFcCXfwleemef2d
-ARU2cFZw4Ijsjxa4jgI4ec4xVZ2W/ooWxh9KS64NZekSLMH303ifsk4C1FowV03V
-csLVLFxN48dSChLfhZ93yDAqcw9yhFR264KD3t8w0HziEuJG0NrD5tLv2wzqKvKY
-4MSc6vMXN4dxfaV8+WvZqVYvN7yf1eaTFze9nEJ/OoQ9OKsAEFBhPAMvIwSSsTnS
-QOuMcAtCFbJJwHlUSoPtVM4EAXKc8pICON1gYomufhtgn9jfJDHBc81fXDi2xbp2
-dQ/v2eCmW7w1h5+puMOfxqj6JXldTDzOmlhhoGtfFfrM2LcNGoz+brHFQlxdCG6u
-OkU5CGOnPp+phY3oeiukqMxUWYXzaPdL4jvhFflVYNDykMhhVAQRhNd/SD95VpYo
-a3gaKni8R8n1BU3Wfy6tdlcfTOVMOWA4ALe+vSZF4ylY/KO0o82jXkr7gwMhFQjU
-SsXEPpmmllaC7QoPtJEX
-=6GCB
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFO4SMQAJHuIenIr6cF/e4OeGR5nye+
+DXByGjVgokyl2JKljmCvDobD9dYxmG68nKymxAV61JF95EsSf9p2qEXrNgJzVE42
+qN8xsEjiIJXMrU5DPORZlp/NoTBJdS8GdSv/EtzceeMtmot2/gt0DYZHx31ngeqL
+iRpKUVH3CWZZYM8t48j8oU4mTUfdgJ05ox26qpTmXq4IxS3mwiEL0Dag/SCyIVdf
+AL1WR4LGrn1ZWEoq6SNsjjySTT47xje0u58yjOg4ygTj9D+30zW25D4iCOv/OjmQ
+nIAMbwYziozHyY/RWYjqBahicnGH9Xb5rlP2+4Lo5+ZhEgGqzkuGQiUXK3Zq3kmK
+y6YdQdvJ8M7Lc7l9JttUxuBrFylCWI1PvLoOGVMExf7ah0cyf8Lgw2InTMtv7MQD
+CuBeZWrPxDNCSmJumhfpe5ozSSnHbxNNxQqs9Po8YuqiJUosJ/rAoQjZ+D0VVEzs
+wCVdvOVf+nIAOJvmYWM1IVRgBy2wp4M00KFU1QIW2axuv+PpfkXrrMjZzO0VgQ3m
+sQiBoSBFg80xpKsyzxw+X5/OjdJbZuDmcfE0a7va17hcWOL+pUjyrcgEvpUPxPiy
+C8WOrHxxt+Jx/RwTZlP2oPPlaOwx4H3KgpIk4RrbMA3Dem3uVxHs79mxA6QriNUD
+v8EfNaIEltcNswSMJEKd
+=QRUo
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-2.21.0.ebuild b/app-text/calibre/calibre-2.21.0.ebuild
deleted file mode 100644
index 82c59b1985b9..000000000000
--- a/app-text/calibre/calibre-2.21.0.ebuild
+++ /dev/null
@@ -1,227 +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.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"
-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[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(-)]
-	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(-)]
-	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"
-
-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.25.0.ebuild b/app-text/calibre/calibre-2.27.0.ebuild
similarity index 98%
rename from app-text/calibre/calibre-2.25.0.ebuild
rename to app-text/calibre/calibre-2.27.0.ebuild
index 03c48eb7efeb..679e67a961b0 100644
--- a/app-text/calibre/calibre-2.25.0.ebuild
+++ b/app-text/calibre/calibre-2.27.0.ebuild
@@ -1,6 +1,6 @@
 # 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.25.0.ebuild,v 1.1 2015/04/18 14:25:29 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-2.27.0.ebuild,v 1.1 2015/05/02 14:39:13 yngwin Exp $
 
 EAPI=5
 inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs
@@ -57,6 +57,7 @@ COMMON_DEPEND="
 	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:=
@@ -65,7 +66,6 @@ COMMON_DEPEND="
 	sys-libs/zlib
 	virtual/libusb:1=
 	virtual/python-imaging[python_targets_python2_7(-)]
-	virtual/ttf-fonts
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXrender