version bump for bugfix release

5 files changed, 77 insertions, 11 deletions

diff --git a/sys-apps/textutils/ChangeLog b/sys-apps/textutils/ChangeLog
index 15f391815421..951927a1a337 100644
--- a/sys-apps/textutils/ChangeLog
+++ b/sys-apps/textutils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/textutils
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/textutils/ChangeLog,v 1.4 2002/07/21 16:14:37 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/textutils/ChangeLog,v 1.5 2002/08/26 17:08:03 seemant Exp $
+
+*textutils-2.0.21 (26 Aug 2002)
+
+  26 Aug 2002; Seemant Kulleen <seemant@gentoo.org> textutils-2.0.21.ebuild
+  files/digest-textutils-2.0.21 :
+
+  rossm@nist.gov (Ross J. Micheals) in bug #6842 reports that od gives
+  incorrect output in the 2.0.19 version.  This release fixes that problem.
 
 *textutils-2.0.19-r1 (21 Jul 2002)
 
diff --git a/sys-apps/textutils/files/digest-textutils-2.0.19 b/sys-apps/textutils/files/digest-textutils-2.0.19
deleted file mode 100644
index 09c4f38a0863..000000000000
--- a/sys-apps/textutils/files/digest-textutils-2.0.19
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6959a6753db324e1061ce8f380a6b679 textutils-2.0.19.tar.gz 2456693
diff --git a/sys-apps/textutils/files/digest-textutils-2.0.21 b/sys-apps/textutils/files/digest-textutils-2.0.21
new file mode 100644
index 000000000000..b770725ad65b
--- /dev/null
+++ b/sys-apps/textutils/files/digest-textutils-2.0.21
@@ -0,0 +1 @@
+MD5 0a47650c72b292c33cf8f073479a9856 textutils-2.0.21.tar.gz 2699698
diff --git a/sys-apps/textutils/files/textutils-2.0.21-gentoo.diff b/sys-apps/textutils/files/textutils-2.0.21-gentoo.diff
new file mode 100644
index 000000000000..7fe033552c82
--- /dev/null
+++ b/sys-apps/textutils/files/textutils-2.0.21-gentoo.diff
@@ -0,0 +1,36 @@
+--- coreutils.texi	Sat Dec  8 11:13:57 2001
++++ coreutils.texi.new	Mon Mar 18 05:34:18 2002
+@@ -10614,33 +10614,6 @@
+ 
+ @end table
+ 
+-@cindex wheel group, not supported
+-@cindex group wheel, not supported
+-@cindex fascism
+-@heading Why GNU @code{su} does not support the @samp{wheel} group
+-
+-(This section is by Richard Stallman.)
+-
+-@cindex Twenex
+-@cindex MIT AI lab
+-Sometimes a few of the users try to hold total power over all the
+-rest.  For example, in 1984, a few users at the MIT AI lab decided to
+-seize power by changing the operator password on the Twenex system and
+-keeping it secret from everyone else.  (I was able to thwart this coup
+-and give power back to the users by patching the kernel, but I
+-wouldn't know how to do that in Unix.)
+-
+-However, occasionally the rulers do tell someone.  Under the usual
+-@code{su} mechanism, once someone learns the root password who
+-sympathizes with the ordinary users, he or she can tell the rest.  The
+-``wheel group'' feature would make this impossible, and thus cement the
+-power of the rulers.
+-
+-I'm on the side of the masses, not that of the rulers.  If you are
+-used to supporting the bosses and sysadmins in whatever they do, you
+-might find this idea strange at first.
+-
+-
+ @node Delaying
+ @chapter Delaying
+ 
diff --git a/sys-apps/textutils/textutils-2.0.19.ebuild b/sys-apps/textutils/textutils-2.0.21.ebuild
index 8bbb3e3404f0..5cd010934f80 100644
--- a/sys-apps/textutils/textutils-2.0.19.ebuild
+++ b/sys-apps/textutils/textutils-2.0.21.ebuild
@@ -1,22 +1,38 @@
 # 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/textutils/textutils-2.0.19.ebuild,v 1.4 2002/08/01 11:40:16 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/textutils/textutils-2.0.21.ebuild,v 1.1 2002/08/26 17:08:03 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Standard GNU text utilities"
 SRC_URI="http://fetish.sf.net/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/textutils/"
-KEYWORDS="x86"
+
+KEYWORDS="x86 ppc sparc sparc64"
 SLOT="0"
 LICENSE="GPL-2"
-DEPEND="virtual/glibc nls? ( sys-devel/gettext )"
-RDEPEND="virtual/glibc"
+
+DEPEND="nls?  ( sys-devel/gettext )"
+
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	
+	cd ${S}
+	# patch to remove Stallman's su rant
+	patch doc/coreutils.texi ${FILESDIR}/${P}-gentoo.diff || die
+	rm doc/coreutils.info
+}
+
 
 src_compile() {
-	local myconf
-	[ -z "`use nls`" ] && myconf="--disable-nls"
-	./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info \
-	--host=${CHOST} --build=${CHOST} --without-included-regex ${myconf} || die
+	local myconf=""
+	use nls || myconf="--disable-nls"
+	
+	econf \
+		--build=${CHOST} \
+		--without-included-regex \
+		${myconf} || die
+		
 	if [ "`use static`" ]
 	then
 		emake LDFLAGS=-static || die
@@ -26,11 +42,17 @@ src_compile() {
 }
 
 src_install() {
-	make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info install || die
+	einstall || die
+		
 	dodir /bin
 	mv ${D}/usr/bin/cat ${D}/bin
 	dosym /bin/cat /usr/bin/cat
+	# For baselayout
+	mv ${D}/usr/bin/wc ${D}/bin
+	dosym /bin/wc /usr/bin/wc
+	
 	rmdir ${D}/usr/lib
+	
 	if [ -z "`use build`" ]
 	then
 		dodoc AUTHORS COPYING ChangeLog NEWS README* THANKS TODO