Version bump thanks to Christian Heim #112819.

Package-Manager: portage-2.0.53_rc7

6 files changed, 224 insertions, 9 deletions

diff --git a/sys-apps/groff/ChangeLog b/sys-apps/groff/ChangeLog
index 9380bcbf3cf5..9a76667fa95b 100644
--- a/sys-apps/groff/ChangeLog
+++ b/sys-apps/groff/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/groff
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/ChangeLog,v 1.59 2005/10/29 02:07:38 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/ChangeLog,v 1.60 2005/11/18 05:30:11 vapier Exp $
+
+*groff-1.19.2 (18 Nov 2005)
+
+  18 Nov 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/groff-1.19.2-infoext.patch,
+  +files/groff-1.19.2-parallel-make.patch, +groff-1.19.2.ebuild:
+  Version bump thanks to Christian Heim #112819.
 
 *groff-1.18.1.1 (29 Oct 2005)
 
diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index f16621a093ad..24b0a32d39f4 100644
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -1,17 +1,31 @@
-MD5 e60e4077abb6cd2503a02609163edce7 ChangeLog 8374
-MD5 032db38ca66c2fbc5929992a4f313944 groff-1.18.1-r4.ebuild 3142
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 dee06c655e952d21181ff84957b4cc8b groff-1.18.1.1.ebuild 3155
-MD5 f5848d8ffad604e64ae98341f898ba2c groff-1.19.1-r2.ebuild 3191
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 76cd621054a0207a7d654c368a3a9c20 ChangeLog 8606
 MD5 b887e99fa5e1252f1bf827af9892a238 files/digest-groff-1.18.1-r4 132
 MD5 5ad2fe2219d24cfa7f9513e0671c0643 files/digest-groff-1.18.1.1 137
-MD5 b70471bdc7015ddf030d176b3a0f2d5f files/groff-1.19.1-stack.patch 3659
 MD5 b79e74dab8ceadf74f153032ad30eea3 files/digest-groff-1.19.1-r2 65
-MD5 8f3336cc924f20e480ac76ee94f0611e files/groff-1.19.1-tmpfile.patch 710
-MD5 64d15253bef046fc681356d45aecf417 files/groff-1.19.1-parallel-make.patch 1067
+MD5 2c6ae4e4871d5126cd5fc95461c87d7a files/digest-groff-1.19.2 65
 MD5 c43ddaf604dd389afc6107d79b90ce6c files/groff-1.18-infoext.patch 673
 MD5 790ff4a99ab0dd200eb710d925058fb6 files/groff-1.18-no-netpbm-depend.patch 920
 MD5 98060417290f3c427f5a3406b21f8da9 files/groff-1.18.1-no-color-segfault.patch 896
+MD5 64d15253bef046fc681356d45aecf417 files/groff-1.19.1-parallel-make.patch 1067
+MD5 b70471bdc7015ddf030d176b3a0f2d5f files/groff-1.19.1-stack.patch 3659
+MD5 8f3336cc924f20e480ac76ee94f0611e files/groff-1.19.1-tmpfile.patch 710
+MD5 5a9e270dfa9c3455b6fdfa6ab65dcc7c files/groff-1.19.2-infoext.patch 2779
+MD5 bbe55373a380c38e9bd1da7f76dd4057 files/groff-1.19.2-parallel-make.patch 620
 MD5 e0ea59264695cc68dc9947e4611dde5d files/groff-man-UTF-8.diff 391
 MD5 a94a3de58bb54769a2793e1f8602a618 files/groff_1.18.1-7-fix.patch 551
 MD5 a94a3de58bb54769a2793e1f8602a618 files/groff_1.18.1.1-10-fix.patch 551
+MD5 032db38ca66c2fbc5929992a4f313944 groff-1.18.1-r4.ebuild 3142
+MD5 dee06c655e952d21181ff84957b4cc8b groff-1.18.1.1.ebuild 3155
+MD5 f5848d8ffad604e64ae98341f898ba2c groff-1.19.1-r2.ebuild 3191
+MD5 a56500e15e87fe4a693ef6eae2eb18dc groff-1.19.2.ebuild 2206
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfWc6gIKl8Uu19MoRAjRRAJ96Kfevvc+UDBmbW/UBlN1fm5qnLgCeMfNZ
+eH+B0z61hunLptknzldc3jo=
+=vG3Q
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/groff/files/digest-groff-1.19.2 b/sys-apps/groff/files/digest-groff-1.19.2
new file mode 100644
index 000000000000..6563e3675d4e
--- /dev/null
+++ b/sys-apps/groff/files/digest-groff-1.19.2
@@ -0,0 +1 @@
+MD5 f7c9cf2e4b9967d3af167d7c9fadaae4 groff-1.19.2.tar.gz 2903263
diff --git a/sys-apps/groff/files/groff-1.19.2-infoext.patch b/sys-apps/groff/files/groff-1.19.2-infoext.patch
new file mode 100644
index 000000000000..af97236683f6
--- /dev/null
+++ b/sys-apps/groff/files/groff-1.19.2-infoext.patch
@@ -0,0 +1,86 @@
+2005-11-17  Mike Frysinger <vapier@gentoo.org>
+
+	* doc/Makefile.in: Rename groff info page to 'groff.info'.
+	* doc/Makefile.sub: Likewise.
+	* doc/groff.texinfo: Likewise.
+
+--- doc/Makefile.in
++++ doc/Makefile.in
+@@ -113,7 +113,7 @@ prepare_examples: grnexmpl.g groff.css
+ 	test -f grnexmpl.g || cp $(srcdir)/grnexmpl.g .
+ 	test -f groff.css || cp $(srcdir)/groff.css .
+ 
+-groff: groff.texinfo
++groff.info: groff.texinfo
+ 	$(MAKEINFO) --enable-encoding -I$(srcdir) $(srcdir)/groff.texinfo
+ 
+ gnu.eps: gnu.xpm
+--- doc/Makefile.sub
++++ doc/Makefile.sub
+@@ -118,7 +118,7 @@ CLEANNOTSRCDIRADD=\
+ 	$(GROFF) -Tps -ms -mwww >$@
+ 
+ 
+-all: groff $(PROCESSEDDOCFILES) prepare_examples \
++all: groff.info $(PROCESSEDDOCFILES) prepare_examples \
+      $(PROCESSEDEXAMPLEFILES) $(make_html)
+ 
+ html: $(HTMLDOCFILES) $(HTMLEXAMPLEFILES)
+@@ -137,7 +137,7 @@ examples.stamp: grnexmpl.g groff.css gnu
+ 	fi
+ 	echo timestamp > $@
+ 
+-groff: groff.texinfo
++groff.info: groff.texinfo
+ 	$(MAKEINFO) --enable-encoding -I$(srcdir) $(srcdir)/groff.texinfo
+ 
+ gnu.eps: gnu.xpm
+@@ -157,20 +157,20 @@ webpage.ps: gnu.eps
+ 
+ grnexmpl.ps: grnexmpl.me grnexmpl.g
+ 
+-distfiles: groff gnu.eps gnu.png
++distfiles: groff.info gnu.eps gnu.png
+ 
+-install_data: groff $(DOCFILES) $(PROCESSEDDOCFILES) $(make_install_html) \
++install_data: groff.info $(DOCFILES) $(PROCESSEDDOCFILES) $(make_install_html) \
+               $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES)
+ 	-test -d $(infodir) || $(mkinstalldirs) $(infodir)
+ # Prefer info files in builddir over srcdir; we test for
+-# the existence of `groff'.
++# the existence of `groff.info'.
+ 	d=.; \
+-	  test -f "groff" || d=$(srcdir); \
+-	  for f in $$d/groff `ls $$d/groff-*`; do \
+-	    rm -f $(infodir)/`basename $$f`; \
+-	    $(INSTALL_DATA) $$f $(infodir)/`basename $$f`; \
++	  test -f "groff.info" || d=$(srcdir); \
++	  for f in $$d/groff.info `ls $$d/groff.info*`; do \
++	    rm -f $(infodir)/$$f; \
++	    $(INSTALL_DATA) $$f $(infodir)/$$f; \
+ 	  done
+-	$(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/groff
++	$(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/groff.info
+ 	-test -d $(docdir) || $(mkinstalldirs) $(docdir)
+ 	for f in $(DOCFILES); do \
+ 	  rm -f $(docdir)/$$f; \
+@@ -212,7 +212,7 @@ uninstall_sub:
+ 	-for f in groff `ls groff-*`; do \
+ 	  rm -f $(infodir)/$$f; \
+ 	done
+-	$(INSTALL_INFO) --remove --info-dir=$(infodir) $(infodir)/groff
++	$(INSTALL_INFO) --remove --info-dir=$(infodir) $(infodir)/groff.info
+ 	-for f in $(DOCFILES) $(PROCESSEDDOCFILES); do \
+ 	  rm -f $(docdir)/$$f; \
+ 	done
+--- doc/groff.texinfo
++++ doc/groff.texinfo
+@@ -8,7 +8,7 @@
+ @c
+ 
+ @c %**start of header (This is for running Texinfo on a region.)
+-@setfilename groff
++@setfilename groff.info
+ @settitle The GNU Troff Manual
+ @setchapternewpage odd
+ @footnotestyle separate
diff --git a/sys-apps/groff/files/groff-1.19.2-parallel-make.patch b/sys-apps/groff/files/groff-1.19.2-parallel-make.patch
new file mode 100644
index 000000000000..5a7b6758be25
--- /dev/null
+++ b/sys-apps/groff/files/groff-1.19.2-parallel-make.patch
@@ -0,0 +1,26 @@
+--- groff-1.19.2/Makefile.in
++++ groff-1.19.2/Makefile.in
+@@ -600,3 +600,3 @@
+ 
+-$(LIBDIRS): FORCE
++$(LIBDIRS): FORCE $(INCDIRS) $(PROGDEPDIRS)
+ 	@$(ENVSETUP); \
+@@ -616,3 +616,3 @@
+ 
+-$(CPROGDIRS): FORCE
++$(CPROGDIRS): FORCE $(LIBDIRS)
+ 	@$(ENVSETUP); \
+@@ -632,3 +632,3 @@
+ 
+-$(CCPROGDIRS): FORCE
++$(CCPROGDIRS): FORCE $(LIBDIRS)
+ 	@$(ENVSETUP); \
+@@ -648,3 +648,3 @@
+ 
+-$(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE
++$(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE $(PROGDIRS)
+ 	@$(ENVSETUP); \
+@@ -662,2 +662,3 @@
+ 
++$(OTHERDIRS): $(PROGDIRS)
+ $(INCDIRS) $(PROGDEPDIRS) $(OTHERDIRS): FORCE
diff --git a/sys-apps/groff/groff-1.19.2.ebuild b/sys-apps/groff/groff-1.19.2.ebuild
new file mode 100644
index 000000000000..efde806d5b3f
--- /dev/null
+++ b/sys-apps/groff/groff-1.19.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.19.2.ebuild,v 1.1 2005/11/18 05:30:11 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+MB_PATCH="groff_1.18.1-7" #"${P/-/_}-7"
+DESCRIPTION="Text formatter used for man pages"
+HOMEPAGE="http://www.gnu.org/software/groff/groff.html"
+SRC_URI="mirror://gnu/groff/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="X"
+
+DEPEND=">=sys-apps/texinfo-4.7-r1
+	!app-i18n/man-pages-ja"
+PDEPEND=">=sys-apps/man-1.5k-r1"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Fix the info pages to have .info extensions,
+	# else they do not get gzipped.
+	epatch "${FILESDIR}"/${P}-infoext.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
+
+	# Fix make dependencies so we can build in parallel
+	epatch "${FILESDIR}"/${P}-parallel-make.patch
+
+	# Make sure we can cross-compile this puppy
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e '/^GROFFBIN=/s:=.*:=/usr/bin/groff:' \
+			-e '/^TROFFBIN=/s:=.*:=/usr/bin/troff:' \
+			-e '/^GROFF_BIN_PATH=/s:=.*:=:' \
+			contrib/mom/Makefile.sub \
+			doc/Makefile.in \
+			doc/Makefile.sub || die "cross-compile sed failed"
+	fi
+}
+
+src_compile() {
+	# Fix problems with not finding g++
+	tc-export CC CXX
+
+	# -Os causes segfaults, -O is probably a fine replacement
+	# (fixes bug 36008, 06 Jan 2004 agriffis)
+	replace-flags -Os -O
+
+	# CJK doesnt work yet with groff-1.19
+	#	$(use_enable cjk multibyte)
+
+	econf \
+		--with-appresdir=/etc/X11/app-defaults \
+		$(use_with X x) \
+		|| die
+	emake || die
+}
+
+src_install() {
+	dodir /usr/bin
+	make \
+		prefix="${D}"/usr \
+		bindir="${D}"/usr/bin \
+		libdir="${D}"/usr/$(get_libdir) \
+		appresdir="${D}"/etc/X11/app-defaults \
+		datadir="${D}"/usr/share \
+		mandir="${D}"/usr/share/man \
+		infodir="${D}"/usr/share/info \
+		install || die
+
+	dodoc BUG-REPORT ChangeLog FDL MORE.STUFF NEWS \
+		PROBLEMS PROJECTS README REVISION TODO VERSION
+}