Add fix for bug #84564.

(Portage version: 2.0.51.19)

4 files changed, 169 insertions, 17 deletions

diff --git a/sys-apps/coreutils/ChangeLog b/sys-apps/coreutils/ChangeLog
index 58577675ccd1..9d78254982bb 100644
--- a/sys-apps/coreutils/ChangeLog
+++ b/sys-apps/coreutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/coreutils
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.122 2005/03/04 17:09:02 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.123 2005/03/15 07:51:58 azarah Exp $
+
+*coreutils-5.2.1-r5 (14 Mar 2005)
+
+  14 Mar 2005; Martin Schlemmer <azarah@gentoo.org>
+  +coreutils-5.2.1-r5.ebuild:
+  Add fix for bug #84564.
 
   04 Mar 2005; Daniel Goller <morfic@gentoo.org> coreutils-5.2.1-r4.ebuild:
   Stable on ppc
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index af8728f4e8aa..908c4d99abf1 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -1,23 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0a532171a448adf8d523ca631e388f3b coreutils-5.2.1-r2.ebuild 4383
-MD5 814ab16ac6cac4e2825942dad9b41e69 coreutils-5.2.1-r4.ebuild 4453
-MD5 a041d2d2ace692ab73aa932cae01debf coreutils-5.2.1-r3.ebuild 4205
+MD5 bb421b0814762f5bdcc056b937861d02 coreutils-5.2.1-r5.ebuild 4456
 MD5 a95df175b0b355eb319642583aa8331f ChangeLog 23404
+MD5 a041d2d2ace692ab73aa932cae01debf coreutils-5.2.1-r3.ebuild 4205
+MD5 0a532171a448adf8d523ca631e388f3b coreutils-5.2.1-r2.ebuild 4383
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 814ab16ac6cac4e2825942dad9b41e69 coreutils-5.2.1-r4.ebuild 4453
+MD5 d3828e48aebb7452db7a8f8b025da0ff files/DIR_COLORS 4041
+MD5 ad6c1b6661e030a48a57172f88d2960a files/coreutils-5.0.91-ppc64-1.patch 280
 MD5 5a7d722a7600e8834bf39c24790caaa2 files/003_all_coreutils-gentoo-uname-s390.patch 3120
-MD5 77947b96aaadc6a33d53156b5b5e4630 files/digest-coreutils-5.2.1-r2 225
 MD5 5336abda618b9eaa721564d34bb6de9b files/digest-coreutils-5.2.1-r3 225
 MD5 db20bb64b1d832abc699dc46d9b40304 files/digest-coreutils-5.2.1-r4 226
+MD5 77947b96aaadc6a33d53156b5b5e4630 files/digest-coreutils-5.2.1-r2 225
+MD5 a35ffb7e8488a498124e0a4c144102bc files/digest-coreutils-5.2.1-r5 227
 MD5 dfc60c0aadb6d857701fb3fa137a12b5 files/003_all_coreutils-gentoo-uname.patch 3261
-MD5 d3828e48aebb7452db7a8f8b025da0ff files/DIR_COLORS 4041
 MD5 569870ec2f958c2a2a716a7f695deb42 files/coreutils-5.2.1-unamefix.patch 485
-MD5 ad6c1b6661e030a48a57172f88d2960a files/coreutils-5.0.91-ppc64-1.patch 280
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCKJUDUpKYMelfdYERAnRwAJ9to8NTiIWMXz9y/Nzbpmfz0h1FegCdEodP
-bB9XQ4dR2Lh8kZm8nIOTcwg=
-=++81
------END PGP SIGNATURE-----
diff --git a/sys-apps/coreutils/coreutils-5.2.1-r5.ebuild b/sys-apps/coreutils/coreutils-5.2.1-r5.ebuild
new file mode 100644
index 000000000000..82d15c573411
--- /dev/null
+++ b/sys-apps/coreutils/coreutils-5.2.1-r5.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2005 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-r5.ebuild,v 1.1 2005/03/15 07:51:58 azarah Exp $
+
+inherit eutils flag-o-matic
+
+PATCH_VER=0.10
+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}-patches-${PATCH_VER}.tar.bz2
+	mirror://gentoo/${P}-${I18N_VER}.patch.bz2
+	http://dev.gentoo.org/~seemant/distfiles/${P}-patches-${PATCH_VER}.tar.bz2
+	http://dev.gentoo.org/~seemant/distfiles/${P}-${I18N_VER}.patch.bz2
+	http://dev.gentoo.org/~vapier/dist/${P}-patches-${PATCH_VER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls build acl selinux static uclibc"
+
+RDEPEND="selinux? ( sys-libs/libselinux )
+	acl? ( 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*
+	>=sys-devel/autoconf-2.58
+	>=sys-devel/m4-1.4-r1
+	!uclibc? ( sys-apps/help2man )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	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
+
+	# Since we've patched many .c files, the make process will 
+	# try to re-build the manpages by running `./bin --help`.  
+	# When cross-compiling, we can't do that since 'bin' isn't 
+	# a native binary, so let's just install outdated man-pages.
+	[[ ${CTARGET:-${CHOST}} != ${CHOST} ]] && touch man/*.1
+}
+
+src_compile() {
+	if ! type -p cvs > /dev/null ; then
+		# Fix issues with gettext's autopoint if cvs is not installed,
+		# bug #28920.
+		export AUTOPOINT="/bin/true"
+	fi
+
+	ebegin "Reconfiguring configure scripts (be patient)"
+	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
+
+	aclocal -I m4 || die "aclocal"
+	autoconf || die "autoconf"
+	automake || die "automake"
+	eend $?
+
+	econf \
+		--bindir=/bin \
+		--enable-largefile \
+		$(use_enable nls) \
+		$(use_enable selinux) \
+		|| die "econf"
+
+	use static && append-ldflags -static
+	emake LDFLAGS="${LDFLAGS}" || die "emake"
+}
+
+src_test() {
+	# Non-root tests will fail if the full path isnt
+	# accessible to non-root users
+	chmod a+rx "${WORKDIR}"
+	addwrite /dev/full
+	export RUN_EXPENSIVE_TESTS="yes"
+	#export FETISH_GROUPS="portage wheel"
+	make check || die "make check failed"
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die
+
+	# add DIRCOLORS
+	insinto /etc
+	doins ${FILESDIR}/DIR_COLORS
+
+	# move non-critical packages into /usr
+	cd "${D}"
+	dodir /usr/bin
+	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 bin
+	local x
+	for x in * ; do
+		dosym /bin/${x} /usr/bin/${x}
+	done
+
+	if ! use build ; then
+		cd ${S}
+		dodoc AUTHORS ChangeLog* NEWS README* THANKS TODO
+	else
+		rm -r "${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-r5 b/sys-apps/coreutils/files/digest-coreutils-5.2.1-r5
new file mode 100644
index 000000000000..9d7121caa150
--- /dev/null
+++ b/sys-apps/coreutils/files/digest-coreutils-5.2.1-r5
@@ -0,0 +1,3 @@
+MD5 172ee3c315af93d3385ddfbeb843c53f coreutils-5.2.1.tar.bz2 4270776
+MD5 587ff6e992e6c8fe5c1869885738d09a coreutils-5.2.1-patches-0.10.tar.bz2 70297
+MD5 7dad35dee7a6517440feac4eef8b64c4 coreutils-5.2.1-i18n-0.2.patch.bz2 21795