Update Makefiles for sed 4.1.4 -- patch courtesy of TGL (Bug #131883)

  Make man pages look ok with man 1.6 (bold fonts were messed up)

(Portage version: 2.1-r1)

7 files changed, 91 insertions, 6 deletions

diff --git a/app-text/ttf2pt1/ChangeLog b/app-text/ttf2pt1/ChangeLog
index 90eb49fc7d5a..a06afa11b6a3 100644
--- a/app-text/ttf2pt1/ChangeLog
+++ b/app-text/ttf2pt1/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/ttf2pt1
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ttf2pt1/ChangeLog,v 1.14 2005/04/24 02:58:42 hansmi Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/ttf2pt1/ChangeLog,v 1.15 2006/08/15 19:46:49 wormo Exp $
+
+  15 Aug 2006; Stephanie Lockwood-Childs <wormo@gentoo.org> +metadata.xml,
+  +files/ttf2pt1-3.4.0-Makefile-multiline-sed.diff,
+  +files/ttf2pt1-3.4.0-man-pages.diff, ttf2pt1-3.4.0.ebuild:
+  Update Makefiles for sed 4.1.4 -- patch courtesy of TGL (Bug #131883)
+  Make man pages look ok with man 1.6 (bold fonts were messed up)
 
   24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> ttf2pt1-3.4.0.ebuild:
   Stable on ppc.
diff --git a/app-text/ttf2pt1/files/digest-ttf2pt1-3.4.0 b/app-text/ttf2pt1/files/digest-ttf2pt1-3.4.0
index 5ddab953c41e..6447e3059660 100644
--- a/app-text/ttf2pt1/files/digest-ttf2pt1-3.4.0
+++ b/app-text/ttf2pt1/files/digest-ttf2pt1-3.4.0
@@ -1 +1,3 @@
 MD5 98c7f1f4359cdf094229be7bc0884f87 ttf2pt1-3.4.0.tgz 204811
+RMD160 42426b09ca964a5628ff3b7c2db7bf1c2ce43c48 ttf2pt1-3.4.0.tgz 204811
+SHA256 f05184ce4f3c7c6e0931ddf25a0c792aaaa27a1ca890036703cb6566dc482eae ttf2pt1-3.4.0.tgz 204811
diff --git a/app-text/ttf2pt1/files/ttf2pt1-3.4.0-Makefile-multiline-sed.diff b/app-text/ttf2pt1/files/ttf2pt1-3.4.0-Makefile-multiline-sed.diff
new file mode 100644
index 000000000000..739d89efc47c
--- /dev/null
+++ b/app-text/ttf2pt1/files/ttf2pt1-3.4.0-Makefile-multiline-sed.diff
@@ -0,0 +1,28 @@
+--- ttf2pt1-3.4.0/Makefile.orig	2006-05-01 13:19:26.000000000 +0200
++++ ttf2pt1-3.4.0/Makefile	2006-05-01 13:20:39.000000000 +0200
+@@ -213,17 +213,19 @@
+ 	chmod -R go-w $(SHAREDIR)
+ 	scripts/inst_file ttf2pt1 $(BINDIR)/ttf2pt1 $(OWNER) $(GROUP) 0755
+ 	[ -f $(BINDIR)/t1asm ] || scripts/inst_file t1asm $(LIBXDIR)/t1asm $(OWNER) $(GROUP) 0755
+-	sed 's|^TTF2PT1_BINDIR=$$|TTF2PT1_BINDIR=$(BINDIR)|;\
+-		s|^TTF2PT1_LIBXDIR=$$|TTF2PT1_LIBXDIR=$(LIBXDIR)|;\
+-		s|^TTF2PT1_SHAREDIR=$$|TTF2PT1_SHAREDIR=$(SHAREDIR)|;' <scripts/convert >cvt.tmp
++	sed -e 's|^TTF2PT1_BINDIR=$$|TTF2PT1_BINDIR=$(BINDIR)|' \
++		-e 's|^TTF2PT1_LIBXDIR=$$|TTF2PT1_LIBXDIR=$(LIBXDIR)|' \
++		-e 's|^TTF2PT1_SHAREDIR=$$|TTF2PT1_SHAREDIR=$(SHAREDIR)|' \
++		<scripts/convert >cvt.tmp
+ 	scripts/inst_file cvt.tmp $(BINDIR)/ttf2pt1_convert $(OWNER) $(GROUP) 0755
+ 	scripts/inst_file cvt.tmp $(SHAREDIR)/scripts/convert $(OWNER) $(GROUP) 0755
+ 	rm cvt.tmp
+ 	scripts/inst_file scripts/x2gs $(BINDIR)/ttf2pt1_x2gs $(OWNER) $(GROUP) 0755
+ 	for i in $(MANS1); do { \
+-		sed 's|TTF2PT1_BINDIR|$(BINDIR)|;\
+-			s|TTF2PT1_LIBXDIR|$(LIBXDIR)|;\
+-			s|TTF2PT1_SHAREDIR|$(SHAREDIR)|;' <$$i >$(MANDIR)/man1/$$i \
++		sed -e 's|TTF2PT1_BINDIR|$(BINDIR)|' \
++			-e 's|TTF2PT1_LIBXDIR|$(LIBXDIR)|' \
++			-e 's|TTF2PT1_SHAREDIR|$(SHAREDIR)|' \
++			<$$i >$(MANDIR)/man1/$$i \
+ 		&& chown $(OWNER) $(MANDIR)/man1/$$i \
+ 		&& chgrp $(GROUP) $(MANDIR)/man1/$$i \
+ 		&& chmod 0644 $(MANDIR)/man1/$$i \
diff --git a/app-text/ttf2pt1/files/ttf2pt1-3.4.0-man-pages.diff b/app-text/ttf2pt1/files/ttf2pt1-3.4.0-man-pages.diff
new file mode 100644
index 000000000000..2d301244272c
--- /dev/null
+++ b/app-text/ttf2pt1/files/ttf2pt1-3.4.0-man-pages.diff
@@ -0,0 +1,39 @@
+diff -ur ttf2pt1-3.4.0.orig/ttf2pt1.1 ttf2pt1-3.4.0/ttf2pt1.1
+--- ttf2pt1-3.4.0.orig/ttf2pt1.1	2001-11-25 00:58:11.000000000 +0000
++++ ttf2pt1-3.4.0/ttf2pt1.1	2006-08-15 19:15:37.129672839 +0000
+@@ -109,7 +109,8 @@
+ ..
+ .\" @(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2
+ .	\" AM - accent mark definitions
+-.bd B 3
++''' Next line commented because it garbles bold font when viewed with man-1.6
++'''.bd B 3
+ .	\" fudge factors for nroff and troff
+ .if n \{\
+ .	ds #H 0
+diff -ur ttf2pt1-3.4.0.orig/ttf2pt1_convert.1 ttf2pt1-3.4.0/ttf2pt1_convert.1
+--- ttf2pt1-3.4.0.orig/ttf2pt1_convert.1	2001-11-25 00:58:13.000000000 +0000
++++ ttf2pt1-3.4.0/ttf2pt1_convert.1	2006-08-15 19:16:14.369517359 +0000
+@@ -109,7 +109,8 @@
+ ..
+ .\" @(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2
+ .	\" AM - accent mark definitions
+-.bd B 3
++''' Next line commented because it garbles bold font when viewed with man-1.6
++'''.bd B 3
+ .	\" fudge factors for nroff and troff
+ .if n \{\
+ .	ds #H 0
+diff -ur ttf2pt1-3.4.0.orig/ttf2pt1_x2gs.1 ttf2pt1-3.4.0/ttf2pt1_x2gs.1
+--- ttf2pt1-3.4.0.orig/ttf2pt1_x2gs.1	2001-11-25 00:58:13.000000000 +0000
++++ ttf2pt1-3.4.0/ttf2pt1_x2gs.1	2006-08-15 19:16:30.770568473 +0000
+@@ -109,7 +109,8 @@
+ ..
+ .\" @(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2
+ .	\" AM - accent mark definitions
+-.bd B 3
++''' Next line commented because it garbles bold font when viewed with man-1.6
++'''.bd B 3
+ .	\" fudge factors for nroff and troff
+ .if n \{\
+ .	ds #H 0
diff --git a/app-text/ttf2pt1/metadata.xml b/app-text/ttf2pt1/metadata.xml
new file mode 100644
index 000000000000..73420b6cf0f0
--- /dev/null
+++ b/app-text/ttf2pt1/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/ttf2pt1/ttf2pt1-3.3.3.ebuild b/app-text/ttf2pt1/ttf2pt1-3.3.3.ebuild
index b161debbd576..2bcedcba60c9 100644
--- a/app-text/ttf2pt1/ttf2pt1-3.3.3.ebuild
+++ b/app-text/ttf2pt1/ttf2pt1-3.3.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ttf2pt1/ttf2pt1-3.3.3.ebuild,v 1.22 2005/01/01 16:39:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ttf2pt1/ttf2pt1-3.3.3.ebuild,v 1.23 2006/08/15 19:46:49 wormo Exp $
 
 inherit eutils
 
diff --git a/app-text/ttf2pt1/ttf2pt1-3.4.0.ebuild b/app-text/ttf2pt1/ttf2pt1-3.4.0.ebuild
index cd533ab99198..bb92d9d40404 100644
--- a/app-text/ttf2pt1/ttf2pt1-3.4.0.ebuild
+++ b/app-text/ttf2pt1/ttf2pt1-3.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ttf2pt1/ttf2pt1-3.4.0.ebuild,v 1.22 2005/04/24 02:58:42 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ttf2pt1/ttf2pt1-3.4.0.ebuild,v 1.23 2006/08/15 19:46:49 wormo Exp $
 
 inherit eutils
 
@@ -21,6 +21,8 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${P}-Makefile-gentoo.diff
+	epatch ${FILESDIR}/${P}-Makefile-multiline-sed.diff
+	epatch ${FILESDIR}/${P}-man-pages.diff
 }
 
 src_compile() {