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: Sun, 08 Sep 2019 06:43:50
Message-Id: 1567923293.01c695fdfdab0cc4c9227eb23876ce4d806753ad.mgorny@gentoo
1 commit: 01c695fdfdab0cc4c9227eb23876ce4d806753ad
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 8 06:14:53 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 8 06:14:53 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01c695fd
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 | 7 ----
13 dev-util/scons/scons-2.5.1.ebuild | 55 ----------------------------
14 dev-util/scons/scons-3.0.4.ebuild | 75 ---------------------------------------
15 3 files changed, 137 deletions(-)
16
17 diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
18 index 258deab5139..121a5da411d 100644
19 --- a/dev-util/scons/Manifest
20 +++ b/dev-util/scons/Manifest
21 @@ -1,10 +1,3 @@
22 -DIST scons-2.5.1-user.html 1112180 BLAKE2B 93df42b296d1be6ffcb73143c5ec9f46225e3e9d07154cf8f703d5f624d2996d85569ff302093a7a73dc0001cfeddf49ee9e57d9a1939d3c6b4689f8773e3ede SHA512 5be58a6bba4b92fc51f0b271fd7e08b820dda10775aaa40a012c0e54d485e02ebf6d0d0be379bd90980a9b496e86a951c8760a4a90107fb3b8f422e874e46046
23 -DIST scons-2.5.1-user.pdf 2522755 BLAKE2B 0dbf4ec98cd1dfb4889595762fdf57c2988a6784d75f8c3ac53e79d686b745ae4dd7b674ce34d61255c798e203fb6de93eaaf936a4842b27990350fa73b6bd46 SHA512 0bd7f67a1355ec33125bef87ce1bc352bda5b0befd9809673a427851c843191d74930b4ca9add705152393521f81d926595d173b0101013da216217dc5b64397
24 -DIST scons-2.5.1.tar.gz 620909 BLAKE2B 021e02583dab06a859e46d164be79dcaa49a1a383c5d3fb9baa64afabb793e049b7ebefff1bbbcc8be1f364ca5c64e1a9c7ef937c32407853e39f4d84a91e51d SHA512 0e39f7f22a6c4ecc13edcd843b050754da5ded5371b3a8b406395f7b53dd280f95f804707eec271f8de3624d06f5b4ba3cc788dc4eb891cad224a163544f51b9
25 -DIST scons-3.0.4-user.html 1127751 BLAKE2B 5bafa81d075c063cc8c0c4d147fdf7573834e7b0af9099b7b68d7cf3c8872061b7ecc93e7119723eaa9d393e4463744a9e9bd8074ce28d8b518d366a11e4a215 SHA512 f3bc5591b90fb05420b00a110d32921394b867255b3925fab97420b864579702a956237983fb5b0a25d2f6d0268493b0f1819fbcb6f1027cc10ad7b59e2836a3
26 -DIST scons-3.0.4-user.pdf 2561758 BLAKE2B aefd100912345f399e52d805bc2f01846f0bcdfb31524212e69fb41713c193a233a30dcea9133e35001a145ce62b84c648b6d57856c0d5dfa019974546cb4d82 SHA512 03b9e1e8b60ca07986956f1e5c63d56573222ea303bed1976167239b4e9ad73056776a80c7fe2529987aa90856c35bc1c858d1a445f34e7964b675e700845e71
27 -DIST scons-3.0.4.gh.tar.gz 5500498 BLAKE2B 2157141d70f0f6d80606a0d53e0b6b99f72ac6d5f8b63e8825c1f484eb5c92979b50e897d2aadc2b201ee6f06a0d1df00ab272b96cc303c34f75124123f40a90 SHA512 d57924f0e7713ec2e5d7159fbf0078947aa5ce49f7cdf7a4ea47c19efbce7ec335a5e5448e200240be1095655c5c25f1466285f0bed5bdadeb2673845b23c4f5
28 -DIST scons-3.0.4.tar.gz 652334 BLAKE2B 742909dcc598780c7ca7884c2403d9fa0cab44228c6597975157148f460dadf789d3c6aaa36125815ea8fc5ba70538ede56542cbecc656c2918341e2827657b3 SHA512 064a604939460fa85aa247776e5a2083ce98cac5f49f6035886d207f5cf167255756ee10cc00dd8228278d0d1efbed2afd8793bf3ca736a3ac970fabc3c4b627
29 DIST scons-3.0.5-user.html 1130793 BLAKE2B 24bf6d5d566fe3c06879b797a77df5eda738246ddf5631ee3f0f49c3c44a53916a8cd5bd075bcffa350e1b5c99f53f81f229d4f74bcc871572a02a0dfafefada SHA512 1b9c965fac6b792e049ad1975e104d40ff6b99fe4bd247aa375955daaebb46e2ed42afb8484dad652df71b695b7db2ee92df34dc0f1d3372d55fad0d27c4b78d
30 DIST scons-3.0.5-user.pdf 2562305 BLAKE2B 48c206386f163a2779b27ede1b77783067a695e7f59255473343ddd3a19c4d39ceb7c7e5ccf819f76eda9282f5fb8d36bd0250a4a18f5e9d1a65fd3148276173 SHA512 443855ecddd1bc56f06b150da5d7b276a4dfe5ff8c5376b3c35b73f8281a89583308ddd138e120e33f67afa2cdd1b9a1366a533306ba4dfa460f439e4a2f33b4
31 DIST scons-3.0.5.gh.tar.gz 5510846 BLAKE2B 64489a9335a9aa0e2b58a78c6bba613de41d7035f03e8b5b1c1db8aae92e54808f1bd5ad4e97b8481db0f5276c184040663ec31d7307c30a6b092c860c0bb1c0 SHA512 afd4e3d5a76c009f7a3f55934c2d479c611df5713fdaf60aaa9860fc685f95a314bbe54df92fcbca3570dc9a5b244dcf08bf63ce0cef837c3767a37628abae02
32
33 diff --git a/dev-util/scons/scons-2.5.1.ebuild b/dev-util/scons/scons-2.5.1.ebuild
34 deleted file mode 100644
35 index bb60b4875ce..00000000000
36 --- a/dev-util/scons/scons-2.5.1.ebuild
37 +++ /dev/null
38 @@ -1,55 +0,0 @@
39 -# Copyright 1999-2018 Gentoo Foundation
40 -# Distributed under the terms of the GNU General Public License v2
41 -
42 -EAPI=6
43 -PYTHON_COMPAT=( python2_7 pypy )
44 -PYTHON_REQ_USE="threads(+)"
45 -
46 -inherit distutils-r1 prefix
47 -
48 -DESCRIPTION="Extensible Python-based build utility"
49 -HOMEPAGE="http://www.scons.org/"
50 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
51 - doc? ( http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
52 - http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html )"
53 -
54 -LICENSE="MIT"
55 -SLOT="0"
56 -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"
57 -IUSE="doc"
58 -
59 -#PATCHES=( )
60 -
61 -python_prepare_all() {
62 - # bug #361061
63 - if use prefix ; then
64 - eapply "${FILESDIR}"/scons-2.5.1-respect-path.patch
65 - eprefixify engine/SCons/Platform/posix.py
66 - fi
67 - # and make sure the build system doesn't "force" /usr/local/ :(
68 - sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die
69 -
70 - distutils-r1_python_prepare_all
71 -}
72 -
73 -python_install() {
74 - distutils-r1_python_install \
75 - --standard-lib \
76 - --no-version-script \
77 - --install-data "${EPREFIX}"/usr/share
78 -}
79 -
80 -python_install_all() {
81 - local DOCS=( {CHANGES,README,RELEASE}.txt )
82 - distutils-r1_python_install_all
83 -
84 - use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
85 -}
86 -
87 -src_install() {
88 - distutils-r1_src_install
89 -
90 - # Build system does not use build_scripts properly.
91 - # http://scons.tigris.org/issues/show_bug.cgi?id=2891
92 - python_replicate_script "${ED}"usr/bin/scons{,ign,-time}
93 -}
94
95 diff --git a/dev-util/scons/scons-3.0.4.ebuild b/dev-util/scons/scons-3.0.4.ebuild
96 deleted file mode 100644
97 index 78790a3eb13..00000000000
98 --- a/dev-util/scons/scons-3.0.4.ebuild
99 +++ /dev/null
100 @@ -1,75 +0,0 @@
101 -# Copyright 1999-2019 Gentoo Authors
102 -# Distributed under the terms of the GNU General Public License v2
103 -
104 -EAPI=6
105 -PYTHON_COMPAT=( python{2_7,3_{5,6}} )
106 -PYTHON_REQ_USE="threads(+)"
107 -
108 -inherit distutils-r1
109 -
110 -DESCRIPTION="Extensible Python-based build utility"
111 -HOMEPAGE="http://www.scons.org/"
112 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
113 - doc? (
114 - http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
115 - http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
116 - )
117 - test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
118 -
119 -LICENSE="MIT"
120 -SLOT="0"
121 -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"
122 -IUSE="doc test"
123 -# unresolved & unpredictable test failures
124 -RESTRICT="test"
125 -
126 -S=${WORKDIR}/${P}/src
127 -
128 -PATCHES=(
129 - # support env passthrough for Gentoo ebuilds
130 - "${FILESDIR}"/scons-3.0.1-env-passthrough.patch
131 - # respect CC, CXX, C*FLAGS, LDFLAGS by default
132 - "${FILESDIR}"/scons-3.0.3-respect-cc-etc-r1.patch
133 -)
134 -
135 -src_unpack() {
136 - # use the git directory structure, but put pregenerated release
137 - # inside src/ subdirectory to make our life easier
138 - if use test; then
139 - unpack "${P}.gh.tar.gz"
140 - rm -r "${P}/src" || die
141 - else
142 - mkdir "${P}" || die
143 - fi
144 -
145 - cd "${P}" || die
146 - unpack "${P}.tar.gz"
147 - mv "${P}" src || die
148 -}
149 -
150 -src_prepare() {
151 - # apply patches relatively to top directory
152 - cd "${WORKDIR}/${P}" || die
153 - distutils-r1_src_prepare
154 -
155 - # remove half-broken, useless custom commands
156 - # and fix manpage install location
157 - sed -i -e '/cmdclass/,/},$/d' \
158 - -e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
159 -}
160 -
161 -python_test() {
162 - cd "${WORKDIR}/${P}" || die
163 - "${EPYTHON}" runtest.py -as \
164 - -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
165 - --builddir "${BUILD_DIR}/lib" ||
166 - die "Tests fail with ${EPYTHON}"
167 -}
168 -
169 -python_install_all() {
170 - local DOCS=( {CHANGES,README,RELEASE}.txt )
171 - distutils-r1_python_install_all
172 - rm "${ED%/}/usr/bin/scons.bat" || die
173 -
174 - use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
175 -}