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

["Michael Haubenwallner" <haubi@gentoo.org>]

commit:     b6d76528d790508796ff0c25b49a7b1858696f60
Author:     Michael Haubenwallner <michael.haubenwallner <AT> ssi-schaefer <DOT> com>
AuthorDate: Mon Apr 18 08:58:56 2016 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 08:58:56 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b6d76528

import coreutils-8.25 from gentoo.git-rev 74ca4a1e0ebd5a86cd91442851b93829645dd674

Package-Manager: portage-2.2.28-prefix

 sys-apps/coreutils/Manifest              |  19 ++++
 sys-apps/coreutils/coreutils-8.25.ebuild | 184 +++++++++++++++++++++++++++++++
 sys-apps/coreutils/metadata.xml          |  15 ++-
 3 files changed, 213 insertions(+), 5 deletions(-)

diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 74488bd..224baa7 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -1,3 +1,12 @@
+AUX coreutils-7.2-mint.patch 3428 SHA256 a4387ae8d994f53f856f443cbfde9e5ca0184e4f5f07762601954d0d5562748c SHA512 72c04e78dbba5c50383b7c624dd2dab2795202879f3f65bd24da0384d8df7611f760623d30295ba7f14d317bfa5a28c9c98b373b0f9386b92f0f223ee77699b4 WHIRLPOOL eae956fac65d794db42a029a55a2fbe3cc45731aeb050bebb663a289a287a22495f72f39d9a567ce16e798668ad52937a1a637aae893f9dc56ce1c08956c21f0
+AUX coreutils-7.4-hppa-hpux.patch 502 SHA256 d9e1c3f4db41393752d0e4ca8aefff8c3bd409c055d7b0401d442fa4ffc282c6 SHA512 99ce4a81f2d89b9d23c3d3f100848d1a552069b9d3d6480ee4a3b1f796e1a4746802e293e2764ff2200b8e4e95d483fd48da14f97d8698a88e5e3eadacd2e724 WHIRLPOOL c0c2741363540fdd1fbd8b4ac4872e43325d05969e71ed30dd65eaaf10f5ac5855d80eb6810b458baa0b2a4f2ef812cfce753cfa05c943cd91cca5265f7546b2
+AUX coreutils-7.5-interix-setgroups.patch 439 SHA256 9b8cd13c7273effe0c9355efb89159a4235c42d7c6c7573448bb06249323afaa SHA512 391d60645d6f8ab4e78f917c08e5ef939c662ed429a47b3b7c85b670c52e39da35db26d8f9dd9fe8bf0d7726744f3cdaa2542a1cd44ffb1a148dc93c5d1737f9 WHIRLPOOL 706b0d016f6a9dadee1fbbaae90695be2329809470c6da53e6c7ad9fddcd19614b8cf8ba26beb10b5bf26f5f4c3f0bba2d8eea4fdd5c60740cacfcba68fa2978
+AUX coreutils-8.22-mint.patch 3894 SHA256 1853e4f86c8455b41037acf4f2bd65a428b050f302920ad23358f30730a2291e SHA512 3f779203d6751bdbeec5ac2d4fc9d1b10d52ae97c7c83f9edb7ac783b075e0e312ad4f12e27772cbedfc240dc4bb9f5232dd7f7edc81a492a530e655eb9d2d30 WHIRLPOOL cb33f6e89a2a1edcdd550c16f821085529045eed08405a44fe99385f83c1ce9b620a56a249eed7e539a6053a7bc2bc486d594193f6817e247ed6cfebe46ba285
+AUX coreutils-8.23-non-elf.patch 847 SHA256 8f877e4b51c9d6d287418db25cebeae47b464945758d03aeb43181c311e8d0f2 SHA512 b3863be7f37d4e57101438885da160d23c4178ee325941a603cdec3595a9886beff0f4d3ba6b4490ba6f89eb8cb7bc1c54e47ffe4d62c8acbca5ab933131489e WHIRLPOOL 32a43b70a6537e034f241855d299872c711f97a32a13cba5742419e7e07b9a147d905f8504295ebe85daa46263d0e6bbdc3347d654428a9b87b9d2f439949a6e
+AUX coreutils-8.5-interix-double.patch 2019 SHA256 1cdcccdcd972bfb5935fc1b2d2b160ba656c67c13a7d3db40d10f8d8752c0c6a SHA512 28d6b492f232517c038a59b713284c5a6dd8f360d463583e0481d373609ac8447ed8793ca91524fbddd6c59f588434c1d05b9d6587d168c1a042e6c9776278b4 WHIRLPOOL 189a2fb5e0b9bbd3477d62b6ad7301f8bdfeeeb6b2a2fb44a2e1e8ec06b90636bb224ce1ca16ab3a7225fdca7e73e5d821558b539c93fadd2ccf4082c149ea39
+AUX coreutils-8.5-interix-warn-mount.patch 716 SHA256 9eb15d7afd7db3fe3dd77544e863d3e093ed85f45a2d585faee64526cc64e16a SHA512 95565e680b41c658b8f5bcd84b2d09c482e1514d34afcbc721151fa5595baccf87aa3ecaa03df14d1904a7246daa350affbcd20065da87252231fdf47ff6b3fb WHIRLPOOL 2e62f5d73ccd37c404c462bc41f8ca06619130fd691242dcff26fbce491752ea36c0977a4cb6b57ad2ae69b5f8d9ae39cd194dd13567a69003e0cd07acf4d12f
+AUX coreutils-8.8-hppa-hpux.patch 478 SHA256 585bbf80cd12bb60de6be8dd4bd6ea3b0cf3724081ba02688764c939ddfacffe SHA512 51a6336a2a6db61d6e2894b8c75fe6b2242e62001d411b8e0b4e4c949e4c81499b1df4990b82b81507a329bedb486440322f5f5246ab4735584896d71fa1f4d9 WHIRLPOOL bee1672b2e6614f1744215d6c0e4a99b83530509c5f3fa83f5d18700d2b5fdbeb58041c38907cc3c6117d09548ba206d202c49a56ef9393d2022cbd3716ed4a3
+AUX coreutils-8.8-interix.patch 739 SHA256 c6fdd213340db6dcdd486e308035af425e37c0e25ad450ca44ec08b62bd049df SHA512 27fe91becfc3a0f9af7aadda4c80978125aa34e1fc6b93c63c6c8aa6eb4b924c5aeedbb89d0a5442aed27af440ca3afaed199962d0290e952d8aebd0bb2efc07 WHIRLPOOL 60bfd640d1e35baed563b9f17493e15bb741f894866da1fc71bae252b69090aab3f0148aaaecbfaadbacc17afd21d4ad4f067a504cb1cfa0cfd7d0388bc0187a
 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
@@ -10,3 +19,13 @@ DIST coreutils-8.23.tar.xz 5375612 SHA256 ec43ca5bcfc62242accb46b7f121f6b684ee21
 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
+EBUILD coreutils-8.20.ebuild 6341 SHA256 18731f622a34d93385ada46dc6713f59ed890543c5c2868c7bf562d313a1313d SHA512 cc34f1e5ff404b23093d74d9d1c6ac5525902652a67cf1a3840ae6b790062842b6869c7a2e9a3711775c17fcc46a99983acbc327b5078d9ed85c85ca72034a4f WHIRLPOOL e873160d0d0dc46f98ac52db8701a1e337491ab207b834968e4763a59f6554d750c63e108dbf54de0a936c93e98241283bcb2c1724dd79f066e9fe11de8f5c74
+EBUILD coreutils-8.22-r1.ebuild 6015 SHA256 08c11cfbd5947d24c48ef169ebf0fe2bc87ee5ceb37d811d294e2e03f77624a5 SHA512 f3b2c5c790eee32dfae480b837be655191216d3cc9b0cbb53d7d64841dce139c127fc2153721e48ab82404ed4fdf353bd578b04db828aad46e0d61a19129e3a7 WHIRLPOOL 84a2655e72aaeee7eb6f9e3afc74124df0baf1a7782a806ddee75d0a178ff5aa6872c997f9c7bfcfe0b1929b8c23ce7a2b50f8bfc2120757be08c2b508082e7c
+EBUILD coreutils-8.22.ebuild 6317 SHA256 7962673e3eeece23fa543eeec7f4ebc9d3bc14254ddc5c98d1c1778508121b9b SHA512 63203170b5378158fed7fdfdb203e3fddf4ac8be79428e7fe4eb475fc800870a9ecda12dcc63a37dfe811aa57b543b414dad847568b18a00f63bbd5a88446914 WHIRLPOOL 45f47540f7114f3e45e41fa36d4d1cace21bafbadac80d29ad6372487f63d9f36537ee03b7a0a4923e743d3294c17a7e1cb96c8ef42e386706bd152a58d2aa28
+EBUILD coreutils-8.23-r00.1.ebuild 6267 SHA256 53c2a4bef763782b3dc6f9c00a3b32ca37dd9fcc1c8096fd41633e2a91e2eb4e SHA512 dc5f1f83dc592a6e0fbf37afb3494d7300f34f63a9b81f8eee08c6f5d2826487fb1c06d3c94ababd6e3ce4430737ffa917ffa00e77e2e51ed07b156d21b45e6d WHIRLPOOL 49548aad93722d42720dd3bd99fdc6eba76eb272cc320e49875a1dc784cc411eadfe2048d0399e8936c26c360861b30c92a0975186e8de008233ca48bbddd4c3
+EBUILD coreutils-8.24.ebuild 6596 SHA256 1e82dda3c1a0b1b6c47af214dffac24ffee45bc19efdd2c403e05890267d078b SHA512 e78d9f8f6e99a767cbc809126284161643af220808753adff57b52e129686ee3a208e7d1742694fd0dd8f3b28d238df759169866da861b7539e9a79b490bd930 WHIRLPOOL 08e2b1ce22af8a0b3b40b62dfc0b6fb739bd22b5db349874ff2c9b70cb14fa247bbb2c896b4db9564f5e6466d62b2483a96fb3c58c2e781419eedb6373108e37
+EBUILD coreutils-8.25.ebuild 5919 SHA256 c8918878e626054233da010b381143d8ffda3690ec166ecaedc8e58f005e2f82 SHA512 a7db176b9aa62fb818d67e6852f78a0393287c586728374e71f26f73835d0b31c43d5c8fff825b1da9921c23f1e196efc235f0b6ef966f3953053b10fab58a8e WHIRLPOOL d37b3be9bb09a1289a2b7e8777c48ad0474001d336da9aeb91e338903846b0db47f0c31cd0eb67ff735285d890539e4029a10a958cc7d0d960a337508678dc5b
+MISC metadata.xml 562 SHA256 80a6788324cad291fc488dd7e1a6cc2578acae197b7ad2d42860109d45d8e12d SHA512 1372dac2fe4990f6cf47a56a56f3fab9c2eb96eb687bdabc0b5b79fc5dbad69e6c434deb5a0904e18ee8032b777fdea0f997c855e3fca86923ab0f04c969b206 WHIRLPOOL ea7e54219becc762b04fe41de75eb511449821b889606f13c617be68b6c1cc64a3e765b90cdd66820b4549709a022e1d9405bbc4c51033996cb2d04a72c7c53f

diff --git a/sys-apps/coreutils/coreutils-8.25.ebuild b/sys-apps/coreutils/coreutils-8.25.ebuild
new file mode 100644
index 0000000..6b1aa55
--- /dev/null
+++ b/sys-apps/coreutils/coreutils-8.25.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# To generate the man pages, unpack the upstream tarball and run:
+# ./configure --enable-install-program=arch,coreutils,hostname,kill
+# make
+# cd ..
+# tar cf - coreutils-*/man/*.[0-9] | xz > coreutils-<ver>-man.tar.xz
+
+EAPI="4"
+
+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="https://www.gnu.org/software/coreutils/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz
+	https://dev.gentoo.org/~vapier/dist/${P}-patches-${PATCH_VER}.tar.xz
+	mirror://gentoo/${P}-man.tar.xz
+	https://dev.gentoo.org/~vapier/dist/${P}-man.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS= # "~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="acl caps gmp hostname kill multicall 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 )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	app-arch/xz-utils"
+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/stat
+	!net-mail/base64
+	!sys-apps/mktemp
+	!<app-forensics/tct-1.18-r1
+	!<net-fs/netatalk-2.0.3-r4"
+
+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="https://bugs.gentoo.org/" \
+		--enable-install-program="arch,$(usev hostname),$(usev kill)" \
+		--enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,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) \
+		${myconf}
+}
+
+src_test() {
+	# Non-root tests will fail if the full path isn't
+	# 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
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	newins src/dircolors.hin DIR_COLORS
+
+	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"
+		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
+		local x
+		for x in ${com} uname ; do
+			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
+	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/metadata.xml b/sys-apps/coreutils/metadata.xml
index 02d1ba7..f9a7962 100644
--- a/sys-apps/coreutils/metadata.xml
+++ b/sys-apps/coreutils/metadata.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
-<upstream>
-  <remote-id type="cpe">cpe:/a:gnu:coreutils</remote-id>
-</upstream>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
-  <flag name='multicall'>Build all tools into a single `coreutils` program akin to busybox to save space</flag>
+	<flag name="hostname">Build the hostname program</flag>
+	<flag name="kill">Build the kill program</flag>
+	<flag name="multicall">Build all tools into a single `coreutils` program akin to busybox to save space</flag>
 </use>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnu:coreutils</remote-id>
+</upstream>
 </pkgmetadata>