0.6.40 version bump.

Package-Manager: portage-2.2_rc62_p15360/cvs/Linux i686

3 files changed, 166 insertions, 2 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index d981a6a3a03e..1e439790cbbe 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.76 2010/02/10 21:04:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.77 2010/02/16 22:06:56 zmedico Exp $
+
+*calibre-0.6.40 (16 Feb 2010)
+
+  16 Feb 2010; Zac Medico <zmedico@gentoo.org> +calibre-0.6.40.ebuild:
+  0.6.40 version bump.
 
   10 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> calibre-0.6.33.ebuild,
   calibre-0.6.36.ebuild, calibre-0.6.37.ebuild:
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index cc7e0b556fd9..f7e40ffabf50 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,14 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST calibre-0.4.77.tar.bz2 4054837 RMD160 24c64276b2413ac8e0974f8f0caa535e8635df3c SHA1 30e39484987a606fb875c6b4afa8785fed0aa4b3 SHA256 4075d8d20713d2e5e299bc3ff51fd541474dff8576c9a6d12f4159c094d73dab
 DIST calibre-0.5.14.tar.gz 7693491 RMD160 175e473e74e036ad245db35a08e700e92d8c718d SHA1 f3241ce95fb590873427d9a9c0881f336b995aef SHA256 71caa8e0540879b851afc5b10a588279b559ee24f2f7375c10737eafd0b2f24e
 DIST calibre-0.6.11.tar.gz 8771885 RMD160 6cc9155560915a3d74314294514a6a97b077cdb9 SHA1 1068e8935318201fc0de7e52a72317c825e7817f SHA256 de71128ea76f468e56201d9940e550b61fe2691d96f1943f1905870d32907b8a
 DIST calibre-0.6.33.tar.gz 11021933 RMD160 6137710cac047aed7eeaef8688984af03a8bf675 SHA1 635f5167d0ed91e859cba05fb0b186421ae0b07f SHA256 36d835eb52d4680974a1ea5a96f17f8fcf7ca867c7a892f980a14fd44fcd8391
 DIST calibre-0.6.36.tar.gz 11315108 RMD160 01357b66a45d0e0ebfb14a2692cb04e9f348c89a SHA1 6be0c3ac3bc460b8da48aa8acd0e74d0bd730e9e SHA256 52efded31a599ce2549d1aaea9e4bde591c5d66a6131acb62bc9bfb51c43fbfe
 DIST calibre-0.6.37.tar.gz 11423275 RMD160 70354735d94295787b9b5bcaaf92f6c178cd9e8e SHA1 c02aab56520dbb5c7361a0a285122699845e78c3 SHA256 97bc2def14b953a9224b1bc8055b47d4b1a30b5f3e42e1e8bec6a02b81d4af95
+DIST calibre-0.6.40.tar.gz 11420347 RMD160 7493d62eea08f7d7d6f99136b6d2c0ca6abf0bf8 SHA1 9ba8324f038e915e3ef6a08090782d3d4c3a5ee8 SHA256 5042ddd332b988edc939b985a574aacea74df8da14be0c5c33f34705080a5160
 EBUILD calibre-0.4.77.ebuild 2282 RMD160 3d0daa0c5740299d302be542de93b42aba01a7b5 SHA1 609941ba89bf2274b2ad776c316140563d0c7366 SHA256 76479992561158d6d7eaa7ebe117b430b8836bbe774f84ab58a7ce037b4604e3
 EBUILD calibre-0.5.14-r1.ebuild 4260 RMD160 dc4d9465d99914e4336ba4b35cd8257435769f18 SHA1 438b4b4cc28a06a7f5bdbccc70862d6810c95904 SHA256 fcc6677b0a7047ce5f377d0cef1c8927e6c70dc87205542ab942f310f6bf8b4b
 EBUILD calibre-0.6.11.ebuild 4074 RMD160 c9951c75216bddc46887edddab6c93b444c8b06c SHA1 0fa086e34ec29fe3847838ff41d1674153af96ae SHA256 f65bb03f0a5ffa3d6b896083e69f9805c3d290c0a04b8c5ff46a38b17c1ecc6b
 EBUILD calibre-0.6.33.ebuild 4389 RMD160 673bdbf8c4dce6c75cecac685f7b8201700219bd SHA1 8431152c509ddb289c76db168401b5212b2619ab SHA256 525a0979c142fa93ae6556fce16510407cf6bd2b7650287cda4a4f9c8e12d44d
 EBUILD calibre-0.6.36.ebuild 4389 RMD160 a7ee187dba8fa3cb9ca6697e344c1fff0a0e9dd9 SHA1 2a57c65c11e04eee2f2e98e8047d2969d877a22e SHA256 c127706855249ce421332c9fcfcd0eafa28a1b60965e2acd1f0475f79f34d004
 EBUILD calibre-0.6.37.ebuild 4467 RMD160 05ed28375fbb54daa9ee96849ead59ac069b6efb SHA1 fa6b3ee7300d81a7c428c41299fe2801b691bd81 SHA256 f3431d09f13c9dd86a0daf964fb9fa9b80c46675db70f7cad4068d7ac31f11ce
-MISC ChangeLog 12167 RMD160 6140a58a7c15cdc8c8b50512134d128d1ed6f0ed SHA1 de28adb4cdddeb35d7ad068c9f96bc457b2cb56b SHA256 0d9730e19d410b07c63c944a7645a792bc276ac799935c931aad1759aca9688c
+EBUILD calibre-0.6.40.ebuild 4501 RMD160 08fd036e33ea1db8364ae4cd74fd70ae3fc228de SHA1 e8145dde6f8d1a0396bf44e6f360878610363139 SHA256 84f8b1c1b877920b9af558d9c1e1a8cd79b6148189d6492e998188cb5c3c149c
+MISC ChangeLog 12291 RMD160 75f5dc16643279b99bd419eaf694d4f64bddc4cd SHA1 f98898280b79a24f1baaa98b18a7ef06fbf23193 SHA256 3621c02b141858dafc2981bcbd6c0c0dea816dcc280eceb75afb6f630cdbbca4
 MISC metadata.xml 231 RMD160 d960211907e25a59573b7be5bb36be9b47bd4c3c SHA1 197ba481e4ddb1dd2776f589fe7339d5f0f9868f SHA256 c97fff2a7f866fcaaa116ae2b946a9422dca2d6b04c702097b02e175d0a07572
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkt7F2kACgkQ/ejvha5XGaMehQCgvIZi0AUsZu4fOhsfnpptD1U3
+QzgAnjBQUP8jR60ZnWsI2/U34R9z4GZx
+=jt9X
+-----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.6.40.ebuild b/app-text/calibre/calibre-0.6.40.ebuild
new file mode 100644
index 000000000000..e697decbfbab
--- /dev/null
+++ b/app-text/calibre/calibre-0.6.40.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6.40.ebuild,v 1.1 2010/02/16 22:06:56 zmedico Exp $
+
+EAPI=2
+PYTHON_DEPEND=2:2.6
+PYTHON_USE_WITH=sqlite
+
+inherit python distutils eutils fdo-mime bash-completion
+
+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=""
+
+# libusb-compat is untested
+SHARED_DEPEND=">=dev-python/cssutils-0.9.7_alpha2
+	>=dev-python/setuptools-0.6_rc5
+	>=dev-python/imaging-1.1.6
+	>=dev-libs/libusb-0.1.12:0
+	>=dev-python/PyQt4-4.5[X,svg,webkit]
+	>=dev-python/mechanize-0.1.11
+	>=media-gfx/imagemagick-6.3.5
+	>=x11-misc/xdg-utils-1.0.2
+	>=dev-python/dbus-python-0.82.2
+	>=dev-python/lxml-2.1.5
+	>=dev-python/python-dateutil-1.4.1
+	>=dev-python/beautifulsoup-3.0.5
+	>=dev-python/dnspython-1.6.0
+	>=app-text/poppler-0.12.3-r3[qt4,xpdf-headers]
+	>=sys-apps/help2man-1.36.4
+	app-text/podofo"
+
+RDEPEND="$SHARED_DEPEND
+	>=dev-python/reportlab-2.1"
+
+DEPEND="$SHARED_DEPEND
+	dev-python/setuptools
+	>=gnome-base/librsvg-2.0.0
+	>=x11-misc/xdg-utils-1.0.2-r2
+	sys-apps/help2man"
+
+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:" \
+		-e "s:old_udev = '/etc:old_udev = '${D}etc:" \
+		-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 - Aavoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export XDG_CONFIG_HOME="$HOME/.config"
+	export CALIBRE_CONFIG_DIRECTORY="$XDG_CONFIG_HOME/calibre"
+	mkdir -p "$XDG_CONFIG_HOME" "$CALIBRE_CONFIG_DIRECTORY"
+
+	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.
+	dodir /usr/lib
+	mv "${D}lib/calibre" "${D}usr/lib/" ||
+		die "failed to move lib dir"
+	find "${D}"lib -type d -empty -delete
+
+	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
+}