Stabilise latest on amd64 and x86. Drop older versions.

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

5 files changed, 22 insertions, 392 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 3c13077faed4..66cfac31fe45 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.272 2013/04/17 07:41:25 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.273 2013/04/23 19:51:32 scarabeus Exp $
+
+  23 Apr 2013; Tomáš Chvátal <scarabeus@gentoo.org> -calibre-0.9.20.ebuild,
+  -calibre-0.9.26.ebuild, calibre-0.9.27.ebuild:
+  Stabilise latest on amd64 and x86. Drop older versions.
 
   17 Apr 2013; Zac Medico <zmedico@gentoo.org> calibre-0.9.20.ebuild,
   calibre-0.9.26.ebuild, calibre-0.9.27.ebuild:
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 78344f50ec03..42ca501d088e 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -5,18 +5,24 @@ AUX calibre-disable_plugins.patch 1042 SHA256 4921ba7be29d8e2789f3e31d23faa96f30
 AUX calibre-no_updates_dialog.patch 891 SHA256 59cbef4d8026241bd198f36728c4dfde6fa063af393788c3126f788730d375a5 SHA512 f7cfa4b0675146275c155897b3bced4899487dcd6e3f5d94719d25dd698b4b74b9bb13477552f0ade3d243a35146e4cda36c46cad8bb74c57dcb549825428117 WHIRLPOOL 138bdd85270076d2a5f8560cbc994bc91bddec2385713c19237fe4db665dbf0bedc62941ec70c39b418c469de2fed036a00bfa9639832f7d435bd6bddad391ef
 AUX calibre-server.conf 523 SHA256 55b20e6a208f7eb7128e0f8e0f8ead83a55ef80bcb62737d1658074141a5b213 SHA512 4595786d9b6ed7662a1124e8acc32e03e0149f614a07890f9df08d05811a1b8de51cc33cc1bfbf30b072c7ad75dc3b8247e9de53d20ee2b45017cb4160437058 WHIRLPOOL a4ba22fb5a9893c2db6254e2ee569514dd132284e0f4e8b62561ec3def773c917d17d6718975b1ecbd02197cb3330506e48b6dd656c20cfacfd610a680e34db1
 AUX calibre-server.init 1928 SHA256 d5632da5955d1304a0b750850b8933eb053ee3462d0a9f74c941a45d8b65707b SHA512 c51c7cae899bebe7fb339f9cfd4070caa778f86ce997dce26052e158dac12444d3a72db91fd83528ccad07d9bd9a9e72edca9ba91d1805e91c91a0a6ed32f579 WHIRLPOOL cf91dc9993b0329821a9a7b9b4a5245c8ef7a6a2a407cddae4b7b94aff1698e663e9ba08352b61b48fe34a1e3c83701ac71ac549142fd12795e1828d5d8f779d
-DIST calibre-0.9.20.tar.xz 28170112 SHA256 96075f6dbd25bf0bd26378b67d695478bd251a5ab8706cbc5907209aa6b6fcda SHA512 6bfa2e5c3b08d4201a281c3067de47d450474586355ab61fe3e4a70ab4a67164fa22b4baadaf859cc89918cc839500330c82e8501f0d52c63441b8bb1cbd4fda WHIRLPOOL 4c21bbc439ccdf2c1ff1cd6d93506d11e165387f68a9cba10f3263bfe6a70085d1ec98db7f187b51e5cc6879427fba2feb0afa2a2d1f4c570517163549546f73
-DIST calibre-0.9.26.tar.xz 28649776 SHA256 9e38087d814acefc580e701fd73a72b81cfd78dbd2b6a100c037eed4a69bb4ba SHA512 3118f4b44a84d7a2187ce1d249a85400b9c725e0aeb779f764123e364bc9304b5fac5752cd187d51b36e9e0bf06d3e36eb7cbb21d91a28bfe1df717a5ec7a303 WHIRLPOOL c337c604035559fe07607a9239e78ee6c33adc5b836634d87209be2979fb7afa5972de8deb5f112bd8a2405016cd52e374dfaddcc942849cc820cbd4532c2ff0
 DIST calibre-0.9.27.tar.xz 28696180 SHA256 8fd3779c8f878420333f6919f80493bf69d4b64bf427697ebc365497d2450d1f SHA512 91970f7c7349f661fc582eb43b89b81e77350b1cf2237c78e55c9f028a94b803b5d72bdac3ac11722c4fcf93077c1f8042567f8e380ad03423ba6c7f5dec7318 WHIRLPOOL 2313f94ee2417343693e1b48736434d1bf356795eb781abbaf68b858ba9fd57eb2a78e8afe04b9c992a1879a99eb9cf65527ccea7ed1a91d7554a62dcee7822b
-EBUILD calibre-0.9.20.ebuild 6398 SHA256 b50ed10a97a444ea1c1a8e918226c6ed43aacd9ee8e109e1150383a10876f315 SHA512 02edb209eef77777755fb12f4a96ac8fe40c7339da2edef69f128637b72f7c213c90038b7a207f044681a4f6c3676a74694e32a82b5c46af3c21814a0d2d5ac6 WHIRLPOOL cf5b03b131764e02426941a138991021c54901d3156fa4bd3351ae782664b53ed05aa7e7f794be910729906288024f6f7f73786f5401d89fe9b8042a4e464e6f
-EBUILD calibre-0.9.26.ebuild 6400 SHA256 2cbd2f5cb104efbc03a118e37cae224a2ea245cada2f5f47b1fad27510acb158 SHA512 f838daf3fab2e720ba00fa3314ac7895e6e19d3626562ee17264da9a799ed8e625781a5074db0ac599b2ad96de071b7ad9d9a3642276e1bad831632166c50087 WHIRLPOOL 8a8af67950f58d8fd0bafe466ddc68507f8a02fc47bafdb98dca7faf7a667d7a89431cf5f5cf10de5a4d8c7fffc2a157f78a6c4eaa2fb54a0ced8310a454b33a
-EBUILD calibre-0.9.27.ebuild 6400 SHA256 4609a8469d82e8cc53ef5eb13524c94937a14c8ee124b7e810751fb100146c38 SHA512 dda5e7cdd6f53db581a0769f154d966c9b5affc3a52b5c9c5b16a5a62f03a25c175d25c9f91d3c5f2a2651df04c7c75c375bc96e65e9247ae910c2c6e15de11a WHIRLPOOL 22ecd096a58c6d80aa803893e06ec2f2d5a5e7ea50c21812b96e8d6de663780002edce2899b476795814dceff8a7afe67db79b8dae1921af9f51199f332be442
-MISC ChangeLog 43334 SHA256 d1978d97ce91df49d1a75728d9ddfc337907f1b6cf7c5351887a4863e18b025e SHA512 d7163d43ff31ac2e6259c9fe56ce35c7a1f1c405135aec78f8368e6e177d8dd28061b50f6f1cadf70cb1eb1a43ee189a8d2c14696d08431281a67ddd39e44079 WHIRLPOOL 8e79580c1cdb38b23b4c78016838385487d29d79b15d0320a388084678babbbba13a2acccf33d9eed728978d9eefbb7d27685946719e59efcdf66abc42102225
+EBUILD calibre-0.9.27.ebuild 6400 SHA256 e81b5499da826f37043cb7e3ac3153db7ca9e8873a086f9b416f5dd011238169 SHA512 59fe6fdac497b86ffdb4c8555c770549b776a9b45bea64084221278a78ffeedb0b48c8facc42e0e698821ecc0a18779f648d4c4c2ff0a4fcd3db4afd01bfb7c6 WHIRLPOOL dba43abc2260058d84fe9ac2fc01a15c2d880502347d76d0ec3af6c423a87277e83de8ac03c9d02803c864f6687726d473200c11626e92c19b095b20e7f8da55
+MISC ChangeLog 43523 SHA256 e9500448a753d565f3ffadeb4494c75198644c93beb74eba27a73d1a69492a42 SHA512 0c19368a892d1b47a64ac76bf62f981952ef4b1fb133fec44f4e9cc81e194b8f73ccca5cb05158ee0c80dac151e3bd28a158d1eee9ece56b6b4eab2b15def2a1 WHIRLPOOL 2d6e82f919cc455fa827969d9e252fcd1f060e56e67f60faa7f739e822c46c0ef99059b8d2a4cd3760ac42b61d1578dc54f1298fc2b06f608278be084f817f4a
 MISC metadata.xml 340 SHA256 db5a0163e41af3aa60492fbffbbd971e2ca9d76097d5da9d3aabf3c16e4294b9 SHA512 9cc44065f152a92ed8428da1306dc08ed3222cc84e38c0390480e1fed4f7748ff66fed8456ab25004b406fe019a29b5cab9b4bce5bcd4a934a4390b984a08333 WHIRLPOOL 928948af880ac651243ac947837b22c98528b779e6251aa26e72b4ca6e16bc05caccbae5c665e2ae7dedcecc2f5dd28d05b1f0b598f6e0750c85eedc95aac04c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFuUicACgkQ/ejvha5XGaONfQCfUvpn2IILNrtq9u4EQoZndvjb
-wXgAn3vGGC5lHqWe0WKc8n6bNwJw9s4g
-=Vm/L
+iQIcBAEBCAAGBQJRduZKAAoJEOSiRoyO7jvoNqgP/AzljO7RayYixL9ymYDtuZfV
+AcoVdvdq0b4FN+sy8OOuBdFAtSZfRx3U7OP8iwenQSEBF2WsGMxQFy95LM2H2kcD
+zlIosGG5bNf2F71VqT60j0LwtKaqfqNkXmbUgeyLJ6Qv751abaLHj57Ve4F00k/J
+Y5NY+cVIrFuJCxfYyP3opYij6YWbuImtSKgYfCrCoLl0EOwLkR2oqG7BvYj15H8z
+ste7H3kSGjjx8xzBIwrOiDHjTS0SyvN1dRCmidoydkx2TxofSRs7T0Qtc7BFcUSE
+3vlMQC0Av/Swycp00jI/9jzht2fROeUaArcKGowBzWnxpBG2CiPvH7S4aPXAAltu
+FMT5yYgQNgcoVYV2dTQFiBu6xeMQE39v5tVhTNbtBbf3ZY+qe0dv7ON43geZYkWL
+H6hvAyiGJ8JLApK2gyaOIxwJiF2GfqG0RbmYDU98hsHyQaWelUnD6uiCuChpzlmp
+7yzhW+zl5U8ncy26b4cmqSzcb46Jjp/VcA/EcGdR3P35fqyfXp73Ykx0LzP46ixv
+dxkIkThjy+fnNiGf5aHMz90oON6w8jePApAdegIreJI+gRdWp9usp9LkY4yzNvKQ
+vx/jmZ+hw6P9ZzeGRWZwSS5TS4yWFK+jsxdauA+7Hbg1M5NSlLcb/PImjY4+aYeN
+qb0UAaRu7IIa9GmK58Vj
+=9Qlq
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.9.20.ebuild b/app-text/calibre/calibre-0.9.20.ebuild
deleted file mode 100644
index 47842ed1bc6a..000000000000
--- a/app-text/calibre/calibre-0.9.20.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.20.ebuild,v 1.4 2013/04/17 07:41:25 zmedico Exp $
-
-EAPI=5
-PYTHON_DEPEND=2:2.7
-PYTHON_USE_WITH="ssl sqlite"
-
-inherit python eutils fdo-mime bash-completion-r1 multilib toolchain-funcs
-
-DESCRIPTION="Ebook management application."
-HOMEPAGE="http://calibre-ebook.com/"
-SRC_URI="http://sourceforge.net/projects/calibre/files/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-
-KEYWORDS="amd64 x86"
-
-SLOT="0"
-
-IUSE="+udisks"
-
-COMMON_DEPEND="
-	>=app-text/podofo-0.8.2:=
-	>=app-text/poppler-0.12.3-r3:=[qt4,xpdf-headers(+)]
-	>=dev-libs/chmlib-0.40:=
-	>=dev-libs/icu-4.4:=
-	>=dev-python/beautifulsoup-3.0.5:python-2
-	dev-python/netifaces
-	dev-python/python-dateutil
-	>=dev-python/dnspython-1.6.0
-	>=dev-python/cssselect-0.7.1
-	>=dev-python/cssutils-0.9.9
-	>=dev-python/dbus-python-0.82.2
-	>=dev-python/imaging-1.1.6
-	>=dev-python/lxml-2.2.1
-	>=dev-python/mechanize-0.1.11
-	>=dev-python/python-dateutil-1.4.1
-	>=dev-python/PyQt4-4.9.1[X,svg,webkit]
-	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.4:=
-	virtual/libusb:1=
-	dev-qt/qtdbus:4=
-	dev-qt/qtsvg:4=
-	>=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"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	python_set_active_version 2.7
-	python_pkg_setup
-}
-
-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"
-
-	# 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}-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}
-	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 calibre-mount-helper
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	dodir "$(python_get_sitedir)" # for init_calibre.py
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	python setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}usr" \
-		--staging-libdir="${ED}usr/${libdir}" || die
-
-	grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
-		die "failed to fix harcoded \$D in paths"
-
-	# Remove dummy calibre-mount-helper which is unused since calibre-0.8.25
-	# due to bug #389515 (instead, calibre now calls udisks via dbus).
-	rm "${ED}usr/bin/calibre-mount-helper" || die
-
-	# The menu entries end up here due to '--mode user' being added to
-	# xdg-* options in src_prepare.
-	dodir /usr/share/mime/packages
-	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
-	mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
-		die "failed to register mime types"
-	dodir /usr/share/icons
-	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
-		die "failed to install icon files"
-
-	domenu "${HOME}"/.local/share/applications/*.desktop ||
-		die "failed to install .desktop menu files"
-
-	dobashcomp "${ED}"usr/etc/bash_completion.d/calibre
-	rm -r "${ED}"usr/etc/bash_completion.d
-	find "${ED}"usr/etc -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
-
-	python_convert_shebangs -r $(python_get_version) "${ED}"
-
-	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
-	python_mod_optimize /usr/$(get_libdir)/${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/${PN}
-}
diff --git a/app-text/calibre/calibre-0.9.26.ebuild b/app-text/calibre/calibre-0.9.26.ebuild
deleted file mode 100644
index c9587c78cf4a..000000000000
--- a/app-text/calibre/calibre-0.9.26.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.26.ebuild,v 1.2 2013/04/17 07:41:25 zmedico Exp $
-
-EAPI=5
-PYTHON_DEPEND=2:2.7
-PYTHON_USE_WITH="ssl sqlite"
-
-inherit python eutils fdo-mime bash-completion-r1 multilib toolchain-funcs
-
-DESCRIPTION="Ebook management application."
-HOMEPAGE="http://calibre-ebook.com/"
-SRC_URI="http://sourceforge.net/projects/calibre/files/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-
-KEYWORDS="~amd64 ~x86"
-
-SLOT="0"
-
-IUSE="+udisks"
-
-COMMON_DEPEND="
-	>=app-text/podofo-0.8.2:=
-	>=app-text/poppler-0.12.3-r3:=[qt4,xpdf-headers(+)]
-	>=dev-libs/chmlib-0.40:=
-	>=dev-libs/icu-4.4:=
-	>=dev-python/beautifulsoup-3.0.5:python-2
-	dev-python/netifaces
-	dev-python/python-dateutil
-	>=dev-python/dnspython-1.6.0
-	>=dev-python/cssselect-0.7.1
-	>=dev-python/cssutils-0.9.9
-	>=dev-python/dbus-python-0.82.2
-	>=dev-python/imaging-1.1.6
-	>=dev-python/lxml-2.2.1
-	>=dev-python/mechanize-0.1.11
-	>=dev-python/python-dateutil-1.4.1
-	>=dev-python/PyQt4-4.9.1[X,svg,webkit]
-	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.4:=
-	virtual/libusb:1=
-	dev-qt/qtdbus:4=
-	dev-qt/qtsvg:4=
-	>=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"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	python_set_active_version 2.7
-	python_pkg_setup
-}
-
-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"
-
-	# 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}-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}
-	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 calibre-mount-helper
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	dodir "$(python_get_sitedir)" # for init_calibre.py
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	python setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}usr" \
-		--staging-libdir="${ED}usr/${libdir}" || die
-
-	grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
-		die "failed to fix harcoded \$D in paths"
-
-	# Remove dummy calibre-mount-helper which is unused since calibre-0.8.25
-	# due to bug #389515 (instead, calibre now calls udisks via dbus).
-	rm "${ED}usr/bin/calibre-mount-helper" || die
-
-	# The menu entries end up here due to '--mode user' being added to
-	# xdg-* options in src_prepare.
-	dodir /usr/share/mime/packages
-	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
-	mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
-		die "failed to register mime types"
-	dodir /usr/share/icons
-	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
-		die "failed to install icon files"
-
-	domenu "${HOME}"/.local/share/applications/*.desktop ||
-		die "failed to install .desktop menu files"
-
-	dobashcomp "${ED}"usr/etc/bash_completion.d/calibre
-	rm -r "${ED}"usr/etc/bash_completion.d
-	find "${ED}"usr/etc -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
-
-	python_convert_shebangs -r $(python_get_version) "${ED}"
-
-	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
-	python_mod_optimize /usr/$(get_libdir)/${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/${PN}
-}
diff --git a/app-text/calibre/calibre-0.9.27.ebuild b/app-text/calibre/calibre-0.9.27.ebuild
index d683343d79b9..128b8c101372 100644
--- a/app-text/calibre/calibre-0.9.27.ebuild
+++ b/app-text/calibre/calibre-0.9.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.27.ebuild,v 1.2 2013/04/17 07:41:25 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.27.ebuild,v 1.3 2013/04/23 19:51:32 scarabeus Exp $
 
 EAPI=5
 PYTHON_DEPEND=2:2.7
@@ -14,7 +14,7 @@ SRC_URI="http://sourceforge.net/projects/calibre/files/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 SLOT="0"