20 files changed, 53 insertions, 87 deletions
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index f7b2463fd589..176e982a1845 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# matoro <matoro_gentoo@matoro.tk> (2023-06-18)
+# sci-physics/bullet not keyworded here (#908240)
+dev-libs/efl physics
+
+# matoro <matoro_gentoo@matoro.tk> (2023-06-18)
+# media-libs/rlottie not keyworded here (#908241)
+dev-libs/efl json
+
 # Sam James <sam@gentoo.org> (2023-06-18)
 # Qt 5 not keyworded here
 app-text/ansifilter gui
@@ -65,7 +73,7 @@ dev-python/click doc
 
 # Nickolas Raymond Kaczynski <nrk@disroot.org> (2022-04-24)
 # Dependencies are missing keywords
-media-libs/imlib2 svg heif
+media-libs/imlib2 svg
 
 # Matt Turner <mattst88@gentoo.org> (2022-04-18)
 # app-text/nuspell is not keyworded
@@ -133,10 +141,8 @@ dev-python/diskcache test
 media-libs/rubberband jni
 
 # Sam James <sam@gentoo.org> (2021-03-11)
-# media-libs/libheif isn't keyworded here
 # media-libs/libavif isn't keyworded here
-media-libs/gd avif heif
-media-gfx/graphicsmagick heif
+media-libs/gd avif
 www-client/links avif
 dev-lang/php avif
 
@@ -254,10 +260,6 @@ media-tv/v4l-utils bpf
 # Mask until dev-libs/libfido2 is keyworded
 net-misc/openssh security-key
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-01-26)
-# media-libs/libheif is not keyworded
-media-gfx/gimp heif
-
 # Tomáš Mózes <hydrapolic@gmail.com> (2019-12-19)
 # dev-libs/criterion is not keyworded yet
 app-admin/syslog-ng test
diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask
index ff7bf0d986ab..39609a8787af 100644
--- a/profiles/arch/alpha/use.mask
+++ b/profiles/arch/alpha/use.mask
@@ -4,6 +4,10 @@
 # Unmask the flag which corresponds to ARCH.
 -alpha
 
+# matoro <matoro_gentoo@matoro.tk> (2023-06-17)
+# media-libs/libheif is not keyworded here
+heif
+
 # matoro <matoro_gentoo@matoro.tk> (2023-06-10)
 # dev-lang/go is not keyworded here
 go
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index d2146cb91175..95d4c48b9fb4 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -258,10 +258,6 @@ net-vpn/strongswan -strongswan_plugins_aesni -strongswan_plugins_rdrand
 # Unmask arch-specific USE flags available on amd64
 net-analyzer/testssl -bundled-openssl -kerberos
 
-# Thomas Deutschmann <whissi@gentoo.org> (2018-09-30)
-# Unmask libheif support where media-libs/libheif is keyworded
-media-gfx/imagemagick -heif
-
 # Thomas Deutschmann <whissi@gentoo.org> (2018-08-23)
 # Dependency sys-cluster/ceph is keyworded for amd64
 net-fs/samba -ceph
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index 75cfebf25113..b0ca89d14d07 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -241,10 +241,6 @@ net-vpn/strongswan strongswan_plugins_aesni strongswan_plugins_rdrand strongswan
 # Only available on amd64/x86
 net-analyzer/testssl bundled-openssl kerberos
 
-# Thomas Deutschmann <whissi@gentoo.org> (2018-09-30)
-# Requires media-libs/libheif which is only keyworded for amd64 and x86
-media-gfx/imagemagick heif
-
 # Rick Farina <zerochaos@gentoo.org> (2018-06-27)
 # Catalyst only has support for assembling bootloader on some arches
 dev-util/catalyst system-bootloader
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 339e73008f4f..f2c66c477fb6 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -70,7 +70,7 @@ dev-libs/libgdata crypt
 
 # Nickolas Raymond Kaczynski <nrk@disroot.org> (2022-04-24)
 # Dependencies are missing keywords
-media-libs/imlib2 svg heif
+media-libs/imlib2 svg
 
 # Sam James <sam@gentoo.org> (2022-04-24)
 # Requires dev-util/pahole.
@@ -164,10 +164,8 @@ dev-ruby/globalid test
 media-libs/rubberband jni
 
 # Sam James <sam@gentoo.org> (2021-03-11)
-# media-libs/libheif isn't keyworded here
 # media-libs/libavif isn't keyworded here
-media-libs/gd avif heif
-media-gfx/graphicsmagick heif
+media-libs/gd avif
 www-client/links avif
 dev-lang/php avif
 
@@ -190,7 +188,7 @@ media-sound/fluidsynth lash
 
 # Joonas Niilola <juippis@gentoo.org> (2020-10-08)
 # Dependency not keyworded on this arch.
-dev-libs/efl avif heif lua_single_target_luajit physics
+dev-libs/efl avif lua_single_target_luajit physics
 
 # Matt Turner <mattst88@gentoo.org> (2020-08-11)
 # No drivers on this architecture support Vulkan
@@ -250,10 +248,6 @@ net-im/pidgin gadu
 # media-libs/libilbc has not been ported to HPPA
 net-analyzer/wireshark ilbc
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-01-26)
-# media-libs/libheif is not keyworded
-media-gfx/gimp heif
-
 # 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/hppa/use.mask b/profiles/arch/hppa/use.mask
index 9542a2f79225..0e94502e8c96 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -7,6 +7,10 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# matoro <matoro_gentoo@matoro.tk> (2023-06-17)
+# media-libs/libheif is not keyworded here
+heif
+
 # Sam James <sam@gentoo.org> (2022-10-15)
 # x11-apps/fonttosfnt is not keyworded here
 opentype-compat
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index ba01fa190cf7..fe7a5135e9ea 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -49,7 +49,7 @@ net-misc/modemmanager qrtr
 
 # Nickolas Raymond Kaczynski <nrk@disroot.org> (2022-04-24)
 # Dependencies are missing keywords
-media-libs/imlib2 svg heif
+media-libs/imlib2 svg
 
 # Matt Turner <mattst88@gentoo.org> (2022-04-18)
 # app-text/nuspell is not keyworded
@@ -94,11 +94,6 @@ dev-python/argon2-cffi doc
 # bug #807616
 media-libs/libsdl2 pipewire
 
-# Sam James <sam@gentoo.org> (2021-10-17)
-# media-libs/libheif not keyworded here
-sci-libs/gdal heif
-media-gfx/graphicsmagick heif
-
 # Sam James <sam@gentoo.org> (2021-09-14)
 # JACK2 isn't keyworded here
 # bug #807616
@@ -133,10 +128,8 @@ dev-python/diskcache test
 media-libs/rubberband jni
 
 # Sam James <sam@gentoo.org> (2021-03-11)
-# media-libs/libheif isn't keyworded here
 # media-libs/libavif isn't keyworded here
-media-libs/gd avif heif
-media-gfx/graphicsmagick heif
+media-libs/gd avif
 www-client/links avif
 dev-lang/php avif
 
@@ -227,10 +220,6 @@ net-misc/openssh security-key
 # Dependency not keyworded on this arch.
 dev-libs/dbus-c++ ecore
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-01-26)
-# media-libs/libheif is not keyworded
-media-gfx/gimp heif
-
 # David Seifert <soap@gentoo.org> (2020-01-26)
 # media-libs/libkate is not keyworded on ia64 anymore
 media-sound/vorbis-tools kate
diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask
index 8cf4b1f138ce..dd4a9e2c043d 100644
--- a/profiles/arch/ia64/use.mask
+++ b/profiles/arch/ia64/use.mask
@@ -4,6 +4,10 @@
 # Unmask the flag which corresponds to ARCH.
 -ia64
 
+# matoro <matoro_gentoo@matoro.tk> (2023-06-17)
+# media-libs/libheif is not keyworded here
+heif
+
 # Sam James <sam@gentoo.org> (2022-07-21)
 # Untested.
 ieee1394
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index afac21575d77..a8cd29a0461f 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# matoro <matoro_gentoo@matoro.tk> (2023-06-18)
+# app-i18n/fcitx:4 not keyworded here
+media-libs/libsdl2 fcitx4
+
 # Sam James <sam@gentoo.org> (2023-06-18)
 # Qt 5 not keyworded here
 app-text/ansifilter gui
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 9af305009dba..f335af2295d2 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -23,10 +23,6 @@ dev-python/bracex doc
 # pandoc not keyworded here, bug #878355
 app-admin/conky doc
 
-# Bernard Cafarelli <voyageur@gentoo.org> (2022-10-17)
-# media-libs/libheif not keyworded
-media-gfx/geeqie heif
-
 # Sam James <sam@gentoo.org> (2022-10-16)
 # dev-cpp/notcurses not keyworded here
 media-sound/snd notcurses
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index 5d8be8ed040c..b4cf3aa4b078 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -55,14 +55,6 @@ dev-util/pkgcheck emacs
 # kde-frameworks/plasma not keyworded here
 app-i18n/uim kde
 
-# Matt Turner <mattst88@gentoo.org> (2022-05-16)
-# media-libs/libheif not keyworded here
-media-gfx/gthumb heif
-
-# Nickolas Raymond Kaczynski <nrk@disroot.org> (2022-04-24)
-# Dependencies are missing keywords
-media-libs/imlib2 heif
-
 # Lars Wendler <polynomial-c@gentoo.org> (2022-04-22)
 # gnome-base/librsvg missing keywords
 media-libs/freetype svg
@@ -86,10 +78,6 @@ net-misc/plowshare javascript
 # https://www.boost.org/doc/libs/1_78_0/libs/context/doc/html/context/architectures.html
 dev-libs/boost -context
 
-# Joonas Niilola <juippis@gentoo.org> (2022-01-04)
-# Dependency not keyworded on this arch.
-dev-libs/efl heif
-
 # Sam James <sam@gentoo.org> (2021-12-31)
 # sci-mathematics/polymake not keyworded here
 sci-mathematics/singular polymake
@@ -115,11 +103,6 @@ app-admin/conky lua-rsvg
 # Requires unkeyworded dependencies
 app-i18n/uim kde
 
-# Sam James <sam@gentoo.org> (2021-10-17)
-# media-libs/libheif not keyworded here
-sci-libs/gdal heif
-media-gfx/graphicsmagick heif
-
 # Matt Turner <mattst88@gentoo.org> (2021-07-25)
 # gdm requires gnome-shell requires rustified librsvg.
 x11-misc/xscreensaver gdm
@@ -137,9 +120,8 @@ media-sound/easyeffects zamaudio
 dev-python/diskcache test
 
 # Sam James <sam@gentoo.org> (2021-03-11)
-# media-libs/libheif isn't keyworded here
 # media-libs/libavif isn't keyworded here
-media-libs/gd avif heif
+media-libs/gd avif
 www-client/links avif
 dev-lang/php avif
 
@@ -184,10 +166,6 @@ net-analyzer/pnp4nagios icinga
 # Mask until dev-libs/libfido2 is keyworded
 net-misc/openssh security-key
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-01-26)
-# media-libs/libheif is not keyworded
-media-gfx/gimp heif
-
 # 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/ppc32/use.mask b/profiles/arch/powerpc/ppc32/use.mask
index dfc84d5e8125..4c5e74f34a9e 100644
--- a/profiles/arch/powerpc/ppc32/use.mask
+++ b/profiles/arch/powerpc/ppc32/use.mask
@@ -4,6 +4,10 @@
 # Unmask the flag which corresponds to ARCH.
 -ppc
 
+# matoro <matoro_gentoo@matoro.tk> (2023-06-17)
+# media-libs/libheif is not keyworded here
+heif
+
 # Sam James <sam@gentoo.org> (2022-03-03)
 # dev-db/mysql doesn't work well on PPC, especially 8.x, but should be fine on PPC64
 -mysql
diff --git a/profiles/arch/powerpc/ppc64/32ul/package.use.mask b/profiles/arch/powerpc/ppc64/32ul/package.use.mask
index 2b0670825720..5e473bff5ffa 100644
--- a/profiles/arch/powerpc/ppc64/32ul/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/32ul/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Lars Wendler <polynomial-c@gentoo.org> (2022-04-22)
@@ -9,10 +9,6 @@ media-libs/freetype svg
 # dev-java/openjdk:11 is not keyworded
 >=app-office/libreoffice-7 java
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-01-26)
-# media-libs/libheif is not keyworded
-media-gfx/gimp heif
-
 # 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/32ul/use.mask b/profiles/arch/powerpc/ppc64/32ul/use.mask
index 2e4685d1f36d..7d18300e0fbc 100644
--- a/profiles/arch/powerpc/ppc64/32ul/use.mask
+++ b/profiles/arch/powerpc/ppc64/32ul/use.mask
@@ -6,3 +6,7 @@ ppc64
 
 # We mask this since we're not really a multilib profile
 multilib
+
+# matoro <matoro_gentoo@matoro.tk> (2023-06-17)
+# media-libs/libheif is not keyworded here
+heif
diff --git a/profiles/arch/powerpc/ppc64/package.use.stable.mask b/profiles/arch/powerpc/ppc64/package.use.stable.mask
index 6cff3416691d..c5b638554613 100644
--- a/profiles/arch/powerpc/ppc64/package.use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.stable.mask
@@ -57,10 +57,6 @@ mail-client/claws-mail gdata
 # Unstable test deps.
 dev-cpp/eigen test
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-05-03)
-# media-libs/libheif not stable, bugs #717242, #720438
-media-gfx/gimp heif
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-02-16)
 # app-text/libwpd and app-text/libwpg are not stable
 media-gfx/inkscape cdr visio wpg
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index 1282683865f5..477a16b6bbe5 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -43,8 +43,7 @@ dev-ruby/stringex test
 
 # Sam James <sam@gentoo.org> (2022-04-26)
 # eps: app-text/libspectre not keyworded here
-# heif: media-libs/libheif not keyworded here
-media-libs/imlib2 eps heif
+media-libs/imlib2 eps
 
 # Sam James <sam@gentoo.org> (2022-04-26)
 # Avoid unkeyworded dependencies
@@ -100,10 +99,8 @@ net-fs/cifs-utils acl
 media-libs/libcanberra sound
 
 # Sam James <sam@gentoo.org> (2022-04-24)
-# media-libs/libheif isn't keyworded here
 # media-libs/libavif isn't keyworded here
-media-libs/gd avif heif
-media-gfx/graphicsmagick heif
+media-libs/gd avif
 www-client/links avif
 dev-lang/php avif
 
diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask
index aefa28077ca8..b8f141fe5f09 100644
--- a/profiles/arch/s390/use.mask
+++ b/profiles/arch/s390/use.mask
@@ -4,6 +4,10 @@
 # Unmask the flag which corresponds to ARCH.
 -s390
 
+# matoro <matoro_gentoo@matoro.tk> (2023-06-17)
+# media-libs/libheif is not keyworded here
+heif
+
 # Sam James <sam@gentoo.org> (2022-04-26)
 # dev-libs/mongo-c-driver not keyworded here
 mongodb
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 0c79529af723..666be07eea63 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -95,7 +95,7 @@ dev-lang/rust-bin clippy doc rustfmt rust-analyzer
 
 # Nickolas Raymond Kaczynski <nrk@disroot.org> (2022-04-24)
 # Dependencies are missing keywords
-media-libs/imlib2 svg heif
+media-libs/imlib2 svg
 
 # Matt Turner <mattst88@gentoo.org> (2022-04-18)
 # app-text/nuspell is not keyworded
@@ -179,11 +179,9 @@ sys-apps/grep static
 media-libs/rubberband jni
 
 # Sam James <sam@gentoo.org> (2021-03-13)
-# media-libs/libheif isn't keyworded here
 # media-libs/libavif isn't keyworded here
-media-libs/gd avif heif
+media-libs/gd avif
 net-libs/webkit-gtk avif
-media-gfx/graphicsmagick heif
 www-client/links avif
 dev-lang/php avif
 
diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask
index 321ddb3a648b..fefe54675310 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
 
+# matoro <matoro_gentoo@matoro.tk> (2023-06-17)
+# media-libs/libheif is not keyworded here
+heif
+
 # matoro <matoro_gentoo@matoro.tk> (2023-03-07)
 # dev-db/mariadb fails tests disastrously.
 mariadb
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 5cf40817952c..b0adeed3d307 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -290,10 +290,6 @@ net-analyzer/zmap mongo
 # Unmask arch-specific USE flag available on x86
 net-analyzer/testssl -bundled-openssl
 
-# Thomas Deutschmann <whissi@gentoo.org> (2018-09-30)
-# Unmask libheif support where media-libs/libheif is keyworded
-media-gfx/imagemagick -heif
-
 # Tomáš Mózes <hydrapolic@gmail.com> (2018-09-28)
 # Requires dev-db/mongodb which has dropped x86 support
 dev-python/pymongo test