diff options
author | Michał Górny <mgorny@gentoo.org> | 2021-03-28 13:57:51 +0200 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2021-03-28 13:57:51 +0200 |
commit | 1bf084fef282cf65c6a0167d8995f9c1399f1f3a (patch) | |
tree | a37c4a62f4b66460164cfce7751deb2263d42653 /dev-util/scons | |
parent | xfce-extra/xfce4-taskmanager: Remove old (diff) | |
download | gentoo-1bf084fef282cf65c6a0167d8995f9c1399f1f3a.tar.gz gentoo-1bf084fef282cf65c6a0167d8995f9c1399f1f3a.tar.bz2 gentoo-1bf084fef282cf65c6a0167d8995f9c1399f1f3a.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 | 4 | ||||
-rw-r--r-- | dev-util/scons/files/scons-4.0.0-env-passthrough.patch | 40 | ||||
-rw-r--r-- | dev-util/scons/scons-4.0.1.ebuild | 100 |
3 files changed, 0 insertions, 144 deletions
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest index 5ab364d5356e..669ad9a3289d 100644 --- a/dev-util/scons/Manifest +++ b/dev-util/scons/Manifest @@ -1,7 +1,3 @@ -DIST scons-4.0.1-user.html 1415152 BLAKE2B 1a94b2ef5e076d883f2960825f055c7cc39cfd1848be797a9519bf94834cd4174d3da3274ef77f64106c1cc182c3f8cef363e3982f5c227d3a6dcbeadbc847c2 SHA512 f1165836ad80c90caa4d936ffc86c0ed20ea4c5e7854c36fee3a2c575b1c05c731d4ece9554e43292e6da30176ad9f31f31cf12f84264307c1494f79b06f43c7 -DIST scons-4.0.1-user.pdf 2468804 BLAKE2B f0af6bc6b41d972b98e955ee3ccec908aa366eabe31bd01022abe1f6d3a94dd6d7da26f71de23a6dfbcbc7bb4e439463f69bb7e8a5780c1300e3ba508b9eb314 SHA512 0d2733e2f1391083522a64117bfd35a2160d1366382f6f630b26eba36fc12ce797467d5e16efeb3b7f58aa9d853f96ae0d50fe78f59e78d24642b146bc7e565d -DIST scons-4.0.1.gh.tar.gz 5578800 BLAKE2B f9ece5eaf1b133219f975e484beb5df726560a38969b8e8ad829781b960b438458bfcd7971333da87560c957675b2a4f8675e757fb0a4268cc4ecf72bb60d45f SHA512 f23c5dfd3c236e9f9f85b986ca64a36dbd85e9f3383cb3577e082a7dea4b83283020fbf064c2d919ab116195c6708fc11f906fcf3b0bc0533a4bc49a4f7371c6 -DIST scons-4.0.1.tar.gz 2874481 BLAKE2B 98377e62ae31d32758a93c4e04c578b88ea541cc292af63c6ca43e2948745e416ee6d757d98129ee30d0e0bbab90664889441a5bb86d4c9dfc649ca1dbef7536 SHA512 400b11323d48f04395b519dfafb6fce15a6dea92013f599dc4895b112629c0a06c7d2806755c74047d001d60087b94f39a118f512b7ee8de6214a4ffc7310468 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 diff --git a/dev-util/scons/files/scons-4.0.0-env-passthrough.patch b/dev-util/scons/files/scons-4.0.0-env-passthrough.patch deleted file mode 100644 index 23538395e972..000000000000 --- a/dev-util/scons/files/scons-4.0.0-env-passthrough.patch +++ /dev/null @@ -1,40 +0,0 @@ -From f2f8536be12f1d095382e7598060c1eb51eb5337 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Wed, 9 May 2018 17:04:49 +0200 -Subject: [PATCH] posix: Support GENTOO_SCONS_ENV_PASSTHROUGH=1 - -Support GENTOO_SCONS_ENV_PASSTHROUGH=1 variable to override the default -of wiping the environment and resetting PATH to default, and instead -pass all variables through. ---- - src/SCons/Platform/posix.py | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) - -diff --git a/src/SCons/Platform/posix.py b/src/SCons/Platform/posix.py -index 8db08db1..af34650c 100644 ---- a/src/SCons/Platform/posix.py -+++ b/src/SCons/Platform/posix.py -@@ -87,9 +87,17 @@ def generate(env): - pspawn = piped_env_spawn - # Note that this means that 'escape' is no longer used - -- if 'ENV' not in env: -- env['ENV'] = {} -- env['ENV']['PATH'] = '/usr/local/bin:/opt/bin:/bin:/usr/bin' -+ # Force pass-through of environment variables in Gentoo builds -+ if os.environ.get('GENTOO_SCONS_ENV_PASSTHROUGH', False): -+ new_env = os.environ.copy() -+ if 'ENV' in env: -+ new_env.update(env['ENV']) -+ env['ENV'] = new_env -+ else: -+ if 'ENV' not in env: -+ env['ENV'] = {} -+ env['ENV']['PATH'] = '/usr/local/bin:/opt/bin:/bin:/usr/bin' -+ - env['OBJPREFIX'] = '' - env['OBJSUFFIX'] = '.o' - env['SHOBJPREFIX'] = '$OBJPREFIX' --- -2.17.0 - diff --git a/dev-util/scons/scons-4.0.1.ebuild b/dev-util/scons/scons-4.0.1.ebuild deleted file mode 100644 index ccba5ef0e0e6..000000000000 --- a/dev-util/scons/scons-4.0.1.ebuild +++ /dev/null @@ -1,100 +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_{7..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 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 )" - -DEPEND=" - 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.0.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 - - # remove half-broken, useless custom commands - # and fix manpage install location - sed -i -e '/cmdclass/,/},$/d' \ - -e '/data_files/s:man/:share/man/:' "${S}"/setup.py || 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)")" \ - --builddir "${BUILD_DIR}/lib" - - # 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 - - use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html} -} |