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 Mar 2019 08:22:37
Message-Id: 1552463564.164e59ca3d812446bb909bb34d1800e7b52b7312.mgorny@gentoo
1 commit: 164e59ca3d812446bb909bb34d1800e7b52b7312
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 13 07:52:44 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 13 07:52:44 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=164e59ca
7
8 dev-util/scons: Drop old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-util/scons/Manifest | 8 --
13 .../files/scons-3.0.1-respect-cc-etc-r1.patch | 88 ----------------------
14 dev-util/scons/scons-3.0.1-r1.ebuild | 71 -----------------
15 dev-util/scons/scons-3.0.1-r100.ebuild | 73 ------------------
16 dev-util/scons/scons-3.0.1-r3.ebuild | 73 ------------------
17 dev-util/scons/scons-3.0.1.ebuild | 66 ----------------
18 dev-util/scons/scons-3.0.3.ebuild | 74 ------------------
19 7 files changed, 453 deletions(-)
20
21 diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
22 index 6a0fef99ce7..23abad5f164 100644
23 --- a/dev-util/scons/Manifest
24 +++ b/dev-util/scons/Manifest
25 @@ -1,14 +1,6 @@
26 DIST scons-2.5.1-user.html 1112180 BLAKE2B 93df42b296d1be6ffcb73143c5ec9f46225e3e9d07154cf8f703d5f624d2996d85569ff302093a7a73dc0001cfeddf49ee9e57d9a1939d3c6b4689f8773e3ede SHA512 5be58a6bba4b92fc51f0b271fd7e08b820dda10775aaa40a012c0e54d485e02ebf6d0d0be379bd90980a9b496e86a951c8760a4a90107fb3b8f422e874e46046
27 DIST scons-2.5.1-user.pdf 2522755 BLAKE2B 0dbf4ec98cd1dfb4889595762fdf57c2988a6784d75f8c3ac53e79d686b745ae4dd7b674ce34d61255c798e203fb6de93eaaf936a4842b27990350fa73b6bd46 SHA512 0bd7f67a1355ec33125bef87ce1bc352bda5b0befd9809673a427851c843191d74930b4ca9add705152393521f81d926595d173b0101013da216217dc5b64397
28 DIST scons-2.5.1.tar.gz 620909 BLAKE2B 021e02583dab06a859e46d164be79dcaa49a1a383c5d3fb9baa64afabb793e049b7ebefff1bbbcc8be1f364ca5c64e1a9c7ef937c32407853e39f4d84a91e51d SHA512 0e39f7f22a6c4ecc13edcd843b050754da5ded5371b3a8b406395f7b53dd280f95f804707eec271f8de3624d06f5b4ba3cc788dc4eb891cad224a163544f51b9
29 -DIST scons-3.0.1-user.html 1121915 BLAKE2B 0ee57d112ba6269a488335e9354723c645e4b06129c26ca64d45923066ad92cf5519fa4933ef74dd5254d5b068b2909290c5c930a4247ebd6a5f1761f683a6e2 SHA512 e49ae91b04509d32f67d17cabb6619ede49c7190d80efcbd1e0bd1992574ea08c7abc892cad26f8b995b0f43bccd099a96ce633d63d6f56aafc442f9aa734aec
30 -DIST scons-3.0.1-user.pdf 2541376 BLAKE2B 43895501bf8b4a7eda12c5b3b076e6a71e949727224c279ef77671f7d4094245d37b9d8aeca6daa7d043c5513cc0c83e82a06f8a50bb4add4f0d750fce416bac SHA512 9fab1915c96cd32908cbbf123dfb8c97be99ec45df0461fa68ac47706f6bfc51d7ab970a43630e5414b01a8b9d27409e356b57c134478cec13f1bcbd97f615e7
31 -DIST scons-3.0.1.gh.tar.gz 5481813 BLAKE2B 750668bf034ff48f635db0395fc4fc950a7148c315099738da4d96f346d025b7dd3849e376d566e5f55793ee0b901ad8a4d7ff661068420f085ab76404ca244c SHA512 092a5d88191e4c9deee2e14371745fad1c3beee746f55256729444ad56a141a28f45ebeef4b2a7ec37344048ff16864d85b978855c0285a14b7c6f46f91158ac
32 -DIST scons-3.0.1.tar.gz 634815 BLAKE2B f5bacec048969d592697bc3dfb44678c25a92982f7ba81f9951e73532e8b9ac0906fe72c979d7818db5ab9b2c6dd380df21d323e47ea4cc0db646d6eed4b7d94 SHA512 b7be40ba507366cc678f31b910553cadaf59781c3a91833a34acbd29d9cad0cda38f6753034bf92c3af55d1e0c2f72aba5d81f1ec67205d0345b005d286f7084
33 -DIST scons-3.0.3-user.html 1131439 BLAKE2B d1755cd462f7e6aad51c6289bd3137c0ae67fd145f3c6fe19a19ad49c793351f9dffaaef7a42f42922f2535aa384f0ce9c23a18070f3a22897a210ac44cdb1af SHA512 48dae93d14928bea3ac17731f7e379a1a907059d75fd7979af02c1442b80cba0bd2c93e3fde4e5220261b3e4afd70f323ecef991dc0ec7b9694e08b11048b932
34 -DIST scons-3.0.3-user.pdf 2545890 BLAKE2B c68c173e62c4a42e01d87f749556ebe1ce4b6f2c3e96e8b87825aefac30b59ad9642977c35441172e1453ffbee1812a383d7bfc24112e4562f5f24a1defc6ae2 SHA512 75da4a0870c9ef860ad1789f9a229b94affe35efd228c450d842a88090279dcfd9ae93b05df366a3d43da27c2e44ee36ae702013b9d4fe2e78db895a7892f182
35 -DIST scons-3.0.3.gh.tar.gz 5497106 BLAKE2B 5bf6b2eaf59200b8eeb19eeb9f4ceda6b9b6bf32561f220565617dc08c9094687ec5200eeb2e182f89d01647d5d6638d0ac742a4bd297cb4f781578707f63a83 SHA512 594c1c4c48a3c48418e2b3945fe17af96ff29d435704e8b6cbb85406cd38109d0b865cb2f7bbbc733f69ea5e0f283f4b5942a0140dac263725968e62d0c87a2e
36 -DIST scons-3.0.3.tar.gz 651374 BLAKE2B e095affdcdf75203559f6e1c9a94ec4ab29c5d8e84354d1ed04bd4b64f7cb14ca1916ed576eb0d180c4e871878b98072e923dd84ce5b8e61ce7fb5ab3747773b SHA512 a9f52bca2f5d98f9ec3aa6ce0fd05660d573e6738daef2162306c95f19bd95851bd83f44cab4a81187c051491b0f016137e443f70d764149bb00ad03f46f273e
37 DIST scons-3.0.4-user.html 1127751 BLAKE2B 5bafa81d075c063cc8c0c4d147fdf7573834e7b0af9099b7b68d7cf3c8872061b7ecc93e7119723eaa9d393e4463744a9e9bd8074ce28d8b518d366a11e4a215 SHA512 f3bc5591b90fb05420b00a110d32921394b867255b3925fab97420b864579702a956237983fb5b0a25d2f6d0268493b0f1819fbcb6f1027cc10ad7b59e2836a3
38 DIST scons-3.0.4-user.pdf 2561758 BLAKE2B aefd100912345f399e52d805bc2f01846f0bcdfb31524212e69fb41713c193a233a30dcea9133e35001a145ce62b84c648b6d57856c0d5dfa019974546cb4d82 SHA512 03b9e1e8b60ca07986956f1e5c63d56573222ea303bed1976167239b4e9ad73056776a80c7fe2529987aa90856c35bc1c858d1a445f34e7964b675e700845e71
39 DIST scons-3.0.4.gh.tar.gz 5500498 BLAKE2B 2157141d70f0f6d80606a0d53e0b6b99f72ac6d5f8b63e8825c1f484eb5c92979b50e897d2aadc2b201ee6f06a0d1df00ab272b96cc303c34f75124123f40a90 SHA512 d57924f0e7713ec2e5d7159fbf0078947aa5ce49f7cdf7a4ea47c19efbce7ec335a5e5448e200240be1095655c5c25f1466285f0bed5bdadeb2673845b23c4f5
40
41 diff --git a/dev-util/scons/files/scons-3.0.1-respect-cc-etc-r1.patch b/dev-util/scons/files/scons-3.0.1-respect-cc-etc-r1.patch
42 deleted file mode 100644
43 index 748646b14f1..00000000000
44 --- a/dev-util/scons/files/scons-3.0.1-respect-cc-etc-r1.patch
45 +++ /dev/null
46 @@ -1,88 +0,0 @@
47 -From 68fc19b7fd6b65ab850e4fd8ef5e85c672989f92 Mon Sep 17 00:00:00 2001
48 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
49 -Date: Thu, 10 May 2018 08:01:08 +0200
50 -Subject: [PATCH] posix: Also force common toolchain vars for Gentoo
51 -
52 ----
53 - src/engine/SCons/Platform/posix.py | 20 ++++++++++++++++++++
54 - src/engine/SCons/Tool/cc.py | 3 ++-
55 - src/engine/SCons/Tool/cxx.py | 3 ++-
56 - src/engine/SCons/Tool/link.py | 3 ++-
57 - 4 files changed, 26 insertions(+), 3 deletions(-)
58 -
59 -diff --git a/src/engine/SCons/Platform/posix.py b/src/engine/SCons/Platform/posix.py
60 -index af34650c..5533c87c 100644
61 ---- a/src/engine/SCons/Platform/posix.py
62 -+++ b/src/engine/SCons/Platform/posix.py
63 -@@ -93,6 +93,26 @@ def generate(env):
64 - if 'ENV' in env:
65 - new_env.update(env['ENV'])
66 - env['ENV'] = new_env
67 -+
68 -+ # Furthermore, force common compiler/linker variables as well
69 -+ envvar_mapping = {
70 -+ 'AR': 'AR',
71 -+ 'AS': 'AS',
72 -+ 'ASFLAGS': 'ASFLAGS',
73 -+ 'CC': 'CC',
74 -+ 'CXX': 'CXX',
75 -+ 'CFLAGS': 'CFLAGS',
76 -+ 'CXXFLAGS': 'CXXFLAGS',
77 -+ 'CPPFLAGS': 'CPPFLAGS',
78 -+ 'LDFLAGS': 'LINKFLAGS',
79 -+ }
80 -+
81 -+ for envvar, toolvar in envvar_mapping.items():
82 -+ if toolvar not in env and envvar in env['ENV']:
83 -+ val = env['ENV'][envvar]
84 -+ if toolvar.endswith('FLAGS'):
85 -+ val = SCons.Util.CLVar(val)
86 -+ env[toolvar] = val
87 - else:
88 - if 'ENV' not in env:
89 - env['ENV'] = {}
90 -diff --git a/src/engine/SCons/Tool/cc.py b/src/engine/SCons/Tool/cc.py
91 -index 590ec5fd..5f9229a0 100644
92 ---- a/src/engine/SCons/Tool/cc.py
93 -+++ b/src/engine/SCons/Tool/cc.py
94 -@@ -80,7 +80,8 @@ def generate(env):
95 -
96 - if 'CC' not in env:
97 - env['CC'] = env.Detect(compilers) or compilers[0]
98 -- env['CFLAGS'] = SCons.Util.CLVar('')
99 -+ if 'CFLAGS' not in env:
100 -+ env['CFLAGS'] = SCons.Util.CLVar('')
101 - env['CCCOM'] = '$CC -o $TARGET -c $CFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
102 - env['SHCC'] = '$CC'
103 - env['SHCFLAGS'] = SCons.Util.CLVar('$CFLAGS')
104 -diff --git a/src/engine/SCons/Tool/cxx.py b/src/engine/SCons/Tool/cxx.py
105 -index 430851c8..ca5ab563 100644
106 ---- a/src/engine/SCons/Tool/cxx.py
107 -+++ b/src/engine/SCons/Tool/cxx.py
108 -@@ -74,7 +74,8 @@ def generate(env):
109 -
110 - if 'CXX' not in env:
111 - env['CXX'] = env.Detect(compilers) or compilers[0]
112 -- env['CXXFLAGS'] = SCons.Util.CLVar('')
113 -+ if 'CXXFLAGS' not in env:
114 -+ env['CXXFLAGS'] = SCons.Util.CLVar('')
115 - env['CXXCOM'] = '$CXX -o $TARGET -c $CXXFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
116 - env['SHCXX'] = '$CXX'
117 - env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS')
118 -diff --git a/src/engine/SCons/Tool/link.py b/src/engine/SCons/Tool/link.py
119 -index 07e92507..614d1779 100644
120 ---- a/src/engine/SCons/Tool/link.py
121 -+++ b/src/engine/SCons/Tool/link.py
122 -@@ -292,7 +292,8 @@ def generate(env):
123 - env.Append(SHLIBEMITTER = [shlib_emitter])
124 - env['SMARTLINK'] = smart_link
125 - env['LINK'] = "$SMARTLINK"
126 -- env['LINKFLAGS'] = SCons.Util.CLVar('')
127 -+ if 'LINKFLAGS' not in env:
128 -+ env['LINKFLAGS'] = SCons.Util.CLVar('')
129 - # __RPATH is only set to something ($_RPATH typically) on platforms that support it.
130 - env['LINKCOM'] = '$LINK -o $TARGET $LINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS'
131 - env['LIBDIRPREFIX']='-L'
132 ---
133 -2.17.0
134 -
135
136 diff --git a/dev-util/scons/scons-3.0.1-r1.ebuild b/dev-util/scons/scons-3.0.1-r1.ebuild
137 deleted file mode 100644
138 index 777e651c9df..00000000000
139 --- a/dev-util/scons/scons-3.0.1-r1.ebuild
140 +++ /dev/null
141 @@ -1,71 +0,0 @@
142 -# Copyright 1999-2018 Gentoo Foundation
143 -# Distributed under the terms of the GNU General Public License v2
144 -
145 -EAPI=6
146 -PYTHON_COMPAT=( python2_7 )
147 -PYTHON_REQ_USE="threads(+)"
148 -
149 -inherit distutils-r1
150 -
151 -DESCRIPTION="Extensible Python-based build utility"
152 -HOMEPAGE="http://www.scons.org/"
153 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
154 - doc? (
155 - http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
156 - http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
157 - )
158 - test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
159 -
160 -LICENSE="MIT"
161 -SLOT="0"
162 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
163 -IUSE="doc test"
164 -
165 -S=${WORKDIR}/${P}/src
166 -
167 -PATCHES=(
168 - # support env passthrough for Gentoo ebuilds
169 - "${FILESDIR}"/scons-3.0.1-env-passthrough.patch
170 -)
171 -
172 -src_unpack() {
173 - # use the git directory structure, but put pregenerated release
174 - # inside src/ subdirectory to make our life easier
175 - if use test; then
176 - unpack "${P}.gh.tar.gz"
177 - rm -r "${P}/src" || die
178 - else
179 - mkdir "${P}" || die
180 - fi
181 -
182 - cd "${P}" || die
183 - unpack "${P}.tar.gz"
184 - mv "${P}" src || die
185 -}
186 -
187 -src_prepare() {
188 - # apply patches relatively to top directory
189 - cd "${WORKDIR}/${P}" || die
190 - distutils-r1_src_prepare
191 -
192 - # remove half-broken, useless custom commands
193 - # and fix manpage install location
194 - sed -i -e '/cmdclass/,/}$/d' \
195 - -e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
196 -}
197 -
198 -python_test() {
199 - cd "${WORKDIR}/${P}" || die
200 - "${EPYTHON}" runtest.py -as \
201 - -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
202 - --builddir "${BUILD_DIR}/lib" ||
203 - die "Tests fail with ${EPYTHON}"
204 -}
205 -
206 -python_install_all() {
207 - local DOCS=( {CHANGES,README,RELEASE}.txt )
208 - distutils-r1_python_install_all
209 - rm "${ED%/}/usr/bin/scons.bat" || die
210 -
211 - use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
212 -}
213
214 diff --git a/dev-util/scons/scons-3.0.1-r100.ebuild b/dev-util/scons/scons-3.0.1-r100.ebuild
215 deleted file mode 100644
216 index 0eedf0cbe6d..00000000000
217 --- a/dev-util/scons/scons-3.0.1-r100.ebuild
218 +++ /dev/null
219 @@ -1,73 +0,0 @@
220 -# Copyright 1999-2018 Gentoo Foundation
221 -# Distributed under the terms of the GNU General Public License v2
222 -
223 -EAPI=6
224 -PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
225 -PYTHON_REQ_USE="threads(+)"
226 -
227 -inherit distutils-r1
228 -
229 -DESCRIPTION="Extensible Python-based build utility"
230 -HOMEPAGE="http://www.scons.org/"
231 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
232 - doc? (
233 - http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
234 - http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
235 - )
236 - test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
237 -
238 -LICENSE="MIT"
239 -SLOT="0"
240 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
241 -IUSE="doc test"
242 -
243 -S=${WORKDIR}/${P}/src
244 -
245 -PATCHES=(
246 - # support env passthrough for Gentoo ebuilds
247 - "${FILESDIR}"/scons-3.0.1-env-passthrough.patch
248 - # respect CC, CXX, C*FLAGS, LDFLAGS by default
249 - "${FILESDIR}"/scons-3.0.1-respect-cc-etc-r1.patch
250 -)
251 -
252 -src_unpack() {
253 - # use the git directory structure, but put pregenerated release
254 - # inside src/ subdirectory to make our life easier
255 - if use test; then
256 - unpack "${P}.gh.tar.gz"
257 - rm -r "${P}/src" || die
258 - else
259 - mkdir "${P}" || die
260 - fi
261 -
262 - cd "${P}" || die
263 - unpack "${P}.tar.gz"
264 - mv "${P}" src || die
265 -}
266 -
267 -src_prepare() {
268 - # apply patches relatively to top directory
269 - cd "${WORKDIR}/${P}" || die
270 - distutils-r1_src_prepare
271 -
272 - # remove half-broken, useless custom commands
273 - # and fix manpage install location
274 - sed -i -e '/cmdclass/,/}$/d' \
275 - -e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
276 -}
277 -
278 -python_test() {
279 - cd "${WORKDIR}/${P}" || die
280 - "${EPYTHON}" runtest.py -as \
281 - -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
282 - --builddir "${BUILD_DIR}/lib" ||
283 - die "Tests fail with ${EPYTHON}"
284 -}
285 -
286 -python_install_all() {
287 - local DOCS=( {CHANGES,README,RELEASE}.txt )
288 - distutils-r1_python_install_all
289 - rm "${ED%/}/usr/bin/scons.bat" || die
290 -
291 - use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
292 -}
293
294 diff --git a/dev-util/scons/scons-3.0.1-r3.ebuild b/dev-util/scons/scons-3.0.1-r3.ebuild
295 deleted file mode 100644
296 index 286ff3abba4..00000000000
297 --- a/dev-util/scons/scons-3.0.1-r3.ebuild
298 +++ /dev/null
299 @@ -1,73 +0,0 @@
300 -# Copyright 1999-2018 Gentoo Foundation
301 -# Distributed under the terms of the GNU General Public License v2
302 -
303 -EAPI=6
304 -PYTHON_COMPAT=( python2_7 )
305 -PYTHON_REQ_USE="threads(+)"
306 -
307 -inherit distutils-r1
308 -
309 -DESCRIPTION="Extensible Python-based build utility"
310 -HOMEPAGE="http://www.scons.org/"
311 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
312 - doc? (
313 - http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
314 - http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
315 - )
316 - test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
317 -
318 -LICENSE="MIT"
319 -SLOT="0"
320 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
321 -IUSE="doc test"
322 -
323 -S=${WORKDIR}/${P}/src
324 -
325 -PATCHES=(
326 - # support env passthrough for Gentoo ebuilds
327 - "${FILESDIR}"/scons-3.0.1-env-passthrough.patch
328 - # respect CC, CXX, C*FLAGS, LDFLAGS by default
329 - "${FILESDIR}"/scons-3.0.1-respect-cc-etc-r1.patch
330 -)
331 -
332 -src_unpack() {
333 - # use the git directory structure, but put pregenerated release
334 - # inside src/ subdirectory to make our life easier
335 - if use test; then
336 - unpack "${P}.gh.tar.gz"
337 - rm -r "${P}/src" || die
338 - else
339 - mkdir "${P}" || die
340 - fi
341 -
342 - cd "${P}" || die
343 - unpack "${P}.tar.gz"
344 - mv "${P}" src || die
345 -}
346 -
347 -src_prepare() {
348 - # apply patches relatively to top directory
349 - cd "${WORKDIR}/${P}" || die
350 - distutils-r1_src_prepare
351 -
352 - # remove half-broken, useless custom commands
353 - # and fix manpage install location
354 - sed -i -e '/cmdclass/,/}$/d' \
355 - -e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
356 -}
357 -
358 -python_test() {
359 - cd "${WORKDIR}/${P}" || die
360 - "${EPYTHON}" runtest.py -as \
361 - -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
362 - --builddir "${BUILD_DIR}/lib" ||
363 - die "Tests fail with ${EPYTHON}"
364 -}
365 -
366 -python_install_all() {
367 - local DOCS=( {CHANGES,README,RELEASE}.txt )
368 - distutils-r1_python_install_all
369 - rm "${ED%/}/usr/bin/scons.bat" || die
370 -
371 - use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
372 -}
373
374 diff --git a/dev-util/scons/scons-3.0.1.ebuild b/dev-util/scons/scons-3.0.1.ebuild
375 deleted file mode 100644
376 index 1a6f2c59360..00000000000
377 --- a/dev-util/scons/scons-3.0.1.ebuild
378 +++ /dev/null
379 @@ -1,66 +0,0 @@
380 -# Copyright 1999-2018 Gentoo Foundation
381 -# Distributed under the terms of the GNU General Public License v2
382 -
383 -EAPI=6
384 -PYTHON_COMPAT=( python2_7 )
385 -PYTHON_REQ_USE="threads(+)"
386 -
387 -inherit distutils-r1
388 -
389 -DESCRIPTION="Extensible Python-based build utility"
390 -HOMEPAGE="http://www.scons.org/"
391 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
392 - doc? (
393 - http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
394 - http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
395 - )
396 - test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
397 -
398 -LICENSE="MIT"
399 -SLOT="0"
400 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
401 -IUSE="doc test"
402 -
403 -S=${WORKDIR}/${P}/src
404 -
405 -src_unpack() {
406 - # use the git directory structure, but put pregenerated release
407 - # inside src/ subdirectory to make our life easier
408 - if use test; then
409 - unpack "${P}.gh.tar.gz"
410 - rm -r "${P}/src" || die
411 - else
412 - mkdir "${P}" || die
413 - fi
414 -
415 - cd "${P}" || die
416 - unpack "${P}.tar.gz"
417 - mv "${P}" src || die
418 -}
419 -
420 -src_prepare() {
421 - # apply patches relatively to top directory
422 - cd "${WORKDIR}/${P}" || die
423 - distutils-r1_src_prepare
424 -
425 - # remove half-broken, useless custom commands
426 - # and fix manpage install location
427 - sed -i -e '/cmdclass/,/}$/d' \
428 - -e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
429 -}
430 -
431 -python_test() {
432 - cd "${WORKDIR}/${P}" || die
433 - "${EPYTHON}" runtest.py -as \
434 - -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
435 - --builddir "${BUILD_DIR}/lib" ||
436 - die "Tests fail with ${EPYTHON}"
437 -}
438 -
439 -python_install_all() {
440 - local DOCS=( {CHANGES,README,RELEASE}.txt )
441 - distutils-r1_python_install_all
442 - rm "${ED%/}/usr/bin/scons.bat" || die
443 -
444 - use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
445 -}
446
447 diff --git a/dev-util/scons/scons-3.0.3.ebuild b/dev-util/scons/scons-3.0.3.ebuild
448 deleted file mode 100644
449 index 7ba0a5a8dbf..00000000000
450 --- a/dev-util/scons/scons-3.0.3.ebuild
451 +++ /dev/null
452 @@ -1,74 +0,0 @@
453 -# Copyright 1999-2019 Gentoo Authors
454 -# Distributed under the terms of the GNU General Public License v2
455 -
456 -EAPI=6
457 -PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
458 -PYTHON_REQ_USE="threads(+)"
459 -
460 -inherit distutils-r1
461 -
462 -DESCRIPTION="Extensible Python-based build utility"
463 -HOMEPAGE="http://www.scons.org/"
464 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
465 - doc? (
466 - http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
467 - http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
468 - )
469 - test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
470 -
471 -LICENSE="MIT"
472 -SLOT="0"
473 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
474 -IUSE="doc test"
475 -RESTRICT="!test? ( test )"
476 -
477 -S=${WORKDIR}/${P}/src
478 -
479 -PATCHES=(
480 - # support env passthrough for Gentoo ebuilds
481 - "${FILESDIR}"/scons-3.0.1-env-passthrough.patch
482 - # respect CC, CXX, C*FLAGS, LDFLAGS by default
483 - "${FILESDIR}"/scons-3.0.3-respect-cc-etc-r1.patch
484 -)
485 -
486 -src_unpack() {
487 - # use the git directory structure, but put pregenerated release
488 - # inside src/ subdirectory to make our life easier
489 - if use test; then
490 - unpack "${P}.gh.tar.gz"
491 - rm -r "${P}/src" || die
492 - else
493 - mkdir "${P}" || die
494 - fi
495 -
496 - cd "${P}" || die
497 - unpack "${P}.tar.gz"
498 - mv "${P}" src || die
499 -}
500 -
501 -src_prepare() {
502 - # apply patches relatively to top directory
503 - cd "${WORKDIR}/${P}" || die
504 - distutils-r1_src_prepare
505 -
506 - # remove half-broken, useless custom commands
507 - # and fix manpage install location
508 - sed -i -e '/cmdclass/,/},$/d' \
509 - -e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
510 -}
511 -
512 -python_test() {
513 - cd "${WORKDIR}/${P}" || die
514 - "${EPYTHON}" runtest.py -as \
515 - -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
516 - --builddir "${BUILD_DIR}/lib" ||
517 - die "Tests fail with ${EPYTHON}"
518 -}
519 -
520 -python_install_all() {
521 - local DOCS=( {CHANGES,README,RELEASE}.txt )
522 - distutils-r1_python_install_all
523 - rm "${ED%/}/usr/bin/scons.bat" || die
524 -
525 - use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
526 -}