[gentoo-commits] repo/proj/prefix:master commit in: sys-apps/coreutils/files/, sys-apps/coreutils/

[Fabian Groffen]

commit:     a17cdcaf7e1ea7eabbdb0331ddee6e6c3a103850
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 12 13:05:58 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Nov 12 13:05:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a17cdcaf

sys-apps/coreutils: sync, pulls in 8.28 which fixes Darwin17

Package-Manager: Portage-2.3.13-prefix, Repoman-2.3.4

 sys-apps/coreutils/Manifest                        |  12 +-
 sys-apps/coreutils/coreutils-8.20.ebuild           | 190 ---------------------
 sys-apps/coreutils/coreutils-8.22-r1.ebuild        | 181 --------------------
 sys-apps/coreutils/coreutils-8.22.ebuild           | 189 --------------------
 ...-8.23-r00.1.ebuild => coreutils-8.28-r1.ebuild} | 157 +++++++++++------
 sys-apps/coreutils/files/coreutils-7.2-mint.patch  | 152 -----------------
 .../coreutils/files/coreutils-7.4-hppa-hpux.patch  |  11 --
 .../files/coreutils-7.5-interix-setgroups.patch    |  15 --
 .../coreutils/files/coreutils-8.23-non-elf.patch   |  37 ----
 .../files/coreutils-8.5-interix-double.patch       |  69 --------
 .../files/coreutils-8.5-interix-warn-mount.patch   |  15 --
 .../coreutils/files/coreutils-8.8-hppa-hpux.patch  |  11 --
 .../coreutils/files/coreutils-8.8-interix.patch    |  18 --
 13 files changed, 106 insertions(+), 951 deletions(-)

diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index de71b647e9..5d14b1a062 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -1,15 +1,9 @@
-DIST coreutils-8.20-patches-1.1.tar.xz 19504 SHA256 0a1a3cc578e8872ebc93113edd76d1f1d88fb4d6596a047cfbb6c5fd4e82c22d SHA512 258116ff52d1d28acbedd2383c8d0f488c272b297c4f146231ea45fb76902bb56c9fad2d74d50c22371e67a4178dcff7b65950fcc034f56fc02c3c2ff290224f WHIRLPOOL ae4436a6ae655affbc02ee2d3d6a87345dc7b63b67aaecf01e034d2e40237c6e76b00a909d852f6ea96e348ef43e8e3f6f4c5bdb01aaf6d30a1b51036cbfe31b
-DIST coreutils-8.20.tar.xz 5273788 SHA256 dbcb798764827a0f74be738662ecb516705cf520330cd3d7b2640fdffa499eb2 SHA512 adbeab5af780ae70d2a98a81e96ad2cdfbcbc20153372b0085f6ac75ae9fadff82bd09b460400820057692b4145d7f2d276630b76b0ed509303587972ed175cd WHIRLPOOL 3cf911cf785c6e6acab4f37bc75805687f91fe74d5727782903d242669ee6b7ad444b18395d6808b1f2569703cca1992983d3bfef41f65ea461f6d0aa25908e2
-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
-DIST coreutils-8.23-man.tar.xz 43060 SHA256 d1b16e74b3dba4f313aeebae2c69da205f7d2e6e1c2aa8d39026c860d314ecca SHA512 db5085c783256e30b9878bdce5cf16063aaa51d800d5b40537d5cdea372d095a391e9986e8680c6d94841bc995ab43ac8bc2d23427e6e96263d24b0b5ccc7d12 WHIRLPOOL ef0cae7c1b752c0f81e6f23b0a792804518a5257740fedf7dd70577ec503a64716156a898ed50045987954a6234ba23c9483772830683bb7e4bd0c8a2ec2c142
-DIST coreutils-8.23-patches-1.1.tar.xz 6480 SHA256 daf5d61b36db61d629bf14bf8f04e878f1205c9ae2af5daf37dca3aad5a6fde4 SHA512 8da5f8e9fc47baa060030076c4a2de90013a0d1faad45fe99545e93d50bc079720281f6db5774590fe842c8c56bd8ae97e1d9bf862fae1896760b5e5b686e7a8 WHIRLPOOL 2a8082975e3627454569e57aecb3d1ac6bdef89e16f4f64a88a4ffcbf2b341fe56874b128485ae540270f7a060f9e0f4bd3eecf68e215fb6a5a1c5ac434f7403
-DIST coreutils-8.23.tar.xz 5375612 SHA256 ec43ca5bcfc62242accb46b7f121f6b684ee21ecd7d075059bf650ff9e37b82d SHA512 a5f4b82ce208cb439d5dbe6f5cf4b19fecff581da210a51c4e3fdd5ffab114d171456d041e20a6996b59185947ac6655096e4b5ca252186e282ae0ae08b7534c WHIRLPOOL 4bd4cd28d6de96218e791c5ed15766e34dfeeb3aeade10e211e3a0e9ffa695e5a716872a915d78b356b3e3635e1e22274d92560301aadaf46a58242dc235d733
 DIST coreutils-8.24-man.tar.xz 42920 SHA256 cf0333b5f134a331e0b46e2ddf90666f8bdc3281c1ca2c7ccbb75b437589ce37 SHA512 9dfe614402bc35c43301ebf97d2d36ac5db1433f48171bda15f2ba76bd9944742665b30a764df0cf773ebcad1845aae57c8e36a1cd3848c1e82a7c996d6cc78a WHIRLPOOL d702a372031fe52262204c00bee641084c099c45150d82abd5915535ab3bbe1efb63c4f00173bb88725ba49126a6ecf368d14b12843b570c08165b757b78710b
 DIST coreutils-8.24-patches-1.1.tar.xz 6688 SHA256 79cb0dc5b58cb97e17b11b5e821ed88fae88f728d9fd07986bbb397824e49c6f SHA512 cf340ccb918e307be8bbfd19a299bcfe5b295a26f59a8eeb8657f5dda1361100a350e996b31097948e63890987a2f83d05d2e7175c6304f4a4812b9974679c2c WHIRLPOOL 3b4d4676b119e4f22a01c8450be13d6eb40720d3c57aac5631454df24814943e6e6024fbdcd27a2b262d42c1446d9c04cbdc163371ff20a4b28d9cd9a77c5c9c
 DIST coreutils-8.24.tar.xz 5649896 SHA256 a2d75286a4b9ef3a13039c2da3868a61be4ee9f17d8ae380a35a97e506972170 SHA512 b42bb233340353647bb9a1c3d9122c1a5379cf3602ba9197c3c935fc899897e7d4685148dfaf93eccc096bee0a9b03416d79dc9bb81d5d2dea6e04ed134a3d1b WHIRLPOOL 68598e0c93375522714b9bc0dd092386a9466725b2b4b5715e2926c5087e1ce887d5e5b8e0b872347a053edcb39ba1f8c6949ee659a06ed554703a0ba07064e2
 DIST coreutils-8.25-man.tar.xz 43420 SHA256 2ee31c3a6d2276f49c5515375d4a0c1047580da6ac10536898e0f0de81707f29 SHA512 412afc9909d30618ab9daba51c965c0fd22420c32f6c5a7e32ba32d957a92e8a65b977bccaba4b76c55d435a57065dc6103ff11c5fa31d02f117c13a2b09f75e WHIRLPOOL f2a9458d71cfbf6227ece5b688adb34653dacda0dfbcfd5332a36e33cda58b081d9b37c4ec910c92feba485e8e182f52327f4860f1ff5e0b0b7ae2f9b82045ee
 DIST coreutils-8.25-patches-1.1.tar.xz 7196 SHA256 68e116eb70a69e94458197cde81165c9902bec0c6661be31f6fffb84ba8d809c SHA512 19326ab7dd8d4515f7239133772f715aac4e722a1e28f4b0f19d8d629abe54a2309fa7c469797dc0f9e88991906883a891622c791ef940b9a5af6608d2e9110e WHIRLPOOL e7931e16e267b817a86f11b9e01d82dfac8144dbabd91d5cea036c819303895bd852809f374a76b6e4e474b559505d6fc907ddcb113ca1915b76d880e291bc76
 DIST coreutils-8.25.tar.xz 5725008 SHA256 31e67c057a5b32a582f26408c789e11c2e8d676593324849dcf5779296cdce87 SHA512 571f95d44987d373081ed4c6ac82155ad3dcd95621d7b1a7163597e80ecbbafef2cd74b2ef594587a443a1a4355083879f898a286bb0230c48112d43d076ccd6 WHIRLPOOL e871e177ffaf96bfdd9e668eb9a09df9fd952ff095796cffd1ac2b8b3943c9c2ae79c31890fa02b5ed2609b6c6c84b64d2292454b043d62260a9560d2f7b9457
+DIST coreutils-8.28-man.tar.xz 43832 SHA256 d72c3fa79ae328a4fd1107102e8946755aa2e908044e1efcf1e71ef206dca042 SHA512 363cf595e0f6fc69eb6a9d1ca258a5f012404cee99887494ab6e40fe2c6de5e49e7cad953aecb394c5612043efe6b407e657811d8251b10e159c97b849dd8b3e WHIRLPOOL 7b10dbde06caf00d4b789cdb60a7d0c73aec65a90e889698daeccd04eefd8df08142261ea5fde8d3d455f35b2eddf07182bf92e2522e63e8ece412379e0cb0d1
+DIST coreutils-8.28-patches-1.1.tar.xz 7336 SHA256 bdd7ed0ef973bc1095df329225659a928ed061695651e2b54de79ac15690f517 SHA512 af47aaa614550e5cd82b2386fafd9f90beb0564b8bbedfe92238906e7c6f040fb7468c1929f0951d4f98038b6e1df7da2408204be78219e6a041658507385957 WHIRLPOOL 4a90ffa0a35b81d3d20c29128b0d39e08136d499201ac875781d9e851142d36c111031b333b6bfb81db692e75e7b3cc9673c4339d8d183d0d8df2371444dca4e
+DIST coreutils-8.28.tar.xz 5252336 SHA256 1117b1a16039ddd84d51a9923948307cfa28c2cea03d1a2438742253df0a0c65 SHA512 1e592d0dd03b9227bf92af9a82bed6dc3bcbee46e984c7fb09833dea0962e86b309aa34d5e43823b73d4522c066bfa5cdc8ec694aa190910fb246ff32ceb63a1 WHIRLPOOL 58bdd9681d07794da70dc012d03de2f791bc8e40a16de85302cbb5ea247f6d81f0a92c3b90d655b9947057c5e5eb99b9347152d41150c1a613dd1f891942a73f

diff --git a/sys-apps/coreutils/coreutils-8.20.ebuild b/sys-apps/coreutils/coreutils-8.20.ebuild
deleted file mode 100644
index 8f87a08bc6..0000000000
--- a/sys-apps/coreutils/coreutils-8.20.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-8.20.ebuild,v 1.12 2013/01/01 18:55:02 armin76 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-alpha/coreutils/${P}.tar.xz
-	mirror://gnu/${PN}/${P}.tar.xz
-	mirror://gentoo/${P}.tar.xz
-	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz
-	http://dev.gentoo.org/~ryao/dist/${P}-patches-${PATCH_VER}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-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? ( >=sys-devel/gettext-0.15 )
-	!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
-
-	epatch "${FILESDIR}"/${PN}-7.2-mint.patch
-
-	# 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
-	if [[ ${CHOST} == *-mint* ]]; then
-		myconf="${myconf} --enable-install-program=arch,hostname,kill,uptime"
-		myconf="${myconf} --enable-no-install-program=groups,su"
-	else
-		myconf="${myconf} --enable-install-program=arch"
-		myconf="${myconf} --enable-no-install-program=groups,hostname,kill,su,uptime"
-	fi
-
-	econf \
-		--with-packager="Gentoo" \
-		--with-packager-version="${PVR} (p${PATCH_VER:-0})" \
-		--with-packager-bug-reports="http://bugs.gentoo.org/" \
-		${myconf} \
-		--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" || ${EPREFIX%/} != "" ]] ; 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"
-
-		[[ ${CHOST} == *-mint* ]] && fhs="${fhs} hostname"
-
-		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
-}

diff --git a/sys-apps/coreutils/coreutils-8.22-r1.ebuild b/sys-apps/coreutils/coreutils-8.22-r1.ebuild
deleted file mode 100644
index 950937359f..0000000000
--- a/sys-apps/coreutils/coreutils-8.22-r1.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2017 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.3 2015/02/28 20:15:19 tgall 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="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-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
-
-	epatch "${FILESDIR}"/${PN}-8.22-mint.patch
-
-	# 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
-	if [[ ${CHOST} == *-mint* ]]; then
-		myconf="${myconf} --enable-install-program=arch,hostname,kill,uptime"
-		myconf="${myconf} --enable-no-install-program=groups,su"
-	else
-		myconf="${myconf} --enable-install-program=arch"
-		myconf="${myconf} --enable-no-install-program=groups,hostname,kill,su,uptime"
-	fi
-
-	econf \
-		--with-packager="Gentoo" \
-		--with-packager-version="${PVR} (p${PATCH_VER:-0})" \
-		--with-packager-bug-reports="http://bugs.gentoo.org/" \
-		--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"
-
-		[[ ${CHOST} == *-mint* ]] && fhs="${fhs} hostname"
-
-		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"
-
-	# 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
-}

diff --git a/sys-apps/coreutils/coreutils-8.22.ebuild b/sys-apps/coreutils/coreutils-8.22.ebuild
deleted file mode 100644
index 2ba4861314..0000000000
--- a/sys-apps/coreutils/coreutils-8.22.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-8.22.ebuild,v 1.4 2014/04/27 19:08:29 vapier Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-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="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="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-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
-
-	epatch "${FILESDIR}"/${PN}-8.22-mint.patch
-
-	# 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
-	if [[ ${CHOST} == *-mint* ]]; then
-		myconf="${myconf} --enable-install-program=arch,hostname,kill,uptime"
-		myconf="${myconf} --enable-no-install-program=groups,su"
-	else
-		myconf="${myconf} --enable-install-program=arch"
-		myconf="${myconf} --enable-no-install-program=groups,hostname,kill,su,uptime"
-	fi
-
-	econf \
-		--with-packager="Gentoo" \
-		--with-packager-version="${PVR} (p${PATCH_VER:-0})" \
-		--with-packager-bug-reports="http://bugs.gentoo.org/" \
-		--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"
-
-		[[ ${CHOST} == *-mint* ]] && fhs="${fhs} hostname"
-
-		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
-}

diff --git a/sys-apps/coreutils/coreutils-8.23-r00.1.ebuild b/sys-apps/coreutils/coreutils-8.28-r1.ebuild
similarity index 52%
rename from sys-apps/coreutils/coreutils-8.23-r00.1.ebuild
rename to sys-apps/coreutils/coreutils-8.28-r1.ebuild
index 36c9c17113..fc63a2986a 100644
--- a/sys-apps/coreutils/coreutils-8.23-r00.1.ebuild
+++ b/sys-apps/coreutils/coreutils-8.28-r1.ebuild
@@ -1,61 +1,100 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-8.23.ebuild,v 1.11 2015/07/30 12:28:54 ago Exp $
+# $Id$
 
 # To generate the man pages, unpack the upstream tarball and run:
-# ./configure --enable-install-program=arch,coreutils
+# ./configure --enable-install-program=arch,coreutils,hostname,kill
 # make
 # cd ..
 # tar cf - coreutils-*/man/*.[0-9] | xz > coreutils-<ver>-man.tar.xz
 
-EAPI="4"
+EAPI="6"
 
-inherit eutils flag-o-matic toolchain-funcs
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit eutils flag-o-matic python-any-r1 toolchain-funcs multilib
 
 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/"
+DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
+HOMEPAGE="https://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
+	https://dev.gentoo.org/~whissi/dist/${PN}/${P}-patches-${PATCH_VER}.tar.xz
 	mirror://gentoo/${P}-man.tar.xz
-	http://dev.gentoo.org/~vapier/dist/${P}-man.tar.xz"
+	https://dev.gentoo.org/~polynomial-c/dist/${P}-man.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="acl caps gmp multicall nls selinux static userland_BSD vanilla xattr"
+KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="acl caps elibc_glibc gmp hostname kill multicall nls selinux static +stdbuf test uptime 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] ) )"
+	gmp? ( dev-libs/gmp:=[static-libs] )
+	xattr? ( !elibc_glibc? ( sys-apps/attr[static-libs] ) )"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )
 	selinux? ( sys-libs/libselinux )
-	nls? ( virtual/libintl )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	app-arch/xz-utils
+	test? (
+		dev-lang/perl
+		dev-perl/Expect
+		!userland_BSD? (
+			dev-util/strace
+		)
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]')
+	)"
+RDEPEND+="
+	hostname? ( !sys-apps/net-tools[hostname] )
+	kill? (
+		!sys-apps/util-linux[kill]
+		!sys-process/procps[kill]
+	)
 	!app-misc/realpath
 	!<sys-apps/util-linux-2.13
+	!<sys-apps/sandbox-2.10-r4
 	!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"
+	!<net-fs/netatalk-2.0.3-r4"
+
+pkg_setup() {
+	if use test ; then
+		python-any-r1_pkg_setup
+	fi
+}
 
 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
+		#rm "${WORKDIR}"/patch/001_all_coreutils-gen-progress-bar.patch || die
+		eapply "${WORKDIR}"/patch/*.patch
 	fi
 
+	eapply_user
+
 	epatch "${FILESDIR}"/${PN}-8.22-mint.patch
-	epatch "${FILESDIR}"/${PN}-8.23-non-elf.patch
+
+	# fixup libstdbuf non-libtool stuff
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i \
+			-e "/src_libstdbuf_so_LDFLAGS = -shared/s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/libexec/coreutils/libstdbuf.dylib:" \
+			Makefile.in \
+			|| die
+	elif use elibc_Cygwin ; then
+		epatch "${FILESDIR}"/${P}-cygwin-3.patch
+		sed -i -e 's|\(libstdbuf\.so\)$(EXEEXT)|\1|g' Makefile.in || die
+	fi
+	sed -i \
+		-e "s/libstdbuf\\.so/libstdbuf$(get_libname)/" \
+		src/stdbuf.c \
+		Makefile.in \
+		configure \
+		|| die
 
 	# Since we've patched many .c files, the make process will try to
 	# re-build the manpages by running `./bin --help`.  When doing a
@@ -69,13 +108,26 @@ src_prepare() {
 
 	# Avoid perl dep for compiled in dircolors default #348642
 	if ! has_version dev-lang/perl ; then
-		touch src/dircolors.h
+		touch src/{dircolors,fs-is-local,fs}.h # more?
 		touch ${@/%x/1}
 	fi
 }
 
 src_configure() {
-	local myconf=''
+	local myconf=(
+		--with-packager="Gentoo"
+		--with-packager-version="${PVR} (p${PATCH_VER:-0})"
+		--with-packager-bug-reports="https://bugs.gentoo.org/"
+		--enable-install-program="arch,$(usev hostname),$(usev kill),$(usev stdbuf),$(usev uptime)"
+		--enable-no-install-program="groups,$(usev !hostname),$(usev !kill),$(usev !stdbuf),su,$(usev !uptime)"
+		--enable-largefile
+		$(use caps || echo --disable-libcap)
+		$(use_enable nls)
+		$(use_enable acl)
+		$(use_enable multicall single-binary)
+		$(use_enable xattr)
+		$(use_with gmp)
+	)
 	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
@@ -84,33 +136,23 @@ src_configure() {
 	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/"
+	use userland_BSD && myconf+=( -program-prefix=g --program-transform-name=s/stat/nustat/ )
 	# kill/uptime - procps
 	# groups/su   - shadow
 	# hostname    - net-tools
-	if [[ ${CHOST} == *-mint* ]]; then
-		myconf="${myconf} --enable-install-program=arch,hostname,kill,uptime"
-		myconf="${myconf} --enable-no-install-program=groups,su,stdbuf"
-	else
-		myconf="${myconf} --enable-install-program=arch"
-		myconf="${myconf} --enable-no-install-program=groups,hostname,kill,su,uptime"
-	fi
-
-	econf \
-		--with-packager="Gentoo" \
-		--with-packager-version="${PVR} (p${PATCH_VER:-0})" \
-		--with-packager-bug-reports="http://bugs.gentoo.org/" \
-		--enable-largefile \
-		$(use caps || echo --disable-libcap) \
-		$(use_enable nls) \
-		$(use_enable acl) \
-		$(use_enable multicall single-binary) \
-		$(use_enable xattr) \
-		$(use_with gmp) \
-		${myconf}
+	econf ${myconf[@]}
 }
 
 src_test() {
+	# Known to fail with FEATURES=usersandbox (bug #439574):
+	#   -  tests/du/long-from-unreadable.sh} (bug #413621)
+	#   -  tests/rm/deep-2.sh (bug #413621)
+	#   -  tests/dd/no-allocate.sh (bug #629660)
+	if has usersandbox $FEATURES ; then
+		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
+			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
+	fi
+
 	# Non-root tests will fail if the full path isn't
 	# accessible to non-root users
 	chmod -R go-w "${WORKDIR}"
@@ -147,29 +189,36 @@ src_install() {
 	newins src/dircolors.hin DIR_COLORS
 
 	if [[ ${USERLAND} == "GNU" ]] ; then
-		cd "${ED}"/usr/bin
+		cd "${ED%/}"/usr/bin || die
 		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"
-
-		[[ ${CHOST} == *-mint* ]] && fhs="${fhs} hostname"
-
+		           mkdir mknod mv pwd rm rmdir stty sync true uname
+		           $(usev hostname)"
 		mv ${fhs} ../../bin/ || die "could not move fhs bins"
+		if use kill; then
+			mv kill ../../bin/ || die
+		fi
 		# 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
+		# as long as /bin resolves to a different directory than /usr/bin
 		local x
+		[[ ${EROOT}bin/. -ef ${EROOT}usr/bin/. ]] ||
 		for x in ${com} uname ; do
-			dosym /bin/${x} /usr/bin/${x}
+			dosym ../../bin/${x} /usr/bin/${x}
 		done
 	else
 		# For now, drop the man pages, collides with the ones of the system.
-		rm -rf "${ED}"/usr/share/man
+		rm -rf "${ED%/}"/usr/share/man
 	fi
 
+	if use elibc_Cygwin ; then
+		! use kill || mv "${ED}"/bin/{,g}kill || die
+		mv "${ED}"/usr/libexec/${PN}/libstdbuf$(get_libname){.exe,} || die
+	fi
 }
 
 pkg_postinst() {
@@ -178,7 +227,7 @@ pkg_postinst() {
 	ewarn "  changes, such as: source /etc/profile"
 
 	# Help out users using experimental filesystems
-	if grep -qs btrfs "${EROOT}"/etc/fstab /proc/mounts ; then
+	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."

diff --git a/sys-apps/coreutils/files/coreutils-7.2-mint.patch b/sys-apps/coreutils/files/coreutils-7.2-mint.patch
deleted file mode 100644
index d0defcefcd..0000000000
--- a/sys-apps/coreutils/files/coreutils-7.2-mint.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=260551
-http://bugs.gentoo.org/show_bug.cgi?id=264763
-https://savannah.gnu.org/patch/index.php?6758
-
-diff -u lib/mountlist.c lib/mountlist.c
---- lib/mountlist.c	2009-02-07 09:58:37.000000000 +0000
-+++ lib/mountlist.c	2009-04-08 04:04:19.000000000 +0000
-@@ -336,6 +336,7 @@
-    If NEED_FS_TYPE is true, ensure that the file system type fields in
-    the returned list are valid.  Otherwise, they might not be.  */
- 
-+#ifndef __MINT__
- struct mount_entry *
- read_file_system_list (bool need_fs_type)
- {
-@@ -881,3 +882,82 @@
-     return NULL;
-   }
- }
-+
-+#else /* __MINT__ */
-+
-+#include <mintbind.h>
-+#include <osbind.h>
-+#include <sys/statfs.h>
-+#include <mint/dcntl.h>
-+
-+/* get the list of available drives */
-+static long
-+get_drives(void)
-+{
-+	long drive_bits;
-+	
-+	drive_bits = Dsetdrv(Dgetdrv());
-+	drive_bits &= ~(1|2); /* exclude all floppies */
-+		
-+	return drive_bits;
-+}
-+
-+struct mount_entry *
-+read_file_system_list (bool need_fs_type)
-+{
-+	struct mount_entry *mount_list;
-+	struct mount_entry *me;
-+	struct mount_entry *mtail;
-+	struct statfs fsp;
-+	struct fs_info info;
-+	long drive_bits;
-+	int i, j;
-+	char lw[] = "a:/", str[25];
-+	
-+	/* Start the list off with a dummy entry. */
-+	me = xmalloc (sizeof (*me));
-+	me->me_next = NULL;
-+	mount_list = mtail = me;
-+	
-+	drive_bits = get_drives();
-+	for (i = 0; i < 32; i++)
-+	{
-+		if (drive_bits & (1L << i))
-+		{
-+			if (i < 26)
-+				lw[0] = 'a' + i;
-+			else
-+				lw[0] = '1' + i - 26;
-+			
-+			if(statfs(lw, &fsp) == 0)
-+			{
-+				char name[32];
-+
-+				me = xmalloc (sizeof (*me));
-+				
-+				me->me_devname  = xstrdup(lw);
-+				me->me_mountdir = xstrdup("u:/");
-+				
-+				if (lw[0] < 'a')				/* 1: .. 6: */
-+					me->me_dev = lw[0] - '1' + 27;
-+				else
-+					me->me_dev = lw[0] - 'a';
-+				
-+				get_fsname(lw, NULL, name);
-+				me->me_type = xstrdup(name);
-+				/* Add to the linked list. */
-+				me->me_next = NULL;
-+				mtail->me_next = me;
-+				mtail = me;
-+			}
-+		}
-+	}
-+	
-+	/* Free the dummy head. */
-+	me = mount_list;
-+	mount_list = mount_list->me_next;
-+	free(me);
-+	return mount_list;
-+}
-+
-+#endif /* __MINT__ */
-diff -u src/df.c src/df.c
---- src/df.c	2009-02-14 10:18:27.000000000 +0000
-+++ src/df.c	2009-04-08 04:04:19.000000000 +0000
-@@ -337,7 +337,12 @@
-      It would be better to report on the unmounted file system,
-      but statfs doesn't do that on most systems.  */
-   if (!stat_file)
-+#ifndef __MINT__
-     stat_file = mount_point ? mount_point : disk;
-+#else
-+    /* MiNT: mount_point is always u:/, so use disk */
-+    stat_file = disk;
-+#endif
- 
-   if (force_fsu)
-     fsu = *force_fsu;
-diff -u src/uptime.c src/uptime.c
---- src/uptime.c	2009-01-21 13:33:41.000000000 +0000
-+++ src/uptime.c	2009-04-08 04:04:19.000000000 +0000
-@@ -17,6 +17,9 @@
- /* Created by hacking who.c by Kaveh Ghazi ghazi@××××××××××××.edu.  */
- 
- #include <config.h>
-+#ifdef __MINT__
-+#define HAVE_PROC_UPTIME 1
-+#endif
- #include <getopt.h>
- #include <stdio.h>
- 
-@@ -62,7 +65,11 @@
- #ifdef HAVE_PROC_UPTIME
-   FILE *fp;
- 
-+#ifdef __MINT__
-+  fp = fopen ("/kern/uptime", "r");
-+#else
-   fp = fopen ("/proc/uptime", "r");
-+#endif
-   if (fp != NULL)
-     {
-       char buf[BUFSIZ];
---- src/timeout.c	2009-04-10 01:37:34.000000000 +0000
-+++ src/timeout.c	2009-04-10 01:38:20.000000000 +0000
-@@ -202,6 +202,10 @@
-   return true;
- }
- 
-+#ifdef __MINT__
-+#define SA_RESTART 0
-+#endif
-+
- static void
- install_signal_handlers (void)
- {

diff --git a/sys-apps/coreutils/files/coreutils-7.4-hppa-hpux.patch b/sys-apps/coreutils/files/coreutils-7.4-hppa-hpux.patch
deleted file mode 100644
index e7ac52058d..0000000000
--- a/sys-apps/coreutils/files/coreutils-7.4-hppa-hpux.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/striconv.c.orig	2009-06-17 16:09:08.000000000 +0200
-+++ lib/striconv.c	2009-06-17 16:09:48.000000000 +0200
-@@ -53,7 +53,7 @@
- 
-   /* Avoid glibc-2.1 bug and Solaris 2.7-2.9 bug.  */
- # if defined _LIBICONV_VERSION \
--     || !((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) || defined __sun)
-+     || !((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) || defined __sun || (defined __hppa && defined __hpux))
-   /* Set to the initial state.  */
-   iconv (cd, NULL, NULL, NULL, NULL);
- # endif

diff --git a/sys-apps/coreutils/files/coreutils-7.5-interix-setgroups.patch b/sys-apps/coreutils/files/coreutils-7.5-interix-setgroups.patch
deleted file mode 100644
index 1e224682b5..0000000000
--- a/sys-apps/coreutils/files/coreutils-7.5-interix-setgroups.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ru -x '*.Po' -x '*.Plo' coreutils-7.5.orig/src/chroot.c coreutils-7.5/src/chroot.c
---- coreutils-7.5.orig/src/chroot.c	2009-08-24 16:15:21 +0200
-+++ coreutils-7.5/src/chroot.c	2009-08-24 16:17:18 +0200
-@@ -103,7 +103,11 @@
- 
-   if (ret == 0)
-     {
-+	  #ifndef __INTERIX
-       ret = setgroups (n_gids, gids);
-+	  #else
-+	  ret = -1;
-+	  #endif
-       if (ret)
-         error (0, errno, _("failed to set additional groups"));
-     }

diff --git a/sys-apps/coreutils/files/coreutils-8.23-non-elf.patch b/sys-apps/coreutils/files/coreutils-8.23-non-elf.patch
deleted file mode 100644
index fb5ee3e222..0000000000
--- a/sys-apps/coreutils/files/coreutils-8.23-non-elf.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 9ab1ca7f8b56d79306a6c2c2b1c3fe45253b2b31 Mon Sep 17 00:00:00 2001
-From: Michael Haubenwallner <michael.haubenwallner@××××××××××××.com>
-Date: Wed, 11 Feb 2015 10:38:58 +0100
-Subject: [PATCH] stdbuf: build for ELF systems only (sr#108676)
-
-* configure.ac: Avoid false positive when checking for ELF system.
----
- configure.ac | 2 ++
- 1 file changed, 2 insertions(+)
-
-#diff --git a/configure.ac b/configure.ac
-#index 3918f43..b88e6c0 100644
-#--- a/configure.ac
-#+++ b/configure.ac
-@@ -472,6 +472,8 @@ AC_COMPILE_IFELSE(
-     {
-       #if __ELF__
-         stdbuf = 1;
-+      #else
-+      # error not an ELF system
-       #endif
-     }]],[[
-     return !(stdbuf == 1);]])
--- 
-2.0.5
-
---- a/configure
-+++ b/configure
-@@ -62600,6 +62600,8 @@
-     {
-       #if __ELF__
-         stdbuf = 1;
-+      #else
-+      # error not ELF
-       #endif
-     }
- int

diff --git a/sys-apps/coreutils/files/coreutils-8.5-interix-double.patch b/sys-apps/coreutils/files/coreutils-8.5-interix-double.patch
deleted file mode 100644
index 4507ddfedc..0000000000
--- a/sys-apps/coreutils/files/coreutils-8.5-interix-double.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Binary files coreutils-8.5.orig/src/seq and coreutils-8.5/src/seq differ
-diff -ru coreutils-8.5.orig/src/seq.c coreutils-8.5/src/seq.c
---- coreutils-8.5.orig/src/seq.c	Mon Oct 18 11:26:56 2010
-+++ coreutils-8.5/src/seq.c	Mon Oct 18 13:03:01 2010
-@@ -245,12 +245,12 @@
- 
-   if (! out_of_range)
-     {
--      long double x = first;
--      long double i;
-+      double x = first;
-+      double i;
- 
-       for (i = 1; ; i++)
-         {
--          long double x0 = x;
-+          double x0 = x;
-           printf (fmt, x);
-           if (out_of_range)
-             break;
-@@ -267,7 +267,7 @@
-                  of stopping at 0.000002.  */
- 
-               bool print_extra_number = false;
--              long double x_val;
-+              double x_val;
-               char *x_str;
-               int x_strlen;
-               setlocale (LC_NUMERIC, "C");
-@@ -277,7 +277,7 @@
-                 xalloc_die ();
-               x_str[x_strlen - layout.suffix_len] = '\0';
- 
--              if (xstrtold (x_str + layout.prefix_len, NULL, &x_val, c_strtold)
-+              if (xstrtod (x_str + layout.prefix_len, NULL, &x_val, c_strtod)
-                   && x_val == last)
-                 {
-                   char *x0_str = NULL;
-@@ -303,7 +303,7 @@
- static char const *
- get_default_format (operand first, operand step, operand last)
- {
--  static char format_buf[sizeof "%0.Lf" + 2 * INT_STRLEN_BOUND (int)];
-+  static char format_buf[sizeof "%0.f" + 2 * INT_STRLEN_BOUND (int)];
- 
-   int prec = MAX (first.precision, step.precision);
- 
-@@ -323,18 +323,18 @@
-           if (width <= INT_MAX)
-             {
-               int w = width;
--              sprintf (format_buf, "%%0%d.%dLf", w, prec);
-+              sprintf (format_buf, "%%0%d.%df", w, prec);
-               return format_buf;
-             }
-         }
-       else
-         {
--          sprintf (format_buf, "%%.%dLf", prec);
-+          sprintf (format_buf, "%%.%df", prec);
-           return format_buf;
-         }
-     }
- 
--  return "%Lg";
-+  return "%g";
- }
- 
- int

diff --git a/sys-apps/coreutils/files/coreutils-8.5-interix-warn-mount.patch b/sys-apps/coreutils/files/coreutils-8.5-interix-warn-mount.patch
deleted file mode 100644
index dc15fe9557..0000000000
--- a/sys-apps/coreutils/files/coreutils-8.5-interix-warn-mount.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Make error about not reading list of mounted filesystems into a warning for interix.
-
-diff -pur coreutils-8.5.orig/configure coreutils-8.5/configure
---- coreutils-8.5.orig/configure
-+++ coreutils-8.5/configure
-@@ -33852,7 +33852,8 @@
- fi
- 
- if test -z "$ac_list_mounted_fs"; then
--  as_fn_error $? "could not determine how to read list of mounted file systems" "$LINENO" 5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not determine how to read list of mounted file systems" >&5
-+$as_echo "$as_me: WARNING: could not determine how to read list of mounted file systems" >&2;}
-   # FIXME -- no need to abort building the whole package
-   # Can't build mountlist.c or anything that needs its functions
- fi

diff --git a/sys-apps/coreutils/files/coreutils-8.8-hppa-hpux.patch b/sys-apps/coreutils/files/coreutils-8.8-hppa-hpux.patch
deleted file mode 100644
index a5e2486ca7..0000000000
--- a/sys-apps/coreutils/files/coreutils-8.8-hppa-hpux.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- coreutils-8.8.orig/lib/striconv.c
-+++ coreutils-8.8/lib/striconv.c
-@@ -53,7 +53,7 @@ mem_cd_iconv (const char *src, size_t sr
-   /* Avoid glibc-2.1 bug and Solaris 2.7-2.9 bug.  */
- # if defined _LIBICONV_VERSION \
-      || !(((__GLIBC__ == 2 && __GLIBC_MINOR__ <= 1) && !defined __UCLIBC__) \
--          || defined __sun)
-+          || defined __sun || (defined __hppa && defined __hpux))
-   /* Set to the initial state.  */
-   iconv (cd, NULL, NULL, NULL, NULL);
- # endif

diff --git a/sys-apps/coreutils/files/coreutils-8.8-interix.patch b/sys-apps/coreutils/files/coreutils-8.8-interix.patch
deleted file mode 100644
index 25107afc82..0000000000
--- a/sys-apps/coreutils/files/coreutils-8.8-interix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-already fixed in gnulib (mountlist support added), should hit coreutils soon.
-see also: http://www.mail-archive.com/bug-gnulib@×××.org/msg21257.html
-
-diff -ru -x '*.Po' -x '*.Plo' coreutils-8.8.orig/src/stat.c coreutils-8.8/src/stat.c
---- coreutils-8.8.orig/src/stat.c	2011-01-26 11:51:08 +0100
-+++ coreutils-8.8/src/stat.c	2011-01-26 11:59:21 +0100
-@@ -762,7 +762,11 @@
-   static bool tried_mount_list = false;
-   if (!tried_mount_list) /* attempt/warn once per process.  */
-     {
-+      #ifndef __INTERIX
-       if (!(mount_list = read_file_system_list (false)))
-+      #else
-+      mount_list = NULL;
-+      #endif
-         error (0, errno, "%s", _("cannot read table of mounted file systems"));
-       tried_mount_list = true;
-     }