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, 18 Sep 2020 09:38:22
Message-Id: 1600421882.e0df25e274186ccdd526263d49fad08a4c750d0d.mgorny@gentoo
1 commit: e0df25e274186ccdd526263d49fad08a4c750d0d
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 18 09:29:36 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 18 09:38:02 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0df25e2
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.0.0.ebuild | 87 ---------------------------------------
14 2 files changed, 91 deletions(-)
15
16 diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
17 index 69386a2572a..0cb81b03bfa 100644
18 --- a/dev-util/scons/Manifest
19 +++ b/dev-util/scons/Manifest
20 @@ -6,10 +6,6 @@ DIST scons-3.1.2-user.html 1126908 BLAKE2B 38e7695b6ef1e79b3eed4455fbe84ec1587be
21 DIST scons-3.1.2-user.pdf 2557502 BLAKE2B 1c89d845d23c4e434c9db11d8730121f0b8dc6f2fca21dabe3e7204373cdf743d831a1835731332e39ccd7f3f49da068ba34a33a2937e9dd205e38d9c8b2b321 SHA512 9da887c157cb95f7802cb4b96080b0e56f2ad7663021b8be0839e71d473422fe9dd0dadf0ad1b067160c39511e91c6b3d9aaff8e238bb46b10a03ae89b12e169
22 DIST scons-3.1.2.gh.tar.gz 5534888 BLAKE2B 63e8b069cfddfed6a2ce8bcb7816b51b1881ca7a1a3e552f2eec5ecd1deae80720b0acfb711ab17067efdc9d0e4aea696e9f4eee6b374071bfc60e7bb79cc58a SHA512 b096501ea37e62f596f16b46b4022ad7979f359b10849d4c5fa17731a6c3ec34e0890374de175a8aa7539ae677777142ccf5dfae39a74696efcdbcc00e89bccf
23 DIST scons-3.1.2.tar.gz 668298 BLAKE2B 14251e2bab425dfc31d1d6d9325a67725dae42576d2a5c204f0ff7948aa2da5aadd3fdf03bbbccd615757520fedee5e18ca2ba13aaf07a4ddfec330db4221203 SHA512 bfc0d58d33408a03eb37c1eff166af8139078026e6b43d6274afceac889d0a6743e359e89ad9a30be5ca43aeed26fba92fa4732854750b7d53091ef3e99b3d33
24 -DIST scons-4.0.0-user.html 1414886 BLAKE2B 1005a79040a4e035fa667a7c2f6231300c5fcade558d373eb6af36f4a8fdfcdb9c48ca0e5ecc36add72548f4ce6b904a745cbd6275649e1a1ce0e9172843259d SHA512 d4ce7b528ae714617a20adf49c66beb478d432f33f095ffb05f30038b2295cfe658c1dab421563dfae674bd0d4c343b98058cb8decc5393883675f4c9a7cf5a6
25 -DIST scons-4.0.0-user.pdf 2468838 BLAKE2B 6541fbc9d8f409ccde07746cb2a6e046fe4a4b868c2b6b80401c30c9d99a27acb2a4aedba9f47ba9e4cf8ac62510bec43a9aac33cba6912b837e13baeb996353 SHA512 cc62fd88dc0dda77515328b434492f8dbc0b4f615a2f3bb4841391ded7fbc738050b2ca7308c820d55efa59c28540391bd546ecec909b1fa7df66a944bdaa8aa
26 -DIST scons-4.0.0.gh.tar.gz 5584060 BLAKE2B 316be6af0cf52181391ba3251315a0d7da6024a3c650c3de927ff9db041aba096a95f09a7a13f64f78e20473490eb08fb2b0da191c9c3957fad9113e2d3dab14 SHA512 8277c8ceeba5e9612e8c757b3ab736cf116f66e707f4127b1e09f21d3a71ca7fd13dde0453f73b97c168cd05d8ba97084c010f3dcc1e29bb26ebbbeae9ea8338
27 -DIST scons-4.0.0.tar.gz 2874600 BLAKE2B 439b4e32cb62f5b9546af771eb292a5ff36eddb23fbd169fe065d2dbc3c3916d0551a2807bf765952384e46e036fe4b6142b739b5cfe385217539e1a22daf5ff SHA512 38c8f6600bc5f4b5385eb65ff1e98e8464dcea2a1128173f883a06822eca2e250998c666418a9cbbe2c30ff26da4de3c5fdd68381e68708d93e59bea8680337c
28 DIST scons-4.0.1-user.html 1415152 BLAKE2B 1a94b2ef5e076d883f2960825f055c7cc39cfd1848be797a9519bf94834cd4174d3da3274ef77f64106c1cc182c3f8cef363e3982f5c227d3a6dcbeadbc847c2 SHA512 f1165836ad80c90caa4d936ffc86c0ed20ea4c5e7854c36fee3a2c575b1c05c731d4ece9554e43292e6da30176ad9f31f31cf12f84264307c1494f79b06f43c7
29 DIST scons-4.0.1-user.pdf 2468804 BLAKE2B f0af6bc6b41d972b98e955ee3ccec908aa366eabe31bd01022abe1f6d3a94dd6d7da26f71de23a6dfbcbc7bb4e439463f69bb7e8a5780c1300e3ba508b9eb314 SHA512 0d2733e2f1391083522a64117bfd35a2160d1366382f6f630b26eba36fc12ce797467d5e16efeb3b7f58aa9d853f96ae0d50fe78f59e78d24642b146bc7e565d
30 DIST scons-4.0.1.gh.tar.gz 5578800 BLAKE2B f9ece5eaf1b133219f975e484beb5df726560a38969b8e8ad829781b960b438458bfcd7971333da87560c957675b2a4f8675e757fb0a4268cc4ecf72bb60d45f SHA512 f23c5dfd3c236e9f9f85b986ca64a36dbd85e9f3383cb3577e082a7dea4b83283020fbf064c2d919ab116195c6708fc11f906fcf3b0bc0533a4bc49a4f7371c6
31
32 diff --git a/dev-util/scons/scons-4.0.0.ebuild b/dev-util/scons/scons-4.0.0.ebuild
33 deleted file mode 100644
34 index 3325adc7593..00000000000
35 --- a/dev-util/scons/scons-4.0.0.ebuild
36 +++ /dev/null
37 @@ -1,87 +0,0 @@
38 -# Copyright 1999-2020 Gentoo Authors
39 -# Distributed under the terms of the GNU General Public License v2
40 -
41 -EAPI=7
42 -
43 -DISTUTILS_USE_SETUPTOOLS=rdepend
44 -PYTHON_COMPAT=( python3_{6,7,8} )
45 -PYTHON_REQ_USE="threads(+)"
46 -
47 -inherit distutils-r1
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 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
62 -IUSE="doc test"
63 -RESTRICT="!test? ( test )"
64 -
65 -DEPEND="
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.0.0-env-passthrough.patch
77 - # respect CC, CXX, C*FLAGS, LDFLAGS by default
78 - "${FILESDIR}"/scons-4.0.0-respect-cc-etc-r1.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 - # remove half-broken, useless custom commands
99 - # and fix manpage install location
100 - sed -i -e '/cmdclass/,/},$/d' \
101 - -e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
102 -}
103 -
104 -python_test() {
105 - # set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env
106 - local -x GENTOO_SCONS_ENV_PASSTHROUGH=1
107 - # unset some env variables to pass appropriate tests
108 - unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
109 - cd "${WORKDIR}/${P}" || die
110 - "${EPYTHON}" runtest.py -a --passed \
111 - -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
112 - --builddir "${BUILD_DIR}/lib"
113 -
114 - # runtest.py script returns "0" if all tests are passed
115 - # and returns "2" if there are any tests with "no result"
116 - # (i.e. in case if some tools are not installed or it's Windows specific tests)
117 - [[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}"
118 -}
119 -
120 -python_install_all() {
121 - distutils-r1_python_install_all
122 -
123 - use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
124 -}