Added patch to fix groff building against 4.7. Bug 57690.

6 files changed, 118 insertions, 8 deletions

diff --git a/sys-apps/texinfo/ChangeLog b/sys-apps/texinfo/ChangeLog
index 10bc3b0d6315..d37470ff6fb4 100644
--- a/sys-apps/texinfo/ChangeLog
+++ b/sys-apps/texinfo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/texinfo
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/ChangeLog,v 1.41 2004/07/19 07:06:06 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/ChangeLog,v 1.42 2004/07/23 02:07:35 avenj Exp $
+
+  22 Jul 2004; Jon Portnoy <avenj@gentoo.org> texinfo-4.7.ebuild,
+  texinfo-4.7-r1.ebuild, files/makeinfo.patch :
+  Added patch from bug #57960 to fix groff compilation.
 
 *texinfo-4.7 (19 Jul 2004)
 
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 5ee884190e32..692d38b1aa30 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,12 +1,15 @@
-MD5 2203374b084a0248412b72161a0c0f79 texinfo-4.5.ebuild 1664
-MD5 bfb5bd95d62aea49807df0d3e14197e3 texinfo-4.7.ebuild 1779
+MD5 818cb94abee0fdc76dc00055314829b6 ChangeLog 5607
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 b010ee0984e648992c747f4b17859dfa texinfo-4.3-r1.ebuild 1726
+MD5 2203374b084a0248412b72161a0c0f79 texinfo-4.5.ebuild 1664
 MD5 67f563e9ad137067bd16ccae9378de74 texinfo-4.6.ebuild 1689
-MD5 367b0ae7120303bf256b90f21ebccd58 ChangeLog 5436
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 44df59581fa418ac2084e667637063e1 texinfo-4.7.ebuild 1978
+MD5 078aea1775723d79eb28300c99c5da26 texinfo-4.7-r1.ebuild 2014
+MD5 a0df107ca9e3036e2ee2d501343cbf2b files/makeinfo.patch 790
 MD5 3173c3b67a3ef4e594cf5ce1b8253504 files/digest-texinfo-4.3-r1 64
 MD5 c14f75d4a1d21ae1776a9868bd0c0296 files/digest-texinfo-4.5 65
 MD5 247b349c3d22ddbd4288247e611bb186 files/digest-texinfo-4.6 65
-MD5 a2c21c53079eb65c306a08d230d15b2b files/digest-texinfo-4.7 65
 MD5 b8ed9b84ca8ab4c2ac4e628a8f928dcb files/install-info.patch 729
 MD5 690fb86d0c0215155b1d18671099115a files/mkinfodir 7318
+MD5 a2c21c53079eb65c306a08d230d15b2b files/digest-texinfo-4.7 65
+MD5 a2c21c53079eb65c306a08d230d15b2b files/digest-texinfo-4.7-r1 65
diff --git a/sys-apps/texinfo/files/digest-texinfo-4.7-r1 b/sys-apps/texinfo/files/digest-texinfo-4.7-r1
new file mode 100644
index 000000000000..7db9f45dcad5
--- /dev/null
+++ b/sys-apps/texinfo/files/digest-texinfo-4.7-r1
@@ -0,0 +1 @@
+MD5 c2fa2ef957f0d728f821ae9b2362ef4e texinfo-4.7.tar.bz2 1418717
diff --git a/sys-apps/texinfo/files/makeinfo.patch b/sys-apps/texinfo/files/makeinfo.patch
new file mode 100644
index 000000000000..7658aa49ac42
--- /dev/null
+++ b/sys-apps/texinfo/files/makeinfo.patch
@@ -0,0 +1,19 @@
+*** makeinfo.c.~1.60.~  Sun Jun  6 07:04:12 2004
+--- makeinfo.c  Fri Jul  2 08:42:28 2004
+***************
+*** 3934,3940 ****
+  
+    /* If insertion stack level changes during execution, that means a multiline
+       command is used inside braces or @section ... kind of commands.  */
+!   if (insertion_level_at_start != insertion_level)
+      {
+        line_error (_("Multiline command %c%s used improperly"),
+            COMMAND_PREFIX,
+--- 3934,3940 ----
+  
+    /* If insertion stack level changes during execution, that means a multiline
+       command is used inside braces or @section ... kind of commands.  */
+!   if (insertion_level_at_start != insertion_level && !executing_macro)
+      {
+        line_error (_("Multiline command %c%s used improperly"),
+            COMMAND_PREFIX,
diff --git a/sys-apps/texinfo/texinfo-4.7-r1.ebuild b/sys-apps/texinfo/texinfo-4.7-r1.ebuild
new file mode 100644
index 000000000000..dacf42c96007
--- /dev/null
+++ b/sys-apps/texinfo/texinfo-4.7-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.7-r1.ebuild,v 1.1 2004/07/23 02:07:35 avenj Exp $
+
+inherit flag-o-matic gnuconfig eutils
+
+DESCRIPTION="The GNU info program and utilities"
+HOMEPAGE="http://www.gnu.org/software/texinfo/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~ppc64 ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390"
+IUSE="nls build static"
+
+DEPEND="virtual/libc
+	!build? ( >=sys-libs/ncurses-5.2-r2
+	>=sys-apps/sed-4.0.5
+	nls? ( sys-devel/gettext ) )"
+
+RDEPEND="virtual/libc
+	!build? ( >=sys-libs/ncurses-5.2-r2 )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}/doc
+	# Get the texinfo info page to have a proper name of texinfo.info
+	sed -i 's:setfilename texinfo:setfilename texinfo.info:' texinfo.txi
+
+	sed -i \
+		-e 's:INFO_DEPS = texinfo:INFO_DEPS = texinfo.info:' \
+		-e 's:texinfo\::texinfo.info\::' \
+		Makefile.in
+	# update config.sub/config.guess for newer arches.
+	gnuconfig_update
+
+	# patch to fix groff build against 4.7. See also bug #57690 and
+	# http://lists.gnu.org/archive/html/bug-texinfo/2004-07/msg00002.html
+	# -- avenj@gentoo.org 22 Jul 04
+	cd ${S}/makeinfo && epatch ${FILESDIR}/makeinfo.patch
+}
+
+src_compile() {
+	local myconf=
+	if ! use nls || use build ; then
+		myconf="--disable-nls"
+	fi
+
+	use static && append-ldflags -static
+
+	export WANT_AUTOMAKE_1_6=1
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	if use build ; then
+		mv util/ginstall-info util/install-info
+		dobin makeinfo/makeinfo util/{install-info,texi2dvi,texindex}
+	else
+		make DESTDIR=${D} \
+			infodir=/usr/share/info \
+			install || die
+
+		exeinto /usr/sbin
+		doexe ${FILESDIR}/mkinfodir
+
+		if [ ! -f ${D}/usr/share/info/texinfo.info ] ; then
+			die "Could not install texinfo.info!!!"
+		fi
+
+		dodoc AUTHORS ChangeLog INTRODUCTION NEWS README TODO
+		docinto info
+		dodoc info/README
+		docinto makeinfo
+		dodoc makeinfo/README
+	fi
+}
diff --git a/sys-apps/texinfo/texinfo-4.7.ebuild b/sys-apps/texinfo/texinfo-4.7.ebuild
index 48afc23da44c..f0fc04fda694 100644
--- a/sys-apps/texinfo/texinfo-4.7.ebuild
+++ b/sys-apps/texinfo/texinfo-4.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.7.ebuild,v 1.1 2004/07/19 07:06:06 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.7.ebuild,v 1.2 2004/07/23 02:07:35 avenj Exp $
 
-inherit flag-o-matic gnuconfig
+inherit flag-o-matic gnuconfig eutils
 
 DESCRIPTION="The GNU info program and utilities"
 HOMEPAGE="http://www.gnu.org/software/texinfo/"
@@ -34,6 +34,10 @@ src_unpack() {
 		Makefile.in
 	# update config.sub/config.guess for newer arches.
 	gnuconfig_update
+
+	# patch to fix groff build against 4.7. See also bug #57690 and
+	# http://lists.gnu.org/archive/html/bug-texinfo/2004-07/msg00002.html
+	cd ${S}/makeinfo && epatch ${FILESDIR}/makeinfo.patch
 }
 
 src_compile() {