gentoo resync : 25.09.2021

3 files changed, 9 insertions, 29 deletions

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index a037994c9e83..db1bba9bb64d 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -171,7 +171,7 @@ PHP_TARGETS="php7-3 php7-4"
 # Alfredo Tupone <tupone@gentoo.org> (2019-09-03)
 #
 # Default ADA target
-ADA_TARGET="gnat_2018"
+ADA_TARGET="gnat_2019"
 
 # Marek Szuba <marecki@gentoo.org> (2020-10-15)
 # Default targets for lua{,-single}.eclass
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 0915aaf80a2a..47bf0a61d988 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -151,10 +151,6 @@ media-tv/kodi system-ffmpeg
 # (probably after stabilization of refind-0.11.4).
 sys-boot/refind gnuefi
 
-# Mike Gilbert <floppym@gentoo.org> (2016-10-13)
-# Python without threads breaks in many ways.
-dev-lang/python threads
-
 # Maciej Mrozowski <reavertm@gentoo.org> (2016-09-01)
 # Workaround until resolved upstream (bug #586840)
 >=dev-games/simgear-2016.2.1 dns
@@ -190,12 +186,6 @@ dev-lang/python-exec python_targets_pypy3
 # (so that repoman's ebuild.nesteddie check is irrelevant).
 sys-apps/portage ipc
 
-# Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
-# Python should use wide Unicode implementation by default.
-# Switching of "wide-unicode" USE flag changes ABI of Python
-# and requires reinstallation of many Python modules.
-dev-lang/python wide-unicode
-
 # Peter Alfredsen <loki_val@gentoo.org> (2009-04-11)
 # Forcing w.r.t. bug 265336. When unicode use-flag is
 # turned off, ABI is broken without a .so bump.
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 64a1414519cf..52488bbb2e05 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -159,18 +159,17 @@ x11-libs/colord-gtk doc
 
 # Michał Górny <mgorny@gentoo.org> (2020-12-04)
 # Mask the experimental targets in release ebuilds.
+# Note to self: remember to move still-applicable masks to the newer
+# version when master is bumped.
 <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-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-13 llvm_targets_CSKY
-<sys-devel/clang-13 llvm_targets_CSKY
-<sys-devel/llvm-13 llvm_targets_CSKY
-<dev-ml/llvm-ocaml-14 llvm_targets_M68k
-<sys-devel/clang-14 llvm_targets_M68k
-<sys-devel/llvm-14 llvm_targets_M68k
+<dev-ml/llvm-ocaml-14 llvm_targets_ARC llvm_targets_VE
+<sys-devel/clang-14 llvm_targets_ARC llvm_targets_VE
+<sys-devel/llvm-14 llvm_targets_ARC llvm_targets_VE
+<dev-ml/llvm-ocaml-14 llvm_targets_CSKY llvm_targets_M68k
+<sys-devel/clang-14 llvm_targets_CSKY llvm_targets_M68k
+<sys-devel/llvm-14 llvm_targets_CSKY llvm_targets_M68k
 
 # Joonas Niilola <juippis@gentoo.org> (2020-12-03)
 # Doc building seem to be very random without any predictability,
@@ -318,11 +317,6 @@ dev-python/statsmodels doc
 >=sys-libs/glibc-2.33-r2 crypt
 <sys-libs/libxcrypt-4.4.23-r1 split-usr system
 
-# Michał Górny <mgorny@gentoo.org> (2019-10-05)
-# net-libs/openslp is being removed.
-sys-block/open-iscsi slp
-sys-block/open-isns slp
-
 # Craig Andrews <candrews@gentoo.org> (2019-09-12)
 # OpenSSL (as of version 1.1.1) doesn't have APIs for QUIC support
 # see https://github.com/openssl/openssl/pull/8797
@@ -595,10 +589,6 @@ net-analyzer/nmap system-lua
 # Most targets do not support ASAN/etc... #504200.
 sys-devel/gcc sanitize
 
-# Rick Farina <zerochaos@gentoo.org> (2014-08-26)
-# mirisdr does not seem to like making releases
-<net-wireless/gr-osmosdr-9999 mirisdr
-
 # Mike Frysinger <vapier@gentoo.org> (2014-02-03)
 # Upstream says to not use this for now.
 dev-libs/elfutils threads