Include new arch(1) man page #507528. Add fix from upstream for cp behavior #508638. Skip test ls/stat-free-color #415487.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 201 insertions, 15 deletions

diff --git a/sys-apps/coreutils/ChangeLog b/sys-apps/coreutils/ChangeLog
index 81b51df3725c..18e2a8a9cbc1 100644
--- a/sys-apps/coreutils/ChangeLog
+++ b/sys-apps/coreutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/coreutils
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.388 2014/04/27 19:08:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.389 2014/04/27 19:09:46 vapier Exp $
+
+*coreutils-8.22-r1 (27 Apr 2014)
+
+  27 Apr 2014; Mike Frysinger <vapier@gentoo.org> +coreutils-8.22-r1.ebuild:
+  Include new arch(1) man page #507528. Add fix from upstream for cp behavior
+  #508638. Skip test ls/stat-free-color #415487.
 
   27 Apr 2014; Mike Frysinger <vapier@gentoo.org> coreutils-8.22.ebuild:
   Rebuild man page tarball to include arch(1) #507528 by dwfreed.
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index c68d89cf2bab..d52901eb623c 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -8,26 +8,28 @@ DIST coreutils-8.21-patches-1.0.tar.xz 6480 SHA256 3a10abca6e41e654837583b582a83
 DIST coreutils-8.21.tar.xz 5357988 SHA256 adaa44bdab3fa5eb352e80d8a31fdbf957b78653d0c2cd30d63e161444288e18 SHA512 cf0e5a393b486dd7fd46600dc2928bd2303250f3bce7b2f0de1bb3bf7b0cc3f6e29001b23fda5bbabe7686bf78917cfabe1f81abb602ab41cd406b45021fd229 WHIRLPOOL 4aa93529fc41f52841d82169fc5d8b10095462d24b46a97bff78c1abda865af5cb248cfbb67495c2618b338dd05e33fecf68a677c9ca268abf97eb5d0f1f05ef
 DIST coreutils-8.22-man-r1.tar.xz 42748 SHA256 eb9882286a6355674e607506318ccc9e361b6a985d64073b797fd56a5e0d256c SHA512 b0123e3c8cd037d006a2bb64e8047636329ac3fd3d685db8e52a19e83df87da0428896af9bdcd8f1208f7aad3665ec2a871bbbfa98cbe5293c697431a23d7b4c WHIRLPOOL 7e705060f5af2d28152531ad3b5ae8e6cca2dabdec7dc1a30bcf7b74951462bb58ee610d1e080abc812e1291fae904b3e931a35d3d2566fb7b85f6a37415e04b
 DIST coreutils-8.22-patches-1.0.tar.xz 6492 SHA256 4a2a32429607e0727d6ae114ee9e543c948d6c7710ef99920901e73784cee3f4 SHA512 daf1c2b85619aa9ff7bae02926be39478f439d5555fd4eb3038b62be6cceb7cc6357b4a77a347cb2b4ee08119aa2c3f7deb63d7179407af03f08459d8de38e0b WHIRLPOOL 845dfbf57269f50486862b6236e2a461bf7bccee383365982d4359895d6c9303e467d359aa9862134a965a96a062fa2c748ceb99390bbee09f9b843dbe5bd1ed
+DIST coreutils-8.22-patches-1.1.tar.xz 7840 SHA256 4c45cca7950bbd278db23318916e503bda2df3be3e11c81cd15b55874007ed16 SHA512 7555544041cf4acf5615df76d6e9f9df157dac66059757d587af8f264597e02e8a395fbb920d42623fd40dab9a5ef1dfae2719e300efe491b0eaa2baa3a91f11 WHIRLPOOL ebc9fa35f40473646c2b826cc1bc57e9012fa37f264eb7e6084c0d2cf04f46827c943f9aa80f779a3d99bc07eeb40ffc4ac09109a6324af9882e2b0630d84253
 DIST coreutils-8.22.tar.xz 5335124 SHA256 5b3e94998152c017e6c75d56b9b994188eb71bf46d4038a642cb9141f6ff1212 SHA512 2f14c2cab7001297309b4774bf3d610ecbaaec7d98d68e3792b24d2b52d319c4e30e55f803e56c48b9b9a1b76eb1c9636be5444fe1dc1dbcdd6150cfcb34847f WHIRLPOOL 1b8e3f1cf12f7975e8d80b9ddab132937b2fffaca8c85ac1fefddb5fe277a63a7aa9c6f0f93d8f5a93d5af378b3cf3573222db8e1da918152b9fb7eff1352238
 EBUILD coreutils-8.20.ebuild 5884 SHA256 b4513676d9e4479a80b891d5586a66200c845e1be0537f5a3e554cebc4efc780 SHA512 889a107a2ceb85877749ed911e33e5ab47b31a7d2a952493b1e2a44395e18758f8f7d4e59708b7b5168957a89f5da3a2887125ffb6a61a8fb0c1c6326ecb819e WHIRLPOOL 65b636b8fe4f3d35cb26698d6f9e468ceea538f197ed08b3b27ef049037291f7d786c2a161b7a53bbc0828f75fdd43d40bd3461bcd5f6a23786cd901d4a1c0b9
 EBUILD coreutils-8.21.ebuild 6007 SHA256 f8bd0ef05a48bb1832a537fd066de878e3aa9abf92640d8e904eefc7b7fe2676 SHA512 c1801a06fd9061f7fc8ef3c0e7880b2edca02bb8f0087c6890bb550a2c709ff555d0cd26e3819e524d010306d2d12f597b1d128eb85d8cd6cf98efee560b9f4d WHIRLPOOL d9137957b902a1ded882ad83ed26c71d7e5deb05df1dc4b93af2b22282554dbe9d1642db303c41bab5fb75c42f36fb36c6c193998f395f460087a07f44e9dea2
+EBUILD coreutils-8.22-r1.ebuild 5957 SHA256 325659f574ff1c53503d3d0a649334f49a9c6cc1e0370d9cd1ec5fe7f5eb75d8 SHA512 265fba3c8b2205c3ae0a27abb13598192322b940379f3f40bf377f6f843f9be9531097ff7fbaadd258d1a9abe1f276d9d5100520ddd88cba12989c0a95c6e791 WHIRLPOOL 5317ef27880534be049f496e03253f7f73ad0691ede24e79ce577f299fb431171a526832756a49e3155eabb3f83ac093b9f6e15e433dec2f7701c456b3aa8cbf
 EBUILD coreutils-8.22.ebuild 5954 SHA256 8112079942b2f1098118f3ca5d1764649933c82212009e4e959c537e69424606 SHA512 c089bec9a24c58ac3920a2ced3a72029386d15528176cc42a8b0295b0d17d695ceb2008a0ae043d259e04587a045bd640b475c77903dbe91bbda979638f1359a WHIRLPOOL 4aaa054cefed7b105812f5fcf07e6e33d6abb968df1e13b3d8ac97a06a6d979c9ff2bbcf08a6afbe87f2094229e2a895553f7ea7b0349017327f6879dda76961
-MISC ChangeLog 55102 SHA256 3316d0caca19ccf92598fe98a4a992392464286d5aae5109d3fa06cf56fcb68a SHA512 9bf5ab29d3881383cfc3114e397c8a5cbb04aa627e6007fe2eed361f76fd057bd9a79c7d017fe421ca55508c78a1a2898ab46220b85642e31c76b47e61cd8e25 WHIRLPOOL f913bf84084d37d42ac2f1fad93b3a9b3f75b8d1fc493ce191e8d443467a1f62d5897e6ff5ec08ce3bf7eb8b1fa2f82d3fafd0c373480cc5cd40a16477a1b670
+MISC ChangeLog 55341 SHA256 9935a596c3d2fce78d1ce42fff440f80e7c5a90ffa26384f87bd699595681136 SHA512 5855e45a8257ac449507ba4f44634690c290f01a82ee61027f849bf3c3741569a829bfe1e0f48ffaaadd5f0841d87cc6c6a0a1ca185f1880dfaea3e414ade300 WHIRLPOOL 9cdbe3b2b2d46c5dc8e4b86c5d8fbbd02582b107d4a5a86aabfc0ac2f72b873e0a87808a950dc0d7492d48afc43b4df45efc04f9032596198a1f61c6de1c6c86
 MISC metadata.xml 244 SHA256 dd89355bb7a4485592e15da6c3829bfbdd6c87d6d1e3782c69e3beb948f244d8 SHA512 02efd3c89a02921efb74129d5c82bed1bad0b2c9f338b0ef87feb831c888fb212b5e609ecf0a602e1b628dc341528910e2f6261f91c1670602d73aad8a54b0d9 WHIRLPOOL aa9bb37b68838172196163bc310b12d0e57be1a1d4d7a80fc25eb96d163c6249751a1871cdf35e66e0d3e50eb3c596c1916e7c3649ba1daf0a0926ab2646fa63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTXVWyAAoJEPGu1DbS6WIAUhYP/Rl/w7HBW8LB4zf/uGM5huIX
-m0GoDqGomxDTaprIMgP95ei+8GmT5Aszv4iv27azWy0O87Zw/77/1yPknEEcvmrm
-MYylqmQGijR94NC0FyHoT5nJivIudcTBBH53T3pQB0uzqTN54MYLceirzxsAmrJF
-ysUgaf5mvNjg2lY25jlfCXOQKkzjb7APDkAZ3JTomanwfaJAvsYz+cV6YKe2+5Ex
-sT4nM5A9lmZ7hpVUy9euIkSOaU/IO7fzAbES/Ky3HbbQ7X9qphNhOlVV1NzxAjE0
-wNZXn/lYXk3D3hORtb7+1S/2S724lXAg4Tuuu3WunyCZvtoAsGGgp8mumQcpdS/x
-BILwmticqlxqgYK2+VqQ751JDjfzlIoIxWBFGmD+T85XD9BKNXLbBL9ag8+sV1XY
-+eKIxSX4eilUZXD/y6AwEBfrKtljErFCDV15ZxQqJfRtxVFZsDJuIF93+eeUrA4E
-MlMqpi+VnrFcWBdJarb5O7EIMXf29TY3YGtT9Ote+xXZ4MKAwEvgnT/8NlEEmkZk
-VdfG4JZyw2Nctrcb23FYqod+UCahc9wHpi0yutEXTmPVXXxweaOUcHt/z8IBTwug
-ESV5ToPOHihh76L9HceY1vG2Zkq5lgIpEskrRKLnmi/V2Uux+ehCsSwaZrn9kDJ8
-HIpEmi9+4qiU32KRKKYo
-=R3ZS
+iQIcBAEBCAAGBQJTXVX/AAoJEPGu1DbS6WIAA1wP/i9touhsNHainAW7WwJBMr02
+SUGXQauETAwnYB76jDUggEqNDxxWZyTUsCHWXXEyl7SsXSbEZi8j9yoTyiG+4X8Y
+2F/SSXWLwkH9POGHB/rGYo4gJmKT50D74gvD6MiA+r+anu/1jmA4Fizx4J39DQwq
+yTTAVqvwyj0e+0Ik5wi9QqrOqK9Iwd8b6eX/urwHdqHpufcsCdySWydzWs9S5RTB
+Co0Yrsuy2n0hB22LA2+XR2MHIRlPxBXhHglEWDh85dFTzvZYy3ptFuJrNVXAXoKJ
+HZbeNKYSXZSJvcY8SeW+aXiSX79EmwucMxbipIlZFQjgzLeX/nXJDnwV4P1ECzHc
+c0DDQQdL2RxpKlVllF9pJGweqsZjggKkwK3ry+Pgv/hVjTlIB7mc1T2MjH1xxviB
+aAJu6WWY+7ZG48TsuXLqgeP7Tb93zyzdRncnzvJcNrf4VJWhkLN3jgbbBkWrHbaw
+RYaTjVNwSTYhSKaHQ3zHLaggjOgRn3gw90dbQUtoCS1bmvuuHFB5lAHfdqL/urzQ
+obft8+JePiVZL5DpojcirMSFdxNPvmr6r93DqdfqIqSxEVTnf0sq2ovY3O8asLez
+82T2OT0gawLaena4Iw4xNS0TBKFKx/MElkd/fd7C/wmQnrOjtcwUzH8+ctDep/gU
+XioQTCdbU8zuc5hmTrDp
+=rcZH
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/coreutils/coreutils-8.22-r1.ebuild b/sys-apps/coreutils/coreutils-8.22-r1.ebuild
new file mode 100644
index 000000000000..f03e0703d66f
--- /dev/null
+++ b/sys-apps/coreutils/coreutils-8.22-r1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-8.22-r1.ebuild,v 1.1 2014/04/27 19:09:46 vapier Exp $
+
+EAPI="3"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+PATCH_VER="1.1"
+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.xz
+	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz
+	http://dev.gentoo.org/~vapier/dist/${P}-patches-${PATCH_VER}.tar.xz
+	mirror://gentoo/${P}-man-r1.tar.xz
+	http://dev.gentoo.org/~vapier/dist/${P}-man-r1.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~arm-linux ~x86-linux"
+IUSE="acl caps gmp nls selinux static userland_BSD vanilla xattr"
+
+LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
+	caps? ( sys-libs/libcap )
+	gmp? ( dev-libs/gmp[static-libs] )
+	xattr? ( !userland_BSD? ( sys-apps/attr[static-libs] ) )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )
+	selinux? ( sys-libs/libselinux )
+	nls? ( virtual/libintl )
+	!app-misc/realpath
+	!<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"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	app-arch/xz-utils"
+
+src_prepare() {
+	if ! use vanilla ; then
+		use_if_iuse unicode || rm -f "${WORKDIR}"/patch/000_all_coreutils-i18n.patch
+		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
+	touch ${@/%x/1}
+
+	# Avoid perl dep for compiled in dircolors default #348642
+	if ! has_version dev-lang/perl ; then
+		touch src/dircolors.h
+		touch ${@/%x/1}
+	fi
+}
+
+src_configure() {
+	local myconf=''
+	if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
+		export fu_cv_sys_stat_statfs2_bsize=yes #311569
+		export gl_cv_func_realpath_works=yes #416629
+	fi
+
+	export gl_cv_func_mknod_works=yes #409919
+	use static && append-ldflags -static && sed -i '/elf_sys=yes/s:yes:no:' configure #321821
+	use selinux || export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no #301782
+	use userland_BSD && myconf="${myconf} -program-prefix=g --program-transform-name=s/stat/nustat/"
+	# kill/uptime - procps
+	# groups/su   - shadow
+	# hostname    - net-tools
+	econf \
+		--with-packager="Gentoo" \
+		--with-packager-version="${PVR} (p${PATCH_VER:-0})" \
+		--with-packager-bug-reports="http://bugs.gentoo.org/" \
+		--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) \
+		${myconf}
+}
+
+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}"
+				#!${EPREFIX}/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 "${ED}"/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 "${ED}"/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 "${EROOT}/usr/bin/dircolors" ] && [ -e "${EROOT}/bin/dircolors" ] ; then
+		if strings "${EROOT}/bin/dircolors" | grep -qs "GNU coreutils" ; then
+			einfo "Deleting orphaned GNU /bin/dircolors for you"
+			rm -f "${EROOT}/bin/dircolors"
+		fi
+	fi
+
+	# Help out users using experimental filesystems
+	if grep -qs btrfs "${EROOT}"/etc/fstab /proc/mounts ; then
+		case $(uname -r) in
+		2.6.[12][0-9]|2.6.3[0-7]*)
+			ewarn "You are running a system with a buggy btrfs driver."
+			ewarn "Please upgrade your kernel to avoid silent corruption."
+			ewarn "See: https://bugs.gentoo.org/353907"
+			;;
+		esac
+	fi
+}