0.6.0 release (bug #279110).

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

3 files changed, 141 insertions, 5 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 35b83d394e4e..d94e29c396ec 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.37 2009/07/22 07:55:17 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.38 2009/07/26 20:20:37 zmedico Exp $
+
+*calibre-0.6.0 (26 Jul 2009)
+
+  26 Jul 2009; Zac Medico <zmedico@gentoo.org> +calibre-0.6.0.ebuild:
+  0.6.0 release (bug #279110).
 
   22 Jul 2009; Zac Medico <zmedico@gentoo.org> calibre-0.6_beta10.ebuild:
   Bug #276858 - Bump dependency from PyQt4-4.4.2 to PyQt4-4.5.
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 9ea2722a6602..4486739921d4 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -3,17 +3,19 @@ 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.0.tar.gz 8577972 RMD160 81cab2c18bf96b9c4759b9e1d971a30cb4509709 SHA1 8db54e76d5c99bb30071f5536f0c8cfe136b3c29 SHA256 f6a2e630049d836bec1b2eb7f08ae9d5101d040ee2a60869d9ecc7b9022abd8d
 DIST calibre-0.6_beta10.tar.gz 8201445 RMD160 6415d155b8c851d3cb835eb3dc904a6db0563a64 SHA1 7940fc1c509922a157bd679d905f80c39b74a54a SHA256 cc06d63cac61d4bfa0673d1720a32d50fffff40e8530728ea44c5e3e0a9c64ae
 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.5.14.ebuild 3979 RMD160 cc2bd464833dc9fbcbe68bcb99c6025c17c87731 SHA1 08c19b728e1b415a3c1d6637f311be6c11d54120 SHA256 bcea5077da8335b00e075832fd60e11302b92ab627d4e8e010deb90f714dc1c0
+EBUILD calibre-0.6.0.ebuild 4230 RMD160 98f49381f3d3e51b63f6b5a6a3f92f5b439c563f SHA1 5df10348cdd60690f5bc8516380e308ad38cfae6 SHA256 d84c4e0b287ddcc2c86ffeb8d9c6cee9d5e44340c4239e38b59c543ca71caf6e
 EBUILD calibre-0.6_beta10.ebuild 4343 RMD160 a98abc37fb02a06f1b6af821320a4a0f417cd3ce SHA1 f5f2b217446e23389be7a6f43db6494ada6f45ef SHA256 d0030dd18f26642a1c1b44ce4763253786d419420eafb30fbc03b987e221a020
-MISC ChangeLog 6204 RMD160 2e84a8cc787a16ea2ded494a93368b0561217dec SHA1 b538bd95b64644f72630048cb5951c16339d44c0 SHA256 93a7c3a98981208ebe249fd78fdd0ead4e2fcba35a4f4f05ddc57472256c5dcc
+MISC ChangeLog 6336 RMD160 49ec9bfc1d7b8d04e93c18d3ca491f6e2ba49f9f SHA1 967b04cde8b95dfafa8a0d4aa49e05bf846ea176 SHA256 fe2e5b45982be4e88c1caf9596040ebe8334700bf61b6d27c85450cfb384b624
 MISC metadata.xml 231 RMD160 d960211907e25a59573b7be5bb36be9b47bd4c3c SHA1 197ba481e4ddb1dd2776f589fe7339d5f0f9868f SHA256 c97fff2a7f866fcaaa116ae2b946a9422dca2d6b04c702097b02e175d0a07572
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpmxeUACgkQ/ejvha5XGaNOdACfUcItnm7oPSB3O4+GLHUPSWZD
-lcYAniIpL3FvM3jjNIlu0rl8V4fbBsdr
-=a5YS
+iEYEARECAAYFAkpsuqYACgkQ/ejvha5XGaM4UgCdHgx464VcGfFtfLhEGQDoDXQ2
+18oAn0R0KelhTscazUlIJGKRWWqwQcxB
+=xgrY
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.6.0.ebuild b/app-text/calibre/calibre-0.6.0.ebuild
new file mode 100644
index 000000000000..586e69c44d09
--- /dev/null
+++ b/app-text/calibre/calibre-0.6.0.ebuild
@@ -0,0 +1,129 @@
+# 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.6.0.ebuild,v 1.1 2009/07/26 20:20:37 zmedico Exp $
+
+EAPI=2
+NEED_PYTHON=2.6
+
+inherit python distutils eutils fdo-mime bash-completion
+
+DESCRIPTION="Ebook management application."
+HOMEPAGE="http://calibre.kovidgoyal.net"
+SRC_URI="http://calibre.kovidgoyal.net/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
+	>=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
+	>=sys-apps/help2man-1.36.4
+	>=dev-python/pyPdf-1.12
+	|| ( app-text/podofo >=app-text/pdftk-1.12 )
+	>=dev-python/cherrypy-3.0.2-r1
+	>=dev-python/cssutils-0.9.5.1
+	>=dev-python/odfpy-0.7"
+
+RDEPEND="$SHARED_DEPEND
+	>=dev-python/reportlab-2.1
+	!dev-python/django-tagging"
+
+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.
+	# Bundled python modules:     Module       | Package
+	#                             ----------------------------
+	#                             encutils     | cssutils
+	#                             odf          | odfpy
+	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)"/{cherrypy,cssutils,encutils,odf,pyPdf}
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	distutils_pkg_postinst
+	bash-completion_pkg_postinst
+}