bug #287546, thanks to Engelbert Gruber <grubert@users.sourceforge.net> and Martin von Gagern <Martin.vGagern@gmx.net>; bug #288273, thanks to Andre Malo <nd@perlig.de>

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

5 files changed, 144 insertions, 2 deletions

diff --git a/dev-python/epydoc/ChangeLog b/dev-python/epydoc/ChangeLog
index 295bfba927ef..0a6b99ccba54 100644
--- a/dev-python/epydoc/ChangeLog
+++ b/dev-python/epydoc/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/epydoc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/epydoc/ChangeLog,v 1.49 2009/11/03 17:10:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/epydoc/ChangeLog,v 1.50 2009/12/17 17:03:43 grozin Exp $
+
+*epydoc-3.0.1-r1 (17 Dec 2009)
+
+  17 Dec 2009; Andrey Grozin <grozin@gentoo.org>
+  +files/epydoc-docutils-0.6.patch, +files/epydoc-python-2.6.patch,
+  +epydoc-3.0.1-r1.ebuild:
+  bug #287546, thanks to Engelbert Gruber <grubert@users.sourceforge.net>
+  and Martin von Gagern <Martin.vGagern@gmx.net>; bug #288273, thanks to
+  Andre Malo <nd@perlig.de>
 
   03 Nov 2009; Raúl Porcel <armin76@gentoo.org> epydoc-3.0.1.ebuild:
   m68k/s390 stable wrt #241572
diff --git a/dev-python/epydoc/Manifest b/dev-python/epydoc/Manifest
index 69f90d723d66..b01284542642 100644
--- a/dev-python/epydoc/Manifest
+++ b/dev-python/epydoc/Manifest
@@ -1,6 +1,9 @@
+AUX epydoc-docutils-0.6.patch 1189 RMD160 b336e7af249f21b1bc520c943e089d8a150e5026 SHA1 aeafa969a8c40c443bd8c6ad041f95182bf12a78 SHA256 395e7d9c128482a9121ca4302d3d67ced86efe81749e736841a8d783ccf62e91
+AUX epydoc-python-2.6.patch 2425 RMD160 6b81cd0868cd37bca5cbe3d146e94871fe2f9d64 SHA1 db9e79f0b472716d81d6462de667545df7ffb2a2 SHA256 c1e3ef61ba2ba70918c9f535c4c515eaba353e79c9cbe2f3071734434c045751
 DIST epydoc-2.1.tar.gz 529943 RMD160 50b8a546cf22acd82e7ccbc3f5a8dc111534b5cf SHA1 f2034c5e1b9cf0d2d16e0b9c8af0d3581af524e4 SHA256 cf1e915810f7b34c1315a41e9aa82b570ab2a7f49edbdbaaec4725e8d543c04a
 DIST epydoc-3.0.1.tar.gz 1785792 RMD160 7630a4f6e4ef5f1e2b033f38316ed992306cb951 SHA1 ccd5cb602cbf8df1a6c61670793d0122fc569523 SHA256 d4e5c8d90937d01b05170f592c1fa9b29e9ed0498dfe7f0eb2a3af61725b6ad1
 EBUILD epydoc-2.1-r2.ebuild 821 RMD160 dc6455ff1bc4aabaf24e2d4ca8121bba56e26e54 SHA1 11e9fbe80f23348db1d05cff7ef5c0c580e2a9da SHA256 5cc7708547b3edcef6e8e1dfdb185094ac05fed9b23bd426d871285ea01f8552
+EBUILD epydoc-3.0.1-r1.ebuild 1321 RMD160 a41fc666f33a9e04cbfafe267b1b59a62bb1bd80 SHA1 d5e972a2ce86b10f923793b910085fabf6084f4f SHA256 a301ec3887025a15dc60355c33e3d23c810797fa426d6a95b8247547ad5e5b8f
 EBUILD epydoc-3.0.1.ebuild 1019 RMD160 26fbcb35a0241f22718dcacc7c6b9f1b604bd5ac SHA1 ea1f84e6343d0948df1cc2d6b502eec75b4e919c SHA256 547b351b7d510d7f36bf5bbf74bbc5f1de99d2601cd8fe784b8123afac2ef14b
-MISC ChangeLog 5458 RMD160 b2c45dab4cb573002b2b41e85c1498de1606097a SHA1 dcbc5a9fca593927422799f2f9984f3c3040b421 SHA256 d5c1a4c937e691a5ca1b360f14e6fc3aa74c37cd20a537774c0ba74bc21f7f19
+MISC ChangeLog 5809 RMD160 93a151cc92a13f8e1cbb8253c02794d749b41322 SHA1 5f07cf053b4146b93893d0776665a01e26222c0e SHA256 1296dc0c046958e9d2e74ed21bf2f7e1b6f269ee00685d38bce92a663dfb5c86
 MISC metadata.xml 1070 RMD160 50fbf351b06775908755ae4436d6352cd5ffdbf3 SHA1 5b01cd363e28a60f952c23954e7f12b882e482ed SHA256 34074c2fb16e86fbf182512c108afebe0c24fc143bb69044028bfa4e7dc2cb7a
diff --git a/dev-python/epydoc/epydoc-3.0.1-r1.ebuild b/dev-python/epydoc/epydoc-3.0.1-r1.ebuild
new file mode 100644
index 000000000000..7bf888cabf57
--- /dev/null
+++ b/dev-python/epydoc/epydoc-3.0.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/epydoc/epydoc-3.0.1-r1.ebuild,v 1.1 2009/12/17 17:03:43 grozin Exp $
+
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils
+
+DESCRIPTION="Tool for generating API documentation for Python modules, based on their docstrings"
+HOMEPAGE="http://epydoc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc latex X"
+
+DEPEND=""
+RDEPEND="dev-python/docutils
+	latex? ( virtual/latex-base
+		|| ( dev-texlive/texlive-latexextra app-text/ptex )
+	)
+	X? ( dev-lang/python[tk] )"
+RESTRICT_PYTHON_ABIS="3.*"
+
+src_prepare() {
+	# bug #287546, thanks to Engelbert Gruber <grubert@users.sourceforge.net>
+	# and Martin von Gagern <Martin.vGagern@gmx.net>
+	epatch "${FILESDIR}"/${PN}-docutils-0.6.patch
+
+	# bug #288273, thanks to Andre Malo <nd@perlig.de>
+	epatch "${FILESDIR}"/${PN}-python-2.6.patch
+}
+
+src_install() {
+	[[ -z ${ED} ]] && local ED=${D}
+	distutils_src_install
+
+	doman man/*
+	use doc && dohtml -r doc/*
+	use X || rm -f "${ED}usr/bin/epydocgui"
+}
diff --git a/dev-python/epydoc/files/epydoc-docutils-0.6.patch b/dev-python/epydoc/files/epydoc-docutils-0.6.patch
new file mode 100644
index 000000000000..35f44108a1ed
--- /dev/null
+++ b/dev-python/epydoc/files/epydoc-docutils-0.6.patch
@@ -0,0 +1,27 @@
+Make epydoc work with docutils-0.6.
+
+Patch created by Engelbert Gruber (grubert) and adjusted by Martin von Gagern.
+
+References:
+http://sourceforge.net/tracker/?func=detail&aid=2895197&group_id=32455&atid=405618
+http://thread.gmane.org/gmane.text.docutils.devel/4888/focus=4924
+http://bugs.gentoo.org/287546
+
+Index: epydoc-3.0.1/epydoc/markup/restructuredtext.py
+===================================================================
+--- epydoc-3.0.1.orig/epydoc/markup/restructuredtext.py
++++ epydoc-3.0.1/epydoc/markup/restructuredtext.py
+@@ -304,10 +304,11 @@ class _SummaryExtractor(NodeVisitor):
+         # Extract the first sentence.
+         for child in node:
+             if isinstance(child, docutils.nodes.Text):
+-                m = self._SUMMARY_RE.match(child.data)
++                data = child.astext()
++                m = self._SUMMARY_RE.match(data)
+                 if m:
+                     summary_pieces.append(docutils.nodes.Text(m.group(1)))
+-                    other = child.data[m.end():]
++                    other = data[m.end():]
+                     if other and not other.isspace():
+                         self.other_docs = True
+                     break
diff --git a/dev-python/epydoc/files/epydoc-python-2.6.patch b/dev-python/epydoc/files/epydoc-python-2.6.patch
new file mode 100644
index 000000000000..84bb22d879c5
--- /dev/null
+++ b/dev-python/epydoc/files/epydoc-python-2.6.patch
@@ -0,0 +1,60 @@
+diff -Nur epydoc-3.0.1/epydoc/docparser.py epydoc-3.0.1/epydoc/docparser.py
+--- epydoc-3.0.1/epydoc/docparser.py
++++ epydoc-3.0.1/epydoc/docparser.py
+@@ -72,6 +72,26 @@
+ from epydoc.compat import *
+ 
+ ######################################################################
++## Tokenizer change in 2.6
++######################################################################
++
++def comment_includes_nl():
++    """ Determine whether comments are parsed as one or two tokens... """
++    readline = iter(u'\n#\n\n'.splitlines(True)).next
++    tokens = [
++        token.tok_name[tup[0]] for tup in tokenize.generate_tokens(readline)
++    ]
++    if tokens == ['NL', 'COMMENT', 'NL', 'ENDMARKER']:
++        return True
++    elif tokens == ['NL', 'COMMENT', 'NL', 'NL', 'ENDMARKER']:
++        return False
++    raise AssertionError(
++        "Tokenizer returns unexexpected tokens: %r" % tokens
++    )
++
++comment_includes_nl = comment_includes_nl()
++
++######################################################################
+ ## Doc Parser
+ ######################################################################
+ 
+@@ -520,6 +540,10 @@
+     # inside that block, not outside it.
+     start_group = None
+ 
++    # If the comment tokens do not include the NL, every comment token
++    # sets this to True in order to swallow the next NL token unprocessed.
++    comment_nl_waiting = False
++
+     # Check if the source file declares an encoding.
+     encoding = get_module_encoding(module_doc.filename)
+ 
+@@ -570,7 +594,9 @@
+         # then discard them: blank lines are not allowed between a
+         # comment block and the thing it describes.
+         elif toktype == tokenize.NL:
+-            if comments and not line_toks:
++            if comment_nl_waiting:
++                comment_nl_waiting = False
++            elif comments and not line_toks:
+                 log.warning('Ignoring docstring comment block followed by '
+                             'a blank line in %r on line %r' %
+                             (module_doc.filename, srow-1))
+@@ -578,6 +604,7 @@
+                 
+         # Comment token: add to comments if appropriate.
+         elif toktype == tokenize.COMMENT:
++            comment_nl_waiting = not comment_includes_nl
+             if toktext.startswith(COMMENT_DOCSTRING_MARKER):
+                 comment_line = toktext[len(COMMENT_DOCSTRING_MARKER):].rstrip()
+                 if comment_line.startswith(" "):