Merge updates from master

16 files changed, 7 insertions, 75 deletions

diff --git a/profiles/arch.list b/profiles/arch.list
index 6b702f1cd2d3..64e86438046c 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 29f3d360f06d..d6f8e6b8091e 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 2ef9288fb862..510e4eee001d 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 <chewi@gentoo.org> (29 Jun 2017)
@@ -251,6 +251,5 @@ riscv
 s390
 sh
 sparc
-sparc-fbsd
 x86
 x86-fbsd
diff --git a/profiles/arch/sparc-fbsd/eapi b/profiles/arch/sparc-fbsd/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/arch/sparc-fbsd/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/arch/sparc-fbsd/make.defaults b/profiles/arch/sparc-fbsd/make.defaults
deleted file mode 100644
index bab6ea3e1254..000000000000
--- a/profiles/arch/sparc-fbsd/make.defaults
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# System-wide defaults for the G/FBSD Portage system
-
-ARCH="sparc-fbsd"
-CFLAGS="-O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
-
-ACCEPT_KEYWORDS="~sparc-fbsd sparc-fbsd"
diff --git a/profiles/arch/sparc-fbsd/package.use.force b/profiles/arch/sparc-fbsd/package.use.force
deleted file mode 100644
index dbbc84463184..000000000000
--- a/profiles/arch/sparc-fbsd/package.use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
-# Force the host target to avoid dependency hell
-sys-devel/clang llvm_targets_Sparc
-sys-devel/llvm llvm_targets_Sparc
diff --git a/profiles/arch/sparc-fbsd/parent b/profiles/arch/sparc-fbsd/parent
deleted file mode 100644
index eb001c6e8ab8..000000000000
--- a/profiles/arch/sparc-fbsd/parent
+++ /dev/null
@@ -1 +0,0 @@
-../base
diff --git a/profiles/arch/sparc-fbsd/use.force b/profiles/arch/sparc-fbsd/use.force
deleted file mode 100644
index 0520964ebe4e..000000000000
--- a/profiles/arch/sparc-fbsd/use.force
+++ /dev/null
@@ -1,2 +0,0 @@
-# Force the flag which corresponds to ARCH.
-sparc-fbsd
diff --git a/profiles/arch/sparc-fbsd/use.mask b/profiles/arch/sparc-fbsd/use.mask
deleted file mode 100644
index b76d06524ff8..000000000000
--- a/profiles/arch/sparc-fbsd/use.mask
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-
-# Unmask the flag which corresponds to ARCH.
--sparc-fbsd
-
-acpi
-
-# guile fails to build on sparc
-# Even with the patch from FreeBSD Ports it core dumps :/
-guile
-
-# valgrind hasn't been ported to sparc-fbsd yet
-valgrind
-
-# These should work one day
-avahi
-cairo
-dbus
-gnome
-gnome-keyring
-gtk
-mono
-opengl
-php
-qt4
-tk
-xpm
-X
-
-# Ryan Hill <dirtyepic@gentoo.org>
-# Needs sci-mathematics/glpk
-lpsol
diff --git a/profiles/default/bsd/fbsd/sparc/8.2/eapi b/profiles/default/bsd/fbsd/sparc/8.2/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/bsd/fbsd/sparc/8.2/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/bsd/fbsd/sparc/8.2/make.defaults b/profiles/default/bsd/fbsd/sparc/8.2/make.defaults
deleted file mode 100644
index eaba730f9ddc..000000000000
--- a/profiles/default/bsd/fbsd/sparc/8.2/make.defaults
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-
-CHOST="sparc64-gentoo-freebsd8.2"
diff --git a/profiles/default/bsd/fbsd/sparc/8.2/parent b/profiles/default/bsd/fbsd/sparc/8.2/parent
deleted file mode 100644
index 43010996613b..000000000000
--- a/profiles/default/bsd/fbsd/sparc/8.2/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../releases/freebsd-8.2
diff --git a/profiles/default/bsd/fbsd/sparc/eapi b/profiles/default/bsd/fbsd/sparc/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/bsd/fbsd/sparc/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/bsd/fbsd/sparc/parent b/profiles/default/bsd/fbsd/sparc/parent
deleted file mode 100644
index 134cc7a38402..000000000000
--- a/profiles/default/bsd/fbsd/sparc/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../arch/sparc-fbsd
diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults
index 793ae3689176..b1e80653f29f 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"
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index ae74a8652337..d323534ffc42 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -258,13 +258,12 @@ x86		default/linux/x86/17.0/systemd			stable
 
 # Gentoo/FreeBSD Profiles
 # @MAINTAINER: bsd@gentoo.org
-amd64-fbsd	default/bsd/fbsd/amd64/9.1			dev
+amd64-fbsd	default/bsd/fbsd/amd64/9.1			exp
 amd64-fbsd	default/bsd/fbsd/amd64/11.1			dev
 amd64-fbsd	default/bsd/fbsd/amd64/9.1/clang		exp
 amd64-fbsd	default/bsd/fbsd/amd64/11.1/clang		exp
-sparc-fbsd      default/bsd/fbsd/sparc/8.2                      exp
-x86-fbsd	default/bsd/fbsd/x86/9.1			dev
-x86-fbsd	default/bsd/fbsd/x86/11.1			dev
+x86-fbsd	default/bsd/fbsd/x86/9.1			exp
+x86-fbsd	default/bsd/fbsd/x86/11.1			exp
 
 # Hardened Profiles
 # @MAINTAINER: hardened@gentoo.org