version bump, to install /etc/DIR_COLORS. Thanks to Weeve for noticing on sparc, and to SPANKY for being SPANKY.

4 files changed, 182 insertions, 13 deletions

diff --git a/sys-apps/coreutils/ChangeLog b/sys-apps/coreutils/ChangeLog
index c1e2e3ce3539..2fd681f5e733 100644
--- a/sys-apps/coreutils/ChangeLog
+++ b/sys-apps/coreutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/coreutils
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.84 2004/04/22 17:02:05 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.85 2004/05/07 21:04:02 seemant Exp $
+
+*coreutils-5.2.0-r2 (07 May 2004)
+
+  07 May 2004; Seemant Kulleen <seemant@gentoo.org>
+  +coreutils-5.2.0-r2.ebuild:
+  version bump, to install /etc/DIR_COLORS. Thanks to Weeve for noticing on
+  sparc, and to SPANKY for being SPANKY.
 
   22 Apr 2004; Martin Holzer <mholzer@gentoo.org> coreutils-5.2.0-r1.ebuild,
   coreutils-5.2.0.ebuild:
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index ba6428036946..3ed1f841c246 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -1,17 +1,20 @@
-MD5 d1eb949ee56a926125ae896f901286ce files/digest-coreutils-5.0-r5 141
-MD5 e80d3d87cfbe40bc56636167ae5b4768 files/digest-coreutils-5.0-r6 141
+MD5 3abce7ecb2ed8228682d7716e8716e8f blah 3543
+MD5 ce3b3665ef7eec18425f7cd7de6f6236 coreutils-5.0.91-r3.ebuild 3958
+MD5 57938316a4408271c2dcdc8a1fd72fe3 coreutils-5.2.0-r2.ebuild 4076
+MD5 9253cc724d0f5ba11a7a7253c91aa6f6 coreutils-5.0-r6.ebuild 2724
+MD5 662b883c90bfb80899252499864acf58 coreutils-5.2.0.ebuild 3966
+MD5 167296005c2f3fc5575606a55b601607 coreutils-5.0.91-r2.ebuild 3550
+MD5 1aa38cee5b4e97505ceab78ec7399a82 coreutils-5.2.0-r1.ebuild 4014
+MD5 3645d83c5dafa30ce524b6fc2361c152 coreutils-5.0-r5.ebuild 2557
+MD5 2f912270290d6f28653774d0c61c5b7e coreutils-5.0.91-r4.ebuild 4223
+MD5 cf76d44d7d62f1cd3e4f3bf694c6d30e ChangeLog 16627
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 4638c50e0ea024536055d69519cd5fad files/digest-coreutils-5.0.91-r2 151
 MD5 a56b66f95289815e386f537689ef29a0 files/digest-coreutils-5.0.91-r3 229
 MD5 9e4492e1c7e9c927ad7c492239dbe029 files/digest-coreutils-5.0.91-r4 229
-MD5 3d21b6fedf28c429ae337aeaaf638f79 files/digest-coreutils-5.2.0 224
 MD5 5a7d722a7600e8834bf39c24790caaa2 files/003_all_coreutils-gentoo-uname-s390.patch 3120
 MD5 3d21b6fedf28c429ae337aeaaf638f79 files/digest-coreutils-5.2.0-r1 224
-MD5 cf76d44d7d62f1cd3e4f3bf694c6d30e ChangeLog 16627
-MD5 3645d83c5dafa30ce524b6fc2361c152 coreutils-5.0-r5.ebuild 2557
-MD5 9253cc724d0f5ba11a7a7253c91aa6f6 coreutils-5.0-r6.ebuild 2724
-MD5 167296005c2f3fc5575606a55b601607 coreutils-5.0.91-r2.ebuild 3550
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 ce3b3665ef7eec18425f7cd7de6f6236 coreutils-5.0.91-r3.ebuild 3958
-MD5 2f912270290d6f28653774d0c61c5b7e coreutils-5.0.91-r4.ebuild 4223
-MD5 662b883c90bfb80899252499864acf58 coreutils-5.2.0.ebuild 3966
-MD5 1aa38cee5b4e97505ceab78ec7399a82 coreutils-5.2.0-r1.ebuild 4014
+MD5 6a9f5a2ffa31d94987039066c5072982 files/digest-coreutils-5.2.0-r2 224
+MD5 3d21b6fedf28c429ae337aeaaf638f79 files/digest-coreutils-5.2.0 224
+MD5 d1eb949ee56a926125ae896f901286ce files/digest-coreutils-5.0-r5 141
+MD5 e80d3d87cfbe40bc56636167ae5b4768 files/digest-coreutils-5.0-r6 141
diff --git a/sys-apps/coreutils/coreutils-5.2.0-r2.ebuild b/sys-apps/coreutils/coreutils-5.2.0-r2.ebuild
new file mode 100644
index 000000000000..c7361e41e48c
--- /dev/null
+++ b/sys-apps/coreutils/coreutils-5.2.0-r2.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-5.2.0-r2.ebuild,v 1.1 2004/05/07 21:04:02 seemant Exp $
+
+inherit eutils flag-o-matic
+
+PATCH_VER=0.2
+I18N_VER=i18n-0.1
+PATCHDIR=${WORKDIR}/patch
+
+S=${WORKDIR}/${P}
+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
+	http://www.openi18n.org/subgroups/utildev/patch/${P}-${I18N_VER}.patch.gz
+	mirror://gentoo/${P}-gentoo-${PATCH_VER}.tar.bz2
+	mirror://gentoo/${P}.tar.bz2
+	mirror://gentoo/${P}-${I18N_VER}.patch.gz
+	http://dev.gentoo.org/~seemant/distfiles/${P}-gentoo-${PATCH_VER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~ppc64 ~sparc ~mips ~alpha arm ~hppa ~ia64 ~amd64 s390"
+IUSE="nls build acl selinux static"
+
+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/glibc
+	>=sys-apps/portage-2.0.49
+	>=sys-devel/automake-1.8.2
+	>=sys-devel/autoconf-2.57
+	>=sys-devel/m4-1.4-r1
+	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
+
+	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/mandrake
+	epatch ${WORKDIR}/${P}-${I18N_VER}.patch
+
+	# Fixed patch for s390 to close bug 47965
+	# 
+	if use s390
+	then
+		mv ${PATCHDIR}/generic/003* ${PATCHDIR}/excluded
+		einfo Applying s390 patches
+		epatch ${FILESDIR}/003_all_coreutils-gentoo-uname-s390.patch || die
+	fi
+
+	# 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
+}
+
+src_compile() {
+
+#	export DEFAULT_POSIX2_VERSION=199209
+
+	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
+
+	mv m4/inttypes.m4 m4/inttypes-eggert.m4
+	touch aclocal.m4 configure config.hin \
+		Makefile.in */Makefile.in */*/Makefile.in
+
+	ebegin "Reconfiguring configure scripts"
+	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 ${PATCHDIR}/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.0-r2 b/sys-apps/coreutils/files/digest-coreutils-5.2.0-r2
new file mode 100644
index 000000000000..ccb7a5e69b3d
--- /dev/null
+++ b/sys-apps/coreutils/files/digest-coreutils-5.2.0-r2
@@ -0,0 +1,3 @@
+MD5 ea024eaf04ee7a2a4270655d584445d2 coreutils-5.2.0.tar.bz2 4242493
+MD5 34f8286d25e5dd049482c0f92bb4f796 coreutils-5.2.0-i18n-0.1.patch.gz 25741
+MD5 cfaf797236922755fe32b5b4a9f9ee14 coreutils-5.2.0-gentoo-0.2.tar.bz2 60799