gentoo christmass resync : 25.12.2020

48 files changed, 68 insertions, 179 deletions

diff --git a/profiles/prefix/darwin/macos/10.5/ppc/package.mask b/profiles/prefix/darwin/macos/10.5/ppc/package.mask
deleted file mode 100644
index ba9daf5618b6..000000000000
--- a/profiles/prefix/darwin/macos/10.5/ppc/package.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> (2018-06-18)
-# FSF GCC is our system compiler here
--sys-devel/gcc
diff --git a/profiles/prefix/sunos/solaris/5.10/eapi b/profiles/prefix/darwin/macos/11.0/arm64/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/prefix/sunos/solaris/5.10/eapi
+++ b/profiles/prefix/darwin/macos/11.0/arm64/eapi
diff --git a/profiles/prefix/darwin/macos/11.0/arm64/make.defaults b/profiles/prefix/darwin/macos/11.0/arm64/make.defaults
new file mode 100644
index 000000000000..6de9f160caa6
--- /dev/null
+++ b/profiles/prefix/darwin/macos/11.0/arm64/make.defaults
@@ -0,0 +1,5 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="arm64-apple-darwin20"
+CHOST_arm64="${CHOST}"
diff --git a/profiles/prefix/sunos/solaris/5.10/x64/parent b/profiles/prefix/darwin/macos/11.0/arm64/parent
index 269f6f48bb15..269f6f48bb15 100644
--- a/profiles/prefix/sunos/solaris/5.10/x64/parent
+++ b/profiles/prefix/darwin/macos/11.0/arm64/parent
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc/eapi b/profiles/prefix/darwin/macos/arch/arm64/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/prefix/sunos/solaris/5.10/sparc/eapi
+++ b/profiles/prefix/darwin/macos/arch/arm64/eapi
diff --git a/profiles/prefix/darwin/macos/arch/arm64/make.defaults b/profiles/prefix/darwin/macos/arch/arm64/make.defaults
new file mode 100644
index 000000000000..3ceab05d32e1
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/arm64/make.defaults
@@ -0,0 +1,11 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+ARCH="arm64-macos"
+ACCEPT_KEYWORDS="~x64-macos"  # this is a hack whilst we don't have full system
+
+# multilib build stuff, single ABI (no multilib)
+ABI="arm64"
+DEFAULT_ABI="arm64"
+MULTILIB_ABIS="arm64"
+LIBDIR_arm64="lib"
diff --git a/profiles/prefix/darwin/macos/arch/arm64/profile.bashrc b/profiles/prefix/darwin/macos/arch/arm64/profile.bashrc
new file mode 100644
index 000000000000..6bfe36915c9d
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/arm64/profile.bashrc
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+pre_src_configure() {
+	# catch when multiple pkgs are in one ebuild
+	pushd "${WORKDIR}" > /dev/null
+
+	# macOS Big Sur (11.x, darwin20) supports Apple Silicon (arm64),
+	# which config.sub currently doesn't understand about.  It is,
+	# however, Apple who seem to use arm64-apple-darwin20 CHOST
+	# triplets, so patch that for various versions of autoconf
+	# This bit should be kept in sync with fix_config_sub in
+	# bootstrap-prefix.sh
+	if [[ ${CHOST} == arm64-apple-darwin* ]] ; then
+		# Apple Silicon doesn't use aarch64, but arm64
+		find . -name "config.sub" | \
+			xargs sed -i -e 's/ arm\(-\*\)* / arm\1 | arm64\1 /'
+		find . -name "config.sub" | \
+			xargs sed -i -e 's/ aarch64 / aarch64 | arm64 /'
+	fi
+
+	popd > /dev/null
+}
diff --git a/profiles/prefix/darwin/macos/arch/arm64/use.force b/profiles/prefix/darwin/macos/arch/arm64/use.force
new file mode 100644
index 000000000000..b4557bfe8498
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/arm64/use.force
@@ -0,0 +1,7 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Force the flag corresponding to the default ABI
+x64-macos
+arm64-macos
+abi_arm64
diff --git a/profiles/prefix/darwin/macos/arch/arm64/use.mask b/profiles/prefix/darwin/macos/arch/arm64/use.mask
new file mode 100644
index 000000000000..2b0df2c9ccf9
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/arm64/use.mask
@@ -0,0 +1,7 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Unmask the flag corresponding to the default ABI
+-x64-macos
+-arm64-macos
+-abi_arm64
diff --git a/profiles/prefix/darwin/macos/arch/ppc/package.mask b/profiles/prefix/darwin/macos/arch/ppc/package.mask
index 05a1b5c5c541..fd829701ef56 100644
--- a/profiles/prefix/darwin/macos/arch/ppc/package.mask
+++ b/profiles/prefix/darwin/macos/arch/ppc/package.mask
@@ -7,12 +7,9 @@
 
 # Fabian Groffen <grobian@gentoo.org> (2012-03-05)
 # Apple removed entire PowerPC support from ld in ld64-128.2 (4.3)
-# a backport of PPC support was kept until compilation with gcc-apple
-# was no longer possible since 7.0.
-# The only working versions are 3.2 and (patched) 6.3, however the
-# latter causes bus errors whilst compiling e.g. GCC
-=sys-devel/binutils-apple-4.3-r2
-=sys-devel/binutils-apple-5.1-r1
-=sys-devel/binutils-apple-6.1-r1
-=sys-devel/binutils-apple-6.3-r2
->sys-devel/binutils-apple-6.99999
+# darwin-xtools added back support and allows to be compiled from FSF
+# GCC for version ld64-274.2 (8.2.1), so basically 3.2.3 and the xtools
+# version 8.2.1 are unmasked for us, allowing a non-gcc-apple path, we
+# dropped all versions inbetween, mask the incompatible ones remaining
+=sys-devel/binutils-apple-8.2.1-r1
+=sys-devel/binutils-apple-11.3.1-r1
diff --git a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
index 90c1048e4022..bcc732c3eb55 100644
--- a/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
+++ b/profiles/prefix/darwin/macos/features/fsf-gcc-nold/package.mask
@@ -5,11 +5,6 @@
 # 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
-
-# cmake-3.19.1 works for us
-->=dev-util/cmake-3.14
diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask
index 831cbe6cf8a8..4f8cc88126e6 100644
--- a/profiles/prefix/darwin/macos/package.mask
+++ b/profiles/prefix/darwin/macos/package.mask
@@ -1,17 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Fabian Groffen <grobian@gentoo.org> (2020-12-20)
+# we need to establish this darwin-xcode version can really be our
+# linker once we figure out TAPI support
+=sys-devel/binutils-apple-8.2.1-r100
+
 # 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-06-09)
-# fails to compile, needs fixing
-=sys-apps/gentoo-functions-0.13
-
-# 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
-# package, you have to emerge -C cmake and re-emerge it.
->=dev-util/cmake-3.14
diff --git a/profiles/prefix/darwin/package.mask b/profiles/prefix/darwin/package.mask
index a0cd86ce4ca8..fbda04428af4 100644
--- a/profiles/prefix/darwin/package.mask
+++ b/profiles/prefix/darwin/package.mask
@@ -5,14 +5,6 @@
 # util-linux has no business on Darwin systems
 sys-apps/util-linux
 
-# Fabian Groffen <grobian@gentoo.org> (2012-02-19)
-# Using FSF GCC on Mac OS X is not supported by Gentoo Prefix.  While
-# the FSF GCC compiler is certainly useful, some - if not many -
-# packages expect the Apple branch of GCC, and its (sometimes peculiar)
-# behaviour.  Do not file bugs for packages that fail to compile with
-# FSF GCC, if you have patches, please send them directly to upstream.
-sys-devel/gcc
-
 # Fabian Groffen <grobian@gentoo.org> (2011-12-30)
 # Does not support Darwin, http://mj.ucw.cz/pciutils.html
 sys-apps/pciutils
diff --git a/profiles/prefix/darwin/package.use.mask b/profiles/prefix/darwin/package.use.mask
index 4b41e3402a55..e99219cedba4 100644
--- a/profiles/prefix/darwin/package.use.mask
+++ b/profiles/prefix/darwin/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Sam James <sam@gentoo.org> (2020-12-01)
diff --git a/profiles/prefix/sunos/solaris/5.10/package.mask b/profiles/prefix/sunos/solaris/5.10/package.mask
deleted file mode 100644
index 3e3cc3434f46..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/package.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
diff --git a/profiles/prefix/sunos/solaris/5.10/parent b/profiles/prefix/sunos/solaris/5.10/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/sunos/solaris/5.10/profile.bashrc b/profiles/prefix/sunos/solaris/5.10/profile.bashrc
deleted file mode 100644
index 199976276664..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/profile.bashrc
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-if [[ ${EBUILD_PHASE} == setup ]] ; then
-	if [[ ${CATEGORY}/${PN} == sys-devel/flex ]] ; then
-		# Solaris 10's <stdbool.h> requires the C99 standard
-		[[ " ${CFLAGS} "   == *" -std=c99 "* ]] || CFLAGS="-std=c99 ${CFLAGS}"
-		[[ " ${CXXFLAGS} " == *" -std=c99 "* ]] || CXXFLAGS="-std=c99 ${CXXFLAGS}"
-	fi
-fi
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc/make.defaults b/profiles/prefix/sunos/solaris/5.10/sparc/make.defaults
deleted file mode 100644
index 9557d14f8d44..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/sparc/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="sparc-solaris"
-CHOST="sparc-sun-solaris2.10"
-ACCEPT_KEYWORDS="~sparc-solaris"
-
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc/package.mask b/profiles/prefix/sunos/solaris/5.10/sparc/package.mask
deleted file mode 100644
index 1a1871bef0cb..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/sparc/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc/package.use.mask b/profiles/prefix/sunos/solaris/5.10/sparc/package.use.mask
deleted file mode 100644
index f7ac4607b395..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/sparc/package.use.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc/parent b/profiles/prefix/sunos/solaris/5.10/sparc/parent
deleted file mode 100644
index 356d2b757b15..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/sparc/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../arch/sparc
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc64/eapi b/profiles/prefix/sunos/solaris/5.10/sparc64/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/sparc64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc64/make.defaults b/profiles/prefix/sunos/solaris/5.10/sparc64/make.defaults
deleted file mode 100644
index cf284c55f436..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/sparc64/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="sparc64-solaris"
-CHOST="sparcv9-sun-solaris2.10"
-ACCEPT_KEYWORDS="~sparc64-solaris"
-
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc64/package.mask b/profiles/prefix/sunos/solaris/5.10/sparc64/package.mask
deleted file mode 100644
index 1a1871bef0cb..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/sparc64/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc64/package.use.mask b/profiles/prefix/sunos/solaris/5.10/sparc64/package.use.mask
deleted file mode 100644
index f7ac4607b395..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/sparc64/package.use.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc64/parent b/profiles/prefix/sunos/solaris/5.10/sparc64/parent
deleted file mode 100644
index 6321d7e3ecda..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/sparc64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../arch/sparc64
diff --git a/profiles/prefix/sunos/solaris/5.10/use.mask b/profiles/prefix/sunos/solaris/5.10/use.mask
deleted file mode 100644
index 416b754cad05..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/use.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> (2017-08-22)
-# PIE is basically not supported on non-Linux
-# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57409
-pie
diff --git a/profiles/prefix/sunos/solaris/5.10/x64/eapi b/profiles/prefix/sunos/solaris/5.10/x64/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/x64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/sunos/solaris/5.10/x64/make.defaults b/profiles/prefix/sunos/solaris/5.10/x64/make.defaults
deleted file mode 100644
index 78dfad702e41..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/x64/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="x64-solaris"
-CHOST="x86_64-pc-solaris2.10"
-ACCEPT_KEYWORDS="~x64-solaris"
-
diff --git a/profiles/prefix/sunos/solaris/5.10/x64/package.mask b/profiles/prefix/sunos/solaris/5.10/x64/package.mask
deleted file mode 100644
index 0cc0ba14627f..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/x64/package.mask
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/prefix/sunos/solaris/5.10/x64/package.use.mask b/profiles/prefix/sunos/solaris/5.10/x64/package.use.mask
deleted file mode 100644
index bddf5edb63e4..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/x64/package.use.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-
diff --git a/profiles/prefix/sunos/solaris/5.10/x86/eapi b/profiles/prefix/sunos/solaris/5.10/x86/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/x86/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/sunos/solaris/5.10/x86/make.defaults b/profiles/prefix/sunos/solaris/5.10/x86/make.defaults
deleted file mode 100644
index 43ada07c78a7..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/x86/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="x86-solaris"
-CHOST="i386-pc-solaris2.10"
-ACCEPT_KEYWORDS="~x86-solaris"
-
diff --git a/profiles/prefix/sunos/solaris/5.10/x86/parent b/profiles/prefix/sunos/solaris/5.10/x86/parent
deleted file mode 100644
index 93220d096824..000000000000
--- a/profiles/prefix/sunos/solaris/5.10/x86/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../arch/x86
diff --git a/profiles/prefix/sunos/solaris/5.9/eapi b/profiles/prefix/sunos/solaris/5.9/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/prefix/sunos/solaris/5.9/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/sunos/solaris/5.9/package.mask b/profiles/prefix/sunos/solaris/5.9/package.mask
deleted file mode 100644
index 20d65461b562..000000000000
--- a/profiles/prefix/sunos/solaris/5.9/package.mask
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-
-# Jeremy Olexa <darkside@gentoo.org> (2008-08-26)
-# Requires that pthread.h defines pthread_atfork() but it doesn't on Solaris 9
-# SPARC.
-dev-libs/nss
-
-# Jeremy Olexa <darkside@gentoo.org> (2008-08-26)
-# Massive header errors. SIZE_MAX is defined in limits.h, getopt_long.c requires
-# getopt.h and err.h which don't seem to be present. Might be salvageable with
-# gnulib but I don't know much about that yet. Old versions still work.
->=sys-apps/file-4.25
diff --git a/profiles/prefix/sunos/solaris/5.9/package.use.mask b/profiles/prefix/sunos/solaris/5.9/package.use.mask
deleted file mode 100644
index 19ae00c853ea..000000000000
--- a/profiles/prefix/sunos/solaris/5.9/package.use.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> (2011-11-16)
-# jit not supported on sparc
-dev-libs/libpcre jit
-
diff --git a/profiles/prefix/sunos/solaris/5.9/parent b/profiles/prefix/sunos/solaris/5.9/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/prefix/sunos/solaris/5.9/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/sunos/solaris/5.9/sparc/eapi b/profiles/prefix/sunos/solaris/5.9/sparc/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/prefix/sunos/solaris/5.9/sparc/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/sunos/solaris/5.9/sparc/make.defaults b/profiles/prefix/sunos/solaris/5.9/sparc/make.defaults
deleted file mode 100644
index 670f50b71e18..000000000000
--- a/profiles/prefix/sunos/solaris/5.9/sparc/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="sparc-solaris"
-CHOST="sparc-sun-solaris2.9"
-ACCEPT_KEYWORDS="~sparc-solaris"
-
diff --git a/profiles/prefix/sunos/solaris/5.9/sparc/package.mask b/profiles/prefix/sunos/solaris/5.9/sparc/package.mask
deleted file mode 100644
index 1a1871bef0cb..000000000000
--- a/profiles/prefix/sunos/solaris/5.9/sparc/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-
diff --git a/profiles/prefix/sunos/solaris/5.9/sparc/parent b/profiles/prefix/sunos/solaris/5.9/sparc/parent
deleted file mode 100644
index 356d2b757b15..000000000000
--- a/profiles/prefix/sunos/solaris/5.9/sparc/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../arch/sparc
diff --git a/profiles/prefix/sunos/solaris/5.9/use.mask b/profiles/prefix/sunos/solaris/5.9/use.mask
deleted file mode 100644
index 416b754cad05..000000000000
--- a/profiles/prefix/sunos/solaris/5.9/use.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Fabian Groffen <grobian@gentoo.org> (2017-08-22)
-# PIE is basically not supported on non-Linux
-# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57409
-pie
diff --git a/profiles/prefix/windows/cygwin/x86/eapi b/profiles/prefix/windows/cygwin/x86/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/prefix/windows/cygwin/x86/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/windows/cygwin/x86/make.defaults b/profiles/prefix/windows/cygwin/x86/make.defaults
deleted file mode 100644
index 1b849ae1b953..000000000000
--- a/profiles/prefix/windows/cygwin/x86/make.defaults
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="x86-cygwin"
-CHOST="i686-pc-cygwin"
-ACCEPT_KEYWORDS="~x86-cygwin ~x86-linux"
-
-# multilib build stuff, single ABI (no multilib)
-MULTILIB_ABIS="x86"
-DEFAULT_ABI="x86"
-ABI="x86"
-IUSE_IMPLICIT="abi_x86_32"
-LIBDIR_x86="lib"
diff --git a/profiles/prefix/windows/cygwin/x86/parent b/profiles/prefix/windows/cygwin/x86/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/prefix/windows/cygwin/x86/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/windows/winnt/packages b/profiles/prefix/windows/winnt/packages
index 7ffc61e1574f..4e74d788041a 100644
--- a/profiles/prefix/windows/winnt/packages
+++ b/profiles/prefix/windows/winnt/packages
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # those are packages not available/required on winnt, since
 # winnt can be a child EPREFIX only, which tears it's DEPENDS
-# from a parent (e.g. x86-cygwin) prefix.
+# from a parent (e.g. x64-cygwin) prefix.
 
 -*sys-apps/grep
 -*app-arch/gzip
diff --git a/profiles/prefix/windows/winnt/profile.bashrc b/profiles/prefix/windows/winnt/profile.bashrc
index 9420300435cd..3b61ad73d6dc 100644
--- a/profiles/prefix/windows/winnt/profile.bashrc
+++ b/profiles/prefix/windows/winnt/profile.bashrc
@@ -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
 
 # On windows, binary files (executables, shared libraries) in use