commit:     b1583ddd746229dfd5514e75ac98dc680da53144
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  3 04:34:54 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Oct  3 05:37:44 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1583ddd

dev-build/scons: Bump to 4.10.0

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-build/scons/Manifest            |   4 +
 dev-build/scons/scons-4.10.0.ebuild | 161 ++++++++++++++++++++++++++++++++++++
 2 files changed, 165 insertions(+)

diff --git a/dev-build/scons/Manifest b/dev-build/scons/Manifest
index 0cbdde341be3..5e8c442aa832 100644
--- a/dev-build/scons/Manifest
+++ b/dev-build/scons/Manifest
@@ -1,6 +1,10 @@
+DIST SCons-4.10.0.tar.gz 3257277 BLAKE2B 
16d5e67865a074d4dfc1a27d70121aa7b76a5251fa84c599cf57bcdfb5cb36ab5249137d4e2742fd62f691a3f5cd221605b2881edea6a0c0b91a2971b6186d45
 SHA512 
5f9a4ac2cfc88b9862d56683f2cf8a1f649d6f7c96af7675fab6ffbd6461e2dd416279dc36fcc9aa347ea48b5fffd23fc59e5664b93a9b3e32a24241ec516337
 DIST SCons-4.8.1.tar.gz 3244423 BLAKE2B 
31441e16ca96b844b1bcc388cd430a4a087bb5f09a8951166fc44b7422611d416fc6311d79370d768b52a93ad417369682e2a77ada3fe77e82d59c81bfd7b4dd
 SHA512 
dad76d7f16b4cc1d9e25c9d8969773604e23accbb4e94451f0fc725919bf223cf04265f5d2b64a1b7e96cc63496cba574df3a634fd6779f2eb5fb7246fded120
 DIST SCons-4.9.0.tar.gz 3251689 BLAKE2B 
fafce07d3e6f946344298f66d8530f79dce08e221ccd9957d29fbea9f23c7048f651c1c6735ac3dd51dd2c07f1540d77f16301e9c253a9f3087446a2a4856666
 SHA512 
74d3d782433394fbdd1010c2a6c4a4026431753f72be1e6f61c7c00ad37ff1cb4c5e149c4418a7d7325b5553e3f827b32bf0f8f1727b08def5a8f90e54ff3439
 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.8.1-user.html 1696975 BLAKE2B 
5c34754daa149f49b35a06ae1ab0264649004cdd94106eb70965c0f89aef80268ee6b138aa0beaac1451222888ccd11ec34f2872006702c36460f719fc90a3c7
 SHA512 
dadfc79a441de6d882e18d3fbf82e668d8a7eca6fa449aaebac9d3edd518d91e208342b7203c5e74ed4651fa5cf5d2d453055e4805407a18aad5349a9e1ea92f
 DIST scons-4.8.1-user.pdf 3093300 BLAKE2B 
84752a76fba302ab6ae1bbd6c960680e94144f0c9d7b1292096fb7df40a090848aede0b3c309271089ab6bbfd8ff89265496c71e970a9b2b6c5789e04ea4954e
 SHA512 
11776a6f0ca475633a85673fb2347358f45e3c20465424aefe4c12f3037e22199ffdc2ae921d002a67f4edee204961f405aef172ca93a77452e25eb9cab33445
 DIST scons-4.8.1.gh.tar.gz 5931602 BLAKE2B 
702252622bc9dd97417cb3db09caebd8732cabe3627e8539475f2177a15bf9cfa8dae9863c462796a6ebf079db2c1609089f1a6d1a0e0ffa220cc69f905beff1
 SHA512 
b9f39634b36876fa15e2db968a38693745ce3f0f14e838e97f69e2a6762d8f78c04e52843e2ce50900000833854c90ee2bd9d3d84bb48d9acfbf41f94af02775

diff --git a/dev-build/scons/scons-4.10.0.ebuild 
b/dev-build/scons/scons-4.10.0.ebuild
new file mode 100644
index 000000000000..a8e99c5cf6b4
--- /dev/null
+++ b/dev-build/scons/scons-4.10.0.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..13} )
+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}
+}

Reply via email to