25 May 2009; Zac Medico <zmedico@gentoo.org>

files/bug_270746_UnicodeEncodeError.patch, -calibre-0.5.13-r1.ebuild,
+calibre-0.5.13-r2.ebuild:
Bug #270746 - Update patch to solve another UnicodeDecodeError.
Package-Manager: portage-2.2_rc33_p13615/cvs/Linux i686

4 files changed, 16 insertions, 9 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 4c659c4eaa36..6a1dcaf10d0e 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.24 2009/05/22 02:13:32 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.25 2009/05/25 23:23:36 zmedico Exp $
+
+*calibre-0.5.13-r2 (25 May 2009)
+
+  25 May 2009; Zac Medico <zmedico@gentoo.org>
+  files/bug_270746_UnicodeEncodeError.patch, -calibre-0.5.13-r1.ebuild,
+  +calibre-0.5.13-r2.ebuild:
+  Bug #270746 - Update patch to solve another UnicodeDecodeError.
 
 *calibre-0.5.13-r1 (22 May 2009)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 5ba722bf8cf6..9f5f4412f6c8 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX bug_270746_UnicodeEncodeError.patch 312 RMD160 221dfb6ebbeb8edab565ce9572f2490585fc1c3a SHA1 7fcd2eda8da937c8178a1dbb24c450eb360f5587 SHA256 b7bfa7751c72ce103b5219ce0abf72f3c5e31f004f9cda8921429cd62e6a3d52
+AUX bug_270746_UnicodeEncodeError.patch 395 RMD160 b934fd07fd65ed07bb7f424233eeb3dd7c6636ac SHA1 65deee2c64cd2271c009ddfdb4de9594413d8189 SHA256 4c737df429fb0631834fdf8bee08d1e3feb7dae8484b4ba05ae9dcc727fdbe2b
 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
@@ -11,14 +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-r2.ebuild 4032 RMD160 088fab925b822b74c40c3a264703aabb20e54b46 SHA1 5ba353e587a658a59cf81e0632f118eef430bad2 SHA256 3773b1a568188b0341fbdeb494471eabc297bfa43c3b23f39fd2ae093c0db4ff
 EBUILD calibre-0.5.13.ebuild 3952 RMD160 0d9c5cc3624f008bba8093726f30b778f0f8bea9 SHA1 6b4f3d44a5845679721cfedf2f730f650cf27fb3 SHA256 e8c66e76db523ca1c1bb2d5c4a4dfd829ca0fd79d10994c9fd9ab2ead2ba50fd
-MISC ChangeLog 4272 RMD160 8d8f1e302282e0a575ee5b45c00088bb5e4b6ef8 SHA1 2d78ad5ece24f2303f8e4104113417e5bce658ee SHA256 72272a438c329433652b9aed325009ec60d57bdd52ab9716fedf5f551a817a7f
+MISC ChangeLog 4521 RMD160 a8a8a6a436ca8606199380716363f7f6bd0179e7 SHA1 af47394dbf5fa124838319a085614fafd0006203 SHA256 fa8df7bd207898a65aac52a29f76cd30fde817031de614f6193a37411bc978ae
 MISC metadata.xml 233 RMD160 da5a1d3b7836dcebb5fec29696b5bfb583fe346c SHA1 1c7142c677598358888a6cfc6f6f65df2e8b6901 SHA256 4d1294dc1b2a6f96aa637a0b8d340bc67191103af0f15197d07fc62446b4a709
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoWCmsACgkQ/ejvha5XGaOwZgCgjED7QWmfYBXcCqPxlUEqU7wP
-UXIAniheaVC1Vxa6GodoSUSHI5EzcTeI
-=R9zY
+iEYEARECAAYFAkobKJcACgkQ/ejvha5XGaMJKgCfYNPBYxNnddazrMWUk8QJ7YTw
+sSgAn0JiPxjoEMvuIHrip2pOosyiPYwC
+=pqwQ
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.5.13-r1.ebuild b/app-text/calibre/calibre-0.5.13-r2.ebuild
index bdbe89f4016a..ba26c2cf3685 100644
--- a/app-text/calibre/calibre-0.5.13-r1.ebuild
+++ b/app-text/calibre/calibre-0.5.13-r2.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.5.13-r2.ebuild,v 1.1 2009/05/25 23:23:36 zmedico Exp $
 
 EAPI=2
 NEED_PYTHON=2.6
diff --git a/app-text/calibre/files/bug_270746_UnicodeEncodeError.patch b/app-text/calibre/files/bug_270746_UnicodeEncodeError.patch
index d5302fd252fc..bd5559110096 100644
--- a/app-text/calibre/files/bug_270746_UnicodeEncodeError.patch
+++ b/app-text/calibre/files/bug_270746_UnicodeEncodeError.patch
@@ -5,6 +5,6 @@
                '.PP', '.B Created by '+__author__]
      
 -    return  bz2.compress('\n'.join(lines))
-+    return  bz2.compress(u'\n'.join(lines).encode('utf_8'))
++    return  bz2.compress(u'\n'.join(isinstance(x, unicode) and x or unicode(x, 'utf_8', 'replace') for x in lines).encode('utf_8', 'replace'))