commit: 82a7903bb07a391b7efd153342fabedebda4075f Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Thu Jan 6 11:02:28 2022 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Thu Jan 6 11:02:28 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82a7903b
profiles: remove amd64-fbsd/x86-fbsd keywords Closes: https://github.com/gentoo/gentoo/pull/23649 Signed-off-by: David Seifert <soap <AT> gentoo.org> profiles/arch/base/make.defaults | 4 ++-- profiles/arch/base/use.mask | 4 +--- profiles/embedded/make.defaults | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/profiles/arch/base/make.defaults b/profiles/arch/base/make.defaults index bbab57a07425..9abd9bab3d01 100644 --- a/profiles/arch/base/make.defaults +++ b/profiles/arch/base/make.defaults @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 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-solaris x86-winnt" +USE_EXPAND_VALUES_ARCH="alpha amd64 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-linux x86-solaris x86-winnt" PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ARCH USE_EXPAND_VALUES_ARCH" diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask index 497a91c05748..b401aee243d9 100644 --- a/profiles/arch/base/use.mask +++ b/profiles/arch/base/use.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Michał Górny <[email protected]> (2021-01-07) @@ -223,7 +223,6 @@ apparmor # Mask flags that correspond to all possible ARCH values. alpha amd64 -amd64-fbsd arm arm64 hppa @@ -236,4 +235,3 @@ riscv s390 sparc x86 -x86-fbsd diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults index a86ce015b4d4..9a78933d6fd1 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-solaris x86-winnt" +USE_EXPAND_VALUES_ARCH="alpha amd64 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-linux x86-solaris x86-winnt" USE_EXPAND_VALUES_ELIBC="bionic Cygwin Darwin glibc mingw musl SunOS Winnt" USE_EXPAND_VALUES_KERNEL="Darwin linux SunOS Winnt" USE_EXPAND_VALUES_USERLAND="BSD GNU"
