0.6.37 version bump.

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

3 files changed, 160 insertions, 6 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 1a2df73ceb93..bc4bdee8af9f 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.71 2010/01/30 11:09:44 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.72 2010/02/05 22:43:13 zmedico Exp $
+
+*calibre-0.6.37 (05 Feb 2010)
+
+  05 Feb 2010; Zac Medico <zmedico@gentoo.org> +calibre-0.6.37.ebuild:
+  0.6.37 version bump.
 
   30 Jan 2010; Zac Medico <zmedico@gentoo.org> -calibre-0.6.24.ebuild,
   -calibre-0.6.26.ebuild, -calibre-0.6.28.ebuild, -calibre-0.6.29.ebuild,
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 4029332559a4..530788f1bc09 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -6,17 +6,19 @@ DIST calibre-0.5.14.tar.gz 7693491 RMD160 175e473e74e036ad245db35a08e700e92d8c71
 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
 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 4365 RMD160 df606b35eceed94b4076f0d4be19d7e73f521a01 SHA1 b880dcd54060ed32cdebf6cf1042d851272e4156 SHA256 011930b1c20414781c7b14c8dbfeb6a7992359e540f53cebff6f3d87272e14ea
 EBUILD calibre-0.6.36.ebuild 4365 RMD160 2be458381c87b9c3df8485c9d10887630184c70f SHA1 ecef7db0a034f617f057e28854c4cbd951875d87 SHA256 852339b299b84442eec95fb458526e63c49a87f77484841656e34e628175f6b3
-MISC ChangeLog 11500 RMD160 0ac58805effa7b4126cab38b08fc324955c179d9 SHA1 5802a2982decc199a78c5ee082f670428f9a9fb4 SHA256 04d219e2eeb8c1780b108cf96ca7deb727be878ce57211fa099b041aebfe2d63
+EBUILD calibre-0.6.37.ebuild 4463 RMD160 022a1231570a41b63b595c713af5e5a17ce1cf5f SHA1 a7dad040e3c7cce8e07d9ee3d66caf31daad7803 SHA256 29f9d716d60789bf74c61691d7a0d7b4c91cb182268fd9870696d08cacefa599
+MISC ChangeLog 11626 RMD160 24fc476ce8ef436840ca542a3272b2b9b3d274cd SHA1 503a04addfc9b6a5ca67b50808179153e245db72 SHA256 8378e5594e871ac806103a8238e168e7e14cf4c9218c2aa8b593c04a339b35c4
 MISC metadata.xml 231 RMD160 d960211907e25a59573b7be5bb36be9b47bd4c3c SHA1 197ba481e4ddb1dd2776f589fe7339d5f0f9868f SHA256 c97fff2a7f866fcaaa116ae2b946a9422dca2d6b04c702097b02e175d0a07572
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktkE90ACgkQ/ejvha5XGaMZCQCfWFgjcon2m+262vAAC8aMRZVS
-fHoAoOw/7NkMkpwVDE7ztH5156cTTwvs
-=83CW
+iEYEARECAAYFAktsn0UACgkQ/ejvha5XGaNu4wCdF4LJr4FlVKTmtSXhQikNFpgE
+uLMAoKXkIS8OfmvVeiR4xWKhigIgDXMA
+=At1H
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.6.37.ebuild b/app-text/calibre/calibre-0.6.37.ebuild
new file mode 100644
index 000000000000..f5bfb5a5df9a
--- /dev/null
+++ b/app-text/calibre/calibre-0.6.37.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.37.ebuild,v 1.1 2010/02/05 22:43:13 zmedico Exp $
+
+EAPI=2
+NEED_PYTHON=2.6
+PYTHON_DEPEND=2
+
+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-lang/python-2.6[sqlite]
+	>=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
+	>=virtual/poppler-0.12.0
+	>=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
+}