0.8.54 version bump.

Package-Manager: portage-2.2.0_alpha108_p8/cvs/Linux i686

3 files changed, 183 insertions, 16 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index fcd7aa9f5730..6a681fe4e3d3 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.207 2012/05/29 11:25:10 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.208 2012/05/31 21:59:19 zmedico Exp $
+
+*calibre-0.8.54 (31 May 2012)
+
+  31 May 2012; Zac Medico <zmedico@gentoo.org> +calibre-0.8.54.ebuild:
+  0.8.54 version bump.
 
   29 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> -calibre-0.8.48.ebuild,
   calibre-0.8.52.ebuild:
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index c17f6886361e..4a5bc3c5b441 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -5,24 +5,16 @@ AUX calibre-server.conf 523 RMD160 4cae757bc84775b66304d969f241b5e377b0e469 SHA1
 AUX calibre-server.init 1928 RMD160 673b3128df7c24151a74a5c87b54020cb63bee62 SHA1 8192780f7c70a027fa962619d519b136d3d8a7b8 SHA256 d5632da5955d1304a0b750850b8933eb053ee3462d0a9f74c941a45d8b65707b
 DIST calibre-0.8.52.tar.xz 24690364 RMD160 3041d07f0c9b8a67fc0457550968814be4d826e9 SHA1 7ec70aa251f90991be876cac9ea731ddd619b4da SHA256 29eebc8c82dd2cacc70e3fb5bc309020348028752a23765d8956769b79deaf2a
 DIST calibre-0.8.53.tar.xz 24703236 RMD160 1c785efada730f7996f5fd561f0cb0967c4236b1 SHA1 6f374e4c3f985768e6b0c7d42bf0652046e393f4 SHA256 3f9b2c530c240c07a7d5d83479f78df588334d705f4c98b0535a04f5cdac544c
+DIST calibre-0.8.54.tar.xz 24733284 RMD160 08dc646b72e6244fe8522f13fd724107c7c401c4 SHA1 9d13634db38e73d6ff8b015c57691eca90e60b97 SHA256 063b733e163b9bf78002f9cb35c2041a5f5550c9b91b38c8aa2b4d256877c847
 EBUILD calibre-0.8.52.ebuild 5640 RMD160 1d2fce319d312264603c0c9a29b6cff75ad1a150 SHA1 ad4fb132e5f99c464efa9d3a2bb607be08f09572 SHA256 7e7187ac3e38cf8c5971e787866bfe70c523935cbad00d09e67107b0d190e82e
 EBUILD calibre-0.8.53.ebuild 5640 RMD160 d99debd2ff0665af4a01e6318232a16b15b1e22a SHA1 0e5846453d36f9d41a0911272b4c4e2fc40b4b1d SHA256 4e36c21a508fe5d7384d404e6b592fb6b8a97fca564f1889fc588a28cb6f5017
-MISC ChangeLog 33446 RMD160 1837787f029588149b3d7f062039d833ae1008a9 SHA1 7d459f08b954f1d308cc74c69e888c09a28f2ec2 SHA256 4f7a435f6bc6f13a5118ae080ac11182cf7c92660052a8565a57c1e0c74fa80a
+EBUILD calibre-0.8.54.ebuild 5640 RMD160 da2ed8994fa667cc715f048663e3277339e63ca0 SHA1 cb514928f5e84f19ab7e34b4c586d8746373d39d SHA256 9bec309bbd53832b04eea3551512fb6dc5f52727f1987045bde1a3b198cef021
+MISC ChangeLog 33570 RMD160 9013ee34cc35233fc1b3c9c7f1e64e9e59089576 SHA1 edc9afdf87f742553b7e65fc79ade7fc452e7d92 SHA256 6c3a048dcf926709ee8ce19ee65d6a6d24f1d8ec3e1bff69dd64ec0e9ecf20f8
 MISC metadata.xml 340 RMD160 87b372ab564a33c6eb65bc2656e39cafe431ee97 SHA1 3b79f0e21800238651f138d5e1f7101bb80c8f5a SHA256 db5a0163e41af3aa60492fbffbbd971e2ca9d76097d5da9d3aabf3c16e4294b9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPxLJ1AAoJEOSiRoyO7jvo5YcP/3Upo8TiS8jTtGoCQji5jaR5
-2z8/OfSl5ykmaRoqSUXX9CdLroPnucP2XOYB86ryEnOiG+emjcDjk3esqcPNXOR5
-Pwulc3uTSCr73tDEE0tJ2DD7YHHToi6Hy6DU3o7cVx5TDQpCA5O96wTiybwkJ8IR
-7//Or3d9pXB7YB8Qk8KMtiedIr3odYc77lIkeHSLDQue9fuZhUV8lT0EeX7V8Eza
-VC1ixkN3mdkQjkwSRwM9+xZd54lp3NFGYQtMB1VWCcizFAWCaKT9ryZComh791FT
-V1tYX5NJuq6LUe9pgrLmW0flkJcoGwBeEa6R0cpa6msDlDB54BOnuhCoNnPNkNuT
-Nqsy1vuL/h5AmIXMdOFaVPgALCHB78D0DLW7L4MIDfDG2fXrMlI2wt16lCCnpIE2
-4lCfinbi69U0llnwRQ8rSSp8jc5iP6rmsp40xh08XrSRXI7/ilt+BFlwQPJzKK+q
-LBQ+5wdsyp3C6yZNs9xEaDHFmYS1FJnJJsJOi+eo1OCwCm5dJkpaEO5DrtFJbFjV
-y3PtPSqP4kLKR6pj8yQoDETG6Je0daXNrxQ4C0sV6pSjdZlutj3vbMbdtgyeKgnb
-I0INEe8W48LnpMGLVQwKTVljEo4x6qwcsnDHOKvjZd52qh73ewIQeVdCb8OFlD8r
-XUpF1DtIT+RZs+ZELiek
-=SFDn
+iEYEARECAAYFAk/H6b4ACgkQ/ejvha5XGaPjLwCguF5pp3/BhIy3QRW/43V/SBnb
+dk8AoK8+u4ZFrzcw6tyCkRiVWvmecBYN
+=sWhl
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.8.54.ebuild b/app-text/calibre/calibre-0.8.54.ebuild
new file mode 100644
index 000000000000..ea814b2cfb95
--- /dev/null
+++ b/app-text/calibre/calibre-0.8.54.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.54.ebuild,v 1.1 2012/05/31 21:59:19 zmedico Exp $
+
+EAPI=4
+PYTHON_DEPEND=2:2.7
+PYTHON_USE_WITH="ssl sqlite"
+
+inherit python distutils 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/python-dateutil
+	>=dev-python/dnspython-1.6.0
+	>=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-gfx/imagemagick-6.5.9[jpeg,png]
+	>=media-libs/libwmf-0.2.8
+	virtual/libusb:0
+	>=x11-misc/xdg-utils-1.0.2-r2"
+
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( 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: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 + \\[ext\\.name+'\\.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"
+
+	distutils_src_prepare
+}
+
+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} \
+		distutils_src_install \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}usr" \
+		--staging-libdir="${ED}usr/${libdir}"
+
+	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
+
+	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}
+}