0.5.11 bump.

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

3 files changed, 139 insertions, 5 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index b31f261918ac..74cc7bd3e44e 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.20 2009/05/04 23:54:11 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.21 2009/05/09 08:51:11 zmedico Exp $
+
+*calibre-0.5.11 (09 May 2009)
+
+  09 May 2009; Zac Medico <zmedico@gentoo.org> +calibre-0.5.11.ebuild:
+  0.5.11 bump.
 
 *calibre-0.5.10 (04 May 2009)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index e4f5a88171ba..61d5b7a1ef82 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -4,17 +4,19 @@ Hash: SHA1
 DIST calibre-0.4.76.tar.bz2 4046425 RMD160 94a4d7dbed1669c4884b8f604fbb061cffa25521 SHA1 26a6d3754355955bdeff02921c2267cb2d7a4a60 SHA256 7f646409ecca0a7796fef318fa4c7950bb67020c24b5f4b33fe4497aa6013435
 DIST calibre-0.4.77.tar.bz2 4054837 RMD160 24c64276b2413ac8e0974f8f0caa535e8635df3c SHA1 30e39484987a606fb875c6b4afa8785fed0aa4b3 SHA256 4075d8d20713d2e5e299bc3ff51fd541474dff8576c9a6d12f4159c094d73dab
 DIST calibre-0.5.10.tar.gz 7622802 RMD160 cb39f3cbcdfbf744a0cb8e8c08e98f218389c325 SHA1 cd426400f69e1e654aba733c22285d9d0f3ba22d SHA256 4026b780ff95cffdb36939c3240dd74c334333a5635c366a8a80d1aa3ed7bb14
+DIST calibre-0.5.11.tar.gz 7631372 RMD160 8d5bec18e2bf8a54026d27d771ad8914e15fee95 SHA1 2c594d7e111c114e395b9326bb80062263e2a87a SHA256 70584072d2f4767f667ab652a73b6122269e4f457f39ed2a2353710360c9cd54
 DIST calibre-0.5.9.tar.gz 7676798 RMD160 4e495eab54cf9cce00f4bc0d2df59aa5f71ef147 SHA1 26455393574d9bd40414b1bb325d287b431deb79 SHA256 0be3ae0b77fdefb5eef8b2403794feaa3c734499aeee0e158786e399f0f0c46d
 EBUILD calibre-0.4.76.ebuild 2282 RMD160 da17bf58be32efeb80d3a2fd192417f2ef8faed6 SHA1 7aeff0d37d6817d1bd59ceb348b2ada0bf271da8 SHA256 15fd43d85381597f75eaf38c3feaae3b62ff47b883889739ccf95ea5321c6d26
 EBUILD calibre-0.4.77.ebuild 2282 RMD160 3d0daa0c5740299d302be542de93b42aba01a7b5 SHA1 609941ba89bf2274b2ad776c316140563d0c7366 SHA256 76479992561158d6d7eaa7ebe117b430b8836bbe774f84ab58a7ce037b4604e3
 EBUILD calibre-0.5.10.ebuild 3929 RMD160 86e31bf01e5b712a8f83bd78aa9f310f5a5ee31b SHA1 99b3037eb7d89e524aa40cfde223885776105bb0 SHA256 109cb88a026d01b3ccc476fc45dd23a181eaec204f7d6351589434c72a7eb1a7
+EBUILD calibre-0.5.11.ebuild 3952 RMD160 6fe36eb1dcf657569b83940e89aa0836da9152c9 SHA1 b0b06ce1aab0e3f22e08ae60439eb9c7e8c61452 SHA256 065b77210180a3f4bbaa40bb26da665fd80d3a3e82119a14ef179b4e16c3694b
 EBUILD calibre-0.5.9-r2.ebuild 3931 RMD160 8291989b151cce2108b955823e2680d4fcff167f SHA1 04938d818641db1f0808323880e23338dfdee300 SHA256 53680aa4eebccff1518232f5b4fc6c172ff44aea3fce4c0c27bd2d41b76400a2
-MISC ChangeLog 3494 RMD160 2dd40b71d7ff43bcce6806bb5f34dc4c64c4a5d0 SHA1 727407dc0082a081f2ff050283213306e922acfa SHA256 9a20d9c5777198692549fcc82d59b7d9993bc6aee21ab10cf1ef38d00a79b396
+MISC ChangeLog 3612 RMD160 f1ac28c38b0cd6a625903f31e64f22da219256a0 SHA1 58b08ff725f71ab619b324135e9ede965a86aa66 SHA256 5ce7f15556bbc4d9d5f313a2871dff7da969f3f2d8a459bf56b0eb695ddd347f
 MISC metadata.xml 233 RMD160 da5a1d3b7836dcebb5fec29696b5bfb583fe346c SHA1 1c7142c677598358888a6cfc6f6f65df2e8b6901 SHA256 4d1294dc1b2a6f96aa637a0b8d340bc67191103af0f15197d07fc62446b4a709
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkn/gDgACgkQ/ejvha5XGaOjsACeO5fZLkJyETsdz8KKqfJipOaL
-Jk0An13lL+FWS/C6VWwmKSVY0sxjPcJg
-=6S8i
+iEYEARECAAYFAkoFRBsACgkQ/ejvha5XGaMhJwCg7vFWBKfLmN2od6nLku7rkFoH
+4PMAn3nyCdKEdzZu7WbLqaWI2xU68v8k
+=CLRN
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.5.11.ebuild b/app-text/calibre/calibre-0.5.11.ebuild
new file mode 100644
index 000000000000..e6604712f6f2
--- /dev/null
+++ b/app-text/calibre/calibre-0.5.11.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.5.11.ebuild,v 1.1 2009/05/09 08:51:11 zmedico Exp $
+
+EAPI=2
+NEED_PYTHON=2.6
+
+inherit python distutils eutils fdo-mime bash-completion
+
+MY_P="${P/_p/-p}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Ebook management application."
+HOMEPAGE="http://calibre.kovidgoyal.net"
+SRC_URI="http://calibre.kovidgoyal.net/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0"
+
+IUSE=""
+
+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
+	>=dev-python/PyQt4-4.4.2[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
+	>=sys-apps/help2man-1.36.4
+	>=dev-python/pyPdf-1.12
+	>=app-text/pdftk-1.12"
+
+RDEPEND="$SHARED_DEPEND
+	>=dev-python/reportlab-2.1
+	!dev-python/cherrypy
+	!dev-python/cssutils
+	!dev-python/django-tagging
+	!dev-python/odfpy"
+
+DEPEND="$SHARED_DEPEND
+	dev-python/setuptools
+	>=gnome-base/librsvg-2.0.0
+	>=x11-misc/xdg-utils-1.0.2-r2
+	sys-apps/help2man"
+
+src_prepare() {
+	# Removing the post_install call. We'll do that stuff in src_install.
+	sed -i -e "/if 'install'/,/subprocess.check_call/d" \
+		setup.py || die "couldn't remove post_install call"
+	# For help2man to succeed, we need to tell it the path to the tools.
+	sed -i -e "s:\('help2man',\) \(prog\):\1 \'PYTHONPATH=\"${D}$(python_get_sitedir)\" \' + \'${D}usr/bin/\' + \2:" \
+		src/calibre/linux.py || die "sed'ing in the IMAGE path failed"
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-desktop-menu (bug #258938). This also prevents
+	# "${D}"/usr/share/applications/{mimeinfo.cache,defaults.list}
+	# from being installed (we don't want them anyway).
+	sed -i -e "s:xdg-desktop-menu install:xdg-desktop-menu install --mode user:" \
+		src/calibre/linux.py || die "sed'ing in the IMAGE path failed"
+	distutils_src_prepare
+}
+
+src_install() {
+	pushd "${S}"/build
+	ln -s lib\.* lib
+	popd
+	distutils_src_install
+
+	# Create directory before running the postinst script
+	# otherwise it will bail out.
+	dodir /usr/share/icons/hicolor
+	dodir /etc/xdg/menus
+	dodir /usr/share/applications
+	dodir /usr/share/desktop-directories
+	dodir /usr/share/applnk
+	dodir /usr/share/mime/packages
+
+	# Bypass the default kde-config output, and force it to
+	# tell xdg-mime to use a different path.
+	cat - > "${T}/kde-config" <<EOF
+#!/bin/bash
+
+case \$1:\$2 in
+	--version:) echo -e "Qt: 3.3.8\nKDE: 3.5.8\nkde-config: 1.0" ;;
+	--path:mime) echo "${D}/usr/share/mimelnk/" ;;
+esac
+EOF
+
+	chmod +x "${T}/kde-config"
+
+	PATH="${T}:${PATH}" KDEDIRS="${D}/usr" XDG_DATA_DIRS="${D}/usr/share" DESTDIR="${D}" PYTHONPATH="${S}/build/lib" \
+		python "${S}"/src/${PN}/linux.py \
+		--use-destdir --do-not-reload-udev-hal \
+		--group-file="${ROOT}"/etc/group --dont-check-root \
+		|| die "post-installation failed."
+
+	# The menu entries end up here due to '--mode user' being added to
+	# xdg-desktop-menu options in src_prepare.
+	domenu "$HOME"/.local/share/applications/*.desktop || \
+		die "failed to install .desktop menu files"
+
+	# Move the bash-completion file and properly install it.
+	mv "${D}"/etc/bash_completion.d/calibre "${S}/" \
+		|| die "cannot move the bash-completion file"
+	dobashcompletion "${S}"/calibre
+	find "${D}"/etc -type d -empty -delete
+
+	# Removing junk.
+	rm -r "${D}"/usr/share/mime/{subclasses,XMLnamespaces,globs{,2},mime.cache,magic,aliases,types,treemagic,{generic-,}icons} \
+		"${D}"/usr/share/{applnk,desktop-directories} \
+		"${D}$(python_get_sitedir)"/pyPdf
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	distutils_pkg_postinst
+	bash-completion_pkg_postinst
+}