From: Mike Frysinger Date: Tue, 2 Jan 2007 04:53:44 +0000 (+0000) Subject: Move binaries not really needed into /usr. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dd0b713b4703d218226f4838d9b5e5999b86033a;p=gentoo.git Move binaries not really needed into /usr. Package-Manager: portage-2.1.2_rc4-r3 --- diff --git a/sys-apps/coreutils/ChangeLog b/sys-apps/coreutils/ChangeLog index fbddccc3acf4..b3619b99e0de 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.187 2006/12/08 00:32:10 vapier Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.188 2007/01/02 04:53:44 vapier Exp $ + +*coreutils-6.7-r1 (02 Jan 2007) + + 02 Jan 2007; Mike Frysinger +coreutils-6.7-r1.ebuild: + Move binaries not really needed into /usr. *coreutils-6.7 (08 Dec 2006) diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest index 1e6be698242b..d37f1c9feda2 100644 --- a/sys-apps/coreutils/Manifest +++ b/sys-apps/coreutils/Manifest @@ -23,14 +23,18 @@ EBUILD coreutils-6.4.ebuild 4520 RMD160 902b940ebf2297d221fa7f498500365dd95c7436 MD5 a48998dc38c7f247d5b384da80557682 coreutils-6.4.ebuild 4520 RMD160 902b940ebf2297d221fa7f498500365dd95c7436 coreutils-6.4.ebuild 4520 SHA256 5cb791bc0114831a494abe94744fd3c8b1ab0e6271825e1908890302817fb37a coreutils-6.4.ebuild 4520 +EBUILD coreutils-6.7-r1.ebuild 4788 RMD160 a78a6ce7ecdf42c513166b1701efb2df70ab97be SHA1 62202c71f43d35af369337fcd44a34ae34494787 SHA256 fd79e33f21d99d754efb7a16ed6f643f6ffe306106a2e5ada917036f981168cb +MD5 fc39c522392da18290ac7e24abad5642 coreutils-6.7-r1.ebuild 4788 +RMD160 a78a6ce7ecdf42c513166b1701efb2df70ab97be coreutils-6.7-r1.ebuild 4788 +SHA256 fd79e33f21d99d754efb7a16ed6f643f6ffe306106a2e5ada917036f981168cb coreutils-6.7-r1.ebuild 4788 EBUILD coreutils-6.7.ebuild 4539 RMD160 d59f56e55d0045ab32484b18ca7134f912936f8b SHA1 60ffe86f4b4771130bcc98f87c0e892b76cac946 SHA256 b79614040ac8ceee6ecfe1b0b5cf94b7a555f949c5147f617d19968a82ee0989 MD5 7a22938b9193303b2c6a4676a1e376db coreutils-6.7.ebuild 4539 RMD160 d59f56e55d0045ab32484b18ca7134f912936f8b coreutils-6.7.ebuild 4539 SHA256 b79614040ac8ceee6ecfe1b0b5cf94b7a555f949c5147f617d19968a82ee0989 coreutils-6.7.ebuild 4539 -MISC ChangeLog 29254 RMD160 2802e5b82e77aae24afdd901aa537a0f467b165e SHA1 eb06c723b744955d4a4312fe3be1769e42c8f149 SHA256 01905a2144c464cd5e8cab2114192fec3538cc64a5b105e6383a7a67ab1c826a -MD5 66ef15f9a43ec7b71531278bc4a05df2 ChangeLog 29254 -RMD160 2802e5b82e77aae24afdd901aa537a0f467b165e ChangeLog 29254 -SHA256 01905a2144c464cd5e8cab2114192fec3538cc64a5b105e6383a7a67ab1c826a ChangeLog 29254 +MISC ChangeLog 29409 RMD160 ba5b44d28b95e239ccec18f6238def0346a94437 SHA1 f99993db3190ffbafb7bc2ed4d1a1b771939b4e9 SHA256 73d5db2ffddf407482f3759cfebb673e3469ae8e2250bce02687448c025aa92f +MD5 8eb4cf017e74df18c0d26a193472f0c5 ChangeLog 29409 +RMD160 ba5b44d28b95e239ccec18f6238def0346a94437 ChangeLog 29409 +SHA256 73d5db2ffddf407482f3759cfebb673e3469ae8e2250bce02687448c025aa92f ChangeLog 29409 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 @@ -44,10 +48,13 @@ SHA256 bdaa6b3e2cbd8bb7063828d82bd6c8217bdcfa38f55fa2196799a5484561750d files/di MD5 3767fddf63f9f267b0eaffb54238d372 files/digest-coreutils-6.7 524 RMD160 c0972faeadaae125b37ff47cb80bd606e2ce02bd files/digest-coreutils-6.7 524 SHA256 e54bf8b4e1020e5c102b26466f52273a255391afd62baa76898d01a14860a7cf files/digest-coreutils-6.7 524 +MD5 3767fddf63f9f267b0eaffb54238d372 files/digest-coreutils-6.7-r1 524 +RMD160 c0972faeadaae125b37ff47cb80bd606e2ce02bd files/digest-coreutils-6.7-r1 524 +SHA256 e54bf8b4e1020e5c102b26466f52273a255391afd62baa76898d01a14860a7cf files/digest-coreutils-6.7-r1 524 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) +Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFlZLA8bi6rjpTunYRAjyoAJ9VtoUZis8Ux9CHwHLfSk8Qwp6okgCeKZyW -9FHaII+FVgGMWLuIUwoYJ4E= -=A2Sj +iD8DBQFFmeWl8bi6rjpTunYRAnisAJ4/2ZB/GgI+c/FLfQNAOxxHoopRcwCgzaF0 +0CQd6Etm8QY9Ikax3NVwKpY= +=brJn -----END PGP SIGNATURE----- diff --git a/sys-apps/coreutils/coreutils-6.7-r1.ebuild b/sys-apps/coreutils/coreutils-6.7-r1.ebuild new file mode 100644 index 000000000000..4a10c963884c --- /dev/null +++ b/sys-apps/coreutils/coreutils-6.7-r1.ebuild @@ -0,0 +1,151 @@ +# 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.7-r1.ebuild,v 1.1 2007/01/02 04:53:44 vapier Exp $ + +WANT_AUTOCONF="latest" +WANT_AUTOMAKE="latest" +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="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" +RESTRICT="confcache" + +RDEPEND="selinux? ( sys-libs/libselinux ) + acl? ( sys-apps/acl sys-apps/attr ) + nls? ( >=sys-devel/gettext-0.15 ) + !net-mail/base64 + >=sys-libs/ncurses-5.3-r5" +DEPEND="${RDEPEND} + =sys-devel/automake-1.9* + >=sys-devel/autoconf-2.59d + >=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 + ( cd "${PATCHDIR}" ; epatch selinux/GLUE* ) || die "glue failed" + 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 " | $(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 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 + # 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 + 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 +} diff --git a/sys-apps/coreutils/files/digest-coreutils-6.7-r1 b/sys-apps/coreutils/files/digest-coreutils-6.7-r1 new file mode 100644 index 000000000000..bd0efe468b7b --- /dev/null +++ b/sys-apps/coreutils/files/digest-coreutils-6.7-r1 @@ -0,0 +1,6 @@ +MD5 4e491d77b463c13c8054150dcce84e6b coreutils-6.7-patches-1.0.tar.bz2 32171 +RMD160 431ee64bfb8ec89f460b199aa3a42994d51ad990 coreutils-6.7-patches-1.0.tar.bz2 32171 +SHA256 8e665c1008514dc50795aaa02e26710812337c6a1704da31242af9cef8d8004c coreutils-6.7-patches-1.0.tar.bz2 32171 +MD5 a16465d0856cd011a1acc1c21040b7f4 coreutils-6.7.tar.bz2 5315342 +RMD160 593acd266431db1777505bd181a7ffe095774beb coreutils-6.7.tar.bz2 5315342 +SHA256 4d7027cc803682decdadf850095dce7e22cc08eba2b1283e16d0fb7a675ac1f0 coreutils-6.7.tar.bz2 5315342