Stabilise 1.2 on amd64 and x86 punt few older.

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

5 files changed, 22 insertions, 460 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 4127387b29e1..a8eb20a5d2fd 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.301 2013/09/06 20:37:55 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.302 2013/09/08 11:26:34 scarabeus Exp $
+
+  08 Sep 2013; Tomáš Chvátal <scarabeus@gentoo.org> -calibre-0.9.42.ebuild,
+  -calibre-0.9.44.ebuild, calibre-1.2.ebuild:
+  Stabilise 1.2 on amd64 and x86 punt few older.
 
 *calibre-1.2 (06 Sep 2013)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index dbb2823a3740..cfe8ebab17ca 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -5,20 +5,26 @@ 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.42.tar.xz 29351712 SHA256 6cd64b54b4c0b696d9a6cfd50527c10cbd7b473a622f2e0f2e2ef81be680fe1f SHA512 22087645893e8626d107093d0308dfeb5a965664f6d3fe326930d663f01ad0873a32af9180de499bca1cf4c07c4634e88c952c27c35368466a1b492f24fcf829 WHIRLPOOL 2cfb0185119a3ed2c52e837028d314094d3b7a458d21a638478e3b066cde5183ed6d5d0a2bae1ddcee5aed53a231c848a57f0fe799fba00efeafda788a400eb2
-DIST calibre-0.9.44.tar.xz 29429172 SHA256 927199fda0b11f13a9045c9ad6295d888f0c72cfaa1ebe166f2b3ae4d18441a7 SHA512 0751800201215ac40487615eea02b79458035c2e613c08a9e2f0b9a146d4be35586608c7da94bdbf18c44388a3e7ccaa6e2d22fbb64519d929627ffdffbae019 WHIRLPOOL e94f8840e933d6498108cbd0939bd6d719f76dc1d34047aa4264ce51eb1f36fe139087c0c5b5cd88575e4c5ba10f771e4bb3e45c9a127b5419f344ad4a653027
 DIST calibre-1.1.0.tar.xz 29610132 SHA256 c699e5a0aaed7484a2b3549944ee4753b4985bd675f6b27b58453a61a58166bd SHA512 2988ed2df62f4c59e56a66b42d67764cb7dd485b8e1a5bca441c758db2abcf2511f917584c35b6424440cf020991d09fd6ea359096f50010a80e63577f30f2c8 WHIRLPOOL 0afa4db0a1e97a066593b68867ac6991bd70b126fb5c87a005a2281421ac50e232908dbef3498c0fc300ad1aa835be243cb864ef02087b35ae5385c313069013
 DIST calibre-1.2.0.tar.xz 29652528 SHA256 d27fdbe981620aa63f5c70909c63a3a7b747ced1da2ee7065879f07b8a75ca40 SHA512 11f6550ae9cce8bb4fbe47d2c715376d2ae3e3651e21016409f131db8abae0c7bf7c8c5d1d30ee25d1726ddf44089b13f9b404468700a6f74c40c0ba9fa513bd WHIRLPOOL 3b10a4f52ca8e976ddc3c240a3d5ece937603572a2d70d73afe6599bb99adad7f08d3402320e00e2532bed85b3c06acb734b12ff6c626278f4934f56aa7c5528
-EBUILD calibre-0.9.42.ebuild 7253 SHA256 7896ca50da2cac22306f992fded80492521741bd1b987cbf5a12af984491db53 SHA512 07629b500404f3090709993aaf86a856b7ce96e6078a54e514eb48a648148e97ee4df716262ad5c189238cc80d6779f2b1f84f2210e89c2fffc6396dead1fa7c WHIRLPOOL e66464ed5b3d74cf42135cc2455fbf88de155c33276b400374de221bc3d32ce9c5f7fb8ab30416d7d99a4a12c5707b696001ca2a7faa16a531d7682945c910f3
-EBUILD calibre-0.9.44.ebuild 7253 SHA256 31b8272281439a6953887d43e243bf032f4d167a6a8fede1cb42046ea88e7137 SHA512 948bbdafab994f691df67a52aa73ee421fe6d35177ae1672c6226c934cd76472a67c1b15a810b6c0505fc8bb1ffe5e947ab49d50d060f559a6df486b4af96fdf WHIRLPOOL 87600e06116d8fc5fabc7744e2f9feedf1521b9765fef94756d6fbadc0cf9932ca91ae39d13b1b01af6aecaff382000fd56eefd84802ea129987646ff4dabb2a
 EBUILD calibre-1.1.ebuild 7188 SHA256 74036a431853dba10619df5c2b6ebfa708dc5d1c1f7e294c0f3d696e6365a777 SHA512 ce9f39373569c5010729292c1f2e3186d179b86825961d71b60bf13a4a2c5f75e752c73ca878aba185aaaf0a58e9874516d315a94fe9497fd8f41cc6d26da82d WHIRLPOOL 2e552531f2f876490d022fb8d6874db10bb09fe6235fd245bab1492bb4835abd715e9a2173476766b58fefe0c3303cf69a0229721a034dcd1040054cd4ae32cd
-EBUILD calibre-1.2.ebuild 7188 SHA256 507742d5d872c2f5f35d9f144847f1eb9fa7cfed69e5ddb61a0de92d3605104c SHA512 ad9519247a03fc923acfe2506e19ea707a68754934c9915a2ce90ce854e7e6c9effc3df863db20102f87981e5809e680412b391fd7209c6ab5aabda62b2c4f1d WHIRLPOOL 04466c464d07f43856e6b063e2319ee49ca173e77bdb26d6178dd40c31eddd9d21af545a88aeec093e5cd3a2e8065d27e586da2466a087cfd1999f9197f2b38a
-MISC ChangeLog 47888 SHA256 2e70d61dfa297d1677e252f9d9a2ffacf2f2e33f6a1c8e2f3554b5b55e796d13 SHA512 ac9fb1d69b094f44101fe75d7bf6eeafe7aab0ef8dcb9a72f130f28efeb0b483f2a88038a283339f6fcbe6509853ce43b78532060a0c6b224a160717909d4b91 WHIRLPOOL f10af6eca67f2ca067bc693c4cbc5c451526fd8946ea7edc87bfba3663410298af95b554325fda46b8d72a5262f68de02ea424032f49d1766b2cd6feea02f0a5
+EBUILD calibre-1.2.ebuild 7188 SHA256 90113b51d09bd3ab231eeceae07d4aae5f8ebd37ceac16525ec51184f39c294c SHA512 3fea7182ff45399da37eafa5e1b8ec9d86bbdd21e1e2a4559d12cedd8028f23313662b9f7b833dfd51f34b13f6320f5db040bca681ce580ef890b1c84a8c18c2 WHIRLPOOL 381ae7dc0ea326d08d94ef3016147d639755c645d928b4830dd8dc655e3dd3eec5cfe71b517831a63fcc48e688cf1eff0e95af0b38e51efac9b9f9b7ca1248b2
+MISC ChangeLog 48065 SHA256 746fb10a8cc4800a6501c6e624bc87752f1cabc5cc049450f935321663da159b SHA512 5555d031a0d5a625c368fc0809e1c4756bdc231d88ecbd4daf643a13b190988f41611b25d188f58d9bff935c39e8c2ed57e1c13d7580fb2ba6a530ca574c9d0e WHIRLPOOL 3532b2653534a53acf09379e5d7e6cbae4beeb228f0fc7094dfcc5d4ab142caec1a9ebab100cbe9f0380e31c4c1bae04e48b6dc34469429c28e5a141ae725ccc
 MISC metadata.xml 340 SHA256 db5a0163e41af3aa60492fbffbbd971e2ca9d76097d5da9d3aabf3c16e4294b9 SHA512 9cc44065f152a92ed8428da1306dc08ed3222cc84e38c0390480e1fed4f7748ff66fed8456ab25004b406fe019a29b5cab9b4bce5bcd4a934a4390b984a08333 WHIRLPOOL 928948af880ac651243ac947837b22c98528b779e6251aa26e72b4ca6e16bc05caccbae5c665e2ae7dedcecc2f5dd28d05b1f0b598f6e0750c85eedc95aac04c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIqPSUACgkQ/ejvha5XGaPkQACgj8AXSGM43MgG6/xc34D5zmua
-PqQAniwxbNKa4vry11G1mY3CuanckFR5
-=a5BU
+iQIcBAEBCAAGBQJSLF7bAAoJEOSiRoyO7jvopCQP/1V6Kdcb1aRiWim16RefURnE
+rgymD72sETPwTeh+Hl34bma5vVI9/XZr90tgpu0vV7+cj85TXMx8ketth8d1T2qa
+c4POdB3BSwLMtwy9z2/DrkNMzWNSSvZjhYIKHrWVzcYwabi0RQuwgUg7KESFsd4+
+rsJAiWq4r1YKa/LjSNXx4fS96fxoizEMODBVZ3YVjRm1Fb5M8KUaNboJnucvQnSc
+7LcvohWVIJBvOOVduEEaanRj7WDAZr9W9z0wzglww6XSv5Dnni/MgL2gDCXGbwIL
+Smkf9oOv3k3OYcsU7Sf/ifxi4s3uQPSkvNNyM646lOsp7qEx9iGiHk89jzq+dTEb
+ZZ9UMcQtawcFYD4/7uIH5IfsJq6YuTgpQYgyeBbGwItk6tHA4QAjyDd6cm3sHg17
+unSVTOON2z1pfPDim4NFYAu2PvCnoj6fcxLQFbmDP6/7eN8xGbAiPAo6d0g8LlSZ
+12gLPIqprib0a3INLFuRB/qzH3Qr2lZv8zm80ibf0TC/jpFvYiBLQOHOictuEhQC
+55iyVauUQM+hvPO2fFLlK9W7XIVyvpzgSYUAnk7HCc9aE8aLFPpcgVYk5tmbCypj
+3MLjYrNVpiGAElgZ0zx1zyFlsu7bopGc6O1k+DAAz1diphphy9sXbYKx48Obrhgr
+qI30IZyML2jHW30o3bl5
+=Al0e
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.9.42.ebuild b/app-text/calibre/calibre-0.9.42.ebuild
deleted file mode 100644
index 4611ffa4a3e6..000000000000
--- a/app-text/calibre/calibre-0.9.42.ebuild
+++ /dev/null
@@ -1,224 +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.42.ebuild,v 1.2 2013/08/09 10:32:56 scarabeus Exp $
-
-EAPI=5
-
-inherit 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"
-
-# Restrict mirror due non-free prs500 fonts (bug #470212).
-RESTRICT="mirror"
-
-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 x86"
-
-SLOT="0"
-
-IUSE="+udisks"
-
-COMMON_DEPEND="
-	>=app-text/podofo-0.8.2:=
-	>=app-text/poppler-0.12.3-r3:=[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/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
-	virtual/python-imaging
-	>=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}
-
-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"
-
-	# Remove non-free fonts (bug #470212).
-	rm -r resources/fonts/prs500 || die
-}
-
-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"
-
-	# 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"
-
-	# 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"
-
-	sed -e 's:^Name=calibre %F$:Name=calibre:' \
-		-e 's:^Exec=calibre$:Exec=calibre %F:' \
-		-i "${HOME}"/.local/share/applications/calibre-gui.desktop || die
-	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
-
-	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-0.9.44.ebuild b/app-text/calibre/calibre-0.9.44.ebuild
deleted file mode 100644
index 55ad7b41168a..000000000000
--- a/app-text/calibre/calibre-0.9.44.ebuild
+++ /dev/null
@@ -1,224 +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.44.ebuild,v 1.1 2013/08/17 18:14:07 zmedico Exp $
-
-EAPI=5
-
-inherit 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"
-
-# Restrict mirror due non-free prs500 fonts (bug #470212).
-RESTRICT="mirror"
-
-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 ~x86"
-
-SLOT="0"
-
-IUSE="+udisks"
-
-COMMON_DEPEND="
-	>=app-text/podofo-0.8.2:=
-	>=app-text/poppler-0.12.3-r3:=[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/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
-	virtual/python-imaging
-	>=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}
-
-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"
-
-	# Remove non-free fonts (bug #470212).
-	rm -r resources/fonts/prs500 || die
-}
-
-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"
-
-	# 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"
-
-	# 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"
-
-	sed -e 's:^Name=calibre %F$:Name=calibre:' \
-		-e 's:^Exec=calibre$:Exec=calibre %F:' \
-		-i "${HOME}"/.local/share/applications/calibre-gui.desktop || die
-	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
-
-	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.2.ebuild b/app-text/calibre/calibre-1.2.ebuild
index 04d6d7785bc0..e03630e1917a 100644
--- a/app-text/calibre/calibre-1.2.ebuild
+++ b/app-text/calibre/calibre-1.2.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-1.2.ebuild,v 1.1 2013/09/06 20:37:55 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-1.2.ebuild,v 1.2 2013/09/08 11:26:34 scarabeus Exp $
 
 EAPI=5
 
@@ -35,7 +35,7 @@ LICENSE="
 	unRAR
 "
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 SLOT="0"