5 files changed, 75 insertions, 75 deletions
diff --git a/sys-apps/coreutils/ChangeLog b/sys-apps/coreutils/ChangeLog
index 5b82fd8d0fbb..795a9874669b 100644
--- a/sys-apps/coreutils/ChangeLog
+++ b/sys-apps/coreutils/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-apps/coreutils
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.102 2004/07/03 22:31:20 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.103 2004/07/13 04:52:29 seemant Exp $
+
+*coreutils-5.2.1-r1 (12 Jul 2004)
+
+  12 Jul 2004; Seemant Kulleen <seemant@gentoo.org>
+  -coreutils-5.0.91-r3.ebuild, +coreutils-5.2.1-r1.ebuild:
+  Fix the sort -M deal, thanks to someone in #gentoo-bugs (please get in touch
+  with me so I can ack you better) and also bartron@gmx.dein bug #54765 by
+  Thomas Petersen <mendocino@mendo.dk>. Also, fix the s390 stuff as reported in
+  bug #52581 by jochen <jochen.eisinger@gmx.de>. Added the ppc64 stuff into the
+  regular uname patch. Finally, fix the selinux-noacl patch, thanks to Chris
+  PeBenito <pebenito@gentoo.org> via e-mail.
 
   03 Jul 2004; Guy Martin <gmsoft@gentoo.org> coreutils-5.2.1.ebuild:
   Marked stable on hppa.
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 3b353280b2d6..8a02e574d338 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -1,15 +1,15 @@
-MD5 ad9e714ee9fc2f4ea98d8807bcab127e ChangeLog 19429
+MD5 d211ca3d229d6f5abca59fdcaaf501af coreutils-5.2.1.ebuild 3904
+MD5 330fbbbd715fa3e8d30bc4fd938c9aff coreutils-5.2.0-r2.ebuild 4089
 MD5 1ce51fdb0c8a9ce07b454d66413e6d09 coreutils-5.0-r6.ebuild 2656
-MD5 0e4d7cf6353d10b0ffbcf4330bb51f3c coreutils-5.0.91-r3.ebuild 3877
+MD5 c2414af497b190151fb25fa2e0a19bc2 coreutils-5.2.1-r1.ebuild 3769
 MD5 b48125a80955256b99cb3fdb15d4dd3f coreutils-5.0.91-r4.ebuild 4209
-MD5 330fbbbd715fa3e8d30bc4fd938c9aff coreutils-5.2.0-r2.ebuild 4089
-MD5 d211ca3d229d6f5abca59fdcaaf501af coreutils-5.2.1.ebuild 3904
+MD5 ad9e714ee9fc2f4ea98d8807bcab127e ChangeLog 19429
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 5a7d722a7600e8834bf39c24790caaa2 files/003_all_coreutils-gentoo-uname-s390.patch 3120
-MD5 c839fce599b98dcfeb021c8e200cbfdf files/DIR_COLORS 3748
-MD5 ad6c1b6661e030a48a57172f88d2960a files/coreutils-5.0.91-ppc64-1.patch 280
-MD5 e80d3d87cfbe40bc56636167ae5b4768 files/digest-coreutils-5.0-r6 141
-MD5 a56b66f95289815e386f537689ef29a0 files/digest-coreutils-5.0.91-r3 229
 MD5 9e4492e1c7e9c927ad7c492239dbe029 files/digest-coreutils-5.0.91-r4 229
+MD5 5a7d722a7600e8834bf39c24790caaa2 files/003_all_coreutils-gentoo-uname-s390.patch 3120
 MD5 6a9f5a2ffa31d94987039066c5072982 files/digest-coreutils-5.2.0-r2 224
+MD5 088a07a388f3e84246e072b1c45e60b3 files/digest-coreutils-5.2.1-r1 225
 MD5 36e1cce43ca15be334d54801e1dbb286 files/digest-coreutils-5.2.1 224
+MD5 c839fce599b98dcfeb021c8e200cbfdf files/DIR_COLORS 3748
+MD5 e80d3d87cfbe40bc56636167ae5b4768 files/digest-coreutils-5.0-r6 141
+MD5 ad6c1b6661e030a48a57172f88d2960a files/coreutils-5.0.91-ppc64-1.patch 280
diff --git a/sys-apps/coreutils/coreutils-5.0.91-r3.ebuild b/sys-apps/coreutils/coreutils-5.2.1-r1.ebuild
index e30908f714ff..506fbbdd698e 100644
--- a/sys-apps/coreutils/coreutils-5.0.91-r3.ebuild
+++ b/sys-apps/coreutils/coreutils-5.2.1-r1.ebuild
@@ -1,81 +1,60 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-5.0.91-r3.ebuild,v 1.15 2004/06/28 18:32:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-5.2.1-r1.ebuild,v 1.1 2004/07/13 04:52:29 seemant Exp $
 
 inherit eutils flag-o-matic
 
-PATCH_VER=1.4.4
-I18N_PATCH=i18n-0.2
+PATCH_VER=0.4
+I18N_VER=i18n-0.2
 PATCHDIR=${WORKDIR}/patch
 
 DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls...), text utilities (sort, tr, head, wc..), and shell utilities (whoami, who,...)"
 HOMEPAGE="http://www.gnu.org/software/coreutils/"
-SRC_URI="mirror://gnu/coreutils/${P}.tar.bz2
-	mirror://coreutils/${P}.tar.bz2
-	http://www.openi18n.org/subgroups/utildev/patch/${P}-${I18N_PATCH}.patch.gz
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2
+	mirror://gentoo/${P}.tar.bz2
 	mirror://gentoo/${P}-gentoo-${PATCH_VER}.tar.bz2
-	mirror://gentoo/${P}-gentoo-${PATCH_VER}.tar.bz2"
+	mirror://gentoo/${P}-${I18N_VER}.patch.bz2
+	http://dev.gentoo.org/~seemant/distfiles/${P}-gentoo-${PATCH_VER}.tar.bz2
+	http://dev.gentoo.org/~seemant/distfiles/${P}-${I18N_VER}.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ia64 ~ppc64"
-IUSE="nls build acl selinux static"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
+IUSE="nls build acl selinux static uclibc"
 
 RDEPEND="selinux? ( sys-libs/libselinux )
 	acl? ( !hppa? ( sys-apps/acl sys-apps/attr ) )
 	nls? ( sys-devel/gettext )
-	>=sys-libs/libtermcap-compat-2.0.8"
+	>=sys-libs/ncurses-5.3-r5"
 DEPEND="${RDEPEND}
 	virtual/libc
 	>=sys-apps/portage-2.0.49
-	>=sys-devel/automake-1.7.6
-	>=sys-devel/autoconf-2.57
+	>=sys-devel/automake-1.8.3
+	>=sys-devel/autoconf-2.58
 	>=sys-devel/m4-1.4-r1
-	sys-apps/help2man"
+	!uclibc? ( sys-apps/help2man )"
 
 src_unpack() {
 	unpack ${A}
 
 	cd ${S}
 
-	if use acl && use selinux
-	then
-		ewarn "Both ACL and SELINUX are not supported together!"
-		ewarn "Will Select SELINUX instead"
-	fi
-
 	# Mandrake's lsw patch caused issues on ia64 and amd64 with ls
 	# Reported upstream, but we don't apply it for now
-	mv ${PATCHDIR}/mandrake/019* ${PATCHDIR}/excluded
-
+	# mv ${PATCHDIR}/mandrake/019* ${PATCHDIR}/excluded
+	mv ${PATCHDIR}/mandrake/025* ${PATCHDIR}/excluded
 	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/mandrake
-	epatch ${WORKDIR}/${P}-${I18N_PATCH}.patch
-
-	# ARM platform does not work well with the uname patch
-	# (see below about it)
-	if use arm
-	then
-		mv ${PATCHDIR}/003* ${PATCHDIR}/excluded
-	fi
+	epatch ${WORKDIR}/${P}-${I18N_VER}.patch
 
 	# Apply the ACL patches. 
 	# WARNING: These CONFLICT with the SELINUX patches
 	if use acl
 	then
-	#
-	# This one also needs porting like the rest, but its a bit more involved,
-	# so I will leave it for somebody that use i18n that can actually test it.
-	#
-	#	if ! use nls ; then
-			mv ${PATCHDIR}/acl/004* ${PATCHDIR}/excluded
-	#	fi
-
-		# This test do seem to be fixed in another way, the acl guys
-		# can just verify please ...
-		mv ${PATCHDIR}/acl/006* ${PATCHDIR}/excluded
-
-		use selinux || mv ${PATCHDIR}/{001*,002*,004*} ${PATCHDIR}/excluded
-		use selinux || EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/acl
+		mv ${PATCHDIR}/generic/00{1,2,4}* ${PATCHDIR}/excluded
+		mv ${PATCHDIR}/selinux/001_all_coreutils-noacl* ${PATCHDIR}/excluded
+		EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/acl
+	else
+		mv ${PATCHDIR}/selinux/001_all_coreutils-acl* ${PATCHDIR}/excluded
 	fi
 
 	# patch to remove Stallman's su/wheel group rant (which doesn't apply,
@@ -84,38 +63,39 @@ src_unpack() {
 	# from sys-apps/shadow that we are using.
 	# Patch to add processor specific info to the uname output
 
-	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
+	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/generic
+
+	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/extra
 
 	use selinux && EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/selinux
 }
 
 src_compile() {
-	local myconf=
-	use nls || myconf="--disable-nls"
-
-	if use acl
+	if [ -z "`which cvs 2>/dev/null`" ]
 	then
-		if ! use selinux
-		then
-			if [ -z "`which cvs 2>/dev/null`" ]
-			then
-				# Fix issues with gettext's autopoint if cvs is not installed,
-				# bug #28920.
-				export AUTOPOINT="/bin/true"
-			fi
-			mv m4/inttypes.m4 m4/inttypes-eggert.m4
-		fi
+		# Fix issues with gettext's autopoint if cvs is not installed,
+		# bug #28920.
+			export AUTOPOINT="/bin/true"
 	fi
 
-	export WANT_AUTOMAKE=1.7
+	export WANT_AUTOMAKE=1.8
+	export WANT_AUTOCONF=2.5
 
-	aclocal -I ${S}/m4 || die
+	mv m4/inttypes.m4 m4/inttypes-eggert.m4
+	touch aclocal.m4 configure config.hin \
+		Makefile.in */Makefile.in */*/Makefile.in
+
+	ebegin "Reconfiguring configure scripts (be patient)"
+	aclocal -I m4 &>/dev/null || die
 	autoconf || die
 	automake || die
+	eend $?
 
 	econf \
 		--bindir=/bin \
-		${myconf} || die
+		--enable-largefile \
+		`use_enable nls` \
+		`use_enable selinux` || die
 
 	if use static
 	then
@@ -132,13 +112,22 @@ src_install() {
 	cd ${D}
 	dodir /usr/bin
 	rm -rf usr/lib
+
+	# add DIRCOLORS
+	insinto /etc
+	doins ${FILESDIR}/DIR_COLORS
+
+	# move non-critical packages into /usr
+	mv bin/{csplit,expand,factor,fmt,fold,join,md5sum,nl,od} usr/bin
+	mv bin/{paste,pathchk,pinky,pr,printf,sha1sum,shred,sum,tac} usr/bin
+	mv bin/{tail,test,tsort,unexpand,users} usr/bin
 	cd usr/bin
 	ln -s ../../bin/* .
 
 	if ! use build
 	then
 		cd ${S}
-		dodoc AUTHORS ChangeLog* COPYING NEWS README* THANKS TODO
+		dodoc AUTHORS ChangeLog* NEWS README* THANKS TODO
 	else
 		rm -rf ${D}/usr/share
 	fi
diff --git a/sys-apps/coreutils/files/digest-coreutils-5.0.91-r3 b/sys-apps/coreutils/files/digest-coreutils-5.0.91-r3
deleted file mode 100644
index 3332f646de3e..000000000000
--- a/sys-apps/coreutils/files/digest-coreutils-5.0.91-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e62c18cde8b254c2512e47dd0c47c332 coreutils-5.0.91.tar.bz2 4183673
-MD5 816c0a3ebdf9f66d004d822dd94b3864 coreutils-5.0.91-i18n-0.2.patch.gz 26150
-MD5 d0ef097c6e1b40542a20071bf5a426e0 coreutils-5.0.91-gentoo-1.4.4.tar.bz2 85518
diff --git a/sys-apps/coreutils/files/digest-coreutils-5.2.1-r1 b/sys-apps/coreutils/files/digest-coreutils-5.2.1-r1
new file mode 100644
index 000000000000..87ff810f4f41
--- /dev/null
+++ b/sys-apps/coreutils/files/digest-coreutils-5.2.1-r1
@@ -0,0 +1,3 @@
+MD5 172ee3c315af93d3385ddfbeb843c53f coreutils-5.2.1.tar.bz2 4270776
+MD5 c030759de397cc63d6da071a1af8d7a9 coreutils-5.2.1-gentoo-0.4.tar.bz2 65178
+MD5 7dad35dee7a6517440feac4eef8b64c4 coreutils-5.2.1-i18n-0.2.patch.bz2 21795