gentoo resync : 25.08.2020

8 files changed, 107 insertions, 107 deletions

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index c8b3fcdddc14..1ac69f51ec90 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -163,7 +163,7 @@ POSTGRES_TARGETS="postgres10 postgres11"
 # Moreover, it should only contain targets that have a stable version
 # of PHP, to avoid pulling in an unstable PHP on stable systems.
 #
-PHP_TARGETS="php7-2"
+PHP_TARGETS="php7-2 php7-3"
 
 # Alfredo Tupone <tupone@gentoo.org> (2019-09-03)
 #
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 846b87f7de0d..182b6b292bfd 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Mikle Kolyada <zlogene@gentoo.org> (2020-08-08)
+# Ensure tools flag is enabled for @system set
+sys-apps/kmod tools
+
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-06-24)
 # Don't let people lose 'cc' or 'f77' by accident.
 sys-devel/gcc-config cc-wrappers
@@ -71,7 +75,6 @@ sys-libs/ncurses-compat tinfo
 # Security is not optional if available for the architecture/kernel.
 gnome-base/gnome-desktop seccomp
 app-misc/tracker-miners seccomp
->gnome-base/nautilus-3.29 seccomp
 net-libs/webkit-gtk seccomp
 
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2018-09-11)
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index ac3815a08433..b3f8e0a3d62a 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,10 +6,82 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Michał Górny <mgorny@gentoo.org> (2020-08-22)
+# These flags depend on dev-python/pygtk that is masked for removal.
+app-mobilephone/sobexsrv gtk
+<media-gfx/gimp-3 python
+<x11-libs/vte-0.58 python
+
+# Michał Górny <mgorny@gentoo.org> (2020-08-22)
+# These flags depend on packages masked for removal due to py2.
+<media-tv/mythtv-31 python
+net-libs/zeromq pgm
+sci-geosciences/qgis grass
+
+# Thomas Deutschmann <whissi@gentoo.org> (2020-08-17)
+# CMake checks will only allow on amd64 & x86
+dev-db/mariadb columnstore
+
+# Michał Górny <mgorny@gentoo.org> (2020-08-16)
+# dev-python/pyminuit is being removed.
+sci-visualization/veusz minuit
+
+# Michał Górny <mgorny@gentoo.org> (2020-08-01)
+# Require dev-python/twisted with py2.7.
+net-voip/telepathy-haze test
+net-voip/telepathy-salut test
+
+# Michał Górny <mgorny@gentoo.org> (2020-08-01)
+# dev-python/distributed is going to be last rited.
+dev-python/dask distributed
+dev-python/joblib doc
+
+# Michał Górny <mgorny@gentoo.org> (2020-07-30)
+# Forces downgrade of dev-python/ws4py and its revdeps.
+www-apps/nikola websocket
+
+# Michał Górny <mgorny@gentoo.org> (2020-07-27)
+# These packages require Python 2 support in dev-python/sphinx.
+# They are generally fixable by adding py3 support and using
+# distutils_enable_sphinx to build docs.
+<dev-libs/mongo-c-driver-1 doc
+dev-python/backports-functools-lru-cache doc
+<dev-python/click-7.1.2 doc
+<=dev-python/dulwich-0.19.15 doc
+<=dev-python/futures-3.2.0 doc
+<dev-python/gevent-20 doc
+<dev-python/inflect-4 doc
+<dev-python/jaraco-itertools-5 doc
+<=dev-python/lockfile-0.12.2-r2 doc
+<=dev-python/mysql-python-1.2.5-r3 doc
+<=dev-python/mysqlclient-1.4.6 doc
+<dev-python/pep8-1.7.1-r1 doc
+<dev-python/psycopg-2.8.4 doc
+<dev-python/requests-cache-0.4.12-r1 doc
+<=sci-biology/seqan-2.4.0 doc
+
+# Michał Górny <mgorny@gentoo.org> (2020-07-27)
+# Requires Python 2 support in xapian-bindings which in turn require
+# Python 2 in dev-python/sphinx.
+<www-apps/roundup-3 xapian
+
+# Michał Górny <mgorny@gentoo.org> (2020-07-25)
+# Requires dev-python/beautifulsoup with py2 support.
+<=sys-cluster/charm-6.8.2 doc
+
+# Brian Dolbec <dolsen@gentoo.org> (2020-07-20)
+# Required dependencies are not yet in the Gentoo ebuild tree
+# Please file a bug if this feature is needed
+dev-python/autobahn xbr
+
+# Thomas Deutschmann <whissi@gentoo.org> (2020-07-27)
+# media-video/pipewire:0/0.3 is only available for certain architectures
+www-client/firefox screencast
+
 # Mart Raudsepp <leio@gentoo.org> (2020-06-28)
 # media-video/pipewire:0/0.3 is ongoing work, 0.2 on mutter-3.34
 # is not worth trying to get to work.
-x11-wm/mutter screencast
+<x11-wm/mutter-3.36 screencast
 
 # Stephan Hartmann <stha09@googlemail.com> (2020-06-28)
 # Mostly intended for development and not for general use.
@@ -25,13 +97,8 @@ media-gfx/inkscape jemalloc
 # broken.
 www-client/chromium component-build
 
-# Mikle Kolyada <zlogene@gentoo.org> (2020-06-08)
-# requires clisp whichis keyworded on fewer arches
-app-text/texlive-core xindy
-
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-05-04)
 # Broken error[E0478]: lifetime bound not satisfied
-=dev-lang/rust-1.44.0 miri
 =dev-lang/rust-1.44.1 miri
 
 # Ben Kohler <bkohler@gentoo.org> (2020-04-29)
@@ -46,18 +113,10 @@ dev-util/meson test
 # Requires dev-python/filemagic that is broken and masked for removal.
 dev-python/jira magic
 
-# Michał Górny <mgorny@gentoo.org> (2020-04-20)
-# Requires dev-python/rst2pdf that is masked for removal.
-media-video/mpv doc
-
 # Michał Górny <mgorny@gentoo.org> (2020-04-19)
 # Requires dev-vcs/ghp-import that is masked for removal.
 www-apps/nikola ghpages
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-04-19)
-# oracle-jdk-bin masked for removal, mask revdep useflag.
-=app-forensics/sleuthkit-4.7.0 java
-
 # 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.
@@ -103,52 +162,29 @@ dev-util/buildbot doc
 # Requires deprecated python2 and pygtk
 mail-client/claws-mail python
 
-# Michał Górny <mgorny@gentoo.org> (2020-03-24)
-# Require dev-python/recommonmark with py2.
-<sys-devel/llvm-9 doc
-
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-03-18)
-# USE=doc makes rust compile 6 times!
-# Reason unknown yet, masking for now.
-=dev-lang/rust-1.42.0 doc
-
-# Michał Górny <mgorny@gentoo.org> (2020-03-17)
-# dev-python/soappy is being removed.
-dev-python/twisted soap
-
 # Guilherme Amadio <amadio@gentoo.org> (2020-03-16)
 # Requires dev-libs/cudnn which is only available on amd64
 sci-physics/root cudnn
 
 # Thomas Deutschmann <whissi@gentoo.org> (2020-03-11)
 # Encrypted Media Extensions (eme-free) can't be disabled everywhere
+mail-client/thunderbird eme-free
 www-client/firefox eme-free
 
-# Michał Górny <mgorny@gentoo.org> (2020-03-03)
-# Tests require py2 sleekxmpp and they are restricted anyway.
-net-im/spectrum2 test
-
 # Rick Farina <zerochaos@gentoo.org> (2020-02-26)
 # dev-python/pyzmq USE=doc deps are not met with python2_7
 dev-python/pyzmq doc
 
-# Michał Górny <mgorny@gentoo.org> (2020-02-08)
-# The dependency is python-single-r1 while the package (and its revdeps)
-# are python-r1.
-dev-python/rdflib redland
-
 # Michał Górny <mgorny@gentoo.org> (2020-02-04)
 # Unsatisfiable dep due to missing impls.
 dev-python/zeep tornado
 
 # Michał Górny <mgorny@gentoo.org> (2020-01-29)
 # Require Python 2 support in numpydoc.
-<dev-python/matplotlib-3 doc
 <=dev-python/pywavelets-0.5.2-r1 doc
 
 # Michał Górny <mgorny@gentoo.org> (2020-01-29)
 # Require dev-python/epydoc which is being removed.
-<=dev-python/restkit-4.2.2 doc
 <=dev-python/suds-0.6-r1 doc
 
 # Michał Górny <mgorny@gentoo.org> (2020-01-27)
@@ -156,10 +192,6 @@ dev-python/zeep tornado
 net-irc/telepathy-idle test
 net-voip/telepathy-rakia test
 
-# Michał Górny <mgorny@gentoo.org> (2020-01-27)
-# dev-python/zsi is being removed.
-sci-chemistry/pdb2pqr opal
-
 # Michał Górny <mgorny@gentoo.org> (2020-01-12)
 # libcxxrt is unmaintained and it's going to be removed.
 sys-libs/libcxx libcxxrt
@@ -185,10 +217,6 @@ app-emulation/aranym jit
 media-sound/beets webserver
 
 # Michał Górny <mgorny@gentoo.org> (2019-12-04)
-# Python 2.7 only packages optionally needing dev-python/ipython.
-dev-python/restkit cli
-
-# Michał Górny <mgorny@gentoo.org> (2019-12-04)
 # Packages requiring dev-python/ipython to build the docs and still
 # supporting Python 2.7.  This can be resolved long term via either
 # using any-r1 API to build docs or cond-deps.
@@ -216,7 +244,6 @@ sys-block/open-isns slp
 # Mask USE until they are fixed
 =dev-libs/xapian-bindings-1.2.25 php
 media-gfx/exact-image php
-sci-geosciences/mapserver php
 
 # Michał Górny <mgorny@gentoo.org> (2019-09-28)
 # media-fonts/hkscs-ming is slated for removal.
@@ -259,12 +286,6 @@ sys-kernel/linux-firmware initramfs
 # Requires dev-libs/gumbo which is only keyworded for amd64 and x86
 mail-client/claws-mail litehtml
 
-# James Le Cuirot <chewi@gentoo.org> (2019-05-21)
-# Doesn't support ffmpeg-4. Portage takes a long time to report the
-# conflict and the feature is half broken anyway. See
-# https://github.com/visualboyadvance-m/visualboyadvance-m/issues/179.
-games-emulation/vbam ffmpeg
-
 # Ulrich Müller <ulm@gentoo.org> (2019-05-18)
 # Firmware images without a known license. Most likely, upstream
 # redistribution may conflict with the licenses or lack thereof
@@ -298,10 +319,6 @@ app-admin/conserver freeipmi
 # (bug #674364)
 sys-apps/memtest86+ floppy
 
-# Brian Evans <grknight@gentoo.org> (2019-01-11)
-# Depend on the EOL PHP 7.0
-dev-libs/Ice php
-
 # Michał Górny <mgorny@gentoo.org> (2018-11-28)
 # Requires last-rited games-server/ut2003-ded.
 games-fps/ut2003 dedicated
@@ -341,12 +358,6 @@ sys-block/fio static
 # Depends on last-rited sci-libs/coinhsl.
 sci-libs/ipopt hsl
 
-# Göktürk Yüksek <gokturk@gentoo.org> (2018-04-04)
-# libewf is getting treecleaned (#547418).
-# Starting with sleuthkit-4.6.0, we statically link sleuthkit to a
-# locally compiled libewf. Mask the prior versions.
-<app-forensics/sleuthkit-4.6.0 ewf
-
 # Lars Wendler <polynomial-c@gentoo.org> (2018-03-14)
 # Broken on all 32bit arches. Globally masked because of sys-apps/dmapi having
 # no active upstream anymore.
@@ -438,20 +449,10 @@ sys-devel/gcc pie
 # Multiple test failures.
 sys-boot/grub:2 test
 
-# Ian Stakenvicius (2017-01-25)
-# rust on mozilla packages is experimental
-www-client/firefox rust
-mail-client/thunderbird rust
-
 # Lars Wendler <polynomial-c@gentoo.org> (2017-01-19)
 # Masked until system heimdal can finally be used with AD DC
 net-fs/samba system-heimdal
 
-# Magnus Granberg <zorry@gentoo.org> (2017-01-18)
-# Adding the mask so that end users and devlopers are notified of the removal and have some
-# time to migrate. There is no support for gcj in gcc-7
->=sys-devel/gcc-6.3.0 gcj
-
 # Robin H. Johnson <robbat2@gentoo.org> (2016-12-04)
 # Additional HAProxy functionality waiting for related stuff to land in the
 # tree.
@@ -501,12 +502,6 @@ sys-devel/gcc vtv
 # invokes it wrong.
 dev-lang/moarvm asan
 
-# Ian Stakenvicius <axs@gentoo.org> (2016-04-28)
-# system-cairo support causes lots of crashing in mozilla pkgs
-# (see bug #556378 and others)
-www-client/firefox system-cairo
-mail-client/thunderbird system-cairo
-
 # James Le Cuirot <chewi@gentoo.org> (2016-04-10)
 # Slower and less reliable than HotSpot and we don't support Java on
 # any non-HotSpot platforms. Don't unmask these unless you know what
@@ -611,10 +606,6 @@ app-doc/doxygen sqlite
 # Lyx is currently not working with subversion 1.7 and needs 1.6.
 app-office/lyx subversion
 
-# Christian Faulhammer <fauli@gentoo.org> (2013-05-08)
-# Will not build successfully yet
-mail-client/claws-mail gtk3
-
 # Bernard Cafarelli <voyageur@gentoo.org> (2013-04-04)
 # Broken for now (segmentation fault on play)
 gnustep-apps/cynthiune flac
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index ba1cae654908..c5f9401e4288 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,9 +4,14 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-07-01)
+# Pacho Ramos <pacho@gentoo.org> (2020-08-21)
+# app-text/pandoc is hard to stabilize #737612
+sys-apps/earlyoom docs
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2020-08-03)
 # dev-qt/qtquicktimeline-5.15.0 not yet stable, bug 711120
-dev-qt/qt-creator qmldesigner
+# dev-libs/libclangformat-ide not stable and unclear maintainer, bug 711120
+>=dev-qt/qt-creator-4.12 clang qmldesigner
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-06-06)
 # dev-python/wxpython:4.0 w/ py3 is not stable, bug #714566
@@ -69,7 +74,6 @@ dev-perl/Template-Toolkit gd
 media-fonts/unifont utils fontforge
 media-video/vdrsync dvdr
 www-apps/bugzilla extras
-www-apps/otrs gd
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-07-16)
 # sci-libs/dcmtk is not stable
@@ -106,10 +110,6 @@ app-admin/sudo sssd
 # app-misc/ddcutil is not yet stable.
 kde-plasma/powerdevil brightness-control
 
-# Michał Górny <mgorny@gentoo.org> (2018-06-07)
-# sys-libs/netbsd-csu not stable yet.
-sys-devel/clang-runtime crt
-
 # Thomas Deutschmann <whissi@gentoo.org> (2018-06-01)
 # Needs dev-ruby/asciidoctor which has a lot of unstable deps
 net-analyzer/wireshark doc
@@ -175,12 +175,6 @@ kde-apps/cantor julia
 # This is stable masked as g-sorcery is being not actively developed.
 app-portage/layman g-sorcery
 
-# David Seifert <soap@gentoo.org> (2017-02-12)
-# Unknown future, stable deps are hopelessly
-# broken, only allow for unstable keywords
-# Bug: #581058
-net-misc/asterisk osplookup
-
 # Michael Palimaka <kensington@gentoo.org (2017-01-26)
 # Requires testing version of media-libs/opencv
 media-libs/mlt opencv
diff --git a/profiles/base/packages b/profiles/base/packages
index 1bfcdfa35fc5..cb524e2293ae 100644
--- a/profiles/base/packages
+++ b/profiles/base/packages
@@ -41,6 +41,7 @@
 *sys-apps/gawk
 *sys-apps/grep
 *sys-apps/kbd
+*sys-apps/kmod
 # temporary bugfix for #398295
 *sys-apps/less
 *sys-process/procps
@@ -58,7 +59,6 @@
 *virtual/editor
 *virtual/libc
 *virtual/man
-*virtual/modutils
 *virtual/os-headers
 *virtual/package-manager
 *virtual/pager
diff --git a/profiles/base/use.force b/profiles/base/use.force
index b864455a7c81..d51d6c2ea56c 100644
--- a/profiles/base/use.force
+++ b/profiles/base/use.force
@@ -1,6 +1,11 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Matt Turner <mattst88@gentoo.org> (2020-08-11)
+# Force USE=libglvnd in order to mask app-eselect/eselect-opengl for removal.
+# This USE flag will be removed completely in the near future. Bug #728286
+libglvnd
+
 # Mike Gilbert <floppym@gentoo.org> (2019-07-20)
 # Disabling this requires a migration to be performed.
 split-usr
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 4c51769639fc..c0db71b19156 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -1,6 +1,18 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2020-08-22)
+# app-office/openoffice-bin is being removed.
+office_implementation_openoffice
+
+# Patrick Lauer <patrick@gentoo.org> (2020-08-18)
+# pg13 is currently beta and has no keywords yet
+postgres_targets_postgres13
+
+# Mikle Kolyada <zlogene@gentoo.org> (2020-08-02)
+# consolekit is masked for removal
+consolekit
+
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
@@ -8,10 +20,6 @@
 # Mask Ruby 2.4 as EOL
 ruby_targets_ruby24
 
-# Ben Kohler <bkohler@gentoo.org> (2020-05-15)
-# Mask 9.4 target to match <9.5 package.mask entry
-postgres_targets_postgres9_4
-
 # Matt Turner <mattst88@gentoo.org> (2020-03-25)
 # media-libs/libav is masked for removal
 libav
@@ -40,6 +48,9 @@ php_targets_php7-0
 # d3d9 only works on amd64/x86.
 d3d9
 
+# winssl is for prefix/windows/winnt only
+winssl
+
 # CURL_SSL=winssl is for prefix/windows/winnt only
 curl_ssl_winssl
 
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index a8422351f10a..81ece61c1376 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -13,10 +13,6 @@ python_single_target_python3_9
 # dev-vcs/darcs (dev-lang/ghc) has no stable keywords.
 darcs
 
-# Patrick Lauer <patrick@gentoo.org> (2019-10-04)
-# No postgres-12 stable yet
-postgres_targets_postgres12
-
 # Zac Medico <zmedico@gentoo.org> (2016-09-01)
 # Needs dev-python/pypy* stable
 python_targets_pypy3