Diff coreutils-9.3-r3 with a coreutils-9.4

/usr/portage/sys-apps/coreutils/coreutils-9.4.ebuild 2023-10-09 14:52:35.348368498 +0300
9 9
#
10 10
# Also recommend subscribing to the coreutils and bug-coreutils MLs.
11 11

  
12
PYTHON_COMPAT=( python3_{9..11} )
12
PYTHON_COMPAT=( python3_{10..11} )
13 13
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/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.0_p20220409-patches-01"
16
MY_PATCH="${PN}-9.4-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).18-ffd62"
26
	MY_SNAPSHOT="$(ver_cut 1-2).156-b3afb"
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 ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
36
	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 )"
......
108 108
}
109 109

  
110 110
src_prepare() {
111
	# TODO: past 2025, we may need to add our own hack for bug #907474.
111 112
	local PATCHES=(
112 113
		# Upstream patches
113
		"${FILESDIR}"/${P}-cp-parents-preserve-permissions.patch
114
		"${FILESDIR}"/${P}-old-kernel-copy_file_range.patch
114
		"${FILESDIR}"/${P}-gnulib-openssl-1.1.patch
115 115
	)
116 116

  
117
	if ! use vanilla && [[ -d "${WORKDIR}"/patch ]] ; then
118
		PATCHES+=( "${WORKDIR}"/patch )
117
	if ! use vanilla && [[ -d "${WORKDIR}"/${MY_PATCH} ]] ; then
118
		PATCHES+=( "${WORKDIR}"/${MY_PATCH} )
119 119
	fi
120 120

  
121 121
	default
122 122

  
123
	# Just for ${P}-old-kernel-copy_file_range.patch
124
	touch aclocal.m4 configure.ac Makefile.in gnulib-tests/Makefile.in configure || die
125

  
126 123
	# Since we've patched many .c files, the make process will try to
127 124
	# re-build the manpages by running `./bin --help`.  When doing a
128 125
	# cross-compile, we can't do that since 'bin' isn't a native bin.
......
140 137
}
141 138

  
142 139
src_configure() {
143
	# On alpha at least, gnulib (as of 9.3) can't seem to figure out we need
144
	# _F_O_B=64: https://debbugs.gnu.org/64123
145
	append-lfs-flags
146

  
140
	# TODO: in future (>9.4?), we may want to wire up USE=systemd:
141
	# still experimental at the moment, but:
142
	# https://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=85edb4afbd119fb69a0d53e1beb71f46c9525dd0
147 143
	local myconf=(
148 144
		--with-packager="Gentoo"
149 145
		--with-packager-version="${PVR} (p${PATCH_VER:-0})"
......
153 149
		# hostname    - net-tools
154 150
		--enable-install-program="arch,$(usev hostname),$(usev kill)"
155 151
		--enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
156
		$(usex caps '' --disable-libcap)
152
		$(usev !caps --disable-libcap)
157 153
		$(use_enable nls)
158 154
		$(use_enable acl)
159 155
		$(use_enable multicall single-binary)
Thank you!