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

10 files changed, 34 insertions, 169 deletions

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"