From fce2f4e2180e091552cb6af48601ee1edd7b71d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Tue, 23 Jan 2018 11:50:57 +0100 Subject: [PATCH] profiles: Remove sparc-fbsd arch and keywords Closes: https://bugs.gentoo.org/644756 Closes: https://github.com/gentoo/gentoo/pull/6935 --- profiles/arch.list | 1 - profiles/arch/base/make.defaults | 4 ++-- profiles/arch/base/use.mask | 3 +-- profiles/embedded/make.defaults | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/profiles/arch.list b/profiles/arch.list index 6b702f1cd2d3e..64e86438046c3 100644 --- a/profiles/arch.list +++ b/profiles/arch.list @@ -14,7 +14,6 @@ riscv s390 sh sparc -sparc-fbsd x86 x86-fbsd diff --git a/profiles/arch/base/make.defaults b/profiles/arch/base/make.defaults index 29f3d360f06dc..d6f8e6b8091eb 100644 --- a/profiles/arch/base/make.defaults +++ b/profiles/arch/base/make.defaults @@ -1,8 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # 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 arm-linux arm64 hppa ia64 m68k m68k-mint mips nios2 ppc ppc64 ppc64-linux ppc-aix ppc-macos riscv s390 sh sparc sparc64-solaris sparc-fbsd sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-linux x86-macos x86-solaris x86-winnt" +USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa ia64 m68k m68k-mint mips nios2 ppc ppc64 ppc64-linux ppc-aix ppc-macos riscv s390 sh sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-linux x86-macos 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 2ef9288fb862d..510e4eee001d6 100644 --- a/profiles/arch/base/use.mask +++ b/profiles/arch/base/use.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # James Le Cuirot (29 Jun 2017) @@ -251,6 +251,5 @@ riscv s390 sh sparc -sparc-fbsd x86 x86-fbsd diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults index 793ae3689176b..b1e80653f29f0 100644 --- a/profiles/embedded/make.defaults +++ b/profiles/embedded/make.defaults @@ -20,7 +20,7 @@ LINGUAS="en" IUSE_IMPLICIT="prefix prefix-chain prefix-guest" USE_EXPAND_UNPREFIXED="ARCH" USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL USERLAND" -USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa ia64 m68k m68k-mint mips nios2 ppc ppc64 ppc64-linux ppc-aix ppc-macos riscv s390 sh sparc sparc64-solaris sparc-fbsd sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-linux x86-macos x86-solaris x86-winnt" +USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa ia64 m68k m68k-mint mips nios2 ppc ppc64 ppc64-linux ppc-aix ppc-macos riscv s390 sh sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x86 x86-cygwin x86-fbsd x86-linux x86-macos 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"