1 |
commit: e56fb0a685dd1ce83bdf6bbe33cb1c8600d7d9f2 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 5 23:31:31 2021 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 6 00:49:14 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e56fb0a6 |
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 | 6 -- |
13 |
.../scons/files/scons-3.0.1-env-passthrough.patch | 40 ---------- |
14 |
.../files/scons-3.0.3-respect-cc-etc-r1.patch | 88 ---------------------- |
15 |
dev-util/scons/scons-3.1.1.ebuild | 55 -------------- |
16 |
dev-util/scons/scons-3.1.2.ebuild | 59 --------------- |
17 |
5 files changed, 248 deletions(-) |
18 |
|
19 |
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest |
20 |
index ec39364465c..5ab364d5356 100644 |
21 |
--- a/dev-util/scons/Manifest |
22 |
+++ b/dev-util/scons/Manifest |
23 |
@@ -1,9 +1,3 @@ |
24 |
-DIST scons-3.1.1-user.html 1134061 BLAKE2B de025ff73ecacec591c63b22bb3f934962a34fa16bec47a58972b97ba28f9a88254b419b4d2edeb2d920e70cf3e0c739df5357956c8586e5377afcd4125ba0a8 SHA512 bd00bcdcd01b192a42110ec65cdb906963af08f5bbc9d5e61624b5b5b1a667b115b099ce2ef71444a8998171a5544f4caecf3acec9715876d4e9e5baa581e60d |
25 |
-DIST scons-3.1.1-user.pdf 2564248 BLAKE2B 702e57a9646779ff1aa077aa7ae7a815d004cda08166f948ef3b893a786c7ccf13e9d1f8621640573802acd0b6a7acaaf68ebea984d5922112a30c4457740bc4 SHA512 0c0f8e93e3bddd9dc0ec661f629f2995ec9375908b3b7bf2b67c9518571cb31754d13fca46fc1182019976e5c0a417832447692ff61f5ee4613b7f56c7891594 |
26 |
-DIST scons-3.1.1.tar.gz 663878 BLAKE2B 095d5f45885ac12937066be247194e70d33e8f5dc0955e7d693c4b0d3a4b61e776bc1d64cd00ebc89d1e85a7992747b8f448255a76c1b6c2d9df8fa173967711 SHA512 2e80b45571679d8acc0554273538f56163488df5aa9007c7c9c3a6deb2698909ab05da8df91502ea287c0cc0ff0a98f226454f67fcfb7a943570f673f4bd8f54 |
27 |
-DIST scons-3.1.2-user.html 1126908 BLAKE2B 38e7695b6ef1e79b3eed4455fbe84ec1587be3f21c1c90cfa6602b344c52c704f021ed8e611abaf2e24ca06c5116e79fb78ca724c9920186cce35feccbac899d SHA512 a13ed1157f6aad25acbad6e1e3d2c0a16a14dd1d5fa369ba27777ca30eeb31ce37c735c1870c80f7343f0f98a4305fe1ef7c2b679cf2cb9c0d6670f34a3aeba8 |
28 |
-DIST scons-3.1.2-user.pdf 2557502 BLAKE2B 1c89d845d23c4e434c9db11d8730121f0b8dc6f2fca21dabe3e7204373cdf743d831a1835731332e39ccd7f3f49da068ba34a33a2937e9dd205e38d9c8b2b321 SHA512 9da887c157cb95f7802cb4b96080b0e56f2ad7663021b8be0839e71d473422fe9dd0dadf0ad1b067160c39511e91c6b3d9aaff8e238bb46b10a03ae89b12e169 |
29 |
-DIST scons-3.1.2.tar.gz 668298 BLAKE2B 14251e2bab425dfc31d1d6d9325a67725dae42576d2a5c204f0ff7948aa2da5aadd3fdf03bbbccd615757520fedee5e18ca2ba13aaf07a4ddfec330db4221203 SHA512 bfc0d58d33408a03eb37c1eff166af8139078026e6b43d6274afceac889d0a6743e359e89ad9a30be5ca43aeed26fba92fa4732854750b7d53091ef3e99b3d33 |
30 |
DIST scons-4.0.1-user.html 1415152 BLAKE2B 1a94b2ef5e076d883f2960825f055c7cc39cfd1848be797a9519bf94834cd4174d3da3274ef77f64106c1cc182c3f8cef363e3982f5c227d3a6dcbeadbc847c2 SHA512 f1165836ad80c90caa4d936ffc86c0ed20ea4c5e7854c36fee3a2c575b1c05c731d4ece9554e43292e6da30176ad9f31f31cf12f84264307c1494f79b06f43c7 |
31 |
DIST scons-4.0.1-user.pdf 2468804 BLAKE2B f0af6bc6b41d972b98e955ee3ccec908aa366eabe31bd01022abe1f6d3a94dd6d7da26f71de23a6dfbcbc7bb4e439463f69bb7e8a5780c1300e3ba508b9eb314 SHA512 0d2733e2f1391083522a64117bfd35a2160d1366382f6f630b26eba36fc12ce797467d5e16efeb3b7f58aa9d853f96ae0d50fe78f59e78d24642b146bc7e565d |
32 |
DIST scons-4.0.1.gh.tar.gz 5578800 BLAKE2B f9ece5eaf1b133219f975e484beb5df726560a38969b8e8ad829781b960b438458bfcd7971333da87560c957675b2a4f8675e757fb0a4268cc4ecf72bb60d45f SHA512 f23c5dfd3c236e9f9f85b986ca64a36dbd85e9f3383cb3577e082a7dea4b83283020fbf064c2d919ab116195c6708fc11f906fcf3b0bc0533a4bc49a4f7371c6 |
33 |
|
34 |
diff --git a/dev-util/scons/files/scons-3.0.1-env-passthrough.patch b/dev-util/scons/files/scons-3.0.1-env-passthrough.patch |
35 |
deleted file mode 100644 |
36 |
index 16de316766b..00000000000 |
37 |
--- a/dev-util/scons/files/scons-3.0.1-env-passthrough.patch |
38 |
+++ /dev/null |
39 |
@@ -1,40 +0,0 @@ |
40 |
-From f2f8536be12f1d095382e7598060c1eb51eb5337 Mon Sep 17 00:00:00 2001 |
41 |
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
42 |
-Date: Wed, 9 May 2018 17:04:49 +0200 |
43 |
-Subject: [PATCH] posix: Support GENTOO_SCONS_ENV_PASSTHROUGH=1 |
44 |
- |
45 |
-Support GENTOO_SCONS_ENV_PASSTHROUGH=1 variable to override the default |
46 |
-of wiping the environment and resetting PATH to default, and instead |
47 |
-pass all variables through. |
48 |
---- |
49 |
- src/engine/SCons/Platform/posix.py | 14 +++++++++++--- |
50 |
- 1 file changed, 11 insertions(+), 3 deletions(-) |
51 |
- |
52 |
-diff --git a/src/engine/SCons/Platform/posix.py b/src/engine/SCons/Platform/posix.py |
53 |
-index 8db08db1..af34650c 100644 |
54 |
---- a/src/engine/SCons/Platform/posix.py |
55 |
-+++ b/src/engine/SCons/Platform/posix.py |
56 |
-@@ -87,9 +87,17 @@ def generate(env): |
57 |
- pspawn = piped_env_spawn |
58 |
- # Note that this means that 'escape' is no longer used |
59 |
- |
60 |
-- if 'ENV' not in env: |
61 |
-- env['ENV'] = {} |
62 |
-- env['ENV']['PATH'] = '/usr/local/bin:/opt/bin:/bin:/usr/bin' |
63 |
-+ # Force pass-through of environment variables in Gentoo builds |
64 |
-+ if os.environ.get('GENTOO_SCONS_ENV_PASSTHROUGH', False): |
65 |
-+ new_env = os.environ.copy() |
66 |
-+ if 'ENV' in env: |
67 |
-+ new_env.update(env['ENV']) |
68 |
-+ env['ENV'] = new_env |
69 |
-+ else: |
70 |
-+ if 'ENV' not in env: |
71 |
-+ env['ENV'] = {} |
72 |
-+ env['ENV']['PATH'] = '/usr/local/bin:/opt/bin:/bin:/usr/bin' |
73 |
-+ |
74 |
- env['OBJPREFIX'] = '' |
75 |
- env['OBJSUFFIX'] = '.o' |
76 |
- env['SHOBJPREFIX'] = '$OBJPREFIX' |
77 |
--- |
78 |
-2.17.0 |
79 |
- |
80 |
|
81 |
diff --git a/dev-util/scons/files/scons-3.0.3-respect-cc-etc-r1.patch b/dev-util/scons/files/scons-3.0.3-respect-cc-etc-r1.patch |
82 |
deleted file mode 100644 |
83 |
index b888993b436..00000000000 |
84 |
--- a/dev-util/scons/files/scons-3.0.3-respect-cc-etc-r1.patch |
85 |
+++ /dev/null |
86 |
@@ -1,88 +0,0 @@ |
87 |
-From 929986e568446f54c2a99c309fbb4d05bd4af00a Mon Sep 17 00:00:00 2001 |
88 |
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
89 |
-Date: Thu, 10 May 2018 08:01:08 +0200 |
90 |
-Subject: [PATCH] posix: Also force common toolchain vars for Gentoo |
91 |
- |
92 |
---- |
93 |
- src/engine/SCons/Platform/posix.py | 20 ++++++++++++++++++++ |
94 |
- src/engine/SCons/Tool/cc.py | 3 ++- |
95 |
- src/engine/SCons/Tool/cxx.py | 3 ++- |
96 |
- src/engine/SCons/Tool/link.py | 3 ++- |
97 |
- 4 files changed, 26 insertions(+), 3 deletions(-) |
98 |
- |
99 |
-diff --git a/src/engine/SCons/Platform/posix.py b/src/engine/SCons/Platform/posix.py |
100 |
-index 739310a1..ef7528e0 100644 |
101 |
---- a/src/engine/SCons/Platform/posix.py |
102 |
-+++ b/src/engine/SCons/Platform/posix.py |
103 |
-@@ -95,6 +95,26 @@ def generate(env): |
104 |
- if 'ENV' in env: |
105 |
- new_env.update(env['ENV']) |
106 |
- env['ENV'] = new_env |
107 |
-+ |
108 |
-+ # Furthermore, force common compiler/linker variables as well |
109 |
-+ envvar_mapping = { |
110 |
-+ 'AR': 'AR', |
111 |
-+ 'AS': 'AS', |
112 |
-+ 'ASFLAGS': 'ASFLAGS', |
113 |
-+ 'CC': 'CC', |
114 |
-+ 'CXX': 'CXX', |
115 |
-+ 'CFLAGS': 'CFLAGS', |
116 |
-+ 'CXXFLAGS': 'CXXFLAGS', |
117 |
-+ 'CPPFLAGS': 'CPPFLAGS', |
118 |
-+ 'LDFLAGS': 'LINKFLAGS', |
119 |
-+ } |
120 |
-+ |
121 |
-+ for envvar, toolvar in envvar_mapping.items(): |
122 |
-+ if toolvar not in env and envvar in env['ENV']: |
123 |
-+ val = env['ENV'][envvar] |
124 |
-+ if toolvar.endswith('FLAGS'): |
125 |
-+ val = SCons.Util.CLVar(val) |
126 |
-+ env[toolvar] = val |
127 |
- else: |
128 |
- if 'ENV' not in env: |
129 |
- env['ENV'] = {} |
130 |
-diff --git a/src/engine/SCons/Tool/cc.py b/src/engine/SCons/Tool/cc.py |
131 |
-index 590ec5fd..5f9229a0 100644 |
132 |
---- a/src/engine/SCons/Tool/cc.py |
133 |
-+++ b/src/engine/SCons/Tool/cc.py |
134 |
-@@ -80,7 +80,8 @@ def generate(env): |
135 |
- |
136 |
- if 'CC' not in env: |
137 |
- env['CC'] = env.Detect(compilers) or compilers[0] |
138 |
-- env['CFLAGS'] = SCons.Util.CLVar('') |
139 |
-+ if 'CFLAGS' not in env: |
140 |
-+ env['CFLAGS'] = SCons.Util.CLVar('') |
141 |
- env['CCCOM'] = '$CC -o $TARGET -c $CFLAGS $CCFLAGS $_CCCOMCOM $SOURCES' |
142 |
- env['SHCC'] = '$CC' |
143 |
- env['SHCFLAGS'] = SCons.Util.CLVar('$CFLAGS') |
144 |
-diff --git a/src/engine/SCons/Tool/cxx.py b/src/engine/SCons/Tool/cxx.py |
145 |
-index 430851c8..ca5ab563 100644 |
146 |
---- a/src/engine/SCons/Tool/cxx.py |
147 |
-+++ b/src/engine/SCons/Tool/cxx.py |
148 |
-@@ -74,7 +74,8 @@ def generate(env): |
149 |
- |
150 |
- if 'CXX' not in env: |
151 |
- env['CXX'] = env.Detect(compilers) or compilers[0] |
152 |
-- env['CXXFLAGS'] = SCons.Util.CLVar('') |
153 |
-+ if 'CXXFLAGS' not in env: |
154 |
-+ env['CXXFLAGS'] = SCons.Util.CLVar('') |
155 |
- env['CXXCOM'] = '$CXX -o $TARGET -c $CXXFLAGS $CCFLAGS $_CCCOMCOM $SOURCES' |
156 |
- env['SHCXX'] = '$CXX' |
157 |
- env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS') |
158 |
-diff --git a/src/engine/SCons/Tool/link.py b/src/engine/SCons/Tool/link.py |
159 |
-index 5adc6ca2..a12ea8ed 100644 |
160 |
---- a/src/engine/SCons/Tool/link.py |
161 |
-+++ b/src/engine/SCons/Tool/link.py |
162 |
-@@ -318,7 +318,8 @@ def generate(env): |
163 |
- |
164 |
- env['SMARTLINK'] = smart_link |
165 |
- env['LINK'] = "$SMARTLINK" |
166 |
-- env['LINKFLAGS'] = SCons.Util.CLVar('') |
167 |
-+ if 'LINKFLAGS' not in env: |
168 |
-+ env['LINKFLAGS'] = SCons.Util.CLVar('') |
169 |
- |
170 |
- # __RPATH is only set to something ($_RPATH typically) on platforms that support it. |
171 |
- env['LINKCOM'] = '$LINK -o $TARGET $LINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS' |
172 |
--- |
173 |
-2.20.1 |
174 |
- |
175 |
|
176 |
diff --git a/dev-util/scons/scons-3.1.1.ebuild b/dev-util/scons/scons-3.1.1.ebuild |
177 |
deleted file mode 100644 |
178 |
index 8983c62b15e..00000000000 |
179 |
--- a/dev-util/scons/scons-3.1.1.ebuild |
180 |
+++ /dev/null |
181 |
@@ -1,55 +0,0 @@ |
182 |
-# Copyright 1999-2021 Gentoo Authors |
183 |
-# Distributed under the terms of the GNU General Public License v2 |
184 |
- |
185 |
-EAPI=7 |
186 |
-PYTHON_COMPAT=( python3_7 ) |
187 |
-PYTHON_REQ_USE="threads(+)" |
188 |
- |
189 |
-inherit distutils-r1 |
190 |
- |
191 |
-DESCRIPTION="Extensible Python-based build utility" |
192 |
-HOMEPAGE="http://www.scons.org/" |
193 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz |
194 |
- doc? ( |
195 |
- http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf |
196 |
- http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html |
197 |
- )" |
198 |
- |
199 |
-LICENSE="MIT" |
200 |
-SLOT="0" |
201 |
-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" |
202 |
-IUSE="doc" |
203 |
-RESTRICT="test" |
204 |
- |
205 |
-S=${WORKDIR}/${P}/src |
206 |
- |
207 |
-PATCHES=( |
208 |
- # support env passthrough for Gentoo ebuilds |
209 |
- "${FILESDIR}"/scons-3.0.1-env-passthrough.patch |
210 |
- # respect CC, CXX, C*FLAGS, LDFLAGS by default |
211 |
- "${FILESDIR}"/scons-3.0.3-respect-cc-etc-r1.patch |
212 |
-) |
213 |
- |
214 |
-src_unpack() { |
215 |
- mkdir -p "${P}"/src || die |
216 |
- tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${P}.tar.gz" || die |
217 |
-} |
218 |
- |
219 |
-src_prepare() { |
220 |
- # apply patches relatively to top directory |
221 |
- cd "${WORKDIR}/${P}" || die |
222 |
- distutils-r1_src_prepare |
223 |
- |
224 |
- # remove half-broken, useless custom commands |
225 |
- # and fix manpage install location |
226 |
- sed -i -e '/cmdclass/,/},$/d' \ |
227 |
- -e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die |
228 |
-} |
229 |
- |
230 |
-python_install_all() { |
231 |
- local DOCS=( {CHANGES,README,RELEASE}.txt ) |
232 |
- distutils-r1_python_install_all |
233 |
- rm "${ED}/usr/bin/scons.bat" || die |
234 |
- |
235 |
- use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html} |
236 |
-} |
237 |
|
238 |
diff --git a/dev-util/scons/scons-3.1.2.ebuild b/dev-util/scons/scons-3.1.2.ebuild |
239 |
deleted file mode 100644 |
240 |
index 8ca8614d68c..00000000000 |
241 |
--- a/dev-util/scons/scons-3.1.2.ebuild |
242 |
+++ /dev/null |
243 |
@@ -1,59 +0,0 @@ |
244 |
-# Copyright 1999-2021 Gentoo Authors |
245 |
-# Distributed under the terms of the GNU General Public License v2 |
246 |
- |
247 |
-EAPI=7 |
248 |
- |
249 |
-# False positive due to commented code in setup.py |
250 |
-DISTUTILS_USE_SETUPTOOLS=manual |
251 |
-PYTHON_COMPAT=( python3_{7,8} ) |
252 |
-PYTHON_REQ_USE="threads(+)" |
253 |
- |
254 |
-inherit distutils-r1 |
255 |
- |
256 |
-DESCRIPTION="Extensible Python-based build utility" |
257 |
-HOMEPAGE="https://www.scons.org/" |
258 |
-SRC_URI=" |
259 |
- https://downloads.sourceforge.net/project/scons/scons/${PV}/${P}.tar.gz |
260 |
- doc? ( |
261 |
- https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf |
262 |
- https://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html |
263 |
- )" |
264 |
- |
265 |
-LICENSE="MIT" |
266 |
-SLOT="0" |
267 |
-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" |
268 |
-IUSE="doc" |
269 |
-RESTRICT="test" |
270 |
- |
271 |
-S=${WORKDIR}/${P}/src |
272 |
- |
273 |
-PATCHES=( |
274 |
- # support env passthrough for Gentoo ebuilds |
275 |
- "${FILESDIR}"/scons-3.0.1-env-passthrough.patch |
276 |
- # respect CC, CXX, C*FLAGS, LDFLAGS by default |
277 |
- "${FILESDIR}"/scons-3.0.3-respect-cc-etc-r1.patch |
278 |
-) |
279 |
- |
280 |
-src_unpack() { |
281 |
- mkdir -p "${P}"/src || die |
282 |
- tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${P}.tar.gz" || die |
283 |
-} |
284 |
- |
285 |
-src_prepare() { |
286 |
- # apply patches relatively to top directory |
287 |
- cd "${WORKDIR}/${P}" || die |
288 |
- distutils-r1_src_prepare |
289 |
- |
290 |
- # remove half-broken, useless custom commands |
291 |
- # and fix manpage install location |
292 |
- sed -i -e '/cmdclass/,/},$/d' \ |
293 |
- -e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die |
294 |
-} |
295 |
- |
296 |
-python_install_all() { |
297 |
- local DOCS=( {CHANGES,README,RELEASE}.txt ) |
298 |
- distutils-r1_python_install_all |
299 |
- rm "${ED}/usr/bin/scons.bat" || die |
300 |
- |
301 |
- use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html} |
302 |
-} |