small fix0rs, ebuild clean up, SLOT, LICENSE

4 files changed, 67 insertions, 71 deletions

diff --git a/sys-apps/texinfo/ChangeLog b/sys-apps/texinfo/ChangeLog
index bbf4a81c4bbf..26b86f09f2e3 100644
--- a/sys-apps/texinfo/ChangeLog
+++ b/sys-apps/texinfo/ChangeLog
@@ -1,6 +1,14 @@
 # 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.3 2002/06/05 13:52:31 verwilst Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/ChangeLog,v 1.4 2002/06/28 01:33:48 seemant Exp $
+
+*texinfo-4.2-r3 (27 Jun 2002)
+
+  27 Jun 2002; Seemant Kulleen <seemant@gentoo.org> texinfo-4.2-r3.ebuild
+  files/digest-texinfo-4.2-r3 :
+
+  info pages now get merged into /usr/share/info instead of /var/tmp/..
+  Thanks to vadim@berezniker.com (Vadim Berezniker) in bug #4241
 
 *texinfo-4.2-r2 (5 June 2002)
   5 June 2002; Verwilst <verwilst@gentoo.org> texinfo-4.2-r2.ebuild
diff --git a/sys-apps/texinfo/files/digest-texinfo-4.2-r1 b/sys-apps/texinfo/files/digest-texinfo-4.2-r3
index c3b196a597a0..c3b196a597a0 100644
--- a/sys-apps/texinfo/files/digest-texinfo-4.2-r1
+++ b/sys-apps/texinfo/files/digest-texinfo-4.2-r3
diff --git a/sys-apps/texinfo/texinfo-4.2-r1.ebuild b/sys-apps/texinfo/texinfo-4.2-r1.ebuild
deleted file mode 100644
index 54e578cc1839..000000000000
--- a/sys-apps/texinfo/texinfo-4.2-r1.ebuild
+++ /dev/null
@@ -1,70 +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-r1.ebuild,v 1.1 2002/05/23 01:47:46 spider 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}"
-
-
-# commenting this out for now, remove later
-# if [ "`use build`" ] ; then
-#   DEPEND="virtual/glibc 
-#   	>=sys-devel/automake-1.6"
-# 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_unpack() {
-	unpack ${A}
-#     if [ "`use build`" ] ; then
-#       cd ${S}
-#       patch -p0 < ${FILESDIR}/${PF}-no-ncurses-gentoo.diff
-#       touch *
-#     fi
-}
-
-src_compile() {
-	export WANT_AUTOMAKE_1_6=1
-	local myconf
-	if [ -z "`use nls`" ] || [ "`use build`" ] ; then
-        	myconf="--disable-nls"
-	fi
-	try ./configure --host=${CHOST} --prefix=/usr  ${myconf} \
-		--mandir=/usr/share/man --infodir=/usr/share/info
-	try make ${MAKEOPTS} 
-}
-
-src_install() {
-#    if [ "`use build`" ] ; then
-#      dobin makeinfo/makeinfo util/{install-info,texi2dvi,texindex}
-#    else
-	try make DESTDIR=${D} infodir=${D}/usr/share/info install
-	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-r3.ebuild
new file mode 100644
index 000000000000..f520e5720dc0
--- /dev/null
+++ b/sys-apps/texinfo/texinfo-4.2-r3.ebuild
@@ -0,0 +1,58 @@
+# 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 $
+
+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=""
+LICENSE="GPL-2"
+
+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=/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}
+
+		dodoc AUTHORS ChangeLog COPYING INTRODUCTION NEWS README TODO 
+		docinto info
+		dodoc info/README
+		docinto makeinfo
+		dodoc makeinfo/README
+	fi
+}
+