0.9.21 version bump.

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

3 files changed, 201 insertions, 15 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 4801fb181d7b..9f26a4f8034c 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.263 2013/02/27 19:06:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.264 2013/03/01 09:20:58 zmedico Exp $
+
+*calibre-0.9.21 (01 Mar 2013)
+
+  01 Mar 2013; Zac Medico <zmedico@gentoo.org> +calibre-0.9.21.ebuild:
+  0.9.21 version bump.
 
   27 Feb 2013; Tomáš Chvátal <scarabeus@gentoo.org> -calibre-0.9.14.ebuild,
   -calibre-0.9.19.ebuild, calibre-0.9.20.ebuild:
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 96e7af325256..77ec0d182ec1 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -6,23 +6,15 @@ AUX calibre-no_updates_dialog.patch 891 SHA256 59cbef4d8026241bd198f36728c4dfde6
 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.21.tar.xz 28241444 SHA256 712d254f4ab717c2d720aa25d956aa039c4c7edbd7f7502773915468b21004e0 SHA512 4b11347a4452d5f125e9bd03361d70361898473d5ed407b842a36c217a792dc80ab9cd337eb492e9b65805c6939a05f75181736cc51849f541a3ed5aa05e300b WHIRLPOOL cfb6eb53932d849fd32a14c2ae1c9a66e2ca4b3063bc0c026b72738fc46b91676cf72d25456963daa015b89825a83157575bcb08f983ee9af98f4f3a4595f0a4
 EBUILD calibre-0.9.20.ebuild 6372 SHA256 51a4a394e8f436af7b66f31807fa43bded879c2c9b10777f3313be254dd6280a SHA512 389643b3a818899d2e9116d7968187353eb90b3b78e4a2795da062bf48433e70956c72529e8bedbbcfff8ef32a95552632374f1fef35bec2c36cd6a0a541be8a WHIRLPOOL 6a22964700d274912abea49ff1abe08cfc7bfe04585738d4108a48c2804a26f21713b52c10f562d5d34759891e44414544ae5e5c2cfd962e261cba0257f28be8
-MISC ChangeLog 42019 SHA256 f621cd14225041c678989a3c524df0fb6b33e1954b33cf3dda6f47b183749270 SHA512 94373994ab9592784f1a158ddddba77402fb786b54c246a6b3963ab49eaf068d0f6f0291155bb396ea710bde714626ae4694d2f33d341b18ad899a17bc2ceae6 WHIRLPOOL 06edfe34ff60c2f5a72bddbfcadb69bce991dd66c9cf399ec9123c0ca9082492f3a6a614d61f30c82c3fb3a540e3ad66b6ce8ac3e6c35088b8764261b9da614b
+EBUILD calibre-0.9.21.ebuild 6372 SHA256 3ad9d58cbd00f7dcacf8196d1c8cf315329b8d7524db7f5f963bf20ea2dd9629 SHA512 e9921066ed3409fca5d96078194e5434e8dbfcbc8bc98751b381c88bc485ae1c188bc48f6db254bd0efef674cadecff001e00a05d3834ee27c061ee685d29c5b WHIRLPOOL da7ed6b4064d976b1d2a8433a00c57e3575fd5c8d3b24012d6f823b9ca0fe98091e037dd3d21cd833519e27a293c97933f3782dc61d89ad005518884da4d1d7d
+MISC ChangeLog 42143 SHA256 6e5e2afc82aad7393096b7c62eac0674d66f16daef9bbf7271a8551d91b7737c SHA512 85713fe79c3f93ab7ac632dddc9e06c5ef42e747d10472789924d94b4bddf3b52903e325ff03844c7143439470cecaabda18b95d5d014684b01b3621111dc682 WHIRLPOOL cd15eac2e12a9acbaaac56bb600fbd0b93f043243b799bf7e0ce06a7a9daaaa6a6c2b6298bbcafb182801c61e0c22845b24c73d41f7f45e9900addd321ef7350
 MISC metadata.xml 340 SHA256 db5a0163e41af3aa60492fbffbbd971e2ca9d76097d5da9d3aabf3c16e4294b9 SHA512 9cc44065f152a92ed8428da1306dc08ed3222cc84e38c0390480e1fed4f7748ff66fed8456ab25004b406fe019a29b5cab9b4bce5bcd4a934a4390b984a08333 WHIRLPOOL 928948af880ac651243ac947837b22c98528b779e6251aa26e72b4ca6e16bc05caccbae5c665e2ae7dedcecc2f5dd28d05b1f0b598f6e0750c85eedc95aac04c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRLllXAAoJEOSiRoyO7jvox08P/idDtc29j7ZvOoLYxtv6N3+O
-mBs9TxGuDloMsPgKomtb2mXWeqz/DITmVrk2/meczRto55EiJuyJHfjLJJuHAKFi
-GKONzB2lP/ZvMSfNsk8qoL+JTF+f2MuOX6hH1iOR9RhuTNT83sqdTgd5WDGSFMzJ
-OjAl2/8m1EZaFHGfjMJYVIQza13hGciWILpzCMp8ou+BCPtU6l56ZoTzFWwnBUvL
-787LiBuYoz6XGJQe4yTrIf9BsT/8xSLC8QZUxo8VhRTj79DAeUruU+wpRiU4XEEZ
-PJ9I+SKFKa29agNlFQVXWSj6AEGFkV93oKo5cvXFC7CYFYiin4r5D2siUlFI0xi3
-BglgXUN8mzDkQ/kqoDkk43IIQ+ggo9ou8V4pLucmnSTqpG1faUWen++KNcaPx5xn
-AXsVmp2wculVFfgu3Spp8nX4Yn/DEwogdgo6e0hmQCED8ylBoBL97Q7/v0/v5ngG
-lQVgM//yubihbJu1qc92+hmOoRxh2nIRoXgqD+JUoraSdwjYK5cfV12tarLwbkkZ
-NOHOU55/12PAvDYwahjmlX7DadFUmSijdZAs2hJ5KikCiSrlOqV24rx8kur5UByW
-DZ3xvMgWnh1MOzoKTzhLtPDT22NY0fA6iO+oVUw2lJGZ5dF8xE0xTMSl8Prne4qt
-G8lfMhld1L8zYGfKlBUB
-=6BJq
+iEYEAREIAAYFAlEwcvwACgkQ/ejvha5XGaMSUwCgpgbVlMtSzjgGdMZJyPwYQehG
+3lkAmgLJfF4+bisObSdmvs97AMpRSidi
+=niMM
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.9.21.ebuild b/app-text/calibre/calibre-0.9.21.ebuild
new file mode 100644
index 000000000000..3e2c98c019f7
--- /dev/null
+++ b/app-text/calibre/calibre-0.9.21.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.21.ebuild,v 1.1 2013/03/01 09:20:57 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=
+	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: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}
+}