Added patch from Debian for hyphens escaping. Thanks to Fredrik Steen <stone@debian.org> (Debian maintainer) and Wesley J. Landaker (original submitter of the patch).

(Portage version: 2.0.51.22-r2)

4 files changed, 43 insertions, 3 deletions

diff --git a/app-text/txt2man/ChangeLog b/app-text/txt2man/ChangeLog
index 37cab14f682b..d92998bf8b69 100644
--- a/app-text/txt2man/ChangeLog
+++ b/app-text/txt2man/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/txt2man
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/txt2man/ChangeLog,v 1.5 2005/07/25 19:13:23 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/txt2man/ChangeLog,v 1.6 2005/07/27 08:07:44 flameeyes Exp $
+
+*txt2man-1.4.8-r1 (27 Jul 2005)
+
+  27 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/txt2man-1.4.8-debian.patch, -txt2man-1.4.8.ebuild,
+  +txt2man-1.4.8-r1.ebuild:
+  Added patch from Debian for hyphens escaping. Thanks to Fredrik Steen
+  <stone@debian.org> (Debian maintainer) and Wesley J. Landaker (original
+  submitter of the patch).
 
   25 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> txt2man-1.4.8.ebuild:
   ~sparc as a dep for bug #100058
diff --git a/app-text/txt2man/files/digest-txt2man-1.4.8 b/app-text/txt2man/files/digest-txt2man-1.4.8-r1
index b5c4ed06acaf..b5c4ed06acaf 100644
--- a/app-text/txt2man/files/digest-txt2man-1.4.8
+++ b/app-text/txt2man/files/digest-txt2man-1.4.8-r1
diff --git a/app-text/txt2man/files/txt2man-1.4.8-debian.patch b/app-text/txt2man/files/txt2man-1.4.8-debian.patch
new file mode 100644
index 000000000000..d6cad591276c
--- /dev/null
+++ b/app-text/txt2man/files/txt2man-1.4.8-debian.patch
@@ -0,0 +1,21 @@
+--- txt2man-1.4.8.orig/txt2man
++++ txt2man-1.4.8/txt2man
+@@ -181,6 +181,7 @@
+ { 
+ 	sub(/\.\.\./, "\\.\\.\\.")	# to avoid some side effects in regexp
+ 	sub(/^ +$/,"") 			# remove spaces in empty lines
++	sub(/-/,"\\-")                  # backslash-escape hyphens
+ }
+ /^[[:upper:][:space:]]+$/ {		# Section header
+ 	if ((in_bd + 0) == 1) {
+--- txt2man-1.4.8.orig/Makefile
++++ txt2man-1.4.8/Makefile
+@@ -6,7 +6,7 @@
+ 	cp -p txt2man.1 $(prefix)/man/man1
+ 
+ txt2man.1 txt2man.man: txt2man
+-	./txt2man -h 2>&1 | ./txt2man -t txt2man >$@
++	./txt2man -h 2>&1 | ./txt2man -s 1 -t txt2man >$@
+ 
+ txt2man.ps: txt2man.man
+ 	groff -man txt2man.man > txt2man.ps
diff --git a/app-text/txt2man/txt2man-1.4.8.ebuild b/app-text/txt2man/txt2man-1.4.8-r1.ebuild
index c8ce37174c8e..bf7b28c228d5 100644
--- a/app-text/txt2man/txt2man-1.4.8.ebuild
+++ b/app-text/txt2man/txt2man-1.4.8-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/txt2man/txt2man-1.4.8.ebuild,v 1.5 2005/07/25 19:13:23 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/txt2man/txt2man-1.4.8-r1.ebuild,v 1.1 2005/07/27 08:07:44 flameeyes Exp $
+
+inherit eutils
 
 DESCRIPTION="A simple script to convert ASCII text to man page."
 HOMEPAGE="http://mvertes.free.fr/"
@@ -15,9 +17,17 @@ RDEPEND="app-shells/bash
 	sys-apps/gawk"
 DEPEND="${RDEPEND}"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Escape hyphens and add section info to txt2man manpage
+	epatch ${FILESDIR}/${P}-debian.patch
+}
+
 src_compile() {
 	cd ${S}
-	gmake txt2man.1
+	make txt2man.1
 }
 
 src_install() {