6 files changed, 30 insertions, 12 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 80ca611e4666..dd929150b90b 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index fa797cc69374..f41be68b0826 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -122,10 +122,6 @@ sys-apps/flashrom -atahpt -atapromise -atavia -drkaiser -gfxnvidia -internal -it
 # clisp is keyworded on amd64
 app-text/texlive-core -xindy
 
-# Thomas Deutschmann <whissi@gentoo.org> (2020-04-30)
-# sys-cluster/slurm is keyworded on amd64
-app-metrics/collectd -collectd_plugins_slurm
-
 # Georgy Yakovlev <gyakovlev@gentoo.org (2020-04-26)
 # static-pie works on amd64, #719444
 sys-libs/glibc -static-pie
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index c02657e5b8d0..f0ea6816568f 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -125,10 +125,6 @@ sys-apps/flashrom atahpt atapromise atavia drkaiser gfxnvidia internal it8212 ni
 # requires clisp whichis keyworded on fewer arches
 app-text/texlive-core xindy
 
-# Thomas Deutschmann <whissi@gentoo.org> (2020-04-30)
-# Dependency is only keyworded on amd64 and x86
-app-metrics/collectd collectd_plugins_slurm
-
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-04-26)
 # static-pie is not implemented on all arches, #719444
 # https://sourceware.org/glibc/wiki/PortStatus
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 5fab53c509a8..ef5e8a39ba3f 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -151,10 +151,6 @@ app-text/texlive-core -xindy
 app-containers/lxc apparmor
 app-containers/lxd apparmor
 
-# Thomas Deutschmann <whissi@gentoo.org> (2020-04-30)
-# sys-cluster/slurm is keyworded on x86
-app-metrics/collectd -collectd_plugins_slurm
-
 # Georgy Yakovlev <gyakovlev@gentoo.org (2020-04-26)
 # static-pie works on x86, #719444
 sys-libs/glibc -static-pie
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 1a9c0c74443c..7b377ff31b49 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,15 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# John Helmert III <ajak@gentoo.org> (2022-08-14)
+# libaacplus is last rited
+media-sound/darkice aacplus
+
+# John Helmert III <ajak@gentoo.org> (2022-08-14)
+# slurm is last rited
+app-metrics/collectd collectd_plugins_slurm
+sys-cluster/openmpi openmpi_rm_slurm
+
 # Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2022-08-13)
 # PyQt6/PySide6 are masked for testing
 dev-python/QtPy pyqt6 pyside6
diff --git a/profiles/package.mask b/profiles/package.mask
index 25bcab1cc87f..1d0fb618f28c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -34,6 +34,27 @@
 #--- END OF EXAMPLES ---
 
 # John Helmert III <ajak@gentoo.org> (2022-08-14)
+# Vulnerable, unmaintained in Gentoo, EAPI6. Removal in 30 days,
+# bug #772209
+app-crypt/keybase
+
+# John Helmert III <ajak@gentoo.org> (2022-08-14)
+# Remote code execution vulnerability, dead upstream. Removal in 30
+# days, bug #791004.
+x11-terms/mrxvt
+
+# John Helmert III <ajak@gentoo.org> (2022-08-14)
+# Dead upstream, vulnerable, no revdeps except a usedep. Removal in 30
+# days, bug #618000
+media-libs/libaacplus
+
+# John Helmert III <ajak@gentoo.org> (2022-08-14)
+# Many vulnerabilities (including code execution and root privilege
+# escalation), effectively unmaintained. Removal in 30 days, bugs
+# #631552, #790296, #842789
+sys-cluster/slurm
+
+# John Helmert III <ajak@gentoo.org> (2022-08-14)
 # Vulnerable and unmaintained for years, many open bugs, no revdeps,
 # EAPI 6. Removal in 30 days, bug 733354
 net-misc/calico-cni-plugin