[gentoo-commits] repo/gentoo:master commit in: media-libs/libmikmod/, media-libs/giflib/, media-libs/sdl-mixer/, ...

[Michał Górny]

commit:     80a41bd9e45de0d472eca6b530411dbe93394740
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 11 15:36:23 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Oct 11 15:36:23 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80a41bd9

media-libs: Remove *-fbsd KEYWORDS

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 media-libs/a52dec/a52dec-0.7.4-r6.ebuild                      | 2 +-
 media-libs/a52dec/a52dec-0.7.4-r7.ebuild                      | 2 +-
 media-libs/aalib/aalib-1.4_rc5-r6.ebuild                      | 2 +-
 media-libs/aalib/aalib-1.4_rc5-r7.ebuild                      | 2 +-
 media-libs/aalib/aalib-1.4_rc5-r8.ebuild                      | 2 +-
 media-libs/audiofile/audiofile-0.3.6-r3.ebuild                | 2 +-
 media-libs/babl/babl-0.1.12.ebuild                            | 2 +-
 media-libs/babl/babl-0.1.38.ebuild                            | 2 +-
 media-libs/babl/babl-0.1.62.ebuild                            | 2 +-
 media-libs/babl/babl-0.1.64.ebuild                            | 2 +-
 media-libs/babl/babl-0.1.66.ebuild                            | 2 +-
 media-libs/babl/babl-9999.ebuild                              | 2 +-
 media-libs/cal3d/cal3d-0.11.0-r1.ebuild                       | 2 +-
 media-libs/chromaprint/chromaprint-1.4.2.ebuild               | 2 +-
 media-libs/chromaprint/chromaprint-1.4.3.ebuild               | 2 +-
 media-libs/compface/compface-1.5.2.ebuild                     | 2 +-
 media-libs/ctl/ctl-1.5.2-r1.ebuild                            | 2 +-
 media-libs/exempi/exempi-2.4.5-r1.ebuild                      | 2 +-
 media-libs/faac/faac-1.29.9.2.ebuild                          | 2 +-
 media-libs/faad2/faad2-2.8.8.ebuild                           | 2 +-
 media-libs/fdk-aac/fdk-aac-0.1.5.ebuild                       | 2 +-
 media-libs/fdk-aac/fdk-aac-0.1.6.ebuild                       | 2 +-
 media-libs/fdk-aac/fdk-aac-2.0.0.ebuild                       | 2 +-
 media-libs/flac/flac-1.3.2-r1.ebuild                          | 2 +-
 media-libs/flac/flac-1.3.3.ebuild                             | 2 +-
 media-libs/fontconfig/fontconfig-2.12.6.ebuild                | 2 +-
 media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild             | 2 +-
 media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild             | 2 +-
 media-libs/freealut/freealut-1.1.0-r3.ebuild                  | 2 +-
 media-libs/freetype/freetype-2.10.0.ebuild                    | 2 +-
 media-libs/freetype/freetype-2.10.1.ebuild                    | 2 +-
 media-libs/freetype/freetype-2.9.1-r3.ebuild                  | 2 +-
 media-libs/freetype/freetype-2.9.1-r4.ebuild                  | 2 +-
 media-libs/freetype/freetype-9999.ebuild                      | 2 +-
 media-libs/ftgl/ftgl-2.1.3_rc5.ebuild                         | 2 +-
 media-libs/game-music-emu/game-music-emu-0.6.2.ebuild         | 2 +-
 media-libs/gd/gd-2.2.5-r2.ebuild                              | 2 +-
 media-libs/gegl/gegl-0.2.0-r2.ebuild                          | 2 +-
 media-libs/gegl/gegl-0.2.0-r5.ebuild                          | 2 +-
 media-libs/gegl/gegl-0.3.0-r1.ebuild                          | 2 +-
 media-libs/gegl/gegl-0.3.0.ebuild                             | 2 +-
 media-libs/gegl/gegl-0.3.26.ebuild                            | 2 +-
 media-libs/gegl/gegl-0.3.34.ebuild                            | 2 +-
 media-libs/gegl/gegl-0.4.14.ebuild                            | 2 +-
 media-libs/gegl/gegl-0.4.16.ebuild                            | 2 +-
 media-libs/gegl/gegl-9999.ebuild                              | 2 +-
 media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild                    | 2 +-
 media-libs/gexiv2/gexiv2-0.12.0.ebuild                        | 2 +-
 media-libs/gexiv2/gexiv2-9999.ebuild                          | 2 +-
 media-libs/giblib/giblib-1.2.4-r1.ebuild                      | 2 +-
 media-libs/giflib/giflib-4.1.6-r2.ebuild                      | 2 +-
 media-libs/giflib/giflib-4.1.6-r3.ebuild                      | 2 +-
 media-libs/giflib/giflib-5.0.6.ebuild                         | 2 +-
 media-libs/giflib/giflib-5.1.4.ebuild                         | 2 +-
 media-libs/giflib/giflib-5.1.8-r1.ebuild                      | 2 +-
 media-libs/giflib/giflib-5.1.9.ebuild                         | 2 +-
 media-libs/giflib/giflib-5.2.1.ebuild                         | 2 +-
 media-libs/glew/glew-1.10.0-r100.ebuild                       | 2 +-
 media-libs/glew/glew-1.6.0-r100.ebuild                        | 2 +-
 media-libs/glew/glew-2.1.0-r1.ebuild                          | 2 +-
 media-libs/glu/glu-9.0.1.ebuild                               | 2 +-
 media-libs/glu/glu-9999.ebuild                                | 2 +-
 media-libs/graphene/graphene-1.8.6.ebuild                     | 2 +-
 media-libs/gst-plugins-bad/gst-plugins-bad-1.14.3.ebuild      | 2 +-
 media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild      | 2 +-
 media-libs/gst-plugins-base/gst-plugins-base-1.14.4.ebuild    | 2 +-
 media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild    | 2 +-
 media-libs/gst-plugins-good/gst-plugins-good-1.14.4.ebuild    | 2 +-
 media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild    | 2 +-
 media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.3.ebuild    | 2 +-
 media-libs/gstreamer/gstreamer-1.14.4.ebuild                  | 2 +-
 media-libs/gstreamer/gstreamer-1.14.5.ebuild                  | 2 +-
 media-libs/hamlib/hamlib-3.1.ebuild                           | 2 +-
 media-libs/hamlib/hamlib-3.2.ebuild                           | 2 +-
 media-libs/hamlib/hamlib-3.3.ebuild                           | 2 +-
 media-libs/harfbuzz/harfbuzz-2.3.1.ebuild                     | 2 +-
 media-libs/harfbuzz/harfbuzz-2.5.3.ebuild                     | 2 +-
 media-libs/harfbuzz/harfbuzz-2.6.0.ebuild                     | 2 +-
 media-libs/harfbuzz/harfbuzz-2.6.1.ebuild                     | 2 +-
 media-libs/harfbuzz/harfbuzz-2.6.2.ebuild                     | 2 +-
 media-libs/harfbuzz/harfbuzz-9999.ebuild                      | 2 +-
 media-libs/id3lib/id3lib-3.8.3-r8.ebuild                      | 2 +-
 media-libs/ilmbase/ilmbase-2.3.0.ebuild                       | 2 +-
 media-libs/imlib/imlib-1.9.15-r5.ebuild                       | 2 +-
 media-libs/imlib2/imlib2-1.5.1-r1.ebuild                      | 2 +-
 media-libs/jbig2dec/jbig2dec-0.14.ebuild                      | 2 +-
 media-libs/jbig2dec/jbig2dec-0.17.ebuild                      | 2 +-
 media-libs/jbigkit/jbigkit-2.1.ebuild                         | 2 +-
 media-libs/jpeg/jpeg-6b-r12.ebuild                            | 2 +-
 media-libs/jpeg/jpeg-8d-r2.ebuild                             | 2 +-
 media-libs/jpeg/jpeg-9c.ebuild                                | 2 +-
 media-libs/ladspa-cmt/ladspa-cmt-1.16-r4.ebuild               | 2 +-
 media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.ebuild               | 2 +-
 media-libs/lasi/lasi-1.1.2.ebuild                             | 2 +-
 media-libs/lcms/lcms-2.9.ebuild                               | 2 +-
 media-libs/lensfun/lensfun-0.3.2-r1.ebuild                    | 2 +-
 media-libs/libaacplus/libaacplus-2.0.2-r2.ebuild              | 2 +-
 media-libs/libaacplus/libaacplus-2.0.2-r3.ebuild              | 2 +-
 media-libs/libaacs/libaacs-0.9.0.ebuild                       | 2 +-
 media-libs/libafterimage/libafterimage-1.20-r2.ebuild         | 2 +-
 media-libs/libafterimage/libafterimage-1.20-r3.ebuild         | 2 +-
 media-libs/libao/libao-1.2.2.ebuild                           | 2 +-
 media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild           | 2 +-
 media-libs/libass/libass-0.14.0.ebuild                        | 2 +-
 media-libs/libbluray/libbluray-1.1.2.ebuild                   | 2 +-
 media-libs/libbluray/libbluray-9999.ebuild                    | 2 +-
 media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild                    | 2 +-
 media-libs/libcaca/libcaca-0.99_beta19.ebuild                 | 2 +-
 media-libs/libcanberra/libcanberra-0.30-r5.ebuild             | 2 +-
 media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild            | 2 +-
 media-libs/libcddb/libcddb-1.3.2-r1.ebuild                    | 2 +-
 media-libs/libcddb/libcddb-1.3.2.ebuild                       | 2 +-
 media-libs/libcuefile/libcuefile-477-r1.ebuild                | 2 +-
 media-libs/libdca/libdca-0.0.5-r3.ebuild                      | 2 +-
 media-libs/libdiscid/libdiscid-0.6.1.ebuild                   | 2 +-
 media-libs/libdiscid/libdiscid-0.6.2.ebuild                   | 2 +-
 media-libs/libdmtx/libdmtx-0.7.4.ebuild                       | 2 +-
 media-libs/libdmtx/libdmtx-0.7.5.ebuild                       | 2 +-
 media-libs/libdv/libdv-1.0.0-r2.ebuild                        | 2 +-
 media-libs/libdv/libdv-1.0.0-r3.ebuild                        | 2 +-
 media-libs/libdv/libdv-1.0.0-r4.ebuild                        | 2 +-
 media-libs/libdvbpsi/libdvbpsi-1.3.1.ebuild                   | 2 +-
 media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild                   | 2 +-
 media-libs/libdvdcss/libdvdcss-1.4.2.ebuild                   | 2 +-
 media-libs/libdvdnav/libdvdnav-6.0.0.ebuild                   | 2 +-
 media-libs/libdvdnav/libdvdnav-9999.ebuild                    | 2 +-
 media-libs/libdvdread/libdvdread-6.0.0.ebuild                 | 2 +-
 media-libs/libdvdread/libdvdread-6.0.1.ebuild                 | 2 +-
 media-libs/libdvdread/libdvdread-9999.ebuild                  | 2 +-
 media-libs/libemf/libemf-1.0.4-r1.ebuild                      | 2 +-
 media-libs/libemf/libemf-1.0.7.ebuild                         | 2 +-
 media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild                  | 2 +-
 media-libs/libepoxy/libepoxy-9999.ebuild                      | 2 +-
 media-libs/libexif/libexif-0.6.21-r3.ebuild                   | 2 +-
 media-libs/libfpx/libfpx-1.3.1_p10.ebuild                     | 2 +-
 media-libs/libggi/libggi-2.2.2-r1.ebuild                      | 2 +-
 media-libs/libggiwmh/libggiwmh-0.3.2-r1.ebuild                | 2 +-
 media-libs/libgii/libgii-1.0.2-r2.ebuild                      | 2 +-
 media-libs/libgphoto2/libgphoto2-2.5.20.ebuild                | 2 +-
 media-libs/libgphoto2/libgphoto2-2.5.22.ebuild                | 2 +-
 media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild              | 2 +-
 media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r2.ebuild        | 2 +-
 media-libs/libjpeg-turbo/libjpeg-turbo-2.0.2.ebuild           | 2 +-
 media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild           | 2 +-
 media-libs/libkate/libkate-0.4.1-r3.ebuild                    | 2 +-
 media-libs/libldac/libldac-2.0.2-r1.ebuild                    | 2 +-
 media-libs/liblqr/liblqr-0.4.2-r1.ebuild                      | 2 +-
 media-libs/libmad/libmad-0.15.1b-r9.ebuild                    | 2 +-
 media-libs/libmatroska/libmatroska-1.5.2.ebuild               | 2 +-
 media-libs/libmikmod/libmikmod-3.3.11.1.ebuild                | 2 +-
 media-libs/libmms/libmms-0.6.4.ebuild                         | 2 +-
 media-libs/libmng/libmng-2.0.3.ebuild                         | 2 +-
 media-libs/libmodplug/libmodplug-0.8.9.0.ebuild               | 2 +-
 media-libs/libmp4v2/libmp4v2-2.0.0-r1.ebuild                  | 2 +-
 media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild                  | 2 +-
 media-libs/libmtp/libmtp-1.1.16.ebuild                        | 2 +-
 media-libs/libmtp/libmtp-9999.ebuild                          | 2 +-
 media-libs/libnjb/libnjb-2.2.7.ebuild                         | 2 +-
 media-libs/libogg/libogg-1.3.3.ebuild                         | 2 +-
 media-libs/libogg/libogg-1.3.4.ebuild                         | 2 +-
 media-libs/libopenraw/libopenraw-0.0.9.ebuild                 | 2 +-
 media-libs/libopenraw/libopenraw-0.1.2.ebuild                 | 2 +-
 media-libs/libopenraw/libopenraw-0.1.3.ebuild                 | 2 +-
 media-libs/libpng/libpng-1.2.59.ebuild                        | 2 +-
 media-libs/libpng/libpng-1.5.30.ebuild                        | 2 +-
 media-libs/libpng/libpng-1.6.37.ebuild                        | 2 +-
 media-libs/libpostproc/libpostproc-0.8.0.20121125.ebuild      | 2 +-
 media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild      | 2 +-
 media-libs/libpostproc/libpostproc-10.20140517.ebuild         | 2 +-
 media-libs/libpostproc/libpostproc-9999.ebuild                | 2 +-
 media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild            | 2 +-
 media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild          | 2 +-
 media-libs/libreplaygain/libreplaygain-477-r1.ebuild          | 2 +-
 media-libs/libsamplerate/libsamplerate-0.1.9.ebuild           | 2 +-
 media-libs/libsamplerate/libsamplerate-9999.ebuild            | 2 +-
 media-libs/libsdl/libsdl-1.2.15-r9.ebuild                     | 2 +-
 media-libs/libshout/libshout-2.4.1-r2.ebuild                  | 2 +-
 media-libs/libshout/libshout-2.4.2.ebuild                     | 2 +-
 media-libs/libshout/libshout-2.4.3.ebuild                     | 2 +-
 media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild            | 2 +-
 media-libs/libsidplay/libsidplay-2.1.1-r5.ebuild              | 2 +-
 media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild             | 2 +-
 media-libs/libsndfile/libsndfile-9999.ebuild                  | 2 +-
 media-libs/libtheora/libtheora-1.1.1-r2.ebuild                | 2 +-
 media-libs/libtiger/libtiger-0.3.4-r1.ebuild                  | 2 +-
 media-libs/libuninameslist/libuninameslist-20091231-r1.ebuild | 2 +-
 media-libs/libvisual/libvisual-0.4.0-r3.ebuild                | 2 +-
 media-libs/libvorbis/libvorbis-1.3.6.ebuild                   | 2 +-
 media-libs/libvpx/libvpx-1.5.0.ebuild                         | 4 ++--
 media-libs/libvpx/libvpx-1.6.0-r1.ebuild                      | 2 +-
 media-libs/libvpx/libvpx-1.6.1.ebuild                         | 2 +-
 media-libs/libvpx/libvpx-1.7.0.ebuild                         | 2 +-
 media-libs/libvpx/libvpx-1.8.0-r1.ebuild                      | 2 +-
 media-libs/libvpx/libvpx-1.8.0.ebuild                         | 2 +-
 media-libs/libwebp/libwebp-1.0.2.ebuild                       | 2 +-
 media-libs/libwebp/libwebp-1.0.3.ebuild                       | 2 +-
 media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild                    | 2 +-
 media-libs/libxmi/libxmi-1.3.ebuild                           | 2 +-
 media-libs/mesa/mesa-19.1.7.ebuild                            | 2 +-
 media-libs/mesa/mesa-19.2.0.ebuild                            | 2 +-
 media-libs/mesa/mesa-19.2.1.ebuild                            | 2 +-
 media-libs/mesa/mesa-9999.ebuild                              | 2 +-
 media-libs/musicbrainz/musicbrainz-5.1.0.ebuild               | 2 +-
 media-libs/nas/nas-1.9.4-r2.ebuild                            | 2 +-
 media-libs/netpbm/netpbm-10.66.00.ebuild                      | 2 +-
 media-libs/netpbm/netpbm-10.70.00.ebuild                      | 2 +-
 media-libs/netpbm/netpbm-10.76.00.ebuild                      | 2 +-
 media-libs/openal/openal-1.19.1.ebuild                        | 2 +-
 media-libs/opencore-amr/opencore-amr-0.1.3-r1.ebuild          | 2 +-
 media-libs/opencore-amr/opencore-amr-0.1.4.ebuild             | 2 +-
 media-libs/opencore-amr/opencore-amr-0.1.5.ebuild             | 2 +-
 media-libs/openexr/openexr-2.3.0.ebuild                       | 2 +-
 media-libs/openexr_ctl/openexr_ctl-1.0.1-r2.ebuild            | 2 +-
 media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild                  | 2 +-
 media-libs/openjpeg/openjpeg-2.3.1.ebuild                     | 2 +-
 media-libs/opus/opus-1.3.1-r1.ebuild                          | 2 +-
 media-libs/opus/opus-1.3.1.ebuild                             | 2 +-
 media-libs/opus/opus-1.3.ebuild                               | 2 +-
 media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0.ebuild    | 2 +-
 media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild  | 2 +-
 media-libs/phonon/phonon-4.10.2.ebuild                        | 2 +-
 media-libs/phonon/phonon-4.11.1.ebuild                        | 2 +-
 media-libs/plotutils/plotutils-2.6-r2.ebuild                  | 2 +-
 media-libs/portaudio/portaudio-19.06.00-r1.ebuild             | 2 +-
 media-libs/portaudio/portaudio-19.06.00-r2.ebuild             | 2 +-
 media-libs/qhull/qhull-2015.2.ebuild                          | 2 +-
 media-libs/raptor/raptor-2.0.15-r2.ebuild                     | 2 +-
 media-libs/sdl-gfx/sdl-gfx-2.0.25.ebuild                      | 2 +-
 media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild                      | 2 +-
 media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild               | 2 +-
 media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild               | 2 +-
 media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild                    | 2 +-
 media-libs/sdl-sound/sdl-sound-1.0.3-r2.ebuild                | 2 +-
 media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild                   | 2 +-
 media-libs/sge/sge-030809.ebuild                              | 2 +-
 media-libs/smpeg/smpeg-0.4.4-r10.ebuild                       | 2 +-
 media-libs/soxr/soxr-0.1.3-r1.ebuild                          | 2 +-
 media-libs/speex/speex-1.2.0-r1.ebuild                        | 2 +-
 media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild                | 2 +-
 media-libs/t1lib/t1lib-5.1.2-r2.ebuild                        | 2 +-
 media-libs/taglib/taglib-1.11.1_p20181028.ebuild              | 2 +-
 media-libs/tiff/tiff-4.0.10-r1.ebuild                         | 2 +-
 media-libs/tiff/tiff-4.0.10-r2.ebuild                         | 2 +-
 media-libs/tiff/tiff-4.0.10.ebuild                            | 2 +-
 media-libs/tremor/tremor-0_pre20130223-r1.ebuild              | 2 +-
 media-libs/urt/urt-3.1b-r1.ebuild                             | 2 +-
 media-libs/urt/urt-3.1b-r3.ebuild                             | 2 +-
 media-libs/vo-aacenc/vo-aacenc-0.1.3.ebuild                   | 2 +-
 media-libs/vo-aacenc/vo-aacenc-9999.ebuild                    | 2 +-
 media-libs/vo-amrwbenc/vo-amrwbenc-0.1.3.ebuild               | 2 +-
 media-libs/vo-amrwbenc/vo-amrwbenc-9999.ebuild                | 2 +-
 media-libs/woff2/woff2-1.0.2-r1.ebuild                        | 2 +-
 media-libs/x264/x264-0.0.20190214.ebuild                      | 2 +-
 media-libs/x264/x264-0.0.20190903.ebuild                      | 2 +-
 media-libs/x264/x264-9999.ebuild                              | 2 +-
 media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild                  | 2 +-
 media-libs/xine-lib/xine-lib-1.2.9999.ebuild                  | 2 +-
 media-libs/xvid/xvid-1.3.5.ebuild                             | 2 +-
 media-libs/zvbi/zvbi-0.2.35-r1.ebuild                         | 2 +-
 259 files changed, 260 insertions(+), 260 deletions(-)

diff --git a/media-libs/a52dec/a52dec-0.7.4-r6.ebuild b/media-libs/a52dec/a52dec-0.7.4-r6.ebuild
index 8af3a605acc..04166c82ea8 100644
--- a/media-libs/a52dec/a52dec-0.7.4-r6.ebuild
+++ b/media-libs/a52dec/a52dec-0.7.4-r6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://liba52.sourceforge.net/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="djbfft oss static-libs"
 
 RDEPEND="djbfft? ( sci-libs/djbfft )"

diff --git a/media-libs/a52dec/a52dec-0.7.4-r7.ebuild b/media-libs/a52dec/a52dec-0.7.4-r7.ebuild
index 0fe011bc542..f87862b037b 100644
--- a/media-libs/a52dec/a52dec-0.7.4-r7.ebuild
+++ b/media-libs/a52dec/a52dec-0.7.4-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://liba52.sourceforge.net/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="djbfft oss static-libs"
 
 RDEPEND="djbfft? ( >=sci-libs/djbfft-0.76-r2[${MULTILIB_USEDEP}] )"

diff --git a/media-libs/aalib/aalib-1.4_rc5-r6.ebuild b/media-libs/aalib/aalib-1.4_rc5-r6.ebuild
index 4c2a787d388..b9c8de5910d 100644
--- a/media-libs/aalib/aalib-1.4_rc5-r6.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc5-r6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="X slang gpm static-libs"
 
 RDEPEND="

diff --git a/media-libs/aalib/aalib-1.4_rc5-r7.ebuild b/media-libs/aalib/aalib-1.4_rc5-r7.ebuild
index 33b7a1fe043..64ea7bfd9bb 100644
--- a/media-libs/aalib/aalib-1.4_rc5-r7.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc5-r7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="X slang gpm static-libs"
 
 RDEPEND="

diff --git a/media-libs/aalib/aalib-1.4_rc5-r8.ebuild b/media-libs/aalib/aalib-1.4_rc5-r8.ebuild
index 6022782624d..f95be8002a2 100644
--- a/media-libs/aalib/aalib-1.4_rc5-r8.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc5-r8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="X slang gpm static-libs"
 
 RDEPEND="

diff --git a/media-libs/audiofile/audiofile-0.3.6-r3.ebuild b/media-libs/audiofile/audiofile-0.3.6-r3.ebuild
index f381e943508..3c1b316b64a 100644
--- a/media-libs/audiofile/audiofile-0.3.6-r3.ebuild
+++ b/media-libs/audiofile/audiofile-0.3.6-r3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.68k.org/~michael/audiofile/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1" # subslot = soname major version
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="flac static-libs test"
 
 RDEPEND="flac? ( >=media-libs/flac-1.2.1[${MULTILIB_USEDEP}] )"

diff --git a/media-libs/babl/babl-0.1.12.ebuild b/media-libs/babl/babl-0.1.12.ebuild
index e37de3fd818..ff19c765a87 100644
--- a/media-libs/babl/babl-0.1.12.ebuild
+++ b/media-libs/babl/babl-0.1.12.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"

diff --git a/media-libs/babl/babl-0.1.38.ebuild b/media-libs/babl/babl-0.1.38.ebuild
index 140b2792c00..87c1f1ee4d1 100644
--- a/media-libs/babl/babl-0.1.38.ebuild
+++ b/media-libs/babl/babl-0.1.38.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"

diff --git a/media-libs/babl/babl-0.1.62.ebuild b/media-libs/babl/babl-0.1.62.ebuild
index 58bb27fcf61..61dffd8b9f2 100644
--- a/media-libs/babl/babl-0.1.62.ebuild
+++ b/media-libs/babl/babl-0.1.62.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"

diff --git a/media-libs/babl/babl-0.1.64.ebuild b/media-libs/babl/babl-0.1.64.ebuild
index c6f18423b43..634e2a1ade6 100644
--- a/media-libs/babl/babl-0.1.64.ebuild
+++ b/media-libs/babl/babl-0.1.64.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"

diff --git a/media-libs/babl/babl-0.1.66.ebuild b/media-libs/babl/babl-0.1.66.ebuild
index c6f18423b43..634e2a1ade6 100644
--- a/media-libs/babl/babl-0.1.66.ebuild
+++ b/media-libs/babl/babl-0.1.66.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"

diff --git a/media-libs/babl/babl-9999.ebuild b/media-libs/babl/babl-9999.ebuild
index c6f18423b43..634e2a1ade6 100644
--- a/media-libs/babl/babl-9999.ebuild
+++ b/media-libs/babl/babl-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"

diff --git a/media-libs/cal3d/cal3d-0.11.0-r1.ebuild b/media-libs/cal3d/cal3d-0.11.0-r1.ebuild
index 40c49372639..94d50870d37 100644
--- a/media-libs/cal3d/cal3d-0.11.0-r1.ebuild
+++ b/media-libs/cal3d/cal3d-0.11.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://download.gna.org/cal3d/sources/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ia64 ppc x86"
 IUSE="16bit-indices debug doc"
 
 DEPEND="doc? (

diff --git a/media-libs/chromaprint/chromaprint-1.4.2.ebuild b/media-libs/chromaprint/chromaprint-1.4.2.ebuild
index d24d84f8a80..9ff16c48df0 100644
--- a/media-libs/chromaprint/chromaprint-1.4.2.ebuild
+++ b/media-libs/chromaprint/chromaprint-1.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://bitbucket.org/acoustid/${PN}/downloads/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0/1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86"
 IUSE="libav test tools"
 
 # note: use ffmpeg or libav instead of fftw because it's recommended and required for tools

diff --git a/media-libs/chromaprint/chromaprint-1.4.3.ebuild b/media-libs/chromaprint/chromaprint-1.4.3.ebuild
index 5c817db6b18..169011a15e1 100644
--- a/media-libs/chromaprint/chromaprint-1.4.3.ebuild
+++ b/media-libs/chromaprint/chromaprint-1.4.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/acoustid/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0/1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="libav test tools"
 
 # note: use ffmpeg or libav instead of fftw because it's recommended and required for tools

diff --git a/media-libs/compface/compface-1.5.2.ebuild b/media-libs/compface/compface-1.5.2.ebuild
index 985757f29b0..af03c528e50 100644
--- a/media-libs/compface/compface-1.5.2.ebuild
+++ b/media-libs/compface/compface-1.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.xemacs.org/pub/xemacs/aux/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 src_prepare() {

diff --git a/media-libs/ctl/ctl-1.5.2-r1.ebuild b/media-libs/ctl/ctl-1.5.2-r1.ebuild
index c431fdafe5e..67aca511194 100644
--- a/media-libs/ctl/ctl-1.5.2-r1.ebuild
+++ b/media-libs/ctl/ctl-1.5.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}/archive/ctl-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="AMPAS"
 SLOT="0"
-KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86"
 
 RDEPEND="media-libs/ilmbase:=
 	media-libs/openexr:=

diff --git a/media-libs/exempi/exempi-2.4.5-r1.ebuild b/media-libs/exempi/exempi-2.4.5-r1.ebuild
index de40c462457..d5d4a561bd1 100644
--- a/media-libs/exempi/exempi-2.4.5-r1.ebuild
+++ b/media-libs/exempi/exempi-2.4.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2/3"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~sh sparc x86"
 IUSE="examples static-libs test"
 
 RDEPEND="

diff --git a/media-libs/faac/faac-1.29.9.2.ebuild b/media-libs/faac/faac-1.29.9.2.ebuild
index 5099c155cd9..58776bbdaad 100644
--- a/media-libs/faac/faac-1.29.9.2.ebuild
+++ b/media-libs/faac/faac-1.29.9.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MPEG-4"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND="${RDEPEND}"

diff --git a/media-libs/faad2/faad2-2.8.8.ebuild b/media-libs/faad2/faad2-2.8.8.ebuild
index 52d52b03f25..aa48abd0ee2 100644
--- a/media-libs/faad2/faad2-2.8.8.ebuild
+++ b/media-libs/faad2/faad2-2.8.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/faac/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="digitalradio static-libs"
 
 RDEPEND=""

diff --git a/media-libs/fdk-aac/fdk-aac-0.1.5.ebuild b/media-libs/fdk-aac/fdk-aac-0.1.5.ebuild
index 0cdfb76e637..3f58741c9d2 100644
--- a/media-libs/fdk-aac/fdk-aac-0.1.5.ebuild
+++ b/media-libs/fdk-aac/fdk-aac-0.1.5.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999* ]]; then
 	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
 	inherit autotools git-r3
 else
-	KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+	KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~x64-macos"
 	if [[ ${PV%_p*} != ${PV} ]]; then # Gentoo snapshot
 		SRC_URI="mirror://gentoo/${P}.tar.xz"
 	else # Official release

diff --git a/media-libs/fdk-aac/fdk-aac-0.1.6.ebuild b/media-libs/fdk-aac/fdk-aac-0.1.6.ebuild
index 228a1c8a1bf..b8197f01d0a 100644
--- a/media-libs/fdk-aac/fdk-aac-0.1.6.ebuild
+++ b/media-libs/fdk-aac/fdk-aac-0.1.6.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then
 	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
 	inherit autotools git-r3
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
 	if [[ ${PV%_p*} != ${PV} ]]; then # Gentoo snapshot
 		SRC_URI="mirror://gentoo/${P}.tar.xz"
 	else # Official release

diff --git a/media-libs/fdk-aac/fdk-aac-2.0.0.ebuild b/media-libs/fdk-aac/fdk-aac-2.0.0.ebuild
index 00ecadc705f..c28e667a221 100644
--- a/media-libs/fdk-aac/fdk-aac-2.0.0.ebuild
+++ b/media-libs/fdk-aac/fdk-aac-2.0.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
 	inherit autotools git-r3
 else
-	KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~x64-macos"
 	if [[ ${PV%_p*} != ${PV} ]]; then # Gentoo snapshot
 		SRC_URI="mirror://gentoo/${P}.tar.xz"
 	else # Official release

diff --git a/media-libs/flac/flac-1.3.2-r1.ebuild b/media-libs/flac/flac-1.3.2-r1.ebuild
index 634d03d1740..7df4ecab2d9 100644
--- a/media-libs/flac/flac-1.3.2-r1.ebuild
+++ b/media-libs/flac/flac-1.3.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/${PN}/${P}.tar.xz"
 
 LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="altivec +cxx debug ogg cpu_flags_x86_sse static-libs"
 
 RDEPEND="ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )"

diff --git a/media-libs/flac/flac-1.3.3.ebuild b/media-libs/flac/flac-1.3.3.ebuild
index 77a1ef44f65..17a63399cd1 100644
--- a/media-libs/flac/flac-1.3.3.ebuild
+++ b/media-libs/flac/flac-1.3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/${PN}/${P}.tar.xz"
 
 LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="altivec +cxx debug ogg cpu_flags_x86_sse static-libs"
 
 RDEPEND="ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )"

diff --git a/media-libs/fontconfig/fontconfig-2.12.6.ebuild b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
index b053ccb18d9..d1b119de4de 100644
--- a/media-libs/fontconfig/fontconfig-2.12.6.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the

diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
index 1f597094e17..eb2cc45cc82 100644
--- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2"
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the

diff --git a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
index f12f3fa0ee3..95b4c7c1cfb 100644
--- a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.bz2"
 LICENSE="MIT"
 SLOT="1.0"
 [[ $(ver_cut 3) -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc static-libs"
 
 BDEPEND="dev-util/gperf

diff --git a/media-libs/freealut/freealut-1.1.0-r3.ebuild b/media-libs/freealut/freealut-1.1.0-r3.ebuild
index 6e80353c534..2a7d3e3a944 100644
--- a/media-libs/freealut/freealut-1.1.0-r3.ebuild
+++ b/media-libs/freealut/freealut-1.1.0-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://connect.creativelabs.com/openal/Downloads/ALUT/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="

diff --git a/media-libs/freetype/freetype-2.10.0.ebuild b/media-libs/freetype/freetype-2.10.0.ebuild
index 369fc05a86e..0b8e98d60ac 100644
--- a/media-libs/freetype/freetype-2.10.0.ebuild
+++ b/media-libs/freetype/freetype-2.10.0.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
 			mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	IUSE+=" doc"
 else
 	inherit autotools git-r3

diff --git a/media-libs/freetype/freetype-2.10.1.ebuild b/media-libs/freetype/freetype-2.10.1.ebuild
index 0961aa456f4..091b3bccbba 100644
--- a/media-libs/freetype/freetype-2.10.1.ebuild
+++ b/media-libs/freetype/freetype-2.10.1.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
 			mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	IUSE+=" doc"
 else
 	inherit autotools git-r3

diff --git a/media-libs/freetype/freetype-2.9.1-r3.ebuild b/media-libs/freetype/freetype-2.9.1-r3.ebuild
index ad7bc062670..07218f0dae2 100644
--- a/media-libs/freetype/freetype-2.9.1-r3.ebuild
+++ b/media-libs/freetype/freetype-2.9.1-r3.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
 			mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	IUSE+=" doc"
 else
 	inherit autotools git-r3

diff --git a/media-libs/freetype/freetype-2.9.1-r4.ebuild b/media-libs/freetype/freetype-2.9.1-r4.ebuild
index 48b9f12deaf..2260eecc4ca 100644
--- a/media-libs/freetype/freetype-2.9.1-r4.ebuild
+++ b/media-libs/freetype/freetype-2.9.1-r4.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
 			mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	IUSE+=" doc"
 else
 	inherit autotools git-r3

diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index 0961aa456f4..091b3bccbba 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
 			mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	IUSE+=" doc"
 else
 	inherit autotools git-r3

diff --git a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
index 9ae8388a56d..ca277b0ec0b 100644
--- a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
+++ b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND=">=media-libs/freetype-2.0.9

diff --git a/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild b/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild
index 6e5cbaaf415..198e5fa7627 100644
--- a/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild
+++ b/media-libs/game-music-emu/game-music-emu-0.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://bitbucket.org/mpyne/game-music-emu/downloads/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ppc ppc64 x86"
 IUSE=""
 
 DOCS=( changes.txt design.txt gme.txt readme.txt )

diff --git a/media-libs/gd/gd-2.2.5-r2.ebuild b/media-libs/gd/gd-2.2.5-r2.ebuild
index e80c41907e4..69f41d061c5 100644
--- a/media-libs/gd/gd-2.2.5-r2.ebuild
+++ b/media-libs/gd/gd-2.2.5-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz
 
 LICENSE="gd IJG HPND BSD"
 SLOT="2/3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_sse fontconfig jpeg png static-libs test tiff truetype webp xpm zlib"
 
 # fontconfig has prefixed font paths, details see bug #518970

diff --git a/media-libs/gegl/gegl-0.2.0-r2.ebuild b/media-libs/gegl/gegl-0.2.0-r2.ebuild
index aad4c1cd886..47fa7ae928d 100644
--- a/media-libs/gegl/gegl-0.2.0-r2.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE="cairo debug ffmpeg jpeg lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
 

diff --git a/media-libs/gegl/gegl-0.2.0-r5.ebuild b/media-libs/gegl/gegl-0.2.0-r5.ebuild
index 6f8434819a0..a0eb45afa30 100644
--- a/media-libs/gegl/gegl-0.2.0-r5.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE="cairo debug ffmpeg jpeg lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
 

diff --git a/media-libs/gegl/gegl-0.3.0-r1.ebuild b/media-libs/gegl/gegl-0.3.0-r1.ebuild
index ce9b36b0372..26ca340bf7f 100644
--- a/media-libs/gegl/gegl-0.3.0-r1.ebuild
+++ b/media-libs/gegl/gegl-0.3.0-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"

diff --git a/media-libs/gegl/gegl-0.3.0.ebuild b/media-libs/gegl/gegl-0.3.0.ebuild
index b86bd58c088..a35131dde0e 100644
--- a/media-libs/gegl/gegl-0.3.0.ebuild
+++ b/media-libs/gegl/gegl-0.3.0.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"

diff --git a/media-libs/gegl/gegl-0.3.26.ebuild b/media-libs/gegl/gegl-0.3.26.ebuild
index 2efd65a8202..7d12cde9c08 100644
--- a/media-libs/gegl/gegl-0.3.26.ebuild
+++ b/media-libs/gegl/gegl-0.3.26.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"

diff --git a/media-libs/gegl/gegl-0.3.34.ebuild b/media-libs/gegl/gegl-0.3.34.ebuild
index 5c8d5871daa..730b532886d 100644
--- a/media-libs/gegl/gegl-0.3.34.ebuild
+++ b/media-libs/gegl/gegl-0.3.34.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"

diff --git a/media-libs/gegl/gegl-0.4.14.ebuild b/media-libs/gegl/gegl-0.4.14.ebuild
index aa1e3dfdf96..b46050046a8 100644
--- a/media-libs/gegl/gegl-0.4.14.ebuild
+++ b/media-libs/gegl/gegl-0.4.14.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"

diff --git a/media-libs/gegl/gegl-0.4.16.ebuild b/media-libs/gegl/gegl-0.4.16.ebuild
index 53a84339c68..12651446e60 100644
--- a/media-libs/gegl/gegl-0.4.16.ebuild
+++ b/media-libs/gegl/gegl-0.4.16.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"

diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index 9655bb544e6..ec1e63cf3a0 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"

diff --git a/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild b/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
index 950c3961be4..ed3b99e6bbd 100644
--- a/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86"
 fi
 
 LICENSE="LGPL-2.1"

diff --git a/media-libs/gexiv2/gexiv2-0.12.0.ebuild b/media-libs/gexiv2/gexiv2-0.12.0.ebuild
index e49aff132e6..c83cec2f56a 100644
--- a/media-libs/gexiv2/gexiv2-0.12.0.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.12.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 LICENSE="LGPL-2.1+ GPL-2"

diff --git a/media-libs/gexiv2/gexiv2-9999.ebuild b/media-libs/gexiv2/gexiv2-9999.ebuild
index e49aff132e6..c83cec2f56a 100644
--- a/media-libs/gexiv2/gexiv2-9999.ebuild
+++ b/media-libs/gexiv2/gexiv2-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 LICENSE="LGPL-2.1+ GPL-2"

diff --git a/media-libs/giblib/giblib-1.2.4-r1.ebuild b/media-libs/giblib/giblib-1.2.4-r1.ebuild
index 8ce183b197b..8c542462cf4 100644
--- a/media-libs/giblib/giblib-1.2.4-r1.ebuild
+++ b/media-libs/giblib/giblib-1.2.4-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz"
 
 LICENSE="feh"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~sh sparc x86"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/imlib2-1.0.3[X]

diff --git a/media-libs/giflib/giflib-4.1.6-r2.ebuild b/media-libs/giflib/giflib-4.1.6-r2.ebuild
index e6dd91121a2..d26ea7adbd5 100644
--- a/media-libs/giflib/giflib-4.1.6-r2.ebuild
+++ b/media-libs/giflib/giflib-4.1.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/giflib/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="rle static-libs X"
 
 DEPEND="

diff --git a/media-libs/giflib/giflib-4.1.6-r3.ebuild b/media-libs/giflib/giflib-4.1.6-r3.ebuild
index 0d782269236..c64647f31a6 100644
--- a/media-libs/giflib/giflib-4.1.6-r3.ebuild
+++ b/media-libs/giflib/giflib-4.1.6-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/giflib/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="rle static-libs X"
 
 RDEPEND="

diff --git a/media-libs/giflib/giflib-5.0.6.ebuild b/media-libs/giflib/giflib-5.0.6.ebuild
index 604b886a47a..f80e51e8c66 100644
--- a/media-libs/giflib/giflib-5.0.6.ebuild
+++ b/media-libs/giflib/giflib-5.0.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/giflib/${P}.tar.bz2"
 LICENSE="MIT"
 SLOT="0/6"
 # Needs testing first.
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 src_prepare() {

diff --git a/media-libs/giflib/giflib-5.1.4.ebuild b/media-libs/giflib/giflib-5.1.4.ebuild
index b92da179a4f..6374d819fb7 100644
--- a/media-libs/giflib/giflib-5.1.4.ebuild
+++ b/media-libs/giflib/giflib-5.1.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/giflib/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0/7"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 DEPEND="doc? ( app-text/xmlto )"

diff --git a/media-libs/giflib/giflib-5.1.8-r1.ebuild b/media-libs/giflib/giflib-5.1.8-r1.ebuild
index e16390f179c..fcf9ffd016a 100644
--- a/media-libs/giflib/giflib-5.1.8-r1.ebuild
+++ b/media-libs/giflib/giflib-5.1.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/giflib/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 DEPEND="doc? ( app-text/xmlto )"

diff --git a/media-libs/giflib/giflib-5.1.9.ebuild b/media-libs/giflib/giflib-5.1.9.ebuild
index 87eaf2bc700..55389387dae 100644
--- a/media-libs/giflib/giflib-5.1.9.ebuild
+++ b/media-libs/giflib/giflib-5.1.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/giflib/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 DEPEND="doc? ( app-text/xmlto )"

diff --git a/media-libs/giflib/giflib-5.2.1.ebuild b/media-libs/giflib/giflib-5.2.1.ebuild
index 87eaf2bc700..55389387dae 100644
--- a/media-libs/giflib/giflib-5.2.1.ebuild
+++ b/media-libs/giflib/giflib-5.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/giflib/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 DEPEND="doc? ( app-text/xmlto )"

diff --git a/media-libs/glew/glew-1.10.0-r100.ebuild b/media-libs/glew/glew-1.10.0-r100.ebuild
index cc4b3786ef6..0e2bd36ca8d 100644
--- a/media-libs/glew/glew-1.10.0-r100.ebuild
+++ b/media-libs/glew/glew-1.10.0-r100.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="BSD MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
 	!=media-libs/glew-1.10*:0"

diff --git a/media-libs/glew/glew-1.6.0-r100.ebuild b/media-libs/glew/glew-1.6.0-r100.ebuild
index e730aa77571..818b61e28e2 100644
--- a/media-libs/glew/glew-1.6.0-r100.ebuild
+++ b/media-libs/glew/glew-1.6.0-r100.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="BSD MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]"
 

diff --git a/media-libs/glew/glew-2.1.0-r1.ebuild b/media-libs/glew/glew-2.1.0-r1.ebuild
index b488e1f7473..282fff5b38b 100644
--- a/media-libs/glew/glew-2.1.0-r1.ebuild
+++ b/media-libs/glew/glew-2.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="BSD MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 DEPEND="

diff --git a/media-libs/glu/glu-9.0.1.ebuild b/media-libs/glu/glu-9.0.1.ebuild
index 060ad7fa7c9..eeef467aa85 100644
--- a/media-libs/glu/glu-9.0.1.ebuild
+++ b/media-libs/glu/glu-9.0.1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/glu/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="SGI-B-2.0"

diff --git a/media-libs/glu/glu-9999.ebuild b/media-libs/glu/glu-9999.ebuild
index ec7ab407c72..dfaaeaefd9f 100644
--- a/media-libs/glu/glu-9999.ebuild
+++ b/media-libs/glu/glu-9999.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/glu/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="SGI-B-2.0"

diff --git a/media-libs/graphene/graphene-1.8.6.ebuild b/media-libs/graphene/graphene-1.8.6.ebuild
index aa45569e80e..beadf7de4f4 100644
--- a/media-libs/graphene/graphene-1.8.6.ebuild
+++ b/media-libs/graphene/graphene-1.8.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ebassi/graphene/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test"
 
 RDEPEND="

diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.3.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.3.ebuild
index 79dfca06e6f..746a8fad759 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.3.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Less plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 # TODO: egl and gtk IUSE only for transition
 IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vcd vnc wayland" # Keep default IUSE mirrored with gst-plugins-base where relevant

diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild
index 1c39a3a7fbd..43c5ed8cab9 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Less plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # TODO: egl and gtk IUSE only for transition
 IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vcd vnc wayland" # Keep default IUSE mirrored with gst-plugins-base where relevant

diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.4.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.4.ebuild
index 3b09b6da9fe..8799cf46d1e 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.14.4.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.14.4.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 # For OpenGL we have three separate concepts, with a list of possibilities in each:
 #  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant

diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild
index b0288166ffc..60f43b86117 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 # For OpenGL we have three separate concepts, with a list of possibilities in each:
 #  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant

diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.14.4.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.14.4.ebuild
index 05b3cc07cca..8926eb71135 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.14.4.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.14.4.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
 IUSE="+orc"
 
 RDEPEND="

diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild
index d4b05401854..2cba91fdae9 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE="+orc"
 
 RDEPEND="

diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.3.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.3.ebuild
index 18fdf4c9e2a..05bf2184cd7 100644
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.3.ebuild
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]

diff --git a/media-libs/gstreamer/gstreamer-1.14.4.ebuild b/media-libs/gstreamer/gstreamer-1.14.4.ebuild
index 19677ed3d4f..eb241bc65fd 100644
--- a/media-libs/gstreamer/gstreamer-1.14.4.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.14.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+caps +introspection nls +orc test unwind"
 
 RDEPEND="

diff --git a/media-libs/gstreamer/gstreamer-1.14.5.ebuild b/media-libs/gstreamer/gstreamer-1.14.5.ebuild
index c57c39da037..b9369fd6b6b 100644
--- a/media-libs/gstreamer/gstreamer-1.14.5.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.14.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+caps +introspection nls +orc test unwind"
 
 RDEPEND="

diff --git a/media-libs/hamlib/hamlib-3.1.ebuild b/media-libs/hamlib/hamlib-3.1.ebuild
index 5d91795318c..5cf4c9fed28 100644
--- a/media-libs/hamlib/hamlib-3.1.ebuild
+++ b/media-libs/hamlib/hamlib-3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 IUSE="doc perl python tcl"
 
 RESTRICT="test"

diff --git a/media-libs/hamlib/hamlib-3.2.ebuild b/media-libs/hamlib/hamlib-3.2.ebuild
index 02653279373..e5eb1f9a6b1 100644
--- a/media-libs/hamlib/hamlib-3.2.ebuild
+++ b/media-libs/hamlib/hamlib-3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.github.com/${PN}/${PN}/releases/download/${PVR}/${P}.tar.gz
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 IUSE="doc perl python tcl"
 
 RESTRICT="test"

diff --git a/media-libs/hamlib/hamlib-3.3.ebuild b/media-libs/hamlib/hamlib-3.3.ebuild
index 486e71723bd..f8782dee571 100644
--- a/media-libs/hamlib/hamlib-3.3.ebuild
+++ b/media-libs/hamlib/hamlib-3.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.github.com/${PN}/${PN}/releases/download/${PVR}/${P}.tar.gz
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 IUSE="doc perl python tcl"
 
 RESTRICT="test"

diff --git a/media-libs/harfbuzz/harfbuzz-2.3.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.3.1.ebuild
index ca088f9e04e..79639b9b885 100644
--- a/media-libs/harfbuzz/harfbuzz-2.3.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.3.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"

diff --git a/media-libs/harfbuzz/harfbuzz-2.5.3.ebuild b/media-libs/harfbuzz/harfbuzz-2.5.3.ebuild
index f03429a61fe..8f3d354b0b0 100644
--- a/media-libs/harfbuzz/harfbuzz-2.5.3.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.5.3.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"

diff --git a/media-libs/harfbuzz/harfbuzz-2.6.0.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.0.ebuild
index f03429a61fe..8f3d354b0b0 100644
--- a/media-libs/harfbuzz/harfbuzz-2.6.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.6.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"

diff --git a/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild
index d6ff7020efd..d8eb3a9c894 100644
--- a/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"

diff --git a/media-libs/harfbuzz/harfbuzz-2.6.2.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.2.ebuild
index f03429a61fe..8f3d354b0b0 100644
--- a/media-libs/harfbuzz/harfbuzz-2.6.2.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.6.2.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"

diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index f03429a61fe..8f3d354b0b0 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"

diff --git a/media-libs/id3lib/id3lib-3.8.3-r8.ebuild b/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
index 80713f9f8b3..4e0801353db 100644
--- a/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
+++ b/media-libs/id3lib/id3lib-3.8.3-r8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="doc static-libs"
 
 RDEPEND="sys-libs/zlib:="

diff --git a/media-libs/ilmbase/ilmbase-2.3.0.ebuild b/media-libs/ilmbase/ilmbase-2.3.0.ebuild
index 10b9361e852..6bcbebc9d10 100644
--- a/media-libs/ilmbase/ilmbase-2.3.0.ebuild
+++ b/media-libs/ilmbase/ilmbase-2.3.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0/24" # based on SONAME
-KEYWORDS="amd64 -arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 -arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND="virtual/pkgconfig[${MULTILIB_USEDEP}]"

diff --git a/media-libs/imlib/imlib-1.9.15-r5.ebuild b/media-libs/imlib/imlib-1.9.15-r5.ebuild
index 786faa8856f..fc5e7b6eb20 100644
--- a/media-libs/imlib/imlib-1.9.15-r5.ebuild
+++ b/media-libs/imlib/imlib-1.9.15-r5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnome/sources/${PN}/${PVP[0]}.${PVP[1]}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE="doc static-libs"
 
 RDEPEND="

diff --git a/media-libs/imlib2/imlib2-1.5.1-r1.ebuild b/media-libs/imlib2/imlib2-1.5.1-r1.ebuild
index 6a4362b928b..1e5aebc4f11 100644
--- a/media-libs/imlib2/imlib2-1.5.1-r1.ebuild
+++ b/media-libs/imlib2/imlib2-1.5.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 doc gif jpeg mp3 nls png +shm static-libs tiff +X zlib"
 
 REQUIRED_USE="shm? ( X )"

diff --git a/media-libs/jbig2dec/jbig2dec-0.14.ebuild b/media-libs/jbig2dec/jbig2dec-0.14.ebuild
index 121c9ca0843..90c837e8057 100644
--- a/media-libs/jbig2dec/jbig2dec-0.14.ebuild
+++ b/media-libs/jbig2dec/jbig2dec-0.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://downloads.ghostscript.com/public/${PN}/${P}.tar.gz
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="png static-libs test"
 
 RDEPEND="png? ( media-libs/libpng:0= )"

diff --git a/media-libs/jbig2dec/jbig2dec-0.17.ebuild b/media-libs/jbig2dec/jbig2dec-0.17.ebuild
index 20a2a7b4e57..0a030167ed5 100644
--- a/media-libs/jbig2dec/jbig2dec-0.17.ebuild
+++ b/media-libs/jbig2dec/jbig2dec-0.17.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ArtifexSoftware/${PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="png static-libs test"
 
 BDEPEND="

diff --git a/media-libs/jbigkit/jbigkit-2.1.ebuild b/media-libs/jbigkit/jbigkit-2.1.ebuild
index 3e359b2c78c..7857809354c 100644
--- a/media-libs/jbigkit/jbigkit-2.1.ebuild
+++ b/media-libs/jbigkit/jbigkit-2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.cl.cam.ac.uk/~mgk25/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/2.1" # Since we install libjbig.so and libjbig85.so without version, use ${PV} like 2.1
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DOCS="ANNOUNCE CHANGES TODO libjbig/*.txt pbmtools/*.txt"

diff --git a/media-libs/jpeg/jpeg-6b-r12.ebuild b/media-libs/jpeg/jpeg-6b-r12.ebuild
index 1bd42de6f2c..66c97bfd20e 100644
--- a/media-libs/jpeg/jpeg-6b-r12.ebuild
+++ b/media-libs/jpeg/jpeg-6b-r12.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/jpegsrc.v${PV}.tar.gz
 
 LICENSE="IJG"
 SLOT="62"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DOCS=""

diff --git a/media-libs/jpeg/jpeg-8d-r2.ebuild b/media-libs/jpeg/jpeg-8d-r2.ebuild
index 410e55d3088..0594e736d32 100644
--- a/media-libs/jpeg/jpeg-8d-r2.ebuild
+++ b/media-libs/jpeg/jpeg-8d-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz"
 
 LICENSE="IJG"
 SLOT="8"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!=media-libs/jpeg-8*:0

diff --git a/media-libs/jpeg/jpeg-9c.ebuild b/media-libs/jpeg/jpeg-9c.ebuild
index 4620ec83b1b..5adc06b19e5 100644
--- a/media-libs/jpeg/jpeg-9c.ebuild
+++ b/media-libs/jpeg/jpeg-9c.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
 
 LICENSE="IJG"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=""

diff --git a/media-libs/ladspa-cmt/ladspa-cmt-1.16-r4.ebuild b/media-libs/ladspa-cmt/ladspa-cmt-1.16-r4.ebuild
index 77413958805..eab37406722 100644
--- a/media-libs/ladspa-cmt/ladspa-cmt-1.16-r4.ebuild
+++ b/media-libs/ladspa-cmt/ladspa-cmt-1.16-r4.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="CMT (computer music toolkit) LADSPA library plugins"
 HOMEPAGE="http://www.ladspa.org/"
 SRC_URI="http://www.ladspa.org/download/${MY_P}.tgz"
 
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE=""

diff --git a/media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.ebuild b/media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.ebuild
index c97387a9f1a..4db804ef0e7 100644
--- a/media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.ebuild
+++ b/media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.ladspa.org/download/${MY_P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=""

diff --git a/media-libs/lasi/lasi-1.1.2.ebuild b/media-libs/lasi/lasi-1.1.2.ebuild
index 18fdbf67123..e7b15eb360c 100644
--- a/media-libs/lasi/lasi-1.1.2.ebuild
+++ b/media-libs/lasi/lasi-1.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RDEPEND="

diff --git a/media-libs/lcms/lcms-2.9.ebuild b/media-libs/lcms/lcms-2.9.ebuild
index 444bf4b1108..3efc857b69f 100644
--- a/media-libs/lcms/lcms-2.9.ebuild
+++ b/media-libs/lcms/lcms-2.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc jpeg static-libs test +threads tiff"
 
 RDEPEND="

diff --git a/media-libs/lensfun/lensfun-0.3.2-r1.ebuild b/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
index ffd96e4ab0c..320f15307eb 100644
--- a/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
+++ b/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning.
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc cpu_flags_x86_sse cpu_flags_x86_sse2 test"
 
 RDEPEND="${PYTHON_DEPS}

diff --git a/media-libs/libaacplus/libaacplus-2.0.2-r2.ebuild b/media-libs/libaacplus/libaacplus-2.0.2-r2.ebuild
index 360b994eb32..3ad71474198 100644
--- a/media-libs/libaacplus/libaacplus-2.0.2-r2.ebuild
+++ b/media-libs/libaacplus/libaacplus-2.0.2-r2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 arm hppa ppc ppc64 x86"
 IUSE="fftw static-libs"
 RESTRICT="bindist mirror"
 

diff --git a/media-libs/libaacplus/libaacplus-2.0.2-r3.ebuild b/media-libs/libaacplus/libaacplus-2.0.2-r3.ebuild
index aca57cf2530..fd3aed6e9a4 100644
--- a/media-libs/libaacplus/libaacplus-2.0.2-r3.ebuild
+++ b/media-libs/libaacplus/libaacplus-2.0.2-r3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 arm hppa ppc ppc64 x86"
 IUSE="fftw static-libs"
 RESTRICT="bindist mirror"
 

diff --git a/media-libs/libaacs/libaacs-0.9.0.ebuild b/media-libs/libaacs/libaacs-0.9.0.ebuild
index 94b9b1f4605..1d50bf2ab9a 100644
--- a/media-libs/libaacs/libaacs-0.9.0.ebuild
+++ b/media-libs/libaacs/libaacs-0.9.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.videolan.org/pub/videolan/libaacs/${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]

diff --git a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild b/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
index c811abb6f5d..441d5bb7deb 100644
--- a/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls opengl png static-libs shm +shaping svg tiff truetype"
 
 RDEPEND="

diff --git a/media-libs/libafterimage/libafterimage-1.20-r3.ebuild b/media-libs/libafterimage/libafterimage-1.20-r3.ebuild
index 4d52a6cc3e2..c0d7ee8bdc3 100644
--- a/media-libs/libafterimage/libafterimage-1.20-r3.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+X cpu_flags_x86_mmx examples gif jpeg nls png static-libs shm +shaping svg tiff truetype"
 
 RDEPEND="

diff --git a/media-libs/libao/libao-1.2.2.ebuild b/media-libs/libao/libao-1.2.2.ebuild
index 63db88fef4b..4b62b207196 100644
--- a/media-libs/libao/libao-1.2.2.ebuild
+++ b/media-libs/libao/libao-1.2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/xiph/libao/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="alsa nas mmap pulseaudio static-libs"
 
 RDEPEND="

diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild b/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild
index 9229b8209dc..7c4ab51cf3d 100644
--- a/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild
+++ b/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.levien.com/libart"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
 

diff --git a/media-libs/libass/libass-0.14.0.ebuild b/media-libs/libass/libass-0.14.0.ebuild
index af3abf1c600..4346996ba53 100644
--- a/media-libs/libass/libass-0.14.0.ebuild
+++ b/media-libs/libass/libass-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0/9" # subslot = libass soname version
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+fontconfig +harfbuzz static-libs"
 
 RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )

diff --git a/media-libs/libbluray/libbluray-1.1.2.ebuild b/media-libs/libbluray/libbluray-1.1.2.ebuild
index 8c5f865ee2a..016d1a2c031 100644
--- a/media-libs/libbluray/libbluray-1.1.2.ebuild
+++ b/media-libs/libbluray/libbluray-1.1.2.ebuild
@@ -7,7 +7,7 @@ if [[ "${PV#9999}" != "${PV}" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libbluray.git"
 else
-	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
 fi
 

diff --git a/media-libs/libbluray/libbluray-9999.ebuild b/media-libs/libbluray/libbluray-9999.ebuild
index d6504f9ac9d..e0edf969521 100644
--- a/media-libs/libbluray/libbluray-9999.ebuild
+++ b/media-libs/libbluray/libbluray-9999.ebuild
@@ -7,7 +7,7 @@ if [[ "${PV#9999}" != "${PV}" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libbluray.git"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
 fi
 

diff --git a/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild b/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild
index f542874c78e..b81cea9c188 100644
--- a/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild
+++ b/media-libs/libbs2b/libbs2b-3.1.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/bs2b/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libsndfile-1.0.25-r1[${MULTILIB_USEDEP}]"

diff --git a/media-libs/libcaca/libcaca-0.99_beta19.ebuild b/media-libs/libcaca/libcaca-0.99_beta19.ebuild
index 42356744d5e..941b299aae7 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://libcaca.zoy.org/files/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2 ISC LGPL-2.1 WTFPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="cxx doc imlib java mono ncurses opengl python ruby slang static-libs test truetype X"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )

diff --git a/media-libs/libcanberra/libcanberra-0.30-r5.ebuild b/media-libs/libcanberra/libcanberra-0.30-r5.ebuild
index 514e1435191..7cda04c1847 100644
--- a/media-libs/libcanberra/libcanberra-0.30-r5.ebuild
+++ b/media-libs/libcanberra/libcanberra-0.30-r5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="alsa gnome gstreamer +gtk +gtk3 oss pulseaudio +sound tdb udev"
 
 COMMON_DEPEND="

diff --git a/media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild b/media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild
index 3938962357a..fef78b2d728 100644
--- a/media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild
+++ b/media-libs/libcdaudio/libcdaudio-0.99.12-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/libcdaudio/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 PATCHES=(

diff --git a/media-libs/libcddb/libcddb-1.3.2-r1.ebuild b/media-libs/libcddb/libcddb-1.3.2-r1.ebuild
index 1a75bacf899..80b267d6b13 100644
--- a/media-libs/libcddb/libcddb-1.3.2-r1.ebuild
+++ b/media-libs/libcddb/libcddb-1.3.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc static-libs"
 
 RDEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"

diff --git a/media-libs/libcddb/libcddb-1.3.2.ebuild b/media-libs/libcddb/libcddb-1.3.2.ebuild
index 90353509485..daba49a4839 100644
--- a/media-libs/libcddb/libcddb-1.3.2.ebuild
+++ b/media-libs/libcddb/libcddb-1.3.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc static-libs"
 
 RDEPEND="virtual/libiconv"

diff --git a/media-libs/libcuefile/libcuefile-477-r1.ebuild b/media-libs/libcuefile/libcuefile-477-r1.ebuild
index 54aee7bbfbf..352236b6dc4 100644
--- a/media-libs/libcuefile/libcuefile-477-r1.ebuild
+++ b/media-libs/libcuefile/libcuefile-477-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 src_install() {

diff --git a/media-libs/libdca/libdca-0.0.5-r3.ebuild b/media-libs/libdca/libdca-0.0.5-r3.ebuild
index faee1c7a653..5135522c650 100644
--- a/media-libs/libdca/libdca-0.0.5-r3.ebuild
+++ b/media-libs/libdca/libdca-0.0.5-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug oss static-libs"
 
 RDEPEND="!media-libs/libdts"

diff --git a/media-libs/libdiscid/libdiscid-0.6.1.ebuild b/media-libs/libdiscid/libdiscid-0.6.1.ebuild
index ef2399eab9d..c475d184050 100644
--- a/media-libs/libdiscid/libdiscid-0.6.1.ebuild
+++ b/media-libs/libdiscid/libdiscid-0.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DOCS=( AUTHORS ChangeLog examples/discid.c README )

diff --git a/media-libs/libdiscid/libdiscid-0.6.2.ebuild b/media-libs/libdiscid/libdiscid-0.6.2.ebuild
index e6b24483778..f21e59055a4 100644
--- a/media-libs/libdiscid/libdiscid-0.6.2.ebuild
+++ b/media-libs/libdiscid/libdiscid-0.6.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DOCS=( AUTHORS ChangeLog examples/discid.c README )

diff --git a/media-libs/libdmtx/libdmtx-0.7.4.ebuild b/media-libs/libdmtx/libdmtx-0.7.4.ebuild
index 860a328be6d..adce86c7d67 100644
--- a/media-libs/libdmtx/libdmtx-0.7.4.ebuild
+++ b/media-libs/libdmtx/libdmtx-0.7.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
 IUSE="static-libs"
 
 DEPEND=""

diff --git a/media-libs/libdmtx/libdmtx-0.7.5.ebuild b/media-libs/libdmtx/libdmtx-0.7.5.ebuild
index e13c9ff42c4..7d934c51260 100644
--- a/media-libs/libdmtx/libdmtx-0.7.5.ebuild
+++ b/media-libs/libdmtx/libdmtx-0.7.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dmtx/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="static-libs"
 
 src_prepare() {

diff --git a/media-libs/libdv/libdv-1.0.0-r2.ebuild b/media-libs/libdv/libdv-1.0.0-r2.ebuild
index 20d6cbfa73d..8e93f4d028f 100644
--- a/media-libs/libdv/libdv-1.0.0-r2.ebuild
+++ b/media-libs/libdv/libdv-1.0.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="debug sdl static-libs xv"
 
 RDEPEND="dev-libs/popt

diff --git a/media-libs/libdv/libdv-1.0.0-r3.ebuild b/media-libs/libdv/libdv-1.0.0-r3.ebuild
index 4aaa15a9ac6..e73f715b82f 100644
--- a/media-libs/libdv/libdv-1.0.0-r3.ebuild
+++ b/media-libs/libdv/libdv-1.0.0-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 RDEPEND="dev-libs/popt"

diff --git a/media-libs/libdv/libdv-1.0.0-r4.ebuild b/media-libs/libdv/libdv-1.0.0-r4.ebuild
index 4dc11d3f79b..6788633e8d6 100644
--- a/media-libs/libdv/libdv-1.0.0-r4.ebuild
+++ b/media-libs/libdv/libdv-1.0.0-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="dev-libs/popt"

diff --git a/media-libs/libdvbpsi/libdvbpsi-1.3.1.ebuild b/media-libs/libdvbpsi/libdvbpsi-1.3.1.ebuild
index a522c5ffad2..6d164d23566 100644
--- a/media-libs/libdvbpsi/libdvbpsi-1.3.1.ebuild
+++ b/media-libs/libdvbpsi/libdvbpsi-1.3.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 # Sublot == libdvbpsi.so major
 SLOT="0/10"
-KEYWORDS="alpha amd64 arm ~arm64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ppc ppc64 sparc x86"
 IUSE="doc static-libs"
 
 RDEPEND=""

diff --git a/media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild b/media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild
index 067915a1756..b62ceb17db9 100644
--- a/media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild
+++ b/media-libs/libdvbpsi/libdvbpsi-1.3.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 # Sublot == libdvbpsi.so major
 SLOT="0/10"
-KEYWORDS="alpha amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ppc ppc64 sparc x86"
 IUSE="doc static-libs"
 
 RDEPEND=""

diff --git a/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild b/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild
index 431e864bc69..4446b4830de 100644
--- a/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild
+++ b/media-libs/libdvdcss/libdvdcss-1.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1.2"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 RDEPEND=""

diff --git a/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild b/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild
index a2b8131348e..678a15d69d0 100644
--- a/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdnav.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdnav/${PV}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"

diff --git a/media-libs/libdvdnav/libdvdnav-9999.ebuild b/media-libs/libdvdnav/libdvdnav-9999.ebuild
index 61b7dbaa549..4207a036e75 100644
--- a/media-libs/libdvdnav/libdvdnav-9999.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdnav.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdnav/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"

diff --git a/media-libs/libdvdread/libdvdread-6.0.0.ebuild b/media-libs/libdvdread/libdvdread-6.0.0.ebuild
index 8231d5e177b..eab7cde033d 100644
--- a/media-libs/libdvdread/libdvdread-6.0.0.ebuild
+++ b/media-libs/libdvdread/libdvdread-6.0.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdread.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdread/${PV}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"

diff --git a/media-libs/libdvdread/libdvdread-6.0.1.ebuild b/media-libs/libdvdread/libdvdread-6.0.1.ebuild
index eabac94a68c..4cd3f34f6e8 100644
--- a/media-libs/libdvdread/libdvdread-6.0.1.ebuild
+++ b/media-libs/libdvdread/libdvdread-6.0.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdread.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdread/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"

diff --git a/media-libs/libdvdread/libdvdread-9999.ebuild b/media-libs/libdvdread/libdvdread-9999.ebuild
index 08894423e14..25adfbb2701 100644
--- a/media-libs/libdvdread/libdvdread-9999.ebuild
+++ b/media-libs/libdvdread/libdvdread-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdread.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdread/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"

diff --git a/media-libs/libemf/libemf-1.0.4-r1.ebuild b/media-libs/libemf/libemf-1.0.4-r1.ebuild
index bfa5e8a65b1..73fdf633c94 100644
--- a/media-libs/libemf/libemf-1.0.4-r1.ebuild
+++ b/media-libs/libemf/libemf-1.0.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/libemf/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 -arm ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 -arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 S=${WORKDIR}/${MY_P}

diff --git a/media-libs/libemf/libemf-1.0.7.ebuild b/media-libs/libemf/libemf-1.0.7.ebuild
index 0418a409840..af83fb2002e 100644
--- a/media-libs/libemf/libemf-1.0.7.ebuild
+++ b/media-libs/libemf/libemf-1.0.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/libemf/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 -arm ppc ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 -arm ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 S=${WORKDIR}/${MY_P}

diff --git a/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild b/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild
index a4335f623af..ac36a7ad49c 100644
--- a/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.3-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/anholt/libepoxy"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 

diff --git a/media-libs/libepoxy/libepoxy-9999.ebuild b/media-libs/libepoxy/libepoxy-9999.ebuild
index c8ed8a6047e..6c2f3fa8e69 100644
--- a/media-libs/libepoxy/libepoxy-9999.ebuild
+++ b/media-libs/libepoxy/libepoxy-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/anholt/libepoxy"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 

diff --git a/media-libs/libexif/libexif-0.6.21-r3.ebuild b/media-libs/libexif/libexif-0.6.21-r3.ebuild
index 4c5b6bc9155..df6c8a6a3c1 100644
--- a/media-libs/libexif/libexif-0.6.21-r3.ebuild
+++ b/media-libs/libexif/libexif-0.6.21-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="doc nls static-libs"
 
 RDEPEND="nls? ( virtual/libintl )"

diff --git a/media-libs/libfpx/libfpx-1.3.1_p10.ebuild b/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
index b6740032011..232e5b12ada 100644
--- a/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
+++ b/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://imagemagick/delegates/${P/_p/-}.tar.bz2"
 
 LICENSE="Flashpix"
 SLOT="0/1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="static-libs"
 
 S=${WORKDIR}/${P/_p/-}

diff --git a/media-libs/libggi/libggi-2.2.2-r1.ebuild b/media-libs/libggi/libggi-2.2.2-r1.ebuild
index b1652dcd2d9..d6038fa440f 100644
--- a/media-libs/libggi/libggi-2.2.2-r1.ebuild
+++ b/media-libs/libggi/libggi-2.2.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86"
 IUSE="3dfx aalib cpu_flags_x86_mmx debug fbcon svga vis X"
 
 RDEPEND=">=media-libs/libgii-1.0.2

diff --git a/media-libs/libggiwmh/libggiwmh-0.3.2-r1.ebuild b/media-libs/libggiwmh/libggiwmh-0.3.2-r1.ebuild
index d4a322807f2..9daceffa1b5 100644
--- a/media-libs/libggiwmh/libggiwmh-0.3.2-r1.ebuild
+++ b/media-libs/libggiwmh/libggiwmh-0.3.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="X"
 
 RDEPEND=">=media-libs/libggi-2.2.2

diff --git a/media-libs/libgii/libgii-1.0.2-r2.ebuild b/media-libs/libgii/libgii-1.0.2-r2.ebuild
index 7e32b4039f7..7b3bf87be60 100644
--- a/media-libs/libgii/libgii-1.0.2-r2.ebuild
+++ b/media-libs/libgii/libgii-1.0.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="X"
 
 RDEPEND="

diff --git a/media-libs/libgphoto2/libgphoto2-2.5.20.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.20.ebuild
index 177492cd323..45a8bc7ef47 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.20.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.20.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # FIXME: should we also bump for libgphoto2_port.so soname version?
 SLOT="0/6" # libgphoto2.so soname version
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples exif gd jpeg nls serial"
 
 # By default, drivers for all supported cameras will be compiled.

diff --git a/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild
index ae1ae90567d..6d4fc0766e0 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # FIXME: should we also bump for libgphoto2_port.so soname version?
 SLOT="0/6" # libgphoto2.so soname version
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples exif gd jpeg nls serial"
 
 # By default, drivers for all supported cameras will be compiled.

diff --git a/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild b/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
index 1b98abd5cf0..0a3a7443ad6 100644
--- a/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
+++ b/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"

diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r2.ebuild
index 8b5aba9b9ad..31680fc1a4f 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r2.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="BSD IJG"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="java static-libs"
 
 ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"

diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.2.ebuild
index 3f2b6ad8734..9110be06553 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.2.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 LICENSE="BSD IJG"
 SLOT="0"
 [[ "$(ver_cut 3)" -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="java static-libs"
 
 ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"

diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
index 7f78841d499..924d4efea84 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 LICENSE="BSD IJG"
 SLOT="0"
 [[ "$(ver_cut 3)" -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="java static-libs"
 
 ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"

diff --git a/media-libs/libkate/libkate-0.4.1-r3.ebuild b/media-libs/libkate/libkate-0.4.1-r3.ebuild
index accaa364ea7..cd225b680f4 100644
--- a/media-libs/libkate/libkate-0.4.1-r3.ebuild
+++ b/media-libs/libkate/libkate-0.4.1-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://libkate.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86"
 
 IUSE="debug doc wxwidgets"
 REQUIRED_USE="wxwidgets? ( ${PYTHON_REQUIRED_USE} )"

diff --git a/media-libs/libldac/libldac-2.0.2-r1.ebuild b/media-libs/libldac/libldac-2.0.2-r1.ebuild
index b7c2e612d12..209f09bd340 100644
--- a/media-libs/libldac/libldac-2.0.2-r1.ebuild
+++ b/media-libs/libldac/libldac-2.0.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/EHfive/ldacBT/releases/download/${PACKAGING_VERSION}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=""

diff --git a/media-libs/liblqr/liblqr-0.4.2-r1.ebuild b/media-libs/liblqr/liblqr-0.4.2-r1.ebuild
index a069cc95cc5..c041cec6fdc 100644
--- a/media-libs/liblqr/liblqr-0.4.2-r1.ebuild
+++ b/media-libs/liblqr/liblqr-0.4.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://liblqr.wikidot.com/local--files/en:download-page/${PN}-1-${PV}.t
 
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ~mips ppc ppc64 x86"
 
 RDEPEND="dev-libs/glib:2"
 DEPEND="${RDEPEND}

diff --git a/media-libs/libmad/libmad-0.15.1b-r9.ebuild b/media-libs/libmad/libmad-0.15.1b-r9.ebuild
index 0cbe0cd6f48..dcccc96d409 100644
--- a/media-libs/libmad/libmad-0.15.1b-r9.ebuild
+++ b/media-libs/libmad/libmad-0.15.1b-r9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug static-libs"
 
 DEPEND=""

diff --git a/media-libs/libmatroska/libmatroska-1.5.2.ebuild b/media-libs/libmatroska/libmatroska-1.5.2.ebuild
index a84fbb11012..62097ee093e 100644
--- a/media-libs/libmatroska/libmatroska-1.5.2.ebuild
+++ b/media-libs/libmatroska/libmatroska-1.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/6" # subslot = soname major version
-KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/libebml-1.3.9:="

diff --git a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild b/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
index 51735588106..46dd5abdae5 100644
--- a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
 
 LICENSE="LGPL-2+ LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads"
 
 REQUIRED_USE="|| ( alsa coreaudio nas openal oss pulseaudio )"

diff --git a/media-libs/libmms/libmms-0.6.4.ebuild b/media-libs/libmms/libmms-0.6.4.ebuild
index b06b1fc0842..bde47cef4e4 100644
--- a/media-libs/libmms/libmms-0.6.4.ebuild
+++ b/media-libs/libmms/libmms-0.6.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND=""

diff --git a/media-libs/libmng/libmng-2.0.3.ebuild b/media-libs/libmng/libmng-2.0.3.ebuild
index 5d30d4adf54..551d20b6f98 100644
--- a/media-libs/libmng/libmng-2.0.3.ebuild
+++ b/media-libs/libmng/libmng-2.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/libmng/${P}.tar.xz"
 
 LICENSE="libmng"
 SLOT="0/2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="lcms static-libs"
 
 RDEPEND="

diff --git a/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild b/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild
index 9f909c151c1..133570a9b37 100644
--- a/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild
+++ b/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://modplug-xmms.sourceforge.net/"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=""

diff --git a/media-libs/libmp4v2/libmp4v2-2.0.0-r1.ebuild b/media-libs/libmp4v2/libmp4v2-2.0.0-r1.ebuild
index dd63588d66c..0a87c196156 100644
--- a/media-libs/libmp4v2/libmp4v2-2.0.0-r1.ebuild
+++ b/media-libs/libmp4v2/libmp4v2-2.0.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mp4v2.googlecode.com/files/${MY_P}.tar.bz2"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs test utils"
 
 BDEPEND="

diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild b/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
index 1595b7ed9cf..697731ffe35 100644
--- a/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
+++ b/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://libmpeg2.sourceforge.net/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="sdl static-libs X"
 
 RDEPEND="sdl? ( media-libs/libsdl )

diff --git a/media-libs/libmtp/libmtp-1.1.16.ebuild b/media-libs/libmtp/libmtp-1.1.16.ebuild
index fa0a23bd8d6..05c94bad71d 100644
--- a/media-libs/libmtp/libmtp-1.1.16.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.16.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ia64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)"

diff --git a/media-libs/libmtp/libmtp-9999.ebuild b/media-libs/libmtp/libmtp-9999.ebuild
index 1bc630134db..588ac3b3b25 100644
--- a/media-libs/libmtp/libmtp-9999.ebuild
+++ b/media-libs/libmtp/libmtp-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)"

diff --git a/media-libs/libnjb/libnjb-2.2.7.ebuild b/media-libs/libnjb/libnjb-2.2.7.ebuild
index 48e23269a9c..db6b951fbf0 100644
--- a/media-libs/libnjb/libnjb-2.2.7.ebuild
+++ b/media-libs/libnjb/libnjb-2.2.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="doc static-libs"
 
 RDEPEND="virtual/libusb:0"

diff --git a/media-libs/libogg/libogg-1.3.3.ebuild b/media-libs/libogg/libogg-1.3.3.ebuild
index 4ca9f62beb0..d8234fb4fd5 100644
--- a/media-libs/libogg/libogg-1.3.3.ebuild
+++ b/media-libs/libogg/libogg-1.3.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.xiph.org/releases/ogg/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DOCS=( AUTHORS CHANGES )

diff --git a/media-libs/libogg/libogg-1.3.4.ebuild b/media-libs/libogg/libogg-1.3.4.ebuild
index 87444316d67..f4e3f98c047 100644
--- a/media-libs/libogg/libogg-1.3.4.ebuild
+++ b/media-libs/libogg/libogg-1.3.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.xiph.org/releases/ogg/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DOCS=( AUTHORS CHANGES )

diff --git a/media-libs/libopenraw/libopenraw-0.0.9.ebuild b/media-libs/libopenraw/libopenraw-0.0.9.ebuild
index 5c269828d8f..d741bde0c6b 100644
--- a/media-libs/libopenraw/libopenraw-0.0.9.ebuild
+++ b/media-libs/libopenraw/libopenraw-0.0.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="gtk static-libs test"
 
 RDEPEND="virtual/jpeg:0

diff --git a/media-libs/libopenraw/libopenraw-0.1.2.ebuild b/media-libs/libopenraw/libopenraw-0.1.2.ebuild
index 571c1c4692d..e05da6d6a4e 100644
--- a/media-libs/libopenraw/libopenraw-0.1.2.ebuild
+++ b/media-libs/libopenraw/libopenraw-0.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0/7"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="gtk static-libs test"
 
 RDEPEND="

diff --git a/media-libs/libopenraw/libopenraw-0.1.3.ebuild b/media-libs/libopenraw/libopenraw-0.1.3.ebuild
index cb9866416da..f6574ac22c9 100644
--- a/media-libs/libopenraw/libopenraw-0.1.3.ebuild
+++ b/media-libs/libopenraw/libopenraw-0.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="gtk static-libs test"
 
 RDEPEND="

diff --git a/media-libs/libpng/libpng-1.2.59.ebuild b/media-libs/libpng/libpng-1.2.59.ebuild
index 1cc6dadbc69..d2562b0303b 100644
--- a/media-libs/libpng/libpng-1.2.59.ebuild
+++ b/media-libs/libpng/libpng-1.2.59.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="libpng"
 SLOT="1.2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]

diff --git a/media-libs/libpng/libpng-1.5.30.ebuild b/media-libs/libpng/libpng-1.5.30.ebuild
index 0d291a42e7a..2963c5a06ba 100644
--- a/media-libs/libpng/libpng-1.5.30.ebuild
+++ b/media-libs/libpng/libpng-1.5.30.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng"
 SLOT="1.5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng neon"
 
 RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]

diff --git a/media-libs/libpng/libpng-1.6.37.ebuild b/media-libs/libpng/libpng-1.6.37.ebuild
index fda499f3c36..41ff59e88c4 100644
--- a/media-libs/libpng/libpng-1.6.37.ebuild
+++ b/media-libs/libpng/libpng-1.6.37.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng2"
 SLOT="0/16"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng cpu_flags_x86_sse neon static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"

diff --git a/media-libs/libpostproc/libpostproc-0.8.0.20121125.ebuild b/media-libs/libpostproc/libpostproc-0.8.0.20121125.ebuild
index 263c068b316..a6b424d6d4a 100644
--- a/media-libs/libpostproc/libpostproc-0.8.0.20121125.ebuild
+++ b/media-libs/libpostproc/libpostproc-0.8.0.20121125.ebuild
@@ -24,7 +24,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 fi
 IUSE="pic static-libs"
 

diff --git a/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild b/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild
index 80721f40f19..9c85a41b48a 100644
--- a/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild
+++ b/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild
@@ -24,7 +24,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 fi
 IUSE="pic static-libs"
 

diff --git a/media-libs/libpostproc/libpostproc-10.20140517.ebuild b/media-libs/libpostproc/libpostproc-10.20140517.ebuild
index 4e1693b0428..38adba08f33 100644
--- a/media-libs/libpostproc/libpostproc-10.20140517.ebuild
+++ b/media-libs/libpostproc/libpostproc-10.20140517.ebuild
@@ -24,7 +24,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 IUSE="pic static-libs"
 

diff --git a/media-libs/libpostproc/libpostproc-9999.ebuild b/media-libs/libpostproc/libpostproc-9999.ebuild
index 23a7caeab9f..cdce6896ff1 100644
--- a/media-libs/libpostproc/libpostproc-9999.ebuild
+++ b/media-libs/libpostproc/libpostproc-9999.ebuild
@@ -24,7 +24,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 IUSE="pic static-libs"
 

diff --git a/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild b/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
index 9f4e4a71fda..5bacac1be0a 100644
--- a/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
+++ b/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/projectm/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="debug openmp video_cards_nvidia"
 
 RDEPEND="media-fonts/dejavu

diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
index eaddbd6d2a7..376312d1885 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
 IUSE="aac alsa doc dv encode ffmpeg gtk jpeg lame libav cpu_flags_x86_mmx opengl png static-libs vorbis X x264"
 
 RDEPEND="

diff --git a/media-libs/libreplaygain/libreplaygain-477-r1.ebuild b/media-libs/libreplaygain/libreplaygain-477-r1.ebuild
index b0c94883cfb..ad7cef3a6c0 100644
--- a/media-libs/libreplaygain/libreplaygain-477-r1.ebuild
+++ b/media-libs/libreplaygain/libreplaygain-477-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 src_prepare() {

diff --git a/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild b/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild
index e62042abd4c..3bb9a3f0495 100644
--- a/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.mega-nerd.com/SRC/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="sndfile static-libs"
 
 RDEPEND="sndfile? ( >=media-libs/libsndfile-1.0.2 )"

diff --git a/media-libs/libsamplerate/libsamplerate-9999.ebuild b/media-libs/libsamplerate/libsamplerate-9999.ebuild
index 5fd3fc1ba45..64a39257945 100644
--- a/media-libs/libsamplerate/libsamplerate-9999.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/erikd/libsamplerate.git"
 else
 	SRC_URI="http://www.mega-nerd.com/SRC/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 fi
 
 LICENSE="BSD-2"

diff --git a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
index 79464c2542b..37f9058f92b 100644
--- a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 # WARNING:
 # If you turn on the custom-cflags use flag in USE and something breaks,
 # you pick up the pieces.  Be prepared for bug reports to be marked INVALID.

diff --git a/media-libs/libshout/libshout-2.4.1-r2.ebuild b/media-libs/libshout/libshout-2.4.1-r2.ebuild
index 74a48b8d3e3..424a2fd384e 100644
--- a/media-libs/libshout/libshout-2.4.1-r2.ebuild
+++ b/media-libs/libshout/libshout-2.4.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86"
 IUSE="libressl speex static-libs theora"
 
 RDEPEND="

diff --git a/media-libs/libshout/libshout-2.4.2.ebuild b/media-libs/libshout/libshout-2.4.2.ebuild
index e478485c81c..3f47fb37583 100644
--- a/media-libs/libshout/libshout-2.4.2.ebuild
+++ b/media-libs/libshout/libshout-2.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE="libressl speex static-libs theora"
 
 RDEPEND="

diff --git a/media-libs/libshout/libshout-2.4.3.ebuild b/media-libs/libshout/libshout-2.4.3.ebuild
index e3730421c58..96a7f60e203 100644
--- a/media-libs/libshout/libshout-2.4.3.ebuild
+++ b/media-libs/libshout/libshout-2.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE="libressl speex static-libs theora"
 
 RDEPEND="

diff --git a/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild b/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild
index 5ed3715ef48..24488c17b25 100644
--- a/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild
+++ b/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://critical.ch/distfiles/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 DEPEND=""
 RDEPEND=""

diff --git a/media-libs/libsidplay/libsidplay-2.1.1-r5.ebuild b/media-libs/libsidplay/libsidplay-2.1.1-r5.ebuild
index d6ca6ea9926..922562932d8 100644
--- a/media-libs/libsidplay/libsidplay-2.1.1-r5.ebuild
+++ b/media-libs/libsidplay/libsidplay-2.1.1-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/sidplay2/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 MULTILIB_WRAPPED_HEADERS=(

diff --git a/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild b/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
index 3097c088709..b316eb15ff8 100644
--- a/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="alsa minimal sqlite static-libs test"
 
 RDEPEND="

diff --git a/media-libs/libsndfile/libsndfile-9999.ebuild b/media-libs/libsndfile/libsndfile-9999.ebuild
index fe5341352a3..aa94640fb8f 100644
--- a/media-libs/libsndfile/libsndfile-9999.ebuild
+++ b/media-libs/libsndfile/libsndfile-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/erikd/libsndfile.git"
 else
 	SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 inherit python-any-r1 multilib-minimal
 

diff --git a/media-libs/libtheora/libtheora-1.1.1-r2.ebuild b/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
index 34fe86706c5..503d97c7aeb 100644
--- a/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
+++ b/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/theora/${P/_}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc +encode examples static-libs"
 
 REQUIRED_USE="examples? ( encode )" #285895

diff --git a/media-libs/libtiger/libtiger-0.3.4-r1.ebuild b/media-libs/libtiger/libtiger-0.3.4-r1.ebuild
index d39f030f284..4389cf919cd 100644
--- a/media-libs/libtiger/libtiger-0.3.4-r1.ebuild
+++ b/media-libs/libtiger/libtiger-0.3.4-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://libtiger.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ppc ppc64 sparc x86"
 IUSE="doc"
 
 RDEPEND="x11-libs/pango[${MULTILIB_USEDEP}]

diff --git a/media-libs/libuninameslist/libuninameslist-20091231-r1.ebuild b/media-libs/libuninameslist/libuninameslist-20091231-r1.ebuild
index 3e6efeac882..6b6e93a21b6 100644
--- a/media-libs/libuninameslist/libuninameslist-20091231-r1.ebuild
+++ b/media-libs/libuninameslist/libuninameslist-20091231-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/libuninameslist/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 S="${WORKDIR}/${PN}"

diff --git a/media-libs/libvisual/libvisual-0.4.0-r3.ebuild b/media-libs/libvisual/libvisual-0.4.0-r3.ebuild
index f5253190906..cad7f9764d7 100644
--- a/media-libs/libvisual/libvisual-0.4.0-r3.ebuild
+++ b/media-libs/libvisual/libvisual-0.4.0-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0.4"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="debug nls static-libs threads"
 
 DEPEND="

diff --git a/media-libs/libvorbis/libvorbis-1.3.6.ebuild b/media-libs/libvorbis/libvorbis-1.3.6.ebuild
index 846302b72c7..cafa1791a4e 100644
--- a/media-libs/libvorbis/libvorbis-1.3.6.ebuild
+++ b/media-libs/libvorbis/libvorbis-1.3.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/vorbis/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]"

diff --git a/media-libs/libvpx/libvpx-1.5.0.ebuild b/media-libs/libvpx/libvpx-1.5.0.ebuild
index b3650dcdba7..e8ec37de660 100644
--- a/media-libs/libvpx/libvpx-1.5.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.5.0.ebuild
@@ -11,10 +11,10 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://chromium.googlesource.com/webm/${PN}.git"
 elif [[ ${PV} == *pre* ]]; then
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 else
 	SRC_URI="https://storage.googleapis.com/downloads.webmproject.org/releases/webm/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 # generated by: make LIBVPX_TEST_DATA_PATH=libvpx-testdata testdata + tar'ing
 # it.

diff --git a/media-libs/libvpx/libvpx-1.6.0-r1.ebuild b/media-libs/libvpx/libvpx-1.6.0-r1.ebuild
index cbe4a96a7c6..fe12e6ee729 100644
--- a/media-libs/libvpx/libvpx-1.6.0-r1.ebuild
+++ b/media-libs/libvpx/libvpx-1.6.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://storage.googleapis.com/downloads.webmproject.org/releases/webm/
 
 LICENSE="BSD"
 SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 +highbitdepth static-libs svc test +threads"
 
 RDEPEND=""

diff --git a/media-libs/libvpx/libvpx-1.6.1.ebuild b/media-libs/libvpx/libvpx-1.6.1.ebuild
index 8b1114c6fbc..48236dae7e9 100644
--- a/media-libs/libvpx/libvpx-1.6.1.ebuild
+++ b/media-libs/libvpx/libvpx-1.6.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://storage.googleapis.com/downloads.webmproject.org/releases/webm/
 
 LICENSE="BSD"
 SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 +highbitdepth static-libs svc test +threads"
 
 REQUIRED_USE="

diff --git a/media-libs/libvpx/libvpx-1.7.0.ebuild b/media-libs/libvpx/libvpx-1.7.0.ebuild
index 1e5f44ad1f8..f22003d811b 100644
--- a/media-libs/libvpx/libvpx-1.7.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.7.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 +highbitdepth static-libs svc test +threads"
 
 REQUIRED_USE="

diff --git a/media-libs/libvpx/libvpx-1.8.0-r1.ebuild b/media-libs/libvpx/libvpx-1.8.0-r1.ebuild
index c45449b70d2..c72271c5ce3 100644
--- a/media-libs/libvpx/libvpx-1.8.0-r1.ebuild
+++ b/media-libs/libvpx/libvpx-1.8.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD"
 SLOT="0/6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc +highbitdepth postproc static-libs svc test +threads"
 
 REQUIRED_USE="test? ( threads )"

diff --git a/media-libs/libvpx/libvpx-1.8.0.ebuild b/media-libs/libvpx/libvpx-1.8.0.ebuild
index cc1164e1ea8..fa67747d2e2 100644
--- a/media-libs/libvpx/libvpx-1.8.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.8.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD"
 SLOT="0/6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 +highbitdepth static-libs svc test +threads"
 
 REQUIRED_USE="

diff --git a/media-libs/libwebp/libwebp-1.0.2.ebuild b/media-libs/libwebp/libwebp-1.0.2.ebuild
index a28d7e1a247..ac156cbefe9 100644
--- a/media-libs/libwebp/libwebp-1.0.2.ebuild
+++ b/media-libs/libwebp/libwebp-1.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.webmproject.org/releases/webp/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/7" # subslot = libwebp soname version
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg neon opengl +png static-libs swap-16bit-csp tiff"
 
 # TODO: dev-lang/swig bindings in swig/ subdirectory

diff --git a/media-libs/libwebp/libwebp-1.0.3.ebuild b/media-libs/libwebp/libwebp-1.0.3.ebuild
index 87c3f659333..ac73ea539ef 100644
--- a/media-libs/libwebp/libwebp-1.0.3.ebuild
+++ b/media-libs/libwebp/libwebp-1.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.webmproject.org/releases/webp/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/7" # subslot = libwebp soname version
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg neon opengl +png static-libs swap-16bit-csp tiff"
 
 # TODO: dev-lang/swig bindings in swig/ subdirectory

diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
index be9a5235f94..a6cffc66d99 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A library for reading vector images in Microsoft's Windows Metafile
 HOMEPAGE="https://wvware.sourceforge.net/"
 SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="debug doc expat X"

diff --git a/media-libs/libxmi/libxmi-1.3.ebuild b/media-libs/libxmi/libxmi-1.3.ebuild
index 03eaea71110..ad55e31a5ac 100644
--- a/media-libs/libxmi/libxmi-1.3.ebuild
+++ b/media-libs/libxmi/libxmi-1.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND="!<=media-libs/plotutils-2.6"

diff --git a/media-libs/mesa/mesa-19.1.7.ebuild b/media-libs/mesa/mesa-19.1.7.ebuild
index 8222ce52ac6..9f078435bae 100644
--- a/media-libs/mesa/mesa-19.1.7.ebuild
+++ b/media-libs/mesa/mesa-19.1.7.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"

diff --git a/media-libs/mesa/mesa-19.2.0.ebuild b/media-libs/mesa/mesa-19.2.0.ebuild
index 27301deb54b..cad8a11cea0 100644
--- a/media-libs/mesa/mesa-19.2.0.ebuild
+++ b/media-libs/mesa/mesa-19.2.0.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"

diff --git a/media-libs/mesa/mesa-19.2.1.ebuild b/media-libs/mesa/mesa-19.2.1.ebuild
index 27301deb54b..cad8a11cea0 100644
--- a/media-libs/mesa/mesa-19.2.1.ebuild
+++ b/media-libs/mesa/mesa-19.2.1.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 27301deb54b..cad8a11cea0 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"

diff --git a/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild b/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild
index fae42e7057e..9ea4846387e 100644
--- a/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild
+++ b/media-libs/musicbrainz/musicbrainz-5.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/metabrainz/lib${PN}/releases/download/release-${PV}/
 
 LICENSE="LGPL-2.1"
 SLOT="5/1"	# soname of libmusicbrainz5.so
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
 
 RDEPEND="

diff --git a/media-libs/nas/nas-1.9.4-r2.ebuild b/media-libs/nas/nas-1.9.4-r2.ebuild
index 89172705683..87fbe235ad1 100644
--- a/media-libs/nas/nas-1.9.4-r2.ebuild
+++ b/media-libs/nas/nas-1.9.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
 
 LICENSE="HPND MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE="doc static-libs"
 
 RDEPEND="

diff --git a/media-libs/netpbm/netpbm-10.66.00.ebuild b/media-libs/netpbm/netpbm-10.66.00.ebuild
index 82fe3af2562..8806ce988f0 100644
--- a/media-libs/netpbm/netpbm-10.66.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.66.00.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc jbig jpeg png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
 
 RDEPEND="jbig? ( media-libs/jbigkit )

diff --git a/media-libs/netpbm/netpbm-10.70.00.ebuild b/media-libs/netpbm/netpbm-10.70.00.ebuild
index 97a05287f20..4d22f142cc9 100644
--- a/media-libs/netpbm/netpbm-10.70.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.70.00.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc jbig jpeg png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
 
 RDEPEND="jbig? ( media-libs/jbigkit )

diff --git a/media-libs/netpbm/netpbm-10.76.00.ebuild b/media-libs/netpbm/netpbm-10.76.00.ebuild
index 10dd2b062d5..e4ed0080f68 100644
--- a/media-libs/netpbm/netpbm-10.76.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.76.00.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
 
 RDEPEND="jbig? ( media-libs/jbigkit )

diff --git a/media-libs/openal/openal-1.19.1.ebuild b/media-libs/openal/openal-1.19.1.ebuild
index a2051502df9..e1a74e794ce 100644
--- a/media-libs/openal/openal-1.19.1.ebuild
+++ b/media-libs/openal/openal-1.19.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="
 	alsa coreaudio debug jack oss portaudio pulseaudio sdl qt5
 	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1

diff --git a/media-libs/opencore-amr/opencore-amr-0.1.3-r1.ebuild b/media-libs/opencore-amr/opencore-amr-0.1.3-r1.ebuild
index b70540563fc..27ae9e737e2 100644
--- a/media-libs/opencore-amr/opencore-amr-0.1.3-r1.ebuild
+++ b/media-libs/opencore-amr/opencore-amr-0.1.3-r1.ebuild
@@ -11,6 +11,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 DOCS=( AUTHORS ChangeLog README )

diff --git a/media-libs/opencore-amr/opencore-amr-0.1.4.ebuild b/media-libs/opencore-amr/opencore-amr-0.1.4.ebuild
index 7b52e1e9fb6..57398d12e5f 100644
--- a/media-libs/opencore-amr/opencore-amr-0.1.4.ebuild
+++ b/media-libs/opencore-amr/opencore-amr-0.1.4.ebuild
@@ -11,6 +11,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 DOCS=( ChangeLog README )

diff --git a/media-libs/opencore-amr/opencore-amr-0.1.5.ebuild b/media-libs/opencore-amr/opencore-amr-0.1.5.ebuild
index 84c706c89b8..d08d3e45112 100644
--- a/media-libs/opencore-amr/opencore-amr-0.1.5.ebuild
+++ b/media-libs/opencore-amr/opencore-amr-0.1.5.ebuild
@@ -11,6 +11,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 DOCS=( ChangeLog README )

diff --git a/media-libs/openexr/openexr-2.3.0.ebuild b/media-libs/openexr/openexr-2.3.0.ebuild
index c09ccb9802a..1be2025d58c 100644
--- a/media-libs/openexr/openexr-2.3.0.ebuild
+++ b/media-libs/openexr/openexr-2.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0/24" # based on SONAME
-KEYWORDS="amd64 -arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 -arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="cpu_flags_x86_avx examples static-libs"
 
 RDEPEND="

diff --git a/media-libs/openexr_ctl/openexr_ctl-1.0.1-r2.ebuild b/media-libs/openexr_ctl/openexr_ctl-1.0.1-r2.ebuild
index 1c79c6eb84a..71f4124efb1 100644
--- a/media-libs/openexr_ctl/openexr_ctl-1.0.1-r2.ebuild
+++ b/media-libs/openexr_ctl/openexr_ctl-1.0.1-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/ampasctl/${P}.tar.gz"
 
 LICENSE="AMPAS"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~hppa ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/ilmbase-2.0.1:=

diff --git a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild b/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
index a12928765e7..8842077a1fb 100644
--- a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}.mirror/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/5" # based on SONAME
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="

diff --git a/media-libs/openjpeg/openjpeg-2.3.1.ebuild b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
index faf9ac61c7c..041bd067b45 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="

diff --git a/media-libs/opus/opus-1.3.1-r1.ebuild b/media-libs/opus/opus-1.3.1-r1.ebuild
index 6658b6af799..ae3328a25fd 100644
--- a/media-libs/opus/opus-1.3.1-r1.ebuild
+++ b/media-libs/opus/opus-1.3.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 INTRINSIC_FLAGS="cpu_flags_x86_sse cpu_flags_arm_neon"
 IUSE="custom-modes doc static-libs ${INTRINSIC_FLAGS}"
 

diff --git a/media-libs/opus/opus-1.3.1.ebuild b/media-libs/opus/opus-1.3.1.ebuild
index 8fef1d8dec5..eeda2865a89 100644
--- a/media-libs/opus/opus-1.3.1.ebuild
+++ b/media-libs/opus/opus-1.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 INTRINSIC_FLAGS="cpu_flags_x86_sse cpu_flags_arm_neon"
 IUSE="custom-modes doc static-libs ${INTRINSIC_FLAGS}"
 

diff --git a/media-libs/opus/opus-1.3.ebuild b/media-libs/opus/opus-1.3.ebuild
index 80e9181a6d4..9cc76e20d7b 100644
--- a/media-libs/opus/opus-1.3.ebuild
+++ b/media-libs/opus/opus-1.3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://archive.mozilla.org/pub/opus/${MY_P}.tar.gz"
 	if [[ "${PV}" != *_alpha* ]] && [[ "${PV}" != *_beta* ]] ; then
-		KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+		KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 	fi
 fi
 

diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0.ebuild
index 34230a07d8e..b514032550e 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://phonon.kde.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"

diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild
index 17981927f53..5af2b0308fc 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild
@@ -8,7 +8,7 @@ MY_P=${MY_PN}-${PV}
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 else
 	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
 	inherit git-r3

diff --git a/media-libs/phonon/phonon-4.10.2.ebuild b/media-libs/phonon/phonon-4.10.2.ebuild
index fb59dd89f04..1899bbdc0c7 100644
--- a/media-libs/phonon/phonon-4.10.2.ebuild
+++ b/media-libs/phonon/phonon-4.10.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 else
 	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
 	inherit git-r3

diff --git a/media-libs/phonon/phonon-4.11.1.ebuild b/media-libs/phonon/phonon-4.11.1.ebuild
index 6edaf832b5a..a5cdbac1015 100644
--- a/media-libs/phonon/phonon-4.11.1.ebuild
+++ b/media-libs/phonon/phonon-4.11.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://phonon.kde.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"

diff --git a/media-libs/plotutils/plotutils-2.6-r2.ebuild b/media-libs/plotutils/plotutils-2.6-r2.ebuild
index e0e81ef5577..5c8530cac0d 100644
--- a/media-libs/plotutils/plotutils-2.6-r2.ebuild
+++ b/media-libs/plotutils/plotutils-2.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/plotutils/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+png static-libs X"
 
 DEPEND="

diff --git a/media-libs/portaudio/portaudio-19.06.00-r1.ebuild b/media-libs/portaudio/portaudio-19.06.00-r1.ebuild
index 91a5125e11a..fe5ea34a8cc 100644
--- a/media-libs/portaudio/portaudio-19.06.00-r1.ebuild
+++ b/media-libs/portaudio/portaudio-19.06.00-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alsa +cxx debug doc jack oss static-libs"
 
 RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )

diff --git a/media-libs/portaudio/portaudio-19.06.00-r2.ebuild b/media-libs/portaudio/portaudio-19.06.00-r2.ebuild
index 6cfde7247b8..ba41ecb8438 100644
--- a/media-libs/portaudio/portaudio-19.06.00-r2.ebuild
+++ b/media-libs/portaudio/portaudio-19.06.00-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="alsa +cxx debug doc jack oss static-libs"
 
 RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )

diff --git a/media-libs/qhull/qhull-2015.2.ebuild b/media-libs/qhull/qhull-2015.2.ebuild
index f88a8b84a6e..c63282d1cc2 100644
--- a/media-libs/qhull/qhull-2015.2.ebuild
+++ b/media-libs/qhull/qhull-2015.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}/download/${PN}-2015-src-7.2.0.tgz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs"
 
 DOCS=( Announce.txt File_id.diz README.txt REGISTER.txt )

diff --git a/media-libs/raptor/raptor-2.0.15-r2.ebuild b/media-libs/raptor/raptor-2.0.15-r2.ebuild
index 82b00ae97d3..48f7ca1a8b9 100644
--- a/media-libs/raptor/raptor-2.0.15-r2.ebuild
+++ b/media-libs/raptor/raptor-2.0.15-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.librdf.org/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+curl debug json static-libs unicode"
 
 DEPEND="

diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.25.ebuild b/media-libs/sdl-gfx/sdl-gfx-2.0.25.ebuild
index 32fe586605e..0d67f84876f 100644
--- a/media-libs/sdl-gfx/sdl-gfx-2.0.25.ebuild
+++ b/media-libs/sdl-gfx/sdl-gfx-2.0.25.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ferzkopp.net/Software/SDL_gfx-2.0/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc cpu_flags_x86_mmx static-libs"
 
 RDEPEND=">=media-libs/libsdl-1.2.15-r4[video,${MULTILIB_USEDEP}]"

diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild b/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild
index 36fd5ef48bc..a785ec3d674 100644
--- a/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild
+++ b/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ferzkopp.net/Software/SDL_gfx-2.0/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc cpu_flags_x86_mmx static-libs"
 
 RDEPEND=">=media-libs/libsdl-1.2.15-r4[video,${MULTILIB_USEDEP}]"

diff --git a/media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild b/media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild
index d9578965e6d..da05ea60d6e 100644
--- a/media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild
+++ b/media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_image/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="gif jpeg png static-libs tiff webp"
 
 RDEPEND="

diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
index 8d73e8e50b6..51aed975758 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav"
 REQUIRED_USE="
 	midi? ( || ( timidity fluidsynth ) )

diff --git a/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild b/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild
index 126aa18d9a2..94eb2ba069d 100644
--- a/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild
+++ b/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_net/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="

diff --git a/media-libs/sdl-sound/sdl-sound-1.0.3-r2.ebuild b/media-libs/sdl-sound/sdl-sound-1.0.3-r2.ebuild
index 77f7b1e18ac..02c6018c0b6 100644
--- a/media-libs/sdl-sound/sdl-sound-1.0.3-r2.ebuild
+++ b/media-libs/sdl-sound/sdl-sound-1.0.3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://icculus.org/${MY_PN}/downloads/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~x64-macos"
 IUSE="flac mikmod modplug mp3 mpeg physfs speex static-libs vorbis"
 
 RDEPEND="

diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
index 61ff98347e5..4b26ca7cab5 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="static-libs X"
 
 RDEPEND="

diff --git a/media-libs/sge/sge-030809.ebuild b/media-libs/sge/sge-030809.ebuild
index 159379bb02f..b3eb1819a16 100644
--- a/media-libs/sge/sge-030809.ebuild
+++ b/media-libs/sge/sge-030809.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.etek.chalmers.se/~e8cal1/sge/files/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ia64 ppc x86"
 IUSE="doc examples image truetype"
 
 RDEPEND="media-libs/libsdl

diff --git a/media-libs/smpeg/smpeg-0.4.4-r10.ebuild b/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
index b564a43ad5f..d2de598ee10 100644
--- a/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
+++ b/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.lokigames.com/pub/open-source/smpeg/${P}.tar.gz
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="X debug cpu_flags_x86_mmx opengl static-libs"
 
 RDEPEND="

diff --git a/media-libs/soxr/soxr-0.1.3-r1.ebuild b/media-libs/soxr/soxr-0.1.3-r1.ebuild
index 6d3d97f3ddd..d78d648f10a 100644
--- a/media-libs/soxr/soxr-0.1.3-r1.ebuild
+++ b/media-libs/soxr/soxr-0.1.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/soxr/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="examples test"
 
 # CMakeLists.txt builds examples if either test or examples USE flag is enabled.

diff --git a/media-libs/speex/speex-1.2.0-r1.ebuild b/media-libs/speex/speex-1.2.0-r1.ebuild
index 2a8671bf244..c815e2a2a0e 100644
--- a/media-libs/speex/speex-1.2.0-r1.ebuild
+++ b/media-libs/speex/speex-1.2.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_arm_v4 cpu_flags_arm_v5 cpu_flags_arm_v6 cpu_flags_x86_sse static-libs utils +vbr"
 
 RDEPEND="

diff --git a/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild b/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild
index e010f35b0a2..9779da23f9d 100644
--- a/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild
+++ b/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon static-libs"
 
 RDEPEND="!<media-libs/speex-1.2.0"

diff --git a/media-libs/t1lib/t1lib-5.1.2-r2.ebuild b/media-libs/t1lib/t1lib-5.1.2-r2.ebuild
index 73c4cebaad8..5e3c53648e2 100644
--- a/media-libs/t1lib/t1lib-5.1.2-r2.ebuild
+++ b/media-libs/t1lib/t1lib-5.1.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://sunsite.unc.edu/pub/Linux/libs/graphics/${P}.tar.gz"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="5"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="X doc static-libs"
 
 RDEPEND="X? (

diff --git a/media-libs/taglib/taglib-1.11.1_p20181028.ebuild b/media-libs/taglib/taglib-1.11.1_p20181028.ebuild
index 0c375210d93..09fcc98658b 100644
--- a/media-libs/taglib/taglib-1.11.1_p20181028.ebuild
+++ b/media-libs/taglib/taglib-1.11.1_p20181028.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://taglib.github.io/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1 MPL-1.1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 SLOT="0"
 IUSE="debug examples test"
 

diff --git a/media-libs/tiff/tiff-4.0.10-r1.ebuild b/media-libs/tiff/tiff-4.0.10-r1.ebuild
index b6af817e880..3a79093c5f7 100644
--- a/media-libs/tiff/tiff-4.0.10-r1.ebuild
+++ b/media-libs/tiff/tiff-4.0.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/libtiff/${P}.tar.gz"
 
 LICENSE="libtiff"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
 
 RDEPEND="

diff --git a/media-libs/tiff/tiff-4.0.10-r2.ebuild b/media-libs/tiff/tiff-4.0.10-r2.ebuild
index 2ad237dee89..6aceef3241c 100644
--- a/media-libs/tiff/tiff-4.0.10-r2.ebuild
+++ b/media-libs/tiff/tiff-4.0.10-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/libtiff/${P}.tar.gz"
 
 LICENSE="libtiff"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
 
 RDEPEND="

diff --git a/media-libs/tiff/tiff-4.0.10.ebuild b/media-libs/tiff/tiff-4.0.10.ebuild
index d416ce56940..afe7c58676b 100644
--- a/media-libs/tiff/tiff-4.0.10.ebuild
+++ b/media-libs/tiff/tiff-4.0.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/libtiff/${P}.tar.gz"
 
 LICENSE="libtiff"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
 
 RDEPEND="

diff --git a/media-libs/tremor/tremor-0_pre20130223-r1.ebuild b/media-libs/tremor/tremor-0_pre20130223-r1.ebuild
index 24edfaf465b..60ba8b2fd7c 100644
--- a/media-libs/tremor/tremor-0_pre20130223-r1.ebuild
+++ b/media-libs/tremor/tremor-0_pre20130223-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="low-accuracy static-libs"
 
 RDEPEND=">=media-libs/libogg-1.3.0:=[${MULTILIB_USEDEP}]"

diff --git a/media-libs/urt/urt-3.1b-r1.ebuild b/media-libs/urt/urt-3.1b-r1.ebuild
index 710fd2e1797..25014ef8eff 100644
--- a/media-libs/urt/urt-3.1b-r1.ebuild
+++ b/media-libs/urt/urt-3.1b-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.iastate.edu/pub/utah-raster/${P}.tar.Z"
 
 LICENSE="URT gif? ( free-noncomm )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="gif postscript tiff X"
 
 RDEPEND="X? ( x11-libs/libXext )

diff --git a/media-libs/urt/urt-3.1b-r3.ebuild b/media-libs/urt/urt-3.1b-r3.ebuild
index c3e32304cf6..e10b1db914a 100644
--- a/media-libs/urt/urt-3.1b-r3.ebuild
+++ b/media-libs/urt/urt-3.1b-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.iastate.edu/pub/utah-raster/${P}.tar.Z"
 
 LICENSE="URT gif? ( free-noncomm )"
 SLOT="0/3.1b-r2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="gif postscript static-libs tiff tools X"
 
 RDEPEND="

diff --git a/media-libs/vo-aacenc/vo-aacenc-0.1.3.ebuild b/media-libs/vo-aacenc/vo-aacenc-0.1.3.ebuild
index 7511d4823b8..d01db2abc7f 100644
--- a/media-libs/vo-aacenc/vo-aacenc-0.1.3.ebuild
+++ b/media-libs/vo-aacenc/vo-aacenc-0.1.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/mstorsjo/${PN}.git"
 else
 	SRC_URI="mirror://sourceforge/opencore-amr/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="VisualOn AAC encoder library"

diff --git a/media-libs/vo-aacenc/vo-aacenc-9999.ebuild b/media-libs/vo-aacenc/vo-aacenc-9999.ebuild
index 022f13cf020..55096b3dbc2 100644
--- a/media-libs/vo-aacenc/vo-aacenc-9999.ebuild
+++ b/media-libs/vo-aacenc/vo-aacenc-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/mstorsjo/${PN}.git"
 else
 	SRC_URI="mirror://sourceforge/opencore-amr/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="VisualOn AAC encoder library"

diff --git a/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.3.ebuild b/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.3.ebuild
index 12491d04112..787a6c65539 100644
--- a/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.3.ebuild
+++ b/media-libs/vo-amrwbenc/vo-amrwbenc-0.1.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/mstorsjo/vo-amrwbenc.git"
 else
 	SRC_URI="mirror://sourceforge/opencore-amr/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x64-macos"
 fi
 
 DESCRIPTION="VisualOn AMR-WB encoder library"

diff --git a/media-libs/vo-amrwbenc/vo-amrwbenc-9999.ebuild b/media-libs/vo-amrwbenc/vo-amrwbenc-9999.ebuild
index 0e3e35eee5f..df26e3f268e 100644
--- a/media-libs/vo-amrwbenc/vo-amrwbenc-9999.ebuild
+++ b/media-libs/vo-amrwbenc/vo-amrwbenc-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/mstorsjo/vo-amrwbenc.git"
 else
 	SRC_URI="mirror://sourceforge/opencore-amr/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="VisualOn AMR-WB encoder library"

diff --git a/media-libs/woff2/woff2-1.0.2-r1.ebuild b/media-libs/woff2/woff2-1.0.2-r1.ebuild
index 7b44c261487..5be3db07976 100644
--- a/media-libs/woff2/woff2-1.0.2-r1.ebuild
+++ b/media-libs/woff2/woff2-1.0.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND="app-arch/brotli"

diff --git a/media-libs/x264/x264-0.0.20190214.ebuild b/media-libs/x264/x264-0.0.20190214.ebuild
index 25efcae6f52..53eb3fb2052 100644
--- a/media-libs/x264/x264-0.0.20190214.ebuild
+++ b/media-libs/x264/x264-0.0.20190214.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_P="x264-snapshot-$(ver_cut 3)-2245"
 	SRC_URI="https://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	S="${WORKDIR}/${MY_P}"
 fi
 

diff --git a/media-libs/x264/x264-0.0.20190903.ebuild b/media-libs/x264/x264-0.0.20190903.ebuild
index ee5e6ace2cd..bb3c2d15e52 100644
--- a/media-libs/x264/x264-0.0.20190903.ebuild
+++ b/media-libs/x264/x264-0.0.20190903.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_P="x264-snapshot-$(ver_cut 3)-2245"
 	SRC_URI="https://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	S="${WORKDIR}/${MY_P}"
 fi
 

diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild
index 2a28aa46b61..4cdfe6a9bba 100644
--- a/media-libs/x264/x264-9999.ebuild
+++ b/media-libs/x264/x264-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_P="x264-snapshot-$(ver_cut 3)-2245"
 	SRC_URI="https://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	S="${WORKDIR}/${MY_P}"
 fi
 

diff --git a/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild b/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild
index d0dac86ff29..b5af0deb05e 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	NLS_DEPEND="sys-devel/gettext"
 	NLS_RDEPEND="virtual/libintl"
 else
-	KEYWORDS="amd64 arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="amd64 arm64 ~hppa ppc ppc64 x86"
 	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
 	NLS_IUSE="nls"
 	NLS_DEPEND="nls? ( sys-devel/gettext )"

diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
index 07cffc7a62f..585781521f8 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	NLS_DEPEND="sys-devel/gettext"
 	NLS_RDEPEND="virtual/libintl"
 else
-	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
 	NLS_IUSE="nls"
 	NLS_DEPEND="nls? ( sys-devel/gettext )"

diff --git a/media-libs/xvid/xvid-1.3.5.ebuild b/media-libs/xvid/xvid-1.3.5.ebuild
index 9128d5c7c57..96fead717c1 100644
--- a/media-libs/xvid/xvid-1.3.5.ebuild
+++ b/media-libs/xvid/xvid-1.3.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.xvid.org/downloads/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="elibc_FreeBSD examples pic +threads"
 
 NASM=">=dev-lang/nasm-2"

diff --git a/media-libs/zvbi/zvbi-0.2.35-r1.ebuild b/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
index 8b2f9be52be..5783acdcf86 100644
--- a/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
+++ b/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://zapping.sourceforge.net"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="doc dvb nls static-libs v4l X"
 
 RDEPEND=">=media-libs/libpng-1.5.18:0=[${MULTILIB_USEDEP}]