Revbump for Prefix changes, bump to EAPI3, add necessary patches from upstream, added Prefix keywords, bug #388193

(Portage version: 2.2.01.19572-prefix/cvs/Darwin i386)

4 files changed, 201 insertions, 1 deletions

diff --git a/sys-apps/groff/ChangeLog b/sys-apps/groff/ChangeLog
index 6e41163c5f4c..d847f49adcc7 100644
--- a/sys-apps/groff/ChangeLog
+++ b/sys-apps/groff/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/groff
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/ChangeLog,v 1.120 2011/05/07 18:02:54 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/ChangeLog,v 1.121 2011/10/23 19:42:35 grobian Exp $
+
+*groff-1.21-r1 (23 Oct 2011)
+
+  23 Oct 2011; Fabian Groffen <grobian@gentoo.org> +groff-1.21-r1.ebuild,
+  +files/groff-1.21-makefile.patch, +files/groff-1.21-gnulib.patch:
+  Revbump for Prefix changes, bump to EAPI3, add necessary patches from
+  upstream, added Prefix keywords, bug #388193
 
   07 May 2011; Raúl Porcel <armin76@gentoo.org> groff-1.21.ebuild:
   alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #362561
diff --git a/sys-apps/groff/files/groff-1.21-gnulib.patch b/sys-apps/groff/files/groff-1.21-gnulib.patch
new file mode 100644
index 000000000000..55abe59022c7
--- /dev/null
+++ b/sys-apps/groff/files/groff-1.21-gnulib.patch
@@ -0,0 +1,94 @@
+https://savannah.gnu.org/bugs/index.php?32301
+http://bugs.gentoo.org/show_bug.cgi?id=353377
+
+diff -ur groff-1.21/src/devices/grodvi/Makefile.sub groff-1.21-mint/src/devices/grodvi/Makefile.sub
+--- groff-1.21/src/devices/grodvi/Makefile.sub	2010-12-31 07:33:08.000000000 +0000
++++ groff-1.21-mint/src/devices/grodvi/Makefile.sub	2011-02-06 01:52:53.000000000 +0000
+@@ -1,6 +1,6 @@
+ PROG=grodvi$(EXEEXT)
+ MAN1=grodvi.n
+-XLIBS=$(LIBDRIVER) $(LIBGROFF)
++XLIBS=$(LIBDRIVER) $(LIBGROFF) $(LIBGNU)
+ MLIB=$(LIBM)
+ OBJS=dvi.$(OBJEXT)
+ CCSRCS=$(srcdir)/dvi.cpp
+diff -ur groff-1.21/src/devices/grohtml/Makefile.sub groff-1.21-mint/src/devices/grohtml/Makefile.sub
+--- groff-1.21/src/devices/grohtml/Makefile.sub	2010-12-31 07:33:08.000000000 +0000
++++ groff-1.21-mint/src/devices/grohtml/Makefile.sub	2011-02-06 02:00:46.000000000 +0000
+@@ -1,6 +1,6 @@
+ PROG=post-grohtml$(EXEEXT)
+ MAN1=grohtml.n
+-XLIBS=$(LIBDRIVER) $(LIBGROFF)
++XLIBS=$(LIBDRIVER) $(LIBGROFF) $(LIBGNU)
+ MLIB=$(LIBM)
+ OBJS=\
+   post-html.$(OBJEXT) \
+diff -ur groff-1.21/src/devices/grolbp/Makefile.sub groff-1.21-mint/src/devices/grolbp/Makefile.sub
+--- groff-1.21/src/devices/grolbp/Makefile.sub	2010-12-31 07:33:08.000000000 +0000
++++ groff-1.21-mint/src/devices/grolbp/Makefile.sub	2011-02-06 02:04:38.000000000 +0000
+@@ -1,6 +1,6 @@
+ PROG=grolbp$(EXEEXT)
+ MAN1=grolbp.n
+-XLIBS=$(LIBDRIVER) $(LIBGROFF)
++XLIBS=$(LIBDRIVER) $(LIBGROFF) $(LIBGNU)
+ MLIB=$(LIBM)
+ OBJS=lbp.$(OBJEXT)
+ CCSRCS=$(srcdir)/lbp.cpp
+diff -ur groff-1.21/src/devices/grolj4/Makefile.sub groff-1.21-mint/src/devices/grolj4/Makefile.sub
+--- groff-1.21/src/devices/grolj4/Makefile.sub	2010-12-31 07:33:08.000000000 +0000
++++ groff-1.21-mint/src/devices/grolj4/Makefile.sub	2011-02-06 01:54:18.000000000 +0000
+@@ -1,7 +1,7 @@
+ PROG=grolj4$(EXEEXT)
+ MAN1=grolj4.n
+ MAN5=lj4_font.n
+-XLIBS=$(LIBDRIVER) $(LIBGROFF)
++XLIBS=$(LIBDRIVER) $(LIBGROFF) $(LIBGNU)
+ MLIB=$(LIBM)
+ OBJS=lj4.$(OBJEXT)
+ CCSRCS=$(srcdir)/lj4.cpp
+diff -ur groff-1.21/src/devices/grops/Makefile.sub groff-1.21-mint/src/devices/grops/Makefile.sub
+--- groff-1.21/src/devices/grops/Makefile.sub	2010-12-31 07:33:08.000000000 +0000
++++ groff-1.21-mint/src/devices/grops/Makefile.sub	2011-02-06 01:50:39.000000000 +0000
+@@ -1,6 +1,6 @@
+ PROG=grops$(EXEEXT)
+ MAN1=grops.n
+-XLIBS=$(LIBDRIVER) $(LIBGROFF)
++XLIBS=$(LIBDRIVER) $(LIBGROFF) $(LIBGNU)
+ MLIB=$(LIBM)
+ OBJS=\
+   ps.$(OBJEXT) \
+diff -ur groff-1.21/src/preproc/grn/Makefile.sub groff-1.21-mint/src/preproc/grn/Makefile.sub
+--- groff-1.21/src/preproc/grn/Makefile.sub	2010-12-31 07:33:08.000000000 +0000
++++ groff-1.21-mint/src/preproc/grn/Makefile.sub	2011-02-06 01:27:38.000000000 +0000
+@@ -1,7 +1,7 @@
+ PROG=grn$(EXEEXT)
+ MAN1=grn.n
+ MLIB=$(LIBM)
+-XLIBS=$(LIBGROFF)
++XLIBS=$(LIBGROFF) $(LIBGNU)
+ OBJS=\
+   hdb.$(OBJEXT) \
+   hpoint.$(OBJEXT) \
+diff -ur groff-1.21/src/preproc/html/Makefile.sub groff-1.21-mint/src/preproc/html/Makefile.sub
+--- groff-1.21/src/preproc/html/Makefile.sub	2010-12-31 07:33:08.000000000 +0000
++++ groff-1.21-mint/src/preproc/html/Makefile.sub	2011-02-06 01:47:56.000000000 +0000
+@@ -1,7 +1,7 @@
+ PROG=pre-grohtml$(EXEEXT)
+ # MAN1=pre-grohtml.n
+ MAN1=
+-XLIBS=$(LIBGROFF)
++XLIBS=$(LIBGROFF) $(LIBGNU)
+ MLIB=$(LIBM)
+ OBJS=pre-html.$(OBJEXT) pushback.$(OBJEXT)
+ CCSRCS=$(srcdir)/pre-html.cpp $(srcdir)/pushback.cpp
+diff -ur groff-1.21/src/roff/groff/Makefile.sub groff-1.21-mint/src/roff/groff/Makefile.sub
+--- groff-1.21/src/roff/groff/Makefile.sub	2010-12-31 07:33:08.000000000 +0000
++++ groff-1.21-mint/src/roff/groff/Makefile.sub	2011-02-06 00:32:30.000000000 +0000
+@@ -1,6 +1,6 @@
+ PROG=groff$(EXEEXT)
+ MAN1=groff.n
+-XLIBS=$(LIBGROFF)
++XLIBS=$(LIBGROFF) $(LIBGNU)
+ MLIB=$(LIBM)
+ OBJS=groff.$(OBJEXT) pipeline.$(OBJEXT)
+ CCSRCS=$(srcdir)/groff.cpp
diff --git a/sys-apps/groff/files/groff-1.21-makefile.patch b/sys-apps/groff/files/groff-1.21-makefile.patch
new file mode 100644
index 000000000000..df8be77c50cc
--- /dev/null
+++ b/sys-apps/groff/files/groff-1.21-makefile.patch
@@ -0,0 +1,14 @@
+From upstream CVS
+http://bugs.gentoo.org/show_bug.cgi?id=353287
+
+--- Makefile.comm
++++ Makefile.comm
+@@ -21,7 +21,7 @@
+ #
+ INCLUDES=-I. -I$(srcdir) \
+   -I$(top_builddir)/src/include -I$(top_srcdir)/src/include \
+-  -I$(tob_builddir)/src/libs/gnulib/lib
++  -I$(top_builddir)/src/libs/gnulib/lib
+ ALL_CCFLAGS=$(INCLUDES) $(CCDEFINES) $(CCFLAGS) $(CPPFLAGS)
+ COMPILE.cpp=$(CCC) $(ALL_CCFLAGS) -c
+ ALL_CFLAGS=$(INCLUDES) $(CDEFINES) $(CFLAGS) $(CPPFLAGS)
diff --git a/sys-apps/groff/groff-1.21-r1.ebuild b/sys-apps/groff/groff-1.21-r1.ebuild
new file mode 100644
index 000000000000..a3c42f3603fe
--- /dev/null
+++ b/sys-apps/groff/groff-1.21-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.21-r1.ebuild,v 1.1 2011/10/23 19:42:35 grobian Exp $
+
+EAPI="3"
+
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="Text formatter used for man pages"
+HOMEPAGE="http://www.gnu.org/software/groff/groff.html"
+SRC_URI="mirror://gnu/groff/${P}.tar.gz
+	linguas_ja? ( mirror://gentoo/${P}-japanese.patch.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples X linguas_ja"
+
+DEPEND=">=sys-apps/texinfo-4.7-r1
+	X? (
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXmu
+		x11-libs/libXaw
+		x11-libs/libSM
+		x11-libs/libICE
+	)"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.19.2-man-unicode-dashes.patch #16108 #17580 #121502
+
+	# Make sure we can cross-compile this puppy
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e '/^GROFFBIN=/s:=.*:=${EPREFIX}/usr/bin/groff:' \
+			-e '/^TROFFBIN=/s:=.*:=${EPREFIX}/usr/bin/troff:' \
+			-e '/^GROFF_BIN_PATH=/s:=.*:=:' \
+			-e '/^GROFF_BIN_DIR=/s:=.*:=:' \
+			contrib/*/Makefile.sub \
+			doc/Makefile.in \
+			doc/Makefile.sub || die "cross-compile sed failed"
+	fi
+
+	local pfx=
+	use prefix && pfx=" Prefix"
+	cat <<-EOF >> tmac/mdoc.local
+	.ds volume-operating-system Gentoo${pfx}
+	.ds operating-system Gentoo${pfx}/${KERNEL}
+	.ds default-operating-system Gentoo${pfx}/${KERNEL}
+	EOF
+
+	if use linguas_ja ; then
+		epatch "${WORKDIR}"/${P}-japanese.patch #255292 #350534
+		eautoconf
+		eautoheader
+	fi
+
+	# from upstream, #353287, #353377
+	epatch "${FILESDIR}"/groff-1.21-makefile.patch
+	epatch "${FILESDIR}"/groff-1.21-gnulib.patch
+	# make sure we don't get a crappy `g' nameprefix on UNIX systems with real
+	# troff (GROFF_G macro runs some test to see, its own troff doesn't satisfy)
+	sed -i -e 's/^[ \t]\+g=g$/g=/' configure || die
+}
+
+src_configure() {
+	econf \
+		--with-appresdir="${EPREFIX}"/usr/share/X11/app-defaults \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		$(use_with X x) \
+		$(use linguas_ja && echo --enable-japanese)
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+
+	# The following links are required for man #123674
+	dosym eqn /usr/bin/geqn
+	dosym tbl /usr/bin/gtbl
+
+	dodoc BUG-REPORT ChangeLog MORE.STUFF NEWS \
+		PROBLEMS PROJECTS README REVISION TODO VERSION
+
+	use examples || rm -rf "${ED}"/usr/share/doc/${PF}/examples
+}