Version bump.

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

3 files changed, 164 insertions, 8 deletions

diff --git a/sys-apps/coreutils/ChangeLog b/sys-apps/coreutils/ChangeLog
index cd2eaf8648da..5cf7a403f19c 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.283 2010/01/08 03:35:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.284 2010/01/13 23:33:48 vapier Exp $
+
+*coreutils-8.4 (13 Jan 2010)
+
+  13 Jan 2010; Mike Frysinger <vapier@gentoo.org> +coreutils-8.4.ebuild:
+  Version bump.
 
 *coreutils-8.3 (08 Jan 2010)
 
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 007afc4a95bf..6746ca5ccb4f 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -9,19 +9,19 @@ DIST coreutils-8.1-patches-1.tar.lzma 5187 RMD160 85e626095e4539c4dec13559e06a0d
 DIST coreutils-8.1.tar.gz 10379352 RMD160 aac4a5cfa6afb0eae1d53aea060838f8c2281d5b SHA1 4a8bdbffa1201e51ca256292f43d0fc35e04adcc SHA256 5ea1adda4df2ad61e0184f5c7b08a2ad13db1a581d5da19610dd3c4718c1c8b0
 DIST coreutils-8.2-patches-2.tar.lzma 27476 RMD160 6b2f590796e421f4ac9ba94944857bbd4126c625 SHA1 be40b2d592d68119ae7d49e792f23ba3dad5b19d SHA256 7a0e2c4cc9ff3ded9e9384934d0b6058844a30ea21c836f2ba5a71ccf777f330
 DIST coreutils-8.2.tar.gz 10697533 RMD160 72ad3df1e0d2ebb982ce993e03410a11234b7acb SHA1 f25f9240f6da5400f36aebdd1e21e85110ab9f0f SHA256 d3c3055d16554ded9ec3b06f31337588179f15d715c4c32104ddf351f1ad4f41
-DIST coreutils-8.3-patches-1.tar.lzma 26720 RMD160 89d3945d1e72899c7630131510bf7c643ed5eff5 SHA1 a35e2e307d81a8a55af5f1e905ab22cacaa3ae12 SHA256 3dd611b4c859836b07f1ea96e38bfc0172be2bbbc057a7f256034a3930ae3f1b
-DIST coreutils-8.3.tar.gz 10734711 RMD160 36811004533df6e5fdc26bfafb21eff36c9ed87e SHA1 2ab33c39f971716e2fd64770b1e86a9da4226cce SHA256 10a64f0f0e223ff5c005e2dce6f1234d3ff39af85fd8068f82fdd76aaaacf051
+DIST coreutils-8.4-patches-1.tar.lzma 26702 RMD160 527759a31ae9d004d66d4df252161ff6fae9a64a SHA1 ab832561e9e8c2dadabe274d0012ce15b83c3c2c SHA256 c351f8f3f365d20f05545f461c4c931004da4073e25a6a77f6c68c685b55a13d
+DIST coreutils-8.4.tar.gz 10519759 RMD160 26ba81ce235997bd6f82c903e8234f2c86e15b5a SHA1 89eefb041215c30408261f46f59dc08e4b500edf SHA256 8bb08d3f5843f25d0f306848cc3514889232267e68d9a66dd20e1e363d0d017f
 EBUILD coreutils-7.5-r1.ebuild 4628 RMD160 f611f4ca3a1da2ebf2350f2b864fcbe09319b61e SHA1 99c7c9dd3437971c13ef38e42566e59a6a3a4545 SHA256 44faf0c5fa187e04696fe752b3ed0a95f8d4b40c6e045ec6c065094ca721129f
 EBUILD coreutils-7.6.ebuild 4780 RMD160 f40ce165aa7888045a0f28e4198e4d11cb605897 SHA1 0ca2e0228801651ee81454f6a04aef73db832e05 SHA256 22150c0c7cbd7d2709224445821558ffdeace828355bd29316033c35caa3d276
 EBUILD coreutils-8.1.ebuild 4753 RMD160 9d59de121f11f960978715d317d83b1b61333827 SHA1 98852deff3756da9fe11c7dfb0f6878b41084c6d SHA256 e3838607adab48571ac6ea97205d959097cda06967f766e6eee27ce1721b59b6
 EBUILD coreutils-8.2.ebuild 4832 RMD160 95f463395ca3bce514c1affc035117a86f86596d SHA1 7bd10cde1d6fbb811da3394799ef0819ac9ce6f9 SHA256 2c686ef13d86dbdb1c1621ae7dceb2fbdbb0f0d01180765caa1a1a4d1102b072
-EBUILD coreutils-8.3.ebuild 4832 RMD160 759752fb06d0fceac178485a6f6171a99ef6ca0a SHA1 3c3b7afc79971f638cb7fc10d2ce4533bb8ef4dd SHA256 0f4c3425ef6d8fe79d96289cb66efebae9e0967810cb0c6217457168dabf9a06
-MISC ChangeLog 41772 RMD160 2dbf458ea46e6aeefd605934fea5f8562ec63e75 SHA1 b49002139ddb2f89dc1fdd9308cb8f9e6798563c SHA256 83f0a28b41ae40b1a8e1b77581699630e2e1ab61a4843d8df812f0d106f19002
+EBUILD coreutils-8.4.ebuild 4832 RMD160 e244725c273b293132e8edcfc124d010adaccdfa SHA1 1881cf20f2e32fce55f562764e0c45c2b05182fe SHA256 d5fa773b408b760693e8cbefe296e51c22f10c68a0b07e9fd577a9be601d7b11
+MISC ChangeLog 41892 RMD160 3bbe4f568e3c63c8dc92cf5a2e4c7971be11815d SHA1 5129170e45bb0d026ac89e5eef255464e49f1a10 SHA256 aef0d715e59a3a80cd0705ec5a0e20ec0569a9013357ef0d81d94531dd01d8ec
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iF4EAREIAAYFAktGp/AACgkQTwhj9JtAlp5iuAD+MJlAx685ZjdCP7pBUDBEiX3R
-ZZcRivQc8TeZ7cN9n+QBAJQuE3ry2Cak2KWk07c+l3Ov1dq+fcXv/we5Gswbi7Yr
-=PeAA
+iF4EAREIAAYFAktOWHUACgkQTwhj9JtAlp4j9gEAqr8RUJVnuySpXF3uik/8cYpR
+oJ3FzxYQuJYQn/LtcWMA/iHRGCvSdqJubvHvchYhnSq1Jg2W1YueNVLXfCe917Tp
+=ma2M
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/coreutils/coreutils-8.4.ebuild b/sys-apps/coreutils/coreutils-8.4.ebuild
new file mode 100644
index 000000000000..25da6314425b
--- /dev/null
+++ b/sys-apps/coreutils/coreutils-8.4.ebuild
@@ -0,0 +1,151 @@
+# 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.4.ebuild,v 1.1 2010/01/13 23:33:48 vapier Exp $
+
+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.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() {
+	use static && append-ldflags -static
+	# 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
+}