commit: d7710da75370936cd5680e60c5e40355a07fdfb2
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 28 06:08:06 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Mar 28 06:47:05 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7710da7
dev-build/scons: Bump to 4.9.1
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-build/scons/Manifest | 4 +
dev-build/scons/scons-4.9.1.ebuild | 157 +++++++++++++++++++++++++++++++++++++
2 files changed, 161 insertions(+)
diff --git a/dev-build/scons/Manifest b/dev-build/scons/Manifest
index 93044a6471c3..c6f444aadb7b 100644
--- a/dev-build/scons/Manifest
+++ b/dev-build/scons/Manifest
@@ -1,8 +1,12 @@
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.tar.gz 3252106 BLAKE2B
5ac153cc2b6a9569765eb4f8d01e900cf6bba1be333f68358aaa1ecd395ab9b7faf6a1da7b56d5080962d5bb078c16fa362487aedbb8417792a4a12f2ac8d95b
SHA512
8d881179a99a1c429ae76fbc01f0bfd606686c89b999687c0a2ec33126f7c71d1efc7c61666165981f752b8c52e40103fe08aadf07ea9337fe4fd3a8d3a94eb1
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
DIST scons-4.9.0-user.html 1713371 BLAKE2B
bcb0a028a531d33b62df3b620b16cc103cba4cf949a78d69dad38c834c6a7596e20a150011235441f3b79604552e9f9c1f57cc2760cb97ff954301827056d0c5
SHA512
3ef7c3baabdddd12abf093449d36dc7b2059600335939dd77f89793bdf7cd16fb09fe83187967a0ea82a8b055c996faa90326016fc0a6b61d99c7d738b16a5b3
DIST scons-4.9.0-user.pdf 3118902 BLAKE2B
d610314b15164cdc4185d423ef5836c5e94a81b377c6befc487cc2c48fadd8037099daa8258c9d66b5d330f9565575f30fb618e650ad32e42abf0e5dad935c4f
SHA512
9eb35b5862dc60ba268ced8a830a5dae48a7ca66dc8ae6139dc762808973bd3a0bb81c19ab4d9732c253d9a4fba5b60bc35cdf553f084a519c81b3abeed4b5fb
DIST scons-4.9.0.gh.tar.gz 5957861 BLAKE2B
1d69245797470b398c623ed6f524783527336db93436792e3b947b898afb188a42c8d9198c7f3b91371da1b49ea7609872f0e8455c14749fb2a73d88d463c589
SHA512
64553794a8b78c9722b1c31eb934ffc6910968431f6a57c9f8d6d8b5ec9d343db8aa28a3f8d924f7a9c50d85edd76c02e08d5b82be2afbc45c32b560cfbc6106
+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.9.1.ebuild
b/dev-build/scons/scons-4.9.1.ebuild
new file mode 100644
index 000000000000..a1a78105c001
--- /dev/null
+++ b/dev-build/scons/scons-4.9.1.ebuild
@@ -0,0 +1,157 @@
+# 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_{10..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
+ )
+
+ 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}
+}
