1 |
commit: e58bb6829e489bb87bd028bbdad91c9aa5d3fd81 |
2 |
Author: Marco Scardovi <marco <AT> scardovi <DOT> com> |
3 |
AuthorDate: Sat Dec 18 20:38:54 2021 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 25 21:51:57 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e58bb682 |
7 |
|
8 |
dev-util/scons: bump to 4.3.0 |
9 |
|
10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
11 |
Signed-off-by: Marco Scardovi <marco <AT> scardovi.com> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/23411 |
13 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
14 |
|
15 |
dev-util/scons/Manifest | 4 ++ |
16 |
dev-util/scons/scons-4.3.0.ebuild | 117 ++++++++++++++++++++++++++++++++++++++ |
17 |
2 files changed, 121 insertions(+) |
18 |
|
19 |
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest |
20 |
index b7a44b312769..ac29b24e5995 100644 |
21 |
--- a/dev-util/scons/Manifest |
22 |
+++ b/dev-util/scons/Manifest |
23 |
@@ -1,3 +1,4 @@ |
24 |
+DIST SCons-4.3.0.tar.gz 3065509 BLAKE2B c36e816357f908d91d532cacde06ed75f57386bb9386bf751dd4ec65580894d8e04ad86380e421008374fa8d8c798323f9f8fb52d7e3d7d85140300a8b388def SHA512 200e087a0a3de7d92d7da6bdb7f2dc0f5d9ff4908a9d6aef2feab8cacfb2e480b7d88efca8f7a84bd39620db2efceaca14f68e6edbf494b1c28b80e35ed14f2c |
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 |
@@ -6,3 +7,6 @@ DIST scons-4.2.0-user.html 1514655 BLAKE2B 036fd0e994d4a3dbf820e864c18f1dda2bb38 |
29 |
DIST scons-4.2.0-user.pdf 2813567 BLAKE2B 2787c9dbecaefccc5f4df2bcccc474ee69e9883f9efa8358f6da00690d9f3fad48f7b696908cbb4cc8f3b9c195f86e11c81301d931783e463d7b2f3a5d528fc3 SHA512 3c36879af2b40190b7b68b162cb39e32e1d7ee01fe063dabe5404d616ab3c9972ebc8a6ce4c0b54a633cfc6825808f93207132ac9c9cd60d9e6ca28e864d5f16 |
30 |
DIST scons-4.2.0.gh.tar.gz 5677165 BLAKE2B c298152db937810ab73afc304a9dc480c185ef0d6e86be5ec7f2022a7d1ed4d3df6ecc18148c3143d4e76a7ea0e50790db1224e66db68bace0759daba7f36a91 SHA512 138573f7203b52fad0527d8d88ceabe182273eff7e4b74125e0d7eda51c44408b07e2c702ee63214519392101d8bbb30013e6d34000eaeb530a816c17396de97 |
31 |
DIST scons-4.2.0.tar.gz 3043008 BLAKE2B 3e69189e45b8ecc956419d3b7d4d36a78ffe219ff87a18d17c511434cf4306635c245107e7978d8f6b86f65bd2ac028fa3c76ab1212806a692d355d7d8036645 SHA512 91d77c858a888621d41432f39970547830997c8e28a851bbab7c0f181afda564abef321befaa33cbe6fd5fc4ac85fa80f2349994956edcc99c027cf7f526bbf0 |
32 |
+DIST scons-4.3.0-user.html 1529873 BLAKE2B 9f5b1bc0ab1d47769d8475ab86b1ae40cfc3643013c6e19692caac50dc37a306b6fd4654ec95c0ad6ad89531e2098253c62db679c9921680955b6dc11c4b247a SHA512 82e2de098c16a354ee3546a39f3ad923d8a40831d69d31266a795f7ce1a8d42e258e650f59f1910f0497d2d053eeb94aa1216c2a2108ca441844445e587490b2 |
33 |
+DIST scons-4.3.0-user.pdf 2851016 BLAKE2B 75282daad0c12da3afa71a0b34447545c2d93ab4fd0589395acd4a04242bb387b35ef2fb0469a57b96eda25258a28f18bd3bb693c6e2b02dc4e6b621a10f0f33 SHA512 c404508ca13e043f8a6717711294fa8cf4a513da7a09285fc6d73342d1f2b4fb0f718faa8fe6ee5b5ab92acf5839dfa05b86004ab0e0fcd7449a31fd5f6f003b |
34 |
+DIST scons-4.3.0.gh.tar.gz 5704869 BLAKE2B a43b509b358d47ee73f7eb714d1239b4fdc33f38483c1a3e72c3a8082242d7bb1a4925958a2648782aa28f4c22a6e018aea8fec1139cf44c59e859f6f902d1d3 SHA512 2d91cf3045797c888d24db38d5b44576e56b271a2c4e9d28d7e16026451865f713990ff9e57fa3e0a1c19603c2d6adbbd1ba36d297c9dcce4db4139fcc51cd62 |
35 |
|
36 |
diff --git a/dev-util/scons/scons-4.3.0.ebuild b/dev-util/scons/scons-4.3.0.ebuild |
37 |
new file mode 100644 |
38 |
index 000000000000..43c7b9958062 |
39 |
--- /dev/null |
40 |
+++ b/dev-util/scons/scons-4.3.0.ebuild |
41 |
@@ -0,0 +1,117 @@ |
42 |
+# Copyright 1999-2021 Gentoo Authors |
43 |
+# Distributed under the terms of the GNU General Public License v2 |
44 |
+ |
45 |
+EAPI=8 |
46 |
+ |
47 |
+DISTUTILS_USE_SETUPTOOLS=rdepend |
48 |
+PYTHON_COMPAT=( python3_{8..10} ) |
49 |
+PYTHON_REQ_USE="threads(+)" |
50 |
+ |
51 |
+inherit distutils-r1 multiprocessing |
52 |
+ |
53 |
+MY_P="SCons-${PV}" |
54 |
+DESCRIPTION="Extensible Python-based build utility" |
55 |
+HOMEPAGE="https://www.scons.org/" |
56 |
+SRC_URI=" |
57 |
+ https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${MY_P}.tar.gz |
58 |
+ doc? ( |
59 |
+ https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf |
60 |
+ https://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html |
61 |
+ ) |
62 |
+ test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )" |
63 |
+S="${WORKDIR}/${P}/src" |
64 |
+ |
65 |
+LICENSE="MIT" |
66 |
+SLOT="0" |
67 |
+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" |
68 |
+IUSE="doc test" |
69 |
+RESTRICT="!test? ( test )" |
70 |
+ |
71 |
+BDEPEND=" |
72 |
+ test? ( |
73 |
+ dev-libs/libxml2[${PYTHON_USEDEP}] |
74 |
+ dev-python/lxml[${PYTHON_USEDEP}] |
75 |
+ ) |
76 |
+" |
77 |
+ |
78 |
+PATCHES=( |
79 |
+ # support env passthrough for Gentoo ebuilds |
80 |
+ "${FILESDIR}"/scons-4.1.0-env-passthrough.patch |
81 |
+ # respect CC, CXX, C*FLAGS, LDFLAGS by default |
82 |
+ "${FILESDIR}"/scons-4.2.0-respect-cc-etc.patch |
83 |
+) |
84 |
+ |
85 |
+src_unpack() { |
86 |
+ # use the git directory structure, but put pregenerated release |
87 |
+ # inside src/ subdirectory to make our life easier |
88 |
+ if use test; then |
89 |
+ unpack "${P}.gh.tar.gz" |
90 |
+ else |
91 |
+ mkdir -p "${P}"/src || die |
92 |
+ fi |
93 |
+ |
94 |
+ tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${MY_P}.tar.gz" || die |
95 |
+} |
96 |
+ |
97 |
+src_prepare() { |
98 |
+ # apply patches relatively to top directory |
99 |
+ cd "${WORKDIR}/${P}" || die |
100 |
+ distutils-r1_src_prepare |
101 |
+ |
102 |
+ if use test; then |
103 |
+ local remove_tests=( |
104 |
+ # TODO: does not respect PATH? |
105 |
+ test/Clang |
106 |
+ # broken |
107 |
+ test/DVIPDF/DVIPDFFLAGS.py |
108 |
+ test/Java/swig-dependencies.py |
109 |
+ test/Java/multi-step.py |
110 |
+ # broken by commas in date, sic! |
111 |
+ test/option/option-v.py |
112 |
+ test/Interactive/version.py |
113 |
+ ) |
114 |
+ |
115 |
+ if ! use amd64 && ! use x86 ; then |
116 |
+ # These tests are currently broken on arm and other non-amd64/x86 platforms |
117 |
+ # Work seems to be ongoing in e.g. https://github.com/SCons/scons/pull/4022 to |
118 |
+ # better plumb up the MSVC tests for alternative arches. |
119 |
+ # Try again after 4.2.0. |
120 |
+ # See also: https://pairlist4.pair.net/pipermail/scons-users/2020-November/008452.html |
121 |
+ # bug #757534 |
122 |
+ remove_tests+=( |
123 |
+ test/MSVS/vs-7.0-scc-files.py |
124 |
+ test/MSVS/vs-7.0-scc-legacy-files.py |
125 |
+ test/MSVS/vs-7.1-scc-files.py |
126 |
+ test/MSVS/vs-7.1-scc-legacy-files.py |
127 |
+ test/MSVS/vs-scc-files.py |
128 |
+ test/MSVS/vs-scc-legacy-files.py |
129 |
+ ) |
130 |
+ fi |
131 |
+ |
132 |
+ rm -r "${remove_tests[@]}" || die |
133 |
+ fi |
134 |
+} |
135 |
+ |
136 |
+python_test() { |
137 |
+ local -x COLUMNS=80 |
138 |
+ # set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env |
139 |
+ local -x GENTOO_SCONS_ENV_PASSTHROUGH=1 |
140 |
+ # unset some env variables to pass appropriate tests |
141 |
+ unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS |
142 |
+ cd "${WORKDIR}/${P}" || die |
143 |
+ "${EPYTHON}" runtest.py -a --passed \ |
144 |
+ -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" |
145 |
+ |
146 |
+ # runtest.py script returns "0" if all tests are passed |
147 |
+ # and returns "2" if there are any tests with "no result" |
148 |
+ # (i.e. in case if some tools are not installed or it's Windows specific tests) |
149 |
+ [[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}" |
150 |
+} |
151 |
+ |
152 |
+python_install_all() { |
153 |
+ rm "${ED}"/usr/*.1 || die |
154 |
+ distutils-r1_python_install_all |
155 |
+ |
156 |
+ doman *.1 |
157 |
+ use doc && dodoc "${DISTDIR}/${P}"-user.{pdf,html} |
158 |
+} |