From f287ecad888abdeb38e617d0485de282cd6819db Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 19 Dec 2022 19:49:08 +0000 Subject: gentoo auto-resync : 19:12:2022 - 19:49:08 --- dev-util/scons/Manifest | 5 +- dev-util/scons/metadata.xml | 1 + dev-util/scons/scons-4.4.0-r1.ebuild | 134 +++++++++++++++++++++++++++++++++++ dev-util/scons/scons-4.4.0.ebuild | 9 ++- 4 files changed, 146 insertions(+), 3 deletions(-) create mode 100644 dev-util/scons/scons-4.4.0-r1.ebuild (limited to 'dev-util/scons') diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest index d7669ce62fe9..b0e3252b2fb3 100644 --- a/dev-util/scons/Manifest +++ b/dev-util/scons/Manifest @@ -4,5 +4,6 @@ DIST SCons-4.4.0.tar.gz 3096863 BLAKE2B 60f125c077dd8f50a7150db6dc1234eac988cf7e DIST scons-4.4.0-user.html 1608381 BLAKE2B ff4eb1e0f9c5e8ea7ca44cc00dc37e3e2dd38c24cb09a857c691e6a48f11e5fc86a55740037cc295e6b23df2a1c1b600adf0462320ec87cc26d4bcf919b07342 SHA512 8c1d6578270054efba34c56ddc07b4314bf62630f6a445f5b9f865cc48d593f6c92101a8d216dece201b8d6cb5bce59ff4adb51caaa40128e96b6235087f748c DIST scons-4.4.0-user.pdf 2964111 BLAKE2B 45b37c99c3f3d0e9969a16506e27aeabfd562155405f5a59ba79c24404b14e5588fbd0673d86e2266adbd25eca140c9e1cf86e271228658591c0d9285474f078 SHA512 57330f685e7c775cb1c782e40f711c2b2322fad19212a22a920aff92db974610cc78f276e1606fb827660bb488ce803e2458bb9d93c452fa0600df4478f03d06 DIST scons-4.4.0.gh.tar.gz 5808265 BLAKE2B f6ce757f2edc40551b05285098626bb62def6abda2380d4885ee4443868e715e53aaa34f26c09dc689bb6ade26d1b0e276046fe3b1d2ddf8eb40400bca9ea164 SHA512 01fcd40bf818ca22a278973af1cda3024efb74cf877f15d46607fda860448fbd577fc96ba33fef2bed3d145e662a0371f55e8c927e7ac44feea7f3081791ce11 -EBUILD scons-4.4.0.ebuild 3479 BLAKE2B 74fdc925c9d23896f8721c9c0e18722d47d6322f4ce9f0f03a58082534087e7decdfd1925a7913e5f2f6c9ca22f6c58ebf066aacf8b745917d17f8815b7ca35e SHA512 d0b16a70484585d4baf4cbb873d2baa437dafeeb5135f85938600463bfdf84224b58a29ae0936df6083ce42bd2a91d4f5845e92552cd9994abcc2512068b4929 -MISC metadata.xml 758 BLAKE2B 01151cc8b1b2cf1e4e1d5357437aac0f0d6bc7dfb1ec055588bda6a828f97c7ed82e1d53cbf7ce754bad65f428a6fc2cecb83a46d8fe6c78e0173e2a4ffed5d6 SHA512 0022388515191b9c2470a58d3c2369874faa989c41d2dafa553750c994a660dfd56014fa9910e1e3bc30073f684a811627decfad1e303b46dff62ddd13b0282d +EBUILD scons-4.4.0-r1.ebuild 3747 BLAKE2B 284dd9ccb9b95cd700ff8cbe8c3f5ec67cf184f620e3cf8d807243f787c102c7dd4fde5fc6ae712aa435cc1072633512d309c4d7fedab55346e62b363a2af8b3 SHA512 0d1fab7a968c9afd6d5a3970f9405af2a0ba05bf4e2d5d5f1703c92f807f79ebb8d034e7626acce91d5bee8d275f5a88a1139872968a41911f314243388333dd +EBUILD scons-4.4.0.ebuild 3659 BLAKE2B 173ff394924798fd1f47bcb577d8598a99b4b293431152d4681e98cb2448d42b12b90d7227a956ddb2448d206b553f06eff998c4ee25b4c2f7c8075085801836 SHA512 15e5c9b00a1538beed25e61308a695325ef7f85565bb1679cd8b7dd3c4dcaa974489e4ebe1463b4b5c784d596fd7755bf38b9bafbd3e8929bdbaa3db496c8ab4 +MISC metadata.xml 803 BLAKE2B 17a1596fb7b6991a9c4732c8e8c1231cd57ba42ae9e0b65a475f4a00503bacba23ae671df112909688574f836962951dcd2fd7a35bc83c34a0eeb72ecb96bbc2 SHA512 c1451442bdf49d7c85cc84831ea3a8a540581680858dc1ac117080b6a8558419d004952ade0410c0b31d9d241ae3d5eef1c81525ecb80c40cdc380b50f49e1ad diff --git a/dev-util/scons/metadata.xml b/dev-util/scons/metadata.xml index 15c2437dbee4..aacbf74f7fb9 100644 --- a/dev-util/scons/metadata.xml +++ b/dev-util/scons/metadata.xml @@ -14,6 +14,7 @@ SCons/scons + SCons scons diff --git a/dev-util/scons/scons-4.4.0-r1.ebuild b/dev-util/scons/scons-4.4.0-r1.ebuild new file mode 100644 index 000000000000..a6021628266f --- /dev/null +++ b/dev-util/scons/scons-4.4.0-r1.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..11} ) +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 + ) +" +S="${WORKDIR}/${P}/src" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="doc test" +RESTRICT="!test? ( test )" + +BDEPEND=" + test? ( + dev-libs/libxml2[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + ) +" + +PATCHES=( + # support env passthrough for Gentoo ebuilds + "${FILESDIR}"/scons-4.1.0-env-passthrough.patch + # respect CC, CXX, C*FLAGS, LDFLAGS by default + "${FILESDIR}"/scons-4.2.0-respect-cc-etc.patch +) + +src_unpack() { + # use the git directory structure, but put pregenerated release + # inside src/ subdirectory to make our life easier + if use test; then + unpack "${P}.gh.tar.gz" + else + mkdir -p "${P}"/src || die + fi + + tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${MY_P}.tar.gz" || die +} + +src_prepare() { + # apply patches relatively to top directory + cd "${WORKDIR}/${P}" || die + distutils-r1_src_prepare + + 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 + # 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 + ) + + 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}" +} + +python_install_all() { + rm "${ED}"/usr/*.1 || die + distutils-r1_python_install_all + + doman *.1 + use doc && dodoc "${DISTDIR}/${P}"-user.{pdf,html} +} diff --git a/dev-util/scons/scons-4.4.0.ebuild b/dev-util/scons/scons-4.4.0.ebuild index 4fa3dc9d6f6a..82d19439d67b 100644 --- a/dev-util/scons/scons-4.4.0.ebuild +++ b/dev-util/scons/scons-4.4.0.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) PYTHON_REQ_USE="threads(+)" inherit distutils-r1 multiprocessing @@ -66,9 +66,16 @@ src_prepare() { test/DVIPDF/DVIPDFFLAGS.py test/Java/swig-dependencies.py test/Java/multi-step.py + test/TEX/newglossary.py + test/TEX/variant_dir_newglossary.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 ) if ! use amd64 && ! use x86 ; then -- cgit v1.2.3