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/, dev-util/scons/files/
Date: Tue, 02 Jan 2018 06:19:10
Message-Id: 1514873930.f5485f46b11f031b4daafe2913fb5d5379dbd448.mgorny@gentoo
1 commit: f5485f46b11f031b4daafe2913fb5d5379dbd448
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 1 22:07:22 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 2 06:18:50 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5485f46
7
8 dev-util/scons: Clean old up
9
10 dev-util/scons/Manifest | 6 ----
11 dev-util/scons/files/scons-2.1.0-jython.patch | 13 -------
12 dev-util/scons/scons-2.3.5.ebuild | 52 ---------------------------
13 dev-util/scons/scons-2.5.0.ebuild | 52 ---------------------------
14 4 files changed, 123 deletions(-)
15
16 diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
17 index 982130e3e07..278a64060b6 100644
18 --- a/dev-util/scons/Manifest
19 +++ b/dev-util/scons/Manifest
20 @@ -1,12 +1,6 @@
21 -DIST scons-2.3.5-user.html 1280097 BLAKE2B 8739b670a9d1f8351b6c7435adb8016af52f5b802942161b18ae217478dddc778d624c59aeef08b948a3a1cd46afaa1765020bf8f3aadd26696c649c46f878f9 SHA512 e2c80beacd03f4071e33f8084e499e54c8529e68ec02b972d0d0944b6e096437fd70f59339ebba652cc5539475e1b4eb8b80e4a3d188413ca5181af9ae5b70d3
22 -DIST scons-2.3.5-user.pdf 2505997 BLAKE2B 4df89d653fe0dff18676fd0ead12c994bf90aa5c3b450b97dbb156c00a14175f7df0cd11208e6de2ef8a9b6a5f7324bbcd0ee484b84545432925ba3c3a44c058 SHA512 137ab2d3b1cab6821f2d8a8fde33406e2a7d46a4c26eec9de1073d3c03f49e1d485ae7884ed3cd2e41a0e3d2ef457e103d782dc1deb01a280c48e4f5e7e68f1e
23 -DIST scons-2.3.5.tar.gz 631619 BLAKE2B 4725c274b53751dcbd6bc20b05798565fca9401755a1f40b6dced512ee34a6cd21d796b55a4c8ae22c9521f7d80688e16e3d5d921e1bd8921fbd3c6cc95529a3 SHA512 aad0213d70c06b02d647a4de4a4fdcd9970e7bda6f3ba0b33e9ba05677af617302b3a557e7cb13560c9057c3b11fbc27cf5e8e7511297058ad9599a04c8381a3
24 DIST scons-2.4.1-user.html 1110981 BLAKE2B 3c2c7c3bb283e18e63b5dfe64928c2821ceb74ac6d5f4c4fc08f0ceb98ef25f6114308d02d65be0ee8231e367556bdce0f76f1f37bb9d3c1ab813a653fda2f54 SHA512 e73caa3daedb5da419a417dbec73a3958da162311e9ad09a7d5e9d6989686b24cf5c1b34fdb1d547a43de1da36e99566e6c367fde05af032a2d1000a7e12270c
25 DIST scons-2.4.1-user.pdf 2527773 BLAKE2B 16c9a90fd57af7552f8d05fcf018ed99b76d29c148169dee4fd610aa40e439448f5a7a6e8ba8d72830a605a26141927f5dcd1643f99a1bfe9433d87350e96569 SHA512 d53d41e51096d1923e168054d335da1498e9ca338e39aef7985967f839656d368b65a8b979dac701ca1c529deeff4a79f402f058d23ef4e658f849ce0784eb45
26 DIST scons-2.4.1.tar.gz 638990 BLAKE2B 44084dd396d8cbe63da59aed706cda7342bbe51dd4f78bd324ad6ce822ae45b9da1099400e1dfeafdb2e4e8f1906e88be423598cc2c2915a1544f37285b31297 SHA512 bd0830719dfc0c2e8620ec767ee6342af74a170cd895acda2995761eafe52e1efa9471626fcaedb0dd9a779ef9bb9b4306bd6cd3c2a5bd7bd2500018b40653e0
27 -DIST scons-2.5.0-user.html 1111090 BLAKE2B 80a4c7230861a52678610df382f31f6d03a2c6b3ff016921b971b52a9960e2e57c922f3b0afdb4a20429cf1f6056f8de4a1727ac97b41f7196a99ccb5573aa46 SHA512 650be28d9be4322b51d31c001ffce339aa926dd3aa2b59c4e16e34151c26f0aa62f9d7a7407d0bcf1ae0e5f10e2e31a5adb66a7a189afac084101c6b0dc209e4
28 -DIST scons-2.5.0-user.pdf 2527810 BLAKE2B 1f94dde46c828f3e1ac44f90c78dc95ed7aa644393c9def5d3f1f009c6fa8b445685cdf07d91b2b9b81978a39d5ef77bd6a121966c37a699f2efd6f4587412b0 SHA512 f8572db6d2fb4e6c4814d785fcde0a2c0bbe647265bf8b8904c315cf46af60636f273843d757f630b9a70f33762cca7010c4dc475143be670ee1c008e6be9155
29 -DIST scons-2.5.0.tar.gz 619991 BLAKE2B 3bbf5b1411bdacbad821076ebff859f229589f62f771d1e4e6f4010c539ac9c863f6705b8be36c3e63a64e3a5fe325450787754e39adedd728987de6f7073d1e SHA512 abb0069976390182b77dbf6f20819c30ccf5fe9f58032eef7694ef408dceb63cfd1d1be69e7c0bced8a179297243b1a93924dd5064cd7c123ea118619bb53572
30 DIST scons-2.5.1-user.html 1112180 BLAKE2B 93df42b296d1be6ffcb73143c5ec9f46225e3e9d07154cf8f703d5f624d2996d85569ff302093a7a73dc0001cfeddf49ee9e57d9a1939d3c6b4689f8773e3ede SHA512 5be58a6bba4b92fc51f0b271fd7e08b820dda10775aaa40a012c0e54d485e02ebf6d0d0be379bd90980a9b496e86a951c8760a4a90107fb3b8f422e874e46046
31 DIST scons-2.5.1-user.pdf 2522755 BLAKE2B 0dbf4ec98cd1dfb4889595762fdf57c2988a6784d75f8c3ac53e79d686b745ae4dd7b674ce34d61255c798e203fb6de93eaaf936a4842b27990350fa73b6bd46 SHA512 0bd7f67a1355ec33125bef87ce1bc352bda5b0befd9809673a427851c843191d74930b4ca9add705152393521f81d926595d173b0101013da216217dc5b64397
32 DIST scons-2.5.1.tar.gz 620909 BLAKE2B 021e02583dab06a859e46d164be79dcaa49a1a383c5d3fb9baa64afabb793e049b7ebefff1bbbcc8be1f364ca5c64e1a9c7ef937c32407853e39f4d84a91e51d SHA512 0e39f7f22a6c4ecc13edcd843b050754da5ded5371b3a8b406395f7b53dd280f95f804707eec271f8de3624d06f5b4ba3cc788dc4eb891cad224a163544f51b9
33
34 diff --git a/dev-util/scons/files/scons-2.1.0-jython.patch b/dev-util/scons/files/scons-2.1.0-jython.patch
35 deleted file mode 100644
36 index ca04e12031e..00000000000
37 --- a/dev-util/scons/files/scons-2.1.0-jython.patch
38 +++ /dev/null
39 @@ -1,13 +0,0 @@
40 -http://scons.tigris.org/issues/show_bug.cgi?id=2791
41 -
42 ---- setup.py
43 -+++ setup.py
44 -@@ -325,7 +325,7 @@
45 - self.copy_scons(src, scons_version_bat)
46 -
47 - # --- distutils copy/paste ---
48 -- if os.name == 'posix':
49 -+ if hasattr(os, 'chmod'):
50 - # Set the executable bits (owner, group, and world) on
51 - # all the scripts we just installed.
52 - for file in self.get_outputs():
53
54 diff --git a/dev-util/scons/scons-2.3.5.ebuild b/dev-util/scons/scons-2.3.5.ebuild
55 deleted file mode 100644
56 index 2c581c3b0cb..00000000000
57 --- a/dev-util/scons/scons-2.3.5.ebuild
58 +++ /dev/null
59 @@ -1,52 +0,0 @@
60 -# Copyright 1999-2015 Gentoo Foundation
61 -# Distributed under the terms of the GNU General Public License v2
62 -
63 -EAPI=5
64 -PYTHON_COMPAT=( python2_7 pypy )
65 -PYTHON_REQ_USE="threads(+)"
66 -
67 -inherit distutils-r1
68 -
69 -DESCRIPTION="Extensible Python-based build utility"
70 -HOMEPAGE="http://www.scons.org/"
71 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
72 - doc? ( http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
73 - http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html )"
74 -
75 -LICENSE="MIT"
76 -SLOT="0"
77 -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
78 -IUSE="doc"
79 -
80 -PATCHES=( "${FILESDIR}/${PN}-2.1.0-jython.patch" )
81 -
82 -python_prepare_all() {
83 - # https://bugs.gentoo.org/show_bug.cgi?id=361061
84 - sed -i -e "s|/usr/local/bin:/opt/bin:/bin:/usr/bin|${EPREFIX}/usr/local/bin:${EPREFIX}/opt/bin:${EPREFIX}/bin:${EPREFIX}/usr/bin:/usr/local/bin:/opt/bin:/bin:/usr/bin|g" engine/SCons/Platform/posix.py || die
85 - # and make sure the build system doesn't "force" /usr/local/ :(
86 - sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die
87 -
88 - distutils-r1_python_prepare_all
89 -}
90 -
91 -python_install() {
92 - distutils-r1_python_install \
93 - --standard-lib \
94 - --no-version-script \
95 - --install-data "${EPREFIX}"/usr/share
96 -}
97 -
98 -python_install_all() {
99 - local DOCS=( {CHANGES,README,RELEASE}.txt )
100 - distutils-r1_python_install_all
101 -
102 - use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
103 -}
104 -
105 -src_install() {
106 - distutils-r1_src_install
107 -
108 - # Build system does not use build_scripts properly.
109 - # http://scons.tigris.org/issues/show_bug.cgi?id=2891
110 - python_replicate_script "${ED}"usr/bin/scons{,ign,-time}
111 -}
112
113 diff --git a/dev-util/scons/scons-2.5.0.ebuild b/dev-util/scons/scons-2.5.0.ebuild
114 deleted file mode 100644
115 index 1229463da8c..00000000000
116 --- a/dev-util/scons/scons-2.5.0.ebuild
117 +++ /dev/null
118 @@ -1,52 +0,0 @@
119 -# Copyright 1999-2016 Gentoo Foundation
120 -# Distributed under the terms of the GNU General Public License v2
121 -
122 -EAPI=6
123 -PYTHON_COMPAT=( python2_7 pypy )
124 -PYTHON_REQ_USE="threads(+)"
125 -
126 -inherit distutils-r1
127 -
128 -DESCRIPTION="Extensible Python-based build utility"
129 -HOMEPAGE="http://www.scons.org/"
130 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
131 - doc? ( http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
132 - http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html )"
133 -
134 -LICENSE="MIT"
135 -SLOT="0"
136 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
137 -IUSE="doc"
138 -
139 -#PATCHES=( )
140 -
141 -python_prepare_all() {
142 - # https://bugs.gentoo.org/show_bug.cgi?id=361061
143 - sed -i -e "s|/usr/local/bin:/opt/bin:/bin:/usr/bin|${EPREFIX}/usr/local/bin:${EPREFIX}/opt/bin:${EPREFIX}/bin:${EPREFIX}/usr/bin:/usr/local/bin:/opt/bin:/bin:/usr/bin|g" engine/SCons/Platform/posix.py || die
144 - # and make sure the build system doesn't "force" /usr/local/ :(
145 - sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die
146 -
147 - distutils-r1_python_prepare_all
148 -}
149 -
150 -python_install() {
151 - distutils-r1_python_install \
152 - --standard-lib \
153 - --no-version-script \
154 - --install-data "${EPREFIX}"/usr/share
155 -}
156 -
157 -python_install_all() {
158 - local DOCS=( {CHANGES,README,RELEASE}.txt )
159 - distutils-r1_python_install_all
160 -
161 - use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
162 -}
163 -
164 -src_install() {
165 - distutils-r1_src_install
166 -
167 - # Build system does not use build_scripts properly.
168 - # http://scons.tigris.org/issues/show_bug.cgi?id=2891
169 - python_replicate_script "${ED}"usr/bin/scons{,ign,-time}
170 -}