Diff fish-4.0_beta1 with a fish-9999

/usr/portage/app-shells/fish/fish-9999.ebuild 2025-02-03 17:39:32.314665085 +0300
3 3

  
4 4
EAPI=8
5 5

  
6
CRATES="
7
	allocator-api2@0.2.18
8
	autocfg@1.4.0
9
	bitflags@2.6.0
10
	block-buffer@0.10.4
11
	cc@1.1.30
12
	cfg-if@1.0.0
13
	cfg_aliases@0.2.1
14
	cpufeatures@0.2.14
15
	crypto-common@0.1.6
16
	dashmap@5.5.3
17
	digest@0.10.7
18
	equivalent@1.0.1
19
	errno@0.3.9
20
	fnv@1.0.7
21
	foldhash@0.1.3
22
	generic-array@0.14.7
23
	hashbrown@0.14.5
24
	hashbrown@0.15.0
25
	jobserver@0.1.32
26
	lazy_static@1.5.0
27
	libc@0.2.159
28
	lock_api@0.4.12
29
	log@0.4.22
30
	lru@0.12.5
31
	memchr@2.7.4
32
	minimal-lexical@0.2.1
33
	nix@0.29.0
34
	nom@7.1.3
35
	num-traits@0.2.19
36
	once_cell@1.20.2
37
	parking_lot@0.12.3
38
	parking_lot_core@0.9.10
39
	phf@0.11.2
40
	phf_codegen@0.11.2
41
	phf_generator@0.11.2
42
	phf_shared@0.11.2
43
	pkg-config@0.3.31
44
	portable-atomic@1.9.0
45
	proc-macro2@1.0.87
46
	quote@1.0.37
47
	rand@0.8.5
48
	rand_core@0.6.4
49
	redox_syscall@0.5.7
50
	rsconf@0.2.2
51
	rust-embed-impl@8.5.0
52
	rust-embed-utils@8.5.0
53
	rust-embed@8.5.0
54
	same-file@1.0.6
55
	scopeguard@1.2.0
56
	serial_test@1.0.0
57
	serial_test_derive@1.0.0
58
	sha2@0.10.8
59
	shlex@1.3.0
60
	siphasher@0.3.11
61
	smallvec@1.13.2
62
	syn@1.0.109
63
	syn@2.0.79
64
	terminfo@0.9.0
65
	typenum@1.17.0
66
	unicode-ident@1.0.13
67
	version_check@0.9.5
68
	walkdir@2.5.0
69
	widestring@1.1.0
70
	winapi-util@0.1.9
71
	windows-sys@0.52.0
72
	windows-sys@0.59.0
73
	windows-targets@0.52.6
74
	windows_aarch64_gnullvm@0.52.6
75
	windows_aarch64_msvc@0.52.6
76
	windows_i686_gnu@0.52.6
77
	windows_i686_gnullvm@0.52.6
78
	windows_i686_msvc@0.52.6
79
	windows_x86_64_gnu@0.52.6
80
	windows_x86_64_gnullvm@0.52.6
81
	windows_x86_64_msvc@0.52.6
82
"
83

  
84
declare -A GIT_CRATES=(
85
	[pcre2-sys]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%/pcre2-sys'
86
	[pcre2]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%'
87
)
88

  
89 6
PYTHON_COMPAT=( python3_{10..13} )
90 7

  
91 8
inherit cargo cmake python-any-r1 readme.gentoo-r1 xdg
......
96 13
MY_PV="${PV/_beta/b}"
97 14
MY_P="${PN}-${MY_PV}"
98 15

  
99
if [[ ${PV} == "9999" ]]; then
16
if [[ ${PV} == 9999 ]]; then
100 17
	inherit git-r3
101 18
	EGIT_REPO_URI="https://github.com/fish-shell/fish-shell.git"
102 19
else
......
104 21
		https://github.com/fish-shell/fish-shell/releases/download/${MY_PV}/${MY_P}.tar.xz
105 22
		${CARGO_CRATE_URIS}
106 23
	"
107
	# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
24
	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
108 25
fi
109 26

  
110 27
S="${WORKDIR}/${MY_P}"
......
198 115
	CMAKE_WITH_GETTEXT="$(usex nls 1 0)"
199 116
	cargo_src_compile
200 117

  
118
	# copy files built with cargo_src_compile into the cmake build directory,
119
	# so when we run cmake_src_install they are not rebuild
201 120
	for target in fish fish_indent fish_key_reader; do
202 121
		cp "$(cargo_target_dir)/${target}" "${BUILD_DIR}" || die
203 122
	done
......
228 147
	# tests are confused by usr/sbin -> bin symlink, no die is intentional for repeated test runs
229 148
	use split-usr || rm -v tests/checks/{redirect,type}.fish || :
230 149

  
231
	# tests are invoked through the test target
150
	# cmake_src_test will invoke ctest but required files are missing
232 151
	cargo_env cmake_build test
233 152
}
234 153

  
Thank you!