0.9.15 version bump.

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

3 files changed, 196 insertions, 15 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index f449c78c7b66..0b12c66e94cd 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.252 2013/01/12 15:35:32 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.253 2013/01/19 08:07:02 zmedico Exp $
+
+*calibre-0.9.15 (19 Jan 2013)
+
+  19 Jan 2013; Zac Medico <zmedico@gentoo.org> +calibre-0.9.15.ebuild:
+  0.9.15 version bump.
 
   12 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> -calibre-0.9.13.ebuild,
   -calibre-0.9.6.ebuild, calibre-0.9.14.ebuild:
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index a9df17c1f87d..c6fe8f12c8e1 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -4,23 +4,15 @@ Hash: SHA256
 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.14.tar.xz 27947396 SHA256 e9df7052902a2c5447abe4305d7cee0c8b675b52f299d6a879d232d3901059a1 SHA512 bdb25750386d692ee909c5affe1845f4098444d340f80333a6002f6a1964477ebad0fc5f80bf1c499238986cab95733a75a8051dde937babf9065ca06fdb60b4 WHIRLPOOL bce5a0486eb9bd45aed16b14df78b8472cee0da2392958889e340f2b6f9eea8e965b4a7e8e5f1fee842d76e17b25d46feb68b9d8f415a55b1bd0862b71c5b223
+DIST calibre-0.9.15.tar.xz 27934432 SHA256 223c0f2813af670460f7c8daccc8b58b7a0f0e2aa7c8c07e6d37c8d186aef391 SHA512 3cbbcf50075413c951ed8e9b21f9f3690ae00bb7bba5c74d5c5e01bb46dfffeb4b2f70a1a4bc73e65c4dea993cb26dfdf8532ec9c020cad08cc4e46adb42ed2d WHIRLPOOL f8613110546a80fbb239b14ec47651689c82b6bdc570f68c97f608bcb5e7261c0e114e54d325a8a8b5421b542b2ebd8332ab4deb7ec326ff724d07e8dbdc2180
 EBUILD calibre-0.9.14.ebuild 6100 SHA256 731c48d9d893fcdfeb6c959312fedccdb1f43d903fca775e7be4fd2c84499e2d SHA512 d98d827c12cd9cd40a180ca2bd6ece47fde5c651a393c8d8b63b7dd567495e5c0435f49ecf701b6b68f674d802bc0cc251de7d16c3c2db7867feea81d4803a64 WHIRLPOOL 8456cc2deed5d1b74a7b3d65bd6603a4e78aaf7c8f1b0e292fe8ad6e880dc2b6bd3f93c95a69b7a144fb9b9475a451a9f4d51226307fcefc549b3b12810d27af
-MISC ChangeLog 40261 SHA256 59d50a7b2a5c2f96acd4d068ff4ac9d74a2f2f276892e254e0d515164c3a98d0 SHA512 5a39a2fd39fe3a05cb63f2de1b07e017eeb7b8202633ab169a4f075ccd7ff64e8f821ea23b290568e581b27175aa379fbb33f6615ae249ef3f13e2ee69d92745 WHIRLPOOL 654e6af40ddca00fc8d1c5b086d43a1a8d62d7fd31c816041340315469182489725594fbd9807b16e34310ea2fccd24103bcae8a11905c84e1b79661ffdd99b5
+EBUILD calibre-0.9.15.ebuild 6100 SHA256 69c7f291398cf296eae61d152910117da5d73cec92c52e1e92371599b8896f71 SHA512 26ec6e2f85cfce94247dc52238f300f788aed0dbdc0491e90923d6b7dc4c02f4a945649aa0c4e626a3cb260c1f9047a84bffac533d1d11161640f449fe038a59 WHIRLPOOL 55dbc64439c3072445dbc995002e7d1f1a3184b8dc04f713b371efe2759bac9ee891d3120439b0442d1d67e63bed922118e70eba89822f09d56fb7d5cc70da34
+MISC ChangeLog 40385 SHA256 fb7ea7ac4a6c4377c0c8ca1c8eeebbcd108231678aa9deb76839785fd166f083 SHA512 40eeac99890139e0dedfb6768a0265e27a6281346525d8edfb308f7db47f4fddb5e83e2b8115685b7425eb4d11d23480d6ed22a75bf8c6210bfb3563bfe49f89 WHIRLPOOL 9f27c70d64ca414cd740ab04293c100df180e36ae632234c61203fc5dd332083de0437bf97d72a045796dc4e2e14586466851aaf65fdb39f4159fc8401d34933
 MISC metadata.xml 340 SHA256 db5a0163e41af3aa60492fbffbbd971e2ca9d76097d5da9d3aabf3c16e4294b9 SHA512 9cc44065f152a92ed8428da1306dc08ed3222cc84e38c0390480e1fed4f7748ff66fed8456ab25004b406fe019a29b5cab9b4bce5bcd4a934a4390b984a08333 WHIRLPOOL 928948af880ac651243ac947837b22c98528b779e6251aa26e72b4ca6e16bc05caccbae5c665e2ae7dedcecc2f5dd28d05b1f0b598f6e0750c85eedc95aac04c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ8YLFAAoJEOSiRoyO7jvojGwP/3tI/pwvSzSCkNMCPRT+eDDt
-Ky5FYNii8NJ0eZzJSo59wRqBJaqTzzUGmB3fx47s2XDFrtD03X53aAbYDz31XlYi
-r4JYSD42QZLRmHEr6vFSy/FquD9oVl9n8NY+w+ZPX1fMZeyOEE23QkRK67V5+zla
-PMl02lRHtbliJqf70kgRtjv1OvC71Hqg21jPScqvbDQcBfUz3MoGvpqFqWf2tm5j
-YlMbp4yUeCQHb3qQir3WnrluRlPRo0glifv7iaDrVX/i1DTvJMWWr8wOeAHC21z+
-pGXIoi5jm+NTW907L9aXWTVuafrhnw9XQGj8a4EMkBUpU1zh6UImPOCPO+0QcYyl
-VugC0m2OMc23qOlPCbbX8jrDXKtWtiOWOC77gXbnB44cQux2p0YjQqxOImI3CZDw
-slxJl6Px0LMx/pCtib95JAnqTQtfMqtscsBipnKBQfshb5/oP76wzZ2LJ+GuO/qO
-fhF1a7vwCse8oiIbjrQNc/79PCfvfSR9qBftsauirMuEh1u+pYANDDI07eHVmVxj
-zorJZ545meiKk0Azr9Q1y1LJ6ZihFeVlkJJ5nrWLgDFdqmjrldqEVQ/iJFuzMnIK
-kcYY8tQrnN5GrHVPiVRz+JmO1p23uIRZCBZKudI7Ry8Rtg8+5lqXCkYropvSojin
-mtXQtQxg99cZZUTJBsdd
-=+2yD
+iEYEAREIAAYFAlD6VCgACgkQ/ejvha5XGaOz9gCffi/2XCaVJd8YEDEs8JL8M0Ff
+8FcAoIhI2JemEpu1gmc8JuwXZ3+l8G8P
+=sgQK
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.9.15.ebuild b/app-text/calibre/calibre-0.9.15.ebuild
new file mode 100644
index 000000000000..5b2be99929c9
--- /dev/null
+++ b/app-text/calibre/calibre-0.9.15.ebuild
@@ -0,0 +1,184 @@
+# 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.15.ebuild,v 1.1 2013/01/19 08:07:02 zmedico Exp $
+
+EAPI=4
+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"
+}
+
+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}
+}