gentoo resync : 25.11.2020

47 files changed, 157 insertions, 98 deletions

diff --git a/profiles/prefix/darwin/macos/10.10/package.mask b/profiles/prefix/darwin/macos/10.10/package.mask
deleted file mode 100644
index c103679ebe56..000000000000
--- a/profiles/prefix/darwin/macos/10.10/package.mask
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/prefix/darwin/macos/10.10/packages b/profiles/prefix/darwin/macos/10.10/packages
deleted file mode 100644
index 9c15af461c72..000000000000
--- a/profiles/prefix/darwin/macos/10.10/packages
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# File a bug if you need these provided for your OS version
--*sys-kernel/xnu-headers
--*sys-libs/darwin-libc-headers
diff --git a/profiles/prefix/darwin/macos/10.11/package.mask b/profiles/prefix/darwin/macos/10.11/package.mask
deleted file mode 100644
index c103679ebe56..000000000000
--- a/profiles/prefix/darwin/macos/10.11/package.mask
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/prefix/darwin/macos/10.11/packages b/profiles/prefix/darwin/macos/10.11/packages
deleted file mode 100644
index 9c15af461c72..000000000000
--- a/profiles/prefix/darwin/macos/10.11/packages
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# File a bug if you need these provided for your OS version
--*sys-kernel/xnu-headers
--*sys-libs/darwin-libc-headers
diff --git a/profiles/prefix/darwin/macos/10.12/package.mask b/profiles/prefix/darwin/macos/10.12/package.mask
deleted file mode 100644
index 2ae88c5d9211..000000000000
--- a/profiles/prefix/darwin/macos/10.12/package.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> (2019-11-11)
-# Unmask versions matching the OS profile
--sys-kernel/xnu-headers:10.12
--sys-libs/darwin-libc-headers:10.12
diff --git a/profiles/prefix/darwin/macos/10.13/package.mask b/profiles/prefix/darwin/macos/10.13/package.mask
deleted file mode 100644
index 1bb624aa74a4..000000000000
--- a/profiles/prefix/darwin/macos/10.13/package.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> (2019-11-11)
-# Unmask versions matching the OS profile
--sys-kernel/xnu-headers:10.13
--sys-libs/darwin-libc-headers:10.13
diff --git a/profiles/prefix/darwin/macos/10.13/x64/gcc/eapi b/profiles/prefix/darwin/macos/10.13/x64/gcc/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.13/x64/gcc/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/darwin/macos/10.13/x64/gcc/parent b/profiles/prefix/darwin/macos/10.13/x64/gcc/parent
new file mode 100644
index 000000000000..5ebbfd24d627
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.13/x64/gcc/parent
@@ -0,0 +1,2 @@
+..
+../../../features/fsf-gcc-nold
diff --git a/profiles/prefix/darwin/macos/10.14/package.mask b/profiles/prefix/darwin/macos/10.14/package.mask
deleted file mode 100644
index e3f098738d17..000000000000
--- a/profiles/prefix/darwin/macos/10.14/package.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> (2019-11-11)
-# Unmask versions matching the OS profile
--sys-kernel/xnu-headers:10.14
--sys-libs/darwin-libc-headers:10.14
diff --git a/profiles/prefix/darwin/macos/10.14/x64/gcc/eapi b/profiles/prefix/darwin/macos/10.14/x64/gcc/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.14/x64/gcc/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/darwin/macos/10.14/x64/gcc/parent b/profiles/prefix/darwin/macos/10.14/x64/gcc/parent
new file mode 100644
index 000000000000..5ebbfd24d627
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.14/x64/gcc/parent
@@ -0,0 +1,2 @@
+..
+../../../features/fsf-gcc-nold
diff --git a/profiles/prefix/darwin/macos/10.15/eapi b/profiles/prefix/darwin/macos/10.15/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.15/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/darwin/macos/10.15/make.defaults b/profiles/prefix/darwin/macos/10.15/make.defaults
new file mode 100644
index 000000000000..8e27d1a15191
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.15/make.defaults
@@ -0,0 +1,4 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+MACOSX_DEPLOYMENT_TARGET="10.15"
diff --git a/profiles/prefix/darwin/macos/10.15/package.use.mask b/profiles/prefix/darwin/macos/10.15/package.use.mask
new file mode 100644
index 000000000000..bdb923686981
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.15/package.use.mask
@@ -0,0 +1,7 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Fabian Groffen <grobian@gentoo.org> (2011-04-10)
+# as long as util-linux installs uuid.h which breaks the system headers
+# (hence we don't) we can't do uuid support here
+x11-libs/libSM -uuid
diff --git a/profiles/prefix/darwin/macos/10.15/parent b/profiles/prefix/darwin/macos/10.15/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.15/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/prefix/darwin/macos/10.15/profile.bashrc b/profiles/prefix/darwin/macos/10.15/profile.bashrc
new file mode 100644
index 000000000000..04d127514c28
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.15/profile.bashrc
@@ -0,0 +1,4 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+export MACOSX_DEPLOYMENT_TARGET=10.15
diff --git a/profiles/prefix/darwin/macos/10.15/x64/eapi b/profiles/prefix/darwin/macos/10.15/x64/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.15/x64/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/darwin/macos/10.15/x64/gcc/eapi b/profiles/prefix/darwin/macos/10.15/x64/gcc/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.15/x64/gcc/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/darwin/macos/10.15/x64/gcc/parent b/profiles/prefix/darwin/macos/10.15/x64/gcc/parent
new file mode 100644
index 000000000000..5ebbfd24d627
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.15/x64/gcc/parent
@@ -0,0 +1,2 @@
+..
+../../../features/fsf-gcc-nold
diff --git a/profiles/prefix/darwin/macos/10.15/x64/make.defaults b/profiles/prefix/darwin/macos/10.15/x64/make.defaults
new file mode 100644
index 000000000000..82bd47eabac0
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.15/x64/make.defaults
@@ -0,0 +1,5 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="x86_64-apple-darwin19"
+CHOST_amd64="${CHOST}"
diff --git a/profiles/prefix/darwin/macos/10.15/x64/parent b/profiles/prefix/darwin/macos/10.15/x64/parent
new file mode 100644
index 000000000000..269f6f48bb15
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.15/x64/parent
@@ -0,0 +1,2 @@
+..
+../../arch/x64
diff --git a/profiles/prefix/darwin/macos/10.15/x64/use.mask b/profiles/prefix/darwin/macos/10.15/x64/use.mask
new file mode 100644
index 000000000000..67647c3611bb
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.15/x64/use.mask
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# This file masks out USE flags that are simply NOT allowed in the default
+# x86 profile.  This works, for example, if another architecture's
+# profile have a USE flag associated with (such as altivec, mmx, etc).
+
+# Unmask x86 instruction sets
+-cpu_flags_x86_mmx
+-cpu_flags_x86_mmxext
+-cpu_flags_x86_sse
+-cpu_flags_x86_sse2
+-cpu_flags_x86_ssse3
+-svga
+
+# Unmask nvidia XvMC support
+-nvidia
+
+# Unmask dev-db/oracle-instantclient-basic support
+-oci8-instant-client
+
+# Modular X: unmask for architectures on which they are available
+-input_devices_synaptics
+-input_devices_vmmouse
+-input_devices_wacom
+-video_cards_nvidia
+-video_cards_vmware
+
+# ibm is only used for ppc64 stuff
+ibm
diff --git a/profiles/prefix/darwin/macos/10.4/packages b/profiles/prefix/darwin/macos/10.4/packages
deleted file mode 100644
index 9c15af461c72..000000000000
--- a/profiles/prefix/darwin/macos/10.4/packages
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# File a bug if you need these provided for your OS version
--*sys-kernel/xnu-headers
--*sys-libs/darwin-libc-headers
diff --git a/profiles/prefix/darwin/macos/10.5/packages b/profiles/prefix/darwin/macos/10.5/packages
deleted file mode 100644
index 9c15af461c72..000000000000
--- a/profiles/prefix/darwin/macos/10.5/packages
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# File a bug if you need these provided for your OS version
--*sys-kernel/xnu-headers
--*sys-libs/darwin-libc-headers
diff --git a/profiles/prefix/darwin/macos/10.6/packages b/profiles/prefix/darwin/macos/10.6/packages
deleted file mode 100644
index 9c15af461c72..000000000000
--- a/profiles/prefix/darwin/macos/10.6/packages
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# File a bug if you need these provided for your OS version
--*sys-kernel/xnu-headers
--*sys-libs/darwin-libc-headers
diff --git a/profiles/prefix/darwin/macos/10.7/packages b/profiles/prefix/darwin/macos/10.7/packages
deleted file mode 100644
index 9c15af461c72..000000000000
--- a/profiles/prefix/darwin/macos/10.7/packages
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# File a bug if you need these provided for your OS version
--*sys-kernel/xnu-headers
--*sys-libs/darwin-libc-headers
diff --git a/profiles/prefix/darwin/macos/10.8/package.mask b/profiles/prefix/darwin/macos/10.8/package.mask
deleted file mode 100644
index c103679ebe56..000000000000
--- a/profiles/prefix/darwin/macos/10.8/package.mask
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/prefix/darwin/macos/10.8/packages b/profiles/prefix/darwin/macos/10.8/packages
deleted file mode 100644
index 9c15af461c72..000000000000
--- a/profiles/prefix/darwin/macos/10.8/packages
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# File a bug if you need these provided for your OS version
--*sys-kernel/xnu-headers
--*sys-libs/darwin-libc-headers
diff --git a/profiles/prefix/darwin/macos/10.9/package.mask b/profiles/prefix/darwin/macos/10.9/package.mask
deleted file mode 100644
index c103679ebe56..000000000000
--- a/profiles/prefix/darwin/macos/10.9/package.mask
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/prefix/darwin/macos/10.9/packages b/profiles/prefix/darwin/macos/10.9/packages
deleted file mode 100644
index 9c15af461c72..000000000000
--- a/profiles/prefix/darwin/macos/10.9/packages
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# File a bug if you need these provided for your OS version
--*sys-kernel/xnu-headers
--*sys-libs/darwin-libc-headers
diff --git a/profiles/prefix/darwin/macos/11.0/eapi b/profiles/prefix/darwin/macos/11.0/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/prefix/darwin/macos/11.0/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/darwin/macos/11.0/make.defaults b/profiles/prefix/darwin/macos/11.0/make.defaults
new file mode 100644
index 000000000000..ad252fcac7f3
--- /dev/null
+++ b/profiles/prefix/darwin/macos/11.0/make.defaults
@@ -0,0 +1,4 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+MACOSX_DEPLOYMENT_TARGET="11.0"
diff --git a/profiles/prefix/darwin/macos/11.0/package.use.mask b/profiles/prefix/darwin/macos/11.0/package.use.mask
new file mode 100644
index 000000000000..bdb923686981
--- /dev/null
+++ b/profiles/prefix/darwin/macos/11.0/package.use.mask
@@ -0,0 +1,7 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Fabian Groffen <grobian@gentoo.org> (2011-04-10)
+# as long as util-linux installs uuid.h which breaks the system headers
+# (hence we don't) we can't do uuid support here
+x11-libs/libSM -uuid
diff --git a/profiles/prefix/darwin/macos/11.0/parent b/profiles/prefix/darwin/macos/11.0/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/prefix/darwin/macos/11.0/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/prefix/darwin/macos/11.0/profile.bashrc b/profiles/prefix/darwin/macos/11.0/profile.bashrc
new file mode 100644
index 000000000000..ae3e7d8c5b1d
--- /dev/null
+++ b/profiles/prefix/darwin/macos/11.0/profile.bashrc
@@ -0,0 +1,4 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+export MACOSX_DEPLOYMENT_TARGET=11.0
diff --git a/profiles/prefix/darwin/macos/11.0/x64/eapi b/profiles/prefix/darwin/macos/11.0/x64/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/prefix/darwin/macos/11.0/x64/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/darwin/macos/11.0/x64/gcc/eapi b/profiles/prefix/darwin/macos/11.0/x64/gcc/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/prefix/darwin/macos/11.0/x64/gcc/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/darwin/macos/11.0/x64/gcc/parent b/profiles/prefix/darwin/macos/11.0/x64/gcc/parent
new file mode 100644
index 000000000000..5ebbfd24d627
--- /dev/null
+++ b/profiles/prefix/darwin/macos/11.0/x64/gcc/parent
@@ -0,0 +1,2 @@
+..
+../../../features/fsf-gcc-nold
diff --git a/profiles/prefix/darwin/macos/11.0/x64/make.defaults b/profiles/prefix/darwin/macos/11.0/x64/make.defaults
new file mode 100644
index 000000000000..b4c18f7a319e
--- /dev/null
+++ b/profiles/prefix/darwin/macos/11.0/x64/make.defaults
@@ -0,0 +1,5 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="x86_64-apple-darwin20"
+CHOST_amd64="${CHOST}"
diff --git a/profiles/prefix/darwin/macos/11.0/x64/parent b/profiles/prefix/darwin/macos/11.0/x64/parent
new file mode 100644
index 000000000000..269f6f48bb15
--- /dev/null
+++ b/profiles/prefix/darwin/macos/11.0/x64/parent
@@ -0,0 +1,2 @@
+..
+../../arch/x64
diff --git a/profiles/prefix/darwin/macos/11.0/x64/use.mask b/profiles/prefix/darwin/macos/11.0/x64/use.mask
new file mode 100644
index 000000000000..67647c3611bb
--- /dev/null
+++ b/profiles/prefix/darwin/macos/11.0/x64/use.mask
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# This file masks out USE flags that are simply NOT allowed in the default
+# x86 profile.  This works, for example, if another architecture's
+# profile have a USE flag associated with (such as altivec, mmx, etc).
+
+# Unmask x86 instruction sets
+-cpu_flags_x86_mmx
+-cpu_flags_x86_mmxext
+-cpu_flags_x86_sse
+-cpu_flags_x86_sse2
+-cpu_flags_x86_ssse3
+-svga
+
+# Unmask nvidia XvMC support
+-nvidia
+
+# Unmask dev-db/oracle-instantclient-basic support
+-oci8-instant-client
+
+# Modular X: unmask for architectures on which they are available
+-input_devices_synaptics
+-input_devices_vmmouse
+-input_devices_wacom
+-video_cards_nvidia
+-video_cards_vmware
+
+# ibm is only used for ppc64 stuff
+ibm
diff --git a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
new file mode 100644
index 000000000000..e1ce7a0144a6
--- /dev/null
+++ b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
@@ -0,0 +1,12 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# unmask ld symlink package, due to missing blocks support we are not
+# able to compile binutils-apple
+sys-devel/binutils-apple
+-sys-devel/native-cctools
+# and unmask FSF GCC itself of course
+-sys-devel/gcc
+
+# packages which link to framework and therefore fail (blocks)
+dev-util/pkgconfig
diff --git a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/packages b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/packages
new file mode 100644
index 000000000000..e036014e912a
--- /dev/null
+++ b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/packages
@@ -0,0 +1,12 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# usage of FSF GCC, disabling Clang, without binutils-apple (due to
+# missing blocks support in GCC)
+*sys-devel/gcc
+*sys-devel/gcc-config
+*sys-devel/native-cctools
+-*sys-devel/binutils-apple
+-*sys-devel/clang
+-*sys-devel/gcc-apple
+-*sys-libs/csu
diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask
index 13dff7f7a416..502af5fe4ab9 100644
--- a/profiles/prefix/darwin/macos/package.mask
+++ b/profiles/prefix/darwin/macos/package.mask
@@ -1,20 +1,19 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Fabian Groffen <grobian@gentoo.org> (2020-11-23)
+# no symbols from libopenbsd-compat
+=net-misc/openssh-8.3_p1-r5
+=net-misc/openssh-8.4_p1-r2
+
+# Fabian Groffen <grobian@gentoo.org> (2020-11-23)
+# doesn't link, some unresolved symbol from gnulib
+=sys-devel/gettext-0.21
+
 # Fabian Groffen <grobian@gentoo.org> (2020-06-09)
 # fails to compile, needs fixing
 =sys-apps/gentoo-functions-0.13
 
-# Fabian Groffen <grobian@gentoo.org> (2019-11-11)
-# We mask all system headers, and only unmask the slot matching the OS
-# install in the version profiles
-sys-kernel/xnu-headers:10.12
-sys-libs/darwin-libc-headers:10.12
-sys-kernel/xnu-headers:10.13
-sys-libs/darwin-libc-headers:10.13
-sys-kernel/xnu-headers:10.14
-sys-libs/darwin-libc-headers:10.14
-
 # Fabian Groffen <grobian@gentoo.org> (2019-03-22)
 # Newer versions break because they insist on sysroot usage lacking
 # -lSystem as looked for by clang/llvm.  If your system got this
diff --git a/profiles/prefix/darwin/macos/package.use.mask b/profiles/prefix/darwin/macos/package.use.mask
index 71cd464991f3..86c47cbbcfb4 100644
--- a/profiles/prefix/darwin/macos/package.use.mask
+++ b/profiles/prefix/darwin/macos/package.use.mask
@@ -18,11 +18,6 @@ media-video/ffmpeg -appkit
 media-video/mplayer xv dga X xinerama xscreensaver
 media-video/mplayer dvb lirc jack joystick
 
-# Fabian Groffen <grobian@gentoo.org> (2008-08-06)
-# runtime loading is horribly broken (it uses fixed .so.0, but when
-# that's fixed it still doesn't work)
-dev-vcs/subversion dso
-
 # Elias Pipping <pipping@gentoo.org> (2007-08-27)
 # elinks does not compile with USE=perl (tested with 0.11.{2,3})
 www-client/elinks perl
diff --git a/profiles/prefix/darwin/macos/packages b/profiles/prefix/darwin/macos/packages
index f37a922f3004..cbc54b794388 100644
--- a/profiles/prefix/darwin/macos/packages
+++ b/profiles/prefix/darwin/macos/packages
@@ -1,11 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # macOS has LLVM/Clang as system compiler
 -*sys-devel/gcc
 -*sys-devel/gcc-config
 *sys-devel/clang
-
-# system headers to be able to compile stuff
-*sys-kernel/xnu-headers
-*sys-libs/darwin-libc-headers
diff --git a/profiles/prefix/linux/amd64/parent b/profiles/prefix/linux/amd64/parent
index 0d2c53ad27fc..c8d63be093b2 100644
--- a/profiles/prefix/linux/amd64/parent
+++ b/profiles/prefix/linux/amd64/parent
@@ -1,2 +1,2 @@
-../../../default/linux/amd64/17.0/no-multilib
+../../../default/linux/amd64/17.1/no-multilib
 ..