Diff scons-4.4.0-r1 with a scons-4.5.1-r2

/usr/portage/dev-util/scons/scons-4.5.1-r2.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
21 25
	doc? (
22 26
		https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf
23 27
			-> ${P}-user.pdf
24 28
		https://www.scons.org/doc/${PV}/HTML/${PN}-user.html
25 29
			-> ${P}-user.html
26 30
	)
27
	test? (
28
		https://github.com/SCons/scons/archive/${PV}.tar.gz
29
			-> ${P}.gh.tar.gz
30
	)
31 31
"
32
S="${WORKDIR}/${P}/src"
33 32

  
34 33
LICENSE="MIT"
35 34
SLOT="0"
......
44 43
	)
45 44
"
46 45

  
47
PATCHES=(
48
	# support env passthrough for Gentoo ebuilds
49
	"${FILESDIR}"/scons-4.1.0-env-passthrough.patch
50
	# respect CC, CXX, C*FLAGS, LDFLAGS by default
51
	"${FILESDIR}"/scons-4.2.0-respect-cc-etc.patch
52
)
53

  
54 46
src_unpack() {
55
	# use the git directory structure, but put pregenerated release
56
	# inside src/ subdirectory to make our life easier
57
	if use test; then
58
		unpack "${P}.gh.tar.gz"
59
	else
60
		mkdir -p "${P}"/src || die
61
	fi
62

  
63
	tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${MY_P}.tar.gz" || die
47
	# use the git directory structure, then unpack the pypi tarball
48
	# on top of it to make our life easier
49
	unpack "${P}.gh.tar.gz"
50
	tar -C "${P}" --strip-components=1 -xzf "${DISTDIR}/${MY_P}.tar.gz" || die
64 51
}
65 52

  
66 53
src_prepare() {
67
	# apply patches relatively to top directory
68
	cd "${WORKDIR}/${P}" || die
54
	local PATCHES=(
55
		# https://bugs.gentoo.org/900971
56
		"${DISTDIR}/${P}-mergeflags.patch"
57
	)
58

  
69 59
	distutils-r1_src_prepare
70 60

  
61
	# TODO: rebase the patches <4.5.1-r2 is gone
62
	# support env passthrough for Gentoo ebuilds
63
	eapply -p2 "${FILESDIR}"/scons-4.1.0-env-passthrough.patch
64
	# respect CC, CXX, C*FLAGS, LDFLAGS by default
65
	eapply -p2 "${FILESDIR}"/scons-4.2.0-respect-cc-etc.patch
66

  
71 67
	if use test; then
72 68
		local remove_tests=(
73 69
			# TODO: does not respect PATH?
......
86 82
			test/AS/nasm.py
87 83
			# hangs
88 84
			test/KeyboardInterrupt.py
85
			# requires f77 executable
86
			test/Fortran/F77PATH.py
87
			test/Fortran/FORTRANPATH.py
88
			test/Fortran/gfortran.py
89
			# TODO, these seem to be caused by our patches
90
			test/Repository/include.py
91
			test/Repository/multi-dir.py
92
			test/Repository/variants.py
93
			test/virtualenv/activated/option/ignore-virtualenv.py
89 94
		)
90 95

  
91 96
		if ! use amd64 && ! use x86 ; then
Thank you!