Diff coreutils-8.31-r1 with a coreutils-8.32-r1

/usr/portage/sys-apps/coreutils/coreutils-8.32-r1.ebuild 2020-04-30 04:09:00.000000000 +0300
1 1
# Copyright 1999-2020 Gentoo Authors
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4
EAPI="6"
4
EAPI=7
5 5

  
6
PYTHON_COMPAT=( python3_{6,7} )
6
PYTHON_COMPAT=( python3_{6,7,8} )
7 7

  
8 8
inherit eutils flag-o-matic python-any-r1 toolchain-funcs
9 9

  
......
11 11
DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
12 12
HOMEPAGE="https://www.gnu.org/software/coreutils/"
13 13
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
14
	mirror://gentoo/${PATCH}.tar.xz
15
	https://dev.gentoo.org/~polynomial-c/dist/${PATCH}.tar.xz"
14
	!vanilla? (
15
		mirror://gentoo/${PATCH}.tar.xz
16
		https://dev.gentoo.org/~polynomial-c/dist/${PATCH}.tar.xz
17
	)
18
"
16 19

  
17 20
LICENSE="GPL-3"
18 21
SLOT="0"
19
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
22
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
20 23
IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr"
21 24
RESTRICT="!test? ( test )"
22 25

  
......
27 30
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )
28 31
	selinux? ( sys-libs/libselinux )
29 32
	nls? ( virtual/libintl )"
30
DEPEND="${RDEPEND}
33
DEPEND="
34
	${RDEPEND}
31 35
	static? ( ${LIB_DEPEND} )
36
"
37
BDEPEND="
32 38
	app-arch/xz-utils
33 39
	test? (
34 40
		dev-lang/perl
35 41
		dev-perl/Expect
36 42
		dev-util/strace
37 43
		${PYTHON_DEPS}
38
	)"
44
	)
45
"
39 46
RDEPEND+="
40 47
	hostname? ( !sys-apps/net-tools[hostname] )
41 48
	kill? (
......
58 65
}
59 66

  
60 67
src_prepare() {
68
	local PATCHES=(
69
		"${FILESDIR}"/coreutils-8.32-ls-restore-8.31-behavior.patch
70
	)
71

  
61 72
	if ! use vanilla ; then
62
		eapply "${WORKDIR}"/patch/*.patch
63
		eapply "${FILESDIR}"/${PN}-8.31-sandbox-env-test.patch
73
		PATCHES+=( "${WORKDIR}"/patch )
74
		PATCHES+=( "${FILESDIR}"/${PN}-8.32-sandbox-env-test.patch )
64 75
	fi
65 76

  
66
	eapply_user
77
	default
67 78

  
68 79
	# Since we've patched many .c files, the make process will try to
69 80
	# re-build the manpages by running `./bin --help`.  When doing a
......
155 166
	newins src/dircolors.hin DIR_COLORS
156 167

  
157 168
	if use split-usr ; then
158
		cd "${ED%/}"/usr/bin || die
169
		cd "${ED}"/usr/bin || die
159 170
		dodir /bin
160 171
		# move critical binaries into /bin (required by FHS)
161 172
		local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
Thank you!