8 files changed, 48 insertions, 47 deletions
diff --git a/profiles/features/hardened/amd64/package.mask b/profiles/features/hardened/amd64/package.mask
deleted file mode 100644
index 6320e8b0055e..000000000000
--- a/profiles/features/hardened/amd64/package.mask
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Cernlib has address space issues on amd64 and package is no
-# longer supported by upstream. Thus masking it and its reverse
-# dependencies.
-# See bug 426764.
-sci-physics/cernlib
-sci-physics/cernlib-montecarlo
-sci-physics/paw
diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index 27d5c51ebf9f..2cdc63f8b852 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# David Seifert <soap@gentoo.org> (2021-02-08)
+# nvidia-drivers only works against glibc.
+x11-drivers/nvidia-drivers
+
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-04-11)
 # musl has no support for prelinked sections, bug #717020
 sys-devel/prelink
diff --git a/profiles/features/prefix/standalone/packages b/profiles/features/prefix/standalone/packages
index 8d5b9aeeb330..259169a6769c 100644
--- a/profiles/features/prefix/standalone/packages
+++ b/profiles/features/prefix/standalone/packages
@@ -1,3 +1,6 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
 # RAP does not need busybox for emergency recovery, the host have all those tools.
 -*sys-apps/busybox
 
@@ -6,7 +9,6 @@
 
 # Man pages are not essential.
 -*sys-apps/man-pages
--*virtual/man
 
 # A service manager is not essential.
 -*virtual/service-manager
diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask
index 1a09d0c5d9f8..81483fd039d2 100644
--- a/profiles/features/selinux/package.mask
+++ b/profiles/features/selinux/package.mask
@@ -1,6 +1,21 @@
 # Copyright 2011-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Jason Zaman <perfinion@gentoo.org> (2019-12-01)
+# SELinux userspace 3.0 dropped python2_7 support
+# python2_7-only packages that depend on portage
+# cause unresolvable deps
+app-portage/distpatch
+app-portage/metagen
+
+# Gilles Dartiguelongue <eva@gentoo.org> (2018-05-24)
+# Packages use systemd unconditionally for now
+>=app-admin/abrt-2.10
+app-admin/gnome-abrt
+>=dev-libs/libreport-2.9
+games-util/gamemode
+gnome-extra/gnome-user-share
+
 # Göktürk Yüksek <gokturk@gentoo.org> (2016-11-09)
 # On behalf of proxy-maint
 # Mask due to the package requiring systemd
@@ -9,7 +24,7 @@
 www-misc/profile-sync-daemon
 
 # Jason Zaman <perfinion@gentoo.org> (2015-06-27)
-# SystemD has no support in the SELinux policy at the moment.
+# systemd has no support in the SELinux policy at the moment.
 # Please see: https://wiki.gentoo.org/wiki/SELinux/FAQ#Can_I_use_SELinux_with_systemd.3F
 app-admin/systemdgenie
 app-eselect/eselect-gnome-shell-extensions
@@ -48,18 +63,3 @@ sys-apps/systemd-readahead
 sys-process/systemd-cron
 sys-apps/dbus-broker
 sys-kernel/installkernel-systemd-boot
-
-# Gilles Dartiguelongue <eva@gentoo.org> (2018-05-24)
-# Packages use systemd unconditionally for now
->=app-admin/abrt-2.10
-app-admin/gnome-abrt
->=dev-libs/libreport-2.9
-games-util/gamemode
-gnome-extra/gnome-user-share
-
-# Jason Zaman <perfinion@gentoo.org> (2019-12-01)
-# SELinux userspace 3.0 dropped python2_7 support
-# python2_7-only packages that depend on portage
-# cause unresolvable deps
-app-portage/distpatch
-app-portage/metagen
diff --git a/profiles/features/selinux/package.use.force b/profiles/features/selinux/package.use.force
index 131e38b9ff34..e05cf6bb0589 100644
--- a/profiles/features/selinux/package.use.force
+++ b/profiles/features/selinux/package.use.force
@@ -1,21 +1,21 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Sven Vermeulen <swift@gentoo.org> (2013-04-19)
-# sys-apps/policycoreutils (semanage command) uses sepolgen, which requires libselinux with USE="python". 
-# sys-apps/policycoreutils also requires libsemanage with USE="python"
-sys-libs/libselinux python
+# Jason Zaman <perfinion@gentoo.org> (2014-12-03)
+# sys-apps/busybox has IUSE="+static", so force static-libs on its deps
+# so stages can build with no interacton. Bug #527938
+sys-libs/libselinux static-libs
+dev-libs/libpcre static-libs
 
 # Sven Vermeulen <swift@gentoo.org> (2013-05-21)
 # sys-apps/policycoreutils has PYTHON_USE_WITH="xml" set, so we force it
 # here to allow stages to build with USE=xml on python
 dev-lang/python xml
 
-# Jason Zaman <perfinion@gentoo.org> (2014-12-03)
-# sys-apps/busybox has IUSE="+static", so force static-libs on its deps
-# so stages can build with no interacton. Bug #527938
-sys-libs/libselinux static-libs
-dev-libs/libpcre static-libs
+# Sven Vermeulen <swift@gentoo.org> (2013-04-19)
+# sys-apps/policycoreutils (semanage command) uses sepolgen, which requires libselinux with USE="python".
+# sys-apps/policycoreutils also requires libsemanage with USE="python"
+sys-libs/libselinux python
 
 # Required for semanage to run correctly.
 sys-process/audit python
diff --git a/profiles/features/selinux/package.use.mask b/profiles/features/selinux/package.use.mask
index a22be1217f05..fa0016533bcc 100644
--- a/profiles/features/selinux/package.use.mask
+++ b/profiles/features/selinux/package.use.mask
@@ -9,16 +9,8 @@ sys-apps/ipmitool openbmc
 # sdjournal links against sys-apps/systemd's libraries
 net-analyzer/wireshark sdjournal
 
-# Brian Dolbec <dolsen@gentoo.org> (2014-09-17)
-# mask pypy for several utilities due to incompatibility with libselinux
-sys-apps/portage python_targets_pypy3
-app-portage/elogv python_targets_pypy3
-app-portage/gentoolkit python_targets_pypy3
-app-portage/layman python_targets_pypy3
-app-portage/repoman python_targets_pypy3
-
 # Jason Zaman <perfinion@gentoo.org> (2015-06-27)
-# SystemD has no support in the SELinux policy at the moment.
+# systemd has no support in the SELinux policy at the moment.
 # Please see: https://wiki.gentoo.org/wiki/SELinux/FAQ#Can_I_use_SELinux_with_SystemD.3F
 app-emulation/libvirt firewalld
 gnome-base/gdm wayland
@@ -31,3 +23,11 @@ x11-terms/gnome-terminal gnome-shell
 x11-themes/arc-theme gnome-shell
 x11-themes/zukitwo gnome-shell
 net-wireless/bluez user-session
+
+# Brian Dolbec <dolsen@gentoo.org> (2014-09-17)
+# mask pypy for several utilities due to incompatibility with libselinux
+sys-apps/portage python_targets_pypy3
+app-portage/elogv python_targets_pypy3
+app-portage/gentoolkit python_targets_pypy3
+app-portage/layman python_targets_pypy3
+app-portage/repoman python_targets_pypy3
diff --git a/profiles/features/selinux/use.mask b/profiles/features/selinux/use.mask
index 3cdf71244bba..7ec45f5f3a3e 100644
--- a/profiles/features/selinux/use.mask
+++ b/profiles/features/selinux/use.mask
@@ -11,3 +11,4 @@
 
 # no policy yet
 systemd
+homed
diff --git a/profiles/features/uclibc/package.mask b/profiles/features/uclibc/package.mask
index d1730bdfd263..c81f0fe19e48 100644
--- a/profiles/features/uclibc/package.mask
+++ b/profiles/features/uclibc/package.mask
@@ -1,10 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 sys-libs/musl
 sys-libs/glibc
 sys-libs/pam
 
+# David Seifert <soap@gentoo.org> (2021-02-08)
+# nvidia-drivers only works against glibc.
+x11-drivers/nvidia-drivers
+
 # Version 8.31 is broken on uclibc, but not 8.30 or 8.32
 ~sys-apps/coreutils-8.31