commit: 7f9624081b9ffcd81cde0f7e8567afeb0e499813
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 7 08:29:53 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jan 7 08:29:53 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f962408
profiles: drop references to x86-macos
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
profiles/arch/base/make.defaults | 2 +-
profiles/arches.desc | 1 -
profiles/embedded/make.defaults | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/profiles/arch/base/make.defaults b/profiles/arch/base/make.defaults
index 635d0b0db9a..bbab57a0742 100644
--- a/profiles/arch/base/make.defaults
+++ b/profiles/arch/base/make.defaults
@@ -3,6 +3,6 @@
USE_EXPAND_UNPREFIXED="ARCH"
USE_EXPAND_IMPLICIT="ARCH"
-USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm64
arm64-macos hppa ia64 m68k mips ppc ppc64 ppc64-linux ppc-macos riscv s390
sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x64-winnt
x86 x86-fbsd x86-linux x86-macos x86-solaris x86-winnt"
+USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm64
arm64-macos hppa ia64 m68k mips ppc ppc64 ppc64-linux ppc-macos riscv s390
sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x64-winnt
x86 x86-fbsd x86-linux x86-solaris x86-winnt"
PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ARCH USE_EXPAND_VALUES_ARCH"
diff --git a/profiles/arches.desc b/profiles/arches.desc
index af01a5da339..72290c6445e 100644
--- a/profiles/arches.desc
+++ b/profiles/arches.desc
@@ -30,7 +30,6 @@ ppc64-linux testing
x86-linux testing
arm64-macos testing
ppc-macos testing
-x86-macos testing
x64-macos testing
sparc-solaris testing
sparc64-solaris testing
diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults
index d31cb0f7172..5af38683be6 100644
--- a/profiles/embedded/make.defaults
+++ b/profiles/embedded/make.defaults
@@ -23,7 +23,7 @@ LINGUAS="en"
IUSE_IMPLICIT="prefix prefix-guest prefix-stack"
USE_EXPAND_UNPREFIXED="ARCH"
USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL USERLAND"
-USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm64 hppa ia64
m68k mips ppc ppc64 ppc64-linux ppc-macos riscv s390 sparc sparc64-solaris
sparc-solaris x64-cygwin x64-macos x64-solaris x64-winnt x86 x86-fbsd x86-linux
x86-macos x86-solaris x86-winnt"
+USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm64 hppa ia64
m68k mips ppc ppc64 ppc64-linux ppc-macos riscv s390 sparc sparc64-solaris
sparc-solaris x64-cygwin x64-macos x64-solaris x64-winnt x86 x86-fbsd x86-linux
x86-solaris x86-winnt"
USE_EXPAND_VALUES_ELIBC="AIX bionic Cygwin Darwin DragonFly FreeBSD glibc HPUX
Interix mingw mintlib musl NetBSD OpenBSD SunOS uclibc Winnt"
USE_EXPAND_VALUES_KERNEL="AIX Darwin FreeBSD freemint HPUX linux NetBSD
OpenBSD SunOS Winnt"
USE_EXPAND_VALUES_USERLAND="BSD GNU"
