Version bump.

Package-Manager: portage-2.1.1_pre1-r2

4 files changed, 190 insertions, 15 deletions

diff --git a/sys-apps/coreutils/ChangeLog b/sys-apps/coreutils/ChangeLog
index 4bc960b711bd..278c7501977e 100644
--- a/sys-apps/coreutils/ChangeLog
+++ b/sys-apps/coreutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/coreutils
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.172 2006/06/01 23:32:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.173 2006/06/25 03:52:52 vapier Exp $
+
+*coreutils-5.97 (25 Jun 2006)
+
+  25 Jun 2006; Mike Frysinger <vapier@gentoo.org> +coreutils-5.97.ebuild:
+  Version bump.
 
   01 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> coreutils-5.96.ebuild:
   Restrict confcache as per bug #134459.
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 4eef099000c2..c7074927a66a 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -14,13 +14,15 @@ DIST coreutils-5.2.1.tar.bz2 4270776 RMD160 a72bdb360371c026e77281ae0d543bdcce55
 DIST coreutils-5.3.0-patches-1.4.tar.bz2 56045 RMD160 bca8a8918c100f0a5f5f615e4ab6cb4e493a289b SHA256 8baaf13fdaa8304cd65b61585397fbf4d11f063580f54e222050746f72cdb237
 DIST coreutils-5.3.0.tar.bz2 4473010 RMD160 7c62567254727979ac503ddf87fcb0d406ce7b28 SHA256 7c3181475402d2b547a407a77b1a8de986eb3a19ee2051f2748e968a7ab83a8c
 DIST coreutils-5.94-patches-1.2.tar.bz2 61330 RMD160 34b3f0e5ed804343a8b7d86efc4571587b4f1341 SHA256 f66a153d63785da026bd294aa5ee1a61bddb367d47e39655cfd43fb7d40b54c7
-DIST coreutils-5.94-patches-1.4.tar.bz2 64744 RMD160 c8b89e28ab0e9831ee817a5107d6d1cdf0ee1871 SHA1 4b01a6c1916e8cd8675160d603764b739a173a5a SHA256 55dc9785cb2158a0d9151999ced4b6c8841bf58bf7ca22894b9564afb2aa9ac6
-DIST coreutils-5.94-patches-1.5.tar.bz2 65180 RMD160 c2e7c4632cc8c4ea9d01bb85a371212e6af4600a SHA1 68024334e6d25d378b74ca67ece8d93ff295f56d SHA256 f3b53c8a1175e5d5f8f233e03b41137e5fa35b0cd581dca6207958776af7b316
-DIST coreutils-5.94.tar.bz2 5047523 RMD160 c3620710beea1b8d604210bdec8fbe0a3da892ab SHA1 c39add02995304e1cf3dfc8543702f22155fba50 SHA256 5942f8ba08e0e2faf425d2c0dc62688b1253166c51b170ca1580db5a0b984d5c
-DIST coreutils-5.95-patches-1.0.tar.bz2 62323 RMD160 48f347d4334bfe78beef56c15fbff050f0ddde5b SHA1 3c1cc552d2eab25c468fff4ca3db19e7dc97e1d7 SHA256 447e97869de03ca83a613fb340e6e321409994d533732e54047981ca95392fa8
-DIST coreutils-5.95.tar.bz2 5047901 RMD160 5ee1b3171e001efbfc263faf20c2f2b44551f4af SHA1 9c5396c296563a7c7b02205ade67eea9dfe24f5a SHA256 8a1a5df82c81586be25717fc9796d841b212ebb03ad0e3d4f245272301b883e3
-DIST coreutils-5.96-patches-1.2.tar.bz2 62601 RMD160 2267963df46299ebd83dd9ce60e7a988622e9fee SHA1 2dcbed5ede6cfe4a296d86f2fef58e325c1c65f3 SHA256 69175156a1757f38f1aecc93e7a88cc433a8627ac911fb3c23e6e724fc73109c
-DIST coreutils-5.96.tar.bz2 5066612 RMD160 a875565fd5c17dd19b188fde7f3aa2f862743084 SHA1 782379daf200427058ca94a408566d600f779823 SHA256 7d0a6b5d87b5d68674213aa7e264d96ab7c3c0b4264fcc82fbc54920b1a37fcc
+DIST coreutils-5.94-patches-1.4.tar.bz2 64744 RMD160 c8b89e28ab0e9831ee817a5107d6d1cdf0ee1871 SHA256 55dc9785cb2158a0d9151999ced4b6c8841bf58bf7ca22894b9564afb2aa9ac6
+DIST coreutils-5.94-patches-1.5.tar.bz2 65180 RMD160 c2e7c4632cc8c4ea9d01bb85a371212e6af4600a SHA256 f3b53c8a1175e5d5f8f233e03b41137e5fa35b0cd581dca6207958776af7b316
+DIST coreutils-5.94.tar.bz2 5047523 RMD160 c3620710beea1b8d604210bdec8fbe0a3da892ab SHA256 5942f8ba08e0e2faf425d2c0dc62688b1253166c51b170ca1580db5a0b984d5c
+DIST coreutils-5.95-patches-1.0.tar.bz2 62323 RMD160 48f347d4334bfe78beef56c15fbff050f0ddde5b SHA256 447e97869de03ca83a613fb340e6e321409994d533732e54047981ca95392fa8
+DIST coreutils-5.95.tar.bz2 5047901 RMD160 5ee1b3171e001efbfc263faf20c2f2b44551f4af SHA256 8a1a5df82c81586be25717fc9796d841b212ebb03ad0e3d4f245272301b883e3
+DIST coreutils-5.96-patches-1.2.tar.bz2 62601 RMD160 2267963df46299ebd83dd9ce60e7a988622e9fee SHA256 69175156a1757f38f1aecc93e7a88cc433a8627ac911fb3c23e6e724fc73109c
+DIST coreutils-5.96.tar.bz2 5066612 RMD160 a875565fd5c17dd19b188fde7f3aa2f862743084 SHA256 7d0a6b5d87b5d68674213aa7e264d96ab7c3c0b4264fcc82fbc54920b1a37fcc
+DIST coreutils-5.97-patches-1.0.tar.bz2 62689 RMD160 1138a1497555843d0d6a8cf46bc6707911bff500 SHA1 65231d6529720d4bee0888bad7aa22f9a04bf368 SHA256 16d05bfb4ee81e871f4cf21b991d4a5b9b60d1a0f83f2a4a9592b18a50a33231
+DIST coreutils-5.97.tar.bz2 5064684 RMD160 96750ad46f0ae1d4af3c714076b5c384a2b901a9 SHA1 6a5cf0b15433569af0de9a7bc3f4ef281d876b31 SHA256 d5266d6421d88902c1c4425b613052ce986abf4bdd73616f35792263bfd91519
 EBUILD coreutils-5.2.1-r7.ebuild 4574 RMD160 29716ddcca9bbd9d90369395d104bf6a8a4fd268 SHA1 788510720116cc6b596f21b2774a5f7450054ded SHA256 f3a846cdf629f53455043b8857fcb8d46cd2ed4aed666ea173599b0c26454a7c
 MD5 c1f9157af3a6f2c2f2e10bac139be7ec coreutils-5.2.1-r7.ebuild 4574
 RMD160 29716ddcca9bbd9d90369395d104bf6a8a4fd268 coreutils-5.2.1-r7.ebuild 4574
@@ -49,10 +51,14 @@ EBUILD coreutils-5.96.ebuild 4730 RMD160 51a0bc106c71079467bc9b0ae3d0885ad98488a
 MD5 c87a282c5cec25226b6d3ae037cc2bb6 coreutils-5.96.ebuild 4730
 RMD160 51a0bc106c71079467bc9b0ae3d0885ad98488a3 coreutils-5.96.ebuild 4730
 SHA256 d09b9721955cba956bb3e60087c75a6e728294d719acb65ff833773dfb1848e6 coreutils-5.96.ebuild 4730
-MISC ChangeLog 27238 RMD160 dbaf5e3e7d1384d84dbe89a950c3264c4d8c3b27 SHA1 14c46e71ecb513c2d60c0d97eef2c06d92e0d26c SHA256 a0feda96accf9fc9592f3eaae18fbadd1c9a2cfa68d3316caef09bce6beb4d9d
-MD5 27f15a91c935c54d8897d99067c05318 ChangeLog 27238
-RMD160 dbaf5e3e7d1384d84dbe89a950c3264c4d8c3b27 ChangeLog 27238
-SHA256 a0feda96accf9fc9592f3eaae18fbadd1c9a2cfa68d3316caef09bce6beb4d9d ChangeLog 27238
+EBUILD coreutils-5.97.ebuild 4741 RMD160 27ca68d5b9f7e9609e2aa9757b47ff636cd7dc79 SHA1 e30846fc74d2d5acde288f2119fc60c575502457 SHA256 7e1a9b5ead28f3422642fceaa5195832916ff0679a95d68e2761b1053e4a5fe5
+MD5 a24e13ffa446a4abd2e9b003d4ace5a1 coreutils-5.97.ebuild 4741
+RMD160 27ca68d5b9f7e9609e2aa9757b47ff636cd7dc79 coreutils-5.97.ebuild 4741
+SHA256 7e1a9b5ead28f3422642fceaa5195832916ff0679a95d68e2761b1053e4a5fe5 coreutils-5.97.ebuild 4741
+MISC ChangeLog 27357 RMD160 184fdc20ac16ad5df5156b3e6af4e580ac2e0b36 SHA1 b80aea5a547b74c34acd3f5aa18b951ec2039c48 SHA256 d3342c9b29383a927989543d3b34b3d09ac8438c8969830f28d7d9006abb19cb
+MD5 cb13aa4fb079411afb4bdb2546aa1453 ChangeLog 27357
+RMD160 184fdc20ac16ad5df5156b3e6af4e580ac2e0b36 ChangeLog 27357
+SHA256 d3342c9b29383a927989543d3b34b3d09ac8438c8969830f28d7d9006abb19cb ChangeLog 27357
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -78,10 +84,13 @@ SHA256 c43f159e044da3a2bf04cb9bea1e3a59c3bf146ef2d338290c7492e6b3e476c0 files/di
 MD5 d2c621d14fbe0d1afc3ef9366b48650d files/digest-coreutils-5.96 530
 RMD160 4cb53225671109a845c26214498da8be732665fe files/digest-coreutils-5.96 530
 SHA256 be597fc83fb3de36b46093660ae253f3ed0f42f526a11d67ebe884ced2260d1f files/digest-coreutils-5.96 530
+MD5 8104abee41c673b0c5a208e5509c1e1b files/digest-coreutils-5.97 530
+RMD160 69cbe453a82084dbb15e87f42fce41abb0fdcba4 files/digest-coreutils-5.97 530
+SHA256 37bbcbcd1678fdeb030c8196e93c961dbbdd098746ac2bf86a6c09d8f1cd2e13 files/digest-coreutils-5.97 530
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEhsvu2+ySkm8kpY0RAh7tAJ0WVZZVWYeg1M81rOmJ6hIXbAEzUQCfU3hP
-gi/xnRa5AXIFelRJNEzZeuI=
-=Mb9v
+iD8DBQFEngnaamhnQswr0vIRAqiMAJ9Xb5hGhmxTVrOYqhXis+gD01eHgQCfQ1C1
+RXXyU8M5xwKUoevbqmppyzs=
+=CJat
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/coreutils/coreutils-5.97.ebuild b/sys-apps/coreutils/coreutils-5.97.ebuild
new file mode 100644
index 000000000000..ef3355ff310b
--- /dev/null
+++ b/sys-apps/coreutils/coreutils-5.97.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-5.97.ebuild,v 1.1 2006/06/25 03:52:52 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs autotools
+
+PATCH_VER="1.0"
+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="mirror://gnu/${PN}/${P}.tar.bz2
+	mirror://gentoo/${P}.tar.bz2
+	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2
+	http://dev.gentoo.org/~vapier/dist/${P}-patches-${PATCH_VER}.tar.bz2
+	http://dev.gentoo.org/~kingtaco/mirror/${P}-patches-${PATCH_VER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="acl nls selinux static"
+
+RDEPEND="selinux? ( sys-libs/libselinux )
+	acl? ( sys-apps/acl sys-apps/attr )
+	nls? ( sys-devel/gettext )
+	>=sys-libs/ncurses-5.3-r5"
+DEPEND="${RDEPEND}
+	=sys-devel/automake-1.8*
+	>=sys-devel/autoconf-2.59d
+	>=sys-devel/m4-1.4-r1
+	sys-apps/help2man"
+
+RESTRICT="confcache"
+
+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}"
+
+	PATCHDIR="${WORKDIR}/patch"
+
+	EPATCH_MULTI_MSG="Applying patches from Mandrake ..." \
+	EPATCH_SUFFIX="patch" epatch "${PATCHDIR}"/mandrake
+
+	# Apply the ACL/SELINUX patches.
+	if use selinux ; then
+		EPATCH_MULTI_MSG="Applying SELINUX patches ..." \
+		EPATCH_SUFFIX="patch" epatch "${PATCHDIR}"/selinux
+		( cd "${PATCHDIR}" ; epatch selinux/GLUE* ) || die "glue failed"
+	elif use acl ; then
+		EPATCH_MULTI_MSG="Applying ACL patches ..." \
+		EPATCH_SUFFIX="patch" epatch "${PATCHDIR}"/acl
+	fi
+
+	EPATCH_SUFFIX="patch" epatch "${PATCHDIR}"/generic
+	chmod a+rx tests/sort/sort-mb-tests
+
+	# Since we've patched many .c files, the make process will
+	# try to re-build the manpages by running `./bin --help`.
+	# When cross-compiling, we can't do that since 'bin' isn't
+	# a native binary, so let's just install outdated man-pages.
+	tc-is-cross-compiler && touch man/*.1
+	# There's no reason for this crap to use the private version
+	sed -i 's:__mempcpy:mempcpy:g' lib/*.c
+
+	export WANT_AUTOMAKE=1.9
+	export WANT_AUTOCONF=2.5
+	ebegin "Reconfiguring configure scripts (be patient)"
+	aclocal -I m4 || die "aclocal"
+	autoconf || die "autoconf"
+	automake || die "automake"
+	eend $?
+}
+
+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=/bin" \
+		|| myconf="${myconf} --bindir=/usr/libexec/gnu"
+
+	[[ ${ELIBC} == "glibc" || ${ELIBC} == "uclibc" ]] \
+		&& myconf="${myconf} --without-included-regex"
+
+	use static && append-ldflags -static
+	econf \
+		--enable-largefile \
+		$(use_enable nls) \
+		$(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 check || die "make check failed"
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die
+	rm -f "${D}"/usr/lib/charset.alias
+	dodoc AUTHORS ChangeLog* NEWS README* THANKS TODO
+
+	# remove files provided by other packages
+	rm "${D}"/bin/{kill,uptime} # procps
+	rm "${D}"/bin/{groups,su}   # shadow
+	rm "${D}"/bin/hostname      # net-tools
+	rm "${D}"/usr/share/man/man1/{groups,kill,hostname,su,uptime}.1
+	# provide by the man-pages package
+	rm "${D}"/usr/share/man/man1/{chgrp,chmod,chown,cp,dd,df,dir,dircolors}.1
+	rm "${D}"/usr/share/man/man1/{du,install,ln,ls,mkdir,mkfifo,mknod,mv}.1
+	rm "${D}"/usr/share/man/man1/{rm,rmdir,touch,vdir}.1
+
+	insinto /etc
+	newins src/dircolors.hin DIR_COLORS
+
+	if [[ ${USERLAND} == "GNU" ]] ; then
+		# move non-critical packages into /usr
+		cd "${D}"
+		dodir /usr/bin
+		mv bin/{csplit,expand,factor,fmt,fold,join,md5sum,nl,od} usr/bin
+		mv bin/{paste,pathchk,pinky,pr,printf,sha1sum,shred,sum,tac} usr/bin
+		mv bin/{tail,test,[,tsort,unexpand,users} usr/bin
+		cd bin
+		local x
+		for x in * ; do
+			dosym /bin/${x} /usr/bin/${x}
+		done
+	else
+		# For now, drop the man pages, collides with the ones of the system.
+		rm -rf ${D}/usr/share/man
+	fi
+}
diff --git a/sys-apps/coreutils/files/digest-coreutils-5.97 b/sys-apps/coreutils/files/digest-coreutils-5.97
new file mode 100644
index 000000000000..5481fc2cee7c
--- /dev/null
+++ b/sys-apps/coreutils/files/digest-coreutils-5.97
@@ -0,0 +1,6 @@
+MD5 921c7c34611767d5a2a6f81854af29a3 coreutils-5.97-patches-1.0.tar.bz2 62689
+RMD160 1138a1497555843d0d6a8cf46bc6707911bff500 coreutils-5.97-patches-1.0.tar.bz2 62689
+SHA256 16d05bfb4ee81e871f4cf21b991d4a5b9b60d1a0f83f2a4a9592b18a50a33231 coreutils-5.97-patches-1.0.tar.bz2 62689
+MD5 1537379b6264a1def443713988a78020 coreutils-5.97.tar.bz2 5064684
+RMD160 96750ad46f0ae1d4af3c714076b5c384a2b901a9 coreutils-5.97.tar.bz2 5064684
+SHA256 d5266d6421d88902c1c4425b613052ce986abf4bdd73616f35792263bfd91519 coreutils-5.97.tar.bz2 5064684