gentoo resync : 20.03.2022

10 files changed, 22 insertions, 30 deletions

diff --git a/profiles/arch/powerpc/ppc64/32ul/use.force b/profiles/arch/powerpc/ppc64/32ul/use.force
index e7102de1a2df..c74bf3460241 100644
--- a/profiles/arch/powerpc/ppc64/32ul/use.force
+++ b/profiles/arch/powerpc/ppc64/32ul/use.force
@@ -3,8 +3,3 @@ ppc
 
 # Unforce the flag which corresponds to the 64-bit ARCH.
 -ppc64
-
-# Michał Górny <mgorny@gentoo.org> (2014-06-27)
-# Switch multilib flags for the ABI.
--abi_ppc_64
-abi_ppc_32
diff --git a/profiles/arch/powerpc/ppc64/32ul/use.mask b/profiles/arch/powerpc/ppc64/32ul/use.mask
index abf49705cc6b..2e4685d1f36d 100644
--- a/profiles/arch/powerpc/ppc64/32ul/use.mask
+++ b/profiles/arch/powerpc/ppc64/32ul/use.mask
@@ -6,8 +6,3 @@ ppc64
 
 # We mask this since we're not really a multilib profile
 multilib
-
-# Michał Górny <mgorny@gentoo.org> (2014-06-27)
-# Switch multilib flags for the ABI.
-abi_ppc_64
--abi_ppc_32
diff --git a/profiles/arch/powerpc/ppc64/64le/package.use.mask b/profiles/arch/powerpc/ppc64/64le/package.use.mask
index ad5616188460..a4009fe5a03c 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Michał Górny <mgorny@gentoo.org> (2021-12-31)
@@ -54,10 +54,6 @@ media-libs/mesa -vulkan -vulkan-overlay
 media-video/mpv -vulkan
 media-video/vlc -libplacebo
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-01-21)
-# mask untested card for libva
-x11-libs/libva video_cards_nouveau
-
 # Robin H. Johnson <robbat2@gentoo.org> (2019-12-06)
 # PPS should work on all arches, but only keyworded on some arches
 >=net-misc/ntp-4.2.6_p3-r1 -parse-clocks
diff --git a/profiles/arch/powerpc/ppc64/64le/package.use.stable.mask b/profiles/arch/powerpc/ppc64/64le/package.use.stable.mask
index 8c1c77451267..77289a944ed2 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.use.stable.mask
@@ -1,6 +1,10 @@
 # Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Alexey Sokolov <alexey+gentoo@asokolov.org> (2022-02-05)
+# dev-qt/qtwebengine not stable on ppc64 yet
+sci-astronomy/stellarium webengine
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-05-07)
 # openjfx:8 will never be stabilized
 # openjfx:11 probably will neither
diff --git a/profiles/arch/powerpc/ppc64/64ul/package.use.mask b/profiles/arch/powerpc/ppc64/64ul/package.use.mask
index ca0dd80c2085..91531751f08e 100644
--- a/profiles/arch/powerpc/ppc64/64ul/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/64ul/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev (2022-02-16)
+# dev-python/networkx is keyworded here
+app-portage/nattka -depgraph-order
+
 # Michał Górny <mgorny@gentoo.org> (2021-12-31)
 # Don't apply stable masks to python-exec since we're forcing every
 # impl there anyway. Please keep this in sync with use.stable.mask.
diff --git a/profiles/arch/powerpc/ppc64/64ul/package.use.stable.mask b/profiles/arch/powerpc/ppc64/64ul/package.use.stable.mask
new file mode 100644
index 000000000000..10737ace35e3
--- /dev/null
+++ b/profiles/arch/powerpc/ppc64/64ul/package.use.stable.mask
@@ -0,0 +1,6 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Georgy Yakovlev (2022-02-16)
+# dev-python/networkx is unstable here
+app-portage/nattka depgraph-order
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index 7a0bdb803f0e..727cd753c7c0 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -38,10 +38,6 @@ sys-apps/exa man
 # dev-python/django is not keyworded here
 dev-python/diskcache test
 
-# Mike Gilbert <floppym@gentoo.org> (2021-03-29)
-# Unmask TPM on supported archs.
-sys-apps/systemd -tpm
-
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-02-25)
 # depends on ring crate, which is not so portable
 # https://github.com/briansmith/ring/issues/389
diff --git a/profiles/arch/powerpc/ppc64/package.use.stable.mask b/profiles/arch/powerpc/ppc64/package.use.stable.mask
index 46b6dcd3e2f7..91ea8bff98d5 100644
--- a/profiles/arch/powerpc/ppc64/package.use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.stable.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
 
 # When you add an entry to the top of this file, add your name, the date, and
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James <sam@gentoo.org> (2022-03-07)
+# sys-cluster/torque not marked stable on ppc64
+sys-cluster/openmpi openmpi_rm_pbs
+
 # Marek Szuba <marecki@gentoo.org> (2021-12-31)
 # No stable dev-ruby/{thor,tty-editor} on this arch yet
 # and there are many dependencies to go through before there are
@@ -47,4 +51,3 @@ media-gfx/inkscape cdr visio wpg
 # Pacho Ramos <pacho@gentoo.org> (2014-07-02)
 # Mask due Gnome3 not going to be stabilized on this arch
 gnome-base/gvfs google
->=x11-libs/gtk+-3.12.2 cloudprint
diff --git a/profiles/arch/powerpc/ppc64/use.force b/profiles/arch/powerpc/ppc64/use.force
index 85c8ee8c145f..88544d5e9243 100644
--- a/profiles/arch/powerpc/ppc64/use.force
+++ b/profiles/arch/powerpc/ppc64/use.force
@@ -1,5 +1,2 @@
 # Force the flag which corresponds to ARCH.
 ppc64
-
-# Force the flag corresponding to the only ABI.
-abi_ppc_64
diff --git a/profiles/arch/powerpc/ppc64/use.mask b/profiles/arch/powerpc/ppc64/use.mask
index ab9cefcf66ac..7de0634ed869 100644
--- a/profiles/arch/powerpc/ppc64/use.mask
+++ b/profiles/arch/powerpc/ppc64/use.mask
@@ -1,4 +1,4 @@
-# Copyright 2008-2021 Gentoo Authors
+# Copyright 2008-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 ### THIS FILE IS ONLY FOR PACKAGES MASKED ON BOTH 64-BIT AND 32-BIT USERLAND!!!
@@ -14,10 +14,6 @@
 openexr
 osg
 
-# Michał Górny <mgorny@gentoo.org> (2014-06-27)
-# Unmask multilib flag for the ABI.
--abi_ppc_64
-
 # Samuli Suominen <ssuominen@gentoo.org> (2012-11-24)
 # TODO: Keyword and stabilize media-gfx/opencolorio and media-libs/opencv
 color-management