From 9f8d586b2a9fa4f928a3a0c6c2cc2e2db38fef38 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 24 Apr 2010 02:48:48 +0000 Subject: [PATCH] Version bump. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- sys-apps/coreutils/ChangeLog | 7 +- sys-apps/coreutils/Manifest | 13 +- sys-apps/coreutils/coreutils-8.5.ebuild | 154 ++++++++++++++++++++++++ 3 files changed, 168 insertions(+), 6 deletions(-) create mode 100644 sys-apps/coreutils/coreutils-8.5.ebuild diff --git a/sys-apps/coreutils/ChangeLog b/sys-apps/coreutils/ChangeLog index ef3a05c5bb15..cf7e6047bedd 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.289 2010/04/08 12:51:01 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.290 2010/04/24 02:48:48 vapier Exp $ + +*coreutils-8.5 (24 Apr 2010) + + 24 Apr 2010; Mike Frysinger +coreutils-8.5.ebuild: + Version bump. 08 Apr 2010; Christian Faulhammer coreutils-8.4.ebuild: stable x86, bug 311827 diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest index a59a07048f6b..dbea48fbf0a5 100644 --- a/sys-apps/coreutils/Manifest +++ b/sys-apps/coreutils/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 DIST coreutils-7.5-patches-2.tar.lzma 8370 RMD160 fef456359dd907c8264686720676ea1dabb90b63 SHA1 55f1b88bfeca34cd09c4ba305f6c0d45cfa3fd3f SHA256 1ee33146c960671f6cb54ca4916f6a828db904dae84841ec690eae7c0205e9a2 DIST coreutils-7.5.tar.gz 9956013 RMD160 17785526e6820705aa5790454af1bd3d0d4104aa SHA1 97e1486a33bf42eb7686d8f131c80ab533f1f683 SHA256 341f49b9434f83ca9a8b6c2266813092ef08a5fca25f15dcc1a0ba82fc18c3c1 @@ -11,17 +11,20 @@ DIST coreutils-8.2-patches-2.tar.lzma 27476 RMD160 6b2f590796e421f4ac9ba94944857 DIST coreutils-8.2.tar.gz 10697533 RMD160 72ad3df1e0d2ebb982ce993e03410a11234b7acb SHA1 f25f9240f6da5400f36aebdd1e21e85110ab9f0f SHA256 d3c3055d16554ded9ec3b06f31337588179f15d715c4c32104ddf351f1ad4f41 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 +DIST coreutils-8.5-patches-1.tar.lzma 4456 RMD160 c91df722421089c9598a194bf5ae4d614d8ea990 SHA1 8bba5c4b0f946cdfe6d208dc5e507606b45a5c60 SHA256 5c805201cd08a3a9f8989c77239606d5266a037aeb7c00ec1d2224219af9a1a7 +DIST coreutils-8.5.tar.gz 10740866 RMD160 2fdba2f8b64c818b459533ba40f94ba7325720b3 SHA1 939144f16d05691753a87134436dd2bb8ea89851 SHA256 dd243e2ac7d0ed203b170ecfb8299643779e7501fec2b45ae1cea8a450fa8ca0 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.4.ebuild 5032 RMD160 644190d9381a272c414ee521bb02bcfa80735b81 SHA1 13cfde75b14f30c650e6e8dda774ed819d1226c9 SHA256 d7d3a410cf4966bb4604f39d08578542cb703a012581b22f308f13c1ecc2ebaa -MISC ChangeLog 42491 RMD160 2a0e6d2648588ac088a464635b4f73d1aa490d6c SHA1 8fb490260d5bf1005386f358a053340cfdaa5110 SHA256 c381d0b62e15f75fad57b3d2502cc030912b189426011b7b72b1c68310560439 +EBUILD coreutils-8.5.ebuild 5036 RMD160 3e5bcbefdbfc7848cea50f3d4ad3b993626bfe8c SHA1 38d95004e68af93e5d80cde7dbb0730e3c0d7dce SHA256 b7e66c8babd7731447ccdf2c2de00b19f22b63f49ad8ff3a1437fafeca4d4573 +MISC ChangeLog 42612 RMD160 75ef055b85a52c253f1ed9c61c74a39c816eaac8 SHA1 88a1d5beab7360817dbf9b254c9da5ba5e966a5f SHA256 2da33bff15a85b1002b706695150866510932a4cc33e6690c33fb986a58507a6 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAku90TsACgkQNQqtfCuFneOcKgCaAtUFrZza5xKZ9BQUi7M+9AvM -1HgAn1CEVNAprwiZcW4KCj5bcvaAYROH -=oQzl +iF4EAREIAAYFAkvSXF4ACgkQTwhj9JtAlp7HYAD/amitHo2ER/d4BoU33TIO6xl9 +L+7xkc/NciT9Nd1uN7IBAMmBaY/KSb62vUvirlnQoXnAn/Im2dheUY8lQ6OGQ41L +=MWxL -----END PGP SIGNATURE----- diff --git a/sys-apps/coreutils/coreutils-8.5.ebuild b/sys-apps/coreutils/coreutils-8.5.ebuild new file mode 100644 index 000000000000..0d3c6fb4b222 --- /dev/null +++ b/sys-apps/coreutils/coreutils-8.5.ebuild @@ -0,0 +1,154 @@ +# 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.5.ebuild,v 1.1 2010/04/24 02:48: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-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() { + tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] && export fu_cv_sys_stat_statfs2_bsize=yes #311569 + + use static && append-ldflags -static + use selinux || export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no #301782 + # 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 +} -- 2.26.2