0.9.43 version bump.

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

3 files changed, 236 insertions, 15 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 0069c6ac264e..f47657684426 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.295 2013/08/09 10:32:56 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.296 2013/08/10 18:10:58 zmedico Exp $
+
+*calibre-0.9.43 (10 Aug 2013)
+
+  10 Aug 2013; Zac Medico <zmedico@gentoo.org> +calibre-0.9.43.ebuild:
+  0.9.43 version bump.
 
   09 Aug 2013; Tomáš Chvátal <scarabeus@gentoo.org> -calibre-0.9.27.ebuild,
   -calibre-0.9.41.ebuild, calibre-0.9.42.ebuild:
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 3f83eb935dda..dda195faf904 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.42.tar.xz 29351712 SHA256 6cd64b54b4c0b696d9a6cfd50527c10cbd7b473a622f2e0f2e2ef81be680fe1f SHA512 22087645893e8626d107093d0308dfeb5a965664f6d3fe326930d663f01ad0873a32af9180de499bca1cf4c07c4634e88c952c27c35368466a1b492f24fcf829 WHIRLPOOL 2cfb0185119a3ed2c52e837028d314094d3b7a458d21a638478e3b066cde5183ed6d5d0a2bae1ddcee5aed53a231c848a57f0fe799fba00efeafda788a400eb2
+DIST calibre-0.9.43.tar.xz 29382264 SHA256 5b2d56d5ff80cdd19472123afc1054938993251e61b0d85d49744396ad7ba5da SHA512 a90117258d39a21ad83605e488e5142060138cc884d2df6ffc9264b78e4a21c8255b8e8b4441cb061117e78cae7fcb8c50887c0732fcbf0b3eda3f35290d3653 WHIRLPOOL 96f04f4a881c47bacf061c54ddf325ca5b876a862ca2e98a2b83e08f8f816ed3a9d3fc9227c0205d717c7c1bd8e3d9ebd64d3a65b178a7d4281631271f43ca27
 EBUILD calibre-0.9.42.ebuild 7253 SHA256 7896ca50da2cac22306f992fded80492521741bd1b987cbf5a12af984491db53 SHA512 07629b500404f3090709993aaf86a856b7ce96e6078a54e514eb48a648148e97ee4df716262ad5c189238cc80d6779f2b1f84f2210e89c2fffc6396dead1fa7c WHIRLPOOL e66464ed5b3d74cf42135cc2455fbf88de155c33276b400374de221bc3d32ce9c5f7fb8ab30416d7d99a4a12c5707b696001ca2a7faa16a531d7682945c910f3
-MISC ChangeLog 47127 SHA256 01667af7ccf59594927493ac7ca368e66d6c35975ce0ecaec5dc104f3072d69f SHA512 e8dc75c85bec812942d6fb912255a15b0332b4b5084260c1be45dcaf147a06aa0aadf51aadc2a40e6ecf24d7f67dfc2c04ff1e89bd9cee92db3e41c557941778 WHIRLPOOL bb28288d0bf477303d80ff315ee7d7bdf56722addd5b5c31415235a234e65875a2a247415d078792c4722e68951a5d31d996140f2fc53a7ea808e4dc188d1ebb
+EBUILD calibre-0.9.43.ebuild 7253 SHA256 7b162391cf1d1569d04a9fed4ca62a242c26c98b9bca1157ae392401a1c21864 SHA512 fbf7ed1b3b7e633302c8e0c21e69ba22a1a6206c8cb3345dbc4d0c7e1f7364ab50ecf8a89ce53a40bc17190afd07a40d441f3ee1ea84dcd7f334d7c6b4eb0ade WHIRLPOOL db494117dd4ca333686e89137b84a3f77155f133b858124e8183a12cffdde91bfc4cd507ead4821593cd4e8a7f0d5b303768d29bf4bac430bd145788a0312179
+MISC ChangeLog 47251 SHA256 4e913857cd952cbf87de153ee9c4c5413d45c1901fe4c327d06fb3abad042da3 SHA512 15e90e00a7a03bada42ef63eb3de691870a36c19ef3a65570470a80e4e64f11ea707fa6ccd0127c24aac7b5a7c332836681ebe91a0930e54886c85de3e75ff5d WHIRLPOOL 3e3ae7c24ba38d599511ea02bcc540457712ea9b0c8bd054866d434e70fcc55793bac161c5954e4d27e315c37732ad7173df0aa3e8f98b42979a4cc48a53d0f0
 MISC metadata.xml 340 SHA256 db5a0163e41af3aa60492fbffbbd971e2ca9d76097d5da9d3aabf3c16e4294b9 SHA512 9cc44065f152a92ed8428da1306dc08ed3222cc84e38c0390480e1fed4f7748ff66fed8456ab25004b406fe019a29b5cab9b4bce5bcd4a934a4390b984a08333 WHIRLPOOL 928948af880ac651243ac947837b22c98528b779e6251aa26e72b4ca6e16bc05caccbae5c665e2ae7dedcecc2f5dd28d05b1f0b598f6e0750c85eedc95aac04c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSBMVqAAoJEOSiRoyO7jvoW14P/2Jmxet6A9zrylzU0R/ESJ90
-agj2ruJap0r6AOSEf8P4685HnY7Aa89WH6efPMuq7vT6ybL7P0oHt4VL4x9SuF40
-dP0eyG1O9BsxQJLemQP8zaUQWHDNUNTdLEBef2CK3DI8bzSZb0ZJ3KTsL1rmyeII
-Qsc+kbtawlfQ5ZkqxFNe1Lf8S7Js4jqpaieI38PDpXA7IaJIv4gOROr/6Zxmew5G
-Dccb9uuVdI7acTBEc2FVNbllLSiHKNJEJceax618Bq4GKhhlWapfAS2wfGMXkWCS
-qln2g4uxn9KQ/MkwucNys8tR6Yeu6pn+1lgCQLuLSqgQ507SPv/ROlYcv80L4snC
-7Wv6r8cudlfTbSHWUq69elD4yDj3ZHPwVTyrknYQ7OkcvJE7vWMcz1BKXWAe8elL
-xrD4lePyKdJul2qwKG+JeKlw/4XNnnnCi0klPnj+1NWsMWJr4hdTasgXNos0AE95
-vT2/M+H4et8zKZoHNSf+eo2ue7csi95YkwbQZkkn654O4wr6FlnXRBLY5rMFNv4V
-Io94krMn3vStD49GRJZio6T4wZdbjutll7tjbW8cLhcuMZZQ8EW8TzO1+t7weLxf
-s1jcKyV9+iNohAzumDvlTUK/KlNYHt5Cye13lTnRtGJ2iiaxI0byv12U4ZlBfcVz
-rMONGg1PwgGAkmbTLhyH
-=jPsn
+iEYEAREIAAYFAlIGgjQACgkQ/ejvha5XGaMXngCeM8PWh4NclnKAIcOj3yb5Ibgf
+YIMAoMCOD9kCdw0aKrwWLm6RwgDGdW2/
+=xEit
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.9.43.ebuild b/app-text/calibre/calibre-0.9.43.ebuild
new file mode 100644
index 000000000000..b1efda46916e
--- /dev/null
+++ b/app-text/calibre/calibre-0.9.43.ebuild
@@ -0,0 +1,224 @@
+# 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.43.ebuild,v 1.1 2013/08/10 18:10:57 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
+}