upgrade sh-utils, fileutils, textutils to coreutils for ~arches

26 files changed, 77 insertions, 475 deletions

diff --git a/sys-apps/fileutils/ChangeLog b/sys-apps/fileutils/ChangeLog
index 887939d8911b..f42d8a2869dc 100644
--- a/sys-apps/fileutils/ChangeLog
+++ b/sys-apps/fileutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/fileutils
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/ChangeLog,v 1.21 2003/07/09 23:37:44 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/ChangeLog,v 1.22 2003/07/18 12:48:59 seemant Exp $
+
+*fileutils-4.1.11-r2 (18 Jul 2003)
+
+  18 Jul 2003; Seemant Kulleen <seemant@gentoo.org>
+  fileutils-4.1.11-r2.ebuild, fileutils-4.1.8-r2.ebuild,
+  fileutils-4.1.8.ebuild:
+  upgrade to coreutils
 
   10 Jul 2003; Christian Birchinger <joker@gentoo.org>
   fileutils-4.1.11-r1.ebuild:
diff --git a/sys-apps/fileutils/Manifest b/sys-apps/fileutils/Manifest
index c7bec3cb72e7..4a285ec64935 100644
--- a/sys-apps/fileutils/Manifest
+++ b/sys-apps/fileutils/Manifest
@@ -1,7 +1,7 @@
-MD5 7fc7426805bf9cc1b3e09ae009eec71e fileutils-4.1.11-r2.ebuild 487
+MD5 ed86b8fc5826ab356da33e635026d79b fileutils-4.1.11-r2.ebuild 485
 MD5 0762e9ff6869d8284626bd7772d733cb fileutils-4.1.11.ebuild 1533
 MD5 779c4436a9cc993dbde1c0fdeea4a032 fileutils-4.1.11-r1.ebuild 1733
-MD5 dc152efbd66e5bbd2d65d8882fdec054 ChangeLog 3587
+MD5 b24a601eb7f9d8ec6ab326cf7d8833f7 ChangeLog 3589
 MD5 9ac7b23c345fb5ab5183c9d922b7abda files/fileutils-4.1.11-configure.patch 448
 MD5 63624ac3762352823e34bb2556dae6c7 files/DIR_COLORS 2224
 MD5 937d5da030f7e7b487b21f37aac123c7 files/digest-fileutils-4.1.11 69
@@ -9,6 +9,4 @@ MD5 579d1206958af450711d6703b6cdfdce files/acl.c.diff 211
 MD5 604dce65d45d5d77c28f74ff4b9292d8 files/digest-fileutils-4.1.11-r1 147
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-fileutils-4.1.11-r2 0
 MD5 4a37c9153acde32c571d40358219342c files/dircolors.1.gz 4076
-MD5 8c42182955b747d16016a62b5a9357c1 files/digest-fileutils-4.1.8 68
 MD5 0abe0f85c62b2bf556386201cc4e1625 files/fileutils.dircolors.diff.gz 3641
-MD5 2baa78dd80e2ca656c51f9cc47977a08 files/digest-fileutils-4.1.8-r2 144
diff --git a/sys-apps/fileutils/files/digest-fileutils-4.1.11-r2 b/sys-apps/fileutils/files/digest-fileutils-4.1.11-r2
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/sys-apps/fileutils/files/digest-fileutils-4.1.11-r2
diff --git a/sys-apps/fileutils/files/digest-fileutils-4.1.8 b/sys-apps/fileutils/files/digest-fileutils-4.1.8
deleted file mode 100644
index 88f3ba178447..000000000000
--- a/sys-apps/fileutils/files/digest-fileutils-4.1.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b4163f3802621788e0804792664b3716 fileutils-4.1.8.tar.gz 2480325
diff --git a/sys-apps/fileutils/files/digest-fileutils-4.1.8-r2 b/sys-apps/fileutils/files/digest-fileutils-4.1.8-r2
deleted file mode 100644
index 175111c6daf2..000000000000
--- a/sys-apps/fileutils/files/digest-fileutils-4.1.8-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b4163f3802621788e0804792664b3716 fileutils-4.1.8.tar.gz 2480325
-MD5 5a85523a84e92984e70f339c470a22d1 fileutils-4.1.8acl-0.8.25.xdelta 27173
diff --git a/sys-apps/fileutils/fileutils-4.1.11-r2.ebuild b/sys-apps/fileutils/fileutils-4.1.11-r2.ebuild
new file mode 100644
index 000000000000..dc95cfa1846d
--- /dev/null
+++ b/sys-apps/fileutils/fileutils-4.1.11-r2.ebuild
@@ -0,0 +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/fileutils/fileutils-4.1.11-r2.ebuild,v 1.1 2003/07/18 12:48:59 seemant Exp $
+
+DESCRIPTION="textutils, sh-utils and fileutils are replaced by coreutils"
+HOMEPAGE="http://www.gnu.org/software/fileutils/fileutils.html"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~arm ~mips"
+
+RDEPEND="sys-apps/coreutils"
+
diff --git a/sys-apps/fileutils/fileutils-4.1.8-r2.ebuild b/sys-apps/fileutils/fileutils-4.1.8-r2.ebuild
deleted file mode 100644
index 402ee4ebcd93..000000000000
--- a/sys-apps/fileutils/fileutils-4.1.8-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/fileutils-4.1.8-r2.ebuild,v 1.12 2003/06/21 21:19:39 drobbins Exp $
-
-IUSE="nls build acl"
-
-ACLPV=4.1.8acl-0.8.25
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls, etc)"
-SRC_URI="ftp://alpha.gnu.org/gnu/fetish/${P}.tar.gz http://acl.bestbits.at/current/diff/fileutils-${ACLPV}.xdelta"
-HOMEPAGE="http://www.gnu.org/software/fileutils/fileutils.html"
-KEYWORDS="x86  ppc sparc alpha mips"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="virtual/glibc
-		nls? ( sys-devel/gettext )
-		acl? ( dev-util/xdelta )"
-RDEPEND="virtual/glibc
-		acl? ( sys-apps/acl )"
-
-src_unpack() {
-	if [ "`use acl`" ]; then
-		cp ${DISTDIR}/${P}.tar.gz ${WORKDIR}/.
-		xdelta patch ${DISTDIR}/fileutils-${ACLPV}.xdelta ${WORKDIR}/${P}.tar.gz || die
-		tar xz --no-same-owner -f ${WORKDIR}/${P}acl.tar.gz || die 
-		mv ${WORKDIR}/${P}acl ${WORKDIR}/${P}
-
-		# fix NLS include buglet
-		cd ${S}/lib
-		cat ${FILESDIR}/acl.c.diff | patch -p0 -l || die
-
-		cd ${S}
-	else
-		unpack ${P}.tar.gz ; cd ${S}
-	fi
-}
-
-src_compile() {
-	local myconf
-	[ -z "`use nls`" ] && myconf="--disable-nls"
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--bindir=/bin \
-		${myconf} || die
-	#fix NULL undefined compilation problem when nls not in USE (and no libintl.h is #included)
-	echo "#include <stddef.h>" >> config.in
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		bindir=${D}/bin \
-		install || die
-	cd ${D}
-	dodir /usr/bin
-	rm -rf usr/lib
-	cd usr/bin
-	ln -s ../../bin/* .
-	if [ -z "`use build`" ]
-	then
-		cd ${S}
-		dodoc COPYING NEWS README*  THANKS TODO ChangeLog ChangeLog-1997 AUTHORS
-
-		#conflicts with textutils.  seems that they install the same
-		#.info file between the two of them
-		rm -f ${D}/usr/share/info/coreutils.info
-	else
-		rm -rf ${D}/usr/share
-	fi
-}
-
diff --git a/sys-apps/fileutils/fileutils-4.1.8.ebuild b/sys-apps/fileutils/fileutils-4.1.8.ebuild
deleted file mode 100644
index 0a50c36c8d71..000000000000
--- a/sys-apps/fileutils/fileutils-4.1.8.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/fileutils-4.1.8.ebuild,v 1.9 2003/07/16 13:43:10 pvdabeel Exp $
-
-IUSE="nls build"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls, etc)"
-SRC_URI="ftp://alpha.gnu.org/gnu/fetish/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/fileutils/fileutils.html"
-KEYWORDS="x86 ppc"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="virtual/glibc nls? ( sys-devel/gettext )"
-RDEPEND="virtual/glibc"
-
-src_compile() {
-	local myconf
-	[ -z "`use nls`" ] && myconf="--disable-nls"
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--bindir=/bin \
-		${myconf} || die
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		bindir=${D}/bin \
-		install || die
-	cd ${D}
-	dodir /usr/bin
-	rm -rf usr/lib
-	cd usr/bin
-	ln -s ../../bin/* .
-	if [ -z "`use build`" ]
-	then
-		cd ${S}
-		dodoc COPYING NEWS README*  THANKS TODO ChangeLog ChangeLog-1997 AUTHORS
-
-		#conflicts with textutils.  seems that they install the same
-		#.info file between the two of them
-		rm -f ${D}/usr/share/info/coreutils.info
-	else
-		rm -rf ${D}/usr/share
-	fi
-}
-
diff --git a/sys-apps/sh-utils/ChangeLog b/sys-apps/sh-utils/ChangeLog
index c72d08fc5192..823c429a2240 100644
--- a/sys-apps/sh-utils/ChangeLog
+++ b/sys-apps/sh-utils/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for sys-apps/sh-utils
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sh-utils/ChangeLog,v 1.21 2003/06/23 22:50:16 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sh-utils/ChangeLog,v 1.22 2003/07/18 12:49:23 seemant Exp $
 
+*sh-utils-2.0.15-r1 (18 Jul 2003)
+
+  18 Jul 2003; Seemant Kulleen <seemant@gentoo.org> sh-utils-2.0.11-r4.ebuild,
+  sh-utils-2.0.11-r5.ebuild, sh-utils-2.0.15-r1.ebuild:
+  upgrade to coreutils
 
 *sh-utils-2.0.15 (24 Aug 2002)
 
diff --git a/sys-apps/sh-utils/Manifest b/sys-apps/sh-utils/Manifest
index deaf9f6c2249..3ec9ba2b5511 100644
--- a/sys-apps/sh-utils/Manifest
+++ b/sys-apps/sh-utils/Manifest
@@ -1,6 +1,6 @@
 MD5 d7867bbfe1bf59befd44079672ac3a5d sh-utils-2.0.15.ebuild 2339
-MD5 0710717da8aca399d5c4f83bd20d73f1 sh-utils-2.0.15-r1.ebuild 473
-MD5 7fbba8d253c442d75b606d29fdb11ab1 ChangeLog 4301
+MD5 49b1bb9ad705327d076a3cd8e1111125 sh-utils-2.0.15-r1.ebuild 476
+MD5 0010d60458d6c455d072b2a5a99e7d5f ChangeLog 4303
 MD5 b0454d28beed9edd23c9facdd154174f files/sh-utils-2.0.15-gentoo.diff 2585
 MD5 3862186589a94a3a12eec30eb838bd0a files/sh-utils-2.0.11-gentoo.diff 3922
 MD5 5fdc646eb14d3f40c0a6f81eb897d339 files/digest-sh-utils-2.0.15 68
diff --git a/sys-apps/sh-utils/files/digest-sh-utils-2.0.11-r4 b/sys-apps/sh-utils/files/digest-sh-utils-2.0.11-r4
deleted file mode 100644
index 71cf6fbdf3b6..000000000000
--- a/sys-apps/sh-utils/files/digest-sh-utils-2.0.11-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 78ba650ef854d0b8f2bfcf12997295c2 sh-utils-2.0.11.tar.gz 1667803
diff --git a/sys-apps/sh-utils/files/digest-sh-utils-2.0.11-r5 b/sys-apps/sh-utils/files/digest-sh-utils-2.0.11-r5
deleted file mode 100644
index 71cf6fbdf3b6..000000000000
--- a/sys-apps/sh-utils/files/digest-sh-utils-2.0.11-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 78ba650ef854d0b8f2bfcf12997295c2 sh-utils-2.0.11.tar.gz 1667803
diff --git a/sys-apps/sh-utils/files/digest-sh-utils-2.0.15-r1 b/sys-apps/sh-utils/files/digest-sh-utils-2.0.15-r1
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/sys-apps/sh-utils/files/digest-sh-utils-2.0.15-r1
diff --git a/sys-apps/sh-utils/sh-utils-2.0.11-r4.ebuild b/sys-apps/sh-utils/sh-utils-2.0.11-r4.ebuild
deleted file mode 100644
index ba216f3e4f29..000000000000
--- a/sys-apps/sh-utils/sh-utils-2.0.11-r4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sh-utils/sh-utils-2.0.11-r4.ebuild,v 1.11 2003/06/21 21:19:40 drobbins Exp $
-
-IUSE="nls static build"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Your standard GNU shell utilities"
-SRC_URI="ftp://alpha.gnu.org/gnu/fetish/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/shellutils/shellutils.html"
-KEYWORDS="x86  ppc sparc "
-SLOT="0"
-LICENSE="GPL-2"
-DEPEND="virtual/glibc nls? ( sys-devel/gettext )"
-
-RDEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-
-	#
-	# patch to remove Stallman's su/wheel group rant and to add processor
-	# information in uname output
-	patch -p0 < ${FILESDIR}/${P}-gentoo.diff
-	rm doc/sh-utils.info
-	#This next line prevents our patched (and updated-mtime) uname.c from forcing a
-	#uname.1 man page regeneration, which requires perl (not available when creating
-	#a new build image... and we don't want this package dependent on perl anyway.
-	#This problem can be fixed by fixing our patch at a future date.
-	touch -d "20 Aug 1999" src/uname.c
-}
-
-src_compile() {
-	local myconf
-	use nls || myconf="--disable-nls"
-	CFLAGS="${CFLAGS}" ./configure --host=${CHOST} --build=${CHOST} \
-	--prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info \
-	--without-included-regex ${myconf} || die
-	
-	if [ -z "`use static`" ]
-	then
-		emake || die
-	else
-		emake LDFLAGS=-static || die
-	fi
-}
-
-src_install() {
-	make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info install || die
-	rm -rf ${D}/usr/lib
-	dodir /bin
-	cd ${D}/usr/bin
-	mv date echo false pwd stty su true uname sleep ${D}/bin
-
-	if [ -z "`use build`" ]
-	then
-		# We must use hostname from net-base
-		rm ${D}/usr/bin/hostname
-		cd ${S}
-		dodoc AUTHORS COPYING ChangeLog ChangeLog.0 NEWS README THANKS TODO
-	else
-		rm -rf ${D}/usr/share
-	fi
-	#we use the /bin/su from the sys-apps/shadow package
-	rm ${D}/bin/su
-	rm ${D}/usr/share/man/man1/su.1.gz
-	#we use the /usr/bin/uptime from the sys-apps/procps package
-	rm ${D}/usr/bin/uptime
-	rm ${D}/usr/share/man/man1/uptime.1.gz
-}
-
-
-
diff --git a/sys-apps/sh-utils/sh-utils-2.0.11-r5.ebuild b/sys-apps/sh-utils/sh-utils-2.0.11-r5.ebuild
deleted file mode 100644
index 794a0a594dd5..000000000000
--- a/sys-apps/sh-utils/sh-utils-2.0.11-r5.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sh-utils/sh-utils-2.0.11-r5.ebuild,v 1.12 2003/06/21 21:19:40 drobbins Exp $
-
-IUSE="nls static build"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Your standard GNU shell utilities"
-SRC_URI="ftp://alpha.gnu.org/gnu/fetish/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/shellutils/shellutils.html"
-
-DEPEND="virtual/glibc nls? ( sys-devel/gettext )"
-RDEPEND="virtual/glibc"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86  ppc sparc alpha"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# patch to remove Stallman's su/wheel group rant and to add processor
-	# information in uname output
-	patch -p0 < ${FILESDIR}/${P}-gentoo.diff || die
-	rm doc/sh-utils.info
-	#This next line prevents our patched (and updated-mtime) uname.c from forcing a
-	#uname.1 man page regeneration, which requires perl (not available when creating
-	#a new build image... and we don't want this package dependent on perl anyway.
-	#This problem can be fixed by fixing our patch at a future date.
-	touch -d "20 Aug 1999" src/uname.c
-}
-
-src_compile() {
-	local myconf=""
-	use nls || myconf="--disable-nls"
-	
-	CFLAGS="${CFLAGS}" \
-	./configure --host=${CHOST} \
-		--build=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--without-included-regex \
-		${myconf} || die
-	
-	if [ -z "`use static`" ]
-	then
-		emake || die
-	else
-		emake LDFLAGS=-static || die
-	fi
-}
-
-src_install() {
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-		
-	rm -rf ${D}/usr/lib
-	dodir /bin
-	cd ${D}/usr/bin
-	mv date echo false pwd stty su true uname sleep ${D}/bin
-
-	if [ -z "`use build`" ]
-	then
-		cd ${S}
-		dodoc AUTHORS COPYING ChangeLog ChangeLog.0 NEWS README THANKS TODO
-	else
-		rm -rf ${D}/usr/share
-	fi
-	#we must use hostname from net-base
-	#hostname do not work with the -f switch ... this breaks gnome2 among things
-	rm ${D}/usr/bin/hostname
-	#we use the /bin/su from the sys-apps/shadow package
-	rm ${D}/bin/su
-	rm ${D}/usr/share/man/man1/su.1.gz
-	#we use the /usr/bin/uptime from the sys-apps/procps package
-	rm ${D}/usr/bin/uptime
-	rm ${D}/usr/share/man/man1/uptime.1.gz
-}
-
-pkg_postinst() {
-	#hostname do not get removed, as it is included with older stage1
-	#tarballs, and net-tools installs to /bin
-	if [ -e ${ROOT}/usr/bin/hostname ] && [ ! -L ${ROOT}/usr/bin/hostname ]
-	then
-		rm -f ${ROOT}/usr/bin/hostname
-	fi
-}
diff --git a/sys-apps/sh-utils/sh-utils-2.0.15-r1.ebuild b/sys-apps/sh-utils/sh-utils-2.0.15-r1.ebuild
new file mode 100644
index 000000000000..5ef57017e060
--- /dev/null
+++ b/sys-apps/sh-utils/sh-utils-2.0.15-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sh-utils/sh-utils-2.0.15-r1.ebuild,v 1.1 2003/07/18 12:49:23 seemant Exp $
+
+DESCRIPTION="textutils, sh-utils and fileutils moved to coreutils"
+HOMEPAGE="http://www.gnu.org/software/shellutils/shellutils.html"
+
+DEPEND="sys-apps/coreutils"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
diff --git a/sys-apps/textutils/ChangeLog b/sys-apps/textutils/ChangeLog
index db795c9ae852..02bfa63e14ec 100644
--- a/sys-apps/textutils/ChangeLog
+++ b/sys-apps/textutils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/textutils
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/textutils/ChangeLog,v 1.13 2003/02/21 02:34:19 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/textutils/ChangeLog,v 1.14 2003/07/18 12:50:35 seemant Exp $
+
+*textutils-2.1-r1 (18 Jul 2003)
+
+  18 Jul 2003; Seemant Kulleen <seemant@gentoo.org>
+  textutils-2.0.19-r1.ebuild, textutils-2.0.19-r2.ebuild,
+  textutils-2.1-r1.ebuild, textutils-2.1.ebuild,
+  files/textutils-2.0.19-gentoo.diff:
+  upgrade to coreutils
 
   20 Feb 2003; Zach Welch <zwelch@gentoo.org> textutils-2.1.ebuild :
   Added arm to keywords.
diff --git a/sys-apps/textutils/Manifest b/sys-apps/textutils/Manifest
index ccbcb0dfec74..7edfaafa95fb 100644
--- a/sys-apps/textutils/Manifest
+++ b/sys-apps/textutils/Manifest
@@ -1,9 +1,8 @@
-MD5 3090ee6ee2341732c12f6b11420d5893 textutils-2.1.ebuild 1212
+MD5 ca4082c08878293eace9705a078ff020 textutils-2.1.ebuild 1211
 MD5 4639171ca42a3aba855a0b48114d7e8b textutils-2.0.21.ebuild 1254
-MD5 9e318714cb470199abaf01e11a18c3a7 textutils-2.1-r1.ebuild 466
-MD5 5c25fc70da0e06e069a5b01997c605e7 ChangeLog 2386
+MD5 805c1782faed7b13286d54877130f5f1 textutils-2.1-r1.ebuild 467
+MD5 1adb441c8e36850d8ab67059854567a3 ChangeLog 2387
 MD5 fa618c23a88a25c243798aacf2db59a6 files/textutils-2.0.21-gentoo.diff 1278
 MD5 912d3e77416726cfd0e4fbe8b53a3468 files/digest-textutils-2.1 66
 MD5 7ffe6874d60801287cacb37785919e0e files/digest-textutils-2.0.21 69
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-textutils-2.1-r1 0
-MD5 fa618c23a88a25c243798aacf2db59a6 files/textutils-2.1-gentoo.diff 1278
diff --git a/sys-apps/textutils/files/digest-textutils-2.0.19-r1 b/sys-apps/textutils/files/digest-textutils-2.0.19-r1
deleted file mode 100644
index 09c4f38a0863..000000000000
--- a/sys-apps/textutils/files/digest-textutils-2.0.19-r1
+++ /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.19-r2 b/sys-apps/textutils/files/digest-textutils-2.0.19-r2
deleted file mode 100644
index 09c4f38a0863..000000000000
--- a/sys-apps/textutils/files/digest-textutils-2.0.19-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6959a6753db324e1061ce8f380a6b679 textutils-2.0.19.tar.gz 2456693
diff --git a/sys-apps/textutils/files/digest-textutils-2.1-r1 b/sys-apps/textutils/files/digest-textutils-2.1-r1
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/sys-apps/textutils/files/digest-textutils-2.1-r1
diff --git a/sys-apps/textutils/files/textutils-2.0.19-gentoo.diff b/sys-apps/textutils/files/textutils-2.0.19-gentoo.diff
deleted file mode 100644
index 7fe033552c82..000000000000
--- a/sys-apps/textutils/files/textutils-2.0.19-gentoo.diff
+++ /dev/null
@@ -1,36 +0,0 @@
---- 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-r1.ebuild b/sys-apps/textutils/textutils-2.0.19-r1.ebuild
deleted file mode 100644
index 5050dc32f63c..000000000000
--- a/sys-apps/textutils/textutils-2.0.19-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/textutils/textutils-2.0.19-r1.ebuild,v 1.12 2003/06/21 21:19:41 drobbins Exp $
-
-IUSE="nls static build"
-
-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  ppc sparc "
-SLOT="0"
-LICENSE="GPL-2"
-DEPEND="virtual/glibc nls? ( sys-devel/gettext )"
-RDEPEND="virtual/glibc"
-
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-	# patch to remove Stallman's su rant
-	patch doc/coreutils.texi ${FILESDIR}/${P}-gentoo.diff
-	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
-	if [ "`use static`" ]
-	then
-		emake LDFLAGS=-static || die
-	else
-		emake || die
-	fi
-}
-
-src_install() {
-	make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info install || die
-	dodir /bin
-	mv ${D}/usr/bin/cat ${D}/bin
-	dosym /bin/cat /usr/bin/cat
-	rmdir ${D}/usr/lib
-	if [ -z "`use build`" ]
-	then
-		dodoc AUTHORS COPYING ChangeLog NEWS README* THANKS TODO
-	else
-		rm -rf ${D}/usr/share
-	fi
-}
diff --git a/sys-apps/textutils/textutils-2.0.19-r2.ebuild b/sys-apps/textutils/textutils-2.0.19-r2.ebuild
deleted file mode 100644
index 8f6945a1b4dc..000000000000
--- a/sys-apps/textutils/textutils-2.0.19-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/textutils/textutils-2.0.19-r2.ebuild,v 1.8 2003/06/21 21:19:41 drobbins Exp $
-
-IUSE="nls static build"
-
-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  ppc sparc "
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="virtual/glibc nls?
-	( sys-devel/gettext )"
-RDEPEND="virtual/glibc"
-
-
-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 --host=${CHOST} \
-		--build=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--without-included-regex \
-		${myconf} || die
-		
-	if [ "`use static`" ]
-	then
-		emake LDFLAGS=-static || die
-	else
-		emake || die
-	fi
-}
-
-src_install() {
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || 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
-	else
-		rm -rf ${D}/usr/share
-	fi
-}
-
diff --git a/sys-apps/textutils/textutils-2.1-r1.ebuild b/sys-apps/textutils/textutils-2.1-r1.ebuild
new file mode 100644
index 000000000000..d3bf88a1ed5c
--- /dev/null
+++ b/sys-apps/textutils/textutils-2.1-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/textutils/textutils-2.1-r1.ebuild,v 1.1 2003/07/18 12:50:35 seemant Exp $
+
+DESCRIPTION="textutils, sh-utils and fileutils are replaced by coreutils"
+HOMEPAGE="http://www.gnu.org/software/coreutils/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
+
+RDEPEND="sys-apps/coreutils"
diff --git a/sys-apps/textutils/textutils-2.1.ebuild b/sys-apps/textutils/textutils-2.1.ebuild
index 550327c69742..a743773f8b3f 100644
--- a/sys-apps/textutils/textutils-2.1.ebuild
+++ b/sys-apps/textutils/textutils-2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/textutils/textutils-2.1.ebuild,v 1.12 2003/06/21 21:19:41 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/textutils/textutils-2.1.ebuild,v 1.13 2003/07/18 12:50:35 seemant Exp $
 
 IUSE="nls static build"
 
@@ -15,6 +15,15 @@ LICENSE="GPL-2"
 
 DEPEND="nls? ( sys-devel/gettext )"
 
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}/doc
+	epatch ${FILESDIR}/${P}-gentoo.diff
+	rm coreutils.info
+	cd ${S}
+}
+
 src_compile() {
 	local myconf=""
 	use nls || myconf="--disable-nls"