From a2219cb0f7891a8fa42ccd9541809c62ce695216 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 10 Jan 2024 01:02:07 +0000 Subject: gentoo auto-resync : 10:01:2024 - 01:02:07 --- dev-util/scons/Manifest | 2 +- dev-util/scons/scons-4.6.0-r1.ebuild | 160 +++++++++++++++++++++++++++++++++++ dev-util/scons/scons-4.6.0.ebuild | 157 ---------------------------------- 3 files changed, 161 insertions(+), 158 deletions(-) create mode 100644 dev-util/scons/scons-4.6.0-r1.ebuild delete mode 100644 dev-util/scons/scons-4.6.0.ebuild (limited to 'dev-util/scons') diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest index 1f8f4b984b67..10108a096a8e 100644 --- a/dev-util/scons/Manifest +++ b/dev-util/scons/Manifest @@ -9,5 +9,5 @@ DIST scons-4.6.0-user.html 1670870 BLAKE2B 0c84248791bdce093cce4d45b525357aeb3ae DIST scons-4.6.0-user.pdf 3058220 BLAKE2B 3a04e1c0fab47f2a1327f20d3ee500d7861599dc31b0007dd196173af5b880d9737ff528b419896e905cae5a5744c74ef38c2b29bc7945ef4157a79c1c6dabe9 SHA512 6a5ca9cdede81ec9536bb32d7df157fd1efd4b3e3f5afa386b7ecaa45d1fc212015673ccec5ab3283475ab0ee6ef001c111f51b7d3bb64dda664e61d11cbaec0 DIST scons-4.6.0.gh.tar.gz 5891032 BLAKE2B 9aeda2ef899dcaf5bc7ca3bc77c0615544f2308f56ef095ad835d5cc748355b467a905ec737eef61a4afd183ff0f041dc244bdd58858ba3abc4f3a4efd9f8dc7 SHA512 d7dd30bbc94ec014b12b37a106aa536dd5c8b16e9f1605b68cad6721cf6e3959add1f75a42693fd8499734ca19eb76f648800d7cc8081fe334282841cd406954 EBUILD scons-4.5.2.ebuild 4534 BLAKE2B 3c7f09fe378c3f1b2a6ea63046275a88c1031b08c15e10ebc4950a56ddd62a60dcdaa7610188d4609ae32a30e32342e8ddba308722fdf5fcc3013c64fd5d1a25 SHA512 69c035f26eec493ebf321eddaffd0ac799835ea84c9c3bfc208cb78af3d08669154638c2fa2092ac2ab3dcb3ef3875517b0af14187854ba157bac91c1ce27c35 -EBUILD scons-4.6.0.ebuild 4535 BLAKE2B c1d5ba6424ed22af1b236323ddcb479f32ac78b88a8857ecc5c116a979a9e213912e57a7fcaef2bebb0df83bbcb773c5de1b5a76236d9ba8a83e6121779f06de SHA512 8ed6b3fb2fa836736809a2e1ecfeaaeae0b53ab361df4a5c5bbfb3c92dd9d9317956517f6652edcfb4308364b58a021e3c24e1ffa34883478a74d1175216eb04 +EBUILD scons-4.6.0-r1.ebuild 4608 BLAKE2B 1145b083da2e3e562d58dd10da6a2ea0f9e8146bd84eecf2f819776131bd29205c542ade92ead5369ceae474933a1fce606c2ba359fecd1484771b17e7ba78be SHA512 c001e31e7f9f97e171d6f9a94378444a65da89bedeaa75bc7e2df69b94eedde996a574f3d2e815a5b3ead85e5cbfda5e792ae88774967e2066dd846cad4ef900 MISC metadata.xml 803 BLAKE2B 17a1596fb7b6991a9c4732c8e8c1231cd57ba42ae9e0b65a475f4a00503bacba23ae671df112909688574f836962951dcd2fd7a35bc83c34a0eeb72ecb96bbc2 SHA512 c1451442bdf49d7c85cc84831ea3a8a540581680858dc1ac117080b6a8558419d004952ade0410c0b31d9d241ae3d5eef1c81525ecb80c40cdc380b50f49e1ad diff --git a/dev-util/scons/scons-4.6.0-r1.ebuild b/dev-util/scons/scons-4.6.0-r1.ebuild new file mode 100644 index 000000000000..acf4b5429a1a --- /dev/null +++ b/dev-util/scons/scons-4.6.0-r1.ebuild @@ -0,0 +1,160 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) +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 ~ia64 ~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 + + # fixed in .post1 release + rm -r SCons/Tool/docbook/__pycache__ || die + + # 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 + # 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() { + 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.6.0.ebuild b/dev-util/scons/scons-4.6.0.ebuild deleted file mode 100644 index 93909c9fbbbd..000000000000 --- a/dev-util/scons/scons-4.6.0.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) -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 ~ia64 ~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 - # 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() { - rm "${ED}"/usr/*.1 || die - distutils-r1_python_install_all - - doman *.1 - use doc && dodoc "${DISTDIR}/${P}"-user.{pdf,html} -} -- cgit v1.2.3