Version bump.

Package-Manager: portage-2.1.4

4 files changed, 176 insertions, 9 deletions

diff --git a/sys-apps/coreutils/ChangeLog b/sys-apps/coreutils/ChangeLog
index 08dddfb20415..b4e9cb954a0d 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.216 2007/09/15 02:31:17 vapier Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.217 2008/01/23 00:07:06 vapier Exp $
+
+*coreutils-6.10 (23 Jan 2008)
+
+  23 Jan 2008; Mike Frysinger <vapier@gentoo.org> +coreutils-6.10.ebuild:
+  Version bump.
 
   15 Sep 2007; Mike Frysinger <vapier@gentoo.org> coreutils-6.9-r1.ebuild:
   Break sys-apps/attr out of USE=acl and into USE=xattr #192023.
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 00c7646e28f0..cf77593641c8 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -5,27 +5,36 @@ AUX gnulib-futimens-rename.patch 1323 RMD160 79f1bcd78441aa4bef1975ee68011cd5d68
 MD5 06d5a3637b0e90366077b3a3dd812f1a files/gnulib-futimens-rename.patch 1323
 RMD160 79f1bcd78441aa4bef1975ee68011cd5d68b7bf1 files/gnulib-futimens-rename.patch 1323
 SHA256 12d3ccbe88aef4f7218799d961e1fc4f56609c59bd739cfc6e3965838e6893a1 files/gnulib-futimens-rename.patch 1323
+DIST coreutils-6.10-patches-1.0.tar.bz2 10046 RMD160 7de54627e3abdef594dc786af441db0206c8dff5 SHA1 a07be665c65cf79e033301ea34c517b420eddfe2 SHA256 6e5fc6be92f932a9c4b2c04d8f008a66bb6b12eae608b8bf629cbe0b0eb1bafd
+DIST coreutils-6.10.tar.lzma 3746908 RMD160 7b3f7ae0f92fa3f04ab0b7fc0bbc22430a392a0b SHA1 783d425aeeb087f46a4d7d24f5a890299a09a487 SHA256 8b05bba1b2726a164e444c314e3f359604b58216be704bed8f2e028449cc6204
 DIST coreutils-6.9-patches-1.2.tar.bz2 49161 RMD160 11f2bf30c5efdd705c38648d3e5dfb383cf62508 SHA1 c6635f62ba015bd54a8137c65529429ca98321ce SHA256 0706957589f60cc269dac08588dc74c1312e837f3fc3a77a88cee449b2e82671
 DIST coreutils-6.9.tar.bz2 5384378 RMD160 c6ae65204b2e9c234a1140f39a8be1ee5cdcaab7 SHA1 10310a78c4e1d9f742f3815ac28e9bf1086a5885 SHA256 89c2895ad157de50e53298b22d91db116ee4e1dd3fdf4019260254e2e31497b0
+EBUILD coreutils-6.10.ebuild 4616 RMD160 dbbb3a6b5ef143dba366bdd6536c093d52fd8b43 SHA1 ced7dfa0638c325fd509cd19028e0b204e582561 SHA256 88501137103ef8cffdcf58cdc03d2f5e0e82391007e65a87f0b1e1d192f22306
+MD5 5322f11b92752d67dd44648531340eb7 coreutils-6.10.ebuild 4616
+RMD160 dbbb3a6b5ef143dba366bdd6536c093d52fd8b43 coreutils-6.10.ebuild 4616
+SHA256 88501137103ef8cffdcf58cdc03d2f5e0e82391007e65a87f0b1e1d192f22306 coreutils-6.10.ebuild 4616
 EBUILD coreutils-6.9-r1.ebuild 4903 RMD160 da46f139e6854ac6af084d2c9337424f51206447 SHA1 5ce306598888c922ce5e96cf86d154cd574cf9b6 SHA256 51f0f1cb6c2247ddff64e5bc51ca0cee6cce1beb881f58ae1609c3666af67809
 MD5 58de554c4b3e66bb86ca2fdc300944dd coreutils-6.9-r1.ebuild 4903
 RMD160 da46f139e6854ac6af084d2c9337424f51206447 coreutils-6.9-r1.ebuild 4903
 SHA256 51f0f1cb6c2247ddff64e5bc51ca0cee6cce1beb881f58ae1609c3666af67809 coreutils-6.9-r1.ebuild 4903
-MISC ChangeLog 32890 RMD160 c942aff9034fb10c1246ea792e95b70b6d503a58 SHA1 53070b3336e0458d461266e3d178faa427db0f9e SHA256 80499ea1dfd8a113199c364001b8183fb2e34eed94b02157a3bd29a2136c4f80
-MD5 e9427e55015a51efaa1618eedafdbdca ChangeLog 32890
-RMD160 c942aff9034fb10c1246ea792e95b70b6d503a58 ChangeLog 32890
-SHA256 80499ea1dfd8a113199c364001b8183fb2e34eed94b02157a3bd29a2136c4f80 ChangeLog 32890
+MISC ChangeLog 33012 RMD160 1b0bc7ec6a9945aebaee7c58e9b64e1c287dc5dc SHA1 438cae1e4435baee1abc22698c68ff450a12d9c0 SHA256 6b0f6bf3cf9e8334c634bc374a82a7f752ad613a4b8bd266c5f23d06998554d7
+MD5 c03023cc33be03fecc8f4ba6eab5a3f4 ChangeLog 33012
+RMD160 1b0bc7ec6a9945aebaee7c58e9b64e1c287dc5dc ChangeLog 33012
+SHA256 6b0f6bf3cf9e8334c634bc374a82a7f752ad613a4b8bd266c5f23d06998554d7 ChangeLog 33012
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
+MD5 123b2246c54cb45770e01be306626143 files/digest-coreutils-6.10 533
+RMD160 0e7d18ed85f374fc681096006e9ed53ad76ec53c files/digest-coreutils-6.10 533
+SHA256 3447559bd1fa37b655b9cf78bc20a8ff9efbe14dc7409e6316e49c3cf79bfcbb files/digest-coreutils-6.10 533
 MD5 249b07d31fff9055a4a923109a735ccc files/digest-coreutils-6.9-r1 524
 RMD160 e7c7d7e65c355c0f3cea4cbd642e0729ab3cbf0b files/digest-coreutils-6.9-r1 524
 SHA256 d4f9908aae5e20bf68b093f23eec6f8be392fb4ad6f2d46d60f11021026b19b9 files/digest-coreutils-6.9-r1 524
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG60P7p/wUKkr7RBoRAtThAJ9VGLgFzVzeoJvW5a7hUgT3bG+QGwCeORYW
-iTNvz3IjRzxa5i/Wxlkpd7I=
-=38/5
+iD8DBQFHloUxj9hvisErhMIRAscSAJsF0ca9SywG8cQY6ixwrZ8AlgReuwCgildB
+11OSJ37V62BRsNYSdMVDI24=
+=vV/y
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/coreutils/coreutils-6.10.ebuild b/sys-apps/coreutils/coreutils-6.10.ebuild
new file mode 100644
index 000000000000..2f71e6f7b852
--- /dev/null
+++ b/sys-apps/coreutils/coreutils-6.10.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-6.10.ebuild,v 1.1 2008/01/23 00:07:06 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.lzma
+	mirror://gnu/${PN}/${P}.tar.lzma
+	mirror://gentoo/${P}.tar.lzma
+	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 xattr"
+
+RDEPEND="selinux? ( sys-libs/libselinux )
+	acl? ( sys-apps/acl )
+	xattr? ( sys-apps/attr )
+	nls? ( >=sys-devel/gettext-0.15 )
+	!net-mail/base64
+	>=sys-libs/ncurses-5.3-r5"
+DEPEND="${RDEPEND}
+	app-arch/lzma-utils
+	>=sys-devel/automake-1.10.1
+	>=sys-devel/autoconf-2.61
+	>=sys-devel/m4-1.4-r1"
+
+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}"
+
+	EPATCH_SUFFIX="patch" \
+	PATCHDIR="${WORKDIR}/patch" \
+	EPATCH_EXCLUDE="001_all_coreutils-gen-progress-bar.patch" \
+	epatch
+
+	# Since we've patched many .c files, the make process will try to
+	# re-build the manpages by running `./bin --help`.  When doing a
+	# cross-compile, we can't do that since 'bin' isn't a native bin.
+	# Also, it's not like we changed the usage on any of these things,
+	# so let's just update the timestamps and skip the help2man step.
+	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
+
+	# cross-compile workaround #177061
+	[[ ${CHOST} == *-linux* ]] && export fu_cv_sys_stat_statvfs=yes
+
+	use static && append-ldflags -static
+	# kill/uptime - procps
+	# groups/su   - shadow
+	# hostname    - net-tools
+	econf \
+		--enable-install-program="arch" \
+		--enable-no-install-program="groups,hostname,kill,su,uptime" \
+		--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 -k 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
+
+	insinto /etc
+	newins src/dircolors.hin DIR_COLORS || die
+
+	# workaround bug in build system where `group` does not
+	# work with --enable-no-install-program configure option
+	rm "${D}"/usr/bin/groups "${D}"/usr/share/man/man1/groups.1 || die
+
+	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"
+		# create a symlink for uname in /usr/bin/ since autotools require it
+		local x
+		for x in ${com} uname ; 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.10 b/sys-apps/coreutils/files/digest-coreutils-6.10
new file mode 100644
index 000000000000..a4d8efaddf26
--- /dev/null
+++ b/sys-apps/coreutils/files/digest-coreutils-6.10
@@ -0,0 +1,6 @@
+MD5 46e83f0013134e1edf2f0c0495a9dc53 coreutils-6.10-patches-1.0.tar.bz2 10046
+RMD160 7de54627e3abdef594dc786af441db0206c8dff5 coreutils-6.10-patches-1.0.tar.bz2 10046
+SHA256 6e5fc6be92f932a9c4b2c04d8f008a66bb6b12eae608b8bf629cbe0b0eb1bafd coreutils-6.10-patches-1.0.tar.bz2 10046
+MD5 23582a4e8b21e837cfbafbc3834a8a4b coreutils-6.10.tar.lzma 3746908
+RMD160 7b3f7ae0f92fa3f04ab0b7fc0bbc22430a392a0b coreutils-6.10.tar.lzma 3746908
+SHA256 8b05bba1b2726a164e444c314e3f359604b58216be704bed8f2e028449cc6204 coreutils-6.10.tar.lzma 3746908