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

Package-Manager: portage-2.2.01.19572-prefix/cvs/Darwin i386

5 files changed, 209 insertions, 6 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/Manifest b/sys-apps/groff/Manifest
index 1ae2d2e071a4..1d9033dadc6a 100644
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -5,6 +5,8 @@ AUX groff-1.19.2-man-unicode-dashes.patch 574 RMD160 759b9822f6950eeaac78ac16cfc
 AUX groff-1.20.1-Thtml-mem-leak.patch 1814 RMD160 e10f328091986ce4a9c3b6e3c7624a48befbecd6 SHA1 db01f9081d2dacf06476913fac3538f9dfa608fd SHA256 b0fc131d0deed47ebe6432fddf93ef8e2bca2dec8f460a39441fadd76361dc8f
 AUX groff-1.20.1-double-frees-mem-leaks.patch 2752 RMD160 4aedb3ced29c09120df170331c5fb439695c039c SHA1 627d3214018a161b29d217abb64874b04c5d5303 SHA256 f4e53e33fbb5ca53841b0984ea9281a5009243ac59b774373c1dd4a9b257dd75
 AUX groff-1.20.1-tmac-ec.patch 763 RMD160 ed2df5ee3287d109b1efa85751c6620553e4b251 SHA1 76516a1a0794f310b74875d80b6651fe19735108 SHA256 5d141c2389da50a689b1f7ac6b704c25b42041b96f6b1a28faa3080084d1fdb9
+AUX groff-1.21-gnulib.patch 3721 RMD160 d75e4924ae9a5dd14a1eb219323e5bb2392a8816 SHA1 8e77308a9e8ed2f6d7235a8ed018c4fa6dbd00be SHA256 2513d6f73728dddcbcc46209088e251d766f5f389660800428f0a952b40ba8dd
+AUX groff-1.21-makefile.patch 452 RMD160 0fca04263de44476b6d418a093511529b0ac874c SHA1 03ddc49a17dc4f5ddbdd855810e506d099d13875 SHA256 7d9828c9bf62ba6f41815a3a5fee26df85489fb47148d24ac98644a84279bc06
 DIST groff-1.20.1-japanese.patch.bz2 52503 RMD160 6b07ac62c5bb8bff99ef31619b434015081f6df7 SHA1 b335de765f8a5b1d34396457d19430ce04ca3e5b SHA256 a07fe0fcb8f10ba6f992797546c795eecd4347128cef79d9bc7cc1ea87fe795b
 DIST groff-1.20.1-r2-japanese.patch.bz2 52496 RMD160 a099b495315cc7d5863d756e227b67916d37d5f8 SHA1 7c689412f817e3326cdd8ee1d002a3a6562b9f54 SHA256 becc287fd0a748b73a04bbf45f0a3add6fc4754490b009c35624d0c93125b476
 DIST groff-1.20.1.tar.gz 3594658 RMD160 ec311727206d183fb04f1b4bd01c1284142fdb52 SHA1 3066587d73df73c2bda235034f4515cf52d22549 SHA256 b645878135cb620c6c417c5601bfe96172245af12045540d7344938b4c2cd805
@@ -13,13 +15,14 @@ DIST groff-1.21.tar.gz 3863837 RMD160 d050f886291a53ea46875887e5641e510e1aecf6 S
 EBUILD groff-1.20.1-r1.ebuild 2215 RMD160 252a54bdbdd7c9e78491ab62c3204c0314ff0263 SHA1 e1cf868dea80e04ea426e66d4bffdb812a908ca3 SHA256 962cb04b7a4541daf659d5a38a1b6e6419ce3cc89d809ea3b796f42a320c0dd7
 EBUILD groff-1.20.1-r2.ebuild 2239 RMD160 3147f1e56e9a804259ff2c976ca52cb5ff2c1a9a SHA1 73d17692e6ecf00de28678b66e8b54bdd7410f47 SHA256 191b5f85bf885990a37928a62d0ff2317e4f1a6294743f57f4f7aee0b7b25050
 EBUILD groff-1.20.1-r3.ebuild 2404 RMD160 c17400b87d088817921a72da6c1a527f7959cf96 SHA1 5a901dff4a0092a6c0b42a5bc6508a5635d91ef8 SHA256 156e891fa65f7212513d86e6b13d92c09550b9d76906f8c7a92bb7741fdbd2df
+EBUILD groff-1.21-r1.ebuild 2652 RMD160 b8a23f1101ddf32f76659cf40ab7acb76ec6106e SHA1 e63d69ab83a0b7b1604429bbf6524a1831d942e5 SHA256 239106b380e23e78016710e3f94f6ce0b73cb9edce9715bc09e490f77e58436c
 EBUILD groff-1.21.ebuild 2029 RMD160 32ce25bde2218a76fcc3aa3a757d1cbc52468f7a SHA1 bbb7d89b086b4d6a7a1776a1cece15e3b069ef31 SHA256 4678098407ea5faba90e440af03d6e2ca40facb1699026c5519ca6c3feaf8627
-MISC ChangeLog 16349 RMD160 c0976748588073a7a0516901a3bbdc9c925111ab SHA1 d7c363e1ad4de2066d6c42700495b8cf0138387d SHA256 13c2385029fa69566bfad622f3988e13804a4c8f80a50c9facbc97d74a99037c
+MISC ChangeLog 16641 RMD160 c49f9df69b42cc4343106bee5975dd7931ead10d SHA1 ed2addc660e25f287c0d1c91480b10a3690edff4 SHA256 ea4e38b30280e3a756a38d2692ca2d4846f4a867db2894e34d26a2620a4fcee5
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.18 (Darwin)
 
-iEYEARECAAYFAk3FiVQACgkQuQc30/atMkANTACfV7rj4hg4QNlflR655Ulo0ytS
-Zp0AoIEzlWOYAAUxUg4rZfF3GjnOPlek
-=LP7u
+iEYEARECAAYFAk6kbjEACgkQX3X2B8XHTok/OACePED0N3lGBLz3zT0g/LIkvfhr
+v/YAnRJ7GICqTLsnuq8/39Y6Na34lxib
+=2PEJ
 -----END PGP SIGNATURE-----
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
+}