Version bump.

Package-Manager: portage-2.1.2.2

4 files changed, 183 insertions, 9 deletions

diff --git a/sys-apps/coreutils/ChangeLog b/sys-apps/coreutils/ChangeLog
index 50677f9acef3..8e5abe69c334 100644
--- a/sys-apps/coreutils/ChangeLog
+++ b/sys-apps/coreutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/coreutils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.190 2007/02/13 23:03:50 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.191 2007/03/24 06:24:26 vapier Exp $
+
+*coreutils-6.9 (24 Mar 2007)
+
+  24 Mar 2007; Mike Frysinger <vapier@gentoo.org> +coreutils-6.9.ebuild:
+  Version bump.
 
   13 Feb 2007; Bryan Østergaard <kloeri@gentoo.org>
   coreutils-6.7-r1.ebuild:
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 35cc59ba220b..675e5192e57a 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -16,6 +16,8 @@ DIST coreutils-6.4.tar.bz2 5294210 RMD160 5e3628115ea814cddcfc6630a77c9079bd8676
 DIST coreutils-6.7-patches-1.0.tar.bz2 32171 RMD160 431ee64bfb8ec89f460b199aa3a42994d51ad990 SHA1 9cb0d80c7c5f1ab1eec96314bca8518f5ad19b50 SHA256 8e665c1008514dc50795aaa02e26710812337c6a1704da31242af9cef8d8004c
 DIST coreutils-6.7-patches-1.1.tar.bz2 32208 RMD160 a1187df0f9a8b98bd25126b5e7582f447748c907 SHA1 23fc9913bf54d9cd9f4fd132d30c084578640e2c SHA256 77f6aa56296386d5e3c9e2590c62778bc79a0c95a84951afec039191600d2379
 DIST coreutils-6.7.tar.bz2 5315342 RMD160 593acd266431db1777505bd181a7ffe095774beb SHA1 55a6037365f749a4ebb9e88a92132a4f938ac90e SHA256 4d7027cc803682decdadf850095dce7e22cc08eba2b1283e16d0fb7a675ac1f0
+DIST coreutils-6.9-patches-1.0.tar.bz2 32023 RMD160 e87e45fdfd05167c284fbf52c715a58796209980 SHA1 fe2ff545c5f06044ad3f8b305b553f9b51fb5972 SHA256 8b358414f4add03604e572328a5dbe1b89756ab4e733bfbed536783a581223cf
+DIST coreutils-6.9.tar.bz2 5384378 RMD160 c6ae65204b2e9c234a1140f39a8be1ee5cdcaab7 SHA1 10310a78c4e1d9f742f3815ac28e9bf1086a5885 SHA256 89c2895ad157de50e53298b22d91db116ee4e1dd3fdf4019260254e2e31497b0
 EBUILD coreutils-5.94-r1.ebuild 4563 RMD160 beb789a2f9f2913b7e5512c880a7cd7b59dbe846 SHA1 888fdbd28eece38c55b152c978d839650054f89c SHA256 a55c89c973f4d63a5ae8f60e60c70a84f05dad4a5e1a91c2e9ddeaecbc25d65d
 MD5 6019675c7bd8f8ad8ac9354de72365c2 coreutils-5.94-r1.ebuild 4563
 RMD160 beb789a2f9f2913b7e5512c880a7cd7b59dbe846 coreutils-5.94-r1.ebuild 4563
@@ -32,10 +34,14 @@ EBUILD coreutils-6.7.ebuild 4539 RMD160 d59f56e55d0045ab32484b18ca7134f912936f8b
 MD5 7a22938b9193303b2c6a4676a1e376db coreutils-6.7.ebuild 4539
 RMD160 d59f56e55d0045ab32484b18ca7134f912936f8b coreutils-6.7.ebuild 4539
 SHA256 b79614040ac8ceee6ecfe1b0b5cf94b7a555f949c5147f617d19968a82ee0989 coreutils-6.7.ebuild 4539
-MISC ChangeLog 29608 RMD160 dcad08deb13ee5ae29ff8dfd4a3fa5b49a17673a SHA1 c57b599d8313734e10fb07384c484c0447a380b9 SHA256 fb7ae50db4ce725e4b0ef7484b5552d8dfa71f1c0b7e31b47942149f795862f5
-MD5 8282a1b992c80be62ebca53ffac68299 ChangeLog 29608
-RMD160 dcad08deb13ee5ae29ff8dfd4a3fa5b49a17673a ChangeLog 29608
-SHA256 fb7ae50db4ce725e4b0ef7484b5552d8dfa71f1c0b7e31b47942149f795862f5 ChangeLog 29608
+EBUILD coreutils-6.9.ebuild 4843 RMD160 85162c13af22be2762558b5014334bf81d3ac71d SHA1 5c528dd4e021e2c3962d271c84592cee11f908c3 SHA256 86b1aec325c4131499403deb36244364b0f1dd4d839c222e76cc7b6e93f0e42c
+MD5 eff6d318070682c4fe59ac35fe92da07 coreutils-6.9.ebuild 4843
+RMD160 85162c13af22be2762558b5014334bf81d3ac71d coreutils-6.9.ebuild 4843
+SHA256 86b1aec325c4131499403deb36244364b0f1dd4d839c222e76cc7b6e93f0e42c coreutils-6.9.ebuild 4843
+MISC ChangeLog 29728 RMD160 9b84852b112d45c9fb24d2055c117aa84a8dcc9f SHA1 026f02c2c87e6e36d4f900e0bb3cc8e4a4587e7b SHA256 cceba9ad34246566d6a86a04d28e77f298240b25797788b451f9c91c12e74d7b
+MD5 2e2b177fc20d9d09fde1402e367507e1 ChangeLog 29728
+RMD160 9b84852b112d45c9fb24d2055c117aa84a8dcc9f ChangeLog 29728
+SHA256 cceba9ad34246566d6a86a04d28e77f298240b25797788b451f9c91c12e74d7b ChangeLog 29728
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -52,10 +58,13 @@ SHA256 e54bf8b4e1020e5c102b26466f52273a255391afd62baa76898d01a14860a7cf files/di
 MD5 f455bf66798a9d6ae4ebddd66a0a679b files/digest-coreutils-6.7-r1 524
 RMD160 75a242e4a816d65a1f29f68ee3d58eb35b360b2a files/digest-coreutils-6.7-r1 524
 SHA256 b890d07e0a0cafd850275f11addaeff906b6b0370a2dbdcd7d9d741fa5bfbaae files/digest-coreutils-6.7-r1 524
+MD5 639cc472801d61ef150d15e6e5f56dae files/digest-coreutils-6.9 524
+RMD160 a14b20f3694a574f59d47cbf2ef2abfc3f4b8165 files/digest-coreutils-6.9 524
+SHA256 9ae482181c7073df35fe17af99c93b360e0ce215cb495a675452fd43af116f32 files/digest-coreutils-6.9 524
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF0kObugEuf3OQ0akRAu20AJ9do8PTHNpfyVCcmmf3B3K3bZOp/gCeJ6vR
-+TqYM0YS8RSyvxAkmCFVW6U=
-=p8PM
+iD8DBQFGBMQ68bi6rjpTunYRAv/DAKCn1ftBMfK/Tk4ahwsmDeI0CjA8EQCeOEfz
+ShK/nQB03dFLcCGTM0XZXx0=
+=j+U7
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/coreutils/coreutils-6.9.ebuild b/sys-apps/coreutils/coreutils-6.9.ebuild
new file mode 100644
index 000000000000..4383797f22e1
--- /dev/null
+++ b/sys-apps/coreutils/coreutils-6.9.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-6.9.ebuild,v 1.1 2007/03/24 06:24:26 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs autotools
+
+PATCH_VER="1.0"
+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="ftp://alpha.gnu.org/gnu/coreutils/${P}.tar.bz2
+	mirror://gnu/${PN}/${P}.tar.bz2
+	mirror://gentoo/${P}.tar.bz2
+	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2
+	http://dev.gentoo.org/~vapier/dist/${P}-patches-${PATCH_VER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="acl nls selinux static"
+RESTRICT="confcache"
+
+RDEPEND="selinux? ( sys-libs/libselinux )
+	acl? ( sys-apps/acl sys-apps/attr )
+	nls? ( >=sys-devel/gettext-0.15 )
+	!net-mail/base64
+	>=sys-libs/ncurses-5.3-r5"
+DEPEND="${RDEPEND}
+	=sys-devel/automake-1.9*
+	>=sys-devel/autoconf-2.59d
+	>=sys-devel/m4-1.4-r1
+	sys-apps/help2man"
+
+pkg_setup() {
+	# fixup expr for #123342
+	if [[ $(/bin/expr a : '\(a\)') != "a" ]] ; then
+		if [[ -x /bin/busybox ]] ; then
+			ln -sf /bin/busybox /bin/expr
+		else
+			eerror "Your expr binary appears to be broken, please fix it."
+			eerror "For more info, see http://bugs.gentoo.org/123342"
+			die "your expr is broke"
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	PATCHDIR="${WORKDIR}/patch"
+	rm -f "${PATCHDIR}"/generic/001_*progress*
+
+	# Apply the ACL/SELINUX patches.
+	if use selinux ; then
+		EPATCH_MULTI_MSG="Applying SELINUX patches ..." \
+		EPATCH_SUFFIX="patch" epatch "${PATCHDIR}"/selinux
+		( cd "${PATCHDIR}" ; epatch selinux/GLUE* ) || die "glue failed"
+	else
+		EPATCH_MULTI_MSG="Applying ACL patches ..." \
+		EPATCH_SUFFIX="patch" epatch "${PATCHDIR}"/acl
+	fi
+
+	EPATCH_SUFFIX="patch" epatch "${PATCHDIR}"/generic
+	chmod a+rx tests/sort/sort-mb-tests
+
+	# 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.
+	tc-is-cross-compiler && touch man/*.1
+	# There's no reason for this crap to use the private version
+	sed -i 's:__mempcpy:mempcpy:g' lib/*.c
+
+	AT_M4DIR="m4" eautoreconf
+}
+
+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
+
+	local myconf=""
+	[[ ${USERLAND} == "GNU" ]] || myconf="${myconf} --bindir=/usr/libexec/gnu"
+	if echo "#include <regex.h>" | $(tc-getCPP) > /dev/null ; then
+		myconf="${myconf} --without-included-regex"
+	fi
+
+	use static && append-ldflags -static
+	econf \
+		--enable-largefile \
+		$(use_enable nls) \
+		$(use_enable acl) \
+		$(use_enable xattr) \
+		$(use_enable selinux) \
+		${myconf} \
+		|| die "econf"
+	emake || die "emake"
+}
+
+src_test() {
+	# Non-root tests will fail if the full path isnt
+	# accessible to non-root users
+	chmod -R go-w "${WORKDIR}"
+	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() {
+	emake install DESTDIR="${D}" || die
+	rm -f "${D}"/usr/lib/charset.alias
+	dodoc AUTHORS ChangeLog* NEWS README* THANKS TODO
+
+	# remove files provided by other packages
+	rm "${D}"/usr/bin/{kill,uptime} # procps
+	rm "${D}"/usr/bin/{groups,su}   # shadow
+	rm "${D}"/usr/bin/hostname      # net-tools
+	rm "${D}"/usr/share/man/man1/{groups,kill,hostname,su,uptime}.1
+	# provide by the man-pages package
+	rm "${D}"/usr/share/man/man1/{chgrp,chmod,chown,cp,dd,df,dir,dircolors}.1
+	rm "${D}"/usr/share/man/man1/{du,install,ln,ls,mkdir,mkfifo,mknod,mv}.1
+	rm "${D}"/usr/share/man/man1/{rm,rmdir,touch,vdir}.1
+
+	insinto /etc
+	newins src/dircolors.hin DIR_COLORS
+
+	if [[ ${USERLAND} == "GNU" ]] ; then
+		cd "${D}"/usr/bin
+		dodir /bin
+		# move critical binaries into /bin (required by FHS)
+		local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
+		           mkdir mknod mv pwd rm rmdir stty sync true uname"
+		mv ${fhs} ../../bin/ || die "could not move fhs bins"
+		# move critical binaries into /bin (common scripts)
+		local com="basename chroot cut dir dirname du env expr head mkfifo
+		           readlink seq sleep sort tail touch tr tty vdir wc yes"
+		mv ${com} ../../bin/ || die "could not move common bins"
+		local x
+		for x in ${com} ; do
+			dosym /bin/${x} /usr/bin/${x} || die
+		done
+	else
+		# For now, drop the man pages, collides with the ones of the system.
+		rm -rf "${D}"/usr/share/man
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Make sure you run 'hash -r' in your active shells."
+}
diff --git a/sys-apps/coreutils/files/digest-coreutils-6.9 b/sys-apps/coreutils/files/digest-coreutils-6.9
new file mode 100644
index 000000000000..b9fe30386176
--- /dev/null
+++ b/sys-apps/coreutils/files/digest-coreutils-6.9
@@ -0,0 +1,6 @@
+MD5 eca17ec25debe3f252e84d6185b53b06 coreutils-6.9-patches-1.0.tar.bz2 32023
+RMD160 e87e45fdfd05167c284fbf52c715a58796209980 coreutils-6.9-patches-1.0.tar.bz2 32023
+SHA256 8b358414f4add03604e572328a5dbe1b89756ab4e733bfbed536783a581223cf coreutils-6.9-patches-1.0.tar.bz2 32023
+MD5 c9607d8495f16e98906e7ed2d9751a06 coreutils-6.9.tar.bz2 5384378
+RMD160 c6ae65204b2e9c234a1140f39a8be1ee5cdcaab7 coreutils-6.9.tar.bz2 5384378
+SHA256 89c2895ad157de50e53298b22d91db116ee4e1dd3fdf4019260254e2e31497b0 coreutils-6.9.tar.bz2 5384378