Add i18n patch from Fedora and some fixes from upstream for #210133.

Package-Manager: portage-2.2_pre5

3 files changed, 160 insertions, 5 deletions

diff --git a/sys-apps/coreutils/ChangeLog b/sys-apps/coreutils/ChangeLog
index 294207958f7d..f273a3d7e263 100644
--- a/sys-apps/coreutils/ChangeLog
+++ b/sys-apps/coreutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/coreutils
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.219 2008/02/23 04:15:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.220 2008/04/12 19:17:09 vapier Exp $
+
+*coreutils-6.10-r2 (12 Apr 2008)
+
+  12 Apr 2008; Mike Frysinger <vapier@gentoo.org> +coreutils-6.10-r2.ebuild:
+  Add i18n patch from Fedora and some fixes from upstream for #210133.
 
   23 Feb 2008; Mike Frysinger <vapier@gentoo.org> coreutils-6.9-r1.ebuild:
   Fix build error on some systems #206841 by Markus Duft.
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index dd781d9c9f49..6980f3817292 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -3,17 +3,19 @@ Hash: SHA1
 
 AUX gnulib-futimens-rename.patch 1323 RMD160 79f1bcd78441aa4bef1975ee68011cd5d68b7bf1 SHA1 f030ebc2f34f8b2ef59112e2f28f8eabeeb9f4fc SHA256 12d3ccbe88aef4f7218799d961e1fc4f56609c59bd739cfc6e3965838e6893a1
 DIST coreutils-6.10-patches-1.1.tar.bz2 10206 RMD160 faf0d0f209df02a3dbaf18700f66c92e268f43c6 SHA1 5457b31b889dfc864ba2434b04197abd6bdb0e13 SHA256 301b7a3f28eb5a972df7ddf452d1f300f3d2bf88ae6d458fbbd6efe4ff350fa2
+DIST coreutils-6.10-patches-1.2.tar.lzma 33307 RMD160 bd7f95f69a315d4fa477d37ca8db214ccf078e9c SHA1 6a2c431941fe6e2897919bc44ed43299c9e11cc6 SHA256 deb26115b8e1e7a983f547ed1e6bbd82d2a3c9df29935db077779129e938d509
 DIST coreutils-6.10.tar.lzma 3746908 RMD160 7b3f7ae0f92fa3f04ab0b7fc0bbc22430a392a0b SHA1 783d425aeeb087f46a4d7d24f5a890299a09a487 SHA256 8b05bba1b2726a164e444c314e3f359604b58216be704bed8f2e028449cc6204
 DIST coreutils-6.9-patches-1.3.tar.bz2 49170 RMD160 a9ef9fb1850f343ede8c6ca81da9d55ebf719756 SHA1 6d88f3ac1da66c99622f09aec9c264efbec1f099 SHA256 e25a74602d0107747d61d3dda9d05673b307fe761f81776cdd5f7ab0262bcae7
 DIST coreutils-6.9.tar.bz2 5384378 RMD160 c6ae65204b2e9c234a1140f39a8be1ee5cdcaab7 SHA1 10310a78c4e1d9f742f3815ac28e9bf1086a5885 SHA256 89c2895ad157de50e53298b22d91db116ee4e1dd3fdf4019260254e2e31497b0
 EBUILD coreutils-6.10-r1.ebuild 4644 RMD160 e0cd092eeb7795089342dde7d818c30f297c1b6f SHA1 cda1e3f20563cb6c3e8829c12d9bebb97579bbdf SHA256 2ad84ce3e494722e2595d3439b985ba2dad839a8467119ad4fd280c1664e7586
+EBUILD coreutils-6.10-r2.ebuild 4646 RMD160 4c1e899b5e597968cc1139eb743bbdd010646e01 SHA1 6d7fbac9f4aced857001c62c2435a8d31d664300 SHA256 e7f97fb61a2e0e6f086dd0cdf2f134c60b246a575620a3cc4912e1f36486df1d
 EBUILD coreutils-6.9-r1.ebuild 4903 RMD160 084abf9060b3d24c8ff93ce6b6f06003e9fe7c80 SHA1 ec66d32b4e58e24f2fc7fcdc6f39953ef32f5376 SHA256 963b2ca3044382e97f68f1f1c5c0dea875c7c68a0fcafef6aceae6e4e26cbf75
-MISC ChangeLog 33408 RMD160 0de38a907c2eb24a00d8438a6a25ae6ca4a14803 SHA1 a7f67791f4df19c7c2b25bc7efde2bb427715b46 SHA256 8aa3dbb19dcc49272e09210a6fb82fb4ce423d34e99d41007f51448e1f17c4db
+MISC ChangeLog 33591 RMD160 58fa93f3c17c13797b7e81f05fcfc740e647307b SHA1 ec52661c03b727d677bce53fa6d0c51624d1f0ea SHA256 9f65dafbf3295bab2c033b1a3f365cae4290b6ab0672ebe1e9d3b4119082f952
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHv537j9hvisErhMIRAmttAKDgUAWU84YLPt/GlEX00UDWuCQjUACgvZJ4
-6UCOxnc7fcYHjqV1Hex0CLk=
-=iFLW
+iD8DBQFIAQq7j9hvisErhMIRAoNMAJ97uXv6+NoaZmZdi82eJEY/uUYCFwCgyZtm
+LRwc5vIiN3HqUekwNSVOugk=
+=gN6v
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/coreutils/coreutils-6.10-r2.ebuild b/sys-apps/coreutils/coreutils-6.10-r2.ebuild
new file mode 100644
index 000000000000..cafb557980a9
--- /dev/null
+++ b/sys-apps/coreutils/coreutils-6.10-r2.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-6.10-r2.ebuild,v 1.1 2008/04/12 19:17:09 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs autotools
+
+PATCH_VER="1.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.lzma
+	mirror://gnu/${PN}/${P}.tar.lzma
+	mirror://gentoo/${P}.tar.lzma
+	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 nls selinux static xattr"
+
+RDEPEND="selinux? ( sys-libs/libselinux )
+	acl? ( sys-apps/acl )
+	xattr? ( sys-apps/attr )
+	nls? ( >=sys-devel/gettext-0.15 )
+	!net-mail/base64
+	!sys-apps/mktemp
+	>=sys-libs/ncurses-5.3-r5"
+DEPEND="${RDEPEND}
+	app-arch/lzma-utils
+	>=sys-devel/automake-1.10.1
+	>=sys-devel/autoconf-2.61
+	>=sys-devel/m4-1.4-r1"
+
+pkg_setup() {
+	# fixup expr for #123342
+	if [[ $(/bin/expr a : '\(a\)') != "a" ]] ; then
+		if [[ -x /bin/busybox ]] ; then
+			ln -sf /bin/busybox /bin/expr
+		else
+			eerror "Your expr binary appears to be broken, please fix it."
+			eerror "For more info, see http://bugs.gentoo.org/123342"
+			die "your expr is broke"
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	EPATCH_SUFFIX="patch" \
+	PATCHDIR="${WORKDIR}/patch" \
+	EPATCH_EXCLUDE="001_all_coreutils-gen-progress-bar.patch" \
+	epatch
+
+	# 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.
+	touch man/*.1
+	# There's no reason for this crap to use the private version
+	sed -i 's:__mempcpy:mempcpy:g' lib/*.c
+
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+	if ! type -p cvs > /dev/null ; then
+		# Fix issues with gettext's autopoint if cvs is not installed,
+		# bug #28920.
+		export AUTOPOINT="/bin/true"
+	fi
+
+	local myconf=""
+	[[ ${USERLAND} == "GNU" ]] || myconf="${myconf} --bindir=/usr/libexec/gnu"
+	if echo "#include <regex.h>" | $(tc-getCPP) > /dev/null ; then
+		myconf="${myconf} --without-included-regex"
+	fi
+
+	# cross-compile workaround #177061
+	[[ ${CHOST} == *-linux* ]] && export fu_cv_sys_stat_statvfs=yes
+
+	use static && append-ldflags -static
+	# kill/uptime - procps
+	# groups/su   - shadow
+	# hostname    - net-tools
+	econf \
+		--enable-install-program="arch" \
+		--enable-no-install-program="groups,hostname,kill,su,uptime" \
+		--enable-largefile \
+		$(use_enable nls) \
+		$(use_enable acl) \
+		$(use_enable xattr) \
+		$(use_enable selinux) \
+		${myconf} \
+		|| 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}"
+	addwrite /dev/full
+	export RUN_EXPENSIVE_TESTS="yes"
+	#export FETISH_GROUPS="portage wheel"
+	make -k check || die "make check failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	rm -f "${D}"/usr/lib/charset.alias
+	dodoc AUTHORS ChangeLog* NEWS README* THANKS TODO
+
+	insinto /etc
+	newins src/dircolors.hin DIR_COLORS || die
+
+	# workaround bug in build system where `group` does not
+	# work with --enable-no-install-program configure option
+	rm "${D}"/usr/bin/groups "${D}"/usr/share/man/man1/groups.1 || 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."
+}