Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/coreutils/
Date: Wed, 30 Nov 2016 21:12:17
Message-Id: 1480540329.b70a910adf118801a8d888206e27a5e492067f2d.polynomial-c@gentoo
1 commit: b70a910adf118801a8d888206e27a5e492067f2d
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 30 21:11:51 2016 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 30 21:12:09 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b70a910a
7
8 sys-apps/coreutils: Removed old.
9
10 Package-Manager: portage-2.3.2
11
12 sys-apps/coreutils/Manifest | 3 -
13 sys-apps/coreutils/coreutils-8.24.ebuild | 184 -------------------------------
14 2 files changed, 187 deletions(-)
15
16 diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
17 index 134a24d..8bda8ed 100644
18 --- a/sys-apps/coreutils/Manifest
19 +++ b/sys-apps/coreutils/Manifest
20 @@ -1,9 +1,6 @@
21 DIST coreutils-8.23-man.tar.xz 43060 SHA256 d1b16e74b3dba4f313aeebae2c69da205f7d2e6e1c2aa8d39026c860d314ecca SHA512 db5085c783256e30b9878bdce5cf16063aaa51d800d5b40537d5cdea372d095a391e9986e8680c6d94841bc995ab43ac8bc2d23427e6e96263d24b0b5ccc7d12 WHIRLPOOL ef0cae7c1b752c0f81e6f23b0a792804518a5257740fedf7dd70577ec503a64716156a898ed50045987954a6234ba23c9483772830683bb7e4bd0c8a2ec2c142
22 DIST coreutils-8.23-patches-1.1.tar.xz 6480 SHA256 daf5d61b36db61d629bf14bf8f04e878f1205c9ae2af5daf37dca3aad5a6fde4 SHA512 8da5f8e9fc47baa060030076c4a2de90013a0d1faad45fe99545e93d50bc079720281f6db5774590fe842c8c56bd8ae97e1d9bf862fae1896760b5e5b686e7a8 WHIRLPOOL 2a8082975e3627454569e57aecb3d1ac6bdef89e16f4f64a88a4ffcbf2b341fe56874b128485ae540270f7a060f9e0f4bd3eecf68e215fb6a5a1c5ac434f7403
23 DIST coreutils-8.23.tar.xz 5375612 SHA256 ec43ca5bcfc62242accb46b7f121f6b684ee21ecd7d075059bf650ff9e37b82d SHA512 a5f4b82ce208cb439d5dbe6f5cf4b19fecff581da210a51c4e3fdd5ffab114d171456d041e20a6996b59185947ac6655096e4b5ca252186e282ae0ae08b7534c WHIRLPOOL 4bd4cd28d6de96218e791c5ed15766e34dfeeb3aeade10e211e3a0e9ffa695e5a716872a915d78b356b3e3635e1e22274d92560301aadaf46a58242dc235d733
24 -DIST coreutils-8.24-man.tar.xz 42920 SHA256 cf0333b5f134a331e0b46e2ddf90666f8bdc3281c1ca2c7ccbb75b437589ce37 SHA512 9dfe614402bc35c43301ebf97d2d36ac5db1433f48171bda15f2ba76bd9944742665b30a764df0cf773ebcad1845aae57c8e36a1cd3848c1e82a7c996d6cc78a WHIRLPOOL d702a372031fe52262204c00bee641084c099c45150d82abd5915535ab3bbe1efb63c4f00173bb88725ba49126a6ecf368d14b12843b570c08165b757b78710b
25 -DIST coreutils-8.24-patches-1.1.tar.xz 6688 SHA256 79cb0dc5b58cb97e17b11b5e821ed88fae88f728d9fd07986bbb397824e49c6f SHA512 cf340ccb918e307be8bbfd19a299bcfe5b295a26f59a8eeb8657f5dda1361100a350e996b31097948e63890987a2f83d05d2e7175c6304f4a4812b9974679c2c WHIRLPOOL 3b4d4676b119e4f22a01c8450be13d6eb40720d3c57aac5631454df24814943e6e6024fbdcd27a2b262d42c1446d9c04cbdc163371ff20a4b28d9cd9a77c5c9c
26 -DIST coreutils-8.24.tar.xz 5649896 SHA256 a2d75286a4b9ef3a13039c2da3868a61be4ee9f17d8ae380a35a97e506972170 SHA512 b42bb233340353647bb9a1c3d9122c1a5379cf3602ba9197c3c935fc899897e7d4685148dfaf93eccc096bee0a9b03416d79dc9bb81d5d2dea6e04ed134a3d1b WHIRLPOOL 68598e0c93375522714b9bc0dd092386a9466725b2b4b5715e2926c5087e1ce887d5e5b8e0b872347a053edcb39ba1f8c6949ee659a06ed554703a0ba07064e2
27 DIST coreutils-8.25-man.tar.xz 43420 SHA256 2ee31c3a6d2276f49c5515375d4a0c1047580da6ac10536898e0f0de81707f29 SHA512 412afc9909d30618ab9daba51c965c0fd22420c32f6c5a7e32ba32d957a92e8a65b977bccaba4b76c55d435a57065dc6103ff11c5fa31d02f117c13a2b09f75e WHIRLPOOL f2a9458d71cfbf6227ece5b688adb34653dacda0dfbcfd5332a36e33cda58b081d9b37c4ec910c92feba485e8e182f52327f4860f1ff5e0b0b7ae2f9b82045ee
28 DIST coreutils-8.25-patches-1.1.tar.xz 7196 SHA256 68e116eb70a69e94458197cde81165c9902bec0c6661be31f6fffb84ba8d809c SHA512 19326ab7dd8d4515f7239133772f715aac4e722a1e28f4b0f19d8d629abe54a2309fa7c469797dc0f9e88991906883a891622c791ef940b9a5af6608d2e9110e WHIRLPOOL e7931e16e267b817a86f11b9e01d82dfac8144dbabd91d5cea036c819303895bd852809f374a76b6e4e474b559505d6fc907ddcb113ca1915b76d880e291bc76
29 DIST coreutils-8.25.tar.xz 5725008 SHA256 31e67c057a5b32a582f26408c789e11c2e8d676593324849dcf5779296cdce87 SHA512 571f95d44987d373081ed4c6ac82155ad3dcd95621d7b1a7163597e80ecbbafef2cd74b2ef594587a443a1a4355083879f898a286bb0230c48112d43d076ccd6 WHIRLPOOL e871e177ffaf96bfdd9e668eb9a09df9fd952ff095796cffd1ac2b8b3943c9c2ae79c31890fa02b5ed2609b6c6c84b64d2292454b043d62260a9560d2f7b9457
30
31 diff --git a/sys-apps/coreutils/coreutils-8.24.ebuild b/sys-apps/coreutils/coreutils-8.24.ebuild
32 deleted file mode 100644
33 index bf3fac7..00000000
34 --- a/sys-apps/coreutils/coreutils-8.24.ebuild
35 +++ /dev/null
36 @@ -1,184 +0,0 @@
37 -# Copyright 1999-2016 Gentoo Foundation
38 -# Distributed under the terms of the GNU General Public License v2
39 -# $Id$
40 -
41 -# To generate the man pages, unpack the upstream tarball and run:
42 -# ./configure --enable-install-program=arch,coreutils
43 -# make
44 -# cd ..
45 -# tar cf - coreutils-*/man/*.[0-9] | xz > coreutils-<ver>-man.tar.xz
46 -
47 -EAPI="4"
48 -
49 -inherit eutils flag-o-matic toolchain-funcs
50 -
51 -PATCH_VER="1.1"
52 -DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls...), text utilities (sort, tr, head, wc..), and shell utilities (whoami, who,...)"
53 -HOMEPAGE="https://www.gnu.org/software/coreutils/"
54 -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
55 - mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz
56 - https://dev.gentoo.org/~vapier/dist/${P}-patches-${PATCH_VER}.tar.xz
57 - mirror://gentoo/${P}-man.tar.xz
58 - https://dev.gentoo.org/~vapier/dist/${P}-man.tar.xz"
59 -
60 -LICENSE="GPL-3"
61 -SLOT="0"
62 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
63 -IUSE="acl caps gmp hostname kill multicall nls selinux static userland_BSD vanilla xattr"
64 -
65 -LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
66 - caps? ( sys-libs/libcap )
67 - gmp? ( dev-libs/gmp[static-libs] )
68 - xattr? ( !userland_BSD? ( sys-apps/attr[static-libs] ) )"
69 -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )
70 - selinux? ( sys-libs/libselinux )
71 - nls? ( virtual/libintl )"
72 -DEPEND="${RDEPEND}
73 - static? ( ${LIB_DEPEND} )
74 - app-arch/xz-utils"
75 -RDEPEND+="
76 - hostname? ( !sys-apps/net-tools[hostname] )
77 - kill? (
78 - !sys-apps/util-linux[kill]
79 - !sys-process/procps[kill]
80 - )
81 - !app-misc/realpath
82 - !<sys-apps/util-linux-2.13
83 - !sys-apps/stat
84 - !net-mail/base64
85 - !sys-apps/mktemp
86 - !<app-forensics/tct-1.18-r1
87 - !<net-fs/netatalk-2.0.3-r4"
88 -
89 -src_prepare() {
90 - if ! use vanilla ; then
91 - use_if_iuse unicode || rm -f "${WORKDIR}"/patch/000_all_coreutils-i18n.patch
92 - EPATCH_SUFFIX="patch" \
93 - PATCHDIR="${WORKDIR}/patch" \
94 - EPATCH_EXCLUDE="001_all_coreutils-gen-progress-bar.patch" \
95 - epatch
96 - fi
97 -
98 - # Since we've patched many .c files, the make process will try to
99 - # re-build the manpages by running `./bin --help`. When doing a
100 - # cross-compile, we can't do that since 'bin' isn't a native bin.
101 - # Also, it's not like we changed the usage on any of these things,
102 - # so let's just update the timestamps and skip the help2man step.
103 - set -- man/*.x
104 - touch ${@/%x/1}
105 -
106 - # Avoid perl dep for compiled in dircolors default #348642
107 - if ! has_version dev-lang/perl ; then
108 - touch src/dircolors.h
109 - touch ${@/%x/1}
110 - fi
111 -}
112 -
113 -src_configure() {
114 - local myconf=''
115 - if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
116 - export fu_cv_sys_stat_statfs2_bsize=yes #311569
117 - export gl_cv_func_realpath_works=yes #416629
118 - fi
119 -
120 - export gl_cv_func_mknod_works=yes #409919
121 - use static && append-ldflags -static && sed -i '/elf_sys=yes/s:yes:no:' configure #321821
122 - use selinux || export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no #301782
123 - use userland_BSD && myconf="${myconf} -program-prefix=g --program-transform-name=s/stat/nustat/"
124 - # kill/uptime - procps
125 - # groups/su - shadow
126 - # hostname - net-tools
127 - econf \
128 - --with-packager="Gentoo" \
129 - --with-packager-version="${PVR} (p${PATCH_VER:-0})" \
130 - --with-packager-bug-reports="https://bugs.gentoo.org/" \
131 - --enable-install-program="arch,$(usev hostname),$(usev kill)" \
132 - --enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime" \
133 - --enable-largefile \
134 - $(use caps || echo --disable-libcap) \
135 - $(use_enable nls) \
136 - $(use_enable acl) \
137 - $(use_enable multicall single-binary) \
138 - $(use_enable xattr) \
139 - $(use_with gmp) \
140 - ${myconf}
141 -}
142 -
143 -src_test() {
144 - # Non-root tests will fail if the full path isn't
145 - # accessible to non-root users
146 - chmod -R go-w "${WORKDIR}"
147 - chmod a+rx "${WORKDIR}"
148 -
149 - # coreutils tests like to do `mount` and such with temp dirs
150 - # so make sure /etc/mtab is writable #265725
151 - # make sure /dev/loop* can be mounted #269758
152 - mkdir -p "${T}"/mount-wrappers
153 - mkwrap() {
154 - local w ww
155 - for w in "$@" ; do
156 - ww="${T}/mount-wrappers/${w}"
157 - cat <<-EOF > "${ww}"
158 - #!${EPREFIX}/bin/sh
159 - exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P $w) "\$@"
160 - EOF
161 - chmod a+rx "${ww}"
162 - done
163 - }
164 - mkwrap mount umount
165 -
166 - addwrite /dev/full
167 - #export RUN_EXPENSIVE_TESTS="yes"
168 - #export FETISH_GROUPS="portage wheel"
169 - env PATH="${T}/mount-wrappers:${PATH}" \
170 - emake -j1 -k check
171 -}
172 -
173 -src_install() {
174 - default
175 -
176 - insinto /etc
177 - newins src/dircolors.hin DIR_COLORS
178 -
179 - if [[ ${USERLAND} == "GNU" ]] ; then
180 - cd "${ED}"/usr/bin
181 - dodir /bin
182 - # move critical binaries into /bin (required by FHS)
183 - local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
184 - mkdir mknod mv pwd rm rmdir stty sync true uname"
185 - mv ${fhs} ../../bin/ || die "could not move fhs bins"
186 - if use kill; then
187 - mv kill ../../bin/ || die
188 - fi
189 - # move critical binaries into /bin (common scripts)
190 - local com="basename chroot cut dir dirname du env expr head mkfifo
191 - mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
192 - mv ${com} ../../bin/ || die "could not move common bins"
193 - # create a symlink for uname in /usr/bin/ since autotools require it
194 - local x
195 - for x in ${com} uname ; do
196 - dosym /bin/${x} /usr/bin/${x}
197 - done
198 - else
199 - # For now, drop the man pages, collides with the ones of the system.
200 - rm -rf "${ED}"/usr/share/man
201 - fi
202 -
203 -}
204 -
205 -pkg_postinst() {
206 - ewarn "Make sure you run 'hash -r' in your active shells."
207 - ewarn "You should also re-source your shell settings for LS_COLORS"
208 - ewarn " changes, such as: source /etc/profile"
209 -
210 - # Help out users using experimental filesystems
211 - if grep -qs btrfs "${EROOT}"/etc/fstab /proc/mounts ; then
212 - case $(uname -r) in
213 - 2.6.[12][0-9]|2.6.3[0-7]*)
214 - ewarn "You are running a system with a buggy btrfs driver."
215 - ewarn "Please upgrade your kernel to avoid silent corruption."
216 - ewarn "See: https://bugs.gentoo.org/353907"
217 - ;;
218 - esac
219 - fi
220 -}