gentoo resync : 09.07.2022

4 files changed, 15 insertions, 11 deletions

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 7eab29651de3..326cb28de537 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -123,14 +123,12 @@ PYTHONDONTWRITEBYTECODE="1"
 # This MUST be kept in sync with the PYTHON_TARGETS below
 # Mike Gilbert <floppym@gentoo.org> (2018-05-23)
 # sys-apps/baselayout-2.5 needs split-usr enabled.
-BOOTSTRAP_USE="unicode internal-glib pkg-config split-usr xml python_targets_python3_9"
+BOOTSTRAP_USE="unicode internal-glib pkg-config split-usr xml python_targets_python3_10"
 
 # Mike Gilbert <floppym@gentoo.org> (2012-05-15)
 # Default target(s) for python-r1.eclass
-# Michał Górny <mgorny@gentoo.org> (2021-06-01)
-# Updated to python3.9
-PYTHON_TARGETS="python3_9"
-PYTHON_SINGLE_TARGET="python3_9"
+PYTHON_TARGETS="python3_10"
+PYTHON_SINGLE_TARGET="python3_10"
 
 # Michał Górny <mgorny@gentoo.org> (2013-08-10)
 # Moved from portage's make.globals.
diff --git a/profiles/base/package.use b/profiles/base/package.use
index 137647598358..190a80825e9a 100644
--- a/profiles/base/package.use
+++ b/profiles/base/package.use
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Andreas Sturmlechner <asturm@gentoo.org>
+# Andreas Sturmlechner <asturm@gentoo.org> (2022-06-14)
 # Only python 3.9 supported, bug #835921
 dev-util/kdevelop-python:5 python_single_target_python3_9
 
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index be6f51bdd00b..b9c6b6beee19 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,16 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2022-07-03)
+# miri is known to be broken on release builds from time to time
+# most of the time it requires nightly (real nightly) compiler.
+# please unmask as needed, may require patching
+>=dev-lang/rust-1.62.0 miri
+
+# Michał Górny <mgorny@gentoo.org> (2022-07-02)
+# dev-python/geoip-python is masked for removal.
+net-p2p/deluge geoip
+
 # James Le Cuirot <chewi@gentoo.org> (2022-06-25)
 # This flag concerns an x86-specific problem.
 sys-libs/glibc stack-realign
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 5470271414c2..d7733c3d0733 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,10 +4,6 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
-# Brian Evans <grknight@gentoo.org> (2022-06-28)
-# Needs newer igbinary stable with target
-dev-php/pecl-redis php_targets_php8-1
-
 # Matt Turner <mattst88@gentoo.org> (2022-05-11)
 # app-text/pandoc is not stable
 app-text/nuspell doc
@@ -110,7 +106,7 @@ app-emulation/winetricks test
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-12-21)
 # For bleeding edge features and testing, not generally suitable
 # for stable systems
-dev-lang/rust miri nightly profiler system-bootstrap
+dev-lang/rust nightly profiler system-bootstrap
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-12-09)
 # Declared experimental, and dev-cpp/websocketpp not stable yet