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/, dev-util/scons/files/
Date: Thu, 08 Sep 2022 14:05:21
Message-Id: 1662644645.61fe5ddd93054ad23508dd7133475ad7bace79b7.mgorny@gentoo
1 commit: 61fe5ddd93054ad23508dd7133475ad7bace79b7
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 8 13:44:05 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 8 13:44:05 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61fe5ddd
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 | 8 --
13 .../files/scons-4.0.0-respect-cc-etc-r1.patch | 88 ----------------
14 dev-util/scons/scons-4.1.0-r1.ebuild | 98 -----------------
15 dev-util/scons/scons-4.3.0.ebuild | 117 ---------------------
16 4 files changed, 311 deletions(-)
17
18 diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
19 index 3f9239d8be68..02f2849626bb 100644
20 --- a/dev-util/scons/Manifest
21 +++ b/dev-util/scons/Manifest
22 @@ -1,12 +1,4 @@
23 -DIST SCons-4.3.0.tar.gz 3065509 BLAKE2B c36e816357f908d91d532cacde06ed75f57386bb9386bf751dd4ec65580894d8e04ad86380e421008374fa8d8c798323f9f8fb52d7e3d7d85140300a8b388def SHA512 200e087a0a3de7d92d7da6bdb7f2dc0f5d9ff4908a9d6aef2feab8cacfb2e480b7d88efca8f7a84bd39620db2efceaca14f68e6edbf494b1c28b80e35ed14f2c
24 DIST SCons-4.4.0.tar.gz 3096863 BLAKE2B 60f125c077dd8f50a7150db6dc1234eac988cf7ee7495036d73c46e8ae445b87c88dde23a537d6647709778a33e6f1ac529f7ac7f862648e3019bbe437bb451c SHA512 d4e630214a9221f00d668b6524803efa83b41534fa6e0acca689d926cbc8546e5cf79c1c7a4b5627afbcd5033564343b408790bf4c29067d053cfbb39408a8ed
25 -DIST scons-4.1.0-user.html 1454432 BLAKE2B 9fac4d7bfb4b25708bc4cc48d952beb030f88181af5dfee63090f726b1a82443c192c63ec5939869967ef8f374e8599321212971439fb265fb050b263681c9f8 SHA512 74f1349fa61dac9e66cfb863cb3126d07ce5f421b3e87d0220eb32bd5017ba8f6cf96eb8cb5ee45c39022671aa9f2d0408d4039970c438a69c002445aea510be
26 -DIST scons-4.1.0-user.pdf 2691364 BLAKE2B a910a09fa936d4d6f8dc967676d5aa009aac58a5a4566399b3ddc3512ac0259731e6c5399722fefadb3b79d8f89a5257e2e9bc2fa4d65697c8293ab995248d64 SHA512 64584731a59b59b78283be3876ecca91d742f83da2653d0de17922bec01e3c9cea1ce2ce3c8dc718597910ba86ed2c8aff0f7ae371bf763439b57a6d5484e1a7
27 -DIST scons-4.1.0.gh.tar.gz 5609204 BLAKE2B ede3d47a1ec652b9248681e26738073e9d01daab7ffeccc58f0fcadb79661e30edb9a35a511518e4a58459243acb027afd8fa5849b0f9e4bae451055f7b1a062 SHA512 f79b86bb09783767b3872cfb8efb665372714a604af2aaf3adc66eee63d3afe27bc6b2aab83813743c83f71c81c800d42842e916501787ba402ce2726dda9b44
28 -DIST scons-4.1.0.tar.gz 3007701 BLAKE2B 70ab64ecfd89fa2af1d78a33fcef82a5f7db9875ffe9d2c16ea75cf40e661b2874359e3a5f75d761b3d9e863f7a434560992cfb020cce3e21e389381331d90de SHA512 24fd493643545a2998b053ed0d68caf6241f05bc2437e7cbeae33d2e1c63517a61449a1a18062f8e4e5a639295a2486925296ba3e54ccfa2ecdd56fa07132de8
29 -DIST scons-4.3.0-user.html 1529873 BLAKE2B 9f5b1bc0ab1d47769d8475ab86b1ae40cfc3643013c6e19692caac50dc37a306b6fd4654ec95c0ad6ad89531e2098253c62db679c9921680955b6dc11c4b247a SHA512 82e2de098c16a354ee3546a39f3ad923d8a40831d69d31266a795f7ce1a8d42e258e650f59f1910f0497d2d053eeb94aa1216c2a2108ca441844445e587490b2
30 -DIST scons-4.3.0-user.pdf 2851016 BLAKE2B 75282daad0c12da3afa71a0b34447545c2d93ab4fd0589395acd4a04242bb387b35ef2fb0469a57b96eda25258a28f18bd3bb693c6e2b02dc4e6b621a10f0f33 SHA512 c404508ca13e043f8a6717711294fa8cf4a513da7a09285fc6d73342d1f2b4fb0f718faa8fe6ee5b5ab92acf5839dfa05b86004ab0e0fcd7449a31fd5f6f003b
31 -DIST scons-4.3.0.gh.tar.gz 5704869 BLAKE2B a43b509b358d47ee73f7eb714d1239b4fdc33f38483c1a3e72c3a8082242d7bb1a4925958a2648782aa28f4c22a6e018aea8fec1139cf44c59e859f6f902d1d3 SHA512 2d91cf3045797c888d24db38d5b44576e56b271a2c4e9d28d7e16026451865f713990ff9e57fa3e0a1c19603c2d6adbbd1ba36d297c9dcce4db4139fcc51cd62
32 DIST scons-4.4.0-user.html 1608381 BLAKE2B ff4eb1e0f9c5e8ea7ca44cc00dc37e3e2dd38c24cb09a857c691e6a48f11e5fc86a55740037cc295e6b23df2a1c1b600adf0462320ec87cc26d4bcf919b07342 SHA512 8c1d6578270054efba34c56ddc07b4314bf62630f6a445f5b9f865cc48d593f6c92101a8d216dece201b8d6cb5bce59ff4adb51caaa40128e96b6235087f748c
33 DIST scons-4.4.0-user.pdf 2964111 BLAKE2B 45b37c99c3f3d0e9969a16506e27aeabfd562155405f5a59ba79c24404b14e5588fbd0673d86e2266adbd25eca140c9e1cf86e271228658591c0d9285474f078 SHA512 57330f685e7c775cb1c782e40f711c2b2322fad19212a22a920aff92db974610cc78f276e1606fb827660bb488ce803e2458bb9d93c452fa0600df4478f03d06
34 DIST scons-4.4.0.gh.tar.gz 5808265 BLAKE2B f6ce757f2edc40551b05285098626bb62def6abda2380d4885ee4443868e715e53aaa34f26c09dc689bb6ade26d1b0e276046fe3b1d2ddf8eb40400bca9ea164 SHA512 01fcd40bf818ca22a278973af1cda3024efb74cf877f15d46607fda860448fbd577fc96ba33fef2bed3d145e662a0371f55e8c927e7ac44feea7f3081791ce11
35
36 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
37 deleted file mode 100644
38 index d187a17ae60c..000000000000
39 --- a/dev-util/scons/files/scons-4.0.0-respect-cc-etc-r1.patch
40 +++ /dev/null
41 @@ -1,88 +0,0 @@
42 -From 929986e568446f54c2a99c309fbb4d05bd4af00a Mon Sep 17 00:00:00 2001
43 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
44 -Date: Thu, 10 May 2018 08:01:08 +0200
45 -Subject: [PATCH] posix: Also force common toolchain vars for Gentoo
46 -
47 ----
48 - src/SCons/Platform/posix.py | 20 ++++++++++++++++++++
49 - src/SCons/Tool/cc.py | 3 ++-
50 - src/SCons/Tool/cxx.py | 3 ++-
51 - src/SCons/Tool/link.py | 3 ++-
52 - 4 files changed, 26 insertions(+), 3 deletions(-)
53 -
54 -diff --git a/src/SCons/Platform/posix.py b/src/SCons/Platform/posix.py
55 -index 739310a1..ef7528e0 100644
56 ---- a/src/SCons/Platform/posix.py
57 -+++ b/src/SCons/Platform/posix.py
58 -@@ -95,6 +95,26 @@ def generate(env):
59 - if 'ENV' in env:
60 - new_env.update(env['ENV'])
61 - env['ENV'] = new_env
62 -+
63 -+ # Furthermore, force common compiler/linker variables as well
64 -+ envvar_mapping = {
65 -+ 'AR': 'AR',
66 -+ 'AS': 'AS',
67 -+ 'ASFLAGS': 'ASFLAGS',
68 -+ 'CC': 'CC',
69 -+ 'CXX': 'CXX',
70 -+ 'CFLAGS': 'CFLAGS',
71 -+ 'CXXFLAGS': 'CXXFLAGS',
72 -+ 'CPPFLAGS': 'CPPFLAGS',
73 -+ 'LDFLAGS': 'LINKFLAGS',
74 -+ }
75 -+
76 -+ for envvar, toolvar in envvar_mapping.items():
77 -+ if toolvar not in env and envvar in env['ENV']:
78 -+ val = env['ENV'][envvar]
79 -+ if toolvar.endswith('FLAGS'):
80 -+ val = SCons.Util.CLVar(val)
81 -+ env[toolvar] = val
82 - else:
83 - if 'ENV' not in env:
84 - env['ENV'] = {}
85 -diff --git a/src/SCons/Tool/cc.py b/src/SCons/Tool/cc.py
86 -index 590ec5fd..5f9229a0 100644
87 ---- a/src/SCons/Tool/cc.py
88 -+++ b/src/SCons/Tool/cc.py
89 -@@ -80,7 +80,8 @@ def generate(env):
90 -
91 - if 'CC' not in env:
92 - env['CC'] = env.Detect(compilers) or compilers[0]
93 -- env['CFLAGS'] = SCons.Util.CLVar('')
94 -+ if 'CFLAGS' not in env:
95 -+ env['CFLAGS'] = SCons.Util.CLVar('')
96 - env['CCCOM'] = '$CC -o $TARGET -c $CFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
97 - env['SHCC'] = '$CC'
98 - env['SHCFLAGS'] = SCons.Util.CLVar('$CFLAGS')
99 -diff --git a/src/SCons/Tool/cxx.py b/src/SCons/Tool/cxx.py
100 -index 430851c8..ca5ab563 100644
101 ---- a/src/SCons/Tool/cxx.py
102 -+++ b/src/SCons/Tool/cxx.py
103 -@@ -74,7 +74,8 @@ def generate(env):
104 -
105 - if 'CXX' not in env:
106 - env['CXX'] = env.Detect(compilers) or compilers[0]
107 -- env['CXXFLAGS'] = SCons.Util.CLVar('')
108 -+ if 'CXXFLAGS' not in env:
109 -+ env['CXXFLAGS'] = SCons.Util.CLVar('')
110 - env['CXXCOM'] = '$CXX -o $TARGET -c $CXXFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
111 - env['SHCXX'] = '$CXX'
112 - env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS')
113 -diff --git a/src/SCons/Tool/link.py b/src/SCons/Tool/link.py
114 -index 5adc6ca2..a12ea8ed 100644
115 ---- a/src/SCons/Tool/link.py
116 -+++ b/src/SCons/Tool/link.py
117 -@@ -318,7 +318,8 @@ def generate(env):
118 -
119 - env['SMARTLINK'] = smart_link
120 - env['LINK'] = "$SMARTLINK"
121 -- env['LINKFLAGS'] = SCons.Util.CLVar('')
122 -+ if 'LINKFLAGS' not in env:
123 -+ env['LINKFLAGS'] = SCons.Util.CLVar('')
124 -
125 - # __RPATH is only set to something ($_RPATH typically) on platforms that support it.
126 - env['LINKCOM'] = '$LINK -o $TARGET $LINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS'
127 ---
128 -2.20.1
129 -
130
131 diff --git a/dev-util/scons/scons-4.1.0-r1.ebuild b/dev-util/scons/scons-4.1.0-r1.ebuild
132 deleted file mode 100644
133 index 3f27b8197d8b..000000000000
134 --- a/dev-util/scons/scons-4.1.0-r1.ebuild
135 +++ /dev/null
136 @@ -1,98 +0,0 @@
137 -# Copyright 1999-2021 Gentoo Authors
138 -# Distributed under the terms of the GNU General Public License v2
139 -
140 -EAPI=7
141 -
142 -DISTUTILS_USE_SETUPTOOLS=rdepend
143 -PYTHON_COMPAT=( python3_{8..9} )
144 -PYTHON_REQ_USE="threads(+)"
145 -
146 -inherit distutils-r1
147 -
148 -DESCRIPTION="Extensible Python-based build utility"
149 -HOMEPAGE="https://www.scons.org/"
150 -SRC_URI="
151 - https://downloads.sourceforge.net/project/scons/scons/${PV}/${P}.tar.gz
152 - doc? (
153 - https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
154 - https://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
155 - )
156 - test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
157 -
158 -LICENSE="MIT"
159 -SLOT="0"
160 -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"
161 -IUSE="doc test"
162 -RESTRICT="!test? ( test )"
163 -
164 -BDEPEND="
165 - test? (
166 - dev-libs/libxml2[${PYTHON_USEDEP}]
167 - dev-python/lxml[${PYTHON_USEDEP}]
168 - )
169 -"
170 -
171 -S=${WORKDIR}/${P}/src
172 -
173 -PATCHES=(
174 - # support env passthrough for Gentoo ebuilds
175 - "${FILESDIR}"/scons-4.1.0-env-passthrough.patch
176 - # respect CC, CXX, C*FLAGS, LDFLAGS by default
177 - "${FILESDIR}"/scons-4.0.0-respect-cc-etc-r1.patch
178 -)
179 -
180 -src_unpack() {
181 - # use the git directory structure, but put pregenerated release
182 - # inside src/ subdirectory to make our life easier
183 - if use test; then
184 - unpack "${P}.gh.tar.gz"
185 - else
186 - mkdir -p "${P}"/src || die
187 - fi
188 -
189 - tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${P}.tar.gz" || die
190 -}
191 -
192 -src_prepare() {
193 - # apply patches relatively to top directory
194 - cd "${WORKDIR}/${P}" || die
195 - distutils-r1_src_prepare
196 -
197 - # manpage install is completely broken
198 - sed -i -e '/build\/doc\/man/d' src/setup.cfg || die
199 -
200 - if use test; then
201 - local remove_tests=(
202 - # TODO: does not respect PATH?
203 - test/Clang
204 - # broken
205 - test/DVIPDF/DVIPDFFLAGS.py
206 - test/Java/swig-dependencies.py
207 - test/Java/multi-step.py
208 - )
209 - rm -r "${remove_tests[@]}" || die
210 - fi
211 -}
212 -
213 -python_test() {
214 - local -x COLUMNS=80
215 - # set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env
216 - local -x GENTOO_SCONS_ENV_PASSTHROUGH=1
217 - # unset some env variables to pass appropriate tests
218 - unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
219 - cd "${WORKDIR}/${P}" || die
220 - "${EPYTHON}" runtest.py -a --passed \
221 - -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
222 -
223 - # runtest.py script returns "0" if all tests are passed
224 - # and returns "2" if there are any tests with "no result"
225 - # (i.e. in case if some tools are not installed or it's Windows specific tests)
226 - [[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}"
227 -}
228 -
229 -python_install_all() {
230 - distutils-r1_python_install_all
231 -
232 - doman *.1
233 - use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
234 -}
235
236 diff --git a/dev-util/scons/scons-4.3.0.ebuild b/dev-util/scons/scons-4.3.0.ebuild
237 deleted file mode 100644
238 index 4fa3dc9d6f6a..000000000000
239 --- a/dev-util/scons/scons-4.3.0.ebuild
240 +++ /dev/null
241 @@ -1,117 +0,0 @@
242 -# Copyright 1999-2022 Gentoo Authors
243 -# Distributed under the terms of the GNU General Public License v2
244 -
245 -EAPI=8
246 -
247 -DISTUTILS_USE_SETUPTOOLS=rdepend
248 -PYTHON_COMPAT=( python3_{8..10} )
249 -PYTHON_REQ_USE="threads(+)"
250 -
251 -inherit distutils-r1 multiprocessing
252 -
253 -MY_P="SCons-${PV}"
254 -DESCRIPTION="Extensible Python-based build utility"
255 -HOMEPAGE="https://www.scons.org/"
256 -SRC_URI="
257 - https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${MY_P}.tar.gz
258 - doc? (
259 - https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
260 - https://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
261 - )
262 - test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
263 -S="${WORKDIR}/${P}/src"
264 -
265 -LICENSE="MIT"
266 -SLOT="0"
267 -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"
268 -IUSE="doc test"
269 -RESTRICT="!test? ( test )"
270 -
271 -BDEPEND="
272 - test? (
273 - dev-libs/libxml2[${PYTHON_USEDEP}]
274 - dev-python/lxml[${PYTHON_USEDEP}]
275 - )
276 -"
277 -
278 -PATCHES=(
279 - # support env passthrough for Gentoo ebuilds
280 - "${FILESDIR}"/scons-4.1.0-env-passthrough.patch
281 - # respect CC, CXX, C*FLAGS, LDFLAGS by default
282 - "${FILESDIR}"/scons-4.2.0-respect-cc-etc.patch
283 -)
284 -
285 -src_unpack() {
286 - # use the git directory structure, but put pregenerated release
287 - # inside src/ subdirectory to make our life easier
288 - if use test; then
289 - unpack "${P}.gh.tar.gz"
290 - else
291 - mkdir -p "${P}"/src || die
292 - fi
293 -
294 - tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${MY_P}.tar.gz" || die
295 -}
296 -
297 -src_prepare() {
298 - # apply patches relatively to top directory
299 - cd "${WORKDIR}/${P}" || die
300 - distutils-r1_src_prepare
301 -
302 - if use test; then
303 - local remove_tests=(
304 - # TODO: does not respect PATH?
305 - test/Clang
306 - # broken
307 - test/DVIPDF/DVIPDFFLAGS.py
308 - test/Java/swig-dependencies.py
309 - test/Java/multi-step.py
310 - # broken by commas in date, sic!
311 - test/option/option-v.py
312 - test/Interactive/version.py
313 - )
314 -
315 - if ! use amd64 && ! use x86 ; then
316 - # These tests are currently broken on arm and other non-amd64/x86 platforms
317 - # Work seems to be ongoing in e.g. https://github.com/SCons/scons/pull/4022 to
318 - # better plumb up the MSVC tests for alternative arches.
319 - # Try again after 4.2.0.
320 - # See also: https://pairlist4.pair.net/pipermail/scons-users/2020-November/008452.html
321 - # bug #757534
322 - remove_tests+=(
323 - test/MSVS/vs-7.0-scc-files.py
324 - test/MSVS/vs-7.0-scc-legacy-files.py
325 - test/MSVS/vs-7.1-scc-files.py
326 - test/MSVS/vs-7.1-scc-legacy-files.py
327 - test/MSVS/vs-scc-files.py
328 - test/MSVS/vs-scc-legacy-files.py
329 - )
330 - fi
331 -
332 - rm -r "${remove_tests[@]}" || die
333 - fi
334 -}
335 -
336 -python_test() {
337 - local -x COLUMNS=80
338 - # set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env
339 - local -x GENTOO_SCONS_ENV_PASSTHROUGH=1
340 - # unset some env variables to pass appropriate tests
341 - unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
342 - cd "${WORKDIR}/${P}" || die
343 - "${EPYTHON}" runtest.py -a --passed \
344 - -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
345 -
346 - # runtest.py script returns "0" if all tests are passed
347 - # and returns "2" if there are any tests with "no result"
348 - # (i.e. in case if some tools are not installed or it's Windows specific tests)
349 - [[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}"
350 -}
351 -
352 -python_install_all() {
353 - rm "${ED}"/usr/*.1 || die
354 - distutils-r1_python_install_all
355 -
356 - doman *.1
357 - use doc && dodoc "${DISTDIR}/${P}"-user.{pdf,html}
358 -}