0.9.22 version bump.

Package-Manager: portage-2.2.0_alpha166/cvs/Linux i686
Manifest-Sign-Key: 0xFDE8EF85AE5719A3

3 files changed, 201 insertions, 17 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index f2d06d641a24..df4f7ebf3c99 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,11 @@
 # 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.265 2013/03/02 19:40:42 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.266 2013/03/09 03:19:28 zmedico Exp $
+
+*calibre-0.9.22 (09 Mar 2013)
+
+  09 Mar 2013; Zac Medico <zmedico@gentoo.org> +calibre-0.9.22.ebuild:
+  0.9.22 version bump.
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> calibre-0.9.20.ebuild,
   calibre-0.9.21.ebuild:
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index f2875dfb7031..d0a04414213d 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -7,26 +7,16 @@ AUX calibre-server.conf 523 SHA256 55b20e6a208f7eb7128e0f8e0f8ead83a55ef80bcb627
 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.21.tar.xz 28241444 SHA256 712d254f4ab717c2d720aa25d956aa039c4c7edbd7f7502773915468b21004e0 SHA512 4b11347a4452d5f125e9bd03361d70361898473d5ed407b842a36c217a792dc80ab9cd337eb492e9b65805c6939a05f75181736cc51849f541a3ed5aa05e300b WHIRLPOOL cfb6eb53932d849fd32a14c2ae1c9a66e2ca4b3063bc0c026b72738fc46b91676cf72d25456963daa015b89825a83157575bcb08f983ee9af98f4f3a4595f0a4
+DIST calibre-0.9.22.tar.xz 28285328 SHA256 acdf49fe7805175dc0506cc3c7845cfad5065549ed138f35a547e6d699ffd92a SHA512 ce0e698dc3ea988e1e16834c00631004f473cfa9fed4e3ecf18b9834bdfd7ebb3de87bc3d863e44783256cace02498d7d34b31f42a4f0f1dcaf37ad1b043e0bf WHIRLPOOL ff75b36ba777a8680ce8ea93d1051bb21c8e69a9781bc644f9d8084ab6ae342be7240f31ca0a269fa31ba022eac37aa3d9223ed4b33222d4ca18b08a1b875aa1
 EBUILD calibre-0.9.20.ebuild 6365 SHA256 e6ac595748d191966a0b00df3cb0633bf1dea901c0909592b8ac208b9c12cd10 SHA512 f4e5b7af5c684356efadaac49b4044a9e6ead04b0c4823ce259ca888daa68503b52cacf85a77c40f18fe792d5143c36c434ee4aa78a3aaa31cecd99b9599b2ec WHIRLPOOL be9897df79d09de2a1ea1c9cbf27e184e3041041313cb59f874f053fcdddb37feafc1620aa9440e6f37475d63c3f48ceab70dee235dea0ff1c457e6b8a1a6e82
 EBUILD calibre-0.9.21.ebuild 6367 SHA256 15582a6593c7e4f1dc0e34af9dfd14a23635f6e8fce886f27e35d9f3245c4f50 SHA512 ee6cdde377a7c5fb611c7fc2264d62c9bfb2fa64bf29749aa184d86902b37866dbfdc8109e855f0d648e3d7c2c91db12c9d0c5eeb0aaf6e9600177d7e3fd1d1f WHIRLPOOL f04a8f24b1f06b9157432c2cb3f538e5e2d61636f54c91797649b30036b464bd5cf4a1aee55417a90e34e552e02814213f55fc58fdfb7c052c7bca8f5225e8ce
-MISC ChangeLog 42289 SHA256 171a95f12cb9adc61f1b21e2686f10aed3373745a7c13cc8d832c62d932d48eb SHA512 d475b4938d257349fcb1ee17b1e36e60ad9e0d02592718efd3bc873acb11e4e0220379084ca64d5ec6f83d0d7fe35f0bc3bd646ace150b53eedad85c037bfa33 WHIRLPOOL 82a1d8d5db61dec992de52e83b2819f7340491f977433792da0fe147a87963c3f07c70a647fe8f7896cbb34c3992d5118813497bc00a59e643fa2b1fb98b9a6e
+EBUILD calibre-0.9.22.ebuild 6366 SHA256 ee9ada28a94b6f112dee76c937ae0f376cdc4699490a093822c6e4dbb1dca176 SHA512 bc1b96d3fcb2dd2a97467ea3a57765dc4f8e47e99c499bcefc4f79ec6d236c78acb7a027f31c398362d8553d0742438dd967fd3e61b32a4c612c3e160fd26e21 WHIRLPOOL 2dff485467f62844e95c45bad373daf650106370cbf6b8d410cd1aca1ae60c22521bde0e10c7fd2f6cedc6122b91ff2531c2117dfaa6654f8e20df4e3799a7cb
+MISC ChangeLog 42414 SHA256 21a003130b71aad29ca51e289e1d75a8f84a244b5d43ea438be76bfc864dfbf0 SHA512 4c37e32d7260c1e48c08c40297661c5928f0aab47c97abb8c1bc3bfeb10b82a86319fb5ac18177584c9315b2b5f4ef107bfedce6812eea672c69a0feda7431f0 WHIRLPOOL 90916727e74f48f6cd695b803039bb8d2bd8bb6be9fe1edd2c523a4d76419717b5ab530fba2a1ebe2a331a5c7e17c0a2ad94c6a9bf2ab86e1406e2063bbd23de
 MISC metadata.xml 340 SHA256 db5a0163e41af3aa60492fbffbbd971e2ca9d76097d5da9d3aabf3c16e4294b9 SHA512 9cc44065f152a92ed8428da1306dc08ed3222cc84e38c0390480e1fed4f7748ff66fed8456ab25004b406fe019a29b5cab9b4bce5bcd4a934a4390b984a08333 WHIRLPOOL 928948af880ac651243ac947837b22c98528b779e6251aa26e72b4ca6e16bc05caccbae5c665e2ae7dedcecc2f5dd28d05b1f0b598f6e0750c85eedc95aac04c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMlW5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88Q50P/0Cm2x4Y+UUAt8CrlMcI0Gnr
-DNa1yyt3lww8y2PWiMZ9YtVAIhgNmHyVDRtTvN9W458DPDVKJ3hgnBmXwQ+ByFBV
-TwSiESS06Nwb7lWjCZHc7QbkBkE8fOeaXyJKT4C1P7N0uXkHqEBXu7iUgU4jaQBU
-i5+07KdN8H6CvNuoARi2JcAR2dzTugZWeobxgDZUYAre0GG5IPt4hXFBRgQB6J+h
-Vf/mT/7i7G5vYo4TWH9OTdTS40uW6n+SxPiwPlH9DF2RgfyqC+DTb5si07Slk7Sr
-+/nqMmiQpgoa1vsYzBh+CgFxp9A8L9I/tT45Vuxba9DG/lTAkdij8rD2yVEoAROm
-v7Lfoj6bdz2Ia6KV29mdbY20m/bTLkqfuhSHmMyZ57RVAYm69pVOLtttDhCEmiya
-SqI6f6ly9UUVRbfHWevrAvbpdR8KvSQhUDOchf7OPbSC4n9G76I3RX8JoRhmx7n/
-U79SiG+ovGaFveRYq6dg8tzhd1XorORmr8OQ3y1alYH4g2YucCBXbMbDv3psLm1E
-0BHWKcks0cGpHLBkheE9Aoksmx4Su+mnh8FqvpQIi4gIayhELOlCr1V1JSlwu1hN
-oFS6A/ozirHH5EhpI5KF0DDhB6rFrW8RMOiXSQmI3gCnZWXlYfjvFVTM2c1UpXwO
-CJVGLf/yPJvHLO4PqbR6
-=1kUU
+iEYEAREIAAYFAlE6qkIACgkQ/ejvha5XGaPpEgCg8nZD4UGV3kKPz9y9z7RUNVEP
+k3QAoOeYyWRDD2zNyBqyC9ACXZnUge7D
+=kupt
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.9.22.ebuild b/app-text/calibre/calibre-0.9.22.ebuild
new file mode 100644
index 000000000000..a05d8590c7b8
--- /dev/null
+++ b/app-text/calibre/calibre-0.9.22.ebuild
@@ -0,0 +1,189 @@
+# 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.22.ebuild,v 1.1 2013/03/09 03:19:28 zmedico Exp $
+
+EAPI=5
+PYTHON_DEPEND=2:2.7
+PYTHON_USE_WITH="ssl sqlite"
+
+inherit python 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/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}"
+
+	# 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}
+}