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

8 files changed, 23 insertions, 136 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
-}
-