Include i18n patch from Fedora #328827 by Arago.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 174 insertions, 3 deletions

diff --git a/sys-apps/coreutils/ChangeLog b/sys-apps/coreutils/ChangeLog
index 4d9452983301..d8093451422d 100644
--- a/sys-apps/coreutils/ChangeLog
+++ b/sys-apps/coreutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/coreutils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.301 2010/07/19 20:15:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.302 2010/07/19 20:42:59 vapier Exp $
+
+*coreutils-8.5-r1 (19 Jul 2010)
+
+  19 Jul 2010; Mike Frysinger <vapier@gentoo.org> +coreutils-8.5-r1.ebuild:
+  Include i18n patch from Fedora #328827 by Arago.
 
   19 Jul 2010; Mike Frysinger <vapier@gentoo.org> coreutils-8.5.ebuild:
   Stabilize for alpha/arm/ia64/s390/sh #327147.
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 7ba1790b01c4..f4e7f930cd28 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -1,11 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST coreutils-7.5-patches-2.tar.lzma 8370 RMD160 fef456359dd907c8264686720676ea1dabb90b63 SHA1 55f1b88bfeca34cd09c4ba305f6c0d45cfa3fd3f SHA256 1ee33146c960671f6cb54ca4916f6a828db904dae84841ec690eae7c0205e9a2
 DIST coreutils-7.5.tar.gz 9956013 RMD160 17785526e6820705aa5790454af1bd3d0d4104aa SHA1 97e1486a33bf42eb7686d8f131c80ab533f1f683 SHA256 341f49b9434f83ca9a8b6c2266813092ef08a5fca25f15dcc1a0ba82fc18c3c1
 DIST coreutils-8.4-patches-2.tar.lzma 26806 RMD160 82b1cedcd1906ef94344e475d473b801a595bee7 SHA1 5592d17a50fea5e6b8abc9c2d1481defd0a50e74 SHA256 a871aeb4d622b710038918d154d24def8f1755c22278e4c2cf2d66f676c54999
 DIST coreutils-8.4.tar.gz 10519759 RMD160 26ba81ce235997bd6f82c903e8234f2c86e15b5a SHA1 89eefb041215c30408261f46f59dc08e4b500edf SHA256 8bb08d3f5843f25d0f306848cc3514889232267e68d9a66dd20e1e363d0d017f
 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
 EBUILD coreutils-7.5-r1.ebuild 4628 RMD160 f611f4ca3a1da2ebf2350f2b864fcbe09319b61e SHA1 99c7c9dd3437971c13ef38e42566e59a6a3a4545 SHA256 44faf0c5fa187e04696fe752b3ed0a95f8d4b40c6e045ec6c065094ca721129f
 EBUILD coreutils-8.4.ebuild 5025 RMD160 ae9e4594558fb9e5129f65e464e19f9a1f0c77db SHA1 25f9287c2bb1911b4164f3260e4e7702a810f1df SHA256 17e960a99ad543b4ab4c1c6b865f049d35a5ae5c97d456297d4f8eaf661683f0
-EBUILD coreutils-8.5.ebuild 5034 RMD160 8135c358c1f8b2a973948d304c9efcadaa0a80d5 SHA1 9b87a79882f52c34328e8d29ca55888c981ccafa SHA256 4a9cbe7b870407410405d76cba3dc60caeb7073b9fcb82dcc783fafe26803b26
-MISC ChangeLog 43577 RMD160 5493e4d7aef75d204e0ca865bfe242c82f5d8bff SHA1 612f4a7445bd2816469355219275e41ea5e157dc SHA256 4ec8004fc68258b710295d48f60afe078fd4f86dd9f6c0aba8b61cd4c8aae08c
+EBUILD coreutils-8.5-r1.ebuild 5092 RMD160 581fd98b19c19507fc4362e1b315b3f81c6ffba4 SHA1 2f5c99678a8653939e6b91a9d2d0ed42783916a7 SHA256 2c537534ff389f926635dcd39cb4d7a48eff5e5d3825aa7af02a8a03a4ce5cc1
+EBUILD coreutils-8.5.ebuild 5079 RMD160 cdff8bfceba1b4c27f2da4d8d20ea33e0d310874 SHA1 84a865764a7d5df39c83d405b246e8758f5443e4 SHA256 25923a7ae273a316b367412e66b8227ebd0360b1dfee467298b487c6d60456bc
+MISC ChangeLog 44010 RMD160 44cc5c0164e4da02892710160f3614d2e54a9fba SHA1 d59b64678b63f9cdf96710c65b2af9ae389b8304 SHA256 6bb253b3a152e3722fe21b4a7fbc37d538a7b2ced0597540ae9438e7fe0e82c1
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iF4EAREIAAYFAkxEuCMACgkQTwhj9JtAlp5s4gD8DEpBiAXRVgQu6vNHNIco1VwY
+hf7+VaeDJpzCjzE1M3MA/iFuCgngD+KDm9bqDJEfLprGpxKeoWvcpVi1n3xd9VSo
+=iR/+
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/coreutils/coreutils-8.5-r1.ebuild b/sys-apps/coreutils/coreutils-8.5-r1.ebuild
new file mode 100644
index 000000000000..1a2cfadd0d44
--- /dev/null
+++ b/sys-apps/coreutils/coreutils-8.5-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-8.5-r1.ebuild,v 1.1 2010/07/19 20:42:59 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+PATCH_VER="2"
+DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls...), text utilities (sort, tr, head, wc..), and shell utilities (whoami, who,...)"
+HOMEPAGE="http://www.gnu.org/software/coreutils/"
+SRC_URI="ftp://alpha.gnu.org/gnu/coreutils/${P}.tar.gz
+	mirror://gnu/${PN}/${P}.tar.gz
+	mirror://gentoo/${P}.tar.gz
+	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.lzma
+	http://dev.gentoo.org/~vapier/dist/${P}-patches-${PATCH_VER}.tar.lzma"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="acl caps gmp nls selinux static 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 )
+	!<sys-apps/util-linux-2.13
+	!sys-apps/stat
+	!net-mail/base64
+	!sys-apps/mktemp
+	!<app-forensics/tct-1.18-r1
+	!<net-fs/netatalk-2.0.3-r4
+	!<sci-chemistry/ccp4-6.1.1
+	>=sys-libs/ncurses-5.3-r5"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	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}
+}
+
+src_compile() {
+	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) \
+		|| die "econf"
+	emake || die "emake"
+}
+
+src_test() {
+	# Non-root tests will fail if the full path isnt
+	# accessible to non-root users
+	chmod -R go-w "${WORKDIR}"
+	chmod a+rx "${WORKDIR}"
+
+	# coreutils tests like to do `mount` and such with temp dirs
+	# so make sure /etc/mtab is writable #265725
+	# make sure /dev/loop* can be mounted #269758
+	mkdir -p "${T}"/mount-wrappers
+	mkwrap() {
+		local w ww
+		for w in "$@" ; do
+			ww="${T}/mount-wrappers/${w}"
+			cat <<-EOF > "${ww}"
+				#!/bin/sh
+				exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P $w) "\$@"
+			EOF
+			chmod a+rx "${ww}"
+		done
+	}
+	mkwrap mount umount
+
+	addwrite /dev/full
+	#export RUN_EXPENSIVE_TESTS="yes"
+	#export FETISH_GROUPS="portage wheel"
+	env PATH="${T}/mount-wrappers:${PATH}" \
+	emake -j1 -k check || die "make check failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS ChangeLog* NEWS README* THANKS TODO
+
+	insinto /etc
+	newins src/dircolors.hin DIR_COLORS || die
+
+	if [[ ${USERLAND} == "GNU" ]] ; then
+		cd "${D}"/usr/bin
+		dodir /bin
+		# move critical binaries into /bin (required by FHS)
+		local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
+		           mkdir mknod mv pwd rm rmdir stty sync true uname"
+		mv ${fhs} ../../bin/ || die "could not move fhs bins"
+		# move critical binaries into /bin (common scripts)
+		local com="basename chroot cut dir dirname du env expr head mkfifo
+		           mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
+		mv ${com} ../../bin/ || die "could not move common bins"
+		# create a symlink for uname in /usr/bin/ since autotools require it
+		local x
+		for x in ${com} uname ; do
+			dosym /bin/${x} /usr/bin/${x} || die
+		done
+	else
+		# For now, drop the man pages, collides with the ones of the system.
+		rm -rf "${D}"/usr/share/man
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Make sure you run 'hash -r' in your active shells."
+	ewarn "You should also re-source your shell settings for LS_COLORS"
+	ewarn "  changes, such as: source /etc/profile"
+
+	# /bin/dircolors sometimes sticks around #224823
+	if [ -e "${ROOT}/usr/bin/dircolors" ] && [ -e "${ROOT}/bin/dircolors" ] ; then
+		if strings "${ROOT}/bin/dircolors" | grep -qs "GNU coreutils" ; then
+			einfo "Deleting orphaned GNU /bin/dircolors for you"
+			rm -f "${ROOT}/bin/dircolors"
+		fi
+	fi
+}