Gentoo Archives: gentoo-commits

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