commit: e8d7b21324b61391087662a45f8f7f6c4267e663
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 17 14:20:11 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Nov 17 15:11:37 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8d7b213
dev-build/scons: Bump to 4.10.1
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-build/scons/Manifest | 4 +
dev-build/scons/scons-4.10.1.ebuild | 161 ++++++++++++++++++++++++++++++++++++
2 files changed, 165 insertions(+)
diff --git a/dev-build/scons/Manifest b/dev-build/scons/Manifest
index 771f3b1bcd61..84ab1133bfc9 100644
--- a/dev-build/scons/Manifest
+++ b/dev-build/scons/Manifest
@@ -1,8 +1,12 @@
DIST SCons-4.10.0.tar.gz 3257277 BLAKE2B
16d5e67865a074d4dfc1a27d70121aa7b76a5251fa84c599cf57bcdfb5cb36ab5249137d4e2742fd62f691a3f5cd221605b2881edea6a0c0b91a2971b6186d45
SHA512
5f9a4ac2cfc88b9862d56683f2cf8a1f649d6f7c96af7675fab6ffbd6461e2dd416279dc36fcc9aa347ea48b5fffd23fc59e5664b93a9b3e32a24241ec516337
+DIST SCons-4.10.1.tar.gz 3258403 BLAKE2B
c3954478e3a6795c04975a50afbca269add686284c50461e8ca71dc338c1b160f4a766ca82557a1cbfc95bd9f668648bcd637f1aa30e0410ca1b41b2e2292ae7
SHA512
4c64070714ba16c8e231ecfac9c1df6fad252b5509e0d260cc05f28865e3068f58c169d73c1559373b7a2d517bcb94a07593ab00781afd9a6a55893455471bc4
DIST SCons-4.9.1.r1.tar.gz 3252098 BLAKE2B
dfb38fdb70ba5bb62211efebf8ae2170e06886efb5c01c8661aef89b9fdf47fef97a1385ccab14180c92d64ef729a0de58b1623d54a19b9e65cb2e46d2836036
SHA512
754704d59096480d30f38271f43e4b0dccd3974b4da385f798bf60654a27eb165693907691245da3d8fedfb9a6cc6cb0cfa3af811227b46eb269de3f525fea2a
DIST scons-4.10.0-user.html 1722954 BLAKE2B
7e368a4b0e63a4cca92140399f7fcc244b2f0eb07003129b1e8adafec94f7f846e1fcb1446b6be3fc909be61d70185b90e3ae2b29c940024652d53ff2241d95b
SHA512
cb973c26a0b01701a1bcb8ae9240544cdb96f31d7420c43d5b72754aeec65826f8839ed552a1854dd8de6aad51fa5ac609d468403f07696de3333b14b9957536
DIST scons-4.10.0-user.pdf 3128077 BLAKE2B
e2657cce5a72141cbd63e49e7674b54607fbdd8f46562e1eea42bcc68a022874178b84df850c1a182aac5d12129a7887352501a73b0e49b65506082fcd4b2d23
SHA512
a153e964f357cb388724eb02acfdd7dc16730af19881c9df9fd1ea5284c18943702571057a182ad1108df56dc407bdfe7a7d2066024965059079ce0a17fb5c48
DIST scons-4.10.0.gh.tar.gz 5983179 BLAKE2B
2d3a7abc6282220d30923bc04ff11f33a5ea6fb281d8c7ed3b91e923b7a9cb0c614d541f8aae1fbc376c7719650e0fb8628b69f2b7168e29a3d3f40547763d9b
SHA512
c6203b1f95627b908fefcc4d9d4a89c9e0d9869c16bef30a9ea16ad32ae0eae45795e36ab92eeb58ab41a1cf53d09094fadfe474e663cdb5da642cfbf7fcb80a
+DIST scons-4.10.1-user.html 1725837 BLAKE2B
5c177696b2abd9a3094ce94e8b07a64c02086ad12e243c8b4f84a1b787e29eec75f38217b2378f0d97ac5f4cc5dcb27984e81f0bd9aabe64d2e2d5d6ded3ddb4
SHA512
b707a4fb380afaf8eee11ab3aca75545225ff571e2d1c1071e365f940bdeffbd0b11085d6464d0e3abb20ca4f12bfcb059e39d7a569533de6cc8db44ec922077
+DIST scons-4.10.1-user.pdf 3128752 BLAKE2B
91050cc519f86e909f49dd84a744133d253376c3d9f649779c9257127c9e1ab05ab699bbac74828bd54bd6f047e94baa0b880b86d501c5b7b5ac1b8d8457b5bf
SHA512
1592a9d33d4cee5970d0cb0872882583bbe1d213305c2f9f7dee5acd3d703a0ec999b580785391cae498cc47fc07118da2efa956b1b77b84d994a36104efdcc3
+DIST scons-4.10.1.gh.tar.gz 5981560 BLAKE2B
c2fa46729300f63debcfe8e982e347ed7d486e9d2d0889470be4553702d3123ae813487f934735bb980732df83894bec5f18f731e83bf75a4bd0c2230c60ea03
SHA512
e47000c4fe770c84c1c97ed4e7feee9305669cfbbd1aac06e158d15b08383dbdcbd5397ff62519478204c07d064337fe8101d81e17e0c8d5d611e453ed6d4da2
DIST scons-4.9.1-user.html 1713371 BLAKE2B
099c507032225ae7b40563f6a07ac9f66169037292f46e80c55030b12c997faa2e9cbed7d1d3adef2d866a1b561d0d352dee81f202c756db3e06a8635119caa8
SHA512
841797a142820d78c2a7bb27b6e8181fe4bc5d46f72663e4f4646e8a92731afeac8baf0fb5d70013a54cb6c00695685a8465ca4c72b12cfcf2440da6e4142b5d
DIST scons-4.9.1-user.pdf 3118902 BLAKE2B
94cbebabe9a4c77e41feec674581467a8c2a9db22dc03df84587a41bbf14fc6defeff2ff195d5187cfbef33e5aa9ae45923621431d093edbdee4ba18cc1aa7a3
SHA512
71d103a3fe4b386028fe578c49e9ba0cc339668c7f37b3f05070c85def936f8f9da160599fe612c527cc71fe70ca9985c38bda31efd8478a50d890b90f2d6a3e
DIST scons-4.9.1.gh.tar.gz 5954643 BLAKE2B
d2e1e79465fbbc6b0a6da6ba37e11981441b817d3d778d21d9c5dbd9fef8f9c9d6e317a036f0977984289f08901f83321b98196d2495b6b8826e25c6af3d7ed7
SHA512
9956d586ef7cfc534ad6adc907689073e9f4ed647c3ba8c2d1dce6e9e5e99cf4255d30d878c74c956795393d1bd00a715d72907350068f660400a189b1142fbd
diff --git a/dev-build/scons/scons-4.10.1.ebuild
b/dev-build/scons/scons-4.10.1.ebuild
new file mode 100644
index 000000000000..c0983df9d0b7
--- /dev/null
+++ b/dev-build/scons/scons-4.10.1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{11..14} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 multiprocessing
+
+MY_P="SCons-${PV}"
+DESCRIPTION="Extensible Python-based build utility"
+HOMEPAGE="
+ https://www.scons.org/
+ https://github.com/SCons/scons/
+ https://pypi.org/project/SCons/
+"
+SRC_URI="
+
https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${MY_P}.tar.gz
+ doc? (
+ https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf
+ -> ${P}-user.pdf
+ https://www.scons.org/doc/${PV}/HTML/${PN}-user.html
+ -> ${P}-user.html
+ )
+ test? (
+ https://github.com/SCons/scons/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+ )
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x64-solaris"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ test? (
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ )
+"
+
+src_unpack() {
+ # use the git directory structure, then unpack the pypi tarball
+ # on top of it to make our life easier
+ if use test; then
+ unpack "${P}.gh.tar.gz"
+ else
+ mkdir -p "${P}" || die
+ fi
+
+ tar -C "${P}" --strip-components=1 --no-same-owner \
+ -xzf "${DISTDIR}/${MY_P}.tar.gz" || die
+}
+
+src_prepare() {
+ distutils-r1_src_prepare
+
+ # TODO: rebase the patches <4.5.1-r2 is gone
+ # support env passthrough for Gentoo ebuilds
+ eapply -p2 "${FILESDIR}"/scons-4.1.0-env-passthrough.patch
+ # respect CC, CXX, C*FLAGS, LDFLAGS by default
+ eapply -p2 "${FILESDIR}"/scons-4.2.0-respect-cc-etc.patch
+
+ if use test; then
+ local remove_tests=(
+ # TODO: does not respect PATH?
+ test/Clang
+ # broken
+ test/DVIPDF/DVIPDFFLAGS.py
+ test/Java/swig-dependencies.py
+ test/Java/multi-step.py
+ test/TEX/newglossary.py
+ test/TEX/variant_dir_newglossary.py
+ test/Configure/option--config.py
+ test/D/HSTeoh/sconstest-linkingProblem_gdc.py
+ # broken by commas in date, sic!
+ test/option/option-v.py
+ test/Interactive/version.py
+ # warnings from new binutils?
+ test/AS/as-live.py
+ test/AS/nasm.py
+ # hangs
+ test/KeyboardInterrupt.py
+ # requires f77 executable
+ test/Fortran/F77PATH.py
+ test/Fortran/FORTRANPATH.py
+ test/Fortran/gfortran.py
+ # TODO, these seem to be caused by our patches
+ test/Repository/include.py
+ test/Repository/multi-dir.py
+ test/Repository/variants.py
+ test/virtualenv/activated/option/ignore-virtualenv.py
+ # broken by CC being set? *facepalm*
+ test/LINK/applelink.py
+ test/ToolSurrogate.py
+ # no clue but why would we care about rpm?
+ test/packaging/option--package-type.py
+ test/packaging/rpm/cleanup.py
+ test/packaging/rpm/internationalization.py
+ test/packaging/rpm/multipackage.py
+ test/packaging/rpm/package.py
+ test/packaging/rpm/tagging.py
+ # apparently fragile to... limits?
+ # https://bugs.gentoo.org/908347#c7
+ test/builderrors.py
+ # unhappy about jre-25
+ test/Java/nested-classes.py
+ # flaky
+ test/leaky-handles.py
+ )
+
+ if ! use amd64 && ! use x86 ; then
+ # These tests are currently broken on arm and other
non-amd64/x86 platforms
+ # Work seems to be ongoing in e.g.
https://github.com/SCons/scons/pull/4022 to
+ # better plumb up the MSVC tests for alternative arches.
+ # Try again after 4.2.0.
+ # See also:
https://pairlist4.pair.net/pipermail/scons-users/2020-November/008452.html
+ # bug #757534
+ remove_tests+=(
+ test/MSVS/vs-7.0-scc-files.py
+ test/MSVS/vs-7.0-scc-legacy-files.py
+ test/MSVS/vs-7.1-scc-files.py
+ test/MSVS/vs-7.1-scc-legacy-files.py
+ test/MSVS/vs-scc-files.py
+ test/MSVS/vs-scc-legacy-files.py
+ )
+ fi
+
+ rm -r "${remove_tests[@]}" || die
+ fi
+}
+
+python_test() {
+ local -x COLUMNS=80
+ # set variable from escons() of scons-util.eclass to make
env-passthrough patch work within test env
+ local -x GENTOO_SCONS_ENV_PASSTHROUGH=1
+ # unset some env variables to pass appropriate tests
+ unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+ cd "${WORKDIR}/${P}" || die
+ "${EPYTHON}" runtest.py -a --passed \
+ -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+
+ # runtest.py script returns "0" if all tests are passed
+ # and returns "2" if there are any tests with "no result"
+ # (i.e. in case if some tools are not installed or it's Windows
specific tests)
+ [[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}"
+
+ # sigh
+ rm "${BUILD_DIR}/install/usr/bin/.sconsign" || die
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ doman *.1
+ use doc && dodoc "${DISTDIR}/${P}"-user.{pdf,html}
+}
