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