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

8 files changed, 20 insertions, 170 deletions

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"