10 files changed, 95 insertions, 68 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index c4bbffdd4d45..bdcc09537456 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 1f3d106695d0..33d1a456737a 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -17,6 +17,12 @@
 
 #--- END OF EXAMPLES ---
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2021-05-05)
+# openjfx:8 will never be stabilized
+# openjfx:11 probably will neither
+dev-java/openjdk:8 javafx
+dev-java/openjdk:11 javafx
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-10-05)
 # REQUIRED_USE="base? ( firebird )", dev-db/firebird is not stable
 app-office/libreoffice base
diff --git a/profiles/arch/hppa/package.mask b/profiles/arch/hppa/package.mask
index c06c1c0e9473..9fa28f2c1954 100644
--- a/profiles/arch/hppa/package.mask
+++ b/profiles/arch/hppa/package.mask
@@ -1,3 +1,7 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Quote from <eike@s...l.de>:
+# "Compilation fails with: #error You need to define CycleTimer for 
+#  your OS and CPU"
+dev-cpp/benchmark
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 8a42be2310b3..81f0d8fb009a 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -1,6 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2021-05-07)
+# Forced on for now as generated headers are now
+# included unconditionally.
+# (https://github.com/cyrusimap/cyrus-imapd/pull/3270)
+>=net-mail/cyrus-imapd-3.4.0 sieve
+
 # Sam James <sam@gentoo.org> (2021-03-08)
 # Broken without USE=unicode
 # Needs to link with libiconv, bug #774507
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 6ecb579a7e57..2c776600b2f3 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -27,10 +27,6 @@ net-analyzer/wireshark lto
 # bug #651740
 net-misc/openssh debug
 
-# Stephan Hartmann <sultan@gentoo.org> (2021-03-21)
-# Requires unreleased sys-devel/icu-69.1
->=www-client/chromium-91 system-icu
-
 # Michał Górny <mgorny@gentoo.org> (2021-03-06)
 # LLVM 9 has been removed.
 <dev-lang/julia-1.6.0 system-llvm
diff --git a/profiles/default/linux/package.use.mask b/profiles/default/linux/package.use.mask
index 0a7c8e5cb3c3..2b4f9ea7dd26 100644
--- a/profiles/default/linux/package.use.mask
+++ b/profiles/default/linux/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andrey Grozin <grozin@gentoo.org> (2021-05-06)
+# Upstream bug: all versions in the tree fail to compile
+# bug #782688
+media-gfx/asymptote offscreen
+
 # Peter Levine <plevine457@gmail.com> (2019-10-01)
 # Native inotify support is preferred on linux.
 # bug #697476
diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask
index 2f75b94c597e..c8f235afbef1 100644
--- a/profiles/features/selinux/package.mask
+++ b/profiles/features/selinux/package.mask
@@ -5,13 +5,6 @@
 # depends on sys-apps/systemd
 kde-plasma/plasma-firewall
 
-# 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-portage/distpatch
-app-portage/metagen
-
 # Gilles Dartiguelongue <eva@gentoo.org> (2018-05-24)
 # Packages use systemd unconditionally for now
 >=app-admin/abrt-2.10
diff --git a/profiles/package.mask b/profiles/package.mask
index 4f1166ada384..e1dcf8118ac4 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,9 +32,72 @@
 
 #--- END OF EXAMPLES ---
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2021-05-03)
-# Sync concurrent unmasking with icu/chromium/boost.
-~dev-qt/qtwebengine-5.15.2_p20210421
+# Sam James <sam@gentoo.org> (2021-05-07)
+# Masked for testing. Two major releases ahead of last packaged version.
+# Please report bugs but this is experimental for now.
+# bug #731266
+~net-mail/cyrus-imapd-3.4.0
+
+# Joonas Niilola <juippis@gentoo.org> (2021-05-06)
+# sci-libs/cbflib: Doesn't compile with GCC-10 or GCC-11. Was never
+# ported to work with GCC-10+. sci-chemistry/rasmol depends on cbflib.
+# Both packages have updates ignored in Gentoo, and their ebuilds
+# pretty much untouched during git-era. Both had their latest upstream
+# version release in 2018. Removal in ~30 days. Bug #788508
+sci-libs/cbflib
+sci-chemistry/rasmol
+
+# David Seifert <soap@gentoo.org> (2021-05-05)
+# Causes unsolvable package conflicts, bug #788310
+>=media-libs/openexr-3
+
+# Miroslav Šulc <fordfrog@gentoo.org> (2021-05-05)
+# no consumers, dead homepage
+# removal in 30 days
+# see bug: https://bugs.gentoo.org/787329
+app-misc/jitac
+
+# Miroslav Šulc <fordfrog@gentoo.org> (2021-05-05)
+# last release in 2009
+# removal in 30 days
+# see bug: https://bugs.gentoo.org/787332
+app-office/hourglass
+
+# Miroslav Šulc <fordfrog@gentoo.org> (2021-05-05)
+# no consumers, last release in 2005
+# removal in 30 days
+# see bug: https://bugs.gentoo.org/787368
+dev-util/jarwizard
+
+# Miroslav Šulc <fordfrog@gentoo.org> (2021-05-05)
+# no consumers, last release in 2008
+# removal in 30 days
+# see bug: https://bugs.gentoo.org/787428
+media-sound/entagged-tageditor
+
+# Miroslav Šulc <fordfrog@gentoo.org> (2021-05-05)
+# no consumers, last release in 2009
+# removal in 30 days
+# see bug: https://bugs.gentoo.org/787434
+media-sound/protux
+
+# Miroslav Šulc <fordfrog@gentoo.org> (2021-05-05)
+# no consumers, last release in 2013
+# removal in 30 days
+# see bug: https://bugs.gentoo.org/787638
+net-nds/jxplorer
+
+# Miroslav Šulc <fordfrog@gentoo.org> (2021-05-05)
+# no consumers, last release in 2011
+# removal in 30 days
+# see bug: https://bugs.gentoo.org/787656
+sci-physics/jaxodraw
+
+# Miroslav Šulc <fordfrog@gentoo.org> (2021-05-05)
+# no consumers
+# removal in 30 days
+# see bug: https://bugs.gentoo.org/785400
+dev-java/cldc-api
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2021-05-01)
 # nsplugin is dead, bug #771801
@@ -454,12 +517,6 @@ dev-util/bless
 dev-dotnet/gkeyfile-sharp
 dev-dotnet/notify-sharp
 
-# David Seifert <soap@gentoo.org> (2021-04-24)
-# Masked for testing and until revdeps have been fixed, Bug #763201.
-# Sync concurrent unmasking with icu/chromium/qtwebengine.
->=dev-libs/boost-1.76.0
->=dev-util/boost-build-1.76.0
-
 # Stephan Hartmann <sultan@gentoo.org> (2021-04-24)
 # Dev channel releases are only for people who
 # are developers or want more experimental features
@@ -608,22 +665,9 @@ dev-python/monotonic
 games-misc/games-envd
 
 # Lars Wendler <polynomial-c@gentoo.org> (2021-04-08)
-# Masked for testing and until revdeps have been fixed:
-# bug #781188
->=dev-libs/icu-69.1
->=dev-libs/icu-layoutex-69.1
-
-# Lars Wendler <polynomial-c@gentoo.org> (2021-04-08)
 # Masked for testing
 >=app-crypt/gnupg-2.3.0
 
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-06)
-# Last release of dev-java/cal10n in 2013, no consumer
-# in the tree except dev-java/slf4j-ext which is not
-# needed by any package aswell. Removal in 30 days.
-dev-java/cal10n
-dev-java/slf4j-ext
-
 # Sergey Popov <pinkbyte@gentoo.org> (2021-04-06)
 # Ancient version, currently no consumers in main tree
 # The only one consumer was mail-client/roundcube
@@ -631,45 +675,18 @@ dev-java/slf4j-ext
 # Masked for removal in 30 days.
 dev-php/PEAR-Net_LDAP3
 
-# David Seifert <soap@gentoo.org> (2021-04-05)
-# Completely broken, unmaintained, does not build. Newer version
-# use Maven, good luck with that. Bugs #418625, #431644, #515816
-# #542940, #574632, #780396, removal in 30 days.
-sci-biology/gatk
-
-# David Seifert <soap@gentoo.org> (2021-04-05)
-# Tests broken since perl 5.22, last release in 2008,
-# Bug #625492, removal in 30 days.
-sci-biology/diya
-
 # Michał Górny <mgorny@gentoo.org> (2021-03-31)
 # New versions remove PORTAGE_CONFIGROOT support, breaking a lot
 # of scripts.
 >=dev-util/pkgdev-0.1.3
 >=sys-apps/pkgcore-0.11.7
 
-# Rick Farina <zerochaos@gentoo.org> (2021-03-30)
-# Gentoo doesn't use this package, and the one package which needs it now uses the bundled version
-# Masked for removal in 30 days
-dev-libs/go-usb
-
 # Sam James <sam@gentoo.org> (2021-03-30)
 # Seems to break dev-tex/culmus-latex
 # Masking until we can investigate & fix
 # bug #737406
 =media-fonts/culmus-0.133-r1
 
-# Jonas Stein <jstein@gentoo.org> (2021-03-29)
-# Depends on gtk-2, no release since 2010.
-# Removal on 2021-05-01.
-# Bug #779148.
-app-editors/beaver
-
-# Jonas Stein <jstein@gentoo.org> (2021-03-27)
-# Upstream is gone. Open bugs. Removal after 2021-05-01.
-# Bug #778800
-x11-themes/nimbus
-
 # Lars Wendler <polynomial-c@gentoo.org> (2021-03-22)
 # Has unidentified race condition on very fast CPUs that causes maintainer-
 # mode to be triggered.
diff --git a/profiles/updates/2Q-2021 b/profiles/updates/2Q-2021
index 92c6ccada772..e2f025a02ffe 100644
--- a/profiles/updates/2Q-2021
+++ b/profiles/updates/2Q-2021
@@ -1,2 +1,3 @@
 move dev-python/PyICU dev-python/pyicu
 move dev-python/python-fastimport dev-python/fastimport
+move dev-python/ebuildtester dev-util/ebuildtester
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 3aa6c4e81b3d..3c3cc2445667 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2009,6 +2009,7 @@ dev-libs/gmp:asm - Enable use of hand optimized assembly routines (faster execut
 dev-libs/gmp:pic - Force static libraries to be built as PIC to avoid TEXTRELs.
 dev-libs/gobject-introspection:doctool - Install g-ir-doc-tool for generating documentation from introspected data
 dev-libs/hidapi:fox - Build a x11-libs/fox GUI
+dev-libs/imath:large-stack - Enables code to take advantage of large stack support
 dev-libs/input-pad:eekboard - Enable support for dev-libs/eekboard
 dev-libs/input-pad:xtest - Enable support for x11-libs/libXtst
 dev-libs/intel-neo:l0 - Install the oneAPI Level Zero driver alongside the OpenCL one
@@ -4030,7 +4031,6 @@ media-gfx/nomacs:plugins - Build officially support plugins
 media-gfx/nvidia-texture-tools:cg - Enable NVIDIA C graphics compiler toolkit plug-in
 media-gfx/nvidia-texture-tools:glew - Enable support for The OpenGL Extension Wrangler Library (media-libs/glew)
 media-gfx/openclipart:gzip - Compresses clip art using gzip
-media-gfx/openscad:ccache - Use dev-util/ccache to speed up rebuilds
 media-gfx/openscad:gamepad - Add support for gamepads through dev-qt/qtgamepad
 media-gfx/openscad:headless - Build a binary without GUI
 media-gfx/openscad:spacenav - Add support for space navigator devices through dev-libs/libspnav
@@ -4205,6 +4205,7 @@ media-libs/libsdl:sound - Control audio support (disable at your own risk)
 media-libs/libsdl:tslib - Build with tslib support for touchscreen devices
 media-libs/libsdl:video - Control video support (disable at your own risk)
 media-libs/libsdl2:fcitx4 - Enable support for app-i18n/fcitx 4
+media-libs/libsdl2:gles1 - include OpenGL ES 1.0 support
 media-libs/libsdl2:gles2 - include OpenGL ES 2.0 support
 media-libs/libsdl2:haptic - Enable the haptic (force feedback) subsystem
 media-libs/libsdl2:ibus - Enable support for app-i18n/ibus
@@ -4283,7 +4284,8 @@ media-libs/opencv:opencvapps - Enable compilation with opencvapps
 media-libs/opencv:tesseract - Use Google's OCR Engine
 media-libs/opencv:testprograms - Build and install programs for testing OpenCV (performance)
 media-libs/opencv:vtk - Build new 3D visualization module viz based on sci-libs/vtk
-media-libs/openexr:utils - Build several utility binaries for verifying and manipulating EXR files.
+media-libs/openexr:large-stack - Enables code to take advantage of large stack support.
+media-libs/openexr:utils - Build several binary tools for verifying and manipulating EXR files.
 media-libs/openh264:plugin - Install the Gecko Media Plugin (GMP) for use with Mozilla packages
 media-libs/openh264:utils - Install the CLI encoder and decoder utilities
 media-libs/openimageio:dicom - Enable DICOM medical image file support via sci-libs/dcmtk
@@ -6728,10 +6730,6 @@ net-p2p/syncthing:tools - Install stdiscosrv, strelaysrv and other tools to /usr
 net-p2p/transmission:lightweight - Optimize transmission for low-resource systems (smaller cache size, prefer unencrypted peer connections, etc.)
 net-p2p/transmission:mbedtls - Use mbed TLS instead of OpenSSL
 net-p2p/transmission-remote-gtk:libproxy - Use net-libs/libproxy for getting the HTTP/HTTPS/SOCKS proxy configuration.
-net-p2p/xmr-stak-rx:cuda - Enable NVIDIA CUDA toolkit support
-net-p2p/xmr-stak-rx:hwloc - Enable CPU affinity support via hwloc
-net-p2p/xmr-stak-rx:opencl - Enable OpenCL support
-net-p2p/xmr-stak-rx:webserver - Enable internal webserver
 net-print/cups:lprng-compat - Do not install lp... binaries so cups and lprng can coexist.
 net-print/cups-filters:foomatic - Build the included foomatic-rip printer driver. Strongly recommended.
 net-print/cups-filters:pclm - Enable PCLm support
@@ -7314,9 +7312,10 @@ sci-libs/openblas:relapack - Build the ReLAPACK extension to OpenBLAS
 sci-libs/opencascade:freeimage - Enable support for image i/o via media-libs/freeimage
 sci-libs/opencascade:gles2 - Use OpenGL ES 2.0
 sci-libs/opencascade:inspector - Build the OCCT inspector tool for low-level data inspection
+sci-libs/opencascade:json - Enable JSON support through dev-libs/rapidjson
 sci-libs/opencascade:optimize - Don't clear allocated memory. Use optimized memory manager unless tbb USE flag is set.
 sci-libs/opencascade:tbb - Enable multithreading with the Intel Threads Building Block dev-cpp/tbb
-sci-libs/opencascade:vtk - Enable Visualization Toolkit
+sci-libs/opencascade:vtk - Enable Visualization Toolkit support via sci-libs/vtk
 sci-libs/orocos_kdl:models - Build models for some well known robots.
 sci-libs/p4est:romio - Build with support for the ROMIO MPI-IO component
 sci-libs/p4est:vtk-binary - Enable binary vtk output. If disabled vtk files will be written in ASCII text format.