gentoo resync : 15.12.2019

6 files changed, 74 insertions, 32 deletions

diff --git a/profiles/base/package.use b/profiles/base/package.use
index 8f3e278bef43..b215ecbea495 100644
--- a/profiles/base/package.use
+++ b/profiles/base/package.use
@@ -5,7 +5,6 @@
 # These py2-only packages also support pypy, enable
 # Python 2.7 as the default implementation, preparing
 # for the eventual switch to py3 in PYTHON_SINGLE_TARGET
-app-text/wklej python_single_target_python2_7 python_targets_python2_7
 dev-vcs/git-bz python_single_target_python2_7 python_targets_python2_7
 gnome-base/libglade python_single_target_python2_7 python_targets_python2_7
 sci-chemistry/pdb-tools python_single_target_python2_7 python_targets_python2_7
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 2da9ae37b651..e8205d6ded66 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -1,6 +1,13 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2019-12-06)
+# Non-initramfs builds do not work with the default .config.  Force
+# the mask, so that users don't brick their systems.  If somebody wants
+# to avoid initramfs, he needs to use a custom .config and unforce
+# the flag.
+sys-kernel/vanilla-kernel initramfs
+
 # Sergei Trofimovich <slyfox@gentoo.org> (2019-11-06)
 # Upstream plans to drop libcrypt.so.1/crypt.h from glibc
 # distribution and rely on external providers lke libxcrypt.
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index d6371f5ea880..20afd26681ea 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,12 +1,57 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# This file requires >=portage-2.1.1
 # New entries go on top.
 
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Ulrich Müller <ulm@gentoo.org> (2019-12-11)
+# Depends on last-rited app-i18n/man-pages-da.
+sys-apps/man-pages l10n_da
+
+# James Le Cuirot <chewi@gentoo.org> (2019-12-10)
+# The JIT feature only works on amd64 and x86.
+app-emulation/aranym jit
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2019-12-07)
+# dev-python/flask-cors is PMASKED.
+media-sound/beets webserver
+
+# Michał Górny <mgorny@gentoo.org> (2019-12-04)
+# Python 2.7 only packages optionally needing dev-python/ipython.
+app-misc/gourmet 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.
+dev-python/matplotlib doc
+dev-python/pandas doc
+<dev-python/pandas-0.24.2 full-support test
+dev-python/pandas-datareader doc
+dev-python/patsy doc
+dev-python/statsmodels doc
+
+# Haelwenn (lanodan) Monnier <contact@hacktivis.me> (2019-12-01)
+# broken static-linking in glibc and maybe others
+>app-shells/mksh-57-r1 static
+
+# Michał Górny <mgorny@gentoo.org> (2019-11-29)
+# Requires dev-python/astropy that's being removed.
+sci-visualization/veusz fits
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2019-11-28)
+# sci-visualization/visit is on the way out, bug #657952
+sci-libs/libgeodecomp visit
+
+# Michał Górny <mgorny@gentoo.org> (2019-11-25)
+# Requires old version of dev-python/sphinx that's being removed.
+~dev-python/fabric-2.3.1 doc
+<dev-python/hacking-1.1.0 doc
+<dev-python/pycadf-2.7.0 doc
+
 # Michał Górny <mgorny@gentoo.org> (2019-11-09)
 # eMovix is being removed.
 kde-apps/k3b emovix
@@ -148,15 +193,6 @@ sys-apps/memtest86+ floppy
 # Depend on the EOL PHP 7.0
 dev-libs/Ice php
 
-# Michał Górny <mgorny@gentoo.org> (2018-12-01)
-# Moved from use.mask to specific packages.
-# Andreas Sturmlechner <asturm@gentoo.org> (2018-05-10)
-# media-sound/mumble is masked/not keyworded at this point, bug #656826.
-games-fps/quake3 mumble
-games-fps/turtlearena mumble
-games-fps/urbanterror mumble
-games-rpg/manaplus mumble
-
 # Michał Górny <mgorny@gentoo.org> (2018-11-28)
 # Requires last-rited games-server/ut2003-ded.
 games-fps/ut2003 dedicated
@@ -258,10 +294,6 @@ dev-java/oracle-jdk-bin:11 gentoo-vm
 dev-java/openjdk-bin:11 gentoo-vm
 dev-java/openjdk:11 gentoo-vm
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2017-11-04)
-# Requires audacious, which is masked. Bug 632513
-media-libs/freeverb3 jack
-
 # Andreas K. Huettel <dilfridge@gentoo.org> (2017-09-09)
 # Potentially destructive. Use it only if you know what you're doing.
 sys-libs/glibc vanilla
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index c35e3a17bb1b..f21b074da565 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +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> (2019-12-09)
+# Declared experimental, and dev-cpp/websocketpp not stable yet
+sci-libs/indilib websocket
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2019-11-28)
+# sci-libs/vtk is not stable anymore
+media-libs/opencv vtk
+
 # Kent Fredric <kentnl@gentoo.org> (2019-08-29)
 # Support for DBD-mysql to use mariadb is sketchy. Use DBD-MariaDB
 # instead if you can.
@@ -55,7 +63,7 @@ media-gfx/alembic arnold maya
 media-plugins/grilo-plugins chromaprint
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-02-16)
-# media-libs/opencv[contrib,contrib_dnn], net-libs/libmediawiki,
+# media-libs/opencv[contrib,contribdnn], net-libs/libmediawiki,
 # net-libs/libkvkontakte all not stable anywhere.
 kde-apps/kipi-plugins mediawiki vkontakte
 media-gfx/digikam dnn vkontakte
@@ -76,10 +84,6 @@ sys-devel/clang-runtime crt
 # Needs dev-ruby/asciidoctor which has a lot of unstable deps
 net-analyzer/wireshark doc
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2018-05-29)
-# Depends on unstable media-libs/libaom
-media-video/vlc aom
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2018-05-21)
 # Depends on lots of unstable dependencies
 dev-python/s3fs test
@@ -116,6 +120,10 @@ app-backup/backup-manager s3
 # Requires stable phpunit
 dev-php/PEAR-Text_Password test
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2017-11-04)
+# Requires audacious, which is masked. Bug 632513
+media-libs/freeverb3 audacious jack
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2017-10-22)
 # Requires unmaintained unstable dependency net-libs/gloox.
 # The go flag requires stable masked dev-lang/go[gccgo].
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 6e981e94a6e9..2181e5f8302b 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -8,18 +8,10 @@
 # Mask PHP 5.6 target for EOL
 php_targets_php5-6
 
-# Matt Turner <mattst88@gentoo.org> (2019-03-03)
-# Mask for testing. Bug 606924
-libglvnd
-
 # Matt Turner <mattst88@gentoo.org> (2019-09-01)
 # app-office/texmacs is package.mask'd. Bug #436400
 texmacs
 
-# Brian Evans <grknight@gentoo.org> (2019-07-25)
-# Mask flag for early testing
-php_targets_php7-4
-
 # Hans de Graaff <graaff@gentoo.org> (2019-04-07)
 # Mask Ruby 2.3 as EOL
 ruby_targets_ruby23
@@ -32,10 +24,6 @@ php_targets_php7-0
 # d3d9 only works on amd64/x86.
 d3d9
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2017-11-04)
-# Unkeyworded on most arches, unmasked in supported arch profiles.
-audacious
-
 # 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 9ddc19ed3b00..636435aa7dd4 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -4,6 +4,14 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Matt Turner <mattst88@gentoo.org> (2019-12-05)
+# Mask for testing. Bug 606924
+libglvnd
+
+# Thomas Deutschmann <whissi@gentoo.org> (28 Nov  2019)
+# Mask PHP 7.4 target while unstable
+php_targets_php7-4
+
 # Patrick Lauer <patrick@gentoo.org> (2019-10-04)
 # No postgres-12 stable yet
 postgres_targets_postgres12