Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/scons/files/, dev-util/scons/
Date: Wed, 13 Oct 2021 09:05:12
Message-Id: 1634115890.cfaacfcffc6895ebe3d021acedf2d71de76f7dc8.mgorny@gentoo
1 commit: cfaacfcffc6895ebe3d021acedf2d71de76f7dc8
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 13 09:04:50 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 13 09:04:50 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfaacfcf
7
8 dev-util/scons: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-util/scons/Manifest | 4 -
13 .../files/scons-4.0.0-respect-cc-etc-r1.patch | 88 -------------------
14 dev-util/scons/scons-4.1.0-r1.ebuild | 98 ----------------------
15 3 files changed, 190 deletions(-)
16
17 diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
18 index b7a44b31276..1a3cad8d5ab 100644
19 --- a/dev-util/scons/Manifest
20 +++ b/dev-util/scons/Manifest
21 @@ -1,7 +1,3 @@
22 -DIST scons-4.1.0-user.html 1454432 BLAKE2B 9fac4d7bfb4b25708bc4cc48d952beb030f88181af5dfee63090f726b1a82443c192c63ec5939869967ef8f374e8599321212971439fb265fb050b263681c9f8 SHA512 74f1349fa61dac9e66cfb863cb3126d07ce5f421b3e87d0220eb32bd5017ba8f6cf96eb8cb5ee45c39022671aa9f2d0408d4039970c438a69c002445aea510be
23 -DIST scons-4.1.0-user.pdf 2691364 BLAKE2B a910a09fa936d4d6f8dc967676d5aa009aac58a5a4566399b3ddc3512ac0259731e6c5399722fefadb3b79d8f89a5257e2e9bc2fa4d65697c8293ab995248d64 SHA512 64584731a59b59b78283be3876ecca91d742f83da2653d0de17922bec01e3c9cea1ce2ce3c8dc718597910ba86ed2c8aff0f7ae371bf763439b57a6d5484e1a7
24 -DIST scons-4.1.0.gh.tar.gz 5609204 BLAKE2B ede3d47a1ec652b9248681e26738073e9d01daab7ffeccc58f0fcadb79661e30edb9a35a511518e4a58459243acb027afd8fa5849b0f9e4bae451055f7b1a062 SHA512 f79b86bb09783767b3872cfb8efb665372714a604af2aaf3adc66eee63d3afe27bc6b2aab83813743c83f71c81c800d42842e916501787ba402ce2726dda9b44
25 -DIST scons-4.1.0.tar.gz 3007701 BLAKE2B 70ab64ecfd89fa2af1d78a33fcef82a5f7db9875ffe9d2c16ea75cf40e661b2874359e3a5f75d761b3d9e863f7a434560992cfb020cce3e21e389381331d90de SHA512 24fd493643545a2998b053ed0d68caf6241f05bc2437e7cbeae33d2e1c63517a61449a1a18062f8e4e5a639295a2486925296ba3e54ccfa2ecdd56fa07132de8
26 DIST scons-4.2.0-user.html 1514655 BLAKE2B 036fd0e994d4a3dbf820e864c18f1dda2bb383b890919b3d99ca02e4f1f319b86050bf094309764bbb01585075697549e3168d66ee02caeee0fe4ca641f794a5 SHA512 b0dcf8d6ff32521f2ce92372a7efce4962268d2ca40645ec4b0d082e5a29ba5098488ba45bf36c9fb7e75996c7454ab80536052f43b9a533a22db05f466cd3e9
27 DIST scons-4.2.0-user.pdf 2813567 BLAKE2B 2787c9dbecaefccc5f4df2bcccc474ee69e9883f9efa8358f6da00690d9f3fad48f7b696908cbb4cc8f3b9c195f86e11c81301d931783e463d7b2f3a5d528fc3 SHA512 3c36879af2b40190b7b68b162cb39e32e1d7ee01fe063dabe5404d616ab3c9972ebc8a6ce4c0b54a633cfc6825808f93207132ac9c9cd60d9e6ca28e864d5f16
28 DIST scons-4.2.0.gh.tar.gz 5677165 BLAKE2B c298152db937810ab73afc304a9dc480c185ef0d6e86be5ec7f2022a7d1ed4d3df6ecc18148c3143d4e76a7ea0e50790db1224e66db68bace0759daba7f36a91 SHA512 138573f7203b52fad0527d8d88ceabe182273eff7e4b74125e0d7eda51c44408b07e2c702ee63214519392101d8bbb30013e6d34000eaeb530a816c17396de97
29
30 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
31 deleted file mode 100644
32 index d187a17ae60..00000000000
33 --- a/dev-util/scons/files/scons-4.0.0-respect-cc-etc-r1.patch
34 +++ /dev/null
35 @@ -1,88 +0,0 @@
36 -From 929986e568446f54c2a99c309fbb4d05bd4af00a Mon Sep 17 00:00:00 2001
37 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
38 -Date: Thu, 10 May 2018 08:01:08 +0200
39 -Subject: [PATCH] posix: Also force common toolchain vars for Gentoo
40 -
41 ----
42 - src/SCons/Platform/posix.py | 20 ++++++++++++++++++++
43 - src/SCons/Tool/cc.py | 3 ++-
44 - src/SCons/Tool/cxx.py | 3 ++-
45 - src/SCons/Tool/link.py | 3 ++-
46 - 4 files changed, 26 insertions(+), 3 deletions(-)
47 -
48 -diff --git a/src/SCons/Platform/posix.py b/src/SCons/Platform/posix.py
49 -index 739310a1..ef7528e0 100644
50 ---- a/src/SCons/Platform/posix.py
51 -+++ b/src/SCons/Platform/posix.py
52 -@@ -95,6 +95,26 @@ def generate(env):
53 - if 'ENV' in env:
54 - new_env.update(env['ENV'])
55 - env['ENV'] = new_env
56 -+
57 -+ # Furthermore, force common compiler/linker variables as well
58 -+ envvar_mapping = {
59 -+ 'AR': 'AR',
60 -+ 'AS': 'AS',
61 -+ 'ASFLAGS': 'ASFLAGS',
62 -+ 'CC': 'CC',
63 -+ 'CXX': 'CXX',
64 -+ 'CFLAGS': 'CFLAGS',
65 -+ 'CXXFLAGS': 'CXXFLAGS',
66 -+ 'CPPFLAGS': 'CPPFLAGS',
67 -+ 'LDFLAGS': 'LINKFLAGS',
68 -+ }
69 -+
70 -+ for envvar, toolvar in envvar_mapping.items():
71 -+ if toolvar not in env and envvar in env['ENV']:
72 -+ val = env['ENV'][envvar]
73 -+ if toolvar.endswith('FLAGS'):
74 -+ val = SCons.Util.CLVar(val)
75 -+ env[toolvar] = val
76 - else:
77 - if 'ENV' not in env:
78 - env['ENV'] = {}
79 -diff --git a/src/SCons/Tool/cc.py b/src/SCons/Tool/cc.py
80 -index 590ec5fd..5f9229a0 100644
81 ---- a/src/SCons/Tool/cc.py
82 -+++ b/src/SCons/Tool/cc.py
83 -@@ -80,7 +80,8 @@ def generate(env):
84 -
85 - if 'CC' not in env:
86 - env['CC'] = env.Detect(compilers) or compilers[0]
87 -- env['CFLAGS'] = SCons.Util.CLVar('')
88 -+ if 'CFLAGS' not in env:
89 -+ env['CFLAGS'] = SCons.Util.CLVar('')
90 - env['CCCOM'] = '$CC -o $TARGET -c $CFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
91 - env['SHCC'] = '$CC'
92 - env['SHCFLAGS'] = SCons.Util.CLVar('$CFLAGS')
93 -diff --git a/src/SCons/Tool/cxx.py b/src/SCons/Tool/cxx.py
94 -index 430851c8..ca5ab563 100644
95 ---- a/src/SCons/Tool/cxx.py
96 -+++ b/src/SCons/Tool/cxx.py
97 -@@ -74,7 +74,8 @@ def generate(env):
98 -
99 - if 'CXX' not in env:
100 - env['CXX'] = env.Detect(compilers) or compilers[0]
101 -- env['CXXFLAGS'] = SCons.Util.CLVar('')
102 -+ if 'CXXFLAGS' not in env:
103 -+ env['CXXFLAGS'] = SCons.Util.CLVar('')
104 - env['CXXCOM'] = '$CXX -o $TARGET -c $CXXFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
105 - env['SHCXX'] = '$CXX'
106 - env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS')
107 -diff --git a/src/SCons/Tool/link.py b/src/SCons/Tool/link.py
108 -index 5adc6ca2..a12ea8ed 100644
109 ---- a/src/SCons/Tool/link.py
110 -+++ b/src/SCons/Tool/link.py
111 -@@ -318,7 +318,8 @@ def generate(env):
112 -
113 - env['SMARTLINK'] = smart_link
114 - env['LINK'] = "$SMARTLINK"
115 -- env['LINKFLAGS'] = SCons.Util.CLVar('')
116 -+ if 'LINKFLAGS' not in env:
117 -+ env['LINKFLAGS'] = SCons.Util.CLVar('')
118 -
119 - # __RPATH is only set to something ($_RPATH typically) on platforms that support it.
120 - env['LINKCOM'] = '$LINK -o $TARGET $LINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS'
121 ---
122 -2.20.1
123 -
124
125 diff --git a/dev-util/scons/scons-4.1.0-r1.ebuild b/dev-util/scons/scons-4.1.0-r1.ebuild
126 deleted file mode 100644
127 index 3f27b8197d8..00000000000
128 --- a/dev-util/scons/scons-4.1.0-r1.ebuild
129 +++ /dev/null
130 @@ -1,98 +0,0 @@
131 -# Copyright 1999-2021 Gentoo Authors
132 -# Distributed under the terms of the GNU General Public License v2
133 -
134 -EAPI=7
135 -
136 -DISTUTILS_USE_SETUPTOOLS=rdepend
137 -PYTHON_COMPAT=( python3_{8..9} )
138 -PYTHON_REQ_USE="threads(+)"
139 -
140 -inherit distutils-r1
141 -
142 -DESCRIPTION="Extensible Python-based build utility"
143 -HOMEPAGE="https://www.scons.org/"
144 -SRC_URI="
145 - https://downloads.sourceforge.net/project/scons/scons/${PV}/${P}.tar.gz
146 - doc? (
147 - https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
148 - https://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
149 - )
150 - test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
151 -
152 -LICENSE="MIT"
153 -SLOT="0"
154 -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"
155 -IUSE="doc test"
156 -RESTRICT="!test? ( test )"
157 -
158 -BDEPEND="
159 - test? (
160 - dev-libs/libxml2[${PYTHON_USEDEP}]
161 - dev-python/lxml[${PYTHON_USEDEP}]
162 - )
163 -"
164 -
165 -S=${WORKDIR}/${P}/src
166 -
167 -PATCHES=(
168 - # support env passthrough for Gentoo ebuilds
169 - "${FILESDIR}"/scons-4.1.0-env-passthrough.patch
170 - # respect CC, CXX, C*FLAGS, LDFLAGS by default
171 - "${FILESDIR}"/scons-4.0.0-respect-cc-etc-r1.patch
172 -)
173 -
174 -src_unpack() {
175 - # use the git directory structure, but put pregenerated release
176 - # inside src/ subdirectory to make our life easier
177 - if use test; then
178 - unpack "${P}.gh.tar.gz"
179 - else
180 - mkdir -p "${P}"/src || die
181 - fi
182 -
183 - tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${P}.tar.gz" || die
184 -}
185 -
186 -src_prepare() {
187 - # apply patches relatively to top directory
188 - cd "${WORKDIR}/${P}" || die
189 - distutils-r1_src_prepare
190 -
191 - # manpage install is completely broken
192 - sed -i -e '/build\/doc\/man/d' src/setup.cfg || die
193 -
194 - if use test; then
195 - local remove_tests=(
196 - # TODO: does not respect PATH?
197 - test/Clang
198 - # broken
199 - test/DVIPDF/DVIPDFFLAGS.py
200 - test/Java/swig-dependencies.py
201 - test/Java/multi-step.py
202 - )
203 - rm -r "${remove_tests[@]}" || die
204 - fi
205 -}
206 -
207 -python_test() {
208 - local -x COLUMNS=80
209 - # set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env
210 - local -x GENTOO_SCONS_ENV_PASSTHROUGH=1
211 - # unset some env variables to pass appropriate tests
212 - unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
213 - cd "${WORKDIR}/${P}" || die
214 - "${EPYTHON}" runtest.py -a --passed \
215 - -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
216 -
217 - # runtest.py script returns "0" if all tests are passed
218 - # and returns "2" if there are any tests with "no result"
219 - # (i.e. in case if some tools are not installed or it's Windows specific tests)
220 - [[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}"
221 -}
222 -
223 -python_install_all() {
224 - distutils-r1_python_install_all
225 -
226 - doman *.1
227 - use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
228 -}