Applied patch; bug #95127.

(Portage version: 2.0.51.22-r1)

5 files changed, 62 insertions, 2 deletions

diff --git a/app-text/asciidoc/ChangeLog b/app-text/asciidoc/ChangeLog
index be701e9aedf8..96c573f7df20 100644
--- a/app-text/asciidoc/ChangeLog
+++ b/app-text/asciidoc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/asciidoc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/ChangeLog,v 1.2 2005/06/04 17:04:32 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/ChangeLog,v 1.3 2005/06/05 23:54:12 pylon Exp $
+
+*asciidoc-6.0.3-r1 (05 Jun 2005)
+
+  05 Jun 2005; Lars Weiler <pylon@gentoo.org> +files/asciidoc-name.patch,
+  +asciidoc-6.0.3-r1.ebuild:
+  Applied patch; bug #95127.
 
   04 Jun 2005; Lars Weiler <pylon@gentoo.org> asciidoc-6.0.3.ebuild:
   Added ~ppc.
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 33c41243b2fe..9777e35d84a1 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,4 +1,7 @@
 MD5 e189d10012a87440fa3e524b4e3f3a84 ChangeLog 488
-MD5 f5e89c0ca90f3b95366cb0ef6454393e asciidoc-6.0.3.ebuild 791
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
+MD5 f5e89c0ca90f3b95366cb0ef6454393e asciidoc-6.0.3.ebuild 791
+MD5 8fd9d466a559ca6f86111a473d559bf1 asciidoc-6.0.3-r1.ebuild 885
 MD5 1dd11281d3bc3afe093491c11675f973 files/digest-asciidoc-6.0.3 66
+MD5 1dd11281d3bc3afe093491c11675f973 files/digest-asciidoc-6.0.3-r1 66
+MD5 b65a7aaa9b99dbad57cf64f07b2d78c8 files/asciidoc-name.patch 598
diff --git a/app-text/asciidoc/asciidoc-6.0.3-r1.ebuild b/app-text/asciidoc/asciidoc-6.0.3-r1.ebuild
new file mode 100644
index 000000000000..595befea40de
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-6.0.3-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-6.0.3-r1.ebuild,v 1.1 2005/06/05 23:54:12 pylon Exp $
+
+inherit eutils
+
+DESCRIPTION="AsciiDoc is a text document format for writing short documents,
+articles, books and UNIX man pages."
+HOMEPAGE="http://www.methods.co.nz/asciidoc/"
+SRC_URI="http://www.methods.co.nz/asciidoc/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="virtual/python"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PN}-name.patch
+}
+
+src_install() {
+
+	newbin asciidoc.py asciidoc
+
+	insopts -m664
+	insinto /etc/${PN}
+	doins *.conf
+	doins -r filters
+
+	dodoc BUGS CHANGELOG COPYRIGHT README
+	dodir /usr/share/doc/${PF}/examples
+	cp -r ${S}/examples ${D}/usr/share/doc/${PF}
+	doman ${S}/doc/asciidoc.1
+}
diff --git a/app-text/asciidoc/files/asciidoc-name.patch b/app-text/asciidoc/files/asciidoc-name.patch
new file mode 100644
index 000000000000..26230621b310
--- /dev/null
+++ b/app-text/asciidoc/files/asciidoc-name.patch
@@ -0,0 +1,11 @@
+--- asciidoc.py.orig      2005-05-08 17:03:42.666249974 +0100
++++ asciidoc.py   2005-05-08 16:56:00.518923960 +0100
+@@ -1067,7 +1067,7 @@
+                     error('malformed NAME section body')
+                 lines = reader.read_until(r'^$')
+                 s = string.join(lines)
+-                mo = re.match(r'^(?P<manname>.*?)-(?P<manpurpose>.*)$',s)
++                mo = re.match(r'^(?P<manname>.*?)\s+-\s+(?P<manpurpose>.*)$',s)
+                 if not mo:
+                     error('malformed NAME section body')
+                 attrs['manname'] = string.strip(mo.group('manname'))
diff --git a/app-text/asciidoc/files/digest-asciidoc-6.0.3-r1 b/app-text/asciidoc/files/digest-asciidoc-6.0.3-r1
new file mode 100644
index 000000000000..1ff755657a3f
--- /dev/null
+++ b/app-text/asciidoc/files/digest-asciidoc-6.0.3-r1
@@ -0,0 +1 @@
+MD5 7b8d918f68a24c1d13be6999248788f8 asciidoc-6.0.3.tar.gz 774893