gentoo resync : 12.07.2021

4 files changed, 11 insertions, 17 deletions

diff --git a/profiles/base/package.mask b/profiles/base/package.mask
index 6f21ce80d960..f6ee04f609fa 100644
--- a/profiles/base/package.mask
+++ b/profiles/base/package.mask
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (06.07.2021)
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-06)
 # Root privilege escalation, CVE-2017-18925, bug 751415
 sys-apps/opentmpfiles
 
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index d9a86e696f2b..83513d5d82c1 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -136,10 +136,6 @@ media-gfx/blender doc
 # but making it do so while vendored is a non-trivial task.
 mail-mta/protonmail-bridge gui
 
-# Michał Górny <mgorny@gentoo.org> (2020-11-29)
-# libclangformat-ide is masked for removal.
-dev-qt/qt-creator clang
-
 # Michał Górny <mgorny@gentoo.org> (2020-09-27)
 # The respective dependencies are masked for removal.
 net-im/telepathy-connection-managers gadu icq meanwhile steam yahoo
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 4cf756030c95..eaa49d098f58 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-07-12)
+# Haskell isn't stable on amd64 (or anywhere)
+# bug #801649
+dev-util/diffoscope haskell
+
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2021-05-30)
 # dev-perl/Net-Netmask-2.0.100 needs ... and ... which ends
 # up pulling in a Test-Simple version newer than 5.32.
@@ -43,12 +48,6 @@ dev-php/theseer-Autoload test
 # Cinnamon is not stable on any architecture.
 x11-themes/arc-theme cinnamon
 
-# Sam James <sam@gentoo.org> (2020-10-09)
-# Depends on dev-libs/boost[python,numpy], not fully working atm
-# bug #733830, bug #746740, bug #753566
-media-gfx/openvdb python numpy
-media-libs/openimageio python
-
 # Pacho Ramos <pacho@gentoo.org> (2020-08-21)
 # app-text/pandoc is hard to stabilize #737612
 sys-apps/earlyoom docs
@@ -65,11 +64,6 @@ app-emulation/winetricks test
 # Dependency (net-wireless/blueman) has no stable keywords
 mate-base/mate bluetooth
 
-# David Seifert <soap@gentoo.org> (2020-03-31)
-# Numpy support in Boost.Python is brittle and shouldn't be enabled
-# on stable systems or force a stable upgrade.
-dev-libs/boost numpy
-
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-12-21)
 # For bleeding edge features and testing, not generally suitable
 # for stable systems
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 12955cfde540..1201801394bb 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,6 +4,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Hans de Graaff <graaff@gentoo.org> (2021-07-09)
+# Mask Ruby 2.5 as EOL
+ruby_targets_ruby25
+
 # Aaron W. Swenson <titanofold@gentoo.org> (2021-07-05)
 # PostgreSQL 9.5 masked for removal
 postgres_targets_postgres9_5