gentoo resync : 19.03.2019

3 files changed, 3 insertions, 16 deletions

diff --git a/profiles/arch/amd64-fbsd/clang/package.use.force b/profiles/arch/amd64-fbsd/clang/package.use.force
index 4706847d448c..36c6e4aadf94 100644
--- a/profiles/arch/amd64-fbsd/clang/package.use.force
+++ b/profiles/arch/amd64-fbsd/clang/package.use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Force building libc++ over libcxxrt.
@@ -12,9 +12,6 @@ sys-libs/libcxx static-libs abi_x86_32
 # libcxx on this profile. Mask the other ssl providers.
 net-misc/curl ssl curl_ssl_openssl
 
-# We obviously need clang
-sys-devel/llvm clang static-analyzer default-compiler-rt default-libcxx
-
 # o-flag-munging is required to compile dev-libs/libgcrypt with clang.
 # https://bugs.gentoo.org/629410
 dev-libs/libgcrypt o-flag-munging
diff --git a/profiles/arch/amd64-fbsd/package.use.force b/profiles/arch/amd64-fbsd/package.use.force
index 6c7737109a3a..3b36252505ee 100644
--- a/profiles/arch/amd64-fbsd/package.use.force
+++ b/profiles/arch/amd64-fbsd/package.use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (09 Mar 2018)
@@ -12,6 +12,7 @@ sys-apps/sandbox abi_x86_32
 
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # 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/arch/amd64-fbsd/package.use.mask b/profiles/arch/amd64-fbsd/package.use.mask
index 74c81944764f..ec4e5b7ad705 100644
--- a/profiles/arch/amd64-fbsd/package.use.mask
+++ b/profiles/arch/amd64-fbsd/package.use.mask
@@ -89,17 +89,6 @@ virtual/notification-daemon kde
 # Requires USE=seccomp that is masked in this profile.
 net-libs/gnutls test-full
 
-# Michał Górny <mgorny@gentoo.org> (20 Jan 2018)
-# Needs sys-libs/libomp which is not keyworded. Leaving the decision
-# whether sys-libs/libomp should eventually be keyworded to when new
-# LLVM is going to be keyworded.
-<sys-devel/clang-runtime-4 openmp
-
-# Michał Górny <mgorny@gentoo.org> (20 Jan 2018)
-# Needs dev-ml/ocaml-ctypes which is not keyworded. Newer versions
-# no longer have the flag, so no point in keywording it for old.
-sys-devel/llvm ocaml
-
 # Ulrich Müller <ulm@gentoo.org> (23 Oct 2017)
 # Needs net-mail/mailutils which is not keyworded, bug #635216.
 app-editors/emacs mailutils