Version bumped.

6 files changed, 85 insertions, 9 deletions

diff --git a/sys-apps/texinfo/ChangeLog b/sys-apps/texinfo/ChangeLog
index 9359105d63e5..8653605a2b92 100644
--- a/sys-apps/texinfo/ChangeLog
+++ b/sys-apps/texinfo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/texinfo
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/ChangeLog,v 1.29 2003/07/16 07:54:43 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/ChangeLog,v 1.30 2003/09/02 18:44:24 mholzer Exp $
+
+*texinfo-4.6 (02 Sep 2003)
+
+  02 Sep 2003; Martin Holzer <mholzer@gentoo.org> texinfo-4.5.ebuild,
+  texinfo-4.6.ebuild:
+  Version bumped.
 
   16 Jul 2003; root <root@gentoo.org> texinfo-4.5.ebuild:
   Mark stable on ppc
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 1aeb7ba741e4..f2a8c64751b4 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,7 +1,7 @@
-MD5 8f41041c97d7fae0d678825b35a6e86e ChangeLog 4141
+MD5 bbc31cddbe8124b3566731a13afc1627 ChangeLog 4279
 MD5 0cabd58c1798443459849d8c26411b2e texinfo-4.3-r1.ebuild 1772
-MD5 e3c23f133487f24a781e3f6cda0f6076 texinfo-4.5.ebuild 1766
-MD5 dba1a18834ee24c13221103cb2b032fd texinfo-4.6.ebuild 1744
+MD5 2ee182f913e799be89181964daaef32c texinfo-4.5.ebuild 1701
+MD5 722ad4c2782fd091d848174c91ed9d05 texinfo-4.6.ebuild 1677
 MD5 3173c3b67a3ef4e594cf5ce1b8253504 files/digest-texinfo-4.3-r1 64
 MD5 c14f75d4a1d21ae1776a9868bd0c0296 files/digest-texinfo-4.5 65
 MD5 b8ed9b84ca8ab4c2ac4e628a8f928dcb files/install-info.patch 729
diff --git a/sys-apps/texinfo/files/digest-texinfo-4.5 b/sys-apps/texinfo/files/digest-texinfo-4.5
index 75daa59c5c1a..05fac36b9552 100644
--- a/sys-apps/texinfo/files/digest-texinfo-4.5
+++ b/sys-apps/texinfo/files/digest-texinfo-4.5
@@ -1 +1 @@
-MD5 8a5d6b54bc2ff5ec51c696a4e89d93b2 texinfo-4.5.tar.gz 1809075
+MD5 980c6be74b31c3257cda25fab0f74ed1 texinfo-4.5.tar.bz2 1294527
diff --git a/sys-apps/texinfo/files/digest-texinfo-4.6 b/sys-apps/texinfo/files/digest-texinfo-4.6
new file mode 100644
index 000000000000..bb4a8776d9c1
--- /dev/null
+++ b/sys-apps/texinfo/files/digest-texinfo-4.6
@@ -0,0 +1 @@
+MD5 d6a771de9e05efd8c1c9152f8b8686d6 texinfo-4.6.tar.bz2 1348113
diff --git a/sys-apps/texinfo/texinfo-4.5.ebuild b/sys-apps/texinfo/texinfo-4.5.ebuild
index 7f6e54fda264..cd835d36eb8c 100644
--- a/sys-apps/texinfo/texinfo-4.5.ebuild
+++ b/sys-apps/texinfo/texinfo-4.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.5.ebuild,v 1.9 2003/07/16 07:54:43 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.5.ebuild,v 1.10 2003/09/02 18:44:24 mholzer Exp $
 
 IUSE="nls build"
 
 S=${WORKDIR}/${P}
 DESCRIPTION="The GNU info program and utilities"
-SRC_URI="ftp://ftp.gnu.org/pub/gnu/texinfo/${P}.tar.gz
-	ftp://alpha.gnu.org/pub/gnu/texinfo/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	mirror://gnu/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://www.gnu.org/software/texinfo/"
 
 SLOT="0"
@@ -69,4 +69,3 @@ src_install() {
 		dodoc makeinfo/README
 	fi
 }
-
diff --git a/sys-apps/texinfo/texinfo-4.6.ebuild b/sys-apps/texinfo/texinfo-4.6.ebuild
new file mode 100644
index 000000000000..b32b40f82893
--- /dev/null
+++ b/sys-apps/texinfo/texinfo-4.6.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.6.ebuild,v 1.1 2003/09/02 18:44:24 mholzer Exp $
+
+IUSE="nls build"
+
+S=${WORKDIR}/${P}
+DESCRIPTION="The GNU info program and utilities"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://www.gnu.org/software/texinfo/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~hppa ~arm ~mips"
+
+DEPEND=">=sys-apps/sed-4.0.5
+	!build? ( >=sys-libs/ncurses-5.2-r2
+		nls? ( sys-devel/gettext ) )"
+
+RDEPEND="virtual/glibc 
+	!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
+}
+
+src_compile() {
+	local myconf=
+	if [ -z "`use nls`" ] || [ -n "`use build`" ] ; then
+		myconf="--disable-nls"
+	fi
+
+	export WANT_AUTOMAKE_1_6=1
+	econf ${myconf} || die
+	
+	emake || die 
+}
+
+src_install() {
+	if [ -n "`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 COPYING INTRODUCTION NEWS README TODO 
+		docinto info
+		dodoc info/README
+		docinto makeinfo
+		dodoc makeinfo/README
+	fi
+}