diff options
author | Michał Górny <mgorny@gentoo.org> | 2022-09-08 15:44:05 +0200 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2022-09-08 15:44:05 +0200 |
commit | 61fe5ddd93054ad23508dd7133475ad7bace79b7 (patch) | |
tree | c325c3e5e512924cff4908cc8df6b77d77e93e06 /dev-util/scons | |
parent | virtual/dist-kernel: Bump to 5.19.8 (diff) | |
download | gentoo-61fe5ddd93054ad23508dd7133475ad7bace79b7.tar.gz gentoo-61fe5ddd93054ad23508dd7133475ad7bace79b7.tar.bz2 gentoo-61fe5ddd93054ad23508dd7133475ad7bace79b7.zip |
dev-util/scons: Remove old
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'dev-util/scons')
-rw-r--r-- | dev-util/scons/Manifest | 8 | ||||
-rw-r--r-- | dev-util/scons/files/scons-4.0.0-respect-cc-etc-r1.patch | 88 | ||||
-rw-r--r-- | dev-util/scons/scons-4.1.0-r1.ebuild | 98 | ||||
-rw-r--r-- | dev-util/scons/scons-4.3.0.ebuild | 117 |
4 files changed, 0 insertions, 311 deletions
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest index 3f9239d8be68..02f2849626bb 100644 --- a/dev-util/scons/Manifest +++ b/dev-util/scons/Manifest @@ -1,12 +1,4 @@ -DIST SCons-4.3.0.tar.gz 3065509 BLAKE2B c36e816357f908d91d532cacde06ed75f57386bb9386bf751dd4ec65580894d8e04ad86380e421008374fa8d8c798323f9f8fb52d7e3d7d85140300a8b388def SHA512 200e087a0a3de7d92d7da6bdb7f2dc0f5d9ff4908a9d6aef2feab8cacfb2e480b7d88efca8f7a84bd39620db2efceaca14f68e6edbf494b1c28b80e35ed14f2c DIST SCons-4.4.0.tar.gz 3096863 BLAKE2B 60f125c077dd8f50a7150db6dc1234eac988cf7ee7495036d73c46e8ae445b87c88dde23a537d6647709778a33e6f1ac529f7ac7f862648e3019bbe437bb451c SHA512 d4e630214a9221f00d668b6524803efa83b41534fa6e0acca689d926cbc8546e5cf79c1c7a4b5627afbcd5033564343b408790bf4c29067d053cfbb39408a8ed -DIST scons-4.1.0-user.html 1454432 BLAKE2B 9fac4d7bfb4b25708bc4cc48d952beb030f88181af5dfee63090f726b1a82443c192c63ec5939869967ef8f374e8599321212971439fb265fb050b263681c9f8 SHA512 74f1349fa61dac9e66cfb863cb3126d07ce5f421b3e87d0220eb32bd5017ba8f6cf96eb8cb5ee45c39022671aa9f2d0408d4039970c438a69c002445aea510be -DIST scons-4.1.0-user.pdf 2691364 BLAKE2B a910a09fa936d4d6f8dc967676d5aa009aac58a5a4566399b3ddc3512ac0259731e6c5399722fefadb3b79d8f89a5257e2e9bc2fa4d65697c8293ab995248d64 SHA512 64584731a59b59b78283be3876ecca91d742f83da2653d0de17922bec01e3c9cea1ce2ce3c8dc718597910ba86ed2c8aff0f7ae371bf763439b57a6d5484e1a7 -DIST scons-4.1.0.gh.tar.gz 5609204 BLAKE2B ede3d47a1ec652b9248681e26738073e9d01daab7ffeccc58f0fcadb79661e30edb9a35a511518e4a58459243acb027afd8fa5849b0f9e4bae451055f7b1a062 SHA512 f79b86bb09783767b3872cfb8efb665372714a604af2aaf3adc66eee63d3afe27bc6b2aab83813743c83f71c81c800d42842e916501787ba402ce2726dda9b44 -DIST scons-4.1.0.tar.gz 3007701 BLAKE2B 70ab64ecfd89fa2af1d78a33fcef82a5f7db9875ffe9d2c16ea75cf40e661b2874359e3a5f75d761b3d9e863f7a434560992cfb020cce3e21e389381331d90de SHA512 24fd493643545a2998b053ed0d68caf6241f05bc2437e7cbeae33d2e1c63517a61449a1a18062f8e4e5a639295a2486925296ba3e54ccfa2ecdd56fa07132de8 -DIST scons-4.3.0-user.html 1529873 BLAKE2B 9f5b1bc0ab1d47769d8475ab86b1ae40cfc3643013c6e19692caac50dc37a306b6fd4654ec95c0ad6ad89531e2098253c62db679c9921680955b6dc11c4b247a SHA512 82e2de098c16a354ee3546a39f3ad923d8a40831d69d31266a795f7ce1a8d42e258e650f59f1910f0497d2d053eeb94aa1216c2a2108ca441844445e587490b2 -DIST scons-4.3.0-user.pdf 2851016 BLAKE2B 75282daad0c12da3afa71a0b34447545c2d93ab4fd0589395acd4a04242bb387b35ef2fb0469a57b96eda25258a28f18bd3bb693c6e2b02dc4e6b621a10f0f33 SHA512 c404508ca13e043f8a6717711294fa8cf4a513da7a09285fc6d73342d1f2b4fb0f718faa8fe6ee5b5ab92acf5839dfa05b86004ab0e0fcd7449a31fd5f6f003b -DIST scons-4.3.0.gh.tar.gz 5704869 BLAKE2B a43b509b358d47ee73f7eb714d1239b4fdc33f38483c1a3e72c3a8082242d7bb1a4925958a2648782aa28f4c22a6e018aea8fec1139cf44c59e859f6f902d1d3 SHA512 2d91cf3045797c888d24db38d5b44576e56b271a2c4e9d28d7e16026451865f713990ff9e57fa3e0a1c19603c2d6adbbd1ba36d297c9dcce4db4139fcc51cd62 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 diff --git a/dev-util/scons/files/scons-4.0.0-respect-cc-etc-r1.patch b/dev-util/scons/files/scons-4.0.0-respect-cc-etc-r1.patch deleted file mode 100644 index d187a17ae60c..000000000000 --- a/dev-util/scons/files/scons-4.0.0-respect-cc-etc-r1.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 929986e568446f54c2a99c309fbb4d05bd4af00a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Thu, 10 May 2018 08:01:08 +0200 -Subject: [PATCH] posix: Also force common toolchain vars for Gentoo - ---- - src/SCons/Platform/posix.py | 20 ++++++++++++++++++++ - src/SCons/Tool/cc.py | 3 ++- - src/SCons/Tool/cxx.py | 3 ++- - src/SCons/Tool/link.py | 3 ++- - 4 files changed, 26 insertions(+), 3 deletions(-) - -diff --git a/src/SCons/Platform/posix.py b/src/SCons/Platform/posix.py -index 739310a1..ef7528e0 100644 ---- a/src/SCons/Platform/posix.py -+++ b/src/SCons/Platform/posix.py -@@ -95,6 +95,26 @@ def generate(env): - if 'ENV' in env: - new_env.update(env['ENV']) - env['ENV'] = new_env -+ -+ # Furthermore, force common compiler/linker variables as well -+ envvar_mapping = { -+ 'AR': 'AR', -+ 'AS': 'AS', -+ 'ASFLAGS': 'ASFLAGS', -+ 'CC': 'CC', -+ 'CXX': 'CXX', -+ 'CFLAGS': 'CFLAGS', -+ 'CXXFLAGS': 'CXXFLAGS', -+ 'CPPFLAGS': 'CPPFLAGS', -+ 'LDFLAGS': 'LINKFLAGS', -+ } -+ -+ for envvar, toolvar in envvar_mapping.items(): -+ if toolvar not in env and envvar in env['ENV']: -+ val = env['ENV'][envvar] -+ if toolvar.endswith('FLAGS'): -+ val = SCons.Util.CLVar(val) -+ env[toolvar] = val - else: - if 'ENV' not in env: - env['ENV'] = {} -diff --git a/src/SCons/Tool/cc.py b/src/SCons/Tool/cc.py -index 590ec5fd..5f9229a0 100644 ---- a/src/SCons/Tool/cc.py -+++ b/src/SCons/Tool/cc.py -@@ -80,7 +80,8 @@ def generate(env): - - if 'CC' not in env: - env['CC'] = env.Detect(compilers) or compilers[0] -- env['CFLAGS'] = SCons.Util.CLVar('') -+ if 'CFLAGS' not in env: -+ env['CFLAGS'] = SCons.Util.CLVar('') - env['CCCOM'] = '$CC -o $TARGET -c $CFLAGS $CCFLAGS $_CCCOMCOM $SOURCES' - env['SHCC'] = '$CC' - env['SHCFLAGS'] = SCons.Util.CLVar('$CFLAGS') -diff --git a/src/SCons/Tool/cxx.py b/src/SCons/Tool/cxx.py -index 430851c8..ca5ab563 100644 ---- a/src/SCons/Tool/cxx.py -+++ b/src/SCons/Tool/cxx.py -@@ -74,7 +74,8 @@ def generate(env): - - if 'CXX' not in env: - env['CXX'] = env.Detect(compilers) or compilers[0] -- env['CXXFLAGS'] = SCons.Util.CLVar('') -+ if 'CXXFLAGS' not in env: -+ env['CXXFLAGS'] = SCons.Util.CLVar('') - env['CXXCOM'] = '$CXX -o $TARGET -c $CXXFLAGS $CCFLAGS $_CCCOMCOM $SOURCES' - env['SHCXX'] = '$CXX' - env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS') -diff --git a/src/SCons/Tool/link.py b/src/SCons/Tool/link.py -index 5adc6ca2..a12ea8ed 100644 ---- a/src/SCons/Tool/link.py -+++ b/src/SCons/Tool/link.py -@@ -318,7 +318,8 @@ def generate(env): - - env['SMARTLINK'] = smart_link - env['LINK'] = "$SMARTLINK" -- env['LINKFLAGS'] = SCons.Util.CLVar('') -+ if 'LINKFLAGS' not in env: -+ env['LINKFLAGS'] = SCons.Util.CLVar('') - - # __RPATH is only set to something ($_RPATH typically) on platforms that support it. - env['LINKCOM'] = '$LINK -o $TARGET $LINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS' --- -2.20.1 - diff --git a/dev-util/scons/scons-4.1.0-r1.ebuild b/dev-util/scons/scons-4.1.0-r1.ebuild deleted file mode 100644 index 3f27b8197d8b..000000000000 --- a/dev-util/scons/scons-4.1.0-r1.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{8..9} ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Extensible Python-based build utility" -HOMEPAGE="https://www.scons.org/" -SRC_URI=" - https://downloads.sourceforge.net/project/scons/scons/${PV}/${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 ~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}] - ) -" - -S=${WORKDIR}/${P}/src - -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.0.0-respect-cc-etc-r1.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}/${P}.tar.gz" || die -} - -src_prepare() { - # apply patches relatively to top directory - cd "${WORKDIR}/${P}" || die - distutils-r1_src_prepare - - # manpage install is completely broken - sed -i -e '/build\/doc\/man/d' src/setup.cfg || die - - 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 - ) - 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() { - distutils-r1_python_install_all - - doman *.1 - use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html} -} diff --git a/dev-util/scons/scons-4.3.0.ebuild b/dev-util/scons/scons-4.3.0.ebuild deleted file mode 100644 index 4fa3dc9d6f6a..000000000000 --- a/dev-util/scons/scons-4.3.0.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 multiprocessing - -MY_P="SCons-${PV}" -DESCRIPTION="Extensible Python-based build utility" -HOMEPAGE="https://www.scons.org/" -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 - # broken by commas in date, sic! - test/option/option-v.py - test/Interactive/version.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} -} |