0.7.40 version bump.

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

3 files changed, 181 insertions, 5 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index ec38678d7d1f..89bb203e40ea 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.125 2011/01/08 10:15:16 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.126 2011/01/16 05:58:42 zmedico Exp $
+
+*calibre-0.7.40 (16 Jan 2011)
+
+  16 Jan 2011; Zac Medico <zmedico@gentoo.org> +calibre-0.7.40.ebuild:
+  0.7.40 version bump.
 
 *calibre-0.7.38 (08 Jan 2011)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 4395501b684f..18fd21a68c88 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -5,16 +5,18 @@ DIST calibre-0.7.35.tar.gz 19988307 RMD160 542eed6b72f67989e52c2c44acff205ba996e
 DIST calibre-0.7.36.tar.gz 20183115 RMD160 89260889ecdca1dc9807361f48240326987a39af SHA1 3b3abd62a2cf89df9d344fa5c48bae3312d0420a SHA256 3558f82eae0cdb66fbdba382dc6f2d2c86e15736b62b9057604e65bd20338753
 DIST calibre-0.7.37.tar.gz 20272968 RMD160 6eae39db13819763dcb3217242caedac06b2714d SHA1 97fa8e9b415b192ac28c87ab1fc2f56f5421dbe2 SHA256 c5348051682d261d750b575b269391d7caf16f2c8b610882b644b7ba9ad6c5ad
 DIST calibre-0.7.38.tar.gz 20342980 RMD160 5abc5ca01142bcabe3418dd09c30cf5f53bf35c9 SHA1 071046cf7c5c1d488091bda3516f80069ddb161c SHA256 41fb9dbadc87167941bc39e8eeabb069b2435d0ec96660379c2f68440831fd76
+DIST calibre-0.7.40.tar.gz 20468870 RMD160 e9678610152bb93f3fa0a7eccefa0070b31a613d SHA1 bfadea87966c805053f34fa35649d25989d92b89 SHA256 3fadde5642bf8d1633a46904834b9e531e2622265c461a5f077b2a4ca59cd4fe
 EBUILD calibre-0.7.35.ebuild 5313 RMD160 fe17531704567077170ebe149c18e79f0e75bd72 SHA1 6b7e39b8444ac1af15a5bc8f18bcb3512125c81a SHA256 267c3f4a4cd065ab599cdcdf71e454ff9c8326a6475e4330d2982443d16292dd
 EBUILD calibre-0.7.36.ebuild 5315 RMD160 0cbf3ae2e7c17a089d4df306d120afe171b01576 SHA1 bac862cb590de31d930dc707af56b8eed4bb0d6e SHA256 e779276cccf6ae6bf1f2fde9cb0bcd56ecc11e66910ba51b01e6770036b65b4f
 EBUILD calibre-0.7.37.ebuild 5315 RMD160 0644aea8ea8d5739eb9fbed8a54512dbf6075af6 SHA1 84a82dad21c1e81bf9b9d6f187be6c6b1c79b1e8 SHA256 38644fe653278c6dc1fbc5ce4ec557fce6fe7ceb73d6f0f19b46bdfd0929b7d7
 EBUILD calibre-0.7.38.ebuild 5315 RMD160 7db8395e59b21ccb3c5090d9a6b61dbbdb5e0fee SHA1 5b77372d5859333a38dfdf5b3211bc73be0a04d9 SHA256 970e88f83808f31c45797dfe901973913809d78c9a1c866231e8613e707c7243
-MISC ChangeLog 19834 RMD160 79d692ad34f89ffe606485ddeedfb69b8f81ab53 SHA1 9435197e860b4d77c6d638b96933223304712d4f SHA256 c773719343aabc618958453c0c06edff8a22509de4aae326f549fe16a902202f
+EBUILD calibre-0.7.40.ebuild 5315 RMD160 b8811c910a0986ecc8afe743d82cbd1f4aaebee5 SHA1 7ca1221cdb11223d3aa08a8f11d82049e9b0af19 SHA256 ab34ff3643da049019065fc00942f128702100ee0118d4ebd62c9e86f06a40e8
+MISC ChangeLog 19960 RMD160 3ebbbd37c2198edd356057c80920d14bed9799b7 SHA1 3e5b379566bf780577dd90a1175b6a399ccf71c0 SHA256 a3685941b9859560e9caf67478397f696dc4a74f4d84ac112974c7c3a0d57515
 MISC metadata.xml 231 RMD160 d960211907e25a59573b7be5bb36be9b47bd4c3c SHA1 197ba481e4ddb1dd2776f589fe7339d5f0f9868f SHA256 c97fff2a7f866fcaaa116ae2b946a9422dca2d6b04c702097b02e175d0a07572
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0oOTsACgkQ/ejvha5XGaNkXQCdHERK9jt27xQH2ZUHyquU9yAz
-VGYAoN9io4mM2/lSZlwP7QhhJPaWSycA
-=nzeD
+iEYEARECAAYFAk0yiSIACgkQ/ejvha5XGaOHUACdGh4Btov+AvQ/lf9zhMuxxS6a
+Of8Anj2rjvYygUeevLxqkkazvuzFwNQC
+=v2GU
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.7.40.ebuild b/app-text/calibre/calibre-0.7.40.ebuild
new file mode 100644
index 000000000000..745dc4ddd112
--- /dev/null
+++ b/app-text/calibre/calibre-0.7.40.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.7.40.ebuild,v 1.1 2011/01/16 05:58:42 zmedico Exp $
+
+EAPI=3
+PYTHON_DEPEND=2:2.6
+PYTHON_USE_WITH=sqlite
+
+inherit python distutils eutils fdo-mime bash-completion multilib
+
+DESCRIPTION="Ebook management application."
+HOMEPAGE="http://calibre-ebook.com/"
+SRC_URI="http://calibre-ebook.com/downloads/$P.tar.gz"
+
+LICENSE="GPL-2"
+
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0"
+
+IUSE=""
+
+SHARED_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/dnspython-1.6.0
+	>=dev-python/cssutils-0.9.7_alpha3
+	>=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.7[X,svg,webkit]
+	|| ( >=media-gfx/imagemagick-6.5.9 media-gfx/graphicsmagick[imagemagick] )
+	>=media-libs/libwmf-0.2.8
+	virtual/libusb:0
+	>=x11-misc/xdg-utils-1.0.2"
+
+RDEPEND="$SHARED_DEPEND
+	>=dev-python/reportlab-2.1"
+
+DEPEND="$SHARED_DEPEND
+	>=dev-python/setuptools-0.6_rc5
+	>=gnome-base/librsvg-2.0.0
+	>=x11-misc/xdg-utils-1.0.2-r2"
+
+S=$WORKDIR/$PN
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s:'xdg-desktop-menu', 'install':'xdg-desktop-menu', 'install', '--mode', 'user':" \
+		-e "s:xdg-icon-resource install:xdg-icon-resource install --mode user:" \
+		-e "s:xdg-mime install:xdg-mime install --mode user:" \
+		-i src/calibre/linux.py || die "sed'ing in the IMAGE path failed"
+
+	# 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'ing in the IMAGE path failed"
+
+	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}
+
+	# --bindir and --sharedir don't seem to work.
+	# Pass them in anyway so we'll know when they are fixed.
+	# 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 #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 $LDFLAGS"
+
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+		distutils_src_install --bindir="${D}usr/bin" --sharedir="${D}usr/share"
+
+	grep -rlZ "${D}" "${D}" | xargs -0 sed -e "s:${D}:/:g" -i ||
+		die "failed to fix harcoded \$D in paths"
+
+	# Python modules are no longer installed in
+	# site-packages, so remove empty dirs.
+	find "${D}$(python_get_libdir)" -type d -empty -delete
+
+	# This code may fail if behavior of --root, --bindir or
+	# --sharedir changes in the future.
+	local libdir=$(get_libdir)
+	dodir /usr/$libdir
+	mv "${D}lib/calibre" "${D}usr/$libdir/" ||
+		die "failed to move libdir"
+	find "${D}"lib -type d -empty -delete
+	grep -rlZ "/usr/lib/calibre" "${D}" | \
+		xargs -0 sed -e "s:/usr/lib/calibre:/usr/$libdir/calibre:g" -i ||
+		die "failed to fix harcoded libdir paths"
+
+	find "${D}"share/calibre/man -type f -print0 | \
+		while read -r -d $'\0' ; do
+			if [[ $REPLY = *.[0-9]calibre.bz2 ]] ; then
+				newname=${REPLY%calibre.bz2}.bz2
+				mv "$REPLY" "$newname"
+				doman "$newname" || die "doman failed"
+				rm -f "$newname" || die "rm failed"
+			fi
+		done
+	rmdir "${D}"share/calibre/man/* || \
+		die "could not remove redundant man subdir(s)"
+	rmdir "${D}"share/calibre/man || \
+		die "could not remove redundant man dir"
+
+	dodir /usr/bin
+	mv "${D}bin/"* "${D}usr/bin/" ||
+		die "failed to move bin dir"
+	find "${D}"bin -type d -empty -delete
+
+	dodir /usr/share
+	mv "${D}share/"* "${D}usr/share/" ||
+		die "failed to move share dir"
+	find "${D}"share -type d -empty -delete
+
+	# 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/* "$D"usr/share/mime/packages/ ||
+		die "failed to register mime types"
+	dodir /usr/share/icons
+	mv "$HOME"/.local/share/icons/* "$D"usr/share/icons/ ||
+		die "failed to install icon files"
+	domenu "$HOME"/.local/share/applications/*.desktop ||
+		die "failed to install .desktop menu files"
+
+	dobashcompletion "$D"etc/bash_completion.d/calibre
+	rm -r "${D}"etc/bash_completion.d
+	find "${D}"etc -type d -empty -delete
+
+	python_convert_shebangs -r 2 "$D"
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	distutils_pkg_postinst
+	bash-completion_pkg_postinst
+}