6 files changed, 8 insertions, 16 deletions
diff --git a/profiles/prefix/darwin/macos/arch/ppc/package.use.force b/profiles/prefix/darwin/macos/arch/ppc/package.use.force
index 5b234c4e9499..d0be324c4b1b 100644
--- a/profiles/prefix/darwin/macos/arch/ppc/package.use.force
+++ b/profiles/prefix/darwin/macos/arch/ppc/package.use.force
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Fabian Groffen <grobian@gentoo.org> (20 Dec 2016)
 # Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_PowerPC
 sys-devel/clang llvm_targets_PowerPC
 sys-devel/llvm llvm_targets_PowerPC
diff --git a/profiles/prefix/darwin/macos/arch/x64/package.use.force b/profiles/prefix/darwin/macos/arch/x64/package.use.force
index ef8f6e2272cd..44d3760857a1 100644
--- a/profiles/prefix/darwin/macos/arch/x64/package.use.force
+++ b/profiles/prefix/darwin/macos/arch/x64/package.use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Fabian Groffen <grobian@gentoo.org> (29 Nov 2018)
@@ -7,5 +7,6 @@ dev-libs/libgcrypt o-flag-munging
 
 # Fabian Groffen <grobian@gentoo.org> (20 Dec 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/prefix/darwin/macos/arch/x86/package.use.force b/profiles/prefix/darwin/macos/arch/x86/package.use.force
index ef8f6e2272cd..44d3760857a1 100644
--- a/profiles/prefix/darwin/macos/arch/x86/package.use.force
+++ b/profiles/prefix/darwin/macos/arch/x86/package.use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Fabian Groffen <grobian@gentoo.org> (29 Nov 2018)
@@ -7,5 +7,6 @@ dev-libs/libgcrypt o-flag-munging
 
 # Fabian Groffen <grobian@gentoo.org> (20 Dec 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/prefix/darwin/macos/package.use.force b/profiles/prefix/darwin/macos/package.use.force
index 24696d95b0f3..e90c190aa153 100644
--- a/profiles/prefix/darwin/macos/package.use.force
+++ b/profiles/prefix/darwin/macos/package.use.force
@@ -1,10 +1,6 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Fabian Groffen <grobian@gentoo.org> (31 May 2015)
-# for clang ebuild to work, llvm must build the clang frontend
-sys-devel/llvm clang
-
 # Fabian Groffen <grobian@gentoo.org> (24 Mar 2012)
 # Non-threaded target doesn't exist for Mac OS X Intel
 media-gfx/tachyon threads opengl
diff --git a/profiles/prefix/darwin/package.mask b/profiles/prefix/darwin/package.mask
index df8c57b6683a..8fb33a1b7214 100644
--- a/profiles/prefix/darwin/package.mask
+++ b/profiles/prefix/darwin/package.mask
@@ -1,12 +1,6 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Fabian Groffen <grobian@gentoo.org> (31 May 2015)
-# fails to compile due to some missing compilerrt stuff, hints at asan,
-# not sure what the problem actually is, 3.7 and 3.8 compile just fine
-=sys-devel/llvm-3.6*
-=sys-devel/clang-3.6*
-
 # Fabian Groffen <grobian@gentoo.org> (14 Jan 2014)
 # util-linux has no business on Darwin systems
 sys-apps/util-linux
diff --git a/profiles/prefix/windows/winnt/use.mask b/profiles/prefix/windows/winnt/use.mask
index ac0a32f6af1d..5b60cad0f8a9 100644
--- a/profiles/prefix/windows/winnt/use.mask
+++ b/profiles/prefix/windows/winnt/use.mask
@@ -38,7 +38,6 @@ ipod
 ipv6
 lm_sensors
 ncurses
-netboot
 opengl
 oss
 pcmcia