10 versions later stable again on amd64 and x86 and remove older

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

5 files changed, 22 insertions, 355 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 9e6053162475..8ddff4b3bd28 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.217 2012/07/27 20:19:39 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.218 2012/07/31 14:08:02 scarabeus Exp $
+
+  31 Jul 2012; Tomáš Chvátal <scarabeus@gentoo.org> -calibre-0.8.52.ebuild,
+  -calibre-0.8.61.ebuild, calibre-0.8.62.ebuild:
+  10 versions later stable again on amd64 and x86 and remove older
 
 *calibre-0.8.62 (27 Jul 2012)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index e54ad292a7b4..07950a3203c9 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -3,18 +3,24 @@ Hash: SHA256
 
 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.8.52.tar.xz 24690364 SHA256 29eebc8c82dd2cacc70e3fb5bc309020348028752a23765d8956769b79deaf2a SHA512 9fb6bb085b8f42a0ad3f63141ce2de63cc7e7c0d5ed914904ddd05fac3713c4c47f093e4579ceab7080627585167e7312039cbc8bc2a1e969937553e123d072a WHIRLPOOL 569be4afc50c78bb4bb35f5d61201760c8ea5fa25d6bcafb343dd6cdfc4a5fc2ff4175549438a9473302331c982f4cfc1d0a916ff2ac3593072f4154142966e2
-DIST calibre-0.8.61.tar.xz 25077408 SHA256 fbbf54d952a13939557b57c5e13d673ed24b5b395fc550c2842d0bca49d3f380 SHA512 f3d588d58e44b2dd5954c96380aaf4bdb4d80605ace32829771002baa26d89485a7fb9f53266edb1cc63a5b561949a7f1b7e7245938bb8c59d581519f0e63e49 WHIRLPOOL 04794a183e8df53d2b4e86f2d0353953754a04e3ddd53add2b2738b093e24fa49a7a4e89341a16c4fdde0be13a5d13ee56b468d9b52e9e0cc7b86217c080bb9f
 DIST calibre-0.8.62.tar.xz 25090932 SHA256 5da54282959e86f288dbb3e275ab403db5a66c74c7ab384adeeb24c459612159 SHA512 2d129b49b3b6daa2a5c85c02a57e70c8ac1ca8b102bca6f708c9094b9f04fb97abed62b4b00e2876473e887492cffbda3247be6021dfb6fe869f878b335c213d WHIRLPOOL c2b90f76b21dda70902dfcdda7fc698f1dcdb5397724f409745530be3f891e556806aab10a3d9328ad695455a6e0ad04084182f63af55fb4328ba60fab228cfc
-EBUILD calibre-0.8.52.ebuild 5640 SHA256 7e7187ac3e38cf8c5971e787866bfe70c523935cbad00d09e67107b0d190e82e SHA512 4b31abf4dff447ba93660dbc41178495562435af208d35b502ecb2d0352d2aad51d26b0688d7d2bf56be0fae70d46b0a244ee6ed92176c5d3f19dae0bf768c45 WHIRLPOOL 905cc762ec395ce4c736826838711e977d1d497998b4498b2e4e35d5bb684194cc1e560d355759eb6d3e98c63089586956404ffd8a9cdce411021cf70507d2b2
-EBUILD calibre-0.8.61.ebuild 5730 SHA256 46ead6d430eae821fa6165e57dfe84b5d9676f40f7d8bb978be4d237f504db1a SHA512 135530fa2a78b9130ed787ca330e2a7d727ba1625f930b8bc14f1cd232d76a86b482df98dec8cb2f5318a011f8843fb624fe5f53195454839b4bac3f81773002 WHIRLPOOL 621dfca1e0c988e95f43f7ab59fc773e937d4c21e3c6483910abe2e7461a5c99db097218f508a55b28118840d45399723f249b21a4e634dc532ef208fc8d8f00
-EBUILD calibre-0.8.62.ebuild 5730 SHA256 80cd78896f47d578791b3ecdf6d187a1315519bf00d0d5f14df52c83d7494152 SHA512 bf35d40017ac33cd0ed8847d874b0ec32e23700ecc6fa91bcb2f2bcf8a799afbcf29b9115c44b6fff907ea73eb9ca0a2ac2c7a14711f5d2d70d110241dbe29e9 WHIRLPOOL 86942a04c0b5066b5ec2e7572a968845f038616fa6ecfe52a1578d8a2162d45281fd55ef88ff056f4d3d92a3b64e89255b0c7d61763365b49929ae4429e36d51
-MISC ChangeLog 34921 SHA256 a566b1d85560c0d47cbb6a3d1e901508bfc282cece0e0c5b1e1ada4b2b372e4c SHA512 94ae4aebe8dbe9937381186f91f2655aea85c2587454b30289dda8188e9635c87253577482b44afc5abea80c8e6eeb12a8639a02030820d3607a857b99b2961f WHIRLPOOL 5b87720d5886363d3b355b0d5477217f714da33d47e95aa472ff031505fc6d53424d42d88133b8f3b94f8a40a504188b971d00bd2389fd7a47ede261ea6fe4c1
+EBUILD calibre-0.8.62.ebuild 5730 SHA256 39ef67b863f85adcd7404483c1266f56e3019ba6a015a15406b1fdee2dceae43 SHA512 3623ea0eb7ea13a90f21dc3a341394fcf722c01776edc26cca8f23daea694f3d391597646515fc6bc89a512b791955bb1232836f009445cceb3037d8a6755e59 WHIRLPOOL 707e5c6cc7c8bb8a726092237dba2d2298a4eba3eb94bed5342a8d70c1b47415a27c77e9626a271bba22b216536effff67cac6f28d5a2242cf480a7e08fa2d77
+MISC ChangeLog 35119 SHA256 a39a41cd525c48255edab095c2ffa9995de59654452ae6321c61ea0120050e33 SHA512 924eb440a0ceb1321898cff519f38f23f84eff812d555ff0dffe0324f96ad83f4ecd25a275cae877049b2640ea245991d75ed81c3a0023ea27ed32c00fa88ca1 WHIRLPOOL 9b85dd9d2ef70470702607c27322c81cfaec4e9a0405bfe9131b2ac329c9c7fd6ba4172f7299c164f1ce9c74cb31459c994d9541fafdf8efc7f1e75df34b4f02
 MISC metadata.xml 340 SHA256 db5a0163e41af3aa60492fbffbbd971e2ca9d76097d5da9d3aabf3c16e4294b9 SHA512 9cc44065f152a92ed8428da1306dc08ed3222cc84e38c0390480e1fed4f7748ff66fed8456ab25004b406fe019a29b5cab9b4bce5bcd4a934a4390b984a08333 WHIRLPOOL 928948af880ac651243ac947837b22c98528b779e6251aa26e72b4ca6e16bc05caccbae5c665e2ae7dedcecc2f5dd28d05b1f0b598f6e0750c85eedc95aac04c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAS9+IACgkQ/ejvha5XGaOUEwCfcSkfYKFfCEvTd+8rHkIrAwNf
-T/MAoL3TIMKDx8ZwR8X0ZkBqRlfvE3Ma
-=jx9T
+iQIcBAEBCAAGBQJQF+baAAoJEOSiRoyO7jvomZwP/2bvF2k+S8h/UISBtV71OYaS
+bqwYowjlemcnbtLySA5gHalLLqdKmXVFIPzOCg7yq/MQgw3esfYV6imUU3Y7skSz
+qHMMRHR5zP0jxm+wlE5S1JSwAZqLrz1gCkz5sJI5on2tH6x41MztmkuyOtdtuW2a
+whyFAI8qbiDAmHXiCtWOshhXy9mftlPQlsMJahcNOWgVmPZg7qhh2KZafVhp9ni6
+2xorI3tjB38+WwbZM+67hUHE6ayNQEuovzLUmilClbDSH6P5uEQ0O7uDyhQ4NMIY
+gCqcG2z22Ft+AGXrqOaQvL3SBbRNibIK3MDU3PkjEa9mkcXgabIMICLWS0s5obzC
+ZuM0ZT+qodXenUm+ni0Q6PJ/IYY+4dZKtQIfhIY/1jUc9FH2Lu+18uzhcRMIhNs3
+nMlDqtBspJgPYWg46HWUMSNveLJGhFdrlU8p0lkR1kJDnwv22dJ3zRo5K/3o9Slv
+OfZe8FaO56DbV4iG3txC+zL4IhvwHh1n4caU/XU8jT1oz9u+zGUraaUzUE0snXrt
+skJ92XIOznUap6rnfy9QJ4zVxT2zwN2W+U+P7zpJQd1Gcg/a/ouQ1mViFrqm0ClI
+HRP7o5XPGMj5Zx8WPYXpEnk1NKy0pmU0mH9ZkrcN5zaW6WNoUq2Lj9ALN36zCkrE
++4Yt266tYpVymxEQJqwX
+=DDmR
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.8.52.ebuild b/app-text/calibre/calibre-0.8.52.ebuild
deleted file mode 100644
index 713f9232cf6e..000000000000
--- a/app-text/calibre/calibre-0.8.52.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.52.ebuild,v 1.2 2012/05/29 11:25:10 scarabeus Exp $
-
-EAPI=4
-PYTHON_DEPEND=2:2.7
-PYTHON_USE_WITH="ssl sqlite"
-
-inherit python distutils eutils fdo-mime bash-completion-r1 multilib
-
-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/python-dateutil
-	>=dev-python/dnspython-1.6.0
-	>=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-gfx/imagemagick-6.5.9[jpeg,png]
-	>=media-libs/libwmf-0.2.8
-	virtual/libusb:0
-	>=x11-misc/xdg-utils-1.0.2-r2"
-
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( 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: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 + \\[ext\\.name+'\\.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"
-
-	distutils_src_prepare
-}
-
-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}"
-
-	# 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} \
-		distutils_src_install \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}usr" \
-		--staging-libdir="${ED}usr/${libdir}"
-
-	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
-
-	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.8.61.ebuild b/app-text/calibre/calibre-0.8.61.ebuild
deleted file mode 100644
index 226642ce3cfa..000000000000
--- a/app-text/calibre/calibre-0.8.61.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.61.ebuild,v 1.1 2012/07/20 20:00:17 zmedico Exp $
-
-EAPI=4
-PYTHON_DEPEND=2:2.7
-PYTHON_USE_WITH="ssl sqlite"
-
-inherit python distutils eutils fdo-mime bash-completion-r1 multilib
-
-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/python-dateutil
-	>=dev-python/dnspython-1.6.0
-	>=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-gfx/imagemagick-6.5.9[jpeg,png]
-	>=media-libs/libwmf-0.2.8
-	virtual/libusb:0
-	x11-libs/qt-dbus:4
-	x11-libs/qt-svg:4
-	>=x11-misc/xdg-utils-1.0.2-r2"
-
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( 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"
-
-	distutils_src_prepare
-}
-
-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}"
-
-	# 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} \
-		distutils_src_install \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}usr" \
-		--staging-libdir="${ED}usr/${libdir}"
-
-	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
-
-	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.8.62.ebuild b/app-text/calibre/calibre-0.8.62.ebuild
index 1ebae21fc409..10dcfa9a6248 100644
--- a/app-text/calibre/calibre-0.8.62.ebuild
+++ b/app-text/calibre/calibre-0.8.62.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.62.ebuild,v 1.1 2012/07/27 20:19:39 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.62.ebuild,v 1.2 2012/07/31 14:08:02 scarabeus Exp $
 
 EAPI=4
 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"