Diff coreutils-9.11-r1 with a coreutils-9999

/usr/portage/sys-apps/coreutils/coreutils-9999.ebuild 2026-09-28 20:03:05.837105506 +0300
13 13
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/coreutils.asc
14 14
inherit branding flag-o-matic python-any-r1 toolchain-funcs verify-sig
15 15

  
16
MY_PATCH="${PN}-9.6-patches"
16
MY_PATCH="${PN}-9.12-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).299-27a7c"
26
	MY_SNAPSHOT="$(ver_cut 1-2).274-7f973"
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"
36
	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
37 37
fi
38 38

  
39
SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )"
39
SRC_URI+=" !vanilla? ( https://distfiles.gentoo.org/pub/dev/sam@gentoo.org/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )"
40 40

  
41 41
LICENSE="GPL-3+"
42 42
SLOT="0"
......
76 76
		!sys-apps/util-linux[kill]
77 77
		!sys-process/procps[kill]
78 78
	)
79
	!<sys-apps/util-linux-2.13
80
	!<sys-apps/sandbox-2.10-r4
81
	!sys-apps/stat
82
	!net-mail/base64
83
	!sys-apps/mktemp
84 79
	!<app-forensics/tct-1.18-r1
85 80
	!<net-fs/netatalk-2.0.3-r4
81
	!net-mail/base64
82
	!sys-apps/mktemp
83
	!<sys-apps/sandbox-2.10-r4
86 84
	!<sys-apps/shadow-4.19.0_rc1
85
	!sys-apps/stat
86
	!<sys-apps/util-linux-2.13
87 87
"
88 88

  
89 89
QA_CONFIG_IMPL_DECL_SKIP=(
......
104 104
		cd "${S}" || die
105 105
		./bootstrap || die
106 106

  
107
		sed -i -e "s:submodule-checks ?= no-submodule-changes public-submodule-commit:submodule-checks ?= no-submodule-changes:" gnulib/top/maint.mk || die
107
		sed -i \
108
			-e "s:submodule-checks ?= no-submodule-changes public-submodule-commit:submodule-checks ?= no-submodule-changes:" \
109
			gnulib/top/maint.mk || die
108 110
	elif use verify-sig ; then
109 111
		# Needed for downloaded patch (which is unsigned, which is fine)
110 112
		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
......
118 120
	local PATCHES=(
119 121
		"${FILESDIR}"/${PN}-9.5-skip-readutmp-test.patch
120 122
		# Upstream patches
121
		"${FILESDIR}"/${PN}-9.11-tee.patch
122 123
	)
123 124

  
125
	if [[ ${PV} == 9999 ]] ; then
126
		rm "${WORKDIR}"/${MY_PATCH}/0005-env-printenv-quote-terminals-only.patch \
127
			"${WORKDIR}"/${MY_PATCH}/0006-regenerate-info-for-printenv-backport.patch || die
128
	else
129
		die "Please drop the patch cleanup and reroll the patch tarball before copying from live!"
130
	fi
131

  
124 132
	if ! use vanilla && [[ -d "${WORKDIR}"/${MY_PATCH} ]] ; then
125 133
		PATCHES+=( "${WORKDIR}"/${MY_PATCH} )
126 134
	fi
......
178 186
	# https://savannah.gnu.org/support/?111394
179 187
	# This can be removed when we patch dev-build/autoconf, though
180 188
	# packages w/o eautoreconf will still need it.
181
	! tc-has-64bit-time_t && [[ ${enable_year2038} == "no" ]] && xfail_tests+=( test-year2038 )
189
	! tc-has-64bit-time_t && [[ ${enable_year2038} == "no" ]] && myconf+=( --disable-year2038 )
182 190

  
183 191
	if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
184 192
		# bug #311569
......
190 198
	# bug #409919
191 199
	export gl_cv_func_mknod_works=yes
192 200

  
201
	# https://sourceware.org/PR20381
202
	has_version "=sys-libs/glibc-2.44*" && export gl_cv_func_re_compile_pattern_working=no
203

  
193 204
	if use static ; then
194 205
		append-ldflags -static
195 206
		# bug #321821
Thank you!