Fix 'man -t' having a blank page as first (bug #25735), thanks to

splite <splite-gentoo@sigint.cs.purdue.edu>.

4 files changed, 121 insertions, 4 deletions

diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index 037328fed159..6ecf3bc52929 100644
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -1,4 +1,4 @@
-MD5 260b251fac07ed1d3ad18d42250c02fc ChangeLog 4085
+MD5 ab7dd6c4ac7ef7bd0ddb76be661d325e ChangeLog 4337
 MD5 bf6f7af7e329d28d0901e174574ae2a9 groff-1.16.1-r1.ebuild 814
 MD5 640fd03ef49ddaab33e8b5427c6e2337 groff-1.18-r3.ebuild 1967
 MD5 5b9b7e3806356dd1d7d4b97056e56b70 groff-1.18-r2.ebuild 1864
@@ -6,7 +6,7 @@ MD5 ef01fb3ceb14724af378c2428d91d2d7 groff-1.17.2-r3.ebuild 2059
 MD5 0687ef3cac785b4ab6c086d5ebe323e2 groff-1.18.1-r1.ebuild 2370
 MD5 1edddbdaef45729082b39ae7efab6d52 groff-1.18.1.ebuild 2015
 MD5 12809870341a9930118762947988cc33 groff-1.18.1-r2.ebuild 2937
-MD5 12809870341a9930118762947988cc33 groff-1.18.1-r3.ebuild 2937
+MD5 075a3080cfa278a8323b22e25b37bf29 groff-1.18.1-r3.ebuild 2933
 MD5 3de83707a0c25509fdb6630bd90e947a files/digest-groff-1.16.1-r1 65
 MD5 e35d3d0986726ce27b9392409d9f6476 files/digest-groff-1.18.1 65
 MD5 2ee48e4557f0e2ca8d674ee94873839e files/digest-groff-1.18-r2 63
diff --git a/sys-apps/groff/files/digest-groff-1.18.1-r3 b/sys-apps/groff/files/digest-groff-1.18.1-r3
new file mode 100644
index 000000000000..09b570a44a72
--- /dev/null
+++ b/sys-apps/groff/files/digest-groff-1.18.1-r3
@@ -0,0 +1,2 @@
+MD5 4c7a1b478d230696f14743772f31639f groff-1.18.1.tar.gz 2250463
+MD5 957fad244caa648fdf3d6395ca27aa2e groff_1.18.1-7.diff.gz 115348
diff --git a/sys-apps/groff/files/groff-man-UTF-8.diff b/sys-apps/groff/files/groff-man-UTF-8.diff
index 512171615c8f..7adbc9e7d188 100644
--- a/sys-apps/groff/files/groff-man-UTF-8.diff
+++ b/sys-apps/groff/files/groff-man-UTF-8.diff
@@ -1,11 +1,10 @@
 diff -ur groff-1.18.1.orig/tmac/man.local groff-1.18.1/tmac/man.local
 --- groff-1.18.1.orig/tmac/man.local	2000-10-26 16:15:17.000000000 +0200
 +++ groff-1.18.1/tmac/man.local	2003-03-16 02:15:50.000000000 +0100
-@@ -1,2 +1,7 @@
+@@ -1,2 +1,6 @@
  .\" This file is loaded after an-old.tmac.
  .\" Put any local modifications to an-old.tmac here.
 +.if '\*[.T]'utf8' \{\
 +.  char \- \N'45'
 +.  char  - \N'45'
 +.\}
-+
diff --git a/sys-apps/groff/groff-1.18.1-r3.ebuild b/sys-apps/groff/groff-1.18.1-r3.ebuild
new file mode 100644
index 000000000000..3ff802f2ac2b
--- /dev/null
+++ b/sys-apps/groff/groff-1.18.1-r3.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.18.1-r3.ebuild,v 1.1 2003/08/04 19:02:44 azarah Exp $
+
+IUSE="X cjk"
+
+inherit eutils
+
+S="${WORKDIR}/${P}"
+DESCRIPTION="Text formatter used for man pages"
+MB_PATCH="${P/-/_}-7"
+SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/groff/${P}.tar.gz
+	cjk? ( http://people.debian.org/~ukai/groff/${MB_PATCH}.diff.gz )"
+HOMEPAGE="http://www.gnu.org/software/groff/groff.html"
+
+KEYWORDS="x86 amd64 ppc sparc alpha mips hppa arm"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="virtual/glibc
+	>=sys-apps/texinfo-4.0"
+
+PDEPEND=">=sys-apps/man-1.5k-r1"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	if [ "`use cjk`" ]; then
+		# multibyte patch contains no-color-segfault
+		epatch ${WORKDIR}/${MB_PATCH}.diff
+		epatch ${FILESDIR}/${MB_PATCH}-fix.patch
+	else
+		# Do not segfault if no color is defined in input, bug #14329
+		# <azarah@gentoo.org> (08 Feb 2003)
+		epatch ${FILESDIR}/${P}-no-color-segfault.patch
+	fi
+
+	# Fix the info pages to have .info extensions,
+	# else they do not get gzipped.
+	epatch ${FILESDIR}/groff-1.18-infoext.patch
+
+	# Do not generate example files that require us to
+	# depend on netpbm.
+	epatch ${FILESDIR}/groff-1.18-no-netpbm-depend.patch
+
+	# Make dashes the same as minus on the keyboard so that you
+	# can search for it. Fixes #17580 and #16108
+	# Thanks to James Cloos <cloos@jhcloos.com>
+	epatch ${FILESDIR}/${PN}-man-UTF-8.diff
+}
+
+src_compile() {
+	local myconf=""
+
+	# Fix problems with not finding g++
+	[ -z "${CC}" ] && export CC="gcc"
+	[ -z "${CXX}" ] && export CXX="g++"
+
+	#-march=2.0 makes groff unable to finish the compile process
+	if [ "${ARCH}" = "hppa" ]; then
+		export CFLAGS="${CFLAGS/-march=2.0/}"
+		export CXXFLAGS="${CXXFLAGS/-march=2.0/}"
+	fi
+
+	if [ "`use cjk`" ]; then
+		myconf="${myconf} --enable-multibyte"
+	fi
+
+	./configure --host=${CHOST} \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--infodir=\${inforoot} \
+		${myconf} || die
+		
+	# emake doesn't work
+	make || die
+
+	# Only build X stuff if we have X installed, but do
+	# not depend on it, else we get circular deps.
+	if [ -n "`use X`" ] && [ -x /usr/X11R6/bin/xmkmf ]
+	then
+		cd ${S}/src/xditview
+		xmkmf || die
+		make depend all || die
+	fi
+}
+
+src_install() {
+	dodir /usr /usr/share/doc/${PF}/{examples,html}
+	make prefix=${D}/usr \
+		manroot=${D}/usr/share/man \
+		inforoot=${D}/usr/share/info \
+		docdir=${D}/usr/share/doc/${PF} \
+		install || die
+
+	if [ -n "`use X`" ] && [ -x /usr/X11R6/bin/xmkmf ]
+	then
+		cd ${S}/src/xditview
+		make DESTDIR=${D} \
+			BINDIR=/usr/bin \
+			MANPATH=/usr/share/man \
+			install \
+			install.man || die
+	fi
+	
+	#the following links are required for xman
+	dosym eqn /usr/bin/geqn
+	dosym tbl /usr/bin/gtbl
+	dosym soelim /usr/bin/zsoelim
+
+	cd ${S}
+	dodoc BUG-REPORT COPYING ChangeLog FDL MORE.STUFF NEWS \
+		PROBLEMS PROJECTS README REVISION TODO VERSION
+}
+