Diff coreutils-9.4 with a coreutils-9999

/usr/portage/sys-apps/coreutils/coreutils-9999.ebuild 2025-07-29 16:22:17.372467909 +0300
1
# Copyright 1999-2024 Gentoo Authors
1
# Copyright 1999-2025 Gentoo Authors
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4 4
EAPI=8
......
9 9
#
10 10
# Also recommend subscribing to the coreutils and bug-coreutils MLs.
11 11

  
12
PYTHON_COMPAT=( python3_{10..11} )
12
PYTHON_COMPAT=( python3_{10..13} )
13 13
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/coreutils.asc
14 14
inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig
15 15

  
16
MY_PATCH="${PN}-9.4-patches"
16
MY_PATCH="${PN}-9.6-patches"
17 17
DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
18 18
HOMEPAGE="https://www.gnu.org/software/coreutils/"
19 19

  
......
23 23
elif [[ ${PV} == *_p* ]] ; then
24 24
	# Note: could put this in devspace, but if it's gone, we don't want
25 25
	# it in tree anyway. It's just for testing.
26
	MY_SNAPSHOT="$(ver_cut 1-2).156-b3afb"
26
	MY_SNAPSHOT="$(ver_cut 1-2).53-14af8"
27 27
	SRC_URI="https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz -> ${P}.tar.xz"
28 28
	SRC_URI+=" verify-sig? ( https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz.sig -> ${P}.tar.xz.sig )"
29 29
	S="${WORKDIR}"/${PN}-${MY_SNAPSHOT}
......
33 33
		verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
34 34
	"
35 35

  
36
	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
36
	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
37 37
fi
38 38

  
39 39
SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )"
......
116 116
	# TODO: past 2025, we may need to add our own hack for bug #907474.
117 117
	local PATCHES=(
118 118
		# Upstream patches
119
		"${FILESDIR}"/${P}-gnulib-openssl-1.1.patch
120 119
	)
121 120

  
122 121
	if ! use vanilla && [[ -d "${WORKDIR}"/${MY_PATCH} ]] ; then
......
222 221
	local -x PATH="${T}/mount-wrappers:${PATH}"
223 222
	local -x gl_public_submodule_commit=
224 223

  
225
	local xfail_tests=(
226
		# bug #629660
227
		#tests/dd/no-allocate.sh
228

  
229
		# bug #675802
230
		tests/env/env-S
231
		tests/env/env-S.pl
232

  
233
		# bug #413621 and bug #548250
234
		tests/du/long-from-unreadable.sh
235
		tests/ls/removed-directory
236
		tests/ls/removed-directory.sh
237
		tests/ls/stat-free-symlinks
238
		tests/ls/stat-free-symlinks.sh
239
		tests/rm/deep-2
240
		tests/rm/deep-2.sh
241

  
242
		# We have a patch which fixes this (bug #259876)
243
		#tests/touch/not-owner
244
		#tests/touch/not-owner.sh
245
	)
224
	local xfail_tests=()
225

  
226
	if [[ -n ${SANDBOX_ACTIVE} ]]; then
227
		xfail_tests+=(
228
			# bug #629660
229
			# Commented out again in 9.6 as it XPASSes on linux-6.12.10
230
			# with sandbox-2.43 on tmpfs. Let's see if it lasts..
231
			#tests/dd/no-allocate.sh
232

  
233
			# bug #675802
234
			tests/env/env-S
235
			tests/env/env-S.pl
236

  
237
			# We have a patch which fixes this (bug #259876)
238
			#tests/touch/not-owner
239
			#tests/touch/not-owner.sh
240
		)
241
	fi
246 242

  
247 243
	# This test is flaky (bug #910640).
248 244
	cat > tests/tty/tty-eof.pl <<-EOF || die
Thank you!