From 0464b87d8be9fcf33aebbd906bc0d3a65c953cff Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 21 Mar 2023 06:39:12 +0000 Subject: gentoo auto-resync : 21:03:2023 - 06:39:12 --- dev-util/scons/Manifest | 3 +- dev-util/scons/scons-4.5.1-r1.ebuild | 136 ---------------------------------- dev-util/scons/scons-4.5.1.ebuild | 138 +++++++++++++++++++++++++++++++++++ 3 files changed, 139 insertions(+), 138 deletions(-) delete mode 100644 dev-util/scons/scons-4.5.1-r1.ebuild create mode 100644 dev-util/scons/scons-4.5.1.ebuild (limited to 'dev-util/scons') diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest index 6ad7d87b1abd..f9a67b4b2e1f 100644 --- a/dev-util/scons/Manifest +++ b/dev-util/scons/Manifest @@ -5,11 +5,10 @@ DIST SCons-4.5.1.tar.gz 3194371 BLAKE2B 830e3365be99e38aec0f3b99d406bb7547d3d8b7 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 -DIST scons-4.5.1-mergeflags.patch 10518 BLAKE2B ea059c4347cfa8dcd99353c1f6b6c1d3aae1c6225b4683e421f3f3ea9181d5597862603c2491abff40dd1599094638239f34bf88458e7c44a8f28908eb91934c SHA512 11771c99d64cee413311f595faec8d2025152a7871ef53bdf0b22be45ffefc0d0c4bf49d185a10c1d3d2fb76ac94b04d992990375dc144587b101761a5d985a4 DIST scons-4.5.1-user.html 1655168 BLAKE2B 644c808f129d2d83f40b1ef2c8c12781b697a0120dfc00f5f0425e88e23c609290ecf2c8b6daad556c876ae3a86e8b262c53915b05d69c6e3c79f58395789362 SHA512 171d9330df520a75fbc124bf646c55c5868b24343ff46755a6283fe444ad4e090f5658dafa7239e708b4ff8b910e81201c27655674bdaffd20e8cc6ffb81d633 DIST scons-4.5.1-user.pdf 3023817 BLAKE2B caa782f77fac668eee0ccd76f3e96168ae3d61c9c3e80123c34bc45625182f77973fbab24170c5f67f133c6124412eadbf02c3497373211560c58a348d6b00ab SHA512 41fddff58032b6364ff3935259d4bf81a0d69398cd52158c42be71e4ff6efaebd2faaf1354781f7336ba1aa4f0cf99f0f37edcd72baf325f9ced7ec88b76ce88 DIST scons-4.5.1.gh.tar.gz 5844118 BLAKE2B 88a82e12a034f6d0748555d0d33716e5af6ff957a9345d5b0ba87c2a36544bae0965ea0a29e3cc80d6d2493f3f8bf0bd314bed5824dc609123972f640b19a53a SHA512 160089342b93197237b9f0c5f0ada42126f3e5c83e0026f6dc121aaae85c94774b01ea3b0b0fc56edf3effd87d91612b2167d004abe7a00bd8d107d5415f5d4a EBUILD scons-4.4.0-r1.ebuild 3748 BLAKE2B 8a0d34afdd7ff554764e41608d75cece47bb47988371da296f5739d2aa2e3d0c7cd589d519edd089b26bae7385727005ab459e23549bd0d3c1a77be4a11faba2 SHA512 c7ae3e2a735b0e3adcd7b2fad1bc030eb3c557a51cc200bd38026e06c6e4adadffba236bceca0b79c47626aaf12e6da5ab74313766434927eaa9381ac069a2d0 EBUILD scons-4.4.0.ebuild 3659 BLAKE2B 1bd5799550b7874e8885f538d7ddc68b77c50012a03c8e8f71a1f68f8c3d38aacb8e851754bf1b9c0044d520049231e12630a8b372ae8316bc1da29f364934ef SHA512 1e289c45de9c534f56c851da908bf2d4bc05129b054faa35ba4fe6050077cabcf45b8048cd34e347218345df01ea0b95eee0c1634a4dd291f4be3c47647b84ea -EBUILD scons-4.5.1-r1.ebuild 3935 BLAKE2B f666846a43e32a19f60ada0354e0b688668ae66f209bac0a1d3eb45b9fe228fc5d2d33cd01f85c22e0418505b1caaeeb3a796e4520497a78ee898e6fb53be608 SHA512 2a760d90c90d2389f4070c8588922ffa80ae1359aed5249de443c61a3f8144bf81e688747366797dbf1fe660f1f4f29c6c10f4628ca4f051115f7e4f07cd741b +EBUILD scons-4.5.1.ebuild 3863 BLAKE2B 50b42ce30b6d28f47e8394a754ca781c307acee255005d32c95282a41baf5fffc6cf728854319d437ca8f6a803ad1f4c0fdf5c43e15f830b47a406278f105b1f SHA512 fe8df981334f50724d914b2d0923b4f12b2f23c5e997c471a74b1589295679db03f28eeb082e4d9b32e6e39f33b4ceb9a967265889527f248ded3c19928d2cc9 MISC metadata.xml 803 BLAKE2B 17a1596fb7b6991a9c4732c8e8c1231cd57ba42ae9e0b65a475f4a00503bacba23ae671df112909688574f836962951dcd2fd7a35bc83c34a0eeb72ecb96bbc2 SHA512 c1451442bdf49d7c85cc84831ea3a8a540581680858dc1ac117080b6a8558419d004952ade0410c0b31d9d241ae3d5eef1c81525ecb80c40cdc380b50f49e1ad diff --git a/dev-util/scons/scons-4.5.1-r1.ebuild b/dev-util/scons/scons-4.5.1-r1.ebuild deleted file mode 100644 index d12cdf7c1bd8..000000000000 --- a/dev-util/scons/scons-4.5.1-r1.ebuild +++ /dev/null @@ -1,136 +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_{9..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 - https://github.com/SCons/scons/pull/4322.patch - -> ${P}-mergeflags.patch - https://github.com/SCons/scons/archive/${PV}.tar.gz - -> ${P}.gh.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 - ) -" -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-python/lxml[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - ) -" - -PATCHES=( - # https://bugs.gentoo.org/900971 - "${DISTDIR}/${P}-mergeflags.patch" - - # 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 - unpack "${P}.gh.tar.gz" - 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 - # requires f77 executable - test/Fortran/F77PATH.py - test/Fortran/FORTRANPATH.py - test/Fortran/gfortran.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.5.1.ebuild b/dev-util/scons/scons-4.5.1.ebuild new file mode 100644 index 000000000000..87c03687ce2a --- /dev/null +++ b/dev-util/scons/scons-4.5.1.ebuild @@ -0,0 +1,138 @@ +# 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_{9..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-python/lxml[${PYTHON_USEDEP}] + dev-python/psutil[${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 + # requires f77 executable + test/Fortran/F77PATH.py + test/Fortran/FORTRANPATH.py + test/Fortran/gfortran.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} +} -- cgit v1.2.3