Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/coreutils/
Date: Fri, 01 Jan 2021 01:56:05
Message-Id: 1609466156.4f776835f391f2c65230e623ffef6c8a1f7faf68.mgorny@gentoo
1 commit: 4f776835f391f2c65230e623ffef6c8a1f7faf68
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 1 01:53:52 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 1 01:55:56 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f776835
7
8 sys-apps/coreutils: Remove old (py3.6)
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-apps/coreutils/Manifest | 1 -
13 sys-apps/coreutils/coreutils-8.30.ebuild | 210 -------------------------------
14 2 files changed, 211 deletions(-)
15
16 diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
17 index 587b6b33bc9..3df4cec98e7 100644
18 --- a/sys-apps/coreutils/Manifest
19 +++ b/sys-apps/coreutils/Manifest
20 @@ -1,4 +1,3 @@
21 DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125eebef92217469a9490808719fa0665f5e5c0adb96fbd02c4bac4d280d1502295669575790a81dbc01afe2ca3a9d384cbefb0 SHA512 b1e1933637de4581d5f8c6ede4e80a012435d13f0cf5550a76ab5bbe9441e3c15ce19ef3f78a7ea3b8368d5e9a3bb17c1207c471d26171b59786f38adeba0454
22 -DIST coreutils-8.30.tar.xz 5359532 BLAKE2B b66ccd112a6c2c8b90e58ff1c3371e7f5827937035769329885e5bdae197466189f3715720b8f8cf0b5047fe16d6c86984dcee994117c2d3c7b8dbd597027255 SHA512 25bc132c0d89ce71c33e417f04649c9fcfce6c5ef8b19f093b2e9e2851bfde9b5a31e20499d9c427332228ba54b88d445ddb445551e1944bb8f5cbff5ffa4eda
23 DIST coreutils-8.31.tar.xz 5410140 BLAKE2B e3ae6be8edbe9df9164b4c9ac8bf14dc23b147fa665f20669e18ac4c6e45ba839dc0dc99e05670eb006d22133475a4a717a5f40b00ebaedfd6e1fbab887674d5 SHA512 ef8941dae845bbf5ae5838bc49e44554a766302930601aada6fa594e8088f0fbad74e481ee392ff89633e68b99e4da3f761fcb5d31ee3b233d540fe2a2d4e1af
24 DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
25
26 diff --git a/sys-apps/coreutils/coreutils-8.30.ebuild b/sys-apps/coreutils/coreutils-8.30.ebuild
27 deleted file mode 100644
28 index fda25b3b8ba..00000000000
29 --- a/sys-apps/coreutils/coreutils-8.30.ebuild
30 +++ /dev/null
31 @@ -1,210 +0,0 @@
32 -# Copyright 1999-2020 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI="6"
36 -
37 -PYTHON_COMPAT=( python3_6 )
38 -
39 -inherit eutils flag-o-matic python-any-r1 toolchain-funcs
40 -
41 -PATCH_VER="01"
42 -DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
43 -HOMEPAGE="https://www.gnu.org/software/coreutils/"
44 -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
45 - mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz
46 - https://dev.gentoo.org/~polynomial-c/dist/${P}-patches-${PATCH_VER}.tar.xz"
47 -
48 -LICENSE="GPL-3"
49 -SLOT="0"
50 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
51 -IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test userland_BSD vanilla xattr"
52 -RESTRICT="!test? ( test )"
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 -python_check_deps() {
89 - has_version --host-root "dev-python/pyinotify[${PYTHON_USEDEP}]"
90 -}
91 -
92 -pkg_setup() {
93 - if use test ; then
94 - python-any-r1_pkg_setup
95 - fi
96 -}
97 -
98 -src_prepare() {
99 - if ! use vanilla ; then
100 - eapply "${WORKDIR}"/patch/*.patch
101 - fi
102 -
103 - eapply_user
104 -
105 - # Since we've patched many .c files, the make process will try to
106 - # re-build the manpages by running `./bin --help`. When doing a
107 - # cross-compile, we can't do that since 'bin' isn't a native bin.
108 - # Also, it's not like we changed the usage on any of these things,
109 - # so let's just update the timestamps and skip the help2man step.
110 - set -- man/*.x
111 - touch ${@/%x/1}
112 -
113 - # Avoid perl dep for compiled in dircolors default #348642
114 - if ! has_version dev-lang/perl ; then
115 - touch src/dircolors.h
116 - touch ${@/%x/1}
117 - fi
118 -}
119 -
120 -src_configure() {
121 - local myconf=(
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 - $(usex caps '' --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 - )
135 - if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
136 - export fu_cv_sys_stat_statfs2_bsize=yes #311569
137 - export gl_cv_func_realpath_works=yes #416629
138 - fi
139 -
140 - export gl_cv_func_mknod_works=yes #409919
141 - use static && append-ldflags -static && sed -i '/elf_sys=yes/s:yes:no:' configure #321821
142 - use selinux || export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no #301782
143 - use userland_BSD && myconf+=( -program-prefix=g --program-transform-name=s/stat/nustat/ )
144 - # kill/uptime - procps
145 - # groups/su - shadow
146 - # hostname - net-tools
147 - econf "${myconf[@]}"
148 -}
149 -
150 -src_test() {
151 - # Known to fail with FEATURES=usersandbox (bug #439574):
152 - # - tests/du/long-from-unreadable.sh} (bug #413621)
153 - # - tests/rm/deep-2.sh (bug #413621)
154 - # - tests/dd/no-allocate.sh (bug #629660)
155 - if has usersandbox $FEATURES ; then
156 - ewarn "You are emerging ${P} with 'usersandbox' enabled." \
157 - "Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
158 - fi
159 -
160 - # Non-root tests will fail if the full path isn't
161 - # accessible to non-root users
162 - chmod -R go-w "${WORKDIR}"
163 - chmod a+rx "${WORKDIR}"
164 -
165 - # coreutils tests like to do `mount` and such with temp dirs
166 - # so make sure /etc/mtab is writable #265725
167 - # make sure /dev/loop* can be mounted #269758
168 - mkdir -p "${T}"/mount-wrappers
169 - mkwrap() {
170 - local w ww
171 - for w in "$@" ; do
172 - ww="${T}/mount-wrappers/${w}"
173 - cat <<-EOF > "${ww}"
174 - #!${EPREFIX}/bin/sh
175 - exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P $w) "\$@"
176 - EOF
177 - chmod a+rx "${ww}"
178 - done
179 - }
180 - mkwrap mount umount
181 -
182 - addwrite /dev/full
183 - #export RUN_EXPENSIVE_TESTS="yes"
184 - #export FETISH_GROUPS="portage wheel"
185 - env PATH="${T}/mount-wrappers:${PATH}" \
186 - emake -j1 -k check
187 -}
188 -
189 -src_install() {
190 - default
191 -
192 - insinto /etc
193 - newins src/dircolors.hin DIR_COLORS
194 -
195 - if [[ ${USERLAND} == "GNU" ]] ; then
196 - cd "${ED%/}"/usr/bin || die
197 - dodir /bin
198 - # move critical binaries into /bin (required by FHS)
199 - local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
200 - mkdir mknod mv pwd rm rmdir stty sync true uname"
201 - mv ${fhs} ../../bin/ || die "could not move fhs bins"
202 - if use hostname; then
203 - mv hostname ../../bin/ || die
204 - fi
205 - if use kill; then
206 - mv kill ../../bin/ || die
207 - fi
208 - if use split-usr ; then
209 - # move critical binaries into /bin (common scripts)
210 - local com="basename chroot cut dir dirname du env expr head mkfifo
211 - mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
212 - mv ${com} ../../bin/ || die "could not move common bins"
213 - # create a symlink for uname in /usr/bin/ since autotools require it
214 - local x
215 - for x in ${com} uname ; do
216 - dosym ../../bin/${x} /usr/bin/${x}
217 - done
218 - fi
219 - else
220 - # For now, drop the man pages, collides with the ones of the system.
221 - rm -rf "${ED%/}"/usr/share/man
222 - fi
223 -
224 -}
225 -
226 -pkg_postinst() {
227 - ewarn "Make sure you run 'hash -r' in your active shells."
228 - ewarn "You should also re-source your shell settings for LS_COLORS"
229 - ewarn " changes, such as: source /etc/profile"
230 -
231 - # Help out users using experimental filesystems
232 - if grep -qs btrfs "${EROOT%/}"/etc/fstab /proc/mounts ; then
233 - case $(uname -r) in
234 - 2.6.[12][0-9]|2.6.3[0-7]*)
235 - ewarn "You are running a system with a buggy btrfs driver."
236 - ewarn "Please upgrade your kernel to avoid silent corruption."
237 - ewarn "See: https://bugs.gentoo.org/353907"
238 - ;;
239 - esac
240 - fi
241 -}