From: Mike Frysinger Date: Sat, 8 Jan 2005 00:32:26 +0000 (+0000) Subject: alpha stable X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8ad5c2a91b4ce596aeb6dfc818acf4deb00f6e7c;p=gentoo.git alpha stable --- diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest index 82edd3acb12b..4f3abe9b1d0f 100644 --- a/sys-apps/coreutils/Manifest +++ b/sys-apps/coreutils/Manifest @@ -4,12 +4,10 @@ Hash: SHA1 MD5 0694dfcd303f0a2559e6c745fe042d66 ChangeLog 22484 MD5 83efa457e8e155248c2ebc6899dc6646 coreutils-5.2.1.ebuild 4149 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 -MD5 a941f375b9afbe7b76fa74277e83ed4f coreutils-5.2.1-r1.ebuild 4145 MD5 cc6fe5a82e8d5d973c1df141e7fff7bd coreutils-5.2.1-r3.ebuild 4204 -MD5 f6735b85a57dc977e931a37ce5a3f6bf coreutils-5.2.1-r2.ebuild 4387 +MD5 09da3eb52ee42d7bc4160977dd25b7a1 coreutils-5.2.1-r2.ebuild 4384 MD5 d3828e48aebb7452db7a8f8b025da0ff files/DIR_COLORS 4041 MD5 36e1cce43ca15be334d54801e1dbb286 files/digest-coreutils-5.2.1 224 -MD5 316d769e60be0f94af3e3c957a664aec files/digest-coreutils-5.2.1-r1 225 MD5 5336abda618b9eaa721564d34bb6de9b files/digest-coreutils-5.2.1-r3 225 MD5 5a7d722a7600e8834bf39c24790caaa2 files/003_all_coreutils-gentoo-uname-s390.patch 3120 MD5 ad6c1b6661e030a48a57172f88d2960a files/coreutils-5.0.91-ppc64-1.patch 280 @@ -19,7 +17,7 @@ MD5 569870ec2f958c2a2a716a7f695deb42 files/coreutils-5.2.1-unamefix.patch 485 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.9.14 (GNU/Linux) -iD8DBQFB3yewroRuSHgZdywRAocPAKCEjx1hILOD5J78jUD40LmY7ZldWgCfe1P0 -cwRN4kemP/WIPi3lZCzEu0E= -=TIrt +iD8DBQFB3yoproRuSHgZdywRAj/9AJ9mj9b+8lXiojNdEuee/tF7cRbiSACgjy4m +7RoYprQYVIkFxFb/Xw1xDkI= +=dJWD -----END PGP SIGNATURE----- diff --git a/sys-apps/coreutils/coreutils-5.2.1-r1.ebuild b/sys-apps/coreutils/coreutils-5.2.1-r1.ebuild deleted file mode 100644 index db00dade88df..000000000000 --- a/sys-apps/coreutils/coreutils-5.2.1-r1.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2004 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-r1.ebuild,v 1.7 2004/09/03 21:03:23 pvdabeel Exp $ - -inherit eutils flag-o-matic - -PATCH_VER=0.5 -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.bz2 - http://dev.gentoo.org/~seemant/distfiles/${P}-gentoo-${PATCH_VER}.tar.bz2 - http://dev.gentoo.org/~seemant/distfiles/${P}-${I18N_VER}.patch.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ppc sparc ~mips alpha ~arm ~hppa ~amd64 ia64 ~ppc64 ~s390" -IUSE="nls build acl selinux static uclibc" - -RDEPEND="selinux? ( sys-libs/libselinux ) - acl? ( !hppa? ( sys-apps/acl sys-apps/attr ) ) - nls? ( sys-devel/gettext ) - >=sys-libs/ncurses-5.3-r5" -DEPEND="${RDEPEND} - virtual/libc - >=sys-apps/portage-2.0.49 - >=sys-devel/automake-1.8.3 - >=sys-devel/autoconf-2.58 - >=sys-devel/m4-1.4-r1 - !uclibc? ( sys-apps/help2man )" - -src_unpack() { - unpack ${A} - - 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 - mv ${PATCHDIR}/generic/00{1,2,4}* ${PATCHDIR}/excluded - mv ${PATCHDIR}/selinux/001_all_coreutils-noacl* ${PATCHDIR}/excluded - EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/acl - else - mv ${PATCHDIR}/selinux/001_all_coreutils-acl* ${PATCHDIR}/excluded - fi - - # patch to remove Stallman's su/wheel group rant (which doesn't apply, - # since Gentoo's su is not GNU/su, but that from shadow. - # 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 - - # Sparc32 SMP bug fix -- see bug #46593 - use sparc && echo -ne "\n\n" >> ${S}/src/pr.c -} - -src_compile() { - if [ -z "`which cvs 2>/dev/null`" ] - then - # Fix issues with gettext's autopoint if cvs is not installed, - # bug #28920. - export AUTOPOINT="/bin/true" - fi - - export WANT_AUTOMAKE=1.8 - export WANT_AUTOCONF=2.5 - - mv m4/inttypes.m4 m4/inttypes-eggert.m4 - 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 - eend $? - - econf \ - --bindir=/bin \ - --enable-largefile \ - `use_enable nls` \ - `use_enable selinux` || die - - if use static - then - emake LDFLAGS=-static || die - else - emake || die - fi -} - -src_install() { - einstall \ - bindir=${D}/bin || die - - cd ${D} - dodir /usr/bin - rm -rf usr/lib - - # add DIRCOLORS - insinto /etc - doins ${FILESDIR}/DIR_COLORS - - # move non-critical packages into /usr - 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 - cd ${S} - dodoc AUTHORS ChangeLog* NEWS README* THANKS TODO - else - rm -rf ${D}/usr/share - fi -} - -pkg_postinst() { - # hostname does not get removed as it is included with older stage1 - # tarballs, and net-tools installs to /bin - if [ -e ${ROOT}/usr/bin/hostname ] && [ ! -L ${ROOT}/usr/bin/hostname ] - then - rm -f ${ROOT}/usr/bin/hostname - fi -} diff --git a/sys-apps/coreutils/coreutils-5.2.1-r2.ebuild b/sys-apps/coreutils/coreutils-5.2.1-r2.ebuild index a9ace350077f..bd8e21057edf 100644 --- a/sys-apps/coreutils/coreutils-5.2.1-r2.ebuild +++ b/sys-apps/coreutils/coreutils-5.2.1-r2.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-r2.ebuild,v 1.8 2004/12/28 20:19:04 absinthe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-5.2.1-r2.ebuild,v 1.9 2005/01/08 00:32:26 vapier Exp $ inherit eutils flag-o-matic @@ -19,7 +19,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.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 ) diff --git a/sys-apps/coreutils/files/digest-coreutils-5.2.1-r1 b/sys-apps/coreutils/files/digest-coreutils-5.2.1-r1 deleted file mode 100644 index 82720f0738f3..000000000000 --- a/sys-apps/coreutils/files/digest-coreutils-5.2.1-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 172ee3c315af93d3385ddfbeb843c53f coreutils-5.2.1.tar.bz2 4270776 -MD5 9062ae08aeb179b2d31356d234886f39 coreutils-5.2.1-gentoo-0.5.tar.bz2 65159 -MD5 7dad35dee7a6517440feac4eef8b64c4 coreutils-5.2.1-i18n-0.2.patch.bz2 21795