9 files changed, 64 insertions, 42 deletions
diff --git a/profiles/features/musl/make.defaults b/profiles/features/musl/make.defaults
index e2dbf5d8a4b7..9db228856d0d 100644
--- a/profiles/features/musl/make.defaults
+++ b/profiles/features/musl/make.defaults
@@ -15,4 +15,4 @@ FEATURES="-multilib-strict"
 
 # TODO: fix so musl doesn't generate this for all packages
 # that use a charset, it causes package collisons.
-INSTALL_MASK="charset.alias"
+INSTALL_MASK="charset.alias locale.alias"
diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index e42c7279fbb1..c4c7bc96159e 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -1,6 +1,37 @@
-# Copyright 1999-2019 Gentoo Authors.
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sergei Trofimovich <slyfox@gentoo.org> (2020-04-11)
+# musl has no support for prelinked sections, bug #717020
+sys-devel/prelink
+
+# Ulrich Müller (2020-03-31)
+# Not ported to musl, bug #715642.
+# See https://wiki.gentoo.org/wiki/Project:Emacs/Emacs-like_editors
+# for alternatives.
+app-editors/jasspa-microemacs
+
+# Sergei Trofimovich <slyfox@gentoo.org> (2020-03-21)
+# musl has no support for nss subsystem.
+sys-auth/libnss-nis
+sys-auth/libnss-compat
+
+# Sergei Trofimovich <slyfox@gentoo.org> (2020-03-21)
+# Needs a port no musl. Uses glibc-specific termio and __getppid.
+app-emulation/ski
+
+# Sergei Trofimovich <slyfox@gentoo.org> (2020-03-21)
+# In ::gentoo dev-libs/elfutils needs an upstream port to
+# musl: #602126, #701478
+# - https://sourceware.org/PR21002
+# - https://sourceware.org/PR21008
+# - https://sourceware.org/PR21010
+dev-libs/elfutils
+
+# Sergei Trofimovich <slyfox@gentoo.org> (2020-03-21)
+# Linux debugger needs a port to musl.
+app-emulation/dosemu
+
 sys-libs/uclibc-ng
 sys-libs/glibc
 
@@ -9,6 +40,9 @@ sys-libs/glibc
 sys-apps/systemd
 sys-fs/udev
 
+# systemd sources fail to build without glibc
+sys-boot/systemd-boot
+
 # Ian Stakenvicius, 2017-06-14
 # on behalf of mozilla@gentoo.org
 # Mask firefox-54 and above as it requires rust
@@ -17,3 +51,7 @@ sys-fs/udev
 
 # rust-bin requires a glibc system
 dev-lang/rust-bin
+
+# Mikle Kolyada <zlogene@gentoo.org> (2020-03-20)
+#  No source builds for musl
+app-emulation/firecracker
diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask
index 117568e0a6bd..3e8e86a01b67 100644
--- a/profiles/features/musl/package.use.mask
+++ b/profiles/features/musl/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License v2
 
+# Sergei Trofimovich <slyfox@gentoo.org> (2020-03-19)
+# check does not work on musl, bug #713138
+dev-lang/gforth check
+
 # See bug #604542
 net-misc/iputils idn
 
diff --git a/profiles/features/prefix/packages b/profiles/features/prefix/packages
index a4d727977333..3bc6e7c91b4f 100644
--- a/profiles/features/prefix/packages
+++ b/profiles/features/prefix/packages
@@ -19,7 +19,7 @@
 -*sys-fs/e2fsprogs
 -*virtual/dev-manager
 -*virtual/modutils
--*virtual/shadow
+-*sys-apps/shadow
 
 # we don't want this either (as baselayout-prefix provides the functions.sh
 # file that this was added to ../base/packages for)
diff --git a/profiles/features/prefix/standalone/kernel-2.6.32+/make.defaults b/profiles/features/prefix/standalone/kernel-2.6.32+/make.defaults
new file mode 100644
index 000000000000..056f07700a5d
--- /dev/null
+++ b/profiles/features/prefix/standalone/kernel-2.6.32+/make.defaults
@@ -0,0 +1,4 @@
+# This profile is supporting >=linux-2.6.32[a] and <linux-3.2[b].
+
+# only available in glibc-2.26.
+ac_cv_func_reallocarray=no
diff --git a/profiles/features/prefix/standalone/kernel-2.6.32+/profile.bashrc b/profiles/features/prefix/standalone/kernel-2.6.32+/profile.bashrc
new file mode 100644
index 000000000000..eb05932eef74
--- /dev/null
+++ b/profiles/features/prefix/standalone/kernel-2.6.32+/profile.bashrc
@@ -0,0 +1,10 @@
+# tricks to circumvent false positive checks of old kernel
+
+if [[ ${CATEGORY}/${PN} == sys-libs/glibc && ${EBUILD_PHASE} == configure ]]; then
+    einfo "Removing O_PATH definitions..."
+    sed -e '/define.*O_PATH/d' -i "${S}"/sysdeps/unix/sysv/linux/bits/fcntl-linux.h || die
+fi
+
+# Local Variables:
+# mode: shell-script
+# End:
diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask
index 3bda66d6463d..b09cf0660c37 100644
--- a/profiles/features/selinux/package.mask
+++ b/profiles/features/selinux/package.mask
@@ -30,7 +30,9 @@ gnome-extra/gnome-logs
 gnome-extra/gnome-shell-extensions
 gnome-extra/gnome-shell-frippery
 gnome-extra/gnome-shell-extensions-topicons-plus
+gnome-extra/gnome-shell-extension-appindicator
 gnome-extra/gnome-shell-extension-applications-overview-tooltip
+gnome-extra/gnome-shell-extension-bluetooth-quick-connect
 gnome-extra/gnome-shell-extension-dash-to-panel
 gnome-extra/gnome-shell-extension-desktop-icons
 gnome-extra/gnome-shell-extension-gsconnect
@@ -58,8 +60,6 @@ gnome-extra/gnome-user-share
 # python2_7-only packages that depend on portage
 # cause unresolvable deps
 =app-admin/bcfg2-1.2.4-r1
-app-admin/equo
-app-admin/matter
 app-admin/packagekit
 ~app-admin/packagekit-base-1.1.12
 app-admin/packagekit-gtk
@@ -74,8 +74,4 @@ app-portage/euscan
 <app-portage/layman-2.4.2
 app-portage/metagen
 =app-portage/overlint-0.5.2
-app-portage/porthole
 gnome-extra/gnome-packagekit
-net-proxy/http-replicator
-sys-apps/entropy
-sys-apps/entropy-server
diff --git a/profiles/features/selinux/package.use.mask b/profiles/features/selinux/package.use.mask
index 63635efd4421..3b50e65f7edd 100644
--- a/profiles/features/selinux/package.use.mask
+++ b/profiles/features/selinux/package.use.mask
@@ -9,12 +9,6 @@ net-analyzer/wireshark sdjournal
 # mask pypy for several utilities due to incompatibility with libselinux
 sys-apps/portage python_targets_pypy3
 app-portage/gentoolkit python_targets_pypy3
-app-portage/layman python_targets_pypy3
-app-admin/webapp-config python_targets_pypy3
-app-portage/diffmask python_targets_pypy3
-app-portage/flaggie python_targets_pypy3
-app-portage/gentoopm python_targets_pypy3
-app-portage/gpyutils python_targets_pypy3
 
 # Jason Zaman <perfinion@gentoo.org> (2015-06-27)
 # SystemD has no support in the SELinux policy at the moment.
@@ -35,33 +29,6 @@ net-wireless/bluez user-session
 
 # Jason Zaman <perfinion@gentoo.org> (2019-12-01)
 # SELinux userspace 3.0 dropped python2.7 support
-app-admin/equo python_targets_python2_7
 app-admin/matter python_targets_python2_7
-app-admin/packagekit-base python_targets_python2_7 python_single_target_python2_7
-app-admin/salt python_targets_python2_7
-app-admin/webapp-config python_targets_python2_7
-app-portage/diffmask python_targets_python2_7
-app-portage/distpatch python_targets_python2_7
-app-portage/elicense python_targets_python2_7
-app-portage/elogviewer python_targets_python2_7 python_single_target_python2_7
 app-portage/euscan python_targets_python2_7
-app-portage/flaggie python_targets_python2_7
-app-portage/g-sorcery python_targets_python2_7
-app-portage/gentoolkit python_targets_python2_7
-app-portage/gentoopm python_targets_python2_7
-app-portage/gpyutils python_targets_python2_7
-app-portage/gs-elpa python_targets_python2_7
-app-portage/layman python_targets_python2_7
-app-portage/metagen python_targets_python2_7
-app-portage/overlint python_targets_python2_7
-app-portage/porthole python_targets_python2_7
-app-portage/portpeek python_targets_python2_7
-app-portage/repoman python_targets_python2_7
-app-portage/smart-live-rebuild python_targets_python2_7
-app-portage/unsymlink-lib python_targets_python2_7 python_single_target_python2_7
-dev-java/java-config python_targets_python2_7
 kde-frameworks/frameworkintegration appstream
-net-proxy/http-replicator python_targets_python2_7
-sys-apps/entropy python_targets_python2_7
-sys-apps/entropy-server python_targets_python2_7
-sys-apps/portage python_targets_python2_7
diff --git a/profiles/features/uclibc/package.mask b/profiles/features/uclibc/package.mask
index 7129450631ea..635fbd4b87ca 100644
--- a/profiles/features/uclibc/package.mask
+++ b/profiles/features/uclibc/package.mask
@@ -5,6 +5,9 @@ sys-libs/musl
 sys-libs/glibc
 sys-libs/pam
 
+# Version 8.31 is broken on uclibc, but not 8.30 or 8.32
+~sys-apps/coreutils-8.31
+
 # We use eudev which is tested on both uclibc and musl
 sys-apps/systemd
 sys-fs/udev