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