Fix ls -x error #173032 and install man pages #105188.

Package-Manager: portage-2.1.2.4

diff --git a/sys-apps/coreutils/ChangeLog b/sys-apps/coreutils/ChangeLog
index 4b1475f79f2641f6e41cb83ecd49685fc75182cc..406b5694eb7e163f5d83a2c8c9f40f8c4110944b 100644 (file)
--- a/sys-apps/coreutils/ChangeLog
+++ b/sys-apps/coreutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/coreutils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.202 2007/04/24 08:06:55 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.203 2007/04/30 18:55:59 vapier Exp $
+
+*coreutils-6.9-r1 (30 Apr 2007)
+
+  30 Apr 2007; Mike Frysinger <vapier@gentoo.org> +coreutils-6.9-r1.ebuild:
+  Fix ls -x error #173032 and install man pages #105188.
 
   24 Apr 2007; Bryan Østergaard <kloeri@gentoo.org>
   coreutils-6.7-r1.ebuild:

diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index c4bc81488d0409cc24d81dc52cbd3ea5de021af0..20ac8e430006ae380c0df5d72d9c9f201e131d18 100644 (file)
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -17,6 +17,7 @@ DIST coreutils-6.7-patches-1.0.tar.bz2 32171 RMD160 431ee64bfb8ec89f460b199aa3a4
 DIST coreutils-6.7-patches-1.1.tar.bz2 32208 RMD160 a1187df0f9a8b98bd25126b5e7582f447748c907 SHA1 23fc9913bf54d9cd9f4fd132d30c084578640e2c SHA256 77f6aa56296386d5e3c9e2590c62778bc79a0c95a84951afec039191600d2379
 DIST coreutils-6.7.tar.bz2 5315342 RMD160 593acd266431db1777505bd181a7ffe095774beb SHA1 55a6037365f749a4ebb9e88a92132a4f938ac90e SHA256 4d7027cc803682decdadf850095dce7e22cc08eba2b1283e16d0fb7a675ac1f0
 DIST coreutils-6.9-patches-1.1.tar.bz2 47243 RMD160 4b0b5e36a4ff5d50d9901b8493cc31e46902f0b9 SHA1 f2f919042e2e72ec3281b0de1731227dc0aa0f81 SHA256 c48c0fe2a218310a7bb1272075095f3d930da666232f0566fb3ca5cd46119fa3
+DIST coreutils-6.9-patches-1.2.tar.bz2 49161 RMD160 11f2bf30c5efdd705c38648d3e5dfb383cf62508 SHA1 c6635f62ba015bd54a8137c65529429ca98321ce SHA256 0706957589f60cc269dac08588dc74c1312e837f3fc3a77a88cee449b2e82671
 DIST coreutils-6.9.tar.bz2 5384378 RMD160 c6ae65204b2e9c234a1140f39a8be1ee5cdcaab7 SHA1 10310a78c4e1d9f742f3815ac28e9bf1086a5885 SHA256 89c2895ad157de50e53298b22d91db116ee4e1dd3fdf4019260254e2e31497b0
 EBUILD coreutils-5.94-r1.ebuild 4563 RMD160 beb789a2f9f2913b7e5512c880a7cd7b59dbe846 SHA1 888fdbd28eece38c55b152c978d839650054f89c SHA256 a55c89c973f4d63a5ae8f60e60c70a84f05dad4a5e1a91c2e9ddeaecbc25d65d
 MD5 6019675c7bd8f8ad8ac9354de72365c2 coreutils-5.94-r1.ebuild 4563
@@ -34,14 +35,18 @@ EBUILD coreutils-6.7.ebuild 4539 RMD160 d59f56e55d0045ab32484b18ca7134f912936f8b
 MD5 7a22938b9193303b2c6a4676a1e376db coreutils-6.7.ebuild 4539
 RMD160 d59f56e55d0045ab32484b18ca7134f912936f8b coreutils-6.7.ebuild 4539
 SHA256 b79614040ac8ceee6ecfe1b0b5cf94b7a555f949c5147f617d19968a82ee0989 coreutils-6.7.ebuild 4539
+EBUILD coreutils-6.9-r1.ebuild 4591 RMD160 2c51af9e83c45a1281864621b049b8c200d217b9 SHA1 91cb491c90e4cc832e09ca4783fd0b7fbf2a646d SHA256 14d046b73f7a66c61761eb4c129e70d0f328464f7523d2c4d9982abaac4219d2
+MD5 c2d876c0319ad227732723fc42e93368 coreutils-6.9-r1.ebuild 4591
+RMD160 2c51af9e83c45a1281864621b049b8c200d217b9 coreutils-6.9-r1.ebuild 4591
+SHA256 14d046b73f7a66c61761eb4c129e70d0f328464f7523d2c4d9982abaac4219d2 coreutils-6.9-r1.ebuild 4591
 EBUILD coreutils-6.9.ebuild 4783 RMD160 d5136012ee4b9d0b5850a2db9ee3055a663b18db SHA1 e1af58e9dfedc853357c05d456564c25d9205ee5 SHA256 dc5544d599aaca99bfc8da9d0cad5ffda2408410a5e70cbd32b286698404f10f
 MD5 28471bf83f276e7eecff89d0eaae2404 coreutils-6.9.ebuild 4783
 RMD160 d5136012ee4b9d0b5850a2db9ee3055a663b18db coreutils-6.9.ebuild 4783
 SHA256 dc5544d599aaca99bfc8da9d0cad5ffda2408410a5e70cbd32b286698404f10f coreutils-6.9.ebuild 4783
-MISC ChangeLog 31013 RMD160 c1ca88bffbf10852f888bd7447f5e121e2bc80c1 SHA1 61f4b41bb0920f2a77801ce9c2f57b2e261f6b85 SHA256 af58d4ad5389a243e2ad91bdfaab7d1c75975fdbb66109b743d147963e9c78ef
-MD5 3731b543bf4887b15195c5be0c196c3c ChangeLog 31013
-RMD160 c1ca88bffbf10852f888bd7447f5e121e2bc80c1 ChangeLog 31013
-SHA256 af58d4ad5389a243e2ad91bdfaab7d1c75975fdbb66109b743d147963e9c78ef ChangeLog 31013
+MISC ChangeLog 31180 RMD160 e717b2a660f71f685169c0072fc0686420387608 SHA1 50c430cdaf58c641d31a9529717637e18fb46015 SHA256 bcf77806c0e62b73968a76c44afbada7946202c14809670d54f2cc36a834a2d5
+MD5 9b1dd6387a8a940a4b835882c4f8119b ChangeLog 31180
+RMD160 e717b2a660f71f685169c0072fc0686420387608 ChangeLog 31180
+SHA256 bcf77806c0e62b73968a76c44afbada7946202c14809670d54f2cc36a834a2d5 ChangeLog 31180
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -61,10 +66,13 @@ SHA256 b890d07e0a0cafd850275f11addaeff906b6b0370a2dbdcd7d9d741fa5bfbaae files/di
 MD5 7ee45dd87d2b5a2d8bac22b6c3f682d1 files/digest-coreutils-6.9 524
 RMD160 81ed8af9046ec9c5e1d178c3446a44a0fa7e33a0 files/digest-coreutils-6.9 524
 SHA256 380eb8dcbd4fa825f839edcb2f40cfb875137fc53454a9e1cb3b7050e2f5c9c7 files/digest-coreutils-6.9 524
+MD5 249b07d31fff9055a4a923109a735ccc files/digest-coreutils-6.9-r1 524
+RMD160 e7c7d7e65c355c0f3cea4cbd642e0729ab3cbf0b files/digest-coreutils-6.9-r1 524
+SHA256 d4f9908aae5e20bf68b093f23eec6f8be392fb4ad6f2d46d60f11021026b19b9 files/digest-coreutils-6.9-r1 524
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGLbpjugEuf3OQ0akRAp1/AJ9nD1lZ9uHiZhxohZOGRPlVKQzTewCdFELM
-KW/xcgAE6LmFABGpoetNq70=
-=DEsE
+iD8DBQFGNjvF8bi6rjpTunYRApczAJ4kmxJuZ2Y273yC4Cgxn8fj1rQG2gCgsz08
+AgnHAAYmclRtFL9yTMoR11E=
+=p5Dm
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/coreutils/coreutils-6.9-r1.ebuild b/sys-apps/coreutils/coreutils-6.9-r1.ebuild
new file mode 100644 (file)
index 0000000..1724751
--- /dev/null
+++ b/sys-apps/coreutils/coreutils-6.9-r1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-6.9-r1.ebuild,v 1.1 2007/04/30 18:55:59 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.bz2
+       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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="acl nls selinux static xattr"
+RESTRICT="confcache"
+
+RDEPEND="selinux? ( sys-libs/libselinux )
+       acl? ( sys-apps/acl sys-apps/attr )
+       nls? ( >=sys-devel/gettext-0.15 )
+       userland_GNU? ( >=sys-apps/man-pages-2.46 )
+       !net-mail/base64
+       >=sys-libs/ncurses-5.3-r5"
+DEPEND="${RDEPEND}
+       =sys-devel/automake-1.9*
+       >=sys-devel/autoconf-2.61
+       >=sys-devel/m4-1.4-r1
+       sys-apps/help2man"
+
+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"
+       rm -f "${PATCHDIR}"/generic/001_*progress*
+
+       # Apply the ACL/SELINUX patches.
+       if use selinux ; then
+               EPATCH_MULTI_MSG="Applying SELINUX patches ..." \
+               EPATCH_SUFFIX="patch" epatch "${PATCHDIR}"/selinux
+       else
+               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
+
+       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
+
+       use static && append-ldflags -static
+       econf \
+               --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 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
+
+       # remove files provided by other packages
+       rm "${D}"/usr/bin/{kill,uptime} # procps
+       rm "${D}"/usr/bin/{groups,su}   # shadow
+       rm "${D}"/usr/bin/hostname      # net-tools
+       rm "${D}"/usr/share/man/man1/{groups,kill,hostname,su,uptime}.1
+
+       insinto /etc
+       newins src/dircolors.hin DIR_COLORS
+
+       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
+                          readlink seq sleep sort tail touch tr tty vdir wc yes"
+               mv ${com} ../../bin/ || die "could not move common bins"
+               local x
+               for x in ${com} ; 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."
+}

diff --git a/sys-apps/coreutils/files/digest-coreutils-6.9-r1 b/sys-apps/coreutils/files/digest-coreutils-6.9-r1
new file mode 100644 (file)
index 0000000..b183d6f
--- /dev/null
+++ b/sys-apps/coreutils/files/digest-coreutils-6.9-r1
@@ -0,0 +1,6 @@
+MD5 d0269325fb9fc8ab4d4400dc6d6dc52b coreutils-6.9-patches-1.2.tar.bz2 49161
+RMD160 11f2bf30c5efdd705c38648d3e5dfb383cf62508 coreutils-6.9-patches-1.2.tar.bz2 49161
+SHA256 0706957589f60cc269dac08588dc74c1312e837f3fc3a77a88cee449b2e82671 coreutils-6.9-patches-1.2.tar.bz2 49161
+MD5 c9607d8495f16e98906e7ed2d9751a06 coreutils-6.9.tar.bz2 5384378
+RMD160 c6ae65204b2e9c234a1140f39a8be1ee5cdcaab7 coreutils-6.9.tar.bz2 5384378
+SHA256 89c2895ad157de50e53298b22d91db116ee4e1dd3fdf4019260254e2e31497b0 coreutils-6.9.tar.bz2 5384378