commit: 75712aea0939827c4efbd5b2eae81e29f66404e6
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 6 16:01:25 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jan 6 16:02:45 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75712aea
profiles: drop x86-macos
Reality is, people having access to a machine that supports this are
rare, bootstrapping to such machines is broken, and even if it would
work, the usefulness is zero.
So drop it, 32-bits Intel macOS is dead.
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
profiles/arch.list | 1 -
profiles/prefix/darwin/macos/10.11/x86/eapi | 1 -
.../prefix/darwin/macos/10.11/x86/make.defaults | 5 ----
.../prefix/darwin/macos/10.11/x86/package.mask | 9 -------
.../darwin/macos/10.11/x86/package.use.force | 6 -----
.../prefix/darwin/macos/10.11/x86/package.use.mask | 4 ---
profiles/prefix/darwin/macos/10.11/x86/parent | 2 --
profiles/prefix/darwin/macos/10.11/x86/use.mask | 30 ----------------------
profiles/prefix/darwin/macos/10.13/x86/eapi | 1 -
.../prefix/darwin/macos/10.13/x86/make.defaults | 5 ----
.../prefix/darwin/macos/10.13/x86/package.mask | 9 -------
.../darwin/macos/10.13/x86/package.use.force | 6 -----
.../prefix/darwin/macos/10.13/x86/package.use.mask | 4 ---
profiles/prefix/darwin/macos/10.13/x86/parent | 2 --
profiles/prefix/darwin/macos/10.13/x86/use.mask | 30 ----------------------
.../prefix/darwin/macos/arch/x64/make.defaults | 2 +-
profiles/prefix/darwin/macos/arch/x64/package.mask | 5 +---
.../prefix/darwin/macos/arch/x64/package.use.mask | 6 +----
profiles/prefix/darwin/macos/arch/x86/eapi | 1 -
.../prefix/darwin/macos/arch/x86/make.defaults | 16 ------------
profiles/prefix/darwin/macos/arch/x86/package.mask | 5 ----
.../prefix/darwin/macos/arch/x86/package.use.force | 12 ---------
.../prefix/darwin/macos/arch/x86/package.use.mask | 13 ----------
profiles/prefix/darwin/macos/arch/x86/use.force | 6 -----
profiles/prefix/darwin/macos/arch/x86/use.mask | 6 -----
profiles/profiles.desc | 3 ---
26 files changed, 3 insertions(+), 187 deletions(-)
diff --git a/profiles/arch.list b/profiles/arch.list
index fd0f7494ce4..0c9a0540efa 100644
--- a/profiles/arch.list
+++ b/profiles/arch.list
@@ -21,7 +21,6 @@ ppc64-linux
x86-linux
arm64-macos
ppc-macos
-x86-macos
x64-macos
sparc-solaris
sparc64-solaris
diff --git a/profiles/prefix/darwin/macos/10.11/x86/eapi
b/profiles/prefix/darwin/macos/10.11/x86/eapi
deleted file mode 100644
index 7ed6ff82de6..00000000000
--- a/profiles/prefix/darwin/macos/10.11/x86/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/darwin/macos/10.11/x86/make.defaults
b/profiles/prefix/darwin/macos/10.11/x86/make.defaults
deleted file mode 100644
index f77f7777f6c..00000000000
--- a/profiles/prefix/darwin/macos/10.11/x86/make.defaults
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-CHOST="i686-apple-darwin15"
-CHOST_x86="${CHOST}"
diff --git a/profiles/prefix/darwin/macos/10.11/x86/package.mask
b/profiles/prefix/darwin/macos/10.11/x86/package.mask
deleted file mode 100644
index 0873d990d5a..00000000000
--- a/profiles/prefix/darwin/macos/10.11/x86/package.mask
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# The Carbon interface has been removed entirely in Lion, only tk-8.6
-# will come with Cocoa support. If you must have tk, you'll have to
-# force USE=-aqua, but don't report bugs for incompatabilities you might
-# encounter.
-# NOTE: keep this mask synced with arch/x64
-<dev-lang/tk-8.6
diff --git a/profiles/prefix/darwin/macos/10.11/x86/package.use.force
b/profiles/prefix/darwin/macos/10.11/x86/package.use.force
deleted file mode 100644
index 92945515d46..00000000000
--- a/profiles/prefix/darwin/macos/10.11/x86/package.use.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Elias Pipping <[email protected]> (2007-09-30)
-# compiles with -aqua, doesn't work, though
-media-video/mplayer aqua
diff --git a/profiles/prefix/darwin/macos/10.11/x86/package.use.mask
b/profiles/prefix/darwin/macos/10.11/x86/package.use.mask
deleted file mode 100644
index 76d41d1fd86..00000000000
--- a/profiles/prefix/darwin/macos/10.11/x86/package.use.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-
diff --git a/profiles/prefix/darwin/macos/10.11/x86/parent
b/profiles/prefix/darwin/macos/10.11/x86/parent
deleted file mode 100644
index 93220d09682..00000000000
--- a/profiles/prefix/darwin/macos/10.11/x86/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../arch/x86
diff --git a/profiles/prefix/darwin/macos/10.11/x86/use.mask
b/profiles/prefix/darwin/macos/10.11/x86/use.mask
deleted file mode 100644
index 3e153701348..00000000000
--- a/profiles/prefix/darwin/macos/10.11/x86/use.mask
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# This file masks out USE flags that are simply NOT allowed in the default
-# x86 profile. This works, for example, if another architecture's
-# profile have a USE flag associated with (such as altivec, mmx, etc).
-
-# Unmask x86 instruction sets
--cpu_flags_x86_mmx
--cpu_flags_x86_mmxext
--cpu_flags_x86_sse
--cpu_flags_x86_sse2
--cpu_flags_x86_ssse3
--svga
-
-# Unmask nvidia XvMC support
--nvidia
-
-# Unmask dev-db/oracle-instantclient-basic support
--oci8-instant-client
-
-# Modular X: unmask for architectures on which they are available
--input_devices_synaptics
--input_devices_vmmouse
--input_devices_wacom
--video_cards_nvidia
--video_cards_vmware
-
-# ibm is only used for ppc64 stuff
-ibm
diff --git a/profiles/prefix/darwin/macos/10.13/x86/eapi
b/profiles/prefix/darwin/macos/10.13/x86/eapi
deleted file mode 100644
index 7ed6ff82de6..00000000000
--- a/profiles/prefix/darwin/macos/10.13/x86/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/darwin/macos/10.13/x86/make.defaults
b/profiles/prefix/darwin/macos/10.13/x86/make.defaults
deleted file mode 100644
index 801d199034d..00000000000
--- a/profiles/prefix/darwin/macos/10.13/x86/make.defaults
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-CHOST="i686-apple-darwin17"
-CHOST_x86="${CHOST}"
diff --git a/profiles/prefix/darwin/macos/10.13/x86/package.mask
b/profiles/prefix/darwin/macos/10.13/x86/package.mask
deleted file mode 100644
index 94be57326b1..00000000000
--- a/profiles/prefix/darwin/macos/10.13/x86/package.mask
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# The Carbon interface has been removed entirely in Lion, only tk-8.6
-# will come with Cocoa support. If you must have tk, you'll have to
-# force USE=-aqua, but don't report bugs for incompatabilities you might
-# encounter.
-# NOTE: keep this mask synced with arch/x64
-<dev-lang/tk-8.6
diff --git a/profiles/prefix/darwin/macos/10.13/x86/package.use.force
b/profiles/prefix/darwin/macos/10.13/x86/package.use.force
deleted file mode 100644
index 2424c49290d..00000000000
--- a/profiles/prefix/darwin/macos/10.13/x86/package.use.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Elias Pipping <[email protected]> (2007-09-30)
-# compiles with -aqua, doesn't work, though
-media-video/mplayer aqua
diff --git a/profiles/prefix/darwin/macos/10.13/x86/package.use.mask
b/profiles/prefix/darwin/macos/10.13/x86/package.use.mask
deleted file mode 100644
index 70e5d808db3..00000000000
--- a/profiles/prefix/darwin/macos/10.13/x86/package.use.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-
diff --git a/profiles/prefix/darwin/macos/10.13/x86/parent
b/profiles/prefix/darwin/macos/10.13/x86/parent
deleted file mode 100644
index 93220d09682..00000000000
--- a/profiles/prefix/darwin/macos/10.13/x86/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../arch/x86
diff --git a/profiles/prefix/darwin/macos/10.13/x86/use.mask
b/profiles/prefix/darwin/macos/10.13/x86/use.mask
deleted file mode 100644
index 3e153701348..00000000000
--- a/profiles/prefix/darwin/macos/10.13/x86/use.mask
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# This file masks out USE flags that are simply NOT allowed in the default
-# x86 profile. This works, for example, if another architecture's
-# profile have a USE flag associated with (such as altivec, mmx, etc).
-
-# Unmask x86 instruction sets
--cpu_flags_x86_mmx
--cpu_flags_x86_mmxext
--cpu_flags_x86_sse
--cpu_flags_x86_sse2
--cpu_flags_x86_ssse3
--svga
-
-# Unmask nvidia XvMC support
--nvidia
-
-# Unmask dev-db/oracle-instantclient-basic support
--oci8-instant-client
-
-# Modular X: unmask for architectures on which they are available
--input_devices_synaptics
--input_devices_vmmouse
--input_devices_wacom
--video_cards_nvidia
--video_cards_vmware
-
-# ibm is only used for ppc64 stuff
-ibm
diff --git a/profiles/prefix/darwin/macos/arch/x64/make.defaults
b/profiles/prefix/darwin/macos/arch/x64/make.defaults
index f03f6a88c4f..9dee8c00f5f 100644
--- a/profiles/prefix/darwin/macos/arch/x64/make.defaults
+++ b/profiles/prefix/darwin/macos/arch/x64/make.defaults
@@ -12,5 +12,5 @@ DEFAULT_ABI="amd64"
ABI="amd64"
IUSE_IMPLICIT="abi_x86_64"
LIBDIR_amd64="lib"
-# We use Clang, let it figure out what is the best to use
+# figure out automatically what is the best to use
CFLAGS="-march=native"
diff --git a/profiles/prefix/darwin/macos/arch/x64/package.mask
b/profiles/prefix/darwin/macos/arch/x64/package.mask
index a1de0b1fec7..acc8b3f1331 100644
--- a/profiles/prefix/darwin/macos/arch/x64/package.mask
+++ b/profiles/prefix/darwin/macos/arch/x64/package.mask
@@ -1,9 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# The 32-bits profile is inherited by the 64-bits one!
-# All the Mac OS X profiles inherit from their matching arch profile here.
-
# The Carbon interface has been removed in the 64-bits userland, only
# tk-8.6 will come with Cocoa support. If you must have tk, you'll have
# to force USE=-aqua, but don't report bugs for incompatabilities you
diff --git a/profiles/prefix/darwin/macos/arch/x64/package.use.mask
b/profiles/prefix/darwin/macos/arch/x64/package.use.mask
index a974e63659b..f0e7d38c642 100644
--- a/profiles/prefix/darwin/macos/arch/x64/package.use.mask
+++ b/profiles/prefix/darwin/macos/arch/x64/package.use.mask
@@ -1,10 +1,6 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# The 32-bits profile is inherited by the 64-bits one!
-# All the Mac OS X profiles inherit from their matching arch profile here.
-
-
# Christoph Junghans <[email protected]> (2014-12-29)
# disable optimized assembly code, bug #529584
media-libs/xvid -pic
diff --git a/profiles/prefix/darwin/macos/arch/x86/eapi
b/profiles/prefix/darwin/macos/arch/x86/eapi
deleted file mode 100644
index 7ed6ff82de6..00000000000
--- a/profiles/prefix/darwin/macos/arch/x86/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/darwin/macos/arch/x86/make.defaults
b/profiles/prefix/darwin/macos/arch/x86/make.defaults
deleted file mode 100644
index 8870f4ea4e4..00000000000
--- a/profiles/prefix/darwin/macos/arch/x86/make.defaults
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="x86-macos"
-ACCEPT_KEYWORDS="~x86-macos"
-
-CPU_FLAGS_X86="mmx mmxext sse sse2"
-
-# multilib build stuff, single ABI (no multilib)
-MULTILIB_ABIS="x86"
-DEFAULT_ABI="x86"
-ABI="x86"
-IUSE_IMPLICIT="abi_x86_32"
-LIBDIR_x86="lib"
-# We use Clang, let it figure out what is the best to use
-CFLAGS="-march=native"
diff --git a/profiles/prefix/darwin/macos/arch/x86/package.mask
b/profiles/prefix/darwin/macos/arch/x86/package.mask
deleted file mode 100644
index 216c87ab637..00000000000
--- a/profiles/prefix/darwin/macos/arch/x86/package.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# All the Mac OS X profiles inherit from their matching arch profile here.
-
diff --git a/profiles/prefix/darwin/macos/arch/x86/package.use.force
b/profiles/prefix/darwin/macos/arch/x86/package.use.force
deleted file mode 100644
index e59fb1aa91b..00000000000
--- a/profiles/prefix/darwin/macos/arch/x86/package.use.force
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <[email protected]> (2018-11-29)
-# libgcrypt relies on GCC pragma to disable optimisation, but we use Clang
-dev-libs/libgcrypt o-flag-munging
-
-# Fabian Groffen <[email protected]> (2016-12-20)
-# Force the host target to avoid dependency hell
-dev-ml/llvm-ocaml llvm_targets_X86
-sys-devel/clang llvm_targets_X86
-sys-devel/llvm llvm_targets_X86
diff --git a/profiles/prefix/darwin/macos/arch/x86/package.use.mask
b/profiles/prefix/darwin/macos/arch/x86/package.use.mask
deleted file mode 100644
index 59fd56b1603..00000000000
--- a/profiles/prefix/darwin/macos/arch/x86/package.use.mask
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# All the Mac OS X profiles inherit from their matching arch profile here.
-
-
-# Jeremy Olexa <[email protected]> (2010-07-29)
-# Relocation issues on 32-bit OSX, bug #329859
-media-sound/mpg123 cpu_flags_x86_mmx cpu_flags_x86_sse
-
-# Fabian Groffen <[email protected]> (2009-02-01)
-# Doesn't compile, bug #257225
-media-video/ffmpeg cpu_flags_x86_mmx
diff --git a/profiles/prefix/darwin/macos/arch/x86/use.force
b/profiles/prefix/darwin/macos/arch/x86/use.force
deleted file mode 100644
index e5de807ddf5..00000000000
--- a/profiles/prefix/darwin/macos/arch/x86/use.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Force the flag corresponding to the default ABI
-x86-macos
-abi_x86_32
diff --git a/profiles/prefix/darwin/macos/arch/x86/use.mask
b/profiles/prefix/darwin/macos/arch/x86/use.mask
deleted file mode 100644
index 64aad1244f8..00000000000
--- a/profiles/prefix/darwin/macos/arch/x86/use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Unmask the flag corresponding to the default ABI
--x86-macos
--abi_x86_32
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 4509608ec41..b9e65d792de 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -288,12 +288,9 @@ arm64-linux
default/linux/arm64/17.0/prefix/kernel-3.2+ exp
# Mac OS X Profiles
ppc-macos prefix/darwin/macos/10.5/ppc/gcc exp
-x86-macos prefix/darwin/macos/10.11/x86 exp
x64-macos prefix/darwin/macos/10.11/x64 exp
-x86-macos prefix/darwin/macos/10.13/x86 exp
x64-macos prefix/darwin/macos/10.13/x64 exp
x64-macos prefix/darwin/macos/10.13/x64/gcc exp
-x86-macos prefix/darwin/macos/10.14/x86 exp
x64-macos prefix/darwin/macos/10.14/x64 exp
x64-macos prefix/darwin/macos/10.14/x64/gcc exp
x64-macos prefix/darwin/macos/10.15/x64 exp
