Add fix from newer versions for cp/mv problems on older kernels #289134 by Allen Brooker.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 157 insertions, 12 deletions

diff --git a/sys-apps/coreutils/ChangeLog b/sys-apps/coreutils/ChangeLog
index f0808ec9bd37..1f02d7e791ad 100644
--- a/sys-apps/coreutils/ChangeLog
+++ b/sys-apps/coreutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/coreutils
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.273 2009/10/12 18:38:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.274 2009/10/18 05:52:32 vapier Exp $
+
+*coreutils-7.5-r1 (18 Oct 2009)
+
+  18 Oct 2009; Mike Frysinger <vapier@gentoo.org> +coreutils-7.5-r1.ebuild:
+  Add fix from newer versions for cp/mv problems on older kernels #289134 by
+  Allen Brooker.
 
   12 Oct 2009; Mike Frysinger <vapier@gentoo.org> coreutils-7.5.ebuild,
   coreutils-7.6.ebuild:
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 0083f2b62785..c59e111e73a5 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST coreutils-7.1-patches-3.tar.lzma 7634 RMD160 4e8887cd7af4c9a58909cc5fabe427d0d2160dda SHA1 f1a1850ba22fe8712169d95f60df23ce5fe1d6f2 SHA256 d25d78ff014d45bab81ff5b39eee634fceb6129a2f8fe03448d34c7f964ae40c
 DIST coreutils-7.1.tar.gz 9533070 RMD160 e2ef184ca0917c38bec8a54b858862f9d02449c5 SHA1 e5f57aed49da5d2e1c7833f7b7cc31aa96fe8a4e SHA256 813cb19fa19a885f342664109c7c5810f0081b624ff317bba8d1b6ccd83c2a05
 DIST coreutils-7.2-patches-2.tar.lzma 7672 RMD160 a3e6fa01876f0087a9f4a3a74140d28b244e536a SHA1 c008f547cd58132b28ded0b89c0e1f7fb10e98e2 SHA256 e15a09e165403d0f163abd3604dcc0e605a6735ac839fafc111265fc3f4954ba
@@ -8,20 +5,15 @@ DIST coreutils-7.2.tar.gz 9664198 RMD160 fbe573b70bafd5d482e519383c0b86aaaa48a66
 DIST coreutils-7.4-patches-1.tar.lzma 7658 RMD160 b15e0775320e378631fa683301fb311efc5eaa16 SHA1 fc9fd5622de13a1441c9df8f4839088f06f3051e SHA256 7bdcffc0c4a3d95f9947b06a0e911787ea71d511bce79586a1a60bac037f37b7
 DIST coreutils-7.4.tar.gz 9708910 RMD160 a7f53f50154e8473d1d859468c8e02fa85c3c6bb SHA1 cfb399b1d121abde8c1b68b2651a645b7170547f SHA256 613c57d0df3616c2684a1e6a59259439b72dbc5eea4b90ac16bde714fefb7c83
 DIST coreutils-7.5-patches-1.tar.lzma 7591 RMD160 ec69e54b41874c425c40695f5dcbc87f785fe4e0 SHA1 536f93c57cbd2bb51159805e5f6380125f270479 SHA256 f3c7070f4dc40eac391427ddc625f4f9cb0f16b5c065c0d4639d9b6969da748e
+DIST coreutils-7.5-patches-2.tar.lzma 8370 RMD160 fef456359dd907c8264686720676ea1dabb90b63 SHA1 55f1b88bfeca34cd09c4ba305f6c0d45cfa3fd3f SHA256 1ee33146c960671f6cb54ca4916f6a828db904dae84841ec690eae7c0205e9a2
 DIST coreutils-7.5.tar.gz 9956013 RMD160 17785526e6820705aa5790454af1bd3d0d4104aa SHA1 97e1486a33bf42eb7686d8f131c80ab533f1f683 SHA256 341f49b9434f83ca9a8b6c2266813092ef08a5fca25f15dcc1a0ba82fc18c3c1
 DIST coreutils-7.6-patches-2.tar.lzma 5394 RMD160 d32618ce5de121515957227a03cbe5ba08794bb5 SHA1 b901596d5c085e157ae8a37fc805a05804cd32a9 SHA256 4bcd2b5977701bb652621d26f0e3d619d007488a45f378f88ef58bc24806ca19
 DIST coreutils-7.6.tar.gz 10014650 RMD160 8d0741aabfc7bea9adc1e7d71ff36100c4afc3a2 SHA1 98880651bee000b1b31e1ee55ff8fabdad8eeecd SHA256 1d9bfe8b427ca5f8cffa0b462f861e4157c946fbeaf0884d273bbd6cab1c25d4
 EBUILD coreutils-7.1.ebuild 4207 RMD160 03f5d9d4ed26aa1ffc5fa23db7e65d13b2be0908 SHA1 3eaafac79b2d07640a5df8343742cec968bbb566 SHA256 ff491c6a3fdfba04cb4036eb93a7462349bb11829f0fdd8e3140d7d79c9b2567
 EBUILD coreutils-7.2.ebuild 4218 RMD160 c83f53a8d56cea22ea2a97aee5e7bd109b1f19e4 SHA1 ff5acf3bcb9e0ca0d174e6cfa06d0bba8b2c5f62 SHA256 e46996720fe0e2fa60b1b33f7ee8167cedcd3295cdc80887d05ef310d24a7505
 EBUILD coreutils-7.4.ebuild 4508 RMD160 8f6bc667c5e10e072d7ddf460f5a2d37adbdad7e SHA1 4cf899fa9c6cd190bd8b9f681746ad8047d3ca18 SHA256 9d907b7ba43e60fdcd8ab5e4fd6de0c23977c71d9c1c0cb2e989a6ba2082cab9
+EBUILD coreutils-7.5-r1.ebuild 4630 RMD160 2f75e20df8db102688d569e58291578a4fbcc3fa SHA1 ffd5f2eb70d028f7ebf8a063b82bb25d1a2c2c40 SHA256 95b4b129a965342ef94f5ac90332a6d34d45455a2a4386ef65b5f541b70270c9
 EBUILD coreutils-7.5.ebuild 4627 RMD160 1714e92c9a18346cd1deb92bce927e03e86b60a7 SHA1 a3a51dd803ec713e976dc01b2ab33d3e5f61bf00 SHA256 f16298ca3ff5155fa63d1fa9972c27996f8687f852e313be02a4ac8f0c122356
 EBUILD coreutils-7.6.ebuild 4637 RMD160 0f4caa44ad47abd0f98714423577535a49f525f7 SHA1 06964233fc406818906b2c6541a7cfd6aadd0307 SHA256 9b9b66382978acadeb5e72f4f93d9cd5afecc8ca283f6af07d967fc85a25a758
-MISC ChangeLog 40488 RMD160 10a4ad51360c9b93ffb545d86970a4c1e114c647 SHA1 036b971922be6536441cf3884707a6755dd82170 SHA256 36b0b60a4b6258aa06498abccc805ce9fd126c502db3f52e89b8c68d7751d055
+MISC ChangeLog 40692 RMD160 406607886e413f65b2952863d09758dfeedb856a SHA1 a8430a5db1b9967013925ae23656141d8ff5d5d4 SHA256 6abffea63a90ae86592ac93842123225b27f70be8d4425825567ee0d6c360e64
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrTd8kACgkQlPl3HsVfCDqudACfa5OYsBcEW/JNAhwpecdBQgJI
-sDsAnRUAtUSrwVXmf4v7WOdW2w4SllnP
-=HpYH
------END PGP SIGNATURE-----
diff --git a/sys-apps/coreutils/coreutils-7.5-r1.ebuild b/sys-apps/coreutils/coreutils-7.5-r1.ebuild
new file mode 100644
index 000000000000..691e5bf8eefd
--- /dev/null
+++ b/sys-apps/coreutils/coreutils-7.5-r1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-7.5-r1.ebuild,v 1.1 2009/10/18 05:52:32 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+PATCH_VER="2"
+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.gz
+	mirror://gnu/${PN}/${P}.tar.gz
+	mirror://gentoo/${P}.tar.gz
+	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.lzma
+	http://dev.gentoo.org/~vapier/dist/${P}-patches-${PATCH_VER}.tar.lzma"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86"
+IUSE="acl caps gmp nls selinux static vanilla xattr"
+
+RDEPEND="caps? ( sys-libs/libcap )
+	gmp? ( dev-libs/gmp )
+	selinux? ( sys-libs/libselinux )
+	acl? ( sys-apps/acl )
+	xattr? ( sys-apps/attr )
+	nls? ( >=sys-devel/gettext-0.15 )
+	!<sys-apps/util-linux-2.13
+	!sys-apps/stat
+	!net-mail/base64
+	!sys-apps/mktemp
+	!<app-forensics/tct-1.18-r1
+	!<net-fs/netatalk-2.0.3-r4
+	!<sci-chemistry/ccp4-6.1.1
+	>=sys-libs/ncurses-5.3-r5"
+DEPEND="${RDEPEND}
+	|| ( app-arch/xz-utils app-arch/lzma-utils )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	if ! use vanilla ; then
+		EPATCH_SUFFIX="patch" \
+		PATCHDIR="${WORKDIR}/patch" \
+		EPATCH_EXCLUDE="001_all_coreutils-gen-progress-bar.patch" \
+		epatch
+	fi
+
+	# 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.
+	set -- man/*.x
+	tc-is-cross-compiler && touch ${@/%x/1}
+}
+
+src_compile() {
+	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 caps || echo --disable-libcap) \
+		$(use_enable nls) \
+		$(use_enable acl) \
+		$(use_enable xattr) \
+		$(use_with gmp) \
+		|| 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}"
+
+	# coreutils tests like to do `mount` and such with temp dirs
+	# so make sure /etc/mtab is writable #265725
+	# make sure /dev/loop* can be mounted #269758
+	mkdir -p "${T}"/mount-wrappers
+	mkwrap() {
+		local w ww
+		for w in "$@" ; do
+			ww="${T}/mount-wrappers/${w}"
+			cat <<-EOF > "${ww}"
+				#!/bin/sh
+				exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P $w) "\$@"
+			EOF
+			chmod a+rx "${ww}"
+		done
+	}
+	mkwrap mount umount
+
+	addwrite /dev/full
+	#export RUN_EXPENSIVE_TESTS="yes"
+	#export FETISH_GROUPS="portage wheel"
+	env PATH="${T}/mount-wrappers:${PATH}" \
+	emake -j1 -k check || die "make check failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS ChangeLog* NEWS README* THANKS TODO
+
+	insinto /etc
+	newins src/dircolors.hin DIR_COLORS || 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
+		           mktemp 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."
+	ewarn "You should also re-source your shell settings for LS_COLORS"
+	ewarn "  changes, such as: source /etc/profile"
+
+	# /bin/dircolors sometimes sticks around #224823
+	if [ -e "${ROOT}/usr/bin/dircolors" ] && [ -e "${ROOT}/bin/dircolors" ] ; then
+		if strings "${ROOT}/bin/dircolors" | grep -qs "GNU coreutils" ; then
+			einfo "Deleting orphaned GNU /bin/dircolors for you"
+			rm -f "${ROOT}/bin/dircolors"
+		fi
+	fi
+}