1 |
commit: 418feef19a1a3027c12ec552909ee0f9cf49ff87 |
2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 26 17:38:56 2019 +0000 |
4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 26 17:41:00 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=418feef1 |
7 |
|
8 |
dev-util/meson: remove old versions |
9 |
|
10 |
Package-Manager: Portage-2.3.58, Repoman-2.3.12 |
11 |
Signed-off-by: William Hubbs <williamh <AT> gentoo.org> |
12 |
|
13 |
dev-util/meson/Manifest | 4 --- |
14 |
dev-util/meson/files/0.48.0-multilib.patch | 48 --------------------------- |
15 |
dev-util/meson/files/0.48.0-test-u.patch | 28 ---------------- |
16 |
dev-util/meson/files/test-llvm.patch | 26 --------------- |
17 |
dev-util/meson/meson-0.46.1.ebuild | 39 ---------------------- |
18 |
dev-util/meson/meson-0.47.1.ebuild | 39 ---------------------- |
19 |
dev-util/meson/meson-0.48.0-r2.ebuild | 52 ------------------------------ |
20 |
dev-util/meson/meson-0.48.1.ebuild | 50 ---------------------------- |
21 |
8 files changed, 286 deletions(-) |
22 |
|
23 |
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest |
24 |
index 36ecd30f910..caeb19cb6c6 100644 |
25 |
--- a/dev-util/meson/Manifest |
26 |
+++ b/dev-util/meson/Manifest |
27 |
@@ -1,7 +1,3 @@ |
28 |
-DIST meson-0.46.1.tar.gz 1203731 BLAKE2B 3b6b78e24a4d1ff3166db5546dda80e8b29236babec51fd5f1e70ba4139f13c4e7b6d2985daccf9ef1bc2e33516b1278ab9c9ea4c7fce775d187450c2498dc76 SHA512 beacd5431f9d6abd85a72b2609cbd913f67829b2eef4712a5b9a151e2d0cad6e2c16b5e42819b93f986705305ed874d26211c315aa930b1695552a9e30de8b98 |
29 |
-DIST meson-0.47.1.tar.gz 1250211 BLAKE2B a1ef5852b432e6856733c25a7ccd225f1a9ff2d1a8f65a38375d13c2c1d93d8e756b2cc2d3528783f18b90598e3f056363822d2400773369457d0801a6e3dd58 SHA512 e5042f0553057eb3a723fd2e17994ff05c2856c0dc22f39f5c5eb68fb56281894a5d13fe9f2e0852b4c934f3f3cbc41e0639ff25db4ab9f352eff95e7d552b8b |
30 |
-DIST meson-0.48.0.tar.gz 1307251 BLAKE2B cafae408a219a8f31b756cae28178480eeadac877a6a694c1369c7524b68b88e606d51823aacde177410fd97c1ad14793a11a6d1a1a97c131d33b1014ca2d5f9 SHA512 99ba4ca4899a3174803e41fe5a010d4be304cf85d7392107c2a6ad65f03d758382b1b9104a0cc54bf6fdba28e7742ecd2b0c299d43be3a66fb1381b77418036b |
31 |
-DIST meson-0.48.1.tar.gz 1310408 BLAKE2B e90c5c0b396883ac516eb3a5de04a1caff084a7f018e3f9b7565ec91e520bf4c0e05a72855b3b35e361623c6bf792e471846a7bac13fabd8b42c5256af017703 SHA512 248856cbab0aba959a01a9759261108baf93eef92d454b9ebb7f54edf1aa3e26f6050e389c9889ca23b19321d835617bacd361fc598b7185f6485bc6a403534c |
32 |
DIST meson-0.48.2.tar.gz 1311011 BLAKE2B 54cb8ca4164238f1c2b77327c330a7615a8d62c63c0cbedcdbe395bf2a99c454407fbc61af8d61d38a85de5dee18e73b98b534a2c9d19cc8f622e25549b84bbf SHA512 beebc90df420c15255c49a13e2f4917934fec8fb2c5b878a59ee0cd2ae46eb05571e995e12b3110b72be89fd11ab4c534ed72aa6d6fe72719ef060df5e75695f |
33 |
DIST meson-0.49.0.tar.gz 1338576 BLAKE2B 6ae3152af337591928232c5dea8331185c8aa7f712019ed3635269544e4506fc0d9195d3d59128c5e5a286aff8ad1e3a0edf3afe28ab469989753c3c988ddae3 SHA512 6aba2a1c1dbf247fc30526215dd499b7c918c19f7f16a7216f5762e95cde39b7cfae2a1ebca1e2ea5323f2f855ed98c99af1b9048aa00bd1ffbe8da20ef2121b |
34 |
DIST meson-0.49.1.tar.gz 1340585 BLAKE2B 7df52f68948c74d4d713d57406a7b496e33740e43ea069b5cb6474a80b94800f8af7983413f3154eb2e6b7f0ea8df51e7359b8b7c6661f454dbb9a21ccf9bdc6 SHA512 cc955509d2c82b12d347f7a670a0e2abf5f6a4455dda3d53ec4abb0930b5f1c4a0ff996223ba5a5333bfec66e5d3fb3448a8187d4640e4b65397fc3e0e43dc72 |
35 |
|
36 |
diff --git a/dev-util/meson/files/0.48.0-multilib.patch b/dev-util/meson/files/0.48.0-multilib.patch |
37 |
deleted file mode 100644 |
38 |
index 0b488f50cd5..00000000000 |
39 |
--- a/dev-util/meson/files/0.48.0-multilib.patch |
40 |
+++ /dev/null |
41 |
@@ -1,48 +0,0 @@ |
42 |
-From 3bb300a76ed4d7a614c4a83ddefe86425040ec13 Mon Sep 17 00:00:00 2001 |
43 |
-From: Dylan Baker <dylan@×××××××××.com> |
44 |
-Date: Mon, 24 Sep 2018 11:08:19 -0700 |
45 |
-Subject: [PATCH] backends: allow running host arch binaries on compatible |
46 |
- build machines |
47 |
- |
48 |
-Meson 0.48.0 some validation for using compiled binaries in custom |
49 |
-targets and generators, which is nice. It didn't take into account |
50 |
-though that as long as the OS is the same, some architectures support |
51 |
-running a related architecture natively (x86_64 can run x86 natively, |
52 |
-for example). |
53 |
- |
54 |
-Fortunately we already have a method for covering this case available |
55 |
-through the Environment class. |
56 |
- |
57 |
-Fixes #4254 |
58 |
---- |
59 |
- mesonbuild/backend/backends.py | 10 ++++++---- |
60 |
- 1 file changed, 6 insertions(+), 4 deletions(-) |
61 |
- |
62 |
-diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py |
63 |
-index 0e7e8e0fe3..ccbbe173fd 100644 |
64 |
---- a/mesonbuild/backend/backends.py |
65 |
-+++ b/mesonbuild/backend/backends.py |
66 |
-@@ -13,6 +13,7 @@ |
67 |
- # limitations under the License. |
68 |
- |
69 |
- import os, pickle, re |
70 |
-+import textwrap |
71 |
- from .. import build |
72 |
- from .. import dependencies |
73 |
- from .. import mesonlib |
74 |
-@@ -731,10 +732,11 @@ def get_regen_filelist(self): |
75 |
- def exe_object_to_cmd_array(self, exe): |
76 |
- if self.environment.is_cross_build() and \ |
77 |
- isinstance(exe, build.BuildTarget) and exe.is_cross: |
78 |
-- if self.environment.exe_wrapper is None: |
79 |
-- s = 'Can not use target %s as a generator because it is cross-built\n' |
80 |
-- s += 'and no exe wrapper is defined. You might want to set it to native instead.' |
81 |
-- s = s % exe.name |
82 |
-+ if self.environment.exe_wrapper is None and self.environment.cross_info.need_exe_wrapper(): |
83 |
-+ s = textwrap.dedent(''' |
84 |
-+ Can not use target {} as a generator because it is cross-built |
85 |
-+ and no exe wrapper is defined or needs_exe_wrapper is true. |
86 |
-+ You might want to set it to native instead.'''.format(exe.name)) |
87 |
- raise MesonException(s) |
88 |
- if isinstance(exe, build.BuildTarget): |
89 |
- exe_arr = [os.path.join(self.environment.get_build_dir(), self.get_target_filename(exe))] |
90 |
|
91 |
diff --git a/dev-util/meson/files/0.48.0-test-u.patch b/dev-util/meson/files/0.48.0-test-u.patch |
92 |
deleted file mode 100644 |
93 |
index 099d4686b96..00000000000 |
94 |
--- a/dev-util/meson/files/0.48.0-test-u.patch |
95 |
+++ /dev/null |
96 |
@@ -1,28 +0,0 @@ |
97 |
-From 99ecedc0930a99fb4d084208964e4c7922a6efec Mon Sep 17 00:00:00 2001 |
98 |
-From: Masanori Kakura <kakurasan@×××××.com> |
99 |
-Date: Tue, 25 Sep 2018 18:04:06 +0900 |
100 |
-Subject: [PATCH] environment: Use os.path.basename() when checking |
101 |
- mesonlib.meson_command |
102 |
- |
103 |
-Without this, when one of Meson's parent directories contains |
104 |
-"python", unexpected option "-u" will be passed to Meson. |
105 |
---- |
106 |
- mesonbuild/environment.py | 2 +- |
107 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
108 |
- |
109 |
-diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py |
110 |
-index 7a44f2fd..a0c2fda4 100644 |
111 |
---- a/mesonbuild/environment.py |
112 |
-+++ b/mesonbuild/environment.py |
113 |
-@@ -375,7 +375,7 @@ class Environment: |
114 |
- |
115 |
- def get_build_command(self, unbuffered=False): |
116 |
- cmd = mesonlib.meson_command[:] |
117 |
-- if unbuffered and 'python' in cmd[0]: |
118 |
-+ if unbuffered and 'python' in os.path.basename(cmd[0]): |
119 |
- cmd.insert(1, '-u') |
120 |
- return cmd |
121 |
- |
122 |
--- |
123 |
-2.19.0 |
124 |
- |
125 |
|
126 |
diff --git a/dev-util/meson/files/test-llvm.patch b/dev-util/meson/files/test-llvm.patch |
127 |
deleted file mode 100644 |
128 |
index af7b9834bf3..00000000000 |
129 |
--- a/dev-util/meson/files/test-llvm.patch |
130 |
+++ /dev/null |
131 |
@@ -1,26 +0,0 @@ |
132 |
-From 40457b1faa2c5b274447838ff1a041a8030c6c22 Mon Sep 17 00:00:00 2001 |
133 |
-From: Mike Gilbert <floppym@g.o> |
134 |
-Date: Sat, 6 Oct 2018 21:11:36 -0400 |
135 |
-Subject: [PATCH] Disable testing of static llvm linkage |
136 |
- |
137 |
-Gentoo doesn't provide static libs for llvm. |
138 |
---- |
139 |
- test cases/frameworks/15 llvm/meson.build | 2 +- |
140 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
141 |
- |
142 |
-diff --git a/test cases/frameworks/15 llvm/meson.build b/test cases/frameworks/15 llvm/meson.build |
143 |
-index e05fddd2..9b38a454 100644 |
144 |
---- a/test cases/frameworks/15 llvm/meson.build |
145 |
-+++ b/test cases/frameworks/15 llvm/meson.build |
146 |
-@@ -20,7 +20,7 @@ if not dep_tinfo.found() |
147 |
- dep_tinfo = cpp.find_library('tinfo', required: false) |
148 |
- endif |
149 |
- |
150 |
--foreach static : [true, false] |
151 |
-+foreach static : [false] |
152 |
- llvm_dep = dependency( |
153 |
- 'llvm', |
154 |
- modules : ['bitwriter', 'asmprinter', 'executionengine', 'target', |
155 |
--- |
156 |
-2.19.0 |
157 |
- |
158 |
|
159 |
diff --git a/dev-util/meson/meson-0.46.1.ebuild b/dev-util/meson/meson-0.46.1.ebuild |
160 |
deleted file mode 100644 |
161 |
index cabc6b2b4e6..00000000000 |
162 |
--- a/dev-util/meson/meson-0.46.1.ebuild |
163 |
+++ /dev/null |
164 |
@@ -1,39 +0,0 @@ |
165 |
-# Copyright 1999-2018 Gentoo Foundation |
166 |
-# Distributed under the terms of the GNU General Public License v2 |
167 |
- |
168 |
-EAPI=6 |
169 |
-PYTHON_COMPAT=( python3_{5,6} ) |
170 |
- |
171 |
-if [[ ${PV} = *9999* ]]; then |
172 |
- EGIT_REPO_URI="https://github.com/mesonbuild/meson" |
173 |
- inherit git-r3 |
174 |
-else |
175 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
176 |
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris" |
177 |
-fi |
178 |
- |
179 |
-inherit distutils-r1 |
180 |
- |
181 |
-DESCRIPTION="Open source build system" |
182 |
-HOMEPAGE="http://mesonbuild.com/" |
183 |
- |
184 |
-LICENSE="Apache-2.0" |
185 |
-SLOT="0" |
186 |
-IUSE="" |
187 |
-RESTRICT="test" |
188 |
- |
189 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" |
190 |
-RDEPEND="" |
191 |
- |
192 |
-python_test() { |
193 |
- ${EPYTHON} run_tests.py || die |
194 |
-} |
195 |
- |
196 |
-python_install_all() { |
197 |
- distutils-r1_python_install_all |
198 |
- |
199 |
- insinto /usr/share/vim/vimfiles |
200 |
- doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax} |
201 |
- insinto /usr/share/zsh/site-functions |
202 |
- doins data/shell-completions/zsh/_meson |
203 |
-} |
204 |
|
205 |
diff --git a/dev-util/meson/meson-0.47.1.ebuild b/dev-util/meson/meson-0.47.1.ebuild |
206 |
deleted file mode 100644 |
207 |
index 6a61d5bc666..00000000000 |
208 |
--- a/dev-util/meson/meson-0.47.1.ebuild |
209 |
+++ /dev/null |
210 |
@@ -1,39 +0,0 @@ |
211 |
-# Copyright 1999-2018 Gentoo Authors |
212 |
-# Distributed under the terms of the GNU General Public License v2 |
213 |
- |
214 |
-EAPI=6 |
215 |
-PYTHON_COMPAT=( python3_{5,6} ) |
216 |
- |
217 |
-if [[ ${PV} = *9999* ]]; then |
218 |
- EGIT_REPO_URI="https://github.com/mesonbuild/meson" |
219 |
- inherit git-r3 |
220 |
-else |
221 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
222 |
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris" |
223 |
-fi |
224 |
- |
225 |
-inherit distutils-r1 |
226 |
- |
227 |
-DESCRIPTION="Open source build system" |
228 |
-HOMEPAGE="http://mesonbuild.com/" |
229 |
- |
230 |
-LICENSE="Apache-2.0" |
231 |
-SLOT="0" |
232 |
-IUSE="" |
233 |
-RESTRICT="test" |
234 |
- |
235 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" |
236 |
-RDEPEND="" |
237 |
- |
238 |
-python_test() { |
239 |
- ${EPYTHON} run_tests.py || die |
240 |
-} |
241 |
- |
242 |
-python_install_all() { |
243 |
- distutils-r1_python_install_all |
244 |
- |
245 |
- insinto /usr/share/vim/vimfiles |
246 |
- doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax} |
247 |
- insinto /usr/share/zsh/site-functions |
248 |
- doins data/shell-completions/zsh/_meson |
249 |
-} |
250 |
|
251 |
diff --git a/dev-util/meson/meson-0.48.0-r2.ebuild b/dev-util/meson/meson-0.48.0-r2.ebuild |
252 |
deleted file mode 100644 |
253 |
index e7fe15297da..00000000000 |
254 |
--- a/dev-util/meson/meson-0.48.0-r2.ebuild |
255 |
+++ /dev/null |
256 |
@@ -1,52 +0,0 @@ |
257 |
-# Copyright 1999-2018 Gentoo Authors |
258 |
-# Distributed under the terms of the GNU General Public License v2 |
259 |
- |
260 |
-EAPI=6 |
261 |
-PYTHON_COMPAT=( python3_{5,6,7} ) |
262 |
- |
263 |
-if [[ ${PV} = *9999* ]]; then |
264 |
- EGIT_REPO_URI="https://github.com/mesonbuild/meson" |
265 |
- inherit git-r3 |
266 |
-else |
267 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
268 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x64-solaris" |
269 |
-fi |
270 |
- |
271 |
-inherit distutils-r1 |
272 |
- |
273 |
-DESCRIPTION="Open source build system" |
274 |
-HOMEPAGE="http://mesonbuild.com/" |
275 |
- |
276 |
-LICENSE="Apache-2.0" |
277 |
-SLOT="0" |
278 |
-IUSE="" |
279 |
- |
280 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" |
281 |
-RDEPEND="${DEPEND}" |
282 |
- |
283 |
-PATCHES=( |
284 |
- "${FILESDIR}"/test-llvm.patch |
285 |
- "${FILESDIR}"/0.48.0-multilib.patch |
286 |
- "${FILESDIR}"/0.48.0-test-u.patch |
287 |
-) |
288 |
- |
289 |
-python_test() { |
290 |
- ( |
291 |
- # test_meson_installed |
292 |
- unset PYTHONDONTWRITEBYTECODE |
293 |
- |
294 |
- # test_cross_file_system_paths |
295 |
- unset XDG_DATA_HOME |
296 |
- |
297 |
- ${EPYTHON} -u run_tests.py |
298 |
- ) || die "Testing failed with ${EPYTHON}" |
299 |
-} |
300 |
- |
301 |
-python_install_all() { |
302 |
- distutils-r1_python_install_all |
303 |
- |
304 |
- insinto /usr/share/vim/vimfiles |
305 |
- doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax} |
306 |
- insinto /usr/share/zsh/site-functions |
307 |
- doins data/shell-completions/zsh/_meson |
308 |
-} |
309 |
|
310 |
diff --git a/dev-util/meson/meson-0.48.1.ebuild b/dev-util/meson/meson-0.48.1.ebuild |
311 |
deleted file mode 100644 |
312 |
index 882072a2fad..00000000000 |
313 |
--- a/dev-util/meson/meson-0.48.1.ebuild |
314 |
+++ /dev/null |
315 |
@@ -1,50 +0,0 @@ |
316 |
-# Copyright 1999-2018 Gentoo Authors |
317 |
-# Distributed under the terms of the GNU General Public License v2 |
318 |
- |
319 |
-EAPI=6 |
320 |
-PYTHON_COMPAT=( python3_{5,6,7} ) |
321 |
- |
322 |
-if [[ ${PV} = *9999* ]]; then |
323 |
- EGIT_REPO_URI="https://github.com/mesonbuild/meson" |
324 |
- inherit git-r3 |
325 |
-else |
326 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
327 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x64-solaris" |
328 |
-fi |
329 |
- |
330 |
-inherit distutils-r1 |
331 |
- |
332 |
-DESCRIPTION="Open source build system" |
333 |
-HOMEPAGE="http://mesonbuild.com/" |
334 |
- |
335 |
-LICENSE="Apache-2.0" |
336 |
-SLOT="0" |
337 |
-IUSE="" |
338 |
- |
339 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" |
340 |
-RDEPEND="${DEPEND}" |
341 |
- |
342 |
-PATCHES=( |
343 |
- "${FILESDIR}"/0.48.0-multilib.patch |
344 |
-) |
345 |
- |
346 |
-python_test() { |
347 |
- ( |
348 |
- # test_meson_installed |
349 |
- unset PYTHONDONTWRITEBYTECODE |
350 |
- |
351 |
- # test_cross_file_system_paths |
352 |
- unset XDG_DATA_HOME |
353 |
- |
354 |
- ${EPYTHON} -u run_tests.py |
355 |
- ) || die "Testing failed with ${EPYTHON}" |
356 |
-} |
357 |
- |
358 |
-python_install_all() { |
359 |
- distutils-r1_python_install_all |
360 |
- |
361 |
- insinto /usr/share/vim/vimfiles |
362 |
- doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax} |
363 |
- insinto /usr/share/zsh/site-functions |
364 |
- doins data/shell-completions/zsh/_meson |
365 |
-} |