Version bump to incorporate two fixes. First, the uname patch is made to work on amd64 architecture (fixing bug #59774 by Danny van Dyk <kugelfang@gentoo.org>), and the second is a fix to sort on large files reported by: qube99@hotmail.com in bug #39515, and fixed by: Sven Wegener <swegener@gentoo.org>

4 files changed, 172 insertions, 10 deletions

diff --git a/sys-apps/coreutils/ChangeLog b/sys-apps/coreutils/ChangeLog
index 0477396f9334..ef69468c2edd 100644
--- a/sys-apps/coreutils/ChangeLog
+++ b/sys-apps/coreutils/ChangeLog
@@ -1,6 +1,16 @@
 # 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.109 2004/08/19 01:35:00 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.110 2004/08/26 01:50:04 seemant Exp $
+
+*coreutils-5.2.1-r2 (25 Aug 2004)
+
+  25 Aug 2004; Seemant Kulleen <seemant@gentoo.org>
+  +coreutils-5.2.1-r2.ebuild:
+  Version bump to incorporate two fixes. First, the uname patch is made to work
+  on amd64 architecture (fixing bug #59774 by Danny van Dyk
+  <kugelfang@gentoo.org>), and the second is a fix to sort on large files
+  reported by: qube99@hotmail.com in bug #39515, and fixed by: Sven Wegener
+  <swegener@gentoo.org>
 
   18 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org>
   coreutils-5.2.1-r1.ebuild:
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 96d00be58b9c..4f5422c5a125 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -1,16 +1,18 @@
-MD5 826da1ceeba4e92ac360dc7545bdad3c ChangeLog 20728
+MD5 55f29e6429bc835cafce6571ea7f2ac7 coreutils-5.2.1-r2.ebuild 4006
+MD5 bf1b2c48440b42ed8176457c2428fcd4 coreutils-5.2.1.ebuild 4043
+MD5 992f0ec91891e7ddbcf466dfce3dd857 coreutils-5.2.0-r2.ebuild 4172
 MD5 1ce51fdb0c8a9ce07b454d66413e6d09 coreutils-5.0-r6.ebuild 2656
+MD5 a8e396d61dd3eeea13e98e0354e1ea8f coreutils-5.2.1-r1.ebuild 4146
 MD5 b48125a80955256b99cb3fdb15d4dd3f coreutils-5.0.91-r4.ebuild 4209
-MD5 992f0ec91891e7ddbcf466dfce3dd857 coreutils-5.2.0-r2.ebuild 4172
-MD5 bf1b2c48440b42ed8176457c2428fcd4 coreutils-5.2.1.ebuild 4043
+MD5 826da1ceeba4e92ac360dc7545bdad3c ChangeLog 20728
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 a8e396d61dd3eeea13e98e0354e1ea8f coreutils-5.2.1-r1.ebuild 4146
-MD5 5a7d722a7600e8834bf39c24790caaa2 files/003_all_coreutils-gentoo-uname-s390.patch 3120
-MD5 9151e34f6e03a329d60e2b5bdbe4f43e files/DIR_COLORS 3834
-MD5 ad6c1b6661e030a48a57172f88d2960a files/coreutils-5.0.91-ppc64-1.patch 280
-MD5 e80d3d87cfbe40bc56636167ae5b4768 files/digest-coreutils-5.0-r6 141
-MD5 316d769e60be0f94af3e3c957a664aec files/digest-coreutils-5.2.1-r1 225
 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 316d769e60be0f94af3e3c957a664aec files/digest-coreutils-5.2.1-r1 225
+MD5 77947b96aaadc6a33d53156b5b5e4630 files/digest-coreutils-5.2.1-r2 225
 MD5 36e1cce43ca15be334d54801e1dbb286 files/digest-coreutils-5.2.1 224
 MD5 dfc60c0aadb6d857701fb3fa137a12b5 files/003_all_coreutils-gentoo-uname.patch 3261
+MD5 9151e34f6e03a329d60e2b5bdbe4f43e files/DIR_COLORS 3834
+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.2.1-r2.ebuild b/sys-apps/coreutils/coreutils-5.2.1-r2.ebuild
new file mode 100644
index 000000000000..51b0ec67b94e
--- /dev/null
+++ b/sys-apps/coreutils/coreutils-5.2.1-r2.ebuild
@@ -0,0 +1,147 @@
+# 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.2.1-r2.ebuild,v 1.1 2004/08/26 01:50:04 seemant Exp $
+
+inherit eutils flag-o-matic
+
+IUSE="nls build acl selinux static uclibc"
+
+PATCH_VER=0.6
+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/${PN}/${P}.tar.bz2
+	mirror://gentoo/${P}.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"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ia64 ~ppc64 ~s390"
+
+RDEPEND="selinux? ( sys-libs/libselinux )
+	acl? ( !hppa? ( sys-apps/acl sys-apps/attr ) )
+	nls? ( sys-devel/gettext )
+	>=sys-libs/ncurses-5.3-r5"
+DEPEND="${RDEPEND}
+	virtual/libc
+	>=sys-apps/portage-2.0.49
+	>=sys-devel/automake-1.8.3
+	>=sys-devel/autoconf-2.58
+	>=sys-devel/m4-1.4-r1
+	!uclibc? ( sys-apps/help2man )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	# 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/025* ${PATCHDIR}/excluded
+	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/mandrake
+	epatch ${WORKDIR}/${P}-${I18N_VER}.patch
+
+	# Apply the ACL patches. 
+	# WARNING: These CONFLICT with the SELINUX patches
+	if use acl
+	then
+		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,
+	# since Gentoo's su is not GNU/su, but that from shadow.
+	# do not include su infopage, as it is not valid for the su
+	# from sys-apps/shadow that we are using.
+	# Patch to add processor specific info to the uname output
+
+	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/generic
+
+	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/extra
+
+	use selinux && EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/selinux
+
+	# Sparc32 SMP bug fix -- see bug #46593
+	use sparc && echo -ne "\n\n" >> ${S}/src/pr.c
+}
+
+src_compile() {
+	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
+
+	export WANT_AUTOMAKE=1.8
+	export WANT_AUTOCONF=2.5
+
+	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 \
+		--enable-largefile \
+		`use_enable nls` \
+		`use_enable selinux` || die
+
+	if use static
+	then
+		emake LDFLAGS=-static || die
+	else
+		emake || die
+	fi
+}
+
+src_install() {
+	einstall \
+		bindir=${D}/bin || die
+
+	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* NEWS README* THANKS TODO
+	else
+		rm -rf ${D}/usr/share
+	fi
+}
+
+pkg_postinst() {
+	# hostname does 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/coreutils/files/digest-coreutils-5.2.1-r2 b/sys-apps/coreutils/files/digest-coreutils-5.2.1-r2
new file mode 100644
index 000000000000..2b0fa02e004b
--- /dev/null
+++ b/sys-apps/coreutils/files/digest-coreutils-5.2.1-r2
@@ -0,0 +1,3 @@
+MD5 172ee3c315af93d3385ddfbeb843c53f coreutils-5.2.1.tar.bz2 4270776
+MD5 7d161e32876df4dddf5d5284f8c6588b coreutils-5.2.1-gentoo-0.6.tar.bz2 65612
+MD5 7dad35dee7a6517440feac4eef8b64c4 coreutils-5.2.1-i18n-0.2.patch.bz2 21795