gentoo auto-resync : 16:09:2022 - 05:14:17

6 files changed, 20 insertions, 1 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index d1370f15d187..7b52351a1cf4 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 4aac007f6130..15edc8b37c4c 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,14 @@
 # mask everywhere, unmask on arch/*) use arch/base.
 
 # Sam James <sam@gentoo.org> (2022-09-15)
+# Doesn't work on e.g. glibc systems. Unmasked on the LLVM profiles.
+# It doesn't matter much as llvm-libunwind has different semantics
+# to other packages, i.e. -llvm-libunwind doesn't force use of sys-libs/libunwind
+# on glibc, so it doesn't prevent usage of llvm-libunwind for other packages.
+# bug #870211.
+dev-lang/rust llvm-libunwind
+
+# Sam James <sam@gentoo.org> (2022-09-15)
 # Patch not rebased and supporting it is not a priority: bug #824018.
 >=media-libs/libpng-1.6.38 apng
 
diff --git a/profiles/features/clang/make.defaults b/profiles/features/clang/make.defaults
index ad06c1d9333f..77b32d47a3c2 100644
--- a/profiles/features/clang/make.defaults
+++ b/profiles/features/clang/make.defaults
@@ -40,6 +40,12 @@ OBJDUMP="llvm-objdump"
 READELF="llvm-readelf"
 ADDR2LINE="llvm-addr2line"
 
+# Rust needs this to build some crates (like uutils)
+# https://github.com/rust-lang/rust/blob/master/compiler/rustc_llvm/build.rs
+LLVM_USE_LIBCXX=1
+# https://github.com/rust-lang/cc-rs#c-support
+# https://github.com/rust-lang/cc-rs/blob/main/src/lib.rs
+CXXSTDLIB="c++"
 
 # bootstrap USE for stage1
 
diff --git a/profiles/features/clang/package.use.mask b/profiles/features/clang/package.use.mask
index 2aa65931d7b2..0975580eab0d 100644
--- a/profiles/features/clang/package.use.mask
+++ b/profiles/features/clang/package.use.mask
@@ -1,5 +1,9 @@
 # Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2022-09-15)
+# Works on pure LLVM systems: bug #870211.
+dev-lang/rust -llvm-libunwind
+
 # libquadmath is gcc-specific
 dev-lang/perl quadmath
diff --git a/profiles/package.mask b/profiles/package.mask
index 0bdb302f3993..05ac16c81135 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -372,7 +372,7 @@ dev-qt/qtwebsockets:6
 
 # Sam James <sam@gentoo.org> (2022-08-02)
 # Multiple rendering/font issues reported: bug #844115, bug #851141.
-=app-text/ghostscript-gpl-9.56.1
+>=app-text/ghostscript-gpl-9.56.1
 
 # Fabian Groffen <grobian@gentoo.org> (2022-07-02)
 # Segfaults handling SPF validations (warn on permerror), like the
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 3d6403c6dee0..23cd5cd0e212 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -5458,6 +5458,7 @@ net-analyzer/wireshark:netlink - Use dev-libs/libnl
 net-analyzer/wireshark:pcap - Use net-libs/libpcap for network packet capturing (build dumpcap, rawshark)
 net-analyzer/wireshark:plugin-ifdemo - Install plugin interface demo
 net-analyzer/wireshark:plugins - Install plugins
+net-analyzer/wireshark:qt6 - Build with Qt6 support instead of the default Qt5 for GUI support
 net-analyzer/wireshark:randpkt - Install randpkt, a utility for creating pcap trace files full of random packets
 net-analyzer/wireshark:randpktdump - Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt)
 net-analyzer/wireshark:reordercap - Install reordercap, to reorder input file by timestamp into output file