gentoo resync : 29.12.2022

11 files changed, 122 insertions, 16 deletions

diff --git a/profiles/features/clang/package.use b/profiles/features/clang/package.use
index 980c320218f9..8bf1736e82c2 100644
--- a/profiles/features/clang/package.use
+++ b/profiles/features/clang/package.use
@@ -11,6 +11,3 @@ sys-devel/clang-runtime compiler-rt libcxx -sanitize
 
 sys-libs/libcxx libunwind libcxxabi
 sys-libs/libcxxabi libunwind
-
-# libgcrypt doesn't like optimizations
-dev-libs/libgcrypt o-flag-munging
diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index 923180a17d74..732e36cb6152 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Stefan Strogin <steils@gentoo.org> (2022-06-29)
+# Binary package linked against glibc
+net-im/element-desktop-bin
+
+# Florian Schmaus <flow@gentoo.org> (2022-06-05)
+# Binary package linked against glibc, bug #832932
+sys-block/hpssacli
+
 # Sam James <sam@gentoo.org> (2022-04-23)
 # Binary package linked against glibc, bug #832615
 net-print/cnijfilter2
@@ -185,6 +193,7 @@ app-text/zotero-bin
 media-video/popcorntime-bin
 net-im/rocketchat-desktop-bin
 net-im/whatsapp-desktop-bin
+net-im/wazzapp-bin
 sci-misc/jupyterlab-desktop-bin
 sci-misc/netlogo-bin
 sci-electronics/eagle
diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask
index a62190387c27..24959cbeda7e 100644
--- a/profiles/features/musl/package.use.mask
+++ b/profiles/features/musl/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Ionen Wolkens <ionen@gentoo.org (2022-06-08)
+# Depends on www-plugins/chrome-binary-plugins which is masked here.
+www-client/qutebrowser widevine
+
 # Petr Vaněk <arkamar@atlas.cz> (2022-03-15)
 # musl package does not currently provide gencat binary, which is needed for
 # nls support, see bug #712828
@@ -31,19 +35,14 @@ sys-apps/man-db nls
 sys-apps/sysvinit nls
 
 # Sam James <sam@gentoo.org> (2021-11-07)
-# gdb-10[nls] doesn't build on musl
-# "ax.cc:(.text+0x2e0): undefined reference to `libintl_gettext'"
-# bug #809686
-<sys-devel/gdb-11 nls
-
-# Sam James <sam@gentoo.org> (2021-11-07)
 # Disable some sanitizers for LLVM, see bug #753935
 # Needs libexecinfo on musl, not yet packaged
-sys-libs/compiler-rt-sanitizers gwp-asan libfuzzer
+sys-libs/compiler-rt-sanitizers gwp-asan
+<sys-libs/compiler-rt-sanitizers-13 libfuzzer
 
 # Sam James <sam@gentoo.org> (2021-11-07)
 # Broken as "error: unknown type name '_Unwind_Word'"
-sys-libs/compiler-rt-sanitizers hwasan
+<sys-libs/compiler-rt-sanitizers-14 hwasan
 
 # Andreas K. Hüttel <dilfridge@gentoo.org>
 # Restore mask here that is gone elsewhere
diff --git a/profiles/features/musl/use.mask b/profiles/features/musl/use.mask
index e6af2dddd757..b3aee89dcfc4 100644
--- a/profiles/features/musl/use.mask
+++ b/profiles/features/musl/use.mask
@@ -9,9 +9,5 @@ elibc_glibc
 # Pulls dev-db/oracle-instantclient which doesn't work on musl
 oracle
 
-# Musl doesn't have support for utmp/wtmp by design
-utmp
-wtmp
-
 # sys-apps/systemd is masked
 systemd
diff --git a/profiles/features/selinux/package.use.mask b/profiles/features/selinux/package.use.mask
index 4d0a1aab402d..7808e7cb7e8d 100644
--- a/profiles/features/selinux/package.use.mask
+++ b/profiles/features/selinux/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-10-21)
@@ -22,7 +22,10 @@ www-servers/uwsgi uwsgi_plugins_systemd_logger
 # Brian Dolbec <dolsen@gentoo.org> (2014-09-17)
 # mask pypy for several utilities due to incompatibility with libselinux
 sys-apps/portage python_targets_pypy3
+app-portage/elicense python_targets_pypy3
 app-portage/elogv python_targets_pypy3
 app-portage/gentoolkit python_targets_pypy3
 app-portage/layman python_targets_pypy3
 app-portage/repoman python_targets_pypy3
+app-portage/smart-live-rebuild python_targets_pypy3
+app-portage/gentoopm python_targets_pypy3
diff --git a/profiles/features/wd40/README b/profiles/features/wd40/README
new file mode 100644
index 000000000000..1e90063187fc
--- /dev/null
+++ b/profiles/features/wd40/README
@@ -0,0 +1,3 @@
+This is a common profile for architectures and subarchitectures that do not
+support Rust (do not have a working virtual/rust).  It serves as a common place
+to mask the packages requiring Rust and the USE flags pulling them.
diff --git a/profiles/features/wd40/eapi b/profiles/features/wd40/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/features/wd40/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/features/wd40/package.mask b/profiles/features/wd40/package.mask
new file mode 100644
index 000000000000..35e1e701f465
--- /dev/null
+++ b/profiles/features/wd40/package.mask
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Various packages requiring Rust.
+app-eselect/eselect-rust
+app-text/mdbook
+dev-lang/rust
+dev-lang/rust-bin
+>=dev-lang/spidermonkey-78
+>=dev-libs/gjs-1.66
+>=dev-python/cryptography-36
+>=dev-python/pyopenssl-22
+dev-python/setuptools-rust
+dev-python/watchfiles
+dev-util/cargo-c
+dev-util/cbindgen
+dev-util/git-delta
+dev-util/maturin
+gnome-base/gdm
+>=gnome-base/gnome-core-apps-3.36.5
+>=gnome-base/gnome-core-libs-3.36.5
+>=gnome-base/gnome-light-3.36.5
+>=gnome-base/gnome-shell-3.38
+>=gnome-base/librsvg-2.41
+gnome-extra/chrome-gnome-shell
+gnome-extra/gnome-tweaks
+media-libs/libavif
+media-video/rav1e
+>=net-irc/polari-3.37
+net-libs/quiche
+net-news/newsboat
+net-p2p/deluge
+sci-geosciences/gnome-maps
+>=sys-apps/bat-0.18.1
+virtual/rust
+>=x11-themes/adwaita-icon-theme-3.36
diff --git a/profiles/features/wd40/package.use.force b/profiles/features/wd40/package.use.force
new file mode 100644
index 000000000000..d70ac2644441
--- /dev/null
+++ b/profiles/features/wd40/package.use.force
@@ -0,0 +1,6 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Sam James <sam@gentoo.org> (2022-05-15)
+# No Rust here (so no Spidermonkey), force Duktape instead
+sys-auth/polkit duktape
diff --git a/profiles/features/wd40/package.use.mask b/profiles/features/wd40/package.use.mask
new file mode 100644
index 000000000000..a2d57b80710f
--- /dev/null
+++ b/profiles/features/wd40/package.use.mask
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# WANG Xuerui <xen0n@gentoo.org> (2022-05-13)
+# dev-lang/rust is not available on ${arch} yet.
+media-gfx/imv svg
+media-libs/libavif rav1e
+
+# Sam James <sam@gentoo.org> (2022-04-22)
+# Needs Rustified librsvg
+>=media-libs/freetype-2.12.0 svg
+media-libs/imlib2 svg
+
+# Michał Górny <mgorny@gentoo.org> (2021-11-26)
+# These package flags require dev-python/cryptography which -- due
+# to the dependency on Rust -- is no longer portable to ${arch}.
+dev-python/twisted conch crypt
+dev-python/urllib3 test
+net-fs/samba addc addns ads
+
+# Matt Turner <mattst88@gentoo.org> (2021-07-25)
+# gdm requires gnome-shell requires rustified librsvg.
+x11-misc/xscreensaver gdm
+
+# Jakov Smolić <jsmolic@gentoo.org> (2021-01-23)
+# Depends on media-video/rav1e which needs Rust
+>=media-libs/libheif-1.10.0 rav1e
+
+# Cédric Krier <cedk@gentoo.org> (2020-11-10)
+# virtual/rust has no ${arch} keyword
+dev-vcs/mercurial rust
+
+# Joonas Niilola <juippis@gentoo.org> (2020-10-02)
+# Sam James <sam@gentoo.org> (2021-03-11)
+# Dependency only keyworded on specific ${arch} profiles.
+dev-libs/efl avif
+kde-frameworks/kimageformats avif
+media-libs/gd avif
+net-libs/webkit-gtk avif
+
+# Mart Raudsepp <leio@gentoo.org> (2020-08-02)
+# ${arch} has no virtual/rust support, needed by newer gnome-base/librsvg, et al
+>=media-gfx/eog-3.33.1 svg
+
+# Thomas Deutschmann <whissi@gentoo.org> (2018-10-12)
+# Requires www-client/firefox which isn't available on ${arch} yet
+# due to dev-lang/rust requirement
+dev-ruby/capybara test
diff --git a/profiles/features/wd40/use.mask b/profiles/features/wd40/use.mask
new file mode 100644
index 000000000000..41e587d5c549
--- /dev/null
+++ b/profiles/features/wd40/use.mask
@@ -0,0 +1,8 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+rust
+
+# Matt Turner <mattst88@gentoo.org> (2021-07-25)
+# gnome-shell requires rustified librsvg.
+gnome-shell