Fix tail -f behavior #57477 by rob holland. Have the progress bar use normal spaces...

diff --git a/sys-apps/coreutils/ChangeLog b/sys-apps/coreutils/ChangeLog
index e1f52faa962b8e3e32401c9ac2a78a226836e828..3b42021464319787999b1a0bfa465126ddc261fb 100644 (file)
--- a/sys-apps/coreutils/ChangeLog
+++ b/sys-apps/coreutils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/coreutils
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.116 2004/12/28 20:19:04 absinthe Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.117 2005/01/09 22:34:17 vapier Exp $
+
+*coreutils-5.2.1-r4 (09 Jan 2005)
+
+  09 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +coreutils-5.2.1-r4.ebuild:
+  Fix tail -f behavior #57477 by rob holland. Have the progress bar use normal
+  spaces #76903 by Nikolai Weibull. Fix chown --dereference #53750 by Georgi
+  Georgiev. Fix test running #75932 / #76089.
 
   28 Dec 2004; Dylan Carlson <absinthe@gentoo.org>
   coreutils-5.2.1-r2.ebuild:

diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 711d16633bacef01eac28d076804419cc4110192..c328110ec9e3c6495069c862a7025edc09e59a38 100644 (file)
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0694dfcd303f0a2559e6c745fe042d66 ChangeLog 22484
-MD5 83efa457e8e155248c2ebc6899dc6646 coreutils-5.2.1.ebuild 4149
+MD5 b979d374d00e409fbcd3e6aa2f730fda ChangeLog 22800
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 cc6fe5a82e8d5d973c1df141e7fff7bd coreutils-5.2.1-r3.ebuild 4204
+MD5 5e697dc0fc499ca779b9074c0ca124fc coreutils-5.2.1-r4.ebuild 4462
+MD5 a2c50bf6eb151e1c91b3f4d374305589 coreutils-5.2.1-r3.ebuild 4204
 MD5 0a532171a448adf8d523ca631e388f3b coreutils-5.2.1-r2.ebuild 4383
 MD5 d3828e48aebb7452db7a8f8b025da0ff files/DIR_COLORS 4041
-MD5 36e1cce43ca15be334d54801e1dbb286 files/digest-coreutils-5.2.1 224
-MD5 5336abda618b9eaa721564d34bb6de9b files/digest-coreutils-5.2.1-r3 225
+MD5 db20bb64b1d832abc699dc46d9b40304 files/digest-coreutils-5.2.1-r4 226
+MD5 77947b96aaadc6a33d53156b5b5e4630 files/digest-coreutils-5.2.1-r2 225
 MD5 5a7d722a7600e8834bf39c24790caaa2 files/003_all_coreutils-gentoo-uname-s390.patch 3120
+MD5 5336abda618b9eaa721564d34bb6de9b files/digest-coreutils-5.2.1-r3 225
 MD5 ad6c1b6661e030a48a57172f88d2960a files/coreutils-5.0.91-ppc64-1.patch 280
 MD5 dfc60c0aadb6d857701fb3fa137a12b5 files/003_all_coreutils-gentoo-uname.patch 3261
-MD5 77947b96aaadc6a33d53156b5b5e4630 files/digest-coreutils-5.2.1-r2 225
 MD5 569870ec2f958c2a2a716a7f695deb42 files/coreutils-5.2.1-unamefix.patch 485
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.14 (GNU/Linux)
 
-iD8DBQFB3yz/roRuSHgZdywRAqMpAKCTdkNqpdmxxd1pJQYIUDKMBqXQTgCcCor7
-gZk0ip7vfvsGZ4sxeWitT7I=
-=rxAc
+iD8DBQFB4bF+roRuSHgZdywRAqLpAJ92oQVWJJE45vcJ20hIpNKYtYDQZwCeMSIG
+e6zag9lBGU+tPKATXUa6Apo=
+=ivZx
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/coreutils/coreutils-5.2.1-r3.ebuild b/sys-apps/coreutils/coreutils-5.2.1-r3.ebuild
index fa303bf70228752c3b4e796e690dbe7a65ace336..b21415878a79d9fadead6d57d64f1159fe442739 100644 (file)
--- a/sys-apps/coreutils/coreutils-5.2.1-r3.ebuild
+++ b/sys-apps/coreutils/coreutils-5.2.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-5.2.1-r3.ebuild,v 1.2 2004/12/23 05:17:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-5.2.1-r3.ebuild,v 1.3 2005/01/09 22:34:17 vapier Exp $
 
 inherit eutils flag-o-matic
 

diff --git a/sys-apps/coreutils/coreutils-5.2.1.ebuild b/sys-apps/coreutils/coreutils-5.2.1-r4.ebuild
similarity index 61%
rename from sys-apps/coreutils/coreutils-5.2.1.ebuild
rename to sys-apps/coreutils/coreutils-5.2.1-r4.ebuild
index 7dc59e76cc90d30a6cfcc3ede604197f34814b17..f65a84db32535c1f26e60fcecac1e77bcc21611e 100644 (file)
--- a/sys-apps/coreutils/coreutils-5.2.1.ebuild
+++ b/sys-apps/coreutils/coreutils-5.2.1-r4.ebuild
@@ -1,26 +1,26 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-5.2.1.ebuild,v 1.15 2004/11/12 15:37:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-5.2.1-r4.ebuild,v 1.1 2005/01/09 22:34:17 vapier Exp $
 
 inherit eutils flag-o-matic
 
-PATCH_VER=0.3
-I18N_VER=i18n-0.1
+PATCH_VER=0.9
+I18N_VER=i18n-0.2
 PATCHDIR=${WORKDIR}/patch
 
 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}-gentoo-${PATCH_VER}.tar.bz2
-       mirror://gentoo/${P}-${I18N_VER}.patch.gz
-       mirror://gentoo/${P}-gentoo-${PATCH_VER}.tar.bz2
-       mirror://gentoo/${P}-${I18N_VER}.patch.gz
-       mirror://gentoo/${P}-gentoo-${PATCH_VER}.tar.bz2"
+       mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2
+       mirror://gentoo/${P}-${I18N_VER}.patch.bz2
+       http://dev.gentoo.org/~seemant/distfiles/${P}-patches-${PATCH_VER}.tar.bz2
+       http://dev.gentoo.org/~seemant/distfiles/${P}-${I18N_VER}.patch.bz2
+       http://dev.gentoo.org/~vapier/dist/${P}-patches-${PATCH_VER}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="nls build acl selinux static uclibc"
 
 RDEPEND="selinux? ( sys-libs/libselinux )
@@ -30,7 +30,7 @@ RDEPEND="selinux? ( sys-libs/libselinux )
 DEPEND="${RDEPEND}
        virtual/libc
        >=sys-apps/portage-2.0.49
-       >=sys-devel/automake-1.8.3
+       =sys-devel/automake-1.8*
        >=sys-devel/autoconf-2.58
        >=sys-devel/m4-1.4-r1
        !uclibc? ( sys-apps/help2man )"
@@ -40,20 +40,12 @@ src_unpack() {
 
        cd ${S}
 
-       # the version of this patch in the patch tarball is broken on amd64
-       cp ${FILESDIR}/003_all_coreutils-gentoo-uname.patch ${PATCHDIR}/generic
-
-       # Mandrake's lsw patch caused issues on ia64 and amd64 with ls
-       # Reported upstream, but we don't apply it for now
-       # mv ${PATCHDIR}/mandrake/019* ${PATCHDIR}/excluded
-       mv ${PATCHDIR}/mandrake/025* ${PATCHDIR}/excluded
        EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/mandrake
        epatch ${WORKDIR}/${P}-${I18N_VER}.patch
 
        # Apply the ACL patches. 
        # WARNING: These CONFLICT with the SELINUX patches
-       if use acl
-       then
+       if use acl ; then
                mv ${PATCHDIR}/generic/00{1,2,4}* ${PATCHDIR}/excluded
                mv ${PATCHDIR}/selinux/001_all_coreutils-noacl* ${PATCHDIR}/excluded
                EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/acl
@@ -66,25 +58,29 @@ src_unpack() {
        # do not include su infopage, as it is not valid for the su
        # from sys-apps/shadow that we are using.
        # Patch to add processor specific info to the uname output
-
        EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/generic
-
        EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/extra
 
        use selinux && EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/selinux
 
-       # this fixes bug #61735 (which was also a general b0rk-age)
-       epatch ${FILESDIR}/coreutils-5.2.1-unamefix.patch
+       # Sparc32 SMP bug fix -- see bug #46593
+       use sparc && echo -ne "\n\n" >> ${S}/src/pr.c
+
+       # 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.
+       [[ ${CTARGET:-${CHOST}} != ${CHOST} ]] && touch man/*.1
 }
 
 src_compile() {
-       if [ -z "`which cvs 2>/dev/null`" ]
-       then
+       if ! type -p cvs > /dev/null ; then
                # Fix issues with gettext's autopoint if cvs is not installed,
                # bug #28920.
-                       export AUTOPOINT="/bin/true"
+               export AUTOPOINT="/bin/true"
        fi
 
+       ebegin "Reconfiguring configure scripts (be patient)"
        export WANT_AUTOMAKE=1.8
        export WANT_AUTOCONF=2.5
 
@@ -92,51 +88,56 @@ src_compile() {
        touch aclocal.m4 configure config.hin \
                Makefile.in */Makefile.in */*/Makefile.in
 
-       ebegin "Reconfiguring configure scripts (be patient)"
-       aclocal -I m4 &>/dev/null || die
-       autoconf || die
-       automake || die
+       aclocal -I m4 || die "aclocal"
+       autoconf || die "autoconf"
+       automake || die "automake"
        eend $?
 
        econf \
                --bindir=/bin \
                --enable-largefile \
-               `use_enable nls` \
-               `use_enable selinux` || die
+               $(use_enable nls) \
+               $(use_enable selinux) \
+               || die "econf"
 
-       if use static
-       then
-               emake LDFLAGS=-static || die
-       else
-               emake || die
-       fi
+       use static && append-ldflags -static
+       emake LDFLAGS="${LDFLAGS}" || die "emake"
 }
 
-src_install() {
-       einstall \
-               bindir=${D}/bin || die
+src_test() {
+       # Non-root tests will fail if the full path isnt
+       # accessible to non-root users
+       chmod a+rx "${WORKDIR}"
+       addwrite /dev/full
+       export RUN_EXPENSIVE_TESTS="yes"
+       #export FETISH_GROUPS="portage wheel"
+       make check || die "make check failed"
+}
 
-       cd ${D}
-       dodir /usr/bin
-       rm -rf usr/lib
+src_install() {
+       make install DESTDIR="${D}" || die
 
        # add DIRCOLORS
        insinto /etc
        doins ${FILESDIR}/DIR_COLORS
 
        # 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 usr/bin
-       ln -s ../../bin/* .
-
-       if ! use build
-       then
+       mv bin/{tail,test,[,tsort,unexpand,users} usr/bin
+       cd bin
+       local x
+       for x in * ; do
+               dosym /bin/${x} /usr/bin/${x}
+       done
+
+       if ! use build ; then
                cd ${S}
                dodoc AUTHORS ChangeLog* NEWS README* THANKS TODO
        else
-               rm -rf ${D}/usr/share
+               rm -r "${D}"/usr/share
        fi
 }
 

diff --git a/sys-apps/coreutils/files/digest-coreutils-5.2.1 b/sys-apps/coreutils/files/digest-coreutils-5.2.1
deleted file mode 100644 (file)
index 1fe7000..0000000
--- a/sys-apps/coreutils/files/digest-coreutils-5.2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 172ee3c315af93d3385ddfbeb843c53f coreutils-5.2.1.tar.bz2 4270776
-MD5 f75140459c59b4e6301e2e830b39b132 coreutils-5.2.1-gentoo-0.3.tar.bz2 61075
-MD5 34f8286d25e5dd049482c0f92bb4f796 coreutils-5.2.1-i18n-0.1.patch.gz 25741

diff --git a/sys-apps/coreutils/files/digest-coreutils-5.2.1-r4 b/sys-apps/coreutils/files/digest-coreutils-5.2.1-r4
new file mode 100644 (file)
index 0000000..918feca
--- /dev/null
+++ b/sys-apps/coreutils/files/digest-coreutils-5.2.1-r4
@@ -0,0 +1,3 @@
+MD5 172ee3c315af93d3385ddfbeb843c53f coreutils-5.2.1.tar.bz2 4270776
+MD5 b11e708dccac63c1a96cad6de46ec065 coreutils-5.2.1-patches-0.9.tar.bz2 70090
+MD5 7dad35dee7a6517440feac4eef8b64c4 coreutils-5.2.1-i18n-0.2.patch.bz2 21795