From b811ad3065bbe580f7524bba8bca4b886769008a Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 6 Jan 2012 20:27:29 +0000
Subject: [PATCH] Version bump.

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64
---
 sys-apps/coreutils/ChangeLog             |   9 +-
 sys-apps/coreutils/Manifest              |  23 +++-
 sys-apps/coreutils/coreutils-8.15.ebuild | 168 +++++++++++++++++++++++
 3 files changed, 193 insertions(+), 7 deletions(-)
 create mode 100644 sys-apps/coreutils/coreutils-8.15.ebuild

diff --git a/sys-apps/coreutils/ChangeLog b/sys-apps/coreutils/ChangeLog
index d5383e77068f..5aa08fc192b2 100644
--- a/sys-apps/coreutils/ChangeLog
+++ b/sys-apps/coreutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/coreutils
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.326 2011/10/18 22:47:25 vapier Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.327 2012/01/06 20:27:29 vapier Exp $
+
+*coreutils-8.15 (06 Jan 2012)
+
+  06 Jan 2012; Mike Frysinger <vapier@gentoo.org> +coreutils-8.15.ebuild:
+  Version bump.
 
   18 Oct 2011; Mike Frysinger <vapier@gentoo.org> coreutils-8.14.ebuild:
   Extend man page hack to missing perl #387091 by nzqr.
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index ad4bfd99d4eb..fe7f25e6b1f4 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 DIST coreutils-8.10-patches-2.tar.xz 5436 RMD160 85bab011059719fdfe4b06d364480212ec346b86 SHA1 9d175c1b470c130cb8f4e60e85831b897135afea SHA256 91e49b864042a644900cf9373d7a762679bd188daf28d4a1edb0a332ac2af4f7
 DIST coreutils-8.10.tar.xz 4753304 RMD160 5585e0cfad01f8ce984b35722a02dbb23cc4e479 SHA1 a5689b41efa2dbf31d500cea26c5fe60760f6580 SHA256 8258785cbab6580f2e0376769a7b98ab3e1ddfca2d6f48e5490a51688d0bee83
@@ -11,6 +11,8 @@ DIST coreutils-8.13-patches-1.tar.xz 4500 RMD160 30f63eefc4bb4d9d416c54980953662
 DIST coreutils-8.13.tar.xz 4913572 RMD160 35b224a18c070209d5c2cee8c6611a23e12209e5 SHA1 2f8bff4310e695e9521dcb48e6c4ea81523b064c SHA256 0bfdbe3ae0cf06bf26bf5bb2bd3983acb8ab60649604cc0dbb08963c9d24ac1b
 DIST coreutils-8.14-patches-1.tar.xz 4496 RMD160 186f25b58bc62976f5b391019eaa2c52f9cc2710 SHA1 3a8f8d3d71d7346e4f87c6fa4782d01a50c5fa44 SHA256 26407cd1ab0e6e36196986d394014a8c9532246bdceaca99ee95b147dc7ab2a5
 DIST coreutils-8.14.tar.xz 4957464 RMD160 e6fd9f14bc90c4540e542ea3e8e9944c4e49c9a3 SHA1 cda40d00ea68486c33a31a3bfb7c80dd2cd2e9d6 SHA256 0d120817c19292edb19e92ae6b8eac9020e03d51e0af9cb116cf82b65d18b02d
+DIST coreutils-8.15-patches-1.tar.xz 4496 RMD160 c5376396205a3f2caa92406ad25de19677a4f914 SHA1 9b968a1531b2df52c1af47b06bf6331f54d7cde0 SHA256 b5902f6e4f27c263bb5686f68e5b05ed9c671a72e47d2f68bd27def2a356a4d1
+DIST coreutils-8.15.tar.xz 4943172 RMD160 9cc728b0d7136931ed73e42cbe897edae364732e SHA1 d5d2035ff6443ff63dc507420b52f54cf7a89545 SHA256 837eb377414eae463fee17d0f77e6d76bed79b87bc97ef0c23887710107fd49c
 DIST coreutils-8.5-patches-1.tar.lzma 4456 RMD160 c91df722421089c9598a194bf5ae4d614d8ea990 SHA1 8bba5c4b0f946cdfe6d208dc5e507606b45a5c60 SHA256 5c805201cd08a3a9f8989c77239606d5266a037aeb7c00ec1d2224219af9a1a7
 DIST coreutils-8.5-patches-2.tar.lzma 25979 RMD160 fe00a23185cc62a4c9f9ce7b0eea832106e9782b SHA1 c320aad0ffb011f752d9078257893197af5f404a SHA256 3fe98017886f0c97e15552caf4b38ba6085f15209c30ea9e5a2b65bee324f105
 DIST coreutils-8.5.tar.gz 10740866 RMD160 2fdba2f8b64c818b459533ba40f94ba7325720b3 SHA1 939144f16d05691753a87134436dd2bb8ea89851 SHA256 dd243e2ac7d0ed203b170ecfb8299643779e7501fec2b45ae1cea8a450fa8ca0
@@ -25,17 +27,28 @@ EBUILD coreutils-8.11.ebuild 5472 RMD160 7c04758691871a3deb82755378d1d1504ffa77c
 EBUILD coreutils-8.12.ebuild 5472 RMD160 767dae36d2968c1c142d8efaa78ca74d8cb19ea8 SHA1 85e1481835fe9a2d7ad423e010007976301adb80 SHA256 e04c1143146043af29e54b9367191e8a11c9a3bf741763a5fb13aec471fdffe9
 EBUILD coreutils-8.13.ebuild 5472 RMD160 1092b8938dee2ef3b0d2b850e3ef6003ccce466e SHA1 d1107fb7aa15b53ec67a2c852c263812de13334d SHA256 8c2fe5fc85031756e8a874805c94892176a9a0618b8532ce644b87b660112a57
 EBUILD coreutils-8.14.ebuild 5505 RMD160 9f8bc60c550728ea2a276348da022439f0c8612c SHA1 9be87f89bb1305980c0c740dd9ae46710a0cf5d6 SHA256 67d0202103ea1e18cbd098c82053ce45e04976a89bca7b2a703114f33fb0c922
+EBUILD coreutils-8.15.ebuild 5525 RMD160 596c2ff18171703c05a750b6bfd361ae31da009f SHA1 2647ac2cb5e993508ea15b5221063201729eaba9 SHA256 c822fd06568f2cb098617de8e737dfcbb44b633e29a0944ea15c6566b36a97e8
 EBUILD coreutils-8.5-r1.ebuild 5092 RMD160 581fd98b19c19507fc4362e1b315b3f81c6ffba4 SHA1 2f5c99678a8653939e6b91a9d2d0ed42783916a7 SHA256 2c537534ff389f926635dcd39cb4d7a48eff5e5d3825aa7af02a8a03a4ce5cc1
 EBUILD coreutils-8.5.ebuild 5078 RMD160 a500ac6b5d8a93dcb8f5863104a8a8e31b1d84ee SHA1 8300896fb3be6280b882bcb9ca62ffc768ec5c97 SHA256 a22d449686212e48dc39bd7b0b1de22bd0ce73d78c758229b3fcc8cb025eb932
 EBUILD coreutils-8.7.ebuild 5104 RMD160 53fe85675d68535ae53f276c5268b65177a5d0e8 SHA1 cc383887e6927281bd67317c23296159bff61cec SHA256 e5b6d11ad984e0d8c93328a2a2a0d2e5f0bace971aabf22d535793fee02cb750
 EBUILD coreutils-8.8.ebuild 5118 RMD160 ab648eef66d5a4a60435d16089bfadf65b830302 SHA1 820383ee5be1902ee43d0b0f1d7eb08e99b584a6 SHA256 de92ab9516bc39f976c3ed0959412d003ff8a83d0b76293657f6524efbe7903b
 EBUILD coreutils-8.9.ebuild 5118 RMD160 3a093bac74854ca289376a678056b104b1ac6960 SHA1 75b03d8636b14b730331f0d5003d373e62aea659 SHA256 ba38db2a7a071493aaa638c55c07515953d2a84540df9b5a405324e22b582741
-MISC ChangeLog 46880 RMD160 7754caf51f339ac69bf6c0d946def543ef17a287 SHA1 25acebcd4253db31c37b03057ffd128dec3e5cda SHA256 0914168db7d236eb7a4ef8ba2212f9d49215ea2d670e140a1d5738d6c4ffd578
+MISC ChangeLog 47002 RMD160 9c867ed7ca773d59ed456d0d9f3623092f8ace26 SHA1 fdbb20f47ef7a62cb0c8053f73eb1b84a2bbfefc SHA256 00fa9914490c6d30c180d1e5ce9c70128dd49d377af278ed2c9e02508fc89179
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6eAgQACgkQaC/OocHi7JYZwQEAlnxu8E0ZMvjzU88wBGiDV7p+
-d+wrCWY1D/TYlPX1eYQA+wRsFRwXJMQxA/ZNfyprOpDxhqBzwetOqo4dQOi8CyaM
-=7w48
+iQIcBAEBAgAGBQJPB1lbAAoJELEHsLL7fEFWqFUQAME1rnmQo0w6sS9fTqmFSpTg
+mWMYPRmb/FsxT45S8z+deDtZjrQcaFxv1qSHCxGYngBO8/+5TuEEvPWMRsc1eTDi
+WSVfBwWmwUoTPyBKGa8auG2SSND88AfLddLlX2YSfV2xNcpgAwA1ICUyRJJZlhdJ
+BlGerW+Dg7K+QjzBYhIDd/8rkkGbI7Y63cNykBimGe39Aa+n1lHlC+ROXHVt/ADt
+PYnoKjaeGJ8M2rNfl/zKpj1Y5L7vAJKkDT+8z2zvY1cLFpt2tKSygHTNnjlM+KKP
+vFvX97AgyVtwApqWu4BhUSejvdJpypZHkfpn8bAwSPjp+QFDLO8+2xcydZBbblDs
+2BrmAlE5dzkrkYmAeSGZKXxIyHevkUTr++D6QJTjBedOTY05+SXz80pXYMlkMNEp
+vtTydu/1K2ZNALyq5x6kIvjdPDX44BPkV23zedk/eRE1c0UB9l6UCYxNcLomozT6
+1PrNpOI/DgLWnMZKwjJhcpYvOVA0vByD7b9k0U8FacahUHJxwfs7Fdd0CfUZq/zO
+dHpxs7sCkxhUk18AIIyvjPenBf+hR+8YRr48SMQuRkOlGmcoNT+RmJKccuTD7mS1
+2aAdMRf7YamWw2Hfkw1jCkJTBL5AxaAwJbWpE8hqhKtLaAtVN0ph+wl0UEkpNRNb
+mt5cDnKSHSSCRW+4rWQ+
+=PH12
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/coreutils/coreutils-8.15.ebuild b/sys-apps/coreutils/coreutils-8.15.ebuild
new file mode 100644
index 000000000000..e3c8bce58836
--- /dev/null
+++ b/sys-apps/coreutils/coreutils-8.15.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-8.15.ebuild,v 1.1 2012/01/06 20:27:29 vapier Exp $
+
+EAPI="3"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+PATCH_VER="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="ftp://alpha.gnu.org/gnu/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/~vapier/dist/${P}-patches-${PATCH_VER}.tar.xz"
+
+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 unicode 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 )
+	!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}
+	app-arch/xz-utils"
+
+src_prepare() {
+	if ! use vanilla ; then
+		use 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
+	tc-is-cross-compiler && 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() {
+	tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] && export fu_cv_sys_stat_statfs2_bsize=yes #311569
+
+	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
+	# 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)
+}
+
+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
+
+	# Help out users using experimental filesystems
+	if grep -qs btrfs "${ROOT}"/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
+}
-- 
2.26.2