gentoo resync : 22.01.2021

5 files changed, 25 insertions, 41 deletions

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index b5cbd7f8143b..981eda7446a7 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -102,7 +102,7 @@ LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses te
 # Manuel Rüger <mrueg@gentoo.org> (2015-09-09)
 # Default Ruby build target(s)
 # Updated to include ruby26 on 2020-09-14
-RUBY_TARGETS="ruby25 ruby26"
+RUBY_TARGETS="ruby26"
 
 # Enable extended filesystem attribute support by default.
 # https://archives.gentoo.org/gentoo-dev/message/ba0e3457e4b807e79816f0df03566af0
@@ -166,7 +166,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 php7-3 php7-4"
+PHP_TARGETS="php7-3 php7-4"
 
 # Alfredo Tupone <tupone@gentoo.org> (2019-09-03)
 #
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 52f7499a622d..7fccdd3e1850 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -1,6 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2021-01-16)
+# NVTT support required for building games-strategy/0ad-data.
+=games-strategy/0ad-0.0.24_alpha_pre* nvtt
+
 # Lars Wendler <polynomial-c@gentoo.org> (2020-12-31)
 # Force-enable unicode. We're in 2020 and this should really be available
 # everywhere.
@@ -163,7 +167,6 @@ app-shells/bash:0 readline
 # Force-enable all PYTHON_TARGETS for python-exec to avoid using private
 # API. Please remember to keep it in sync with python_targets.desc.
 dev-lang/python-exec python_targets_python2_7
-dev-lang/python-exec python_targets_python3_6
 dev-lang/python-exec python_targets_python3_7
 dev-lang/python-exec python_targets_python3_8
 dev-lang/python-exec python_targets_python3_9
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 31123461d8e6..1523482ee630 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.
 
+# Michał Górny <mgorny@gentoo.org> (2021-01-19)
+# Requires masked media-sound/mp3_check.
+app-cdr/burncdda mp3
+
 # Brian Evans <grknight@gentoo.org> (2021-01-07)
 # Block test deps on packages until they can be updated
 # Old phpunit does not work with new PHP and last is vulnerable
@@ -57,15 +61,15 @@ x11-libs/colord-gtk doc
 <dev-ml/llvm-ocaml-11 llvm_targets_AVR
 <sys-devel/clang-11 llvm_targets_AVR
 <sys-devel/llvm-11 llvm_targets_AVR
-<dev-ml/llvm-ocaml-11.0.1.9999 llvm_targets_ARC llvm_targets_VE
-<sys-devel/clang-11.0.1.9999 llvm_targets_ARC llvm_targets_VE
-<sys-devel/llvm-11.0.1.9999 llvm_targets_ARC llvm_targets_VE
+<dev-ml/llvm-ocaml-12 llvm_targets_ARC llvm_targets_VE
+<sys-devel/clang-12 llvm_targets_ARC llvm_targets_VE
+<sys-devel/llvm-12 llvm_targets_ARC llvm_targets_VE
 <dev-ml/llvm-ocaml-12.0.0.9999 llvm_targets_CSKY
 <sys-devel/clang-12.0.0.9999 llvm_targets_CSKY
 <sys-devel/llvm-12.0.0.9999 llvm_targets_CSKY
 
 # Joonas Niilola <juippis@gentoo.org> (2020-12-03)
-# Doc building seem to be very random without any predictability, 
+# Doc building seem to be very random without any predictability,
 # bug #734104
 media-gfx/blender doc
 
@@ -110,7 +114,7 @@ net-im/telepathy-connection-managers gadu icq meanwhile steam yahoo
 sci-geosciences/viking mapnik
 
 # Joonas Niilola <juippis@gentoo.org> (2020-09-23)
-# Highly experimental, may cause breakages when updating. Use with 
+# Highly experimental, may cause breakages when updating. Use with
 # caution!
 dev-libs/efl efl-one
 
@@ -192,14 +196,6 @@ dev-util/meson test
 # Requires dev-vcs/ghp-import that is masked for removal.
 www-apps/nikola ghpages
 
-# Ulrich Müller <ulm@gentoo.org> (2020-04-08, 2020-11-21)
-# Old versions of libjpeg-turbo have known security issues.
-# The version included with >=zoom-5.3 has an empty DT_RPATH,
-# which is insecure because the loader will search the working
-# directory when it finds an empty path.
-# Use the bundled lib on your own risk. Bug #715106.
-net-im/zoom bundled-libjpeg-turbo
-
 # Alfredo Tupone <tupone@gentoo.org> (2020-04-04)
 # Ada support is not yet ready for sys-deve/gcc
 sys-devel/gcc ada
@@ -245,6 +241,10 @@ net-irc/telepathy-idle test
 # libcxxrt is unmaintained and it's going to be removed.
 sys-libs/libcxx libcxxrt
 
+# Alexey Shvetsov <alexxy@gentoo.org> (2019-12-24)
+# Gromacs python module install br0ken
+sci-chemistry/gromacs python
+
 # Brian Evans <grknight@gentoo.org> (2019-12-19)
 # PHP 7.1 is end of life and has security issues Bug 703326
 # Associated packages are not ready for new versions tracked in bug 702110
@@ -260,10 +260,6 @@ sci-mathematics/gsl-shell fox
 # 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)
 # Packages requiring dev-python/ipython to build the docs and still
 # supporting Python 2.7.  This can be resolved long term via either
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 4065a7678029..d94f7915e31d 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,11 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Sam James <sam@gentoo.org> (2021-01-09)
+# relapack is experimental, please be careful with use
+# bug #764206
+sci-libs/openblas relapack
+
 # Brian Evans <grknight@gentoo.org> (2021-01-07)
 # temporarily block tests so that bugs can be resolved
 dev-php/theseer-Autoload test
@@ -32,10 +37,6 @@ dev-java/openjdk:8 javafx
 # app-text/pandoc is hard to stabilize #737612
 sys-apps/earlyoom docs
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-06-06)
-# dev-python/wxpython:4.0 w/ py3 is not stable, bug #714566
-dev-python/matplotlib wxwidgets
-
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-04-13)
 # app-text/pandoc (dev-lang/ghc) has no stable keywords.
 app-emulation/xen-tools doc
@@ -79,10 +80,6 @@ dev-perl/Template-Toolkit gd
 media-fonts/unifont utils fontforge
 media-video/vdrsync dvdr
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2019-07-16)
-# sci-libs/dcmtk is not stable
-media-libs/openimageio dicom
-
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-05-10)
 # needs llvm slots which are not stable #678908
 # also prone to weird compilation failures
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 11e7560900e2..a5d0bb3705e2 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -10,14 +10,6 @@
 php_targets_php7-2
 php7-2
 
-# Michał Górny <mgorny@gentoo.org> (2021-01-01)
-# The support for python3.6 target in Gentoo is discontinued.
-# The flags are masked to permit removal of the last backport packages.
-# Once they're gone, the eclass support will be disabled and the flags
-# removed.
-python_targets_python3_6
-python_single_target_python3_6
-
 # Alexis Ballier <aballier@gentoo.org> (2020-10-13)
 # Nothing depends on those ROS messages. dev-ros/geneus
 # is half broken in our setup where it looks for packages
@@ -25,10 +17,6 @@ python_single_target_python3_6
 # See e.g. https://bugs.gentoo.org/741076
 ros_messages_eus
 
-# Michał Górny <mgorny@gentoo.org> (2020-08-22)
-# app-office/openoffice-bin is being removed.
-office_implementation_openoffice
-
 # Hans de Graaff <graaff@gentoo.org> (2020-06-13)
 # Mask Ruby 2.4 as EOL
 ruby_targets_ruby24