gentoo resync : 20.03.2022

6 files changed, 60 insertions, 63 deletions

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 7c4cc85f1cbc..ff9d142dabf7 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -13,11 +13,11 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU"
 
 # Env vars to expand into USE vars.  Modifying this requires prior
 # discussion on gentoo-dev@lists.gentoo.org.
-USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LLVM_TARGETS LUA_SINGLE_TARGET LUA_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XTABLES_ADDONS"
+USE_EXPAND="ABI_MIPS ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LLVM_TARGETS LUA_SINGLE_TARGET LUA_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XTABLES_ADDONS"
 
 # USE_EXPAND variables whose contents are not shown in package manager
 # output. Changes need discussion on gentoo-dev.
-USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86"
+USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86"
 
 CONFIG_PROTECT="/etc"
 CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf"
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index b558db9e0e62..abd8fbe4ffb3 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -1,6 +1,16 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Esteve Varela Colominas <esteve.varela@gmail.com> (2022-02-19)
+# Use the jemalloc allocator for telegram, as recommended by upstream,
+# to reduce memory usage, at least on glibc.
+# See the ebuild for more info.
+net-im/telegram-desktop jemalloc
+
+# Sam James <sam@gentoo.org> (2022-02-11)
+# Always build with PIE-default, just like GCC.
+sys-devel/clang pie
+
 # Arthur Zamarin <arthurzam@gentoo.org> (2022-01-13)
 # Force to use installed openjdk{,-bin} for bootstrapping
 dev-java/openjdk:11 system-bootstrap
@@ -25,6 +35,7 @@ dev-java/openjdk:17 system-bootstrap
 >=sys-devel/clang-13.0.1_rc llvm_targets_RISCV llvm_targets_Sparc
 >=sys-devel/clang-13.0.1_rc llvm_targets_SystemZ llvm_targets_WebAssembly
 >=sys-devel/clang-13.0.1_rc llvm_targets_X86 llvm_targets_XCore
+>=sys-devel/clang-14 llvm_targets_VE
 >=sys-devel/llvm-13.0.1_rc llvm_targets_AArch64 llvm_targets_AMDGPU
 >=sys-devel/llvm-13.0.1_rc llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF
 >=sys-devel/llvm-13.0.1_rc llvm_targets_Hexagon llvm_targets_Lanai
@@ -33,6 +44,7 @@ dev-java/openjdk:17 system-bootstrap
 >=sys-devel/llvm-13.0.1_rc llvm_targets_RISCV llvm_targets_Sparc
 >=sys-devel/llvm-13.0.1_rc llvm_targets_SystemZ llvm_targets_WebAssembly
 >=sys-devel/llvm-13.0.1_rc llvm_targets_X86 llvm_targets_XCore
+>=sys-devel/llvm-14 llvm_targets_VE
 
 # Sam James <sam@gentoo.org> (2021-03-08)
 # Broken without USE=unicode
@@ -55,7 +67,6 @@ dev-lang/python-exec native-symlinks
 # Add more packages
 #
 # a) no additional deps
-sys-libs/ncurses unicode
 sys-libs/readline unicode
 app-editors/nano unicode
 app-admin/metalog unicode
@@ -161,7 +172,6 @@ sys-firmware/seabios binary
 
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2018-09-11)
 # All glibc versions that include RPC code are masked now.
-dev-perl/Lab-VXI11 libtirpc
 net-analyzer/snort libtirpc
 net-firewall/conntrack-tools libtirpc
 net-fs/autofs libtirpc
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 67d7c4ca7ca1..887350d956a6 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,30 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Andreas Sturmlechner <asturm@gentoo.org> (2022-03-07)
+# Requires PMASKED dev-libs/device-atlas-api-c, bug #770499
+net-proxy/haproxy device-atlas
+
+# Sam James <sam@gentoo.org> (2022-03-02)
+# Needs masked version of ogre (>=1.12), bug #825330
+>=dev-games/mygui-3.4.1 ogre
+
+# Sam James <sam@gentoo.org> (2022-02-21)
+# Needs build system love to make LLVM support work.
+# bug #745915
+sci-libs/symengine llvm
+
+# Marek Szuba <marecki@gentoo.org> (2022-02-07)
+# Deprecated back-end with known stability and data-corruption issues,
+# likely to be removed in gramps-5.2.0.
+app-misc/gramps berkdb
+
+# Jason A. Donenfeld <zx2c4@gentoo.org> (2022-02-04)
+# We're still ironing out some kinks and writing documentation for
+# this feature, so keep masked for now.
+media-video/pipewire system-service
+media-video/wireplumber system-service
+
 # Sam James <sam@gentoo.org> (2021-01-24)
 # USE=custom-cflags is _particularly_ dangerous on sys-libs/glibc and
 # can result in not just build-time failures for glibc itself, but
@@ -178,7 +202,6 @@ net-misc/openssh debug
 
 # Michał Górny <mgorny@gentoo.org> (2021-03-06)
 # LLVM 9 has been removed.
-<dev-lang/julia-1.6.0 system-llvm
 <dev-util/perf-5.15 clang
 
 # Thomas Deutschmann <whissi@gentoo.org> (2021-02-17)
@@ -241,15 +264,15 @@ x11-libs/colord-gtk doc
 # 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-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
+<dev-ml/llvm-ocaml-14 llvm_targets_VE
+<sys-devel/clang-14 llvm_targets_VE
+<sys-devel/llvm-14 llvm_targets_VE
+<dev-ml/llvm-ocaml-15 llvm_targets_ARC
+<sys-devel/clang-15 llvm_targets_ARC
+<sys-devel/llvm-15 llvm_targets_ARC
+<dev-ml/llvm-ocaml-15 llvm_targets_CSKY llvm_targets_M68k
+<sys-devel/clang-15 llvm_targets_CSKY llvm_targets_M68k
+<sys-devel/llvm-15 llvm_targets_CSKY llvm_targets_M68k
 
 # Marek Szuba <marecki@gentoo.org> (2020-11-30)
 # Vendored therecipe/qt violates network sandbox + uses external binary
@@ -318,10 +341,6 @@ sys-devel/gcc ada
 <=dev-util/rosinstall-0.7.8 test
 <=dev-util/wstool-0.1.18 test
 
-# Michał Górny <mgorny@gentoo.org> (2020-03-27)
-# Requires old version of dev-python/docutils.
-dev-util/buildbot doc
-
 # Guilherme Amadio <amadio@gentoo.org> (2020-03-16)
 # Requires dev-libs/cudnn which is only available on amd64
 sci-physics/root cudnn
@@ -339,11 +358,6 @@ dev-python/pyzmq doc
 # 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
-dev-libs/ossp-uuid php
-
 # Michał Górny <mgorny@gentoo.org> (2019-12-16)
 # Requires old x11-libs/fox:1.6 slot.
 dev-games/openscenegraph fox
@@ -470,10 +484,8 @@ sys-block/fio static
 sci-libs/ipopt hsl
 
 # Lars Wendler <polynomial-c@gentoo.org> (2018-03-14)
-# Broken on all 32bit arches. Globally masked because of sys-apps/dmapi having
-# no active upstream anymore.
 # sys-cluster/ceph is only available on amd64 & x86, unmask per arch
-net-fs/samba dmapi ceph
+net-fs/samba ceph
 
 # Jan Ziak <0xe2.0x9a.0x9b@gmail.com> (2018-03-14)
 # Mask local USE flag to satisfy repoman
@@ -728,9 +740,6 @@ dev-lisp/clisp svm
 # Keep it masked here so that I don't need to manage two versions every time.
 media-sound/pulseaudio system-wide
 
-# These are for BSD only
-net-proxy/squid ipf-transparent pf-transparent
-
 # Alexis Ballier <aballier@gentoo.org> (2011-02-16)
 # Win32 specific useflag for vlc. Can be used for cross-compiling.
 media-video/vlc directx
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index e25a8cff704d..c8e1375a025a 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -1,17 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2022-01-09)
-# virtual/{jdk,jre}:11 just got unmasked but are not yet stable
-# Having a masked gentoo-vm flag allows us to provide it without
-# it breaking Gentoo packages. Those who wish to experiment with it
-# as a fully recognised Gentoo JVM can unmask the flag.
-dev-java/openjdk-jre-bin:11 gentoo-vm
-dev-java/openjdk-bin:11 gentoo-vm
-dev-java/openjdk:11 gentoo-vm
+# Sam James <sam@gentoo.org> (2022-02-11)
+# Needs glibc-2.35(?) (or <2.34) which is not yet even keyworded but
+# won't be stable for a while. Can be unmasked then.
+# bug #806079
+sys-apps/nvme-cli hugepages
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-12-24)
 # test deps are not stable
@@ -97,10 +94,6 @@ app-emulation/xen-tools doc
 # dev-util/shellcheck (dev-lang/ghc) has no stable keywords.
 app-emulation/winetricks test
 
-# Adam Feldman <NP-Hardass@gentoo.org> (2020-04-12)
-# Dependency (net-wireless/blueman) has no stable keywords
-mate-base/mate bluetooth
-
 # 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 982071c4ee63..059f596fff47 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,10 +4,11 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2022-01-22)
-# Prelink support is being removed from glibc, and has been
-# somewhat broken for a while already
-prelink
+# Brian Evans <grknight@gentoo.org> (2022-01-21)
+# PHP 7.3 is end-of-life
+# Please upgrade to a newer slot
+php_targets_php7-3
+php7-3
 
 # Sam James <sam@gentoo.org> (2022-01-12)
 # PCH has proven itself to be unreliable and lead to spurious build
@@ -25,7 +26,6 @@ ruby_targets_ruby25
 # PHP 7.2 is security vulnerable and end-of-life
 # Please upgrade to a newer slot
 php_targets_php7-2
-php7-2
 
 # Alexis Ballier <aballier@gentoo.org> (2020-10-13)
 # Nothing depends on those ROS messages. dev-ros/geneus
@@ -38,26 +38,10 @@ ros_messages_eus
 # Mask Ruby 2.4 as EOL
 ruby_targets_ruby24
 
-# Brian Evans <grknight@gentoo.org> (2019-12-19)
-# PHP 7.1 is end of life and has security issues Bug 703326
-php_targets_php7-1
-
-# Brian Evans <grknight@gentoo.org> (2019-10-01)
-# Mask PHP 5.6 target for EOL
-php_targets_php5-6
-
 # Matt Turner <mattst88@gentoo.org> (2019-09-01)
 # app-office/texmacs is package.mask'd. Bug #436400
 texmacs
 
-# Hans de Graaff <graaff@gentoo.org> (2019-04-07)
-# Mask Ruby 2.3 as EOL
-ruby_targets_ruby23
-
-# Brian Evans <grknight@gentoo.org> (2019-01-11)
-# Mask PHP 7.0 target as EOL
-php_targets_php7-0
-
 # Matt Turner <mattst88@gentoo.org> (2018-11-11)
 # d3d9 only works on amd64/x86.
 d3d9
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index 453037208983..23119a063249 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -20,3 +20,4 @@ python_single_target_pypy3
 # Hans de Graaff <graaff@gentoo.org> (2021-10-10)
 # Currently in testing and not ready to go stable yet.
 ruby_targets_ruby30
+ruby_targets_ruby31