16 files changed, 14 insertions, 60 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index a3aa4c771cdc..dccd08be9d44 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 4d6987cbac1c..56226c90bb3b 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -42,11 +42,6 @@ media-gfx/graphicsmagick jpegxl
 # Untested useflag on other arches, needs keywording
 media-video/ffmpeg vmaf
 
-# Adel Kara Slimane <adel.ks@zegrapher.com> (2022-02-17)
-# Mask AMF keyword on non-amd64 arches
-# It is unusable, for now, in other arches
-media-video/ffmpeg amf
-
 # Sam James <sam@gentoo.org> (2022-01-29)
 # app-text/ronn-ng not keyworded here, bug #801103
 app-accessibility/espeak-ng man
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 317dfc821763..20f9e7c5b661 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -50,6 +50,10 @@ media-sound/qmmp -xmp
 # Need intel-hybrid-codec-driver, which only works on amd64
 media-libs/libva-intel-driver -hybrid
 
+# Adel Kara Slimane <adel.ks@zegrapher.com> (2022-02-17)
+# Unmask AMF keyword on amd64 only
+media-video/ffmpeg -amf
+
 # James Le Cuirot <chewi@gentoo.org> (2021-10-22)
 # The JIT feature only works on amd64 and x86.
 app-emulation/fs-uae -jit
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index c27544a2899d..fba3315db99a 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -47,11 +47,6 @@ kde-frameworks/kfilemetadata mobi
 # https://www.boost.org/doc/libs/1_78_0/libs/context/doc/html/context/architectures.html
 dev-libs/boost -context
 
-# Adel Kara Slimane <adel.ks@zegrapher.com> (2022-01-17)
-# Mask AMF keyword on non-amd64 arches
-# It is unusable, for now, in other arches
-media-video/ffmpeg amf
-
 # Sam James <sam@gentoo.org> (2022-01-15)
 # Deps not yet stable:
 # app-emulation/spice
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 9d78b11ce771..e91a2e91bf26 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -46,11 +46,6 @@ media-video/ffmpeg vmaf
 # Supports 64-bit NEON
 >=media-libs/libjpeg-turbo-2.1.3 -cpu_flags_arm_neon
 
-# Adel Kara Slimane <adel.ks@zegrapher.com> (2022-01-11)
-# Mask AMF keyword on non-amd64 arches
-# It is unusable, for now, in other arches
-media-video/ffmpeg amf
-
 # Sam James <sam@gentoo.org> (2022-02-02)
 # sys-cluster/knem is not keyworded on arm64
 sys-cluster/openmpi openmpi_fabrics_knem
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index 8ca1e3eda94e..7db6c9601a3c 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -43,6 +43,11 @@ sys-libs/libseccomp experimental-loong
 # These GRUB platforms are only for MIPS.
 sys-boot/grub grub_platforms_loongson grub_platforms_qemu-mips
 
+# Adel Kara Slimane <adel.ks@zegrapher.com> (2022-02-17)
+# Mask AMF keyword on non-amd64 arches
+# It is unusable, for now, in other arches
+media-video/ffmpeg amf
+
 # Sam James <sam@gentoo.org> (2021-11-15)
 # Only available on PPC*.
 sys-apps/util-linux rtas
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 6c3e4c331e3b..11880aec0ddf 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -73,11 +73,6 @@ media-video/ffmpeg vmaf
 # Unkeyworded dependencies
 net-mail/cyrus-imapd http
 
-# Adel Kara Slimane <adel.ks@zegrapher.com> (2022-02-17)
-# Mask AMF keyword on non-amd64 arches
-# It is unusable, for now, in other arches
-media-video/ffmpeg amf
-
 # Arthur Zamarin <arthurzam@gentoo.org> (2022-02-08)
 # bash becomes corrupted and system breaks, bug #832946
 app-shells/bash mem-scramble
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index ff0426675ad5..b7d40c41c51a 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -55,11 +55,6 @@ media-video/ffmpeg vmaf
 # Unkeyworded dependencies
 net-mail/cyrus-imapd http
 
-# Adel Kara Slimane <adel.ks@zegrapher.com> (2022-01-11)
-# Mask AMF keyword on non-amd64 arches
-# It is unusable, for now, in other arches
-media-video/ffmpeg amf
-
 # Sam James <sam@gentoo.org> (2022-01-29)
 # app-text/ronn-ng not keyworded here, bug #801103
 app-accessibility/espeak-ng man
diff --git a/profiles/arch/m68k/package.use.mask b/profiles/arch/m68k/package.use.mask
index c9cf8600697b..49f32e29504c 100644
--- a/profiles/arch/m68k/package.use.mask
+++ b/profiles/arch/m68k/package.use.mask
@@ -9,11 +9,6 @@ sys-apps/systemd tpm xkb
 # Untested useflag on other arches, needs keywording
 media-video/ffmpeg vmaf
 
-# Adel Kara Slimane <adel.ks@zegrapher.com> (2022-01-11)
-# Mask AMF keyword on non-amd64 arches
-# It is unusable, for now, in other arches
-media-video/ffmpeg amf
-
 # James Le Cuirot <chewi@gentoo.org> (2022-01-09)
 # Most usage of KMS requires GBM, which is provided by Mesa, which currently
 # doesn't work on m68k.
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index b170dc1e0b6d..0c30ba5895fc 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -27,11 +27,6 @@ media-video/ffmpeg vmaf
 # These GRUB platforms are only for MIPS.
 sys-boot/grub -grub_platforms_loongson -grub_platforms_qemu-mips
 
-# Adel Kara Slimane <adel.ks@zegrapher.com> (2022-01-17)
-# Mask AMF keyword on non-amd64 arches
-# It is unusable, for now, in other arches
-media-video/ffmpeg amf
-
 # Fabian Groffen <grobian@gentoo.org> (2022-02-13)
 # needs unkeyworded virtual/gsasl
 mail-client/mutt gsasl
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index d79b13f82ed2..bbc877e0dd77 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -30,11 +30,6 @@ app-text/enchant nuspell
 # Untested useflag on other arches, needs keywording
 media-video/ffmpeg vmaf
 
-# Adel Kara Slimane <adel.ks@zegrapher.com> (2021-12-11)
-# Mask AMF keyword on non-amd64 arches
-# It is unusable, for now, in other arches
-media-video/ffmpeg amf
-
 # Sam James <sam@gentoo.org> (2021-11-15)
 # librtas is available on (only) ppc*
 sys-apps/util-linux -rtas
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index c4a2cc172cad..d4d1f89fe2c2 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -96,11 +96,6 @@ sys-block/fio rbd
 # Upstream bug for criu: https://github.com/checkpoint-restore/criu/issues/1702
 app-containers/crun criu
 
-# Adel Kara Slimane <adel.ks@zegrapher.com> (2022-02-17)
-# Mask AMF keyword on non-amd64 arches
-# It is unusable, for now, in other arches
-media-video/ffmpeg amf
-
 # Yongxinag Liang <tanekliang@gmail.com> (2022-01-09)
 # app-emulation/xen-tools doesn't support riscv yet
 app-emulation/qemu xen
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index 5c8b25342be2..bb80e08dba19 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -117,11 +117,6 @@ app-portage/nattka depgraph-order
 # Untested useflag on other arches, needs keywording
 media-video/ffmpeg vmaf
 
-# Adel Kara Slimane <adel.ks@zegrapher.com> (2021-12-11)
-# Mask AMF keyword on non-amd64 arches
-# It is unusable, for now, in other arches
-media-video/ffmpeg amf
-
 # Sam James <sam@gentoo.org> (2021-11-05)
 # Avoid keywording unnecessary depenencies for now, bug #804115
 dev-python/scipy pythran
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 14d208bd5e97..29c11d7beaca 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -73,11 +73,6 @@ media-video/ffmpeg vmaf
 # Unkeyworded dependencies
 net-mail/cyrus-imapd http
 
-# Adel Kara Slimane <adel.ks@zegrapher.com> (2022-02-17)
-# Mask AMF keyword on non-amd64 arches
-# It is unusable, for now, in other arches
-media-video/ffmpeg amf
-
 # Daniel Pielmeier <billie@gentoo.org> (2021-11-07)
 # gnome-base/librsvg is not keyworded here, bug #807130
 app-admin/conky lua-rsvg
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 71f1fb9e451a..4e5178298642 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -67,11 +67,6 @@ media-video/ffmpeg vmaf
 # dev-util/hip and its rocm dependencies not keyworded here
 sci-physics/lammps hip
 
-# Adel Kara Slimane <adel.ks@zegrapher.com> (2021-02-17)
-# Mask AMF keyword on non-amd64 arches
-# It is unusable, for now, in other arches
-media-video/ffmpeg amf
-
 # Sam James <sam@gentoo.org> (2022-01-20)
 # Only supports cpu_flags_x86_aes in 64-bit mode
 net-fs/samba cpu_flags_x86_aes
diff --git a/profiles/package.mask b/profiles/package.mask
index a3e58355d2ad..a2c3edae21c4 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Hans de Graaff <graaff@gentoo.org> (2022-12-03)
+# ruby27-only packages. No recent releases. No reverse dependencies
+# anymore. Maksed for removal in 30 days.
+dev-ruby/rspec-retry
+
 # Oz Tiram <oz.tiram@gmail.com> (2022-12-03)
 # Mate-desktop no longer supports gtk+:2, so there is
 # no need for this package. Removal on 2023-01-03.