Bug #270746 - Fix UnicodeEncodeError for LANG=pl_PL.UTF-8. Also, change

libusb dep to specify slot 0 and note that libusb-compat is untested.
Package-Manager: portage-2.2_rc33_p13615/cvs/Linux i686

4 files changed, 153 insertions, 5 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index b0ea4e0c2349..4c659c4eaa36 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,13 @@
 # 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.23 2009/05/21 19:43:44 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.24 2009/05/22 02:13:32 zmedico Exp $
+
+*calibre-0.5.13-r1 (22 May 2009)
+
+  22 May 2009; Zac Medico <zmedico@gentoo.org>
+  +files/bug_270746_UnicodeEncodeError.patch, +calibre-0.5.13-r1.ebuild:
+  Bug #270746 - Fix UnicodeEncodeError for LANG=pl_PL.UTF-8. Also, change
+  libusb dep to specify slot 0 and note that libusb-compat is untested.
 
 *calibre-0.5.13 (21 May 2009)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index e3685dc56b38..5ba722bf8cf6 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX bug_270746_UnicodeEncodeError.patch 312 RMD160 221dfb6ebbeb8edab565ce9572f2490585fc1c3a SHA1 7fcd2eda8da937c8178a1dbb24c450eb360f5587 SHA256 b7bfa7751c72ce103b5219ce0abf72f3c5e31f004f9cda8921429cd62e6a3d52
 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.11.tar.gz 7631372 RMD160 8d5bec18e2bf8a54026d27d771ad8914e15fee95 SHA1 2c594d7e111c114e395b9326bb80062263e2a87a SHA256 70584072d2f4767f667ab652a73b6122269e4f457f39ed2a2353710360c9cd54
@@ -10,13 +11,14 @@ EBUILD calibre-0.4.76.ebuild 2282 RMD160 da17bf58be32efeb80d3a2fd192417f2ef8faed
 EBUILD calibre-0.4.77.ebuild 2282 RMD160 3d0daa0c5740299d302be542de93b42aba01a7b5 SHA1 609941ba89bf2274b2ad776c316140563d0c7366 SHA256 76479992561158d6d7eaa7ebe117b430b8836bbe774f84ab58a7ce037b4604e3
 EBUILD calibre-0.5.11.ebuild 3952 RMD160 6fe36eb1dcf657569b83940e89aa0836da9152c9 SHA1 b0b06ce1aab0e3f22e08ae60439eb9c7e8c61452 SHA256 065b77210180a3f4bbaa40bb26da665fd80d3a3e82119a14ef179b4e16c3694b
 EBUILD calibre-0.5.12.ebuild 3952 RMD160 0fce936801c92d2a9b25e9e9a11058873875738a SHA1 e4220bca6f8adee18529f89344f565b3a7bf28ac SHA256 c3abf34de59334bb3c5757bc00c39f4c9fd5c64fd6f3a20a7e64cb1e5ada040d
+EBUILD calibre-0.5.13-r1.ebuild 4032 RMD160 3da7c1780bff3fea958113d107a01ac3a9a8c46f SHA1 a05fd0844775376e6d80006ffa71426d0e503053 SHA256 aa6123cde8b8adb4677c72084ae12eb7cab96cf8c4e0dd5aa9f6d071f33bbc2b
 EBUILD calibre-0.5.13.ebuild 3952 RMD160 0d9c5cc3624f008bba8093726f30b778f0f8bea9 SHA1 6b4f3d44a5845679721cfedf2f730f650cf27fb3 SHA256 e8c66e76db523ca1c1bb2d5c4a4dfd829ca0fd79d10994c9fd9ab2ead2ba50fd
-MISC ChangeLog 3971 RMD160 78f10616cfcb17bf13b7f21a45b063369d098da2 SHA1 b1513107bc299dab0317c5fab8c24dee09645a09 SHA256 9aef80fd9849388111534db60834083597c9659a1a7c5a625edc7cfa64933077
+MISC ChangeLog 4272 RMD160 8d8f1e302282e0a575ee5b45c00088bb5e4b6ef8 SHA1 2d78ad5ece24f2303f8e4104113417e5bce658ee SHA256 72272a438c329433652b9aed325009ec60d57bdd52ab9716fedf5f551a817a7f
 MISC metadata.xml 233 RMD160 da5a1d3b7836dcebb5fec29696b5bfb583fe346c SHA1 1c7142c677598358888a6cfc6f6f65df2e8b6901 SHA256 4d1294dc1b2a6f96aa637a0b8d340bc67191103af0f15197d07fc62446b4a709
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoVrw0ACgkQ/ejvha5XGaNWYwCgiicJFe2xpI/X+KCApn+zx6vn
-dOoAniGy0P47gJ27YoBCVvSu5ei04eGR
-=R588
+iEYEARECAAYFAkoWCmsACgkQ/ejvha5XGaOwZgCgjED7QWmfYBXcCqPxlUEqU7wP
+UXIAniheaVC1Vxa6GodoSUSHI5EzcTeI
+=R9zY
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.5.13-r1.ebuild b/app-text/calibre/calibre-0.5.13-r1.ebuild
new file mode 100644
index 000000000000..bdbe89f4016a
--- /dev/null
+++ b/app-text/calibre/calibre-0.5.13-r1.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.5.13-r1.ebuild,v 1.1 2009/05/22 02:13:32 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=""
+
+# 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.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"
+	epatch "$FILESDIR"/bug_270746_UnicodeEncodeError.patch
+	# 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
+}
diff --git a/app-text/calibre/files/bug_270746_UnicodeEncodeError.patch b/app-text/calibre/files/bug_270746_UnicodeEncodeError.patch
new file mode 100644
index 000000000000..d5302fd252fc
--- /dev/null
+++ b/app-text/calibre/files/bug_270746_UnicodeEncodeError.patch
@@ -0,0 +1,10 @@
+--- src/calibre/utils/help2man.py
++++ src/calibre/utils/help2man.py
+@@ -54,6 +54,6 @@
+               'http://calibre.kovidgoyal.net/user_manual',
+               '.PP', '.B Created by '+__author__]
+     
+-    return  bz2.compress('\n'.join(lines))
++    return  bz2.compress(u'\n'.join(lines).encode('utf_8'))
+ 
+