gentoo resync : 29.12.2022

10 files changed, 51 insertions, 27 deletions

diff --git a/profiles/arch/sparc/32ul/eapi b/profiles/arch/sparc/32ul/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/arch/sparc/32ul/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/arch/sparc/32ul/make.defaults b/profiles/arch/sparc/32ul/make.defaults
new file mode 100644
index 000000000000..46df0689c786
--- /dev/null
+++ b/profiles/arch/sparc/32ul/make.defaults
@@ -0,0 +1,9 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="sparc-unknown-linux-gnu"
+
+# Multilib stuff
+MULTILIB_ABIS="sparc32"
+DEFAULT_ABI="sparc32"
+ABI="${DEFAULT_ABI}"
diff --git a/profiles/arch/sparc/32ul/parent b/profiles/arch/sparc/32ul/parent
new file mode 100644
index 000000000000..154b8158dc01
--- /dev/null
+++ b/profiles/arch/sparc/32ul/parent
@@ -0,0 +1,2 @@
+..
+../../../features/wd40
diff --git a/profiles/arch/sparc/64ul/package.use.mask b/profiles/arch/sparc/64ul/package.use.mask
index cdda3cd66f3b..c19643d0ff90 100644
--- a/profiles/arch/sparc/64ul/package.use.mask
+++ b/profiles/arch/sparc/64ul/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Sam James <sam@gentoo.org> (2021-03-20)
@@ -9,3 +9,7 @@ dev-libs/libpcre jit
 # Matt Turner <mattst88@gentoo.org> (2019-08-26)
 # jit not supported on sparc64
 dev-libs/libpcre2 jit
+
+# Anna Vyalkova <cyber+gentoo@sysrq.in> (2022-03-13)
+# depends on dev-lisp/sbcl
+dev-lisp/alexandria doc
diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults
index b25d074c2cd5..23b5d7dad10a 100644
--- a/profiles/arch/sparc/make.defaults
+++ b/profiles/arch/sparc/make.defaults
@@ -5,7 +5,6 @@ ARCH="sparc"
 ACCEPT_KEYWORDS="${ARCH}"
 
 # 64bit kernel, 32bit userland
-CHOST="sparc-unknown-linux-gnu"
 PROFILE_ARCH="sparc64"
 
 # We need sparc64 binutils for linux-headers
@@ -17,9 +16,6 @@ CHOST_sparc64="sparc64-unknown-linux-gnu"
 LDFLAGS_sparc64="-m elf64_sparc"
 
 # Multilib stuff
-MULTILIB_ABIS="sparc32"
-DEFAULT_ABI="sparc32"
-ABI="${DEFAULT_ABI}"
 CFLAGS_sparc32=""  # 32 bit is the default, so no need to set it.
 LDFLAGS_sparc32="" # setting it would make gcc use -m32 and -m64 at the same time
 CHOST_sparc32="sparc-unknown-linux-gnu"
diff --git a/profiles/arch/sparc/package.mask b/profiles/arch/sparc/package.mask
index 8c6f66119902..6a4f874db264 100644
--- a/profiles/arch/sparc/package.mask
+++ b/profiles/arch/sparc/package.mask
@@ -1,12 +1,6 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Sam James <sam@gentoo.org> (2022-01-13)
-# Unaligned access causes SIGBUS on sparc in NSS module.
-# Newer versions fixed. Please upgrade ASAP!
-# bug #830275
-<sys-apps/systemd-249.9
-
 # Raúl Porcel <armin76@gentoo.org> (2014-11-17)
 # Mask sys-devel/kgcc64 since >=gcc-4.4 can build 64bit kernels
 sys-devel/kgcc64
diff --git a/profiles/arch/sparc/package.use.force b/profiles/arch/sparc/package.use.force
index 3c53f2a73cfa..888248394524 100644
--- a/profiles/arch/sparc/package.use.force
+++ b/profiles/arch/sparc/package.use.force
@@ -1,6 +1,12 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2022-06-25)
+# dev-lang/rust lacks wiring up to use our custom rust-bin bootstrap
+# tarball, so force system-bootstrap instead (i.e. force using rust-bin
+# or existing installed rust). bug #842246.
+dev-lang/rust system-bootstrap
+
 # Sam James <sam@gentoo.org> (2022-02-19)
 # New enough SpiderMonkey not (yet?) keyworded here, bug #753221
 sys-auth/polkit duktape
@@ -10,3 +16,4 @@ sys-auth/polkit duktape
 dev-ml/llvm-ocaml llvm_targets_Sparc
 sys-devel/clang llvm_targets_Sparc
 sys-devel/llvm llvm_targets_Sparc
+dev-lang/rust llvm_targets_Sparc
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index a155bfca4536..6298a47b94a1 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,19 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Matt Turner <mattst88@gentoo.org> (2022-06-25)
+# net-libs/libqrtr-glib not keyworded
+net-misc/modemmanager qrtr
+
+# Sam James <sam@gentoo.org> (2022-06-25)
+# sys-devel/lld lacks sparc support right now
+dev-lang/rust wasm
+
+# Sam James <sam@gentoo.org> (2022-06-25)
+# We're not (yet?) providing our own tarballs for these and
+# upstream don't offer them for this arch (see bug #769467).
+dev-lang/rust-bin clippy doc rls rustfmt
+
 # Nickolas Raymond Kaczynski <nrk@disroot.org> (2022-04-24)
 # Dependencies are missing keywords
 media-libs/imlib2 svg heif
@@ -135,10 +148,6 @@ media-libs/libsdl2 fcitx4
 # No drivers on this architecture support Vulkan
 media-libs/mesa vulkan vulkan-overlay zink
 
-# Mart Raudsepp <leio@gentoo.org> (2020-08-02)
-# sparc has no virtual/rust support, needed by newer gnome-base/librsvg, et al
->=media-gfx/eog-3.33.1 svg
-
 # Robin H. Johnson <robbat2@gentoo.org> (2020-07-02)
 # Mask io-uring & zbc pending keywording
 sys-block/fio -io-uring -zbc
@@ -244,7 +253,7 @@ net-misc/scponly unison
 
 # Rolf Eike Beer <eike@sf-mail.de> (2020-04-06)
 # hardware related dependencies are not keyworded
-net-analyzer/nagios-plugin-check_raid 3ware aacraid hpa hpsa megaraid-sas megaraid-scsi mpt-sas2 mpt
+net-analyzer/nagios-plugin-check_raid 3ware aacraid hpa hpsa megaraid-sas mpt-sas2 mpt
 
 # Rolf Eike Beer <eike@sf-mail.de> (2020-04-04)
 # dev-python/pymongo is not keyworded
@@ -302,7 +311,6 @@ app-office/scribus osg
 # Sergei Trofimovich <slyfox@gentoo.org> (2018-06-17)
 # Mask broken HIPE support on sparc32 (bug #656618)
 dev-lang/erlang hipe
-net-im/ejabberd hipe
 
 # Sergei Trofimovich <slyfox@gentoo.org> (2018-05-08)
 # Mask USE=games to avoid unkeyworded games-util/qstat.
@@ -337,7 +345,7 @@ net-libs/gnutls test-full
 # Michał Górny <mgorny@gentoo.org> (2017-08-07)
 # Requires USE=bluetooth that is masked in this profile.
 media-sound/pulseaudio native-headset ofono-headset
-media-sound/pulseaudio-daemon native-headset ofono-headset
+media-sound/pulseaudio-daemon ofono-headset
 net-misc/ofono dundee
 
 # Michał Górny <mgorny@gentoo.org> (2017-08-07)
diff --git a/profiles/arch/sparc/package.use.stable.mask b/profiles/arch/sparc/package.use.stable.mask
index 37fdd6e57621..12e089e092ac 100644
--- a/profiles/arch/sparc/package.use.stable.mask
+++ b/profiles/arch/sparc/package.use.stable.mask
@@ -1,6 +1,14 @@
 # Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2022-06-10)
+# gstreamer not marked stable on sparc
+media-sound/pulseaudio-daemon aptx ldac
+
+# Sam James <sam@gentoo.org> (2022-06-01)
+# media-plugins/gst-plugins-v4l2 not marked stable on sparc
+net-im/pidgin v4l
+
 # Sam James <sam@gentoo.org> (2022-05-11)
 # sys-apps/keyutils not stable here (test failures)
 # ... and samba[client] pulls in cifs-utils which pulls in keyutils.
diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask
index a88935985b69..6362e7c746e2 100644
--- a/profiles/arch/sparc/use.mask
+++ b/profiles/arch/sparc/use.mask
@@ -4,6 +4,10 @@
 # Unmask the flag which corresponds to ARCH.
 -sparc
 
+# Sam James <sam@gentoo.org> (2022-07-21)
+# Untested.
+ieee1394
+
 # Matt Turner <mattst88@gentoo.org> (2022-02-21)
 # app-crypt/tpm2-tss is not keyworded here
 tpm
@@ -28,10 +32,6 @@ allegro
 # dev-python/mercurial does not work on sparc due to deps.
 mercurial
 
-# Rolf Eike Beer <eike@sf-mail.de> (2020-04-21)
-# ruby2.4 will go away soon, avoid keywording older packages
-ruby_targets_ruby24
-
 # Rolf Eike Beer <eike@sf-mail.de> (2020-04-14)
 # media-libs/opencv not keyworded on sparc
 opencv
@@ -40,11 +40,6 @@ opencv
 # gimp dependencies unusable because of unaligned accesses, bug #638172
 gimp
 
-# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
-# Dependency not keyworded (dev-libs/libappindicator).
-appindicator
-ayatana
-
 # Sergei Trofimovich <slyfox@gentoo.org> (2018-12-12)
 # mongodb is not keyworded on sparc
 mongodb