Diff scons-4.5.1-r2 with a scons-4.5.2

/usr/portage/dev-util/scons/scons-4.5.2.ebuild 2023-10-09 14:52:31.000368388 +0300
18 18
"
19 19
SRC_URI="
20 20
	https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${MY_P}.tar.gz
21
	https://github.com/SCons/scons/pull/4322.patch
22
		-> ${P}-mergeflags.patch
23
	https://github.com/SCons/scons/archive/${PV}.tar.gz
24
		-> ${P}.gh.tar.gz
25 21
	doc? (
26 22
		https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf
27 23
			-> ${P}-user.pdf
28 24
		https://www.scons.org/doc/${PV}/HTML/${PN}-user.html
29 25
			-> ${P}-user.html
30 26
	)
27
	test? (
28
		https://github.com/SCons/scons/archive/${PV}.tar.gz
29
			-> ${P}.gh.tar.gz
30
	)
31 31
"
32 32

  
33 33
LICENSE="MIT"
34 34
SLOT="0"
35
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
35
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
36 36
IUSE="doc test"
37 37
RESTRICT="!test? ( test )"
38 38

  
......
46 46
src_unpack() {
47 47
	# use the git directory structure, then unpack the pypi tarball
48 48
	# on top of it to make our life easier
49
	unpack "${P}.gh.tar.gz"
49
	if use test; then
50
		unpack "${P}.gh.tar.gz"
51
	else
52
		mkdir -p "${P}" || die
53
	fi
54

  
50 55
	tar -C "${P}" --strip-components=1 -xzf "${DISTDIR}/${MY_P}.tar.gz" || die
51 56
}
52 57

  
53 58
src_prepare() {
54
	local PATCHES=(
55
		# https://bugs.gentoo.org/900971
56
		"${DISTDIR}/${P}-mergeflags.patch"
57
	)
58

  
59 59
	distutils-r1_src_prepare
60 60

  
61 61
	# TODO: rebase the patches <4.5.1-r2 is gone
......
74 74
			test/Java/multi-step.py
75 75
			test/TEX/newglossary.py
76 76
			test/TEX/variant_dir_newglossary.py
77
			test/Configure/option--config.py
77 78
			# broken by commas in date, sic!
78 79
			test/option/option-v.py
79 80
			test/Interactive/version.py
......
91 92
			test/Repository/multi-dir.py
92 93
			test/Repository/variants.py
93 94
			test/virtualenv/activated/option/ignore-virtualenv.py
95
			# broken by CC being set? *facepalm*
96
			test/LINK/applelink.py
97
			test/ToolSurrogate.py
98
			# no clue but why would we care about rpm?
99
			test/packaging/option--package-type.py
100
			test/packaging/rpm/cleanup.py
101
			test/packaging/rpm/internationalization.py
102
			test/packaging/rpm/multipackage.py
103
			test/packaging/rpm/package.py
104
			test/packaging/rpm/tagging.py
94 105
		)
95 106

  
96 107
		if ! use amd64 && ! use x86 ; then
......
128 139
	# and returns "2" if there are any tests with "no result"
129 140
	# (i.e. in case if some tools are not installed or it's Windows specific tests)
130 141
	[[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}"
142

  
143
	# sigh
144
	rm "${BUILD_DIR}/install/usr/bin/.sconsign" || die
131 145
}
132 146

  
133 147
python_install_all() {
Thank you!