gentoo resync : 15.12.2019

4 files changed, 67 insertions, 0 deletions

diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask
index e8ef0ab07a3e..117568e0a6bd 100644
--- a/profiles/features/musl/package.use.mask
+++ b/profiles/features/musl/package.use.mask
@@ -20,3 +20,6 @@ app-shells/bash mem-scramble
 # lto builds are known to cause an OOM issue during build.
 mail-client/thunderbird lto
 www-client/firefox lto
+
+# static linking works with musl
+app-shells/mksh -static
diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask
index 274535191db4..957ea16b4f30 100644
--- a/profiles/features/selinux/package.mask
+++ b/profiles/features/selinux/package.mask
@@ -41,6 +41,7 @@ sys-apps/gentoo-systemd-integration
 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
@@ -49,3 +50,30 @@ 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-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
+app-admin/packagekit-qt
+<app-admin/salt-2018
+<app-admin/webapp-config-1.55
+app-backup/deja-dup
+app-portage/distpatch
+app-portage/euscan
+<app-portage/g-sorcery-0.2.1-r1
+=app-portage/gs-elpa-0.1.3
+<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 6c6cd0f280d2..287c2abb966b 100644
--- a/profiles/features/selinux/package.use.mask
+++ b/profiles/features/selinux/package.use.mask
@@ -32,3 +32,36 @@ x11-terms/gnome-terminal gnome-shell
 x11-themes/arc-theme gnome-shell
 x11-themes/zukitwo gnome-shell
 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
+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
+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
+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.use.mask b/profiles/features/uclibc/package.use.mask
index eb7b5dc02161..b00ae69a84ab 100644
--- a/profiles/features/uclibc/package.use.mask
+++ b/profiles/features/uclibc/package.use.mask
@@ -22,3 +22,6 @@ dev-util/geany-plugins gtkspell
 # 'append-libs', but xfsdump's build system doesn't honor $LIBS.
 # So this is the best way for now.  See 570548.
 sys-fs/xfsdump nls
+
+# static linking works with uClibc
+app-shells/mksh -static