Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: sys-apps/coreutils/
Date: Mon, 12 Feb 2018 16:25:03
Message-Id: 1518452690.32d9641af90ab02558ff0f54ec7ee05249019142.grobian@gentoo
1 commit: 32d9641af90ab02558ff0f54ec7ee05249019142
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 12 16:24:50 2018 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 12 16:24:50 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=32d9641a
7
8 sys-apps/coreutils: sync
9
10 Package-Manager: Portage-2.3.18-prefix, Repoman-2.3.6
11
12 sys-apps/coreutils/Manifest | 2 +
13 sys-apps/coreutils/coreutils-8.29.ebuild | 207 +++++++++++++++++++++++++++++++
14 2 files changed, 209 insertions(+)
15
16 diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
17 index 6a020b516f..9b00c6fe99 100644
18 --- a/sys-apps/coreutils/Manifest
19 +++ b/sys-apps/coreutils/Manifest
20 @@ -7,3 +7,5 @@ DIST coreutils-8.25.tar.xz 5725008 BLAKE2B 6dd5d6179476e0e0c801dc23fab006b3f8142
21 DIST coreutils-8.28-man.tar.xz 43832 BLAKE2B 18ea22a89daac64444da8b91c82c62e4c6dfe27e0e9c2d2ec1de4dc9c3ee44fb91f197e3122803a8a18c2619c6daf683e0b3b07c36e0e9b8dd73c2cdf44ba6b7 SHA512 363cf595e0f6fc69eb6a9d1ca258a5f012404cee99887494ab6e40fe2c6de5e49e7cad953aecb394c5612043efe6b407e657811d8251b10e159c97b849dd8b3e
22 DIST coreutils-8.28-patches-1.1.tar.xz 7336 BLAKE2B 9cd5db3e1d5545da5cb38f919ae5528d8642efb7f7e11994c6603f49b097f0f804cf1553dfce65682f9d725964cd6a3d142916cbc018f707cc617ad8c9b9f471 SHA512 af47aaa614550e5cd82b2386fafd9f90beb0564b8bbedfe92238906e7c6f040fb7468c1929f0951d4f98038b6e1df7da2408204be78219e6a041658507385957
23 DIST coreutils-8.28.tar.xz 5252336 BLAKE2B 30e3c05311834b19a941ddaa6a405cb0033b0e3518211dd0d33e9a1aa91c60f4d597fca9419b467ade2b54e3bf81ba5149cebfc93a02fa1e546c1b0f71ee91c9 SHA512 1e592d0dd03b9227bf92af9a82bed6dc3bcbee46e984c7fb09833dea0962e86b309aa34d5e43823b73d4522c066bfa5cdc8ec694aa190910fb246ff32ceb63a1
24 +DIST coreutils-8.29-patches-1.0.tar.xz 5772 BLAKE2B 8f05185404d527ad524684231f0b8bef3b65e7752527b6bf55371f474035b8a92cdcaa8349a321784d14c6700a0d49e9d10ee2e3a96b78e8f6423ee8c5b9ec02 SHA512 0f7db6744a6a6bad8d582bb2d32e1a0ad0ab5f48a53b54c371d27494967832ddec2570e45dbf7e66c7091496bcecd66aab21644f603d2c8878a87f51a1a9b1a2
25 +DIST coreutils-8.29.tar.xz 5286588 BLAKE2B cbb66d9054bdd2db5b9a6010876484b16d178f8f4d935836b1e42830178647fac4e0a75052a6e7e2fbc50e74e4e7ff6f8da43f1137b96d0c2d027c4ebac28a98 SHA512 546bbcd5741beae7a68e7c4ca14d6d634f7c8be87feecdeddd00e226f4865bb89d503437c3a95622ba7bb0cb70addbb5bdf3767fa18d0b7410ab90ee53b29dfd
26
27 diff --git a/sys-apps/coreutils/coreutils-8.29.ebuild b/sys-apps/coreutils/coreutils-8.29.ebuild
28 new file mode 100644
29 index 0000000000..fc62029cf3
30 --- /dev/null
31 +++ b/sys-apps/coreutils/coreutils-8.29.ebuild
32 @@ -0,0 +1,207 @@
33 +# Copyright 1999-2018 Gentoo Foundation
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI="6"
37 +
38 +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
39 +
40 +inherit eutils flag-o-matic python-any-r1 toolchain-funcs
41 +
42 +PATCH_VER="1.0"
43 +DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
44 +HOMEPAGE="https://www.gnu.org/software/coreutils/"
45 +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
46 + mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz
47 + https://dev.gentoo.org/~whissi/dist/${PN}/${P}-patches-${PATCH_VER}.tar.xz"
48 +
49 +LICENSE="GPL-3"
50 +SLOT="0"
51 +KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
52 +IUSE="acl caps gmp hostname kill multicall nls selinux static test userland_BSD vanilla xattr"
53 +
54 +LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
55 + caps? ( sys-libs/libcap )
56 + gmp? ( dev-libs/gmp:=[static-libs] )
57 + xattr? ( !userland_BSD? ( sys-apps/attr[static-libs] ) )"
58 +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )
59 + selinux? ( sys-libs/libselinux )
60 + nls? ( virtual/libintl )"
61 +DEPEND="${RDEPEND}
62 + static? ( ${LIB_DEPEND} )
63 + app-arch/xz-utils
64 + test? (
65 + dev-lang/perl
66 + dev-perl/Expect
67 + !userland_BSD? (
68 + dev-util/strace
69 + )
70 + ${PYTHON_DEPS}
71 + $(python_gen_any_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]')
72 + )"
73 +RDEPEND+="
74 + hostname? ( !sys-apps/net-tools[hostname] )
75 + kill? (
76 + !sys-apps/util-linux[kill]
77 + !sys-process/procps[kill]
78 + )
79 + !app-misc/realpath
80 + !<sys-apps/util-linux-2.13
81 + !<sys-apps/sandbox-2.10-r4
82 + !sys-apps/stat
83 + !net-mail/base64
84 + !sys-apps/mktemp
85 + !<app-forensics/tct-1.18-r1
86 + !<net-fs/netatalk-2.0.3-r4"
87 +
88 +pkg_setup() {
89 + if use test ; then
90 + python-any-r1_pkg_setup
91 + fi
92 +}
93 +
94 +src_prepare() {
95 + if ! use vanilla ; then
96 + eapply "${WORKDIR}"/patch/*.patch
97 + fi
98 +
99 + eapply_user
100 +
101 + epatch "${FILESDIR}"/${PN}-8.22-mint.patch
102 + # Since we've patched many .c files, the make process will try to
103 + # re-build the manpages by running `./bin --help`. When doing a
104 + # cross-compile, we can't do that since 'bin' isn't a native bin.
105 + # Also, it's not like we changed the usage on any of these things,
106 + # so let's just update the timestamps and skip the help2man step.
107 + set -- man/*.x
108 + touch ${@/%x/1}
109 +
110 + # Avoid perl dep for compiled in dircolors default #348642
111 + if ! has_version dev-lang/perl ; then
112 + touch src/dircolors.h
113 + touch ${@/%x/1}
114 + fi
115 +}
116 +
117 +src_configure() {
118 + local myconf=(
119 + --with-packager="Gentoo"
120 + --with-packager-version="${PVR} (p${PATCH_VER:-0})"
121 + --with-packager-bug-reports="https://bugs.gentoo.org/"
122 + --enable-install-program="arch,$(usev hostname),$(usev kill)"
123 + --enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
124 + --enable-largefile
125 + $(use caps || echo --disable-libcap)
126 + $(use_enable nls)
127 + $(use_enable acl)
128 + $(use_enable multicall single-binary)
129 + $(use_enable xattr)
130 + $(use_with gmp)
131 + )
132 + if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
133 + export fu_cv_sys_stat_statfs2_bsize=yes #311569
134 + export gl_cv_func_realpath_works=yes #416629
135 + fi
136 +
137 + export gl_cv_func_mknod_works=yes #409919
138 + use static && append-ldflags -static && sed -i '/elf_sys=yes/s:yes:no:' configure #321821
139 + use selinux || export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no #301782
140 + use userland_BSD && myconf+=( -program-prefix=g --program-transform-name=s/stat/nustat/ )
141 + # kill/uptime - procps
142 + # groups/su - shadow
143 + # hostname - net-tools
144 + econf "${myconf[@]}"
145 +}
146 +
147 +src_test() {
148 + # Known to fail with FEATURES=usersandbox (bug #439574):
149 + # - tests/du/long-from-unreadable.sh} (bug #413621)
150 + # - tests/rm/deep-2.sh (bug #413621)
151 + # - tests/dd/no-allocate.sh (bug #629660)
152 + if has usersandbox $FEATURES ; then
153 + ewarn "You are emerging ${P} with 'usersandbox' enabled." \
154 + "Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
155 + fi
156 +
157 + # Non-root tests will fail if the full path isn't
158 + # accessible to non-root users
159 + chmod -R go-w "${WORKDIR}"
160 + chmod a+rx "${WORKDIR}"
161 +
162 + # coreutils tests like to do `mount` and such with temp dirs
163 + # so make sure /etc/mtab is writable #265725
164 + # make sure /dev/loop* can be mounted #269758
165 + mkdir -p "${T}"/mount-wrappers
166 + mkwrap() {
167 + local w ww
168 + for w in "$@" ; do
169 + ww="${T}/mount-wrappers/${w}"
170 + cat <<-EOF > "${ww}"
171 + #!${EPREFIX}/bin/sh
172 + exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P $w) "\$@"
173 + EOF
174 + chmod a+rx "${ww}"
175 + done
176 + }
177 + mkwrap mount umount
178 +
179 + addwrite /dev/full
180 + #export RUN_EXPENSIVE_TESTS="yes"
181 + #export FETISH_GROUPS="portage wheel"
182 + env PATH="${T}/mount-wrappers:${PATH}" \
183 + emake -j1 -k check
184 +}
185 +
186 +src_install() {
187 + default
188 +
189 + insinto /etc
190 + newins src/dircolors.hin DIR_COLORS
191 +
192 + if [[ ${USERLAND} == "GNU" ]] ; then
193 + cd "${ED%/}"/usr/bin || die
194 + dodir /bin
195 + # move critical binaries into /bin (required by FHS)
196 + local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
197 + mkdir mknod mv pwd rm rmdir stty sync true uname"
198 + mv ${fhs} ../../bin/ || die "could not move fhs bins"
199 + if use kill; then
200 + mv kill ../../bin/ || die
201 + fi
202 + # move critical binaries into /bin (common scripts)
203 + local com="basename chroot cut dir dirname du env expr head mkfifo
204 + mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
205 + mv ${com} ../../bin/ || die "could not move common bins"
206 + # create a symlink for uname in /usr/bin/ since autotools require it
207 + # as long as /bin resolves to a different directory than /usr/bin
208 + local x
209 + [[ ${EROOT}bin/. -ef ${EROOT}usr/bin/. ]] ||
210 + for x in ${com} uname ; do
211 + dosym ../../bin/${x} /usr/bin/${x}
212 + done
213 + else
214 + # For now, drop the man pages, collides with the ones of the system.
215 + rm -rf "${ED%/}"/usr/share/man
216 + fi
217 +
218 + if use elibc_Cygwin ; then
219 + ! use kill || mv "${ED}"/bin/{,g}kill || die
220 + mv "${ED}"/usr/libexec/${PN}/libstdbuf$(get_libname){.exe,} || die
221 + fi
222 +}
223 +
224 +pkg_postinst() {
225 + ewarn "Make sure you run 'hash -r' in your active shells."
226 + ewarn "You should also re-source your shell settings for LS_COLORS"
227 + ewarn " changes, such as: source /etc/profile"
228 +
229 + # Help out users using experimental filesystems
230 + if grep -qs btrfs "${EROOT%/}"/etc/fstab /proc/mounts ; then
231 + case $(uname -r) in
232 + 2.6.[12][0-9]|2.6.3[0-7]*)
233 + ewarn "You are running a system with a buggy btrfs driver."
234 + ewarn "Please upgrade your kernel to avoid silent corruption."
235 + ewarn "See: https://bugs.gentoo.org/353907"
236 + ;;
237 + esac
238 + fi
239 +}