gentoo resync : 14.05.2020

2 files changed, 10 insertions, 21 deletions

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index cf27a009b57c..2d4015005846 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -50,7 +50,7 @@ PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ELIBC IUSE_IMPLICIT KERNEL USE
 ELIBC="glibc"
 KERNEL="linux"
 USERLAND="GNU"
-INPUT_DEVICES="keyboard mouse"
+INPUT_DEVICES="libinput"
 
 # Accept only licenses in the FREE license group, i.e., with
 # the freedom to use, share, modify and share modifications
@@ -121,14 +121,14 @@ PYTHONDONTWRITEBYTECODE="1"
 # This MUST be kept in sync with the PYTHON_TARGETS below
 # Mike Gilbert <floppym@gentoo.org> (2018-05-23)
 # sys-apps/baslayout-2.5 needs split-usr enabled.
-BOOTSTRAP_USE="unicode internal-glib pkg-config split-usr python_targets_python3_6 python_targets_python2_7"
+BOOTSTRAP_USE="unicode internal-glib pkg-config split-usr python_targets_python3_7 python_targets_python2_7"
 
 # Mike Gilbert <floppym@gentoo.org> (2012-05-15)
 # Default target(s) for python-r1.eclass
-# Mikle Kolyada <zlogene@gentoo.org> (2018-07-24)
-# Updated to python3_6
-PYTHON_TARGETS="python2_7 python3_6"
-PYTHON_SINGLE_TARGET="python3_6"
+# Mikle Kolyada <zlogene@gentoo.org> (2020-05-06)
+# Updated to python3_7
+PYTHON_TARGETS="python2_7 python3_7"
+PYTHON_SINGLE_TARGET="python3_7"
 
 # Michał Górny <mgorny@gentoo.org> (2013-08-10)
 # Moved from portage's make.globals.
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 7e38c37b2cdb..0f953392ec90 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Ben Kohler <bkohler@gentoo.org> (2020-04-29)
+# Dependency pam_wrapper missing for tests, and RESTRICT=test is already set
+net-fs/samba test
+
 # Mike Gilbert <floppym@gentoo.org> (2020-04-23)
 # Tests are very sensitive to the host environment.
 dev-util/meson test
@@ -32,10 +36,6 @@ www-apps/nikola ghpages
 # Bug #713590, bug #717744.
 <sys-apps/man-pages-5.05-r1 l10n_de l10n_fr l10n_nl l10n_pl
 
-# Stephan Hartmann <stha09@googlemail.com> (2020-04-11)
-# Requires unreleased >=dev-libs/icu-67
->=www-client/chromium-83.0.4103.7 system-icu
-
 # Ulrich Müller <ulm@gentoo.org> (2020-04-08)
 # Old versions of libjpeg-turbo have known security issues.
 # Use the bundled lib on your own risk. Bug #715106.
@@ -346,7 +346,6 @@ dev-lang/gnat-gpl go
 
 # Pacho Ramos <pacho@gentoo.org> (2018-11-11)
 # pm-utils will be removed, bug #659616
-net-misc/wicd pm-utils
 sys-apps/razercfg pm-utils
 sys-power/powermgmt-base pm-utils
 
@@ -514,10 +513,6 @@ net-proxy/haproxy wurfl
 # dev-dotnet/zeitgeist-sharp is going to be removed, bug #582894
 net-irc/hexchat theme-manager
 
-# Pacho Ramos <pacho@gentoo.org> (2016-11-27)
-# Avoid the usage of dead net-dialup/capi4k-utils
-app-emulation/crossover-bin capi
-
 # Ulrich Müller <ulm@gentoo.org> (2016-10-15)
 # The --with-cairo option is considered as experimental by upstream
 # and causes problems with updating the X window, bug #592238
@@ -737,12 +732,6 @@ dev-lisp/clisp svm
 # Keep it masked here so that I don't need to manage two versions every time.
 media-sound/pulseaudio system-wide
 
-# Jeremy Olexa <darkside@gentoo.org> (2010-01-10)
-# Upsteam doesn't support ioctl backend and neither does Gentoo. ioctl USE flag
-# will eventually be removed unless the backend is re-written by upstream. bug
-# 299674
->net-misc/wicd-1.6.2.2 ioctl
-
 # These are for BSD only
 net-proxy/squid ipf-transparent pf-transparent