Revision bump. Fixed runtime errors when using >=docutils-0.8 (bug #369943).

Package-Manager: portage-2.2.0_alpha46/cvs/Linux x86_64

diff --git a/dev-python/rst2pdf/ChangeLog b/dev-python/rst2pdf/ChangeLog
index f65fb11150ff680d861934cefa7b532e8b0f6c57..ec636cacf46d00b68721388c07191a2bc3cc0fad 100644 (file)
--- a/dev-python/rst2pdf/ChangeLog
+++ b/dev-python/rst2pdf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/rst2pdf
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rst2pdf/ChangeLog,v 1.15 2011/01/15 18:13:56 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rst2pdf/ChangeLog,v 1.16 2011/07/30 04:39:42 rafaelmartins Exp $
+
+*rst2pdf-0.16-r1 (30 Jul 2011)
+
+  30 Jul 2011; Rafael G. Martins <rafaelmartins@gentoo.org>
+  +rst2pdf-0.16-r1.ebuild, +files/rst2pdf-0.16_docutils-0.8.patch:
+  Revision bump. Fixed runtime errors when using >=docutils-0.8 (bug #369943).
 
   15 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   -rst2pdf-0.15.ebuild:

diff --git a/dev-python/rst2pdf/Manifest b/dev-python/rst2pdf/Manifest
index 896b43d8e855e3b2248a5fffc54dfee31f334ba5..cb69815366cdd5366e8819e9d3b47742f84e0142 100644 (file)
--- a/dev-python/rst2pdf/Manifest
+++ b/dev-python/rst2pdf/Manifest
@@ -1,4 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX rst2pdf-0.16_docutils-0.8.patch 1496 RMD160 886d6bc08aef715c5da5d44b220ee4021b12c991 SHA1 87ea231489690420e3b441bb4fa842253e1ee282 SHA256 40656c71518325aa8d74a50d4d3b10693909549a1222e916d21484de4dec7ee0
 DIST rst2pdf-0.16.tar.gz 1263326 RMD160 1ddf23532507dfafbfae58c759978bdfd65dec4e SHA1 297f9ad8e91baa706321dd50d99b21adfa1f1e66 SHA256 5efe4051bcdf7d38b8d25738cfdd86af13d6f0d7f7ed4598baef37693b729ac7
+EBUILD rst2pdf-0.16-r1.ebuild 1610 RMD160 809de03064bb27abcf774ef43d9cd78d97b5e35b SHA1 dafe85c154f700515ceeb8cc4e8b7d10c98a2e4f SHA256 c51eca0f9c86c9032699f1dffc4979ce130fc283612e100b3a407818ec4f4d78
 EBUILD rst2pdf-0.16.ebuild 1502 RMD160 44b9b03b76ee20a1fca5f46f95bac67d3f1a464d SHA1 30af673e93f21958353b5b4c07a6b0a10ef3f353 SHA256 26f4228b03d021c21c4f40ab32bf13783a941e8473ac1c91b99e859b5484c826
-MISC ChangeLog 2210 RMD160 f7a89e4d1ac5b3392c006d9d5ef463fa70e9195e SHA1 416b79cdbf34c6648b7d812a9e51614d91aed8c5 SHA256 af416259018ef5583cf65b3bebf70613b0876efcf75bb56d9f08f81a54ad6970
+MISC ChangeLog 2454 RMD160 5c02303ee3a721ef039d53b4ced23257443ff01a SHA1 62a8f01d252101522455811dabe853862c99b9fb SHA256 1fcca75c66de7ef96c5b20634ed4977f3bc60e3207931e955318b433ea15fa37
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJOM4sVAAoJEMmH5mwCk1NvyREH/398M4J03k4OnQnH/bBxZWKe
+PcxwU1lv8fVBuXUXiYT4oD2mQnjnS8xEDz3rjWWGrA3LyddkSuRuJaHoid/F+LSo
+Q4e/rfye7uuWxaLypB+bISW1pwNKLPj6lQkN1bYtGR6z1tq+i6Ac9JlijdUUQgmj
+NbBkiqhzuZvK69ONt1r5I63HlLXjKFrcDkSsmr/jAqYv0w73y4q6AfA2D89kni6m
+Iku9NffaQAvCvhD2R/mW4JjnN8LgtJEZWTI8Zkl0GaVZc9MsEf/UydSNbJHs0+vW
++1Gbn09lQmWIrgjv2Ax038Gb3S45rpnbjdJN3klmcu6HWhcpW+t95GsnV9G8E9w=
+=INAF
+-----END PGP SIGNATURE-----

diff --git a/dev-python/rst2pdf/files/rst2pdf-0.16_docutils-0.8.patch b/dev-python/rst2pdf/files/rst2pdf-0.16_docutils-0.8.patch
new file mode 100644 (file)
index 0000000..a7cc081
--- /dev/null
+++ b/dev-python/rst2pdf/files/rst2pdf-0.16_docutils-0.8.patch
@@ -0,0 +1,52 @@
+Index: rst2pdf/createpdf.py
+===================================================================
+--- rst2pdf/createpdf.py       (revision 2441)
++++ rst2pdf/createpdf.py       (working copy)
+@@ -56,6 +56,7 @@
+ from optparse import OptionParser
+ import logging
+ 
++import docutils
+ from docutils.languages import get_language
+ import docutils.readers.doctree
+ import docutils.core
+@@ -97,6 +98,12 @@
+ escape=tenjin.helpers.escape
+ templateEngine=tenjin.Engine()
+ 
++# fix get_language for docutils>=0.8
++if docutils.__version__ >= '0.8':
++    orig_func = get_language
++    def get_language(arg1):
++        return orig_func(arg1, None)
++
+ def renderTemplate(tname, **context):
+   context['to_str']=to_str
+   context['escape']=escape
+Index: rst2pdf/pdfbuilder.py
+===================================================================
+--- rst2pdf/pdfbuilder.py      (revision 2441)
++++ rst2pdf/pdfbuilder.py      (working copy)
+@@ -27,6 +27,7 @@
+ from rst2pdf import pygments_code_block_directive, oddeven_directive
+ from pygments.lexers import get_lexer_by_name, guess_lexer
+ 
++import docutils
+ from docutils import writers
+ from docutils import nodes
+ from docutils import languages
+@@ -56,7 +57,14 @@
+ 
+ from traceback import print_exc
+ 
++# fix get_language for docutils>=0.8
++if docutils.__version__ >= '0.8':
++    orig_func = get_language
++    def get_language(arg1):
++        return orig_func(arg1, None)
++    languages.get_language = get_language
+ 
++
+ class PDFBuilder(Builder):
+     name = 'pdf'
+     out_suffix = '.pdf'

diff --git a/dev-python/rst2pdf/rst2pdf-0.16-r1.ebuild b/dev-python/rst2pdf/rst2pdf-0.16-r1.ebuild
new file mode 100644 (file)
index 0000000..b668006
--- /dev/null
+++ b/dev-python/rst2pdf/rst2pdf-0.16-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rst2pdf/rst2pdf-0.16-r1.ebuild,v 1.1 2011/07/30 04:39:42 rafaelmartins Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+
+inherit distutils eutils
+
+DESCRIPTION="Tool for transforming reStructuredText to PDF using ReportLab"
+HOMEPAGE="http://code.google.com/p/rst2pdf/ http://pypi.python.org/pypi/rst2pdf"
+SRC_URI="http://rst2pdf.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/docutils
+       dev-python/imaging
+       dev-python/pygments
+       >=dev-python/reportlab-2.4"
+RDEPEND="${DEPEND}"
+
+DOCS="Contributors.txt CHANGES.txt README.txt doc/*"
+
+src_prepare() {
+       distutils_src_prepare
+
+       epatch "${FILESDIR}/${P}_docutils-0.8.patch"
+}
+
+src_install() {
+       distutils_src_install
+
+       insinto /usr/share/doc/${PF}/examples
+       doins doc/montecristo/* || die "doins failed"
+}
+
+pkg_postinst() {
+       distutils_pkg_postinst
+
+       elog "rst2pdf can work with the following packages for additional functionality:"
+       elog "   dev-python/sphinx       - versatile documentation creation"
+       elog "   dev-python/pythonmagick - image processing with ImageMagick"
+       elog "   dev-python/matplotlib   - mathematical formulae"
+       elog "   media-gfx/uniconvertor  - vector image format conversion"
+       elog "It can also use wordaxe for hyphenation, but this package is not"
+       elog "available in the portage tree yet. Please refer to the manual"
+       elog "installed in /usr/share/doc/${PF}/ for more information."
+}