Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, profiles/prefix/darwin/macos/10.13/x86/, ...
Date: Wed, 06 Jan 2021 16:02:53
Message-Id: 1609948965.75712aea0939827c4efbd5b2eae81e29f66404e6.grobian@gentoo
1 commit: 75712aea0939827c4efbd5b2eae81e29f66404e6
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 6 16:01:25 2021 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 6 16:02:45 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75712aea
7
8 profiles: drop x86-macos
9
10 Reality is, people having access to a machine that supports this are
11 rare, bootstrapping to such machines is broken, and even if it would
12 work, the usefulness is zero.
13
14 So drop it, 32-bits Intel macOS is dead.
15
16 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
17
18 profiles/arch.list | 1 -
19 profiles/prefix/darwin/macos/10.11/x86/eapi | 1 -
20 .../prefix/darwin/macos/10.11/x86/make.defaults | 5 ----
21 .../prefix/darwin/macos/10.11/x86/package.mask | 9 -------
22 .../darwin/macos/10.11/x86/package.use.force | 6 -----
23 .../prefix/darwin/macos/10.11/x86/package.use.mask | 4 ---
24 profiles/prefix/darwin/macos/10.11/x86/parent | 2 --
25 profiles/prefix/darwin/macos/10.11/x86/use.mask | 30 ----------------------
26 profiles/prefix/darwin/macos/10.13/x86/eapi | 1 -
27 .../prefix/darwin/macos/10.13/x86/make.defaults | 5 ----
28 .../prefix/darwin/macos/10.13/x86/package.mask | 9 -------
29 .../darwin/macos/10.13/x86/package.use.force | 6 -----
30 .../prefix/darwin/macos/10.13/x86/package.use.mask | 4 ---
31 profiles/prefix/darwin/macos/10.13/x86/parent | 2 --
32 profiles/prefix/darwin/macos/10.13/x86/use.mask | 30 ----------------------
33 .../prefix/darwin/macos/arch/x64/make.defaults | 2 +-
34 profiles/prefix/darwin/macos/arch/x64/package.mask | 5 +---
35 .../prefix/darwin/macos/arch/x64/package.use.mask | 6 +----
36 profiles/prefix/darwin/macos/arch/x86/eapi | 1 -
37 .../prefix/darwin/macos/arch/x86/make.defaults | 16 ------------
38 profiles/prefix/darwin/macos/arch/x86/package.mask | 5 ----
39 .../prefix/darwin/macos/arch/x86/package.use.force | 12 ---------
40 .../prefix/darwin/macos/arch/x86/package.use.mask | 13 ----------
41 profiles/prefix/darwin/macos/arch/x86/use.force | 6 -----
42 profiles/prefix/darwin/macos/arch/x86/use.mask | 6 -----
43 profiles/profiles.desc | 3 ---
44 26 files changed, 3 insertions(+), 187 deletions(-)
45
46 diff --git a/profiles/arch.list b/profiles/arch.list
47 index fd0f7494ce4..0c9a0540efa 100644
48 --- a/profiles/arch.list
49 +++ b/profiles/arch.list
50 @@ -21,7 +21,6 @@ ppc64-linux
51 x86-linux
52 arm64-macos
53 ppc-macos
54 -x86-macos
55 x64-macos
56 sparc-solaris
57 sparc64-solaris
58
59 diff --git a/profiles/prefix/darwin/macos/10.11/x86/eapi b/profiles/prefix/darwin/macos/10.11/x86/eapi
60 deleted file mode 100644
61 index 7ed6ff82de6..00000000000
62 --- a/profiles/prefix/darwin/macos/10.11/x86/eapi
63 +++ /dev/null
64 @@ -1 +0,0 @@
65 -5
66
67 diff --git a/profiles/prefix/darwin/macos/10.11/x86/make.defaults b/profiles/prefix/darwin/macos/10.11/x86/make.defaults
68 deleted file mode 100644
69 index f77f7777f6c..00000000000
70 --- a/profiles/prefix/darwin/macos/10.11/x86/make.defaults
71 +++ /dev/null
72 @@ -1,5 +0,0 @@
73 -# Copyright 1999-2016 Gentoo Foundation
74 -# Distributed under the terms of the GNU General Public License v2
75 -
76 -CHOST="i686-apple-darwin15"
77 -CHOST_x86="${CHOST}"
78
79 diff --git a/profiles/prefix/darwin/macos/10.11/x86/package.mask b/profiles/prefix/darwin/macos/10.11/x86/package.mask
80 deleted file mode 100644
81 index 0873d990d5a..00000000000
82 --- a/profiles/prefix/darwin/macos/10.11/x86/package.mask
83 +++ /dev/null
84 @@ -1,9 +0,0 @@
85 -# Copyright 1999-2015 Gentoo Foundation
86 -# Distributed under the terms of the GNU General Public License v2
87 -
88 -# The Carbon interface has been removed entirely in Lion, only tk-8.6
89 -# will come with Cocoa support. If you must have tk, you'll have to
90 -# force USE=-aqua, but don't report bugs for incompatabilities you might
91 -# encounter.
92 -# NOTE: keep this mask synced with arch/x64
93 -<dev-lang/tk-8.6
94
95 diff --git a/profiles/prefix/darwin/macos/10.11/x86/package.use.force b/profiles/prefix/darwin/macos/10.11/x86/package.use.force
96 deleted file mode 100644
97 index 92945515d46..00000000000
98 --- a/profiles/prefix/darwin/macos/10.11/x86/package.use.force
99 +++ /dev/null
100 @@ -1,6 +0,0 @@
101 -# Copyright 1999-2015 Gentoo Foundation
102 -# Distributed under the terms of the GNU General Public License v2
103 -
104 -# Elias Pipping <pipping@g.o> (2007-09-30)
105 -# compiles with -aqua, doesn't work, though
106 -media-video/mplayer aqua
107
108 diff --git a/profiles/prefix/darwin/macos/10.11/x86/package.use.mask b/profiles/prefix/darwin/macos/10.11/x86/package.use.mask
109 deleted file mode 100644
110 index 76d41d1fd86..00000000000
111 --- a/profiles/prefix/darwin/macos/10.11/x86/package.use.mask
112 +++ /dev/null
113 @@ -1,4 +0,0 @@
114 -# Copyright 1999-2015 Gentoo Foundation
115 -# Distributed under the terms of the GNU General Public License v2
116 -
117 -
118
119 diff --git a/profiles/prefix/darwin/macos/10.11/x86/parent b/profiles/prefix/darwin/macos/10.11/x86/parent
120 deleted file mode 100644
121 index 93220d09682..00000000000
122 --- a/profiles/prefix/darwin/macos/10.11/x86/parent
123 +++ /dev/null
124 @@ -1,2 +0,0 @@
125 -..
126 -../../arch/x86
127
128 diff --git a/profiles/prefix/darwin/macos/10.11/x86/use.mask b/profiles/prefix/darwin/macos/10.11/x86/use.mask
129 deleted file mode 100644
130 index 3e153701348..00000000000
131 --- a/profiles/prefix/darwin/macos/10.11/x86/use.mask
132 +++ /dev/null
133 @@ -1,30 +0,0 @@
134 -# Copyright 1999-2017 Gentoo Foundation
135 -# Distributed under the terms of the GNU General Public License v2
136 -
137 -# This file masks out USE flags that are simply NOT allowed in the default
138 -# x86 profile. This works, for example, if another architecture's
139 -# profile have a USE flag associated with (such as altivec, mmx, etc).
140 -
141 -# Unmask x86 instruction sets
142 --cpu_flags_x86_mmx
143 --cpu_flags_x86_mmxext
144 --cpu_flags_x86_sse
145 --cpu_flags_x86_sse2
146 --cpu_flags_x86_ssse3
147 --svga
148 -
149 -# Unmask nvidia XvMC support
150 --nvidia
151 -
152 -# Unmask dev-db/oracle-instantclient-basic support
153 --oci8-instant-client
154 -
155 -# Modular X: unmask for architectures on which they are available
156 --input_devices_synaptics
157 --input_devices_vmmouse
158 --input_devices_wacom
159 --video_cards_nvidia
160 --video_cards_vmware
161 -
162 -# ibm is only used for ppc64 stuff
163 -ibm
164
165 diff --git a/profiles/prefix/darwin/macos/10.13/x86/eapi b/profiles/prefix/darwin/macos/10.13/x86/eapi
166 deleted file mode 100644
167 index 7ed6ff82de6..00000000000
168 --- a/profiles/prefix/darwin/macos/10.13/x86/eapi
169 +++ /dev/null
170 @@ -1 +0,0 @@
171 -5
172
173 diff --git a/profiles/prefix/darwin/macos/10.13/x86/make.defaults b/profiles/prefix/darwin/macos/10.13/x86/make.defaults
174 deleted file mode 100644
175 index 801d199034d..00000000000
176 --- a/profiles/prefix/darwin/macos/10.13/x86/make.defaults
177 +++ /dev/null
178 @@ -1,5 +0,0 @@
179 -# Copyright 1999-2017 Gentoo Foundation
180 -# Distributed under the terms of the GNU General Public License v2
181 -
182 -CHOST="i686-apple-darwin17"
183 -CHOST_x86="${CHOST}"
184
185 diff --git a/profiles/prefix/darwin/macos/10.13/x86/package.mask b/profiles/prefix/darwin/macos/10.13/x86/package.mask
186 deleted file mode 100644
187 index 94be57326b1..00000000000
188 --- a/profiles/prefix/darwin/macos/10.13/x86/package.mask
189 +++ /dev/null
190 @@ -1,9 +0,0 @@
191 -# Copyright 1999-2017 Gentoo Foundation
192 -# Distributed under the terms of the GNU General Public License v2
193 -
194 -# The Carbon interface has been removed entirely in Lion, only tk-8.6
195 -# will come with Cocoa support. If you must have tk, you'll have to
196 -# force USE=-aqua, but don't report bugs for incompatabilities you might
197 -# encounter.
198 -# NOTE: keep this mask synced with arch/x64
199 -<dev-lang/tk-8.6
200
201 diff --git a/profiles/prefix/darwin/macos/10.13/x86/package.use.force b/profiles/prefix/darwin/macos/10.13/x86/package.use.force
202 deleted file mode 100644
203 index 2424c49290d..00000000000
204 --- a/profiles/prefix/darwin/macos/10.13/x86/package.use.force
205 +++ /dev/null
206 @@ -1,6 +0,0 @@
207 -# Copyright 1999-2017 Gentoo Foundation
208 -# Distributed under the terms of the GNU General Public License v2
209 -
210 -# Elias Pipping <pipping@g.o> (2007-09-30)
211 -# compiles with -aqua, doesn't work, though
212 -media-video/mplayer aqua
213
214 diff --git a/profiles/prefix/darwin/macos/10.13/x86/package.use.mask b/profiles/prefix/darwin/macos/10.13/x86/package.use.mask
215 deleted file mode 100644
216 index 70e5d808db3..00000000000
217 --- a/profiles/prefix/darwin/macos/10.13/x86/package.use.mask
218 +++ /dev/null
219 @@ -1,4 +0,0 @@
220 -# Copyright 1999-2017 Gentoo Foundation
221 -# Distributed under the terms of the GNU General Public License v2
222 -
223 -
224
225 diff --git a/profiles/prefix/darwin/macos/10.13/x86/parent b/profiles/prefix/darwin/macos/10.13/x86/parent
226 deleted file mode 100644
227 index 93220d09682..00000000000
228 --- a/profiles/prefix/darwin/macos/10.13/x86/parent
229 +++ /dev/null
230 @@ -1,2 +0,0 @@
231 -..
232 -../../arch/x86
233
234 diff --git a/profiles/prefix/darwin/macos/10.13/x86/use.mask b/profiles/prefix/darwin/macos/10.13/x86/use.mask
235 deleted file mode 100644
236 index 3e153701348..00000000000
237 --- a/profiles/prefix/darwin/macos/10.13/x86/use.mask
238 +++ /dev/null
239 @@ -1,30 +0,0 @@
240 -# Copyright 1999-2017 Gentoo Foundation
241 -# Distributed under the terms of the GNU General Public License v2
242 -
243 -# This file masks out USE flags that are simply NOT allowed in the default
244 -# x86 profile. This works, for example, if another architecture's
245 -# profile have a USE flag associated with (such as altivec, mmx, etc).
246 -
247 -# Unmask x86 instruction sets
248 --cpu_flags_x86_mmx
249 --cpu_flags_x86_mmxext
250 --cpu_flags_x86_sse
251 --cpu_flags_x86_sse2
252 --cpu_flags_x86_ssse3
253 --svga
254 -
255 -# Unmask nvidia XvMC support
256 --nvidia
257 -
258 -# Unmask dev-db/oracle-instantclient-basic support
259 --oci8-instant-client
260 -
261 -# Modular X: unmask for architectures on which they are available
262 --input_devices_synaptics
263 --input_devices_vmmouse
264 --input_devices_wacom
265 --video_cards_nvidia
266 --video_cards_vmware
267 -
268 -# ibm is only used for ppc64 stuff
269 -ibm
270
271 diff --git a/profiles/prefix/darwin/macos/arch/x64/make.defaults b/profiles/prefix/darwin/macos/arch/x64/make.defaults
272 index f03f6a88c4f..9dee8c00f5f 100644
273 --- a/profiles/prefix/darwin/macos/arch/x64/make.defaults
274 +++ b/profiles/prefix/darwin/macos/arch/x64/make.defaults
275 @@ -12,5 +12,5 @@ DEFAULT_ABI="amd64"
276 ABI="amd64"
277 IUSE_IMPLICIT="abi_x86_64"
278 LIBDIR_amd64="lib"
279 -# We use Clang, let it figure out what is the best to use
280 +# figure out automatically what is the best to use
281 CFLAGS="-march=native"
282
283 diff --git a/profiles/prefix/darwin/macos/arch/x64/package.mask b/profiles/prefix/darwin/macos/arch/x64/package.mask
284 index a1de0b1fec7..acc8b3f1331 100644
285 --- a/profiles/prefix/darwin/macos/arch/x64/package.mask
286 +++ b/profiles/prefix/darwin/macos/arch/x64/package.mask
287 @@ -1,9 +1,6 @@
288 -# Copyright 1999-2012 Gentoo Foundation
289 +# Copyright 1999-2021 Gentoo Authors
290 # Distributed under the terms of the GNU General Public License v2
291
292 -# The 32-bits profile is inherited by the 64-bits one!
293 -# All the Mac OS X profiles inherit from their matching arch profile here.
294 -
295 # The Carbon interface has been removed in the 64-bits userland, only
296 # tk-8.6 will come with Cocoa support. If you must have tk, you'll have
297 # to force USE=-aqua, but don't report bugs for incompatabilities you
298
299 diff --git a/profiles/prefix/darwin/macos/arch/x64/package.use.mask b/profiles/prefix/darwin/macos/arch/x64/package.use.mask
300 index a974e63659b..f0e7d38c642 100644
301 --- a/profiles/prefix/darwin/macos/arch/x64/package.use.mask
302 +++ b/profiles/prefix/darwin/macos/arch/x64/package.use.mask
303 @@ -1,10 +1,6 @@
304 -# Copyright 1999-2017 Gentoo Foundation
305 +# Copyright 1999-2021 Gentoo Authors
306 # Distributed under the terms of the GNU General Public License v2
307
308 -# The 32-bits profile is inherited by the 64-bits one!
309 -# All the Mac OS X profiles inherit from their matching arch profile here.
310 -
311 -
312 # Christoph Junghans <ottoxr@g.o> (2014-12-29)
313 # disable optimized assembly code, bug #529584
314 media-libs/xvid -pic
315
316 diff --git a/profiles/prefix/darwin/macos/arch/x86/eapi b/profiles/prefix/darwin/macos/arch/x86/eapi
317 deleted file mode 100644
318 index 7ed6ff82de6..00000000000
319 --- a/profiles/prefix/darwin/macos/arch/x86/eapi
320 +++ /dev/null
321 @@ -1 +0,0 @@
322 -5
323
324 diff --git a/profiles/prefix/darwin/macos/arch/x86/make.defaults b/profiles/prefix/darwin/macos/arch/x86/make.defaults
325 deleted file mode 100644
326 index 8870f4ea4e4..00000000000
327 --- a/profiles/prefix/darwin/macos/arch/x86/make.defaults
328 +++ /dev/null
329 @@ -1,16 +0,0 @@
330 -# Copyright 1999-2017 Gentoo Foundation
331 -# Distributed under the terms of the GNU General Public License v2
332 -
333 -ARCH="x86-macos"
334 -ACCEPT_KEYWORDS="~x86-macos"
335 -
336 -CPU_FLAGS_X86="mmx mmxext sse sse2"
337 -
338 -# multilib build stuff, single ABI (no multilib)
339 -MULTILIB_ABIS="x86"
340 -DEFAULT_ABI="x86"
341 -ABI="x86"
342 -IUSE_IMPLICIT="abi_x86_32"
343 -LIBDIR_x86="lib"
344 -# We use Clang, let it figure out what is the best to use
345 -CFLAGS="-march=native"
346
347 diff --git a/profiles/prefix/darwin/macos/arch/x86/package.mask b/profiles/prefix/darwin/macos/arch/x86/package.mask
348 deleted file mode 100644
349 index 216c87ab637..00000000000
350 --- a/profiles/prefix/darwin/macos/arch/x86/package.mask
351 +++ /dev/null
352 @@ -1,5 +0,0 @@
353 -# Copyright 1999-2016 Gentoo Foundation
354 -# Distributed under the terms of the GNU General Public License v2
355 -
356 -# All the Mac OS X profiles inherit from their matching arch profile here.
357 -
358
359 diff --git a/profiles/prefix/darwin/macos/arch/x86/package.use.force b/profiles/prefix/darwin/macos/arch/x86/package.use.force
360 deleted file mode 100644
361 index e59fb1aa91b..00000000000
362 --- a/profiles/prefix/darwin/macos/arch/x86/package.use.force
363 +++ /dev/null
364 @@ -1,12 +0,0 @@
365 -# Copyright 1999-2019 Gentoo Authors
366 -# Distributed under the terms of the GNU General Public License v2
367 -
368 -# Fabian Groffen <grobian@g.o> (2018-11-29)
369 -# libgcrypt relies on GCC pragma to disable optimisation, but we use Clang
370 -dev-libs/libgcrypt o-flag-munging
371 -
372 -# Fabian Groffen <grobian@g.o> (2016-12-20)
373 -# Force the host target to avoid dependency hell
374 -dev-ml/llvm-ocaml llvm_targets_X86
375 -sys-devel/clang llvm_targets_X86
376 -sys-devel/llvm llvm_targets_X86
377
378 diff --git a/profiles/prefix/darwin/macos/arch/x86/package.use.mask b/profiles/prefix/darwin/macos/arch/x86/package.use.mask
379 deleted file mode 100644
380 index 59fd56b1603..00000000000
381 --- a/profiles/prefix/darwin/macos/arch/x86/package.use.mask
382 +++ /dev/null
383 @@ -1,13 +0,0 @@
384 -# Copyright 1999-2019 Gentoo Authors
385 -# Distributed under the terms of the GNU General Public License v2
386 -
387 -# All the Mac OS X profiles inherit from their matching arch profile here.
388 -
389 -
390 -# Jeremy Olexa <darkside@g.o> (2010-07-29)
391 -# Relocation issues on 32-bit OSX, bug #329859
392 -media-sound/mpg123 cpu_flags_x86_mmx cpu_flags_x86_sse
393 -
394 -# Fabian Groffen <grobian@g.o> (2009-02-01)
395 -# Doesn't compile, bug #257225
396 -media-video/ffmpeg cpu_flags_x86_mmx
397
398 diff --git a/profiles/prefix/darwin/macos/arch/x86/use.force b/profiles/prefix/darwin/macos/arch/x86/use.force
399 deleted file mode 100644
400 index e5de807ddf5..00000000000
401 --- a/profiles/prefix/darwin/macos/arch/x86/use.force
402 +++ /dev/null
403 @@ -1,6 +0,0 @@
404 -# Copyright 1999-2016 Gentoo Foundation
405 -# Distributed under the terms of the GNU General Public License v2
406 -
407 -# Force the flag corresponding to the default ABI
408 -x86-macos
409 -abi_x86_32
410
411 diff --git a/profiles/prefix/darwin/macos/arch/x86/use.mask b/profiles/prefix/darwin/macos/arch/x86/use.mask
412 deleted file mode 100644
413 index 64aad1244f8..00000000000
414 --- a/profiles/prefix/darwin/macos/arch/x86/use.mask
415 +++ /dev/null
416 @@ -1,6 +0,0 @@
417 -# Copyright 1999-2016 Gentoo Foundation
418 -# Distributed under the terms of the GNU General Public License v2
419 -
420 -# Unmask the flag corresponding to the default ABI
421 --x86-macos
422 --abi_x86_32
423
424 diff --git a/profiles/profiles.desc b/profiles/profiles.desc
425 index 4509608ec41..b9e65d792de 100644
426 --- a/profiles/profiles.desc
427 +++ b/profiles/profiles.desc
428 @@ -288,12 +288,9 @@ arm64-linux default/linux/arm64/17.0/prefix/kernel-3.2+ exp
429
430 # Mac OS X Profiles
431 ppc-macos prefix/darwin/macos/10.5/ppc/gcc exp
432 -x86-macos prefix/darwin/macos/10.11/x86 exp
433 x64-macos prefix/darwin/macos/10.11/x64 exp
434 -x86-macos prefix/darwin/macos/10.13/x86 exp
435 x64-macos prefix/darwin/macos/10.13/x64 exp
436 x64-macos prefix/darwin/macos/10.13/x64/gcc exp
437 -x86-macos prefix/darwin/macos/10.14/x86 exp
438 x64-macos prefix/darwin/macos/10.14/x64 exp
439 x64-macos prefix/darwin/macos/10.14/x64/gcc exp
440 x64-macos prefix/darwin/macos/10.15/x64 exp