gentoo auto-resync : 29:06:2024 - 08:00:25

8 files changed, 259 insertions, 13 deletions

diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index a07ff1ac31cf..1e0be9fec5fd 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -13,14 +13,17 @@ DIST calibre-7.11.0.tar.xz 44329708 BLAKE2B 0c5a1ccafb9c192b7f25998174f2b9ea3571
 DIST calibre-7.11.0.tar.xz.sig 566 BLAKE2B 2b035fd2a31f5954de229c932c4aca58c0850a3fdfa793932ef81bd84c4612e65ad12138684932714a85e7be68d21cd808f4008d096121d047ae9bf053b893ca SHA512 ffca64e38e5e402c8fc146dff850a67e0644dcf665c5b0d36f9c9ade6702a980f11dcdf73147412c6ee384110fa8a27168fe5c759ba4754005647f8f656a543b
 DIST calibre-7.12.0.tar.xz 44341928 BLAKE2B 18d3178b9daafaa674949b29528d055dea4e13aad937b8b75e22ac7ec9f9df1aa5c6bd5ca76b151347461077d2e2fc7888a9b46d1c727059db97ea49cb396b1f SHA512 ee654260d7047f0579a659b8907439a407fb561affcef84141126840452e7b98d10bb5e0a69e0cc809d9ba68729570900a0e7251f18b2056a94b0213880f1363
 DIST calibre-7.12.0.tar.xz.sig 566 BLAKE2B 3fb90d638b00e1a9bf481b16e947cf855e89f4c13f5614ef2003fb0447c1131dc4d1a6101dde7e413bc1b9b5ca3812d3f090f00a0f4e14e8029f5b2896286b23 SHA512 12c78975b175f08208a4e7d2b9734b2f886d0cd3804b1d2f32f87190b648a79bf4eac6b0650b74c0e93682ff60f74be74d86a5c02d7e5bd1615c0799b9f6020a
+DIST calibre-7.13.0.tar.xz 44331860 BLAKE2B d5d9d04740dff52e59af0efff30e1044d52d188d58a91a9c8191084e021218feffca15cbde27f12a742e38d6db49168c6c6b64b1df9de5384c1b361ef66ba10b SHA512 b64bba8b6982e2f41b6e1e1d9392a07f15307781a1da3b2f2daca464f1d1303a7ff44af398c0c0edc84dda8090cd47461bf1570daa8ba12496661eae2f3c3bca
+DIST calibre-7.13.0.tar.xz.sig 566 BLAKE2B 40ee9d53eb658623f0047601ddf26bde232b9f4575309faa09ab2ea74b70d8c43fa82a7dc80bb322fca908923661ed8ec33050917196c0f22ff490f9348b266f SHA512 6943ea01c30c8c2ed49f115873cbe1d75484a79deedf734d77ba2326b6f2a2d35994b0219d8e81789e46e8a56d01a19efe8f124c8ebb546b86fa287d8449bf6e
 DIST calibre-7.8.0.tar.xz 44167208 BLAKE2B 676f5519b2809ca91c972ce0b4227aeac977945248063be58f8ed387c2dc1285f01e0d59c52ba9dea3a25842be1f97cdaece7f1eac5c208503240ff9ac3f0093 SHA512 c90d247af3a8ba3b2a94ca3a03bf9ee4d1c8f07d6feaa1ec045d639f448c476c4be9568e66845e7067e32b746e0ab034be65084a60f2b64f961f6678a30910e7
 DIST calibre-7.8.0.tar.xz.sig 566 BLAKE2B 03f283bee606d3071a2602ad2b1cc962b3d0cf6737ca294955524da6de7f22ddbe740d9b455332961b847331ad15f47efa884cc65bfe1a42eb46bef9f7a4a1dd SHA512 527a931f6d8701580b7b405124f53b54bb6ca65056aa41d677806a00c2ece3cb138c1c37e0d29394ee4e83487dec9dc7e82b6db63a4154e19f8463c19956e040
 DIST calibre-7.9.0.tar.xz 44164396 BLAKE2B 523b3aad25b73f4de4e2e5ce323dc63759fa1d2b65b646d3597dea42723f6a047782b019547df69d824f64cea8ca4c5964a17f37c3ea6beca95c5016bb839791 SHA512 388f47e13e0a682ae61a32ec2d7840e1514dd5cc79cc9ba271cee7619ad67f270c5059849e9412545bd4b9fa0904d105f5e88736956aba37abf9ef3ac8e1e09f
 DIST calibre-7.9.0.tar.xz.sig 566 BLAKE2B 7a5c9b835edf649d790c5da143f982deb3ce908fed40a557761b7f80bed372502010ab77c57f2a3f3f4de96bbc1a7f8bae6285c510b7bc1d053fc6571e77491d SHA512 c7ac1ea50f09122b023427ea902ecccdd1ffd7b9e21d70dbd853f45686db912aa88d3830cd587ed6dfe9052cd240ab3771990639a8db20c2801fc244965ac71b
-EBUILD calibre-5.44.0-r3.ebuild 8840 BLAKE2B e391fd8baf637882693b9c11b43d2b7e102c8a91767d46210f36a30617d641dcf57146b79230beddf9260ed4db10942b8496458f03b6d9acd24d4ffe0867ed68 SHA512 369964a397b4caccdd060163ad4b15cb6212cbebd021dd1ea8646c9e4a08e25da73bdcaa664f3a23eca0205fcb31d8feaf4abdd655f8cdc00c0608db46535220
-EBUILD calibre-7.10.0.ebuild 7987 BLAKE2B 9e15b0398c634b14a318965bd141df972766a0384db403f4c2525b0626f20018b7166c7bb9f0afc5d38d0e84c33bc9153ab9f1336a4f491ec1487e4dff6d402e SHA512 d13eb6b9e6cb31aff9481580b7ccd1e7b334b8ccfe2c3216d78b21a91c7e51088c86c6e17962ba26578a3bb84718b365ba50da83b0cbc430418ccdcfebeafd30
-EBUILD calibre-7.11.0.ebuild 7987 BLAKE2B 9e15b0398c634b14a318965bd141df972766a0384db403f4c2525b0626f20018b7166c7bb9f0afc5d38d0e84c33bc9153ab9f1336a4f491ec1487e4dff6d402e SHA512 d13eb6b9e6cb31aff9481580b7ccd1e7b334b8ccfe2c3216d78b21a91c7e51088c86c6e17962ba26578a3bb84718b365ba50da83b0cbc430418ccdcfebeafd30
-EBUILD calibre-7.12.0.ebuild 7988 BLAKE2B 9ec4691deb16f634e88cb4edc5523e0632f064f9ae1dd7bb579bae22599efb6eb6ba769e1c8be9e3038b362f0829b50a6f2a4b53482a42e1fe11d0501df35666 SHA512 15a2b185880432363f736e19957b9a81e8657a60217bab023a80cefdbb656924da708cd820f3544f7eb0d4fa510a68dd2e800fa14b7a82588eafe6057e6cc7b5
-EBUILD calibre-7.8.0-r1.ebuild 7980 BLAKE2B 7fdfbfeae68c49b62eaf36c704bb1e188d84ae8d7d87f30647146e39432ee9e12318d3a2ade1344318284aad11dbc43aba3fe1b1a6fc3a69348b2a91876be7dd SHA512 aff7340f9af08af560139a5f307b0c5e5f637a4608833ddb77ec206f6180b3c43ba809f5ee2c83b1dba471c8119492f4dc7ac1a476a6204febbd7b9e3134dbaa
-EBUILD calibre-7.9.0.ebuild 7987 BLAKE2B 9e15b0398c634b14a318965bd141df972766a0384db403f4c2525b0626f20018b7166c7bb9f0afc5d38d0e84c33bc9153ab9f1336a4f491ec1487e4dff6d402e SHA512 d13eb6b9e6cb31aff9481580b7ccd1e7b334b8ccfe2c3216d78b21a91c7e51088c86c6e17962ba26578a3bb84718b365ba50da83b0cbc430418ccdcfebeafd30
+EBUILD calibre-5.44.0-r3.ebuild 8840 BLAKE2B 7c52f8b0295e74684f14576a9162251738a485b2e8ff2e0628209aa899d6fcd6e163a19ba56d95b174b77937bd4245f7a9fd4db03d09fccd3d1f7fb79f0e58da SHA512 75271d1150dd0cc0f5b5f54e6d9a01d856efd99279d15444b3c93d6c9e88c2260554b135e913f8c16862cb111f8718a4289cb0c276f7c76f867ec4d183e4e88f
+EBUILD calibre-7.10.0.ebuild 7987 BLAKE2B 15c5678554e68f5187d228175e6f65548a1ea9807bf06b7020c8e11b41a7a3e6fd03100d86ca32abc296c300309df7d9165364539cbaec15ca56c1dce03278e9 SHA512 af7c748f66e8a76338d96d20fa7d91d9d09b1bc00d8d187c9b44f952e827fbca63a3eb3d9d81302ce8b84ba911fe4ef711cba9df5b8d4a2dd9ed6d06f3b04c2d
+EBUILD calibre-7.11.0.ebuild 7987 BLAKE2B 15c5678554e68f5187d228175e6f65548a1ea9807bf06b7020c8e11b41a7a3e6fd03100d86ca32abc296c300309df7d9165364539cbaec15ca56c1dce03278e9 SHA512 af7c748f66e8a76338d96d20fa7d91d9d09b1bc00d8d187c9b44f952e827fbca63a3eb3d9d81302ce8b84ba911fe4ef711cba9df5b8d4a2dd9ed6d06f3b04c2d
+EBUILD calibre-7.12.0.ebuild 7988 BLAKE2B 5776c54bb55d812bd5e70d3f5a21ccd539bb1c64de9187bbe6c8c637ff359d7956cacfcefcc08a6dd41b0bb5df5ed703b54b474c6c5b36d81c3e9a143d45b42a SHA512 cb6518a1d2cd9a71c2b41c47bda28c4ca404578b86b424f0db91bf1a70a8665aa260de79633c64e98e46b18ae74f6f9aa9fddbf33aac19b691bc56899518c390
+EBUILD calibre-7.13.0.ebuild 7988 BLAKE2B 5776c54bb55d812bd5e70d3f5a21ccd539bb1c64de9187bbe6c8c637ff359d7956cacfcefcc08a6dd41b0bb5df5ed703b54b474c6c5b36d81c3e9a143d45b42a SHA512 cb6518a1d2cd9a71c2b41c47bda28c4ca404578b86b424f0db91bf1a70a8665aa260de79633c64e98e46b18ae74f6f9aa9fddbf33aac19b691bc56899518c390
+EBUILD calibre-7.8.0-r1.ebuild 7980 BLAKE2B b222ca0eb1f8073be2ebf471dc234646964bbb261434be3f169bdfc13632284b4c968a61a5fe9855b68641052ccc94a4bbf4a018df2628eb5a08026bbe85e56b SHA512 1e41f415575ba929d2e193bb8a5fff7f3acb453587386975631d53bdd76437cccffa1db91756b099ee129ccd501224129dbdd4c2fb9cb7d8396e6522fec2f0c3
+EBUILD calibre-7.9.0.ebuild 7987 BLAKE2B 15c5678554e68f5187d228175e6f65548a1ea9807bf06b7020c8e11b41a7a3e6fd03100d86ca32abc296c300309df7d9165364539cbaec15ca56c1dce03278e9 SHA512 af7c748f66e8a76338d96d20fa7d91d9d09b1bc00d8d187c9b44f952e827fbca63a3eb3d9d81302ce8b84ba911fe4ef711cba9df5b8d4a2dd9ed6d06f3b04c2d
 MISC metadata.xml 760 BLAKE2B 5ba72f0a076d86ebb3348b30aab00754108f012221f2b387e22e772841d861b9cfb1e3ff29df78bb5971b32c312a4d5ae3f13cbf23c34226f271281180e9cfe6 SHA512 0d7ed014e4ff33a793433f7ee4260e047ea6cc18825deaa024330accbbc7fe0e78b782914f5dcdcf5f3bc5d2bb8200167566c0faa44aa8cbbfaf3dcfbf4ff533
diff --git a/app-text/calibre/calibre-5.44.0-r3.ebuild b/app-text/calibre/calibre-5.44.0-r3.ebuild
index fefe407084e6..34e4e197b419 100644
--- a/app-text/calibre/calibre-5.44.0-r3.ebuild
+++ b/app-text/calibre/calibre-5.44.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -35,8 +35,8 @@ LICENSE="
 	OFL-1.1
 	PSF-2
 "
-KEYWORDS="amd64"
 SLOT="0"
+KEYWORDS="amd64"
 IUSE="ios speech test +udisks"
 
 RESTRICT="!test? ( test )"
diff --git a/app-text/calibre/calibre-7.10.0.ebuild b/app-text/calibre/calibre-7.10.0.ebuild
index 176a40d67c9a..27ed594b785c 100644
--- a/app-text/calibre/calibre-7.10.0.ebuild
+++ b/app-text/calibre/calibre-7.10.0.ebuild
@@ -35,8 +35,8 @@ LICENSE="
 	OFL-1.1
 	PSF-2
 "
-KEYWORDS="amd64 ~arm64"
 SLOT="0"
+KEYWORDS="amd64 ~arm64"
 IUSE="+font-subsetting ios speech +system-mathjax test +udisks unrar"
 
 RESTRICT="!test? ( test )"
diff --git a/app-text/calibre/calibre-7.11.0.ebuild b/app-text/calibre/calibre-7.11.0.ebuild
index 176a40d67c9a..27ed594b785c 100644
--- a/app-text/calibre/calibre-7.11.0.ebuild
+++ b/app-text/calibre/calibre-7.11.0.ebuild
@@ -35,8 +35,8 @@ LICENSE="
 	OFL-1.1
 	PSF-2
 "
-KEYWORDS="amd64 ~arm64"
 SLOT="0"
+KEYWORDS="amd64 ~arm64"
 IUSE="+font-subsetting ios speech +system-mathjax test +udisks unrar"
 
 RESTRICT="!test? ( test )"
diff --git a/app-text/calibre/calibre-7.12.0.ebuild b/app-text/calibre/calibre-7.12.0.ebuild
index 8bbc8f3c7a6f..e42daca289d1 100644
--- a/app-text/calibre/calibre-7.12.0.ebuild
+++ b/app-text/calibre/calibre-7.12.0.ebuild
@@ -35,8 +35,8 @@ LICENSE="
 	OFL-1.1
 	PSF-2
 "
-KEYWORDS="~amd64 ~arm64"
 SLOT="0"
+KEYWORDS="~amd64 ~arm64"
 IUSE="+font-subsetting ios speech +system-mathjax test +udisks unrar"
 
 RESTRICT="!test? ( test )"
diff --git a/app-text/calibre/calibre-7.13.0.ebuild b/app-text/calibre/calibre-7.13.0.ebuild
new file mode 100644
index 000000000000..e42daca289d1
--- /dev/null
+++ b/app-text/calibre/calibre-7.13.0.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit edo toolchain-funcs python-single-r1 qmake-utils verify-sig xdg
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="
+	https://download.calibre-ebook.com/${PV}/${P}.tar.xz
+	verify-sig? ( https://calibre-ebook.com/signatures/${P}.tar.xz.sig )
+"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kovidgoyal.gpg
+
+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
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="+font-subsetting ios speech +system-mathjax test +udisks unrar"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Qt slotted dependencies are used because the libheadless.so plugin links to
+# QT_*_PRIVATE_ABI. It only uses core/gui/dbus.
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-i18n/uchardet
+	>=app-text/hunspell-1.7:=
+	>=app-text/podofo-0.10.0:=
+	app-text/poppler[utils]
+	dev-libs/hyphen:=
+	>=dev-libs/icu-57.1:=
+	dev-libs/openssl:=
+	dev-libs/snowball-stemmer:=
+	$(python_gen_cond_dep '
+		>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
+		dev-python/dnspython[${PYTHON_USEDEP}]
+		>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
+		>=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
+		>=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
+		dev-python/jeepney[${PYTHON_USEDEP}]
+		>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
+		dev-python/lxml-html-clean[${PYTHON_USEDEP}]
+		>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+		>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}]
+		>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-3.2.0[jpeg,truetype,webp,zlib,${PYTHON_USEDEP}]
+		>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
+		>=dev-python/pychm-0.8.6[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+		dev-python/PyQt6[gui,network,opengl,printsupport,quick,svg,widgets,${PYTHON_USEDEP}]
+		dev-python/PyQt6-WebEngine[widgets,${PYTHON_USEDEP}]
+		dev-python/regex[${PYTHON_USEDEP}]
+		dev-python/xxhash[${PYTHON_USEDEP}]
+		>=dev-python/zeroconf-0.75.0[${PYTHON_USEDEP}]
+	')
+	dev-qt/qtbase:6=[gui,widgets]
+	dev-qt/qtimageformats:6
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
+	media-fonts/liberation-fonts
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.11:=
+	>=media-gfx/optipng-0.7.6
+	virtual/libusb:1=
+	x11-misc/shared-mime-info
+	>=x11-misc/xdg-utils-1.0.2-r2
+	font-subsetting? ( $(python_gen_cond_dep 'dev-python/fonttools[${PYTHON_USEDEP}]') )
+	ios? (
+		>=app-pda/usbmuxd-1.0.8
+		>=app-pda/libimobiledevice-1.2.0
+	)
+	speech? ( $(python_gen_cond_dep 'app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]') )
+	system-mathjax? ( >=dev-libs/mathjax-3:= )
+	udisks? ( virtual/libudev )
+	unrar? ( dev-python/unrardll )
+"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( sys-fs/udisks:2 )"
+DEPEND="${COMMON_DEPEND}
+	test? ( $(python_gen_cond_dep '>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]') )
+"
+BDEPEND="$(python_gen_cond_dep '
+		>=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}]
+		>=dev-python/sip-5[${PYTHON_USEDEP}]
+	')
+	virtual/pkgconfig
+	system-mathjax? ( dev-lang/rapydscript-ng )
+	verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )
+"
+
+PATCHES=(
+	# Skip calling a binary (JxrDecApp) from libjxr which is used for tests
+	# We don't (yet?) package libjxr and it seems to be dead upstream
+	# (last commit in 2017)
+	"${FILESDIR}/${PN}-7.0.0-jxr-test.patch"
+)
+
+src_prepare() {
+	default
+
+	# Warning:
+	#
+	# While it might be rather tempting to add yet another sed here,
+	# please don't. There have been several bugs in Gentoo's packaging
+	# of calibre from seds-which-become-stale. Please consider
+	# creating a patch instead, but in any case, run the test suite
+	# and ensure it passes.
+	#
+	# If in doubt about a problem, checking Fedora's packaging is recommended.
+
+	# 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"
+
+	# This is only ever used at build time. It contains a small embedded copy
+	# of the rapydscript-ng compiler usable inside of qtwebengine, if you don't
+	# have rapydscript-ng (a nodejs package) itself installed. Its only purpose
+	# is to build some resources that come bundled in dist tarballs already...
+	# and which we may also need to regenerate e.g. to use system-mathjax.
+	#
+	# However, running qtwebengine violates the portage sandbox (among other
+	# things, it tries to create directories in /usr! amazing) so this is a
+	# wash anyway. The only real solution here is to package rapydscript-ng.
+	#
+	# We do not need it at build time, and *no one* needs it at install time.
+	# Delete the cruft.
+	rm -r resources/rapydscript/ || die
+}
+
+src_compile() {
+	# TODO: get qmake called by setup.py to respect CC and CXX too
+	tc-export CC CXX
+
+	# bug 821871
+	local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)"
+	export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}"
+	export QMAKE="$(qt6_get_bindir)/qmake"
+
+	edo ${EPYTHON} setup.py build
+	edo ${EPYTHON} setup.py gui
+
+	# A few different resources are bundled in the distfile by default, because
+	# not all systems necessarily have them. We un-vendor them, using the
+	# upstream integrated approach if possible. See setup/revendor.py and
+	# consider migrating other resources to this if they do not use it, in
+	# *preference* over manual rm'ing.
+	edo ${EPYTHON} setup.py liberation_fonts \
+		--path-to-liberation_fonts "${EPREFIX}"/usr/share/fonts/liberation-fonts \
+		--system-liberation_fonts
+	if use system-mathjax; then
+		edo ${EPYTHON} setup.py mathjax --path-to-mathjax "${EPREFIX}"/usr/share/mathjax --system-mathjax
+		edo ${EPYTHON} setup.py rapydscript
+	fi
+}
+
+src_test() {
+	# Skipped tests:
+	local _test_excludes=(
+		# unpackaged Python dependency: py7zr
+		7z
+		# unpackaged Python dependency: pyzstd
+		test_zstd
+		# tests if a completely unused module is bundled
+		pycryptodome
+
+		$(usev !speech speech_dispatcher)
+		$(usev !unrar test_unrar)
+
+		# undocumented reasons
+		test_mem_leaks
+		test_searching
+	)
+
+	edo ${PYTHON} setup.py test "${_test_excludes[@]/#/--exclude-test-name=}"
+}
+
+src_install() {
+	# 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 LANG LANGUAGE ${!LC_*}
+	export LC_ALL=C.utf8 # bug #709682
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export CALIBRE_CONFIG_DIRECTORY="${HOME}/.config/calibre"
+	mkdir -p "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	addpredict /dev/dri #665310
+
+	# If this directory doesn't exist, zsh completion won't install
+	dodir /usr/share/zsh/site-functions
+
+	edo "${PYTHON}" setup.py install \
+		--staging-root="${ED}/usr" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--staging-libdir="${ED}/usr/$(get_libdir)" \
+		--system-plugins-location="${EPREFIX}/usr/share/calibre/system-plugins"
+
+	cp -r man-pages/ "${ED}"/usr/share/man || die
+
+	find "${ED}"/usr/share -type d -empty -delete || die
+
+	python_fix_shebang "${ED}/usr/bin"
+
+	python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)"
+
+	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+}
diff --git a/app-text/calibre/calibre-7.8.0-r1.ebuild b/app-text/calibre/calibre-7.8.0-r1.ebuild
index 3bfa3ebc10dd..e8c9a3b78f0a 100644
--- a/app-text/calibre/calibre-7.8.0-r1.ebuild
+++ b/app-text/calibre/calibre-7.8.0-r1.ebuild
@@ -35,8 +35,8 @@ LICENSE="
 	OFL-1.1
 	PSF-2
 "
-KEYWORDS="amd64"
 SLOT="0"
+KEYWORDS="amd64"
 IUSE="+font-subsetting ios speech +system-mathjax test +udisks unrar"
 
 RESTRICT="!test? ( test )"
diff --git a/app-text/calibre/calibre-7.9.0.ebuild b/app-text/calibre/calibre-7.9.0.ebuild
index 176a40d67c9a..27ed594b785c 100644
--- a/app-text/calibre/calibre-7.9.0.ebuild
+++ b/app-text/calibre/calibre-7.9.0.ebuild
@@ -35,8 +35,8 @@ LICENSE="
 	OFL-1.1
 	PSF-2
 "
-KEYWORDS="amd64 ~arm64"
 SLOT="0"
+KEYWORDS="amd64 ~arm64"
 IUSE="+font-subsetting ios speech +system-mathjax test +udisks unrar"
 
 RESTRICT="!test? ( test )"