resolve bug #4672

5 files changed, 42 insertions, 76 deletions

diff --git a/sys-apps/texinfo/ChangeLog b/sys-apps/texinfo/ChangeLog
index ca645b3bfa75..dcab161526db 100644
--- a/sys-apps/texinfo/ChangeLog
+++ b/sys-apps/texinfo/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-apps/texinfo
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/ChangeLog,v 1.5 2002/07/01 21:34:11 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/ChangeLog,v 1.6 2002/07/08 21:41:46 azarah Exp $
+
+*texinfo-4.2-r5 (8 Jul 2002)
+
+  5 Jul 2002; Martin Schlemmer <azarah@gentoo.org> texinfo-4.2-r5.ebuild :
+
+  Remove the part in src_install() that renames "texinfo" and "texinfo-*"
+  (the info files) to "texinfo.info" and "texinfo.info-*".  This is replaced
+  by changing the Makefile.in to update the files that should be installed,
+  and modifying texinfo.txi to change the files being generated.  This should
+  resolve an issue where the info pages was not readable, closing bug #4672.
 
 *texinfo-4.2-r4 (1 Jul 2002)
 
diff --git a/sys-apps/texinfo/files/digest-texinfo-4.2-r3 b/sys-apps/texinfo/files/digest-texinfo-4.2-r3
deleted file mode 100644
index c3b196a597a0..000000000000
--- a/sys-apps/texinfo/files/digest-texinfo-4.2-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 41a97498d34ddbf245df40a95977be7f texinfo-4.2.tar.gz 1666333
diff --git a/sys-apps/texinfo/files/digest-texinfo-4.2-r2 b/sys-apps/texinfo/files/digest-texinfo-4.2-r5
index c3b196a597a0..c3b196a597a0 100644
--- a/sys-apps/texinfo/files/digest-texinfo-4.2-r2
+++ b/sys-apps/texinfo/files/digest-texinfo-4.2-r5
diff --git a/sys-apps/texinfo/texinfo-4.2-r2.ebuild b/sys-apps/texinfo/texinfo-4.2-r2.ebuild
deleted file mode 100644
index 73f03fb5f0d3..000000000000
--- a/sys-apps/texinfo/texinfo-4.2-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: System Team <system@gentoo.org>
-# Author: Achim Gottinger <achim@gentoo.org>, Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.2-r2.ebuild,v 1.1 2002/06/05 13:52:31 verwilst Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="The GNU info program and utilities"
-SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/texinfo/${A}
-	ftp://ftp.gnu.org/pub/gnu/texinfo/${A}"
-
-
- if [ "`use build`" ] ; then
-   DEPEND="virtual/glibc"
- else
-DEPEND="virtual/glibc 
-	>=sys-libs/ncurses-5.2-r2
-	>=sys-devel/automake-1.6
-	nls? ( sys-devel/gettext )"
-RDEPEND="virtual/glibc 
-	>=sys-libs/ncurses-5.2-r2"
- fi
-
-src_compile() {
-	export WANT_AUTOMAKE_1_6=1
-	local myconf
-	if [ -z "`use nls`" ] || [ "`use build`" ] ; then
-        	myconf="--disable-nls"
-	fi
-	./configure --host=${CHOST} --prefix=/usr  ${myconf} \
-		--mandir=/usr/share/man --infodir=/usr/share/info || die
-	make ${MAKEOPTS} || die 
-}
-
-src_install() {
-    if [ "`use build`" ] ; then
-      dobin makeinfo/makeinfo util/{install-info,texi2dvi,texindex}
-    else
-	make DESTDIR=${D} infodir=${D}/usr/share/info install || die
-	exeinto /usr/sbin
-	doexe ${FILESDIR}/mkinfodir
-
-	cd ${D}/usr/share/info
-	mv texinfo texinfo.info
-	for i in texinfo-*
-	do
-		mv ${i} texinfo.info-${i#texinfo-*}
-	done
-	cd ${S}
-
-	odoc AUTHORS ChangeLog COPYING INTRODUCTION NEWS README TODO 
-	docinto info
-	dodoc info/README
-	docinto makeinfo
-	dodoc makeinfo/README
-    fi
-}
-
diff --git a/sys-apps/texinfo/texinfo-4.2-r3.ebuild b/sys-apps/texinfo/texinfo-4.2-r5.ebuild
index f520e5720dc0..8006214fc5b3 100644
--- a/sys-apps/texinfo/texinfo-4.2-r3.ebuild
+++ b/sys-apps/texinfo/texinfo-4.2-r5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.2-r3.ebuild,v 1.1 2002/06/28 01:33:48 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.2-r5.ebuild,v 1.1 2002/07/08 21:41:46 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="The GNU info program and utilities"
 SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/texinfo/${P}.tar.gz
 	ftp://ftp.gnu.org/pub/gnu/texinfo/${P}.tar.gz"
 
-SLOT=""
+SLOT="0"
 LICENSE="GPL-2"
 
 if [ "`use build`" ] ; then
@@ -15,20 +15,37 @@ if [ "`use build`" ] ; then
 else
 	DEPEND="virtual/glibc 
 		>=sys-libs/ncurses-5.2-r2
-		>=sys-devel/automake-1.6
 		nls? ( sys-devel/gettext )"
+#		>=sys-devel/automake-1.6"
 	RDEPEND="virtual/glibc 
 		>=sys-libs/ncurses-5.2-r2"
 fi
 
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}/doc
+	cp texinfo.txi texinfo.txi.orig
+	sed -e 's:setfilename texinfo:setfilename texinfo.info:' \
+		texinfo.txi.orig > texinfo.txi
+	cp Makefile.in Makefile.in.orig
+	sed -e 's:INFO_DEPS = texinfo:INFO_DEPS = texinfo.info:' \
+		Makefile.in.orig > Makefile.in
+}
+
 src_compile() {
-	export WANT_AUTOMAKE_1_6=1
-	local myconf
+	local myconf=""
 	if [ -z "`use nls`" ] || [ "`use build`" ] ; then
 		myconf="--disable-nls"
 	fi
-	./configure --host=${CHOST} --prefix=/usr  ${myconf} \
-		--mandir=/usr/share/man --infodir=/usr/share/info || die
+
+	export WANT_AUTOMAKE_1_6=1
+	./configure --host=${CHOST} \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		${myconf} || die
+	
 	make ${MAKEOPTS} || die 
 }
 
@@ -36,17 +53,16 @@ src_install() {
 	if [ "`use build`" ] ; then
 		dobin makeinfo/makeinfo util/{install-info,texi2dvi,texindex}
 	else
-		make DESTDIR=${D} infodir=/usr/share/info install || die
+		make DESTDIR=${D} \
+			infodir=/usr/share/info \
+			install || die
+			
 		exeinto /usr/sbin
 		doexe ${FILESDIR}/mkinfodir
 
-		cd ${D}/usr/share/info
-		mv texinfo texinfo.info
-		for i in texinfo-*
-		do
-			mv ${i} texinfo.info-${i#texinfo-*}
-		done
-		cd ${S}
+		if [ ! -f ${D}/usr/share/info/texinfo.info ] ; then
+			die "Could not install texinfo.info!!!"
+		fi
 
 		dodoc AUTHORS ChangeLog COPYING INTRODUCTION NEWS README TODO 
 		docinto info