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