summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-accessibility/at-spi2-atk/at-spi2-atk-2.34.2.ebuild2
-rw-r--r--app-accessibility/at-spi2-core/at-spi2-core-2.34.0.ebuild2
-rw-r--r--app-accessibility/at-spi2-core/at-spi2-core-2.36.0.ebuild2
-rw-r--r--app-admin/eselect/eselect-1.4.16.ebuild2
-rw-r--r--app-admin/eselect/eselect-1.4.17.ebuild2
-rw-r--r--app-admin/fam/fam-2.7.0_p17_p3.ebuild2
-rw-r--r--app-admin/genromfs/genromfs-0.5.2.ebuild4
-rw-r--r--app-admin/killproc/killproc-2.13-r1.ebuild2
-rw-r--r--app-admin/makepasswd/makepasswd-1.10.ebuild2
-rw-r--r--app-admin/metalog/metalog-20181125.ebuild4
-rw-r--r--app-admin/metalog/metalog-3-r2.ebuild4
-rw-r--r--app-admin/perl-cleaner/perl-cleaner-2.27.ebuild2
-rw-r--r--app-admin/quickswitch/quickswitch-1.05.ebuild4
-rw-r--r--app-admin/sudo/sudo-1.9.5_p2-r1.ebuild2
-rw-r--r--app-admin/superadduser/superadduser-1.0.9.ebuild4
-rw-r--r--app-admin/webapp-config/webapp-config-1.55-r1.ebuild2
-rw-r--r--app-arch/bzip2/bzip2-1.0.6-r11.ebuild4
-rw-r--r--app-arch/bzip2/bzip2-1.0.8-r1.ebuild2
-rw-r--r--app-arch/cpio/cpio-2.12-r1.ebuild2
-rw-r--r--app-arch/gcab/gcab-1.4.ebuild4
-rw-r--r--app-arch/gzip/gzip-1.10.ebuild2
-rw-r--r--app-arch/gzip/gzip-1.9.ebuild2
-rw-r--r--app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild4
-rw-r--r--app-arch/lha/lha-114i_p20201004.ebuild4
-rw-r--r--app-arch/libarchive/libarchive-3.5.1.ebuild2
-rw-r--r--app-arch/lz4/lz4-1.9.3.ebuild2
-rw-r--r--app-arch/ncompress/ncompress-4.2.4.5.ebuild4
-rw-r--r--app-arch/pbzip2/pbzip2-1.1.12.ebuild4
-rw-r--r--app-arch/pigz/pigz-2.4-r1.ebuild2
-rw-r--r--app-arch/pixz/pixz-1.0.7.ebuild4
-rw-r--r--app-arch/rpm/rpm-4.14.2.1-r1.ebuild4
-rw-r--r--app-arch/rpm/rpm-4.16.0.ebuild2
-rw-r--r--app-arch/rpm2targz/rpm2targz-9.0.0.5g-r2.ebuild2
-rw-r--r--app-arch/sharutils/sharutils-4.15.2-r1.ebuild2
-rw-r--r--app-arch/snappy/snappy-1.1.8.ebuild2
-rw-r--r--app-arch/tar/tar-1.32-r1.ebuild2
-rw-r--r--app-arch/unace/unace-2.5-r5.ebuild4
-rw-r--r--app-arch/unrar/unrar-6.0.3.ebuild2
-rw-r--r--app-arch/unzip/unzip-6.0_p25-r1.ebuild2
-rw-r--r--app-arch/xz-utils/xz-utils-5.2.5.ebuild2
-rw-r--r--app-arch/zip/zip-3.0-r4.ebuild4
-rw-r--r--app-arch/zopfli/zopfli-1.0.2.ebuild4
-rw-r--r--app-arch/zopfli/zopfli-1.0.3.ebuild4
-rw-r--r--app-arch/zstd/zstd-1.4.9.ebuild2
-rw-r--r--app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild2
-rw-r--r--app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild2
-rw-r--r--app-crypt/argon2/argon2-20190702.ebuild2
-rw-r--r--app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild4
-rw-r--r--app-crypt/easy-rsa/easy-rsa-3.0.7.ebuild4
-rw-r--r--app-crypt/gentoo-keys/gentoo-keys-201901130136.ebuild4
-rw-r--r--app-crypt/gnupg/gnupg-2.2.25.ebuild2
-rw-r--r--app-crypt/gnupg/gnupg-2.2.27.ebuild2
-rw-r--r--app-crypt/hashalot/hashalot-0.3-r2.ebuild4
-rw-r--r--app-crypt/heimdal/heimdal-7.6.0.ebuild2
-rw-r--r--app-crypt/libb2/libb2-0.98.1-r2.ebuild2
-rw-r--r--app-crypt/mhash/mhash-0.9.9.9-r2.ebuild2
-rw-r--r--app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild4
-rw-r--r--app-crypt/openpgp-keys-django/openpgp-keys-django-20201105.ebuild4
-rw-r--r--app-crypt/openpgp-keys-django/openpgp-keys-django-20201201.ebuild4
-rw-r--r--app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20200704.ebuild4
-rw-r--r--app-crypt/openpgp-keys-kernel/openpgp-keys-kernel-20201103.ebuild4
-rw-r--r--app-crypt/openpgp-keys-linuxcontainers/openpgp-keys-linuxcontainers-20201014.ebuild4
-rw-r--r--app-crypt/openpgp-keys-miniupnp/openpgp-keys-miniupnp-20201006.ebuild4
-rw-r--r--app-crypt/openpgp-keys-python/openpgp-keys-python-20210121.ebuild2
-rw-r--r--app-crypt/openpgp-keys-terminator/openpgp-keys-terminator-20210306.ebuild2
-rw-r--r--app-crypt/openpgp-keys-voikko/openpgp-keys-voikko-20201013.ebuild4
-rw-r--r--app-crypt/p11-kit/p11-kit-0.23.22.ebuild2
-rw-r--r--app-crypt/pinentry/pinentry-1.1.0-r4.ebuild2
-rw-r--r--app-crypt/rhash/rhash-1.3.6-r1.ebuild2
-rw-r--r--app-crypt/shash/shash-0.2.6-r3.ebuild4
-rw-r--r--app-crypt/veracrypt/veracrypt-1.24_p8.ebuild4
-rw-r--r--app-dicts/aspell-af/aspell-af-0.50.0.ebuild2
-rw-r--r--app-dicts/aspell-be/aspell-be-0.01-r1.ebuild2
-rw-r--r--app-dicts/aspell-bg/aspell-bg-4.1.0.ebuild2
-rw-r--r--app-dicts/aspell-br/aspell-br-0.50.2.ebuild2
-rw-r--r--app-dicts/aspell-ca/aspell-ca-2.1.5.1.ebuild2
-rw-r--r--app-dicts/aspell-cs/aspell-cs-20040614.1.ebuild2
-rw-r--r--app-dicts/aspell-cy/aspell-cy-0.50.3.ebuild2
-rw-r--r--app-dicts/aspell-da/aspell-da-1.7.42.ebuild2
-rw-r--r--app-dicts/aspell-de-alt/aspell-de-alt-2.1.1-r1.ebuild2
-rw-r--r--app-dicts/aspell-de/aspell-de-0.60_pre20030222.ebuild2
-rw-r--r--app-dicts/aspell-el/aspell-el-0.50.3.ebuild2
-rw-r--r--app-dicts/aspell-en/aspell-en-2018.04.16.0.ebuild2
-rw-r--r--app-dicts/aspell-eo/aspell-eo-2.1.20000225.2.ebuild2
-rw-r--r--app-dicts/aspell-es/aspell-es-1.9a.ebuild2
-rw-r--r--app-dicts/aspell-et/aspell-et-0.1.21.1.ebuild2
-rw-r--r--app-dicts/aspell-fi/aspell-fi-0.7.0.ebuild2
-rw-r--r--app-dicts/aspell-fo/aspell-fo-0.51.0.ebuild2
-rw-r--r--app-dicts/aspell-fr/aspell-fr-0.50.3.ebuild2
-rw-r--r--app-dicts/aspell-ga/aspell-ga-0.50.4.ebuild2
-rw-r--r--app-dicts/aspell-gl/aspell-gl-0.5.2.ebuild2
-rw-r--r--app-dicts/aspell-he/aspell-he-1.0.0.ebuild2
-rw-r--r--app-dicts/aspell-hr/aspell-hr-0.51.0.ebuild2
-rw-r--r--app-dicts/aspell-hu/aspell-hu-0.99.4.2.0.ebuild2
-rw-r--r--app-dicts/aspell-hy/aspell-hy-0.10.0.0.ebuild2
-rw-r--r--app-dicts/aspell-is/aspell-is-0.51.1.0-r1.ebuild2
-rw-r--r--app-dicts/aspell-it/aspell-it-2.4.20070901.0.ebuild2
-rw-r--r--app-dicts/aspell-la/aspell-la-20020503.0.ebuild2
-rw-r--r--app-dicts/aspell-lt/aspell-lt-1.0.1.ebuild2
-rw-r--r--app-dicts/aspell-nl/aspell-nl-0.50.2.ebuild2
-rw-r--r--app-dicts/aspell-no/aspell-no-0.50.2-r1.ebuild2
-rw-r--r--app-dicts/aspell-pl/aspell-pl-6.0.20120418.0.ebuild2
-rw-r--r--app-dicts/aspell-pt-br/aspell-pt-br-20090702.0.ebuild2
-rw-r--r--app-dicts/aspell-pt/aspell-pt-0.50.2-r1.ebuild2
-rw-r--r--app-dicts/aspell-ro/aspell-ro-3.3.2.ebuild2
-rw-r--r--app-dicts/aspell-ru/aspell-ru-0.99.1-r1.ebuild2
-rw-r--r--app-dicts/aspell-sk/aspell-sk-2.01.2.ebuild2
-rw-r--r--app-dicts/aspell-sl/aspell-sl-0.50.0.ebuild2
-rw-r--r--app-dicts/aspell-sr/aspell-sr-0.02.ebuild2
-rw-r--r--app-dicts/aspell-sv/aspell-sv-0.51.0.ebuild2
-rw-r--r--app-dicts/aspell-uk/aspell-uk-1.4.0.0.ebuild2
-rw-r--r--app-dicts/aspell-vi/aspell-vi-0.01.1.1.ebuild2
-rw-r--r--app-dicts/mecab-ipadic/mecab-ipadic-2.7.0.20070801.ebuild4
-rw-r--r--app-doc/autobook/autobook-1.5.ebuild4
-rw-r--r--app-doc/blas-docs/blas-docs-3.1.1.ebuild2
-rw-r--r--app-doc/doxygen/doxygen-1.8.17-r1.ebuild2
-rw-r--r--app-doc/eclass-manpages/eclass-manpages-20200913.ebuild4
-rw-r--r--app-doc/eclass-manpages/eclass-manpages-20210104.ebuild2
-rw-r--r--app-doc/lapack-docs/lapack-docs-3.1.1.ebuild2
-rw-r--r--app-doc/linkers-and-loaders/linkers-and-loaders-1-r1.ebuild4
-rw-r--r--app-doc/linux-device-drivers/linux-device-drivers-2.ebuild4
-rw-r--r--app-doc/linux-device-drivers/linux-device-drivers-3.ebuild4
-rw-r--r--app-doc/linux-kernel-in-a-nutshell/linux-kernel-in-a-nutshell-1-r1.ebuild4
-rw-r--r--app-doc/php-docs/php-docs-20190203.ebuild4
-rw-r--r--app-doc/phrack-all/phrack-all-69.ebuild4
-rw-r--r--app-doc/phrack/phrack-01.ebuild4
-rw-r--r--app-doc/phrack/phrack-02.ebuild4
-rw-r--r--app-doc/phrack/phrack-03.ebuild4
-rw-r--r--app-doc/phrack/phrack-04.ebuild4
-rw-r--r--app-doc/phrack/phrack-05.ebuild4
-rw-r--r--app-doc/phrack/phrack-06.ebuild4
-rw-r--r--app-doc/phrack/phrack-07.ebuild4
-rw-r--r--app-doc/phrack/phrack-08.ebuild4
-rw-r--r--app-doc/phrack/phrack-09.ebuild4
-rw-r--r--app-doc/phrack/phrack-10.ebuild4
-rw-r--r--app-doc/phrack/phrack-11.ebuild4
-rw-r--r--app-doc/phrack/phrack-12.ebuild4
-rw-r--r--app-doc/phrack/phrack-13.ebuild4
-rw-r--r--app-doc/phrack/phrack-14.ebuild4
-rw-r--r--app-doc/phrack/phrack-15.ebuild4
-rw-r--r--app-doc/phrack/phrack-16.ebuild4
-rw-r--r--app-doc/phrack/phrack-17.ebuild4
-rw-r--r--app-doc/phrack/phrack-18.ebuild4
-rw-r--r--app-doc/phrack/phrack-19.ebuild4
-rw-r--r--app-doc/phrack/phrack-20.ebuild4
-rw-r--r--app-doc/phrack/phrack-21.ebuild4
-rw-r--r--app-doc/phrack/phrack-22.ebuild4
-rw-r--r--app-doc/phrack/phrack-23.ebuild4
-rw-r--r--app-doc/phrack/phrack-24.ebuild4
-rw-r--r--app-doc/phrack/phrack-25.ebuild4
-rw-r--r--app-doc/phrack/phrack-26.ebuild4
-rw-r--r--app-doc/phrack/phrack-27.ebuild4
-rw-r--r--app-doc/phrack/phrack-28.ebuild4
-rw-r--r--app-doc/phrack/phrack-29.ebuild4
-rw-r--r--app-doc/phrack/phrack-30.ebuild4
-rw-r--r--app-doc/phrack/phrack-31.ebuild4
-rw-r--r--app-doc/phrack/phrack-32.ebuild4
-rw-r--r--app-doc/phrack/phrack-33.ebuild4
-rw-r--r--app-doc/phrack/phrack-34.ebuild4
-rw-r--r--app-doc/phrack/phrack-35.ebuild4
-rw-r--r--app-doc/phrack/phrack-36.ebuild4
-rw-r--r--app-doc/phrack/phrack-37.ebuild4
-rw-r--r--app-doc/phrack/phrack-38.ebuild4
-rw-r--r--app-doc/phrack/phrack-39.ebuild4
-rw-r--r--app-doc/phrack/phrack-40.ebuild4
-rw-r--r--app-doc/phrack/phrack-41.ebuild4
-rw-r--r--app-doc/phrack/phrack-42.ebuild4
-rw-r--r--app-doc/phrack/phrack-43.ebuild4
-rw-r--r--app-doc/phrack/phrack-44.ebuild4
-rw-r--r--app-doc/phrack/phrack-45.ebuild4
-rw-r--r--app-doc/phrack/phrack-46.ebuild4
-rw-r--r--app-doc/phrack/phrack-47.ebuild4
-rw-r--r--app-doc/phrack/phrack-48.ebuild4
-rw-r--r--app-doc/phrack/phrack-49.ebuild4
-rw-r--r--app-doc/phrack/phrack-50.ebuild4
-rw-r--r--app-doc/phrack/phrack-51.ebuild4
-rw-r--r--app-doc/phrack/phrack-52.ebuild4
-rw-r--r--app-doc/phrack/phrack-53.ebuild4
-rw-r--r--app-doc/phrack/phrack-54.ebuild4
-rw-r--r--app-doc/phrack/phrack-55.ebuild4
-rw-r--r--app-doc/phrack/phrack-56.ebuild4
-rw-r--r--app-doc/phrack/phrack-57.ebuild4
-rw-r--r--app-doc/phrack/phrack-58.ebuild4
-rw-r--r--app-doc/phrack/phrack-59.ebuild4
-rw-r--r--app-doc/phrack/phrack-60.ebuild4
-rw-r--r--app-doc/phrack/phrack-61.ebuild4
-rw-r--r--app-doc/phrack/phrack-62.ebuild4
-rw-r--r--app-doc/phrack/phrack-63.ebuild4
-rw-r--r--app-doc/phrack/phrack-64.ebuild4
-rw-r--r--app-doc/phrack/phrack-65.ebuild4
-rw-r--r--app-doc/phrack/phrack-66.ebuild4
-rw-r--r--app-doc/phrack/phrack-67.ebuild4
-rw-r--r--app-doc/phrack/phrack-68.ebuild4
-rw-r--r--app-doc/phrack/phrack-69.ebuild4
-rw-r--r--app-doc/pms-bin/pms-bin-5_p20120920.ebuild2
-rw-r--r--app-doc/pms-bin/pms-bin-7_p20180430.ebuild2
-rw-r--r--app-doc/tldp-howto/tldp-howto-20120707.ebuild4
-rw-r--r--app-doc/xmltoman/xmltoman-0.4-r1.ebuild4
-rw-r--r--app-doc/zsh-lovers/zsh-lovers-0.9.0.ebuild2
-rw-r--r--app-editors/hexcurse/hexcurse-1.55.ebuild4
-rw-r--r--app-editors/hexcurse/hexcurse-1.60.0.ebuild2
-rw-r--r--app-editors/hexedit/hexedit-1.2.13.ebuild2
-rw-r--r--app-editors/nano/nano-5.3-r1.ebuild2
-rw-r--r--app-emacs/autoconf-mode/autoconf-mode-2.69-r1.ebuild2
-rw-r--r--app-emacs/lua-mode/lua-mode-20151025.ebuild4
-rw-r--r--app-emacs/lua-mode/lua-mode-20201010.ebuild4
-rw-r--r--app-emacs/po-mode/po-mode-0.20.1.ebuild2
-rw-r--r--app-emulation/pcem/pcem-17.ebuild6
-rw-r--r--app-eselect/eselect-awk/eselect-awk-0.3.ebuild2
-rw-r--r--app-eselect/eselect-blas/eselect-blas-0.1.ebuild2
-rw-r--r--app-eselect/eselect-cblas/eselect-cblas-0.1.ebuild2
-rw-r--r--app-eselect/eselect-ctags/eselect-ctags-1.18.ebuild2
-rw-r--r--app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild2
-rw-r--r--app-eselect/eselect-iptables/eselect-iptables-20200508.ebuild4
-rw-r--r--app-eselect/eselect-lapack/eselect-lapack-0.2.ebuild4
-rw-r--r--app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1-r1.ebuild2
-rw-r--r--app-eselect/eselect-package-manager/eselect-package-manager-20110108-r1.ebuild4
-rw-r--r--app-eselect/eselect-pinentry/eselect-pinentry-0.7.1.ebuild2
-rw-r--r--app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild2
-rw-r--r--app-eselect/eselect-python/eselect-python-20190417.ebuild2
-rw-r--r--app-eselect/eselect-python/eselect-python-20200719.ebuild2
-rw-r--r--app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild2
-rw-r--r--app-eselect/eselect-ruby/eselect-ruby-20190121.ebuild2
-rw-r--r--app-eselect/eselect-sh/eselect-sh-0.4.1.ebuild4
-rw-r--r--app-eselect/eselect-vi/eselect-vi-1.2.ebuild2
-rw-r--r--app-eselect/eselect-xvmc/eselect-xvmc-0.4.ebuild4
-rw-r--r--app-i18n/man-pages-it/man-pages-it-4.00.ebuild4
-rw-r--r--app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild4
-rw-r--r--app-i18n/man-pages-l10n/man-pages-l10n-4.2.0-r1.ebuild2
-rw-r--r--app-i18n/man-pages-ru/man-pages-ru-5.03.2390.2390.20191017.ebuild2
-rw-r--r--app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.2.ebuild4
-rw-r--r--app-i18n/unicode-data/unicode-data-12.0.0.ebuild4
-rw-r--r--app-i18n/unicode-data/unicode-data-13.0.0.ebuild2
-rw-r--r--app-misc/c_rehash/c_rehash-1.7-r1.ebuild2
-rw-r--r--app-misc/ca-certificates/ca-certificates-20200601.3.53.ebuild2
-rw-r--r--app-misc/ca-certificates/ca-certificates-20210119.3.62.ebuild2
-rw-r--r--app-misc/datefudge/datefudge-1.24.ebuild2
-rw-r--r--app-misc/delay/delay-1.6-r2.ebuild4
-rw-r--r--app-misc/dtach/dtach-0.9.ebuild4
-rw-r--r--app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild2
-rw-r--r--app-misc/mime-types/mime-types-9.ebuild2
-rw-r--r--app-misc/pax-utils/pax-utils-1.2.6.ebuild2
-rw-r--r--app-misc/pax-utils/pax-utils-1.2.9.ebuild2
-rw-r--r--app-misc/realpath/realpath-1.18.ebuild2
-rw-r--r--app-misc/rl/rl-0.2.7-r1.ebuild4
-rw-r--r--app-misc/screen/screen-4.8.0-r1.ebuild2
-rw-r--r--app-misc/screen/screen-4.8.0-r2.ebuild2
-rw-r--r--app-misc/tmux/tmux-3.1c.ebuild2
-rw-r--r--app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild4
-rw-r--r--app-portage/eix/eix-0.34.12.ebuild2
-rw-r--r--app-portage/elicense/elicense-1.0.2.ebuild4
-rw-r--r--app-portage/elt-patches/elt-patches-20170317.ebuild2
-rw-r--r--app-portage/elt-patches/elt-patches-20170422.ebuild2
-rw-r--r--app-portage/elt-patches/elt-patches-20170815.ebuild2
-rw-r--r--app-portage/esearch/esearch-1.3-r3.ebuild2
-rw-r--r--app-portage/gemato/gemato-15.2.ebuild4
-rw-r--r--app-portage/genlop/genlop-0.30.10-r2.ebuild2
-rw-r--r--app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild2
-rw-r--r--app-portage/mirrorselect/mirrorselect-2.2.6-r2.ebuild2
-rw-r--r--app-portage/repoman/repoman-2.3.23.ebuild2
-rw-r--r--app-portage/repoman/repoman-3.0.2.ebuild2
-rw-r--r--app-shells/bash/bash-2.05b_p13.ebuild4
-rw-r--r--app-shells/bash/bash-3.0_p22.ebuild4
-rw-r--r--app-shells/bash/bash-3.1_p23.ebuild4
-rw-r--r--app-shells/bash/bash-3.2_p57.ebuild4
-rw-r--r--app-shells/bash/bash-4.0_p44.ebuild4
-rw-r--r--app-shells/bash/bash-4.1_p17.ebuild4
-rw-r--r--app-shells/bash/bash-4.2_p53.ebuild4
-rw-r--r--app-shells/bash/bash-4.3_p48-r2.ebuild4
-rw-r--r--app-shells/bash/bash-4.4_p23-r2.ebuild2
-rw-r--r--app-shells/bash/bash-5.0_p11-r1.ebuild2
-rw-r--r--app-shells/bash/bash-5.0_p18.ebuild2
-rw-r--r--app-shells/push/push-2.0-r1.ebuild2
-rw-r--r--app-shells/push/push-3.4.ebuild2
-rw-r--r--app-shells/quoter/quoter-4.2.ebuild2
-rw-r--r--app-shells/tcsh/tcsh-6.22.02.ebuild2
-rw-r--r--app-text/asciidoc/asciidoc-9.0.2-r1.ebuild2
-rw-r--r--app-text/aspell/aspell-0.60.8.ebuild2
-rw-r--r--app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild2
-rw-r--r--app-text/dbacl/dbacl-1.14.ebuild4
-rw-r--r--app-text/delta/delta-20060803-r1.ebuild2
-rw-r--r--app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild5
-rw-r--r--app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild2
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild2
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild2
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild2
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild2
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild2
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild2
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild2
-rw-r--r--app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild2
-rw-r--r--app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild2
-rw-r--r--app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild2
-rw-r--r--app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild2
-rw-r--r--app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild2
-rw-r--r--app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild2
-rw-r--r--app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild2
-rw-r--r--app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild2
-rw-r--r--app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild2
-rw-r--r--app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild2
-rw-r--r--app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild2
-rw-r--r--app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild2
-rw-r--r--app-text/docbook2X/docbook2X-0.8.8-r4.ebuild2
-rw-r--r--app-text/dvipng/dvipng-1.17.ebuild2
-rw-r--r--app-text/dvipsk/dvipsk-2020.1_p20200406.ebuild2
-rw-r--r--app-text/epspdf/epspdf-0.6.3-r1.ebuild2
-rw-r--r--app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild4
-rw-r--r--app-text/libexttextcat/libexttextcat-3.4.5.ebuild4
-rw-r--r--app-text/libpaper/libpaper-1.1.24_p5.ebuild2
-rw-r--r--app-text/manpager/manpager-1.ebuild2
-rw-r--r--app-text/mecab/mecab-0.996-r1.ebuild4
-rw-r--r--app-text/openjade/openjade-1.3.2-r9.ebuild2
-rw-r--r--app-text/opensp/opensp-1.5.2-r3.ebuild2
-rw-r--r--app-text/pdfjam/pdfjam-2.08-r1.ebuild2
-rw-r--r--app-text/po4a/po4a-0.57.ebuild4
-rw-r--r--app-text/poppler-data/poppler-data-0.4.10.ebuild2
-rw-r--r--app-text/poppler/poppler-20.11.0.ebuild2
-rw-r--r--app-text/ps2eps/ps2eps-1.68.ebuild2
-rw-r--r--app-text/ps2pkm/ps2pkm-1.8_p20200406.ebuild2
-rw-r--r--app-text/qpdf/qpdf-10.0.4.ebuild2
-rw-r--r--app-text/rarian/rarian-0.8.1-r3.ebuild2
-rw-r--r--app-text/rman/rman-3.2-r1.ebuild2
-rw-r--r--app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild2
-rw-r--r--app-text/sgml-common/sgml-common-0.6.3-r7.ebuild2
-rw-r--r--app-text/teckit/teckit-2.5.10.ebuild2
-rw-r--r--app-text/texi2html/texi2html-5.0-r1.ebuild2
-rw-r--r--app-text/texlive/texlive-2020-r9.ebuild2
-rw-r--r--app-text/tree/tree-1.8.0.ebuild2
-rw-r--r--app-text/ttf2pk2/ttf2pk2-2.0_p20200406.ebuild2
-rw-r--r--app-text/xmlto/xmlto-0.0.28-r3.ebuild2
-rw-r--r--app-text/yelp-tools/yelp-tools-3.32.2.ebuild4
-rw-r--r--app-vim/cfengine-syntax/cfengine-syntax-20141019.ebuild4
-rw-r--r--app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild4
-rw-r--r--app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild2
-rw-r--r--app-vim/gentoo-syntax/gentoo-syntax-20201216.ebuild2
-rw-r--r--app-vim/gtk-syntax/gtk-syntax-20130716.ebuild2
-rw-r--r--app-vim/info/info-1.7-r2.ebuild4
-rw-r--r--app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild4
-rw-r--r--dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild2
-rw-r--r--dev-db/freetds/freetds-1.2.18.ebuild2
-rw-r--r--dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild2
-rw-r--r--dev-db/libdbi/libdbi-0.9.0.ebuild4
-rw-r--r--dev-db/libiodbc/libiodbc-3.52.12-r1.ebuild2
-rw-r--r--dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild2
-rw-r--r--dev-db/mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild2
-rw-r--r--dev-db/mysql-connector-c/mysql-connector-c-8.0.22.ebuild4
-rw-r--r--dev-db/mysql-connector-c/mysql-connector-c-8.0.23-r1.ebuild2
-rw-r--r--dev-db/qdbm/qdbm-1.8.78-r2.ebuild4
-rw-r--r--dev-db/sqlite/sqlite-3.34.1.ebuild2
-rw-r--r--dev-db/unixODBC/unixODBC-2.3.9.ebuild2
-rw-r--r--dev-lang/bff/bff-1.0.5.ebuild4
-rw-r--r--dev-lang/mujs/mujs-1.0.9.ebuild2
-rw-r--r--dev-lang/mujs/mujs-1.1.0.ebuild2
-rw-r--r--dev-lang/perl/perl-5.30.3.ebuild2
-rw-r--r--dev-lang/python-exec-conf/python-exec-conf-2.4.6.ebuild2
-rw-r--r--dev-lang/python-exec/python-exec-2.4.6-r4.ebuild2
-rw-r--r--dev-lang/ruby/ruby-2.5.8.ebuild4
-rw-r--r--dev-lang/spidermonkey/spidermonkey-1.8.5-r9.ebuild4
-rw-r--r--dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r2.ebuild4
-rw-r--r--dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r4.ebuild4
-rw-r--r--dev-lang/tcl/tcl-8.5.17-r1.ebuild2
-rw-r--r--dev-lang/tcl/tcl-8.6.8.ebuild2
-rw-r--r--dev-lang/tk/tk-8.6.8.ebuild2
-rw-r--r--dev-lang/vala/vala-0.36.20.ebuild2
-rw-r--r--dev-lang/vala/vala-0.40.20.ebuild2
-rw-r--r--dev-lang/vala/vala-0.40.23.ebuild2
-rw-r--r--dev-lang/vala/vala-0.44.11.ebuild2
-rw-r--r--dev-lang/vala/vala-0.46.10.ebuild2
-rw-r--r--dev-lang/vala/vala-0.46.13.ebuild2
-rw-r--r--dev-lang/vala/vala-0.48.6.ebuild2
-rw-r--r--dev-lang/vala/vala-0.48.9.ebuild2
-rw-r--r--dev-libs/appstream-glib/appstream-glib-0.7.16.ebuild2
-rw-r--r--dev-libs/appstream-glib/appstream-glib-0.7.17.ebuild2
-rw-r--r--dev-libs/apr/apr-1.6.3-r4.ebuild2
-rw-r--r--dev-libs/apr/apr-1.7.0-r1.ebuild2
-rw-r--r--dev-libs/atf/atf-0.21-r2.ebuild2
-rw-r--r--dev-libs/atk/atk-2.34.1.ebuild2
-rw-r--r--dev-libs/atk/atk-2.36.0.ebuild2
-rw-r--r--dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild2
-rw-r--r--dev-libs/cgilib/cgilib-0.7-r1.ebuild4
-rw-r--r--dev-libs/check/check-0.15.2-r1.ebuild2
-rw-r--r--dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild2
-rw-r--r--dev-libs/dbus-glib/dbus-glib-0.110.ebuild2
-rw-r--r--dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild2
-rw-r--r--dev-libs/elfutils/elfutils-0.182.ebuild2
-rw-r--r--dev-libs/elfutils/elfutils-0.183.ebuild2
-rw-r--r--dev-libs/eventlog/eventlog-0.2.12.ebuild4
-rw-r--r--dev-libs/expat/expat-2.2.10.ebuild2
-rw-r--r--dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild2
-rw-r--r--dev-libs/fribidi/fribidi-1.0.9.ebuild2
-rw-r--r--dev-libs/geoip/geoip-1.6.12.ebuild2
-rw-r--r--dev-libs/glib/glib-2.66.7.ebuild2
-rw-r--r--dev-libs/gmp/gmp-6.2.1.ebuild2
-rw-r--r--dev-libs/gobject-introspection-common/gobject-introspection-common-1.62.0.ebuild2
-rw-r--r--dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild2
-rw-r--r--dev-libs/gobject-introspection/gobject-introspection-1.62.0-r1.ebuild2
-rw-r--r--dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild2
-rw-r--r--dev-libs/hiredis/hiredis-0.14.1.ebuild2
-rw-r--r--dev-libs/hiredis/hiredis-1.0.0.ebuild2
-rw-r--r--dev-libs/inih/inih-52.ebuild2
-rw-r--r--dev-libs/iniparser/iniparser-3.1-r2.ebuild2
-rw-r--r--dev-libs/iniparser/iniparser-4.1.ebuild2
-rw-r--r--dev-libs/isl/isl-0.23-r1.ebuild2
-rw-r--r--dev-libs/jansson/jansson-2.13.1-r1.ebuild4
-rw-r--r--dev-libs/jemalloc/jemalloc-5.2.1.ebuild4
-rw-r--r--dev-libs/json-c/json-c-0.15.ebuild4
-rw-r--r--dev-libs/json-glib/json-glib-1.4.4.ebuild4
-rw-r--r--dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild4
-rw-r--r--dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild2
-rw-r--r--dev-libs/kpathsea/kpathsea-6.3.2_p20200406.ebuild2
-rw-r--r--dev-libs/libaio/libaio-0.3.112.ebuild4
-rw-r--r--dev-libs/libassuan/libassuan-2.5.3.ebuild2
-rw-r--r--dev-libs/libassuan/libassuan-2.5.4.ebuild2
-rw-r--r--dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild2
-rw-r--r--dev-libs/libbsd/libbsd-0.10.0.ebuild4
-rw-r--r--dev-libs/libcbor/libcbor-0.8.0.ebuild2
-rw-r--r--dev-libs/libcroco/libcroco-0.6.13.ebuild2
-rw-r--r--dev-libs/libdaemon/libdaemon-0.14-r3.ebuild2
-rw-r--r--dev-libs/libedit/libedit-20191211.3.1.ebuild2
-rw-r--r--dev-libs/libev/libev-4.33.ebuild2
-rw-r--r--dev-libs/libevdev/libevdev-1.10.0.ebuild4
-rw-r--r--dev-libs/libevent/libevent-2.1.11.ebuild2
-rw-r--r--dev-libs/libffi/libffi-3.3-r2.ebuild2
-rw-r--r--dev-libs/libfido2/libfido2-1.5.0-r1.ebuild2
-rw-r--r--dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild2
-rw-r--r--dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild2
-rw-r--r--dev-libs/libgpg-error/libgpg-error-1.38.ebuild2
-rw-r--r--dev-libs/libgpg-error/libgpg-error-1.41.ebuild2
-rw-r--r--dev-libs/libgudev/libgudev-233-r1.ebuild4
-rw-r--r--dev-libs/libintl/libintl-0.21.ebuild2
-rw-r--r--dev-libs/libksba/libksba-1.3.5-r1.ebuild2
-rw-r--r--dev-libs/libksba/libksba-1.5.0.ebuild2
-rw-r--r--dev-libs/libltdl/libltdl-2.4.6.ebuild2
-rw-r--r--dev-libs/liblzw/liblzw-0.2-r1.ebuild4
-rw-r--r--dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild2
-rw-r--r--dev-libs/libmix/libmix-2.05-r7.ebuild2
-rw-r--r--dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild4
-rw-r--r--dev-libs/libnatspec/libnatspec-0.3.0.ebuild2
-rw-r--r--dev-libs/libnl/libnl-1.1.4-r1.ebuild2
-rw-r--r--dev-libs/libnl/libnl-3.5.0.ebuild2
-rw-r--r--dev-libs/libpcre/libpcre-8.44.ebuild2
-rw-r--r--dev-libs/libpcre2/libpcre2-10.35.ebuild2
-rw-r--r--dev-libs/libpipeline/libpipeline-1.5.2.ebuild2
-rw-r--r--dev-libs/libpipeline/libpipeline-1.5.3.ebuild2
-rw-r--r--dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild2
-rw-r--r--dev-libs/libsodium/libsodium-1.0.18.ebuild2
-rw-r--r--dev-libs/libtasn1/libtasn1-4.13.ebuild2
-rw-r--r--dev-libs/libtasn1/libtasn1-4.16.0.ebuild2
-rw-r--r--dev-libs/libtommath/libtommath-1.2.0.ebuild2
-rw-r--r--dev-libs/libunistring/libunistring-0.9.10-r1.ebuild2
-rw-r--r--dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild2
-rw-r--r--dev-libs/libuv/libuv-1.40.0.ebuild2
-rw-r--r--dev-libs/libverto/libverto-0.3.1-r1.ebuild2
-rw-r--r--dev-libs/libxml2/libxml2-2.9.10-r4.ebuild2
-rw-r--r--dev-libs/libxml2/libxml2-2.9.10-r5.ebuild2
-rw-r--r--dev-libs/libxslt/libxslt-1.1.34-r1.ebuild2
-rw-r--r--dev-libs/libyaml/libyaml-0.2.2.ebuild2
-rw-r--r--dev-libs/libyaml/libyaml-0.2.5.ebuild2
-rw-r--r--dev-libs/log4cpp/log4cpp-1.1.3.ebuild2
-rw-r--r--dev-libs/lzo/lzo-2.10.ebuild2
-rw-r--r--dev-libs/mm/mm-1.4.2-r2.ebuild4
-rw-r--r--dev-libs/mpc/mpc-1.2.1.ebuild2
-rw-r--r--dev-libs/mpfr/mpfr-4.1.0.ebuild2
-rw-r--r--dev-libs/nettle/nettle-3.6-r2.ebuild2
-rw-r--r--dev-libs/nettle/nettle-3.7.2.ebuild2
-rw-r--r--dev-libs/npth/npth-1.6-r1.ebuild2
-rw-r--r--dev-libs/nspr/nspr-4.26.ebuild2
-rw-r--r--dev-libs/nspr/nspr-4.28.ebuild2
-rw-r--r--dev-libs/nspr/nspr-4.29.ebuild2
-rw-r--r--dev-libs/nspr/nspr-4.30.ebuild2
-rw-r--r--dev-libs/nss-pem/nss-pem-1.0.7.ebuild2
-rw-r--r--dev-libs/nss/nss-3.58-r2.ebuild2
-rw-r--r--dev-libs/nss/nss-3.63.ebuild2
-rw-r--r--dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild2
-rw-r--r--dev-libs/openct/openct-0.6.20-r4.ebuild2
-rw-r--r--dev-libs/openssl/openssl-1.0.2u.ebuild4
-rw-r--r--dev-libs/openssl/openssl-1.1.1k.ebuild2
-rw-r--r--dev-libs/popt/popt-1.16-r2.ebuild2
-rw-r--r--dev-libs/popt/popt-1.18.ebuild2
-rw-r--r--dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild4
-rw-r--r--dev-libs/protobuf/protobuf-3.12.2.ebuild2
-rw-r--r--dev-libs/protobuf/protobuf-3.13.0.ebuild2
-rw-r--r--dev-libs/ptexenc/ptexenc-1.3.8_p20200406.ebuild2
-rw-r--r--dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild2
-rw-r--r--dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild2
-rw-r--r--dev-libs/vala-common/vala-common-0.48.6.ebuild2
-rw-r--r--dev-libs/vala-common/vala-common-0.48.9.ebuild4
-rw-r--r--dev-libs/wayland-protocols/wayland-protocols-1.20.ebuild4
-rw-r--r--dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild2
-rw-r--r--dev-libs/xxhash/xxhash-0.7.3.ebuild4
-rw-r--r--dev-libs/xxhash/xxhash-0.8.0.ebuild2
-rw-r--r--dev-libs/zziplib/zziplib-0.13.72.ebuild2
-rw-r--r--dev-perl/Algorithm-Diff/Algorithm-Diff-1.190.300-r1.ebuild2
-rw-r--r--dev-perl/Alien-Build/Alien-Build-2.230.0.ebuild4
-rw-r--r--dev-perl/Alien-Libxml2/Alien-Libxml2-0.160.0.ebuild4
-rw-r--r--dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.690.0-r2.ebuild2
-rw-r--r--dev-perl/App-pwhich/App-pwhich-1.160.0.ebuild2
-rw-r--r--dev-perl/Archive-Zip/Archive-Zip-1.640.0.ebuild2
-rw-r--r--dev-perl/Archive-Zip/Archive-Zip-1.680.0.ebuild4
-rw-r--r--dev-perl/Authen-PAM/Authen-PAM-0.160.0-r3.ebuild4
-rw-r--r--dev-perl/Authen-SASL/Authen-SASL-2.160.0-r2.ebuild2
-rw-r--r--dev-perl/BSD-Resource/BSD-Resource-1.291.100-r2.ebuild4
-rw-r--r--dev-perl/CGI/CGI-4.470.0.ebuild2
-rw-r--r--dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r2.ebuild2
-rw-r--r--dev-perl/Canary-Stability/Canary-Stability-2013.0.0.ebuild2
-rw-r--r--dev-perl/Capture-Tiny/Capture-Tiny-0.480.0.ebuild2
-rw-r--r--dev-perl/Class-Inspector/Class-Inspector-1.360.0.ebuild2
-rw-r--r--dev-perl/Class-Load/Class-Load-0.250.0.ebuild2
-rw-r--r--dev-perl/Class-MakeMethods/Class-MakeMethods-1.10.0-r2.ebuild4
-rw-r--r--dev-perl/Convert-ASN1/Convert-ASN1-0.270.0-r1.ebuild2
-rw-r--r--dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.190.0.ebuild2
-rw-r--r--dev-perl/Crypt-OpenSSL-Bignum/Crypt-OpenSSL-Bignum-0.90.0.ebuild2
-rw-r--r--dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.280.0-r3.ebuild2
-rw-r--r--dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.110.0.ebuild2
-rw-r--r--dev-perl/Crypt-RC4/Crypt-RC4-2.020.0-r1.ebuild2
-rw-r--r--dev-perl/Crypt-SmbHash/Crypt-SmbHash-0.120.0-r2.ebuild4
-rw-r--r--dev-perl/Curses/Curses-1.360.0.ebuild4
-rw-r--r--dev-perl/CursesWidgets/CursesWidgets-1.997.0-r2.ebuild4
-rw-r--r--dev-perl/DBD-Pg/DBD-Pg-3.7.0.ebuild2
-rw-r--r--dev-perl/DBD-SQLite/DBD-SQLite-1.560.0.ebuild2
-rw-r--r--dev-perl/DBD-SQLite/DBD-SQLite-1.580.0.ebuild2
-rw-r--r--dev-perl/DBD-SQLite/DBD-SQLite-1.660.0.ebuild2
-rw-r--r--dev-perl/DBD-mysql/DBD-mysql-4.44.0-r1.ebuild2
-rw-r--r--dev-perl/DBD-mysql/DBD-mysql-4.50.0.ebuild4
-rw-r--r--dev-perl/DBI/DBI-1.643.0.ebuild2
-rw-r--r--dev-perl/Data-OptList/Data-OptList-0.110.0.ebuild2
-rw-r--r--dev-perl/Date-Manip/Date-Manip-6.600.0.ebuild2
-rw-r--r--dev-perl/Devel-CheckBin/Devel-CheckBin-0.40.0.ebuild2
-rw-r--r--dev-perl/Devel-Hide/Devel-Hide-0.0.900.ebuild4
-rw-r--r--dev-perl/Digest-BubbleBabble/Digest-BubbleBabble-0.20.0-r1.ebuild2
-rw-r--r--dev-perl/Digest-GOST/Digest-GOST-0.60.0-r1.ebuild2
-rw-r--r--dev-perl/Digest-HMAC/Digest-HMAC-1.30.0-r1.ebuild2
-rw-r--r--dev-perl/Digest-MD4/Digest-MD4-1.900.0-r1.ebuild4
-rw-r--r--dev-perl/Digest-Perl-MD5/Digest-Perl-MD5-1.900.0.ebuild2
-rw-r--r--dev-perl/Digest-SHA1/Digest-SHA1-2.130.0-r1.ebuild2
-rw-r--r--dev-perl/Dist-CheckConflicts/Dist-CheckConflicts-0.110.0.ebuild2
-rw-r--r--dev-perl/Encode-Detect/Encode-Detect-1.10.0-r1.ebuild2
-rw-r--r--dev-perl/Encode-EUCJPASCII/Encode-EUCJPASCII-0.30.0.ebuild2
-rw-r--r--dev-perl/Encode-HanExtra/Encode-HanExtra-0.230.0-r2.ebuild2
-rw-r--r--dev-perl/Encode-Locale/Encode-Locale-1.50.0.ebuild2
-rw-r--r--dev-perl/Error/Error-0.170.250.ebuild2
-rw-r--r--dev-perl/Expect/Expect-1.350.0.ebuild4
-rw-r--r--dev-perl/ExtUtils-Config/ExtUtils-Config-0.8.0.ebuild2
-rw-r--r--dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.26.0.ebuild2
-rw-r--r--dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.11.0.ebuild2
-rw-r--r--dev-perl/ExtUtils-PkgConfig/ExtUtils-PkgConfig-1.160.0.ebuild2
-rw-r--r--dev-perl/FCGI/FCGI-0.780.0.ebuild2
-rw-r--r--dev-perl/FFI-CheckLib/FFI-CheckLib-0.250.0.ebuild4
-rw-r--r--dev-perl/File-BaseDir/File-BaseDir-0.70.0.ebuild2
-rw-r--r--dev-perl/File-DesktopEntry/File-DesktopEntry-0.220.0.ebuild2
-rw-r--r--dev-perl/File-Find-Rule/File-Find-Rule-0.340.0.ebuild2
-rw-r--r--dev-perl/File-Listing/File-Listing-6.40.0-r1.ebuild2
-rw-r--r--dev-perl/File-MimeInfo/File-MimeInfo-0.280.0.ebuild2
-rw-r--r--dev-perl/File-ShareDir-Install/File-ShareDir-Install-0.110.0.ebuild2
-rw-r--r--dev-perl/File-ShareDir/File-ShareDir-1.104.0.ebuild2
-rw-r--r--dev-perl/File-Slurp-Tiny/File-Slurp-Tiny-0.4.0.ebuild2
-rw-r--r--dev-perl/File-Slurp/File-Slurp-9999.270.0.ebuild2
-rw-r--r--dev-perl/File-Stat-Bits/File-Stat-Bits-1.10.0-r1.ebuild4
-rw-r--r--dev-perl/File-Which/File-Which-1.220.0.ebuild2
-rw-r--r--dev-perl/File-chdir/File-chdir-0.101.100.ebuild2
-rw-r--r--dev-perl/Font-TTF/Font-TTF-1.60.0-r1.ebuild2
-rw-r--r--dev-perl/GSSAPI/GSSAPI-0.280.0-r1.ebuild4
-rw-r--r--dev-perl/Geo-IP/Geo-IP-1.510.0.ebuild4
-rw-r--r--dev-perl/HTML-Clean/HTML-Clean-0.800.0-r2.ebuild4
-rw-r--r--dev-perl/HTML-Parser/HTML-Parser-3.720.0.ebuild2
-rw-r--r--dev-perl/HTML-Tagset/HTML-Tagset-3.200.0-r1.ebuild2
-rw-r--r--dev-perl/HTTP-Cookies/HTTP-Cookies-6.40.0.ebuild2
-rw-r--r--dev-perl/HTTP-Daemon/HTTP-Daemon-6.10.0-r2.ebuild2
-rw-r--r--dev-perl/HTTP-Daemon/HTTP-Daemon-6.60.0.ebuild2
-rw-r--r--dev-perl/HTTP-Date/HTTP-Date-6.20.0-r1.ebuild2
-rw-r--r--dev-perl/HTTP-Message/HTTP-Message-6.130.0.ebuild2
-rw-r--r--dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.10.0-r1.ebuild2
-rw-r--r--dev-perl/IO-HTML/IO-HTML-1.1.0.ebuild2
-rw-r--r--dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.720.0-r1.ebuild2
-rw-r--r--dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.52.0.ebuild4
-rw-r--r--dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.66.0.ebuild2
-rw-r--r--dev-perl/IO-String/IO-String-1.80.0-r1.ebuild2
-rw-r--r--dev-perl/IO-Stty/IO-Stty-0.30.0.ebuild4
-rw-r--r--dev-perl/IO-Tty/IO-Tty-1.120.0.ebuild2
-rw-r--r--dev-perl/IO-stringy/IO-stringy-2.111.0.ebuild2
-rw-r--r--dev-perl/IPC-System-Simple/IPC-System-Simple-1.250.0.ebuild2
-rw-r--r--dev-perl/Importer/Importer-0.24.0.ebuild2
-rw-r--r--dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.3.9.ebuild2
-rw-r--r--dev-perl/JSON-XS/JSON-XS-3.40.0.ebuild2
-rw-r--r--dev-perl/Jcode/Jcode-2.70.0-r1.ebuild2
-rw-r--r--dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.20.0-r1.ebuild2
-rw-r--r--dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.70.0.ebuild2
-rw-r--r--dev-perl/Locale-Maketext-Lexicon/Locale-Maketext-Lexicon-1.0.0.ebuild2
-rw-r--r--dev-perl/Locale-gettext/Locale-gettext-1.70.0.ebuild2
-rw-r--r--dev-perl/MIME-Charset/MIME-Charset-1.12.2.ebuild2
-rw-r--r--dev-perl/Mail-DKIM/Mail-DKIM-0.440.0.ebuild4
-rw-r--r--dev-perl/Mail-SPF/Mail-SPF-2.9.0-r2.ebuild4
-rw-r--r--dev-perl/MailTools/MailTools-2.190.0.ebuild2
-rw-r--r--dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild2
-rw-r--r--dev-perl/Module-Build/Module-Build-0.422.400.ebuild2
-rw-r--r--dev-perl/Module-Implementation/Module-Implementation-0.90.0.ebuild2
-rw-r--r--dev-perl/Module-Runtime/Module-Runtime-0.16.0.ebuild2
-rw-r--r--dev-perl/Mozilla-CA/Mozilla-CA-20999999.ebuild2
-rw-r--r--dev-perl/Net-CIDR-Lite/Net-CIDR-Lite-0.210.0-r1.ebuild2
-rw-r--r--dev-perl/Net-DBus/Net-DBus-1.1.0.ebuild4
-rw-r--r--dev-perl/Net-DNS-Resolver-Mock/Net-DNS-Resolver-Mock-1.201.710.310.ebuild2
-rw-r--r--dev-perl/Net-DNS-Resolver-Programmable/Net-DNS-Resolver-Programmable-0.9.0.ebuild4
-rw-r--r--dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.30.0.ebuild2
-rw-r--r--dev-perl/Net-DNS/Net-DNS-1.100.0.ebuild4
-rw-r--r--dev-perl/Net-DNS/Net-DNS-1.130.0.ebuild2
-rw-r--r--dev-perl/Net-Daemon/Net-Daemon-0.480.0-r2.ebuild2
-rw-r--r--dev-perl/Net-HTTP/Net-HTTP-6.170.0.ebuild2
-rw-r--r--dev-perl/Net-IP/Net-IP-1.260.0-r1.ebuild2
-rw-r--r--dev-perl/Net-LibIDN/Net-LibIDN-0.120.0-r2.ebuild2
-rw-r--r--dev-perl/Net-LibIDN2/Net-LibIDN2-1.0.0-r1.ebuild2
-rw-r--r--dev-perl/Net-Patricia/Net-Patricia-1.220.0-r1.ebuild4
-rw-r--r--dev-perl/Net-SMTP-SSL/Net-SMTP-SSL-1.40.0.ebuild4
-rw-r--r--dev-perl/Net-SSLeay/Net-SSLeay-1.880.0.ebuild2
-rw-r--r--dev-perl/NetAddr-IP/NetAddr-IP-4.79.0.ebuild4
-rw-r--r--dev-perl/Number-Compare/Number-Compare-0.30.0-r1.ebuild2
-rw-r--r--dev-perl/OLE-StorageLite/OLE-StorageLite-0.190.0-r1.ebuild2
-rw-r--r--dev-perl/Package-Stash-XS/Package-Stash-XS-0.280.0.ebuild2
-rw-r--r--dev-perl/Package-Stash/Package-Stash-0.370.0.ebuild2
-rw-r--r--dev-perl/Params-Util/Params-Util-1.70.0.ebuild2
-rw-r--r--dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.15.ebuild2
-rw-r--r--dev-perl/Path-Class/Path-Class-0.370.0.ebuild2
-rw-r--r--dev-perl/Path-Tiny/Path-Tiny-0.104.0.ebuild2
-rw-r--r--dev-perl/PlRPC/PlRPC-0.202.0-r3.ebuild2
-rw-r--r--dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0.ebuild4
-rw-r--r--dev-perl/Pod-Parser/Pod-Parser-1.630.0-r1.ebuild2
-rw-r--r--dev-perl/Probe-Perl/Probe-Perl-0.30.0.ebuild2
-rw-r--r--dev-perl/SGMLSpm/SGMLSpm-1.1-r1.ebuild2
-rw-r--r--dev-perl/SUPER/SUPER-1.201.411.170.ebuild2
-rw-r--r--dev-perl/Socket6/Socket6-0.280.0.ebuild2
-rw-r--r--dev-perl/Spreadsheet-ParseExcel/Spreadsheet-ParseExcel-0.650.0.ebuild2
-rw-r--r--dev-perl/Spreadsheet-WriteExcel/Spreadsheet-WriteExcel-2.400.0.ebuild2
-rw-r--r--dev-perl/String-CRC32/String-CRC32-1.600.0.ebuild2
-rw-r--r--dev-perl/Sub-Identify/Sub-Identify-0.140.0.ebuild2
-rw-r--r--dev-perl/Sub-Info/Sub-Info-0.2.0.ebuild2
-rw-r--r--dev-perl/Sub-Install/Sub-Install-0.928.0.ebuild2
-rw-r--r--dev-perl/Sub-Name/Sub-Name-0.210.0.ebuild2
-rw-r--r--dev-perl/Sub-Uplevel/Sub-Uplevel-0.280.0.ebuild2
-rw-r--r--dev-perl/Taint-Runtime/Taint-Runtime-0.30.0-r1.ebuild2
-rw-r--r--dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.310.0.ebuild4
-rw-r--r--dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.360.0.ebuild4
-rw-r--r--dev-perl/Term-Screen/Term-Screen-1.60.0.ebuild4
-rw-r--r--dev-perl/Term-ScreenColor/Term-ScreenColor-1.200.0-r1.ebuild4
-rw-r--r--dev-perl/Term-Table/Term-Table-0.8.0.ebuild2
-rw-r--r--dev-perl/TermReadKey/TermReadKey-2.370.0.ebuild2
-rw-r--r--dev-perl/Test-Deep/Test-Deep-1.126.0.ebuild2
-rw-r--r--dev-perl/Test-Deep/Test-Deep-1.127.0.ebuild2
-rw-r--r--dev-perl/Test-Exception/Test-Exception-0.430.0.ebuild2
-rw-r--r--dev-perl/Test-FailWarnings/Test-FailWarnings-0.8.0-r1.ebuild2
-rw-r--r--dev-perl/Test-Fatal/Test-Fatal-0.14.0.ebuild2
-rw-r--r--dev-perl/Test-Inter/Test-Inter-1.60.0.ebuild2
-rw-r--r--dev-perl/Test-Inter/Test-Inter-1.90.0.ebuild2
-rw-r--r--dev-perl/Test-LeakTrace/Test-LeakTrace-0.160.0.ebuild2
-rw-r--r--dev-perl/Test-MockModule/Test-MockModule-0.130.0.ebuild2
-rw-r--r--dev-perl/Test-MockRandom/Test-MockRandom-1.10.0.ebuild2
-rw-r--r--dev-perl/Test-Needs/Test-Needs-0.2.5.ebuild2
-rw-r--r--dev-perl/Test-NoWarnings/Test-NoWarnings-1.40.0-r3.ebuild2
-rw-r--r--dev-perl/Test-Requires/Test-Requires-0.100.0.ebuild2
-rw-r--r--dev-perl/Test-RequiresInternet/Test-RequiresInternet-0.50.0.ebuild2
-rw-r--r--dev-perl/Test-Script/Test-Script-1.230.0.ebuild2
-rw-r--r--dev-perl/Test-Warn/Test-Warn-0.320.0.ebuild2
-rw-r--r--dev-perl/Test2-Suite/Test2-Suite-0.0.77.ebuild2
-rw-r--r--dev-perl/Text-CSV_XS/Text-CSV_XS-1.340.0.ebuild2
-rw-r--r--dev-perl/Text-CharWidth/Text-CharWidth-0.40.0-r1.ebuild2
-rw-r--r--dev-perl/Text-Diff/Text-Diff-1.450.0.ebuild2
-rw-r--r--dev-perl/Text-Glob/Text-Glob-0.110.0.ebuild2
-rw-r--r--dev-perl/Text-Iconv/Text-Iconv-1.700.0-r2.ebuild2
-rw-r--r--dev-perl/Text-Reform/Text-Reform-1.200.0-r1.ebuild2
-rw-r--r--dev-perl/Text-Unidecode/Text-Unidecode-1.300.0.ebuild2
-rw-r--r--dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r1.ebuild2
-rw-r--r--dev-perl/Tie-IxHash/Tie-IxHash-1.230.0.ebuild2
-rw-r--r--dev-perl/TimeDate/TimeDate-2.300.0.ebuild2
-rw-r--r--dev-perl/Tk/Tk-804.33.0.ebuild4
-rw-r--r--dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.310.0.ebuild2
-rw-r--r--dev-perl/Try-Tiny/Try-Tiny-0.300.0.ebuild2
-rw-r--r--dev-perl/Types-Serialiser/Types-Serialiser-1.0.0-r1.ebuild2
-rw-r--r--dev-perl/URI/URI-1.710.0.ebuild2
-rw-r--r--dev-perl/URI/URI-1.730.0.ebuild2
-rw-r--r--dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-1.330.0-r1.ebuild2
-rw-r--r--dev-perl/Unicode-LineBreak/Unicode-LineBreak-2017.4.0-r1.ebuild4
-rw-r--r--dev-perl/Unicode-LineBreak/Unicode-LineBreak-2019.1.0.ebuild2
-rw-r--r--dev-perl/Unicode-Map/Unicode-Map-0.112.0-r1.ebuild2
-rw-r--r--dev-perl/Unicode-Map8/Unicode-Map8-0.130.0.ebuild4
-rw-r--r--dev-perl/Unicode-MapUTF8/Unicode-MapUTF8-1.110.0-r2.ebuild4
-rw-r--r--dev-perl/Unicode-String/Unicode-String-2.100.0.ebuild4
-rw-r--r--dev-perl/Unicode-UTF8/Unicode-UTF8-0.620.0.ebuild2
-rw-r--r--dev-perl/Variable-Magic/Variable-Magic-0.620.0.ebuild2
-rw-r--r--dev-perl/WWW-RobotRules/WWW-RobotRules-6.20.0-r1.ebuild2
-rw-r--r--dev-perl/X11-Protocol/X11-Protocol-0.560.0-r1.ebuild4
-rw-r--r--dev-perl/XML-Filter-BufferText/XML-Filter-BufferText-1.10.0-r1.ebuild2
-rw-r--r--dev-perl/XML-Handler-YAWriter/XML-Handler-YAWriter-0.230.0-r2.ebuild2
-rw-r--r--dev-perl/XML-LibXML/XML-LibXML-2.13.200.ebuild4
-rw-r--r--dev-perl/XML-LibXML/XML-LibXML-2.20.100.ebuild4
-rw-r--r--dev-perl/XML-NamespaceSupport/XML-NamespaceSupport-1.120.0.ebuild2
-rw-r--r--dev-perl/XML-Parser/XML-Parser-2.440.0.ebuild2
-rw-r--r--dev-perl/XML-SAX-Base/XML-SAX-Base-1.90.0.ebuild2
-rw-r--r--dev-perl/XML-SAX-Expat/XML-SAX-Expat-0.510.0.ebuild2
-rw-r--r--dev-perl/XML-SAX-Writer/XML-SAX-Writer-0.570.0.ebuild2
-rw-r--r--dev-perl/XML-SAX/XML-SAX-0.990.0-r1.ebuild2
-rw-r--r--dev-perl/XML-SAX/XML-SAX-1.0.0.ebuild2
-rw-r--r--dev-perl/XML-Simple/XML-Simple-2.250.0.ebuild2
-rw-r--r--dev-perl/XML-Twig/XML-Twig-3.520.0.ebuild4
-rw-r--r--dev-perl/XML-XPath/XML-XPath-1.420.0.ebuild2
-rw-r--r--dev-perl/YAML-LibYAML/YAML-LibYAML-0.690.0.ebuild2
-rw-r--r--dev-perl/YAML-Tiny/YAML-Tiny-1.730.0.ebuild2
-rw-r--r--dev-perl/common-sense/common-sense-3.740.0-r1.ebuild2
-rw-r--r--dev-perl/libintl-perl/libintl-perl-1.280.0.ebuild2
-rw-r--r--dev-perl/libintl-perl/libintl-perl-1.310.0.ebuild2
-rw-r--r--dev-perl/libwww-perl/libwww-perl-6.270.0.ebuild2
-rw-r--r--dev-perl/libxml-perl/libxml-perl-0.80.0-r2.ebuild2
-rw-r--r--dev-perl/perl-ldap/perl-ldap-0.650.0.ebuild4
-rw-r--r--dev-perl/prefork/prefork-1.40.0-r2.ebuild2
-rw-r--r--dev-python/Babel/Babel-2.8.1.ebuild2
-rw-r--r--dev-python/Babel/Babel-2.9.0.ebuild2
-rw-r--r--dev-python/PyContracts/PyContracts-1.8.14-r1.ebuild2
-rw-r--r--dev-python/PySocks/PySocks-1.7.1-r1.ebuild4
-rw-r--r--dev-python/alabaster/alabaster-0.7.12.ebuild4
-rw-r--r--dev-python/apipkg/apipkg-1.5-r1.ebuild4
-rw-r--r--dev-python/appdirs/appdirs-1.4.4-r1.ebuild2
-rw-r--r--dev-python/asn1crypto/asn1crypto-1.4.0.ebuild2
-rw-r--r--dev-python/attrs/attrs-20.3.0.ebuild4
-rw-r--r--dev-python/automat/automat-20.2.0.ebuild4
-rw-r--r--dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild2
-rw-r--r--dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild2
-rw-r--r--dev-python/bcrypt/bcrypt-3.2.0.ebuild2
-rw-r--r--dev-python/bleach/bleach-3.3.0.ebuild2
-rw-r--r--dev-python/breathe/breathe-4.27.0.ebuild2
-rw-r--r--dev-python/certifi/certifi-10001-r1.ebuild2
-rw-r--r--dev-python/cffi/cffi-1.14.4.ebuild2
-rw-r--r--dev-python/characteristic/characteristic-14.3.0-r3.ebuild4
-rw-r--r--dev-python/chardet/chardet-3.0.4-r1.ebuild2
-rw-r--r--dev-python/chardet/chardet-4.0.0.ebuild2
-rw-r--r--dev-python/cliff/cliff-3.7.0.ebuild2
-rw-r--r--dev-python/constantly/constantly-15.1.0-r1.ebuild4
-rw-r--r--dev-python/contextlib2/contextlib2-0.6.0_p1-r1.ebuild4
-rw-r--r--dev-python/cookies/cookies-2.2.1-r1.ebuild4
-rw-r--r--dev-python/coverage/coverage-5.4.ebuild2
-rw-r--r--dev-python/cryptography/cryptography-3.2.1.ebuild2
-rw-r--r--dev-python/cssselect/cssselect-1.1.0-r1.ebuild4
-rw-r--r--dev-python/decorator/decorator-4.4.2-r1.ebuild4
-rw-r--r--dev-python/defusedxml/defusedxml-0.7.1.ebuild2
-rw-r--r--dev-python/docutils-glep/docutils-glep-1.2.ebuild2
-rw-r--r--dev-python/docutils/docutils-0.16-r1.ebuild2
-rw-r--r--dev-python/execnet/execnet-1.8.0.ebuild2
-rw-r--r--dev-python/extras/extras-1.0.0-r1.ebuild4
-rw-r--r--dev-python/feedparser/feedparser-5.2.1-r1.ebuild4
-rw-r--r--dev-python/feedparser/feedparser-6.0.2.ebuild2
-rw-r--r--dev-python/fixtures/fixtures-3.0.0-r1.ebuild4
-rw-r--r--dev-python/flaky/flaky-3.7.0-r1.ebuild4
-rw-r--r--dev-python/freezegun/freezegun-1.1.0.ebuild2
-rw-r--r--dev-python/fs/fs-2.4.12.ebuild2
-rw-r--r--dev-python/future/future-0.18.2-r1.ebuild4
-rw-r--r--dev-python/genty/genty-1.3.2-r1.ebuild4
-rw-r--r--dev-python/gevent/gevent-21.1.2.ebuild2
-rw-r--r--dev-python/gmpy/gmpy-2.0.8-r2.ebuild4
-rw-r--r--dev-python/greenlet/greenlet-1.0.0.ebuild2
-rw-r--r--dev-python/hpack/hpack-3.0.0.ebuild4
-rw-r--r--dev-python/hpack/hpack-4.0.0.ebuild4
-rw-r--r--dev-python/html5lib/html5lib-1.1.ebuild4
-rw-r--r--dev-python/http-parser/http-parser-0.9.0.ebuild2
-rw-r--r--dev-python/hyper-h2/hyper-h2-3.2.0.ebuild4
-rw-r--r--dev-python/hyper-h2/hyper-h2-4.0.0.ebuild4
-rw-r--r--dev-python/hyperframe/hyperframe-5.2.0.ebuild4
-rw-r--r--dev-python/hyperframe/hyperframe-6.0.0.ebuild4
-rw-r--r--dev-python/hyperlink/hyperlink-21.0.0.ebuild2
-rw-r--r--dev-python/idna/idna-2.10-r1.ebuild4
-rw-r--r--dev-python/imagesize/imagesize-1.2.0.ebuild4
-rw-r--r--dev-python/importlib_resources/importlib_resources-5.1.2.ebuild2
-rw-r--r--dev-python/incremental/incremental-21.3.0.ebuild2
-rw-r--r--dev-python/inflect/inflect-5.3.0.ebuild2
-rw-r--r--dev-python/iso8601/iso8601-0.1.14.ebuild2
-rw-r--r--dev-python/jaraco-itertools/jaraco-itertools-5.0.0-r1.ebuild4
-rw-r--r--dev-python/jaraco-packaging/jaraco-packaging-8.2.0.ebuild2
-rw-r--r--dev-python/jinja/jinja-2.11.3.ebuild2
-rw-r--r--dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild2
-rw-r--r--dev-python/linecache2/linecache2-1.0.0-r1.ebuild4
-rw-r--r--dev-python/lxml/lxml-4.6.2-r1.ebuild2
-rw-r--r--dev-python/lxml/lxml-4.6.3.ebuild2
-rw-r--r--dev-python/m2crypto/m2crypto-0.35.2-r1.ebuild2
-rw-r--r--dev-python/m2r/m2r-0.2.1.ebuild4
-rw-r--r--dev-python/mako/mako-1.1.4.ebuild2
-rw-r--r--dev-python/markupsafe/markupsafe-1.1.1-r1.ebuild2
-rw-r--r--dev-python/mccabe/mccabe-0.6.1-r1.ebuild2
-rw-r--r--dev-python/mccabe/mccabe-0.6.1-r2.ebuild2
-rw-r--r--dev-python/mistune/mistune-0.8.4-r1.ebuild4
-rw-r--r--dev-python/mock/mock-4.0.3.ebuild2
-rw-r--r--dev-python/more-itertools/more-itertools-8.7.0.ebuild2
-rw-r--r--dev-python/namespace-paste/namespace-paste-1-r1.ebuild4
-rw-r--r--dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild2
-rw-r--r--dev-python/namespace-zope/namespace-zope-1-r1.ebuild2
-rw-r--r--dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild2
-rw-r--r--dev-python/nose-exclude/nose-exclude-0.5.0-r1.ebuild2
-rw-r--r--dev-python/nose/nose-1.3.7-r7.ebuild2
-rw-r--r--dev-python/packaging/packaging-20.9.ebuild2
-rw-r--r--dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild4
-rw-r--r--dev-python/parameterized/parameterized-0.8.1.ebuild2
-rw-r--r--dev-python/paste/paste-3.5.0.ebuild2
-rw-r--r--dev-python/pastedeploy/pastedeploy-2.1.1.ebuild4
-rw-r--r--dev-python/path-py/path-py-15.1.2.ebuild2
-rw-r--r--dev-python/pathlib2/pathlib2-2.3.5-r1.ebuild4
-rw-r--r--dev-python/pbr/pbr-5.5.1.ebuild4
-rw-r--r--dev-python/pep8/pep8-1.7.1.ebuild2
-rw-r--r--dev-python/ply/ply-3.11-r1.ebuild2
-rw-r--r--dev-python/pretend/pretend-1.0.9-r1.ebuild2
-rw-r--r--dev-python/priority/priority-1.3.0.ebuild4
-rw-r--r--dev-python/process-tests/process-tests-2.1.1.ebuild4
-rw-r--r--dev-python/psutil/psutil-5.7.0-r1.ebuild2
-rw-r--r--dev-python/py/py-1.10.0.ebuild2
-rw-r--r--dev-python/pyaes/pyaes-1.6.1-r2.ebuild2
-rw-r--r--dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r1.ebuild4
-rw-r--r--dev-python/pyasn1/pyasn1-0.4.8-r1.ebuild2
-rw-r--r--dev-python/pycodestyle/pycodestyle-2.6.0.ebuild2
-rw-r--r--dev-python/pycparser/pycparser-2.20-r1.ebuild2
-rw-r--r--dev-python/pydecomp/pydecomp-0.3-r1.ebuild2
-rw-r--r--dev-python/pydot/pydot-1.4.1.ebuild2
-rw-r--r--dev-python/pyelftools/pyelftools-0.27.ebuild2
-rw-r--r--dev-python/pyflakes/pyflakes-2.2.0.ebuild2
-rw-r--r--dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild2
-rw-r--r--dev-python/pygments/pygments-2.8.0.ebuild2
-rw-r--r--dev-python/pygobject/pygobject-3.34.0-r1.ebuild2
-rw-r--r--dev-python/pygobject/pygobject-3.36.1-r1.ebuild2
-rw-r--r--dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild4
-rw-r--r--dev-python/pyinotify/pyinotify-0.9.6.ebuild4
-rw-r--r--dev-python/pynacl/pynacl-1.4.0.ebuild4
-rw-r--r--dev-python/pyopenssl/pyopenssl-19.1.0-r1.ebuild4
-rw-r--r--dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild2
-rw-r--r--dev-python/pyquery/pyquery-1.4.3.ebuild4
-rw-r--r--dev-python/pyserial/pyserial-3.5.ebuild4
-rw-r--r--dev-python/pytest-cov/pytest-cov-2.11.1.ebuild2
-rw-r--r--dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild4
-rw-r--r--dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r1.ebuild2
-rw-r--r--dev-python/pytest-forked/pytest-forked-1.3.0-r1.ebuild4
-rw-r--r--dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild2
-rw-r--r--dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild2
-rw-r--r--dev-python/python-dateutil/python-dateutil-2.8.1-r2.ebuild2
-rw-r--r--dev-python/python-docs/python-docs-2.7.18.ebuild2
-rw-r--r--dev-python/python-docs/python-docs-3.6.13.ebuild2
-rw-r--r--dev-python/python-docs/python-docs-3.7.10.ebuild2
-rw-r--r--dev-python/python-docs/python-docs-3.8.8.ebuild2
-rw-r--r--dev-python/python-docs/python-docs-3.9.2.ebuild2
-rw-r--r--dev-python/python-libevdev/python-libevdev-0.9.ebuild2
-rw-r--r--dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild4
-rw-r--r--dev-python/pytz/pytz-2021.1.ebuild2
-rw-r--r--dev-python/pyxattr/pyxattr-0.7.2.ebuild2
-rw-r--r--dev-python/pyyaml/pyyaml-5.3.1-r1.ebuild2
-rw-r--r--dev-python/pyyaml/pyyaml-5.4.1.ebuild2
-rw-r--r--dev-python/regex/regex-2020.4.4-r1.ebuild2
-rw-r--r--dev-python/requests/requests-2.25.1-r1.ebuild2
-rw-r--r--dev-python/responses/responses-0.12.1.ebuild4
-rw-r--r--dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild2
-rw-r--r--dev-python/rst-linker/rst-linker-2.1.1.ebuild4
-rw-r--r--dev-python/scandir/scandir-1.10.0-r2.ebuild4
-rw-r--r--dev-python/service_identity/service_identity-18.1.0-r1.ebuild4
-rw-r--r--dev-python/setuptools-git/setuptools-git-1.2-r2.ebuild2
-rw-r--r--dev-python/setuptools/setuptools-53.1.0.ebuild2
-rw-r--r--dev-python/setuptools_scm/setuptools_scm-6.0.1.ebuild2
-rw-r--r--dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild2
-rw-r--r--dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild2
-rw-r--r--dev-python/simplejson/simplejson-3.17.2-r1.ebuild2
-rw-r--r--dev-python/six/six-1.15.0-r1.ebuild2
-rw-r--r--dev-python/snakeoil/snakeoil-0.9.2-r1.ebuild2
-rw-r--r--dev-python/snowballstemmer/snowballstemmer-2.1.0.ebuild2
-rw-r--r--dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.0.ebuild4
-rw-r--r--dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild4
-rw-r--r--dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild2
-rw-r--r--dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild4
-rw-r--r--dev-python/sphinx/sphinx-3.5.1.ebuild2
-rw-r--r--dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.5.1.ebuild2
-rw-r--r--dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild4
-rw-r--r--dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild2
-rw-r--r--dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild4
-rw-r--r--dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild2
-rw-r--r--dev-python/sqlparse/sqlparse-0.3.1.ebuild4
-rw-r--r--dev-python/sqlparse/sqlparse-0.4.1.ebuild4
-rw-r--r--dev-python/ssl-fetch/ssl-fetch-0.4.ebuild2
-rw-r--r--dev-python/stestr/stestr-2.1.0-r1.ebuild2
-rw-r--r--dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild4
-rw-r--r--dev-python/subunit/subunit-1.4.0.ebuild4
-rw-r--r--dev-python/termcolor/termcolor-1.1.0-r2.ebuild2
-rw-r--r--dev-python/testresources/testresources-2.0.1.ebuild4
-rw-r--r--dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild4
-rw-r--r--dev-python/testtools/testtools-2.4.0-r1.ebuild4
-rw-r--r--dev-python/toml/toml-0.10.2.ebuild2
-rw-r--r--dev-python/traceback2/traceback2-1.4.0-r1.ebuild4
-rw-r--r--dev-python/twisted/twisted-19.10.0.ebuild4
-rw-r--r--dev-python/twisted/twisted-20.3.0.ebuild4
-rw-r--r--dev-python/u-msgpack/u-msgpack-2.7.1.ebuild4
-rw-r--r--dev-python/unittest-or-fail/unittest-or-fail-1.ebuild2
-rw-r--r--dev-python/unittest2/unittest2-1.1.0-r1.ebuild2
-rw-r--r--dev-python/urllib3/urllib3-1.26.4.ebuild2
-rw-r--r--dev-python/voluptuous/voluptuous-0.12.1.ebuild2
-rw-r--r--dev-python/waitress/waitress-1.4.4.ebuild4
-rw-r--r--dev-python/wcwidth/wcwidth-0.2.5-r1.ebuild4
-rw-r--r--dev-python/webcolors/webcolors-1.11.1.ebuild4
-rw-r--r--dev-python/webencodings/webencodings-0.5.1-r1.ebuild4
-rw-r--r--dev-python/webob/webob-1.8.7.ebuild2
-rw-r--r--dev-python/wheel/wheel-0.36.2.ebuild2
-rw-r--r--dev-python/whoosh/whoosh-2.7.4-r1.ebuild4
-rw-r--r--dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild4
-rw-r--r--dev-python/zipp/zipp-3.4.1.ebuild2
-rw-r--r--dev-python/zope-event/zope-event-4.5.0-r1.ebuild2
-rw-r--r--dev-python/zope-interface/zope-interface-5.2.0.ebuild2
-rw-r--r--dev-python/zope-testing/zope-testing-4.9.ebuild2
-rw-r--r--dev-ruby/backports/backports-3.15.0.ebuild4
-rw-r--r--dev-ruby/builder/builder-3.2.3.ebuild2
-rw-r--r--dev-ruby/bundler/bundler-2.1.4.ebuild2
-rw-r--r--dev-ruby/childprocess/childprocess-3.0.0.ebuild4
-rw-r--r--dev-ruby/coderay/coderay-1.1.2.ebuild2
-rw-r--r--dev-ruby/did_you_mean/did_you_mean-1.2.1.ebuild2
-rw-r--r--dev-ruby/diff-lcs/diff-lcs-1.3.ebuild2
-rw-r--r--dev-ruby/gherkin/gherkin-5.1.0.ebuild4
-rw-r--r--dev-ruby/json/json-2.3.0.ebuild2
-rw-r--r--dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild2
-rw-r--r--dev-ruby/minitest/minitest-4.7.5-r2.ebuild2
-rw-r--r--dev-ruby/minitest/minitest-5.11.3.ebuild2
-rw-r--r--dev-ruby/multi_json/multi_json-1.14.1.ebuild2
-rw-r--r--dev-ruby/multi_test/multi_test-0.1.2.ebuild4
-rw-r--r--dev-ruby/nokogiri/nokogiri-1.11.1-r1.ebuild2
-rw-r--r--dev-ruby/power_assert/power_assert-1.1.5.ebuild2
-rw-r--r--dev-ruby/racc/racc-1.4.14.ebuild2
-rw-r--r--dev-ruby/rake/rake-12.3.3.ebuild2
-rw-r--r--dev-ruby/rdoc/rdoc-6.1.2.ebuild2
-rw-r--r--dev-ruby/rexical/rexical-1.0.7.ebuild2
-rw-r--r--dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild2
-rw-r--r--dev-ruby/rspec-core/rspec-core-3.8.2.ebuild2
-rw-r--r--dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild2
-rw-r--r--dev-ruby/rspec-expectations/rspec-expectations-3.8.4.ebuild2
-rw-r--r--dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild2
-rw-r--r--dev-ruby/rspec-mocks/rspec-mocks-3.8.1.ebuild2
-rw-r--r--dev-ruby/rspec-support/rspec-support-3.8.2.ebuild2
-rw-r--r--dev-ruby/rspec/rspec-2.99.0.ebuild2
-rw-r--r--dev-ruby/rspec/rspec-3.8.0.ebuild4
-rw-r--r--dev-ruby/rubygems/rubygems-2.7.10.ebuild2
-rw-r--r--dev-ruby/syntax/syntax-1.2.2.ebuild2
-rw-r--r--dev-ruby/test-unit/test-unit-3.3.3.ebuild2
-rw-r--r--dev-ruby/thread_order/thread_order-1.1.1.ebuild2
-rw-r--r--dev-ruby/xmlrpc/xmlrpc-0.3.0.ebuild2
-rw-r--r--dev-ruby/yajl-ruby/yajl-ruby-1.4.1.ebuild2
-rw-r--r--dev-scheme/guile/guile-1.8.8-r3.ebuild2
-rw-r--r--dev-scheme/guile/guile-2.0.14-r3.ebuild2
-rw-r--r--dev-scheme/guile/guile-2.2.6.ebuild2
-rw-r--r--dev-scheme/guile/guile-2.2.7.ebuild2
-rw-r--r--dev-tcltk/blt/blt-2.4z-r13.ebuild2
-rw-r--r--dev-tcltk/expect/expect-5.45.4.ebuild2
-rw-r--r--dev-tcltk/tcllib/tcllib-1.20.ebuild4
-rw-r--r--dev-tcltk/tdom/tdom-0.8.3-r4.ebuild4
-rw-r--r--dev-tcltk/tdom/tdom-0.9.1.ebuild4
-rw-r--r--dev-tcltk/tix/tix-8.4.3-r1.ebuild2
-rw-r--r--dev-tex/bibtexu/bibtexu-3.71_p20200406.ebuild2
-rw-r--r--dev-tex/glossaries/glossaries-4.41.ebuild2
-rw-r--r--dev-tex/latex-beamer/latex-beamer-3.59.ebuild2
-rw-r--r--dev-tex/latex-beamer/latex-beamer-3.60.ebuild2
-rw-r--r--dev-tex/latex-beamer/latex-beamer-3.61.ebuild2
-rw-r--r--dev-tex/latexdiff/latexdiff-1.3.1.1.ebuild2
-rw-r--r--dev-tex/latexmk/latexmk-456.ebuild2
-rw-r--r--dev-tex/pgf/pgf-3.1.4b-r2.ebuild2
-rw-r--r--dev-texlive/texlive-basic/texlive-basic-2020-r1.ebuild2
-rw-r--r--dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2020.ebuild2
-rw-r--r--dev-texlive/texlive-context/texlive-context-2020.ebuild2
-rw-r--r--dev-texlive/texlive-fontsextra/texlive-fontsextra-2020.ebuild2
-rw-r--r--dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2020.ebuild2
-rw-r--r--dev-texlive/texlive-fontutils/texlive-fontutils-2020.ebuild2
-rw-r--r--dev-texlive/texlive-formatsextra/texlive-formatsextra-2020-r2.ebuild2
-rw-r--r--dev-texlive/texlive-games/texlive-games-2020.ebuild2
-rw-r--r--dev-texlive/texlive-humanities/texlive-humanities-2020.ebuild2
-rw-r--r--dev-texlive/texlive-langarabic/texlive-langarabic-2020.ebuild2
-rw-r--r--dev-texlive/texlive-langchinese/texlive-langchinese-2020.ebuild2
-rw-r--r--dev-texlive/texlive-langcjk/texlive-langcjk-2020.ebuild2
-rw-r--r--dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2020.ebuild2
-rw-r--r--dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2020.ebuild2
-rw-r--r--dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2021.ebuild2
-rw-r--r--dev-texlive/texlive-langenglish/texlive-langenglish-2020.ebuild2
-rw-r--r--dev-texlive/texlive-langeuropean/texlive-langeuropean-2020.ebuild2
-rw-r--r--dev-texlive/texlive-langfrench/texlive-langfrench-2020.ebuild2
-rw-r--r--dev-texlive/texlive-langgerman/texlive-langgerman-2020.ebuild2
-rw-r--r--dev-texlive/texlive-langgreek/texlive-langgreek-2020.ebuild2
-rw-r--r--dev-texlive/texlive-langitalian/texlive-langitalian-2020.ebuild2
-rw-r--r--dev-texlive/texlive-langjapanese/texlive-langjapanese-2020.ebuild2
-rw-r--r--dev-texlive/texlive-langkorean/texlive-langkorean-2020.ebuild2
-rw-r--r--dev-texlive/texlive-langother/texlive-langother-2020.ebuild2
-rw-r--r--dev-texlive/texlive-langpolish/texlive-langpolish-2020.ebuild2
-rw-r--r--dev-texlive/texlive-langportuguese/texlive-langportuguese-2020.ebuild2
-rw-r--r--dev-texlive/texlive-langspanish/texlive-langspanish-2020.ebuild2
-rw-r--r--dev-texlive/texlive-latex/texlive-latex-2020.ebuild2
-rw-r--r--dev-texlive/texlive-latexextra/texlive-latexextra-2020-r2.ebuild2
-rw-r--r--dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2020.ebuild2
-rw-r--r--dev-texlive/texlive-luatex/texlive-luatex-2020-r2.ebuild2
-rw-r--r--dev-texlive/texlive-mathscience/texlive-mathscience-2020.ebuild2
-rw-r--r--dev-texlive/texlive-metapost/texlive-metapost-2020-r1.ebuild2
-rw-r--r--dev-texlive/texlive-music/texlive-music-2020.ebuild2
-rw-r--r--dev-texlive/texlive-pictures/texlive-pictures-2020-r2.ebuild2
-rw-r--r--dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2020.ebuild2
-rw-r--r--dev-texlive/texlive-pstricks/texlive-pstricks-2020.ebuild2
-rw-r--r--dev-texlive/texlive-publishers/texlive-publishers-2020.ebuild2
-rw-r--r--dev-texlive/texlive-xetex/texlive-xetex-2020.ebuild2
-rw-r--r--dev-util/aruba/aruba-0.6.2-r2.ebuild4
-rw-r--r--dev-util/byacc/byacc-20200330.ebuild2
-rw-r--r--dev-util/byacc/byacc-20200910.ebuild2
-rw-r--r--dev-util/catalyst/catalyst-3.0.17.ebuild2
-rw-r--r--dev-util/ccache/ccache-4.2.ebuild2
-rw-r--r--dev-util/cgvg/cgvg-1.6.3.ebuild2
-rw-r--r--dev-util/cmake/cmake-3.18.5.ebuild2
-rw-r--r--dev-util/colm/colm-0.13.0.7.ebuild2
-rw-r--r--dev-util/colm/colm-0.14.7.ebuild2
-rw-r--r--dev-util/cppunit/cppunit-1.14.0.ebuild2
-rw-r--r--dev-util/cppunit/cppunit-1.15.1-r2.ebuild2
-rw-r--r--dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild4
-rw-r--r--dev-util/cscope/cscope-15.8a-r1.ebuild4
-rw-r--r--dev-util/ctags/ctags-20190331.ebuild2
-rw-r--r--dev-util/cucumber-core/cucumber-core-3.2.1.ebuild4
-rw-r--r--dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild4
-rw-r--r--dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild4
-rw-r--r--dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild4
-rw-r--r--dev-util/cucumber/cucumber-3.1.2.ebuild4
-rw-r--r--dev-util/cunit/cunit-2.1_p3.ebuild4
-rw-r--r--dev-util/dejagnu/dejagnu-1.6.2.ebuild2
-rw-r--r--dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild2
-rw-r--r--dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild2
-rw-r--r--dev-util/dialog/dialog-1.3.20170131.ebuild4
-rw-r--r--dev-util/dialog/dialog-1.3.20200327.ebuild4
-rw-r--r--dev-util/diffstat/diffstat-1.63.ebuild2
-rw-r--r--dev-util/diffstat/diffstat-1.64.ebuild2
-rw-r--r--dev-util/gdbus-codegen/gdbus-codegen-2.66.7.ebuild2
-rw-r--r--dev-util/glib-utils/glib-utils-2.66.7.ebuild2
-rw-r--r--dev-util/gob/gob-2.0.20.ebuild4
-rw-r--r--dev-util/gperf/gperf-3.1.ebuild2
-rw-r--r--dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild2
-rw-r--r--dev-util/gtk-doc-am/gtk-doc-am-1.33.1.ebuild2
-rw-r--r--dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild2
-rw-r--r--dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild2
-rw-r--r--dev-util/gtk-doc/gtk-doc-1.33.1-r4.ebuild2
-rw-r--r--dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.20.ebuild2
-rw-r--r--dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild2
-rw-r--r--dev-util/indent/indent-2.2.12.ebuild2
-rw-r--r--dev-util/intltool/intltool-0.51.0-r2.ebuild2
-rw-r--r--dev-util/itstool/itstool-2.0.6-r1.ebuild4
-rw-r--r--dev-util/kyua/kyua-0.13-r2.ebuild4
-rw-r--r--dev-util/meson-format-array/meson-format-array-0.ebuild2
-rw-r--r--dev-util/meson/meson-0.55.3.ebuild2
-rw-r--r--dev-util/meson/meson-0.56.2.ebuild2
-rw-r--r--dev-util/ninja/ninja-1.10.0.ebuild2
-rw-r--r--dev-util/ninja/ninja-1.10.1.ebuild2
-rw-r--r--dev-util/ninja/ninja-9999.ebuild2
-rw-r--r--dev-util/patchutils/patchutils-0.3.4.ebuild4
-rw-r--r--dev-util/pkgconf/pkgconf-1.6.3.ebuild4
-rw-r--r--dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild2
-rw-r--r--dev-util/pkgconfig/pkgconfig-0.29.2.ebuild2
-rw-r--r--dev-util/ragel/ragel-6.10.ebuild2
-rw-r--r--dev-util/ragel/ragel-7.0.0.12.ebuild2
-rw-r--r--dev-util/ragel/ragel-7.0.4.ebuild2
-rw-r--r--dev-util/re2c/re2c-2.0.3.ebuild2
-rw-r--r--dev-util/sel/sel-0.08.4-r2.ebuild2
-rw-r--r--dev-util/shadowman/shadowman-2.ebuild4
-rw-r--r--dev-util/shflags/shflags-1.0.3.ebuild4
-rw-r--r--dev-util/shflags/shflags-1.2.3.ebuild4
-rw-r--r--dev-util/shtool/shtool-2.0.8-r1.ebuild4
-rw-r--r--dev-util/strace/strace-5.8.ebuild4
-rw-r--r--dev-util/systemtap/systemtap-4.0-r1.ebuild2
-rw-r--r--dev-util/treecc/treecc-0.3.10-r1.ebuild4
-rw-r--r--dev-util/unifdef/unifdef-2.10.ebuild4
-rw-r--r--dev-util/yacc/yacc-1.9.1-r6.ebuild4
-rw-r--r--dev-vcs/cvs/cvs-1.12.12-r13.ebuild2
-rw-r--r--dev-vcs/cvsps/cvsps-2.2_beta1-r1.ebuild2
-rw-r--r--dev-vcs/cvsps/cvsps-3.13-r2.ebuild2
-rw-r--r--dev-vcs/git/git-2.26.2.ebuild2
-rw-r--r--dev-vcs/git/git-2.26.3.ebuild2
-rw-r--r--games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild8
-rw-r--r--games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild8
-rw-r--r--games-emulation/pcsx2/pcsx2-9999.ebuild5
-rw-r--r--games-misc/games-envd/games-envd-0.ebuild2
-rw-r--r--games-strategy/megaglest/megaglest-3.11.1-r100.ebuild6
-rw-r--r--games-strategy/megaglest/megaglest-3.13.0.ebuild6
-rw-r--r--gnome-base/dconf/dconf-0.34.0.ebuild4
-rw-r--r--gnome-base/dconf/dconf-0.36.0.ebuild4
-rw-r--r--gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.34.0.ebuild4
-rw-r--r--gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.36.1.ebuild4
-rw-r--r--gnome-base/librsvg/librsvg-2.40.21.ebuild2
-rw-r--r--gnome-extra/yelp-xsl/yelp-xsl-3.36.1.ebuild2
-rw-r--r--mail-filter/maildrop/maildrop-3.0.0.ebuild4
-rw-r--r--mail-filter/procmail/procmail-3.22-r14.ebuild2
-rw-r--r--mail-filter/spamassassin/spamassassin-3.4.4-r4.ebuild4
-rw-r--r--mail-mta/courier/courier-1.0.14.ebuild2
-rw-r--r--mail-mta/courier/courier-1.0.5.ebuild2
-rw-r--r--mail-mta/ssmtp/ssmtp-2.64-r3.ebuild2
-rw-r--r--media-fonts/aquafont/aquafont-2.7-r4.ebuild2
-rw-r--r--media-fonts/aquapfont/aquapfont-2.6-r2.ebuild2
-rw-r--r--media-fonts/arabeyes-fonts/arabeyes-fonts-2.0-r1.ebuild2
-rw-r--r--media-fonts/arkpandora/arkpandora-2.04.ebuild2
-rw-r--r--media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild2
-rw-r--r--media-fonts/artwiz-aleczapka-en/artwiz-aleczapka-en-1.3.ebuild2
-rw-r--r--media-fonts/artwiz-latin1/artwiz-latin1-1.1.ebuild4
-rw-r--r--media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild2
-rw-r--r--media-fonts/cantarell/cantarell-0.201.ebuild2
-rw-r--r--media-fonts/cheapskatefonts/cheapskatefonts-1.0.ebuild4
-rw-r--r--media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild4
-rw-r--r--media-fonts/culmus/culmus-0.120-r5.ebuild2
-rw-r--r--media-fonts/culmus/culmus-0.133-r1.ebuild2
-rw-r--r--media-fonts/dejavu/dejavu-2.37.ebuild2
-rw-r--r--media-fonts/efont-unicode/efont-unicode-0.4.2-r1.ebuild4
-rw-r--r--media-fonts/encodings/encodings-1.0.5-r1.ebuild2
-rw-r--r--media-fonts/farsi-fonts/farsi-fonts-0.4.ebuild2
-rw-r--r--media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r2.ebuild4
-rw-r--r--media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r2.ebuild4
-rw-r--r--media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r2.ebuild4
-rw-r--r--media-fonts/font-alias/font-alias-1.0.4.ebuild2
-rw-r--r--media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-bh-type1/font-bh-type1-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r2.ebuild4
-rw-r--r--media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-dec-misc/font-dec-misc-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-isas-misc/font-isas-misc-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-jis-misc/font-jis-misc-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-micro-misc/font-micro-misc-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.4.ebuild4
-rw-r--r--media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-misc-misc/font-misc-misc-1.1.2-r2.ebuild2
-rw-r--r--media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r2.ebuild4
-rw-r--r--media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r2.ebuild4
-rw-r--r--media-fonts/font-sony-misc/font-sony-misc-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-sun-misc/font-sun-misc-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-util/font-util-1.3.2-r1.ebuild2
-rw-r--r--media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r2.ebuild4
-rw-r--r--media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r2.ebuild4
-rw-r--r--media-fonts/free-bangla-font/free-bangla-font-0.2.ebuild4
-rw-r--r--media-fonts/freefonts/freefonts-0.10-r4.ebuild4
-rw-r--r--media-fonts/fs-fonts/fs-fonts-0.1_alpha3.ebuild2
-rw-r--r--media-fonts/hunkyfonts/hunkyfonts-0.3.1.ebuild4
-rw-r--r--media-fonts/intlfonts/intlfonts-1.2.1-r1.ebuild4
-rw-r--r--media-fonts/intlfonts/intlfonts-1.4.1.ebuild2
-rw-r--r--media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild4
-rw-r--r--media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild2
-rw-r--r--media-fonts/jisx0213-fonts/jisx0213-fonts-20040425-r2.ebuild2
-rw-r--r--media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild2
-rw-r--r--media-fonts/konfont/konfont-0.1.ebuild4
-rw-r--r--media-fonts/lfpfonts-fix/lfpfonts-fix-0.83-r2.ebuild4
-rw-r--r--media-fonts/lfpfonts-var/lfpfonts-var-0.84.ebuild4
-rw-r--r--media-fonts/lohit-assamese/lohit-assamese-2.91.5.ebuild2
-rw-r--r--media-fonts/lohit-bengali/lohit-bengali-2.91.5.ebuild2
-rw-r--r--media-fonts/lohit-devanagari/lohit-devanagari-2.95.4.ebuild2
-rw-r--r--media-fonts/lohit-fonts/lohit-fonts-2.20150220.ebuild2
-rw-r--r--media-fonts/lohit-gujarati/lohit-gujarati-2.92.4.ebuild2
-rw-r--r--media-fonts/lohit-gurmukhi/lohit-gurmukhi-2.91.2.ebuild2
-rw-r--r--media-fonts/lohit-kannada/lohit-kannada-2.5.4.ebuild2
-rw-r--r--media-fonts/lohit-malayalam/lohit-malayalam-2.92.2.ebuild2
-rw-r--r--media-fonts/lohit-marathi/lohit-marathi-2.94.2.ebuild2
-rw-r--r--media-fonts/lohit-nepali/lohit-nepali-2.94.2.ebuild2
-rw-r--r--media-fonts/lohit-odia/lohit-odia-2.91.2.ebuild2
-rw-r--r--media-fonts/lohit-tamil-classical/lohit-tamil-classical-2.5.4.ebuild2
-rw-r--r--media-fonts/lohit-tamil/lohit-tamil-2.91.3.ebuild2
-rw-r--r--media-fonts/lohit-telugu/lohit-telugu-2.5.5.ebuild2
-rw-r--r--media-fonts/mikachan-font-otf/mikachan-font-otf-9.1-r1.ebuild4
-rw-r--r--media-fonts/mikachan-font-ttc/mikachan-font-ttc-9.1.ebuild4
-rw-r--r--media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r2.ebuild4
-rw-r--r--media-fonts/monafont/monafont-2.90-r2.ebuild2
-rw-r--r--media-fonts/mplus-fonts/mplus-fonts-2.2.4-r1.ebuild2
-rw-r--r--media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild2
-rw-r--r--media-fonts/pcf2bdf/pcf2bdf-1.04-r1.ebuild4
-rw-r--r--media-fonts/sazanami/sazanami-20040629.ebuild2
-rw-r--r--media-fonts/sgi-fonts/sgi-fonts-1.0.ebuild4
-rw-r--r--media-fonts/shinonome/shinonome-0.9.11.ebuild4
-rw-r--r--media-fonts/sil-charis/sil-charis-5.000-r1.ebuild2
-rw-r--r--media-fonts/sil-doulos/sil-doulos-5.000-r1.ebuild2
-rw-r--r--media-fonts/sil-ezra/sil-ezra-2.51.ebuild4
-rw-r--r--media-fonts/sil-galatia/sil-galatia-2.1.ebuild4
-rw-r--r--media-fonts/sil-gentium/sil-gentium-5.000-r1.ebuild2
-rw-r--r--media-fonts/sil-padauk/sil-padauk-2.8-r1.ebuild2
-rw-r--r--media-fonts/tengwar-fonts/tengwar-fonts-1.9d.ebuild4
-rw-r--r--media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild4
-rw-r--r--media-fonts/ttf-bitstream-vera/ttf-bitstream-vera-1.10-r3.ebuild2
-rw-r--r--media-fonts/unfonts-extra/unfonts-extra-1.0.2_pre080608-r1.ebuild4
-rw-r--r--media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild4
-rw-r--r--media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild2
-rw-r--r--media-fonts/urwvn-fonts/urwvn-fonts-3.05.ebuild2
-rw-r--r--media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r4.ebuild2
-rw-r--r--media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild4
-rw-r--r--media-gfx/ebdftopcf/ebdftopcf-2.ebuild2
-rw-r--r--media-gfx/fontforge/fontforge-20200314.ebuild2
-rw-r--r--media-gfx/graphite2/graphite2-1.3.14.ebuild2
-rw-r--r--media-gfx/graphviz/graphviz-2.44.1-r1.ebuild2
-rw-r--r--media-gfx/transfig/transfig-3.2.5e-r1.ebuild2
-rw-r--r--media-libs/aalib/aalib-1.4_rc5-r9.ebuild2
-rw-r--r--media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild2
-rw-r--r--media-libs/freetype/freetype-2.10.4.ebuild2
-rw-r--r--media-libs/ftgl/ftgl-2.1.3_rc5.ebuild4
-rw-r--r--media-libs/gd/gd-2.3.0.ebuild2
-rw-r--r--media-libs/gd/gd-2.3.1.ebuild2
-rw-r--r--media-libs/giflib/giflib-5.2.1-r1.ebuild2
-rw-r--r--media-libs/glu/glu-9.0.1.ebuild4
-rw-r--r--media-libs/imlib2/imlib2-1.6.1.ebuild2
-rw-r--r--media-libs/jbig2dec/jbig2dec-0.18.ebuild2
-rw-r--r--media-libs/jbigkit/jbigkit-2.1.ebuild2
-rw-r--r--media-libs/lcms/lcms-2.11.ebuild2
-rw-r--r--media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild2
-rw-r--r--media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild4
-rw-r--r--media-libs/libggi/libggi-2.2.2-r1.ebuild4
-rw-r--r--media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild2
-rw-r--r--media-libs/libpng/libpng-1.6.37-r2.ebuild2
-rw-r--r--media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild2
-rw-r--r--media-libs/libuninameslist/libuninameslist-20091231-r1.ebuild2
-rw-r--r--media-libs/libv4l/libv4l-1.20.0.ebuild2
-rw-r--r--media-libs/libwebp/libwebp-1.1.0.ebuild2
-rw-r--r--media-libs/netpbm/netpbm-10.76.00.ebuild4
-rw-r--r--media-libs/openjpeg/openjpeg-2.4.0.ebuild2
-rw-r--r--media-libs/tiff/tiff-4.2.0.ebuild2
-rw-r--r--media-libs/urt/urt-3.1b-r3.ebuild2
-rw-r--r--media-radio/tqsl/tqsl-2.5.1.ebuild26
-rw-r--r--media-sound/rplay/rplay-3.3.2-r3.ebuild4
-rw-r--r--media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild4
-rw-r--r--net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild2
-rw-r--r--net-analyzer/netcat/netcat-110-r9.ebuild2
-rw-r--r--net-analyzer/netselect/netselect-0.4-r1.ebuild2
-rw-r--r--net-analyzer/ngrep/ngrep-1.47.ebuild4
-rw-r--r--net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild4
-rw-r--r--net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild2
-rw-r--r--net-analyzer/tcpdump/tcpdump-4.99.0.ebuild2
-rw-r--r--net-analyzer/traceroute/traceroute-2.1.0.ebuild4
-rw-r--r--net-dialup/linux-atm/linux-atm-2.5.2.ebuild4
-rw-r--r--net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild4
-rw-r--r--net-dialup/mgetty/mgetty-1.2.1-r1.ebuild2
-rw-r--r--net-dialup/minicom/minicom-2.7.1.ebuild2
-rw-r--r--net-dns/c-ares/c-ares-1.17.1.ebuild2
-rw-r--r--net-dns/idnkit/idnkit-1.0-r2.ebuild4
-rw-r--r--net-dns/idnkit/idnkit-2.3.ebuild4
-rw-r--r--net-dns/libidn/libidn-1.36.ebuild2
-rw-r--r--net-dns/libidn2/libidn2-2.3.0.ebuild2
-rw-r--r--net-firewall/iptables/iptables-1.8.5.ebuild4
-rw-r--r--net-fs/libnfs/libnfs-4.0.0.ebuild4
-rw-r--r--net-fs/nfs-utils/nfs-utils-2.5.1.ebuild4
-rw-r--r--net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild4
-rw-r--r--net-ftp/ftpbase/ftpbase-0.01-r4.ebuild2
-rw-r--r--net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild4
-rw-r--r--net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild4
-rw-r--r--net-irc/irssi/irssi-1.2.2-r1.ebuild2
-rw-r--r--net-libs/c-client/c-client-2007f-r6.ebuild4
-rw-r--r--net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild4
-rw-r--r--net-libs/courier-authlib/courier-authlib-0.71.0.ebuild4
-rw-r--r--net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild4
-rw-r--r--net-libs/courier-unicode/courier-unicode-2.1.ebuild4
-rw-r--r--net-libs/glib-networking/glib-networking-2.62.4.ebuild2
-rw-r--r--net-libs/glib-networking/glib-networking-2.64.3.ebuild2
-rw-r--r--net-libs/gnutls/gnutls-3.6.15.ebuild2
-rw-r--r--net-libs/ldns/ldns-1.7.1-r1.ebuild4
-rw-r--r--net-libs/libgsasl/libgsasl-1.10.0.ebuild2
-rw-r--r--net-libs/libgssglue/libgssglue-0.4-r1.ebuild4
-rw-r--r--net-libs/liblockfile/liblockfile-1.16.ebuild2
-rw-r--r--net-libs/libmnl/libmnl-1.0.4.ebuild4
-rw-r--r--net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild2
-rw-r--r--net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild2
-rw-r--r--net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild4
-rw-r--r--net-libs/libnfsidmap/libnfsidmap-0.27.ebuild4
-rw-r--r--net-libs/libnsl/libnsl-0-r1.ebuild4
-rw-r--r--net-libs/libnsl/libnsl-1.3.0-r1.ebuild4
-rw-r--r--net-libs/libntlm/libntlm-1.6.ebuild4
-rw-r--r--net-libs/libpcap/libpcap-1.10.0.ebuild2
-rw-r--r--net-libs/libpsl/libpsl-0.21.0.ebuild4
-rw-r--r--net-libs/librsync/librsync-2.3.1.ebuild2
-rw-r--r--net-libs/libsmi/libsmi-0.5.0-r1.ebuild4
-rw-r--r--net-libs/libsoup/libsoup-2.70.0.ebuild4
-rw-r--r--net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild2
-rw-r--r--net-libs/libtirpc/libtirpc-1.2.6.ebuild4
-rw-r--r--net-libs/miniupnpc/miniupnpc-2.2.1.ebuild2
-rw-r--r--net-libs/nghttp2/nghttp2-1.41.0.ebuild4
-rw-r--r--net-libs/rest/rest-0.8.1.ebuild4
-rw-r--r--net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild4
-rw-r--r--net-libs/rpcsvc-proto/rpcsvc-proto-1.4.2.ebuild4
-rw-r--r--net-mail/autorespond/autorespond-2.0.4.ebuild4
-rw-r--r--net-mail/checkpassword/checkpassword-0.90-r4.ebuild4
-rw-r--r--net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild4
-rw-r--r--net-mail/courier-imap/courier-imap-5.0.7.ebuild4
-rw-r--r--net-mail/dot-forward/dot-forward-0.71-r4.ebuild4
-rw-r--r--net-mail/dovecot/dovecot-2.3.13-r100.ebuild2
-rw-r--r--net-mail/fetchmail/fetchmail-6.4.8.ebuild2
-rw-r--r--net-mail/mailbase/mailbase-1.5-r2.ebuild2
-rw-r--r--net-mail/metamail/metamail-2.7.53.3-r2.ebuild4
-rw-r--r--net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild2
-rw-r--r--net-mail/queue-fix/queue-fix-1.4-r3.ebuild4
-rw-r--r--net-mail/queue-repair/queue-repair-0.9.0-r2.ebuild4
-rw-r--r--net-mail/randomsig/randomsig-1.10.0.ebuild4
-rw-r--r--net-mail/smtptools/smtptools-0.2.3-r1.ebuild4
-rw-r--r--net-misc/curl/curl-7.74.0-r2.ebuild2
-rw-r--r--net-misc/dhcpcd/dhcpcd-8.1.9-r1.ebuild2
-rw-r--r--net-misc/dhcpcd/dhcpcd-9.3.4.ebuild2
-rw-r--r--net-misc/dropbear/dropbear-2020.81-r2.ebuild2
-rw-r--r--net-misc/ethertypes/ethertypes-0.ebuild2
-rw-r--r--net-misc/htpdate/htpdate-1.2.2.ebuild2
-rw-r--r--net-misc/ipcalc/ipcalc-0.42_p2.ebuild2
-rw-r--r--net-misc/iputils/iputils-20190709-r1.ebuild2
-rw-r--r--net-misc/iputils/iputils-20200821-r2.ebuild2
-rw-r--r--net-misc/jwhois/jwhois-4.0-r1.ebuild4
-rw-r--r--net-misc/keychain/keychain-2.8.5.ebuild2
-rw-r--r--net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild2
-rw-r--r--net-misc/memcached/memcached-1.6.9.ebuild2
-rw-r--r--net-misc/netdate/netdate-1.2-r1.ebuild4
-rw-r--r--net-misc/netifrc/netifrc-0.7.1-r1.ebuild4
-rw-r--r--net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild4
-rw-r--r--net-misc/netkit-rsh/netkit-rsh-0.17-r11.ebuild2
-rw-r--r--net-misc/ntp/ntp-4.2.8_p15.ebuild2
-rw-r--r--net-misc/openntpd/openntpd-6.2_p3-r2.ebuild4
-rw-r--r--net-misc/openssh/openssh-8.4_p1-r3.ebuild2
-rw-r--r--net-misc/openssh/openssh-8.5_p1-r1.ebuild2
-rw-r--r--net-misc/pipes/pipes-1.16.1-r1.ebuild4
-rw-r--r--net-misc/rsync/rsync-3.2.3-r2.ebuild2
-rw-r--r--net-misc/suite3270/suite3270-4.0_p13.ebuild2
-rw-r--r--net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild4
-rw-r--r--net-misc/unix2tcp/unix2tcp-0.8.2-r1.ebuild4
-rw-r--r--net-misc/wget/wget-1.20.3-r3.ebuild2
-rw-r--r--net-misc/whois/whois-5.5.6-r1.ebuild4
-rw-r--r--net-nds/rpcbind/rpcbind-1.2.5.ebuild4
-rw-r--r--net-print/cups-filters/cups-filters-1.28.3.ebuild2
-rw-r--r--net-print/cups-filters/cups-filters-1.28.7.ebuild2
-rw-r--r--net-print/cups-windows/cups-windows-6.0-r1.ebuild4
-rw-r--r--net-print/cups/cups-2.3.3-r2.ebuild2
-rw-r--r--net-proxy/dante/dante-1.4.1-r2.ebuild4
-rw-r--r--perl-core/File-Temp/File-Temp-0.230.900.ebuild2
-rw-r--r--perl-core/IO-Zlib/IO-Zlib-1.100.0.ebuild2
-rw-r--r--profiles/arch/s390/make.defaults4
-rw-r--r--profiles/arch/s390/package.use.stable.mask7
-rw-r--r--profiles/arches.desc2
-rw-r--r--sci-calculators/pcalc/pcalc-3-r1.ebuild4
-rw-r--r--sci-libs/libcerf/libcerf-1.5.ebuild2
-rw-r--r--sci-libs/mpir/mpir-3.0.0.ebuild2
-rw-r--r--sys-apps/acl/acl-2.2.53-r1.ebuild2
-rw-r--r--sys-apps/attr/attr-2.4.48-r4.ebuild4
-rw-r--r--sys-apps/baselayout/baselayout-2.4.1-r2.ebuild4
-rw-r--r--sys-apps/baselayout/baselayout-2.7.ebuild4
-rw-r--r--sys-apps/busybox/busybox-1.32.1.ebuild2
-rw-r--r--sys-apps/coreutils/coreutils-8.31-r1.ebuild4
-rw-r--r--sys-apps/coreutils/coreutils-8.32-r1.ebuild4
-rw-r--r--sys-apps/cpint/cpint-2.5.3.ebuild4
-rw-r--r--sys-apps/cracklib-words/cracklib-words-2.9.6.ebuild4
-rw-r--r--sys-apps/daisydog/daisydog-2014.05.30.ebuild4
-rw-r--r--sys-apps/debianutils/debianutils-4.11.1.ebuild4
-rw-r--r--sys-apps/debianutils/debianutils-4.11.2.ebuild2
-rw-r--r--sys-apps/diffutils/diffutils-3.7-r1.ebuild2
-rw-r--r--sys-apps/dmapi/dmapi-2.2.12-r1.ebuild4
-rw-r--r--sys-apps/ed/ed-1.16.ebuild2
-rw-r--r--sys-apps/fakeroot/fakeroot-1.22.ebuild2
-rw-r--r--sys-apps/fbset/fbset-2.1.ebuild2
-rw-r--r--sys-apps/file/file-5.39-r4.ebuild2
-rw-r--r--sys-apps/findutils/findutils-4.7.0.ebuild2
-rw-r--r--sys-apps/gawk/gawk-4.2.1-r1.ebuild2
-rw-r--r--sys-apps/gawk/gawk-5.0.1.ebuild2
-rw-r--r--sys-apps/gawk/gawk-5.1.0.ebuild2
-rw-r--r--sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild2
-rw-r--r--sys-apps/grep/grep-3.4.ebuild2
-rw-r--r--sys-apps/groff/groff-1.22.4.ebuild2
-rw-r--r--sys-apps/help2man/help2man-1.47.17.ebuild2
-rw-r--r--sys-apps/hwids/hwids-20200813.1.ebuild4
-rw-r--r--sys-apps/hwids/hwids-20201207.ebuild2
-rw-r--r--sys-apps/install-xattr/install-xattr-0.5.ebuild4
-rw-r--r--sys-apps/iproute2/iproute2-5.7.0.ebuild4
-rw-r--r--sys-apps/keyutils/keyutils-1.6.1.ebuild4
-rw-r--r--sys-apps/kmod/kmod-27-r2.ebuild2
-rw-r--r--sys-apps/kmod/kmod-28.ebuild2
-rw-r--r--sys-apps/less/less-563-r1.ebuild2
-rw-r--r--sys-apps/lsb-release/lsb-release-1.4-r3.ebuild4
-rw-r--r--sys-apps/makedev/makedev-3.23.1-r1.ebuild4
-rw-r--r--sys-apps/man-db/man-db-2.9.3-r1.ebuild2
-rw-r--r--sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild2
-rw-r--r--sys-apps/man-pages-posix/man-pages-posix-2017a.ebuild2
-rw-r--r--sys-apps/man-pages/man-pages-5.09.ebuild4
-rw-r--r--sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild2
-rw-r--r--sys-apps/openrc/openrc-0.42.1-r1.ebuild2
-rw-r--r--sys-apps/opentmpfiles/opentmpfiles-0.1.1.ebuild4
-rw-r--r--sys-apps/opentmpfiles/opentmpfiles-0.1.2.ebuild4
-rw-r--r--sys-apps/opentmpfiles/opentmpfiles-0.1.3.ebuild4
-rw-r--r--sys-apps/opentmpfiles/opentmpfiles-0.2.ebuild2
-rw-r--r--sys-apps/paxctl/paxctl-0.9.ebuild4
-rw-r--r--sys-apps/pciutils/pciutils-3.5.6-r1.ebuild4
-rw-r--r--sys-apps/pciutils/pciutils-3.6.4.ebuild4
-rw-r--r--sys-apps/pciutils/pciutils-3.7.0.ebuild2
-rw-r--r--sys-apps/portage/portage-2.3.99-r2.ebuild2
-rw-r--r--sys-apps/portage/portage-3.0.13.ebuild2
-rw-r--r--sys-apps/portage/portage-3.0.17-r2.ebuild2
-rw-r--r--sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r2.ebuild4
-rw-r--r--sys-apps/s390-tools/s390-tools-2.12.0.ebuild4
-rw-r--r--sys-apps/s390-tools/s390-tools-2.9.0.ebuild4
-rw-r--r--sys-apps/sandbox/sandbox-2.20.ebuild4
-rw-r--r--sys-apps/sed/sed-4.7.ebuild4
-rw-r--r--sys-apps/sed/sed-4.8.ebuild4
-rw-r--r--sys-apps/setserial/setserial-2.17-r5.ebuild4
-rw-r--r--sys-apps/shadow/shadow-4.8-r5.ebuild4
-rw-r--r--sys-apps/sysvinit/sysvinit-2.97.ebuild4
-rw-r--r--sys-apps/texinfo/texinfo-6.6-r1.ebuild4
-rw-r--r--sys-apps/texinfo/texinfo-6.7.ebuild2
-rw-r--r--sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild2
-rw-r--r--sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild4
-rw-r--r--sys-apps/usbutils/usbutils-012.ebuild4
-rw-r--r--sys-apps/usbutils/usbutils-013.ebuild4
-rw-r--r--sys-apps/utempter/utempter-0.5.5.6.ebuild4
-rw-r--r--sys-apps/util-linux/util-linux-2.33.2.ebuild4
-rw-r--r--sys-apps/util-linux/util-linux-2.35.2.ebuild4
-rw-r--r--sys-apps/which/which-2.21.ebuild2
-rw-r--r--sys-apps/xinetd/xinetd-2.3.15.3.ebuild4
-rw-r--r--sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild4
-rw-r--r--sys-auth/pam_ssh/pam_ssh-2.3.ebuild4
-rw-r--r--sys-auth/pambase/pambase-20201103.ebuild2
-rw-r--r--sys-auth/pambase/pambase-999999999.ebuild2
-rw-r--r--sys-auth/passwdqc/passwdqc-1.4.0-r1.ebuild4
-rw-r--r--sys-auth/realtime-base/realtime-base-0.1.ebuild4
-rw-r--r--sys-auth/skey/skey-1.1.5-r11.ebuild4
-rw-r--r--sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild4
-rw-r--r--sys-cluster/sanlock/sanlock-3.8.2.ebuild4
-rw-r--r--sys-devel/autoconf-archive/autoconf-archive-2018.03.13.ebuild2
-rw-r--r--sys-devel/autoconf-archive/autoconf-archive-2019.01.06.ebuild2
-rw-r--r--sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild2
-rw-r--r--sys-devel/autoconf/autoconf-2.13-r1.ebuild2
-rw-r--r--sys-devel/autoconf/autoconf-2.64-r1.ebuild4
-rw-r--r--sys-devel/autoconf/autoconf-2.69-r5.ebuild2
-rw-r--r--sys-devel/autogen/autogen-5.18.16-r1.ebuild4
-rw-r--r--sys-devel/automake-wrapper/automake-wrapper-11.ebuild2
-rw-r--r--sys-devel/automake/automake-1.10.3-r3.ebuild4
-rw-r--r--sys-devel/automake/automake-1.11.6-r3.ebuild4
-rw-r--r--sys-devel/automake/automake-1.12.6-r2.ebuild4
-rw-r--r--sys-devel/automake/automake-1.13.4-r2.ebuild2
-rw-r--r--sys-devel/automake/automake-1.14.1-r2.ebuild2
-rw-r--r--sys-devel/automake/automake-1.15.1-r2.ebuild2
-rw-r--r--sys-devel/automake/automake-1.16.2-r1.ebuild2
-rw-r--r--sys-devel/automake/automake-1.4_p6-r2.ebuild4
-rw-r--r--sys-devel/automake/automake-1.5-r2.ebuild4
-rw-r--r--sys-devel/automake/automake-1.6.3-r2.ebuild4
-rw-r--r--sys-devel/automake/automake-1.7.9-r3.ebuild4
-rw-r--r--sys-devel/automake/automake-1.8.5-r5.ebuild4
-rw-r--r--sys-devel/automake/automake-1.9.6-r5.ebuild4
-rw-r--r--sys-devel/bc/bc-1.06.95-r2.ebuild2
-rw-r--r--sys-devel/bc/bc-1.07.1-r3.ebuild2
-rw-r--r--sys-devel/binutils-config/binutils-config-5.3.2.ebuild2
-rw-r--r--sys-devel/binutils/binutils-2.32-r1.ebuild4
-rw-r--r--sys-devel/binutils/binutils-2.33.1-r1.ebuild4
-rw-r--r--sys-devel/binutils/binutils-2.34-r2.ebuild2
-rw-r--r--sys-devel/binutils/binutils-2.35.1-r1.ebuild2
-rw-r--r--sys-devel/bison/bison-3.6.4.ebuild2
-rw-r--r--sys-devel/bison/bison-3.7.3.ebuild2
-rw-r--r--sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild2
-rw-r--r--sys-devel/crossdev/crossdev-20201129.ebuild4
-rw-r--r--sys-devel/distcc/distcc-3.3.3-r3.ebuild2
-rw-r--r--sys-devel/flex/flex-2.6.1.ebuild2
-rw-r--r--sys-devel/flex/flex-2.6.4-r1.ebuild2
-rw-r--r--sys-devel/gcc-config/gcc-config-2.3.2-r1.ebuild4
-rw-r--r--sys-devel/gcc-config/gcc-config-2.3.3.ebuild2
-rw-r--r--sys-devel/gcc/gcc-10.2.0-r5.ebuild2
-rw-r--r--sys-devel/gcc/gcc-6.5.0-r3.ebuild4
-rw-r--r--sys-devel/gcc/gcc-7.5.0-r1.ebuild4
-rw-r--r--sys-devel/gcc/gcc-8.4.0-r1.ebuild4
-rw-r--r--sys-devel/gcc/gcc-8.4.0-r2.ebuild2
-rw-r--r--sys-devel/gcc/gcc-9.3.0-r1.ebuild4
-rw-r--r--sys-devel/gcc/gcc-9.3.0-r2.ebuild2
-rw-r--r--sys-devel/gdb/gdb-10.1.ebuild2
-rw-r--r--sys-devel/gettext/gettext-0.21.ebuild2
-rw-r--r--sys-devel/gnuconfig/gnuconfig-20200621.ebuild2
-rw-r--r--sys-devel/libtool/libtool-2.4.6-r6.ebuild2
-rw-r--r--sys-devel/m4/m4-1.4.18-r2.ebuild2
-rw-r--r--sys-devel/make/make-4.2.1-r4.ebuild2
-rw-r--r--sys-devel/make/make-4.3.ebuild2
-rw-r--r--sys-devel/patch/patch-2.7.6-r4.ebuild2
-rw-r--r--sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild4
-rw-r--r--sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild2
-rw-r--r--sys-fs/dosfstools/dosfstools-4.1.ebuild4
-rw-r--r--sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild2
-rw-r--r--sys-fs/eudev/eudev-3.2.10.ebuild2
-rw-r--r--sys-fs/eudev/eudev-3.2.5.ebuild4
-rw-r--r--sys-fs/eudev/eudev-3.2.9.ebuild4
-rw-r--r--sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild4
-rw-r--r--sys-fs/lvm2/lvm2-2.02.187-r2.ebuild2
-rw-r--r--sys-fs/squashfs-tools/squashfs-tools-4.4_p1.ebuild4
-rw-r--r--sys-fs/static-dev/static-dev-0.1.ebuild4
-rw-r--r--sys-fs/sysfsutils/sysfsutils-2.1.0.ebuild4
-rw-r--r--sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild4
-rw-r--r--sys-fs/udev-init-scripts/udev-init-scripts-34.ebuild4
-rw-r--r--sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild4
-rw-r--r--sys-fs/udev/udev-243-r2.ebuild4
-rw-r--r--sys-fs/udev/udev-245.5-r1.ebuild2
-rw-r--r--sys-fs/xfsprogs/xfsprogs-5.10.0-r1.ebuild2
-rw-r--r--sys-kernel/genkernel/genkernel-3.5.3.3.ebuild4
-rw-r--r--sys-kernel/genkernel/genkernel-4.0.10.ebuild4
-rw-r--r--sys-kernel/genkernel/genkernel-4.1.2-r3.ebuild4
-rw-r--r--sys-kernel/genkernel/genkernel-4.2.1-r1.ebuild2
-rw-r--r--sys-kernel/installkernel-gentoo/installkernel-gentoo-2.ebuild4
-rw-r--r--sys-kernel/linux-firmware/linux-firmware-20200316.ebuild2
-rw-r--r--sys-kernel/linux-firmware/linux-firmware-20200421.ebuild2
-rw-r--r--sys-kernel/linux-firmware/linux-firmware-20200519.ebuild2
-rw-r--r--sys-kernel/linux-firmware/linux-firmware-20200619.ebuild2
-rw-r--r--sys-kernel/linux-firmware/linux-firmware-20200721.ebuild2
-rw-r--r--sys-kernel/linux-firmware/linux-firmware-20200817.ebuild2
-rw-r--r--sys-kernel/linux-firmware/linux-firmware-20200918.ebuild2
-rw-r--r--sys-kernel/linux-firmware/linux-firmware-20201022-r3.ebuild2
-rw-r--r--sys-kernel/linux-firmware/linux-firmware-20201218.ebuild2
-rw-r--r--sys-kernel/linux-firmware/linux-firmware-20210208.ebuild2
-rw-r--r--sys-kernel/linux-firmware/linux-firmware-20210315.ebuild2
-rw-r--r--sys-kernel/linux-firmware/linux-firmware-99999999.ebuild2
-rw-r--r--sys-kernel/linux-headers/linux-headers-3.18.ebuild2
-rw-r--r--sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild2
-rw-r--r--sys-kernel/linux-headers/linux-headers-4.19.ebuild2
-rw-r--r--sys-kernel/linux-headers/linux-headers-4.4.ebuild2
-rw-r--r--sys-kernel/linux-headers/linux-headers-5.10.ebuild2
-rw-r--r--sys-kernel/linux-headers/linux-headers-5.4-r1.ebuild2
-rw-r--r--sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild2
-rw-r--r--sys-libs/binutils-libs/binutils-libs-2.35.1-r1.ebuild2
-rw-r--r--sys-libs/cracklib/cracklib-2.9.7.ebuild2
-rw-r--r--sys-libs/db/db-1.85-r4.ebuild4
-rw-r--r--sys-libs/db/db-3.2.9_p2-r1.ebuild4
-rw-r--r--sys-libs/db/db-4.2.52_p5-r3.ebuild4
-rw-r--r--sys-libs/db/db-4.3.29_p1-r3.ebuild2
-rw-r--r--sys-libs/db/db-4.5.20_p2-r3.ebuild2
-rw-r--r--sys-libs/db/db-4.6.21_p4-r2.ebuild2
-rw-r--r--sys-libs/db/db-4.7.25_p4-r2.ebuild2
-rw-r--r--sys-libs/db/db-4.8.30-r3.ebuild2
-rw-r--r--sys-libs/db/db-5.3.28-r4.ebuild2
-rw-r--r--sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.6.ebuild2
-rw-r--r--sys-libs/gdbm/gdbm-1.18.1-r1.ebuild2
-rw-r--r--sys-libs/glibc/glibc-2.25-r11.ebuild4
-rw-r--r--sys-libs/glibc/glibc-2.31-r7.ebuild2
-rw-r--r--sys-libs/glibc/glibc-2.32-r6.ebuild2
-rw-r--r--sys-libs/glibc/glibc-2.32-r7.ebuild2
-rw-r--r--sys-libs/gpm/gpm-1.20.7-r2.ebuild4
-rw-r--r--sys-libs/libcap/libcap-2.43.ebuild4
-rw-r--r--sys-libs/libseccomp/libseccomp-2.4.3.ebuild4
-rw-r--r--sys-libs/libseccomp/libseccomp-2.4.4.ebuild4
-rw-r--r--sys-libs/libutempter/libutempter-1.1.6-r3.ebuild4
-rw-r--r--sys-libs/mtdev/mtdev-1.1.6.ebuild4
-rw-r--r--sys-libs/ncurses-compat/ncurses-compat-6.1_p20190609.ebuild2
-rw-r--r--sys-libs/ncurses/ncurses-6.2-r1.ebuild2
-rw-r--r--sys-libs/pam/pam-1.5.1.ebuild2
-rw-r--r--sys-libs/pwdb/pwdb-0.62-r1.ebuild4
-rw-r--r--sys-libs/readline/readline-8.0_p4.ebuild4
-rw-r--r--sys-libs/slang/slang-2.3.2.ebuild2
-rw-r--r--sys-libs/timezone-data/timezone-data-2021a.ebuild2
-rw-r--r--sys-libs/zlib/zlib-1.2.11-r3.ebuild2
-rw-r--r--sys-process/audit/audit-2.8.5-r2.ebuild4
-rw-r--r--sys-process/audit/audit-3.0.ebuild2
-rw-r--r--sys-process/cronbase/cronbase-0.3.7-r6.ebuild4
-rw-r--r--sys-process/daemontools/daemontools-0.76-r8.ebuild4
-rw-r--r--sys-process/dcron/dcron-4.5-r2.ebuild4
-rw-r--r--sys-process/lsof/lsof-4.93.2-r1.ebuild2
-rw-r--r--sys-process/numad/numad-0.5-r3.ebuild4
-rw-r--r--sys-process/numad/numad-9999.ebuild4
-rw-r--r--sys-process/procps/procps-3.3.16-r2.ebuild4
-rw-r--r--sys-process/procps/procps-3.3.17.ebuild2
-rw-r--r--sys-process/psmisc/psmisc-23.3-r1.ebuild4
-rw-r--r--sys-process/runit/runit-2.1.1-r2.ebuild4
-rw-r--r--virtual/acl/acl-0-r1.ebuild4
-rw-r--r--virtual/acl/acl-0-r2.ebuild4
-rw-r--r--virtual/acl/acl-0.ebuild4
-rw-r--r--virtual/awk/awk-1.ebuild2
-rw-r--r--virtual/checkpassword/checkpassword-0.ebuild4
-rw-r--r--virtual/cron/cron-0-r2.ebuild4
-rw-r--r--virtual/daemontools/daemontools-0.ebuild4
-rw-r--r--virtual/dev-manager/dev-manager-0-r2.ebuild4
-rw-r--r--virtual/editor/editor-0-r3.ebuild2
-rw-r--r--virtual/eject/eject-0-r1.ebuild2
-rw-r--r--virtual/fam/fam-0-r1.ebuild4
-rw-r--r--virtual/fortran/fortran-0.ebuild2
-rw-r--r--virtual/glu/glu-9.0-r2.ebuild2
-rw-r--r--virtual/gsasl/gsasl-2.ebuild2
-rw-r--r--virtual/httpd-basic/httpd-basic-0-r2.ebuild2
-rw-r--r--virtual/httpd-cgi/httpd-cgi-0-r1.ebuild2
-rw-r--r--virtual/httpd-cgi/httpd-cgi-0-r2.ebuild2
-rw-r--r--virtual/httpd-fastcgi/httpd-fastcgi-0-r1.ebuild4
-rw-r--r--virtual/imagemagick-tools/imagemagick-tools-0.ebuild2
-rw-r--r--virtual/imap-c-client/imap-c-client-2.ebuild4
-rw-r--r--virtual/inetd/inetd-0.ebuild2
-rw-r--r--virtual/jpeg/jpeg-100.ebuild2
-rw-r--r--virtual/krb5/krb5-0-r1.ebuild4
-rw-r--r--virtual/latex-base/latex-base-1.0.ebuild2
-rw-r--r--virtual/libc/libc-1-r1.ebuild2
-rw-r--r--virtual/libcrypt/libcrypt-1-r1.ebuild2
-rw-r--r--virtual/libcrypt/libcrypt-2.ebuild2
-rw-r--r--virtual/libelf/libelf-3.ebuild4
-rw-r--r--virtual/libffi/libffi-3.3_rc0.ebuild2
-rw-r--r--virtual/libiconv/libiconv-0-r1.ebuild2
-rw-r--r--virtual/libiconv/libiconv-0-r2.ebuild2
-rw-r--r--virtual/libiconv/libiconv-0.ebuild2
-rw-r--r--virtual/libintl/libintl-0-r1.ebuild2
-rw-r--r--virtual/libintl/libintl-0-r2.ebuild2
-rw-r--r--virtual/libintl/libintl-0.ebuild2
-rw-r--r--virtual/libudev/libudev-215-r1.ebuild4
-rw-r--r--virtual/libudev/libudev-232-r2.ebuild4
-rw-r--r--virtual/libudev/libudev-232-r3.ebuild4
-rw-r--r--virtual/libusb/libusb-0-r2.ebuild2
-rw-r--r--virtual/libusb/libusb-1-r1.ebuild2
-rw-r--r--virtual/linuxtv-dvb-headers/linuxtv-dvb-headers-5.8.ebuild2
-rw-r--r--virtual/logger/logger-0-r1.ebuild2
-rw-r--r--virtual/mailx/mailx-3.ebuild2
-rw-r--r--virtual/man/man-0-r3.ebuild2
-rw-r--r--virtual/mda/mda-0.ebuild2
-rw-r--r--virtual/mta/mta-1-r2.ebuild2
-rw-r--r--virtual/mysql/mysql-5.6-r13.ebuild2
-rw-r--r--virtual/opengl/opengl-7.0-r2.ebuild2
-rw-r--r--virtual/os-headers/os-headers-0-r2.ebuild2
-rw-r--r--virtual/package-manager/package-manager-1.ebuild2
-rw-r--r--virtual/pager/pager-0.ebuild2
-rw-r--r--virtual/perl-Archive-Tar/perl-Archive-Tar-2.320.0.ebuild2
-rw-r--r--virtual/perl-Attribute-Handlers/perl-Attribute-Handlers-1.10.0-r3.ebuild2
-rw-r--r--virtual/perl-AutoLoader/perl-AutoLoader-5.740.0-r9.ebuild2
-rw-r--r--virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.140.0-r6.ebuild2
-rw-r--r--virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.18.0-r6.ebuild2
-rw-r--r--virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.10-r4.ebuild2
-rw-r--r--virtual/perl-CPAN/perl-CPAN-2.220.0.ebuild2
-rw-r--r--virtual/perl-Carp/perl-Carp-1.500.0-r3.ebuild2
-rw-r--r--virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.89.0-r1.ebuild2
-rw-r--r--virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.84.0.ebuild2
-rw-r--r--virtual/perl-DB_File/perl-DB_File-1.843.0.ebuild2
-rw-r--r--virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.0-r2.ebuild2
-rw-r--r--virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.520.0.ebuild2
-rw-r--r--virtual/perl-Digest-MD5/perl-Digest-MD5-2.550.0-r2.ebuild2
-rw-r--r--virtual/perl-Digest-SHA/perl-Digest-SHA-6.20.0-r1.ebuild2
-rw-r--r--virtual/perl-Digest/perl-Digest-1.170.100_rc-r10.ebuild2
-rw-r--r--virtual/perl-Dumpvalue/perl-Dumpvalue-1.180.0-r5.ebuild2
-rw-r--r--virtual/perl-Encode/perl-Encode-3.10.0.ebuild2
-rw-r--r--virtual/perl-Exporter/perl-Exporter-5.730.0-r2.ebuild2
-rw-r--r--virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.231.ebuild2
-rw-r--r--virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.250.0-r3.ebuild2
-rw-r--r--virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-2.140.0-r3.ebuild2
-rw-r--r--virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.340.0-r2.ebuild2
-rw-r--r--virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.720.0-r1.ebuild2
-rw-r--r--virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.400.0-r1.ebuild2
-rw-r--r--virtual/perl-File-Path/perl-File-Path-2.160.0-r1.ebuild2
-rw-r--r--virtual/perl-File-Spec/perl-File-Spec-3.780.0-r1.ebuild2
-rw-r--r--virtual/perl-File-Temp/perl-File-Temp-0.230.900.ebuild2
-rw-r--r--virtual/perl-Filter-Simple/perl-Filter-Simple-0.950.0-r2.ebuild2
-rw-r--r--virtual/perl-Getopt-Long/perl-Getopt-Long-2.500.0-r2.ebuild2
-rw-r--r--virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.76.0-r1.ebuild2
-rw-r--r--virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.430.0-r2.ebuild2
-rw-r--r--virtual/perl-IO-Compress/perl-IO-Compress-2.84.0.ebuild2
-rw-r--r--virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.390.0-r3.ebuild2
-rw-r--r--virtual/perl-IO-Zlib/perl-IO-Zlib-1.100.0-r14.ebuild2
-rw-r--r--virtual/perl-IO/perl-IO-1.400.0.ebuild2
-rw-r--r--virtual/perl-IPC-Cmd/perl-IPC-Cmd-1.20.0.ebuild2
-rw-r--r--virtual/perl-JSON-PP/perl-JSON-PP-4.20.0.ebuild2
-rw-r--r--virtual/perl-Locale-Maketext-Simple/perl-Locale-Maketext-Simple-0.210.100_rc-r10.ebuild2
-rw-r--r--virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.290.0-r3.ebuild2
-rw-r--r--virtual/perl-MIME-Base64/perl-MIME-Base64-3.150.0-r7.ebuild2
-rw-r--r--virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.500.800.ebuild2
-rw-r--r--virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.816.ebuild2
-rw-r--r--virtual/perl-Math-BigRat/perl-Math-BigRat-0.261.400-r1.ebuild2
-rw-r--r--virtual/perl-Math-Complex/perl-Math-Complex-1.590.100-r4.ebuild2
-rw-r--r--virtual/perl-Memoize/perl-Memoize-1.30.100_rc-r10.ebuild2
-rw-r--r--virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.6.13.0_rc.ebuild2
-rw-r--r--virtual/perl-Module-Load-Conditional/perl-Module-Load-Conditional-0.680.0-r3.ebuild2
-rw-r--r--virtual/perl-Module-Load/perl-Module-Load-0.340.0-r1.ebuild2
-rw-r--r--virtual/perl-Module-Loaded/perl-Module-Loaded-0.80.0-r13.ebuild4
-rw-r--r--virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.36.ebuild2
-rw-r--r--virtual/perl-Net-Ping/perl-Net-Ping-2.710.0.ebuild2
-rw-r--r--virtual/perl-Params-Check/perl-Params-Check-0.380.0-r10.ebuild2
-rw-r--r--virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-2.150.10-r4.ebuild2
-rw-r--r--virtual/perl-Perl-OSType/perl-Perl-OSType-1.10.0-r4.ebuild2
-rw-r--r--virtual/perl-Pod-Escapes/perl-Pod-Escapes-1.70.0-r7.ebuild2
-rw-r--r--virtual/perl-Pod-Parser/perl-Pod-Parser-1.630.0-r8.ebuild2
-rw-r--r--virtual/perl-Pod-Simple/perl-Pod-Simple-3.350.0-r3.ebuild2
-rw-r--r--virtual/perl-Safe/perl-Safe-2.400.0-r3.ebuild2
-rw-r--r--virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.500.0-r2.ebuild2
-rw-r--r--virtual/perl-Socket/perl-Socket-2.27.0-r2.ebuild2
-rw-r--r--virtual/perl-Storable/perl-Storable-3.150.0.ebuild2
-rw-r--r--virtual/perl-Sys-Syslog/perl-Sys-Syslog-0.350.0-r3.ebuild2
-rw-r--r--virtual/perl-Term-ANSIColor/perl-Term-ANSIColor-4.60.0-r3.ebuild2
-rw-r--r--virtual/perl-Term-ReadLine/perl-Term-ReadLine-1.170.0-r4.ebuild2
-rw-r--r--virtual/perl-Test-Harness/perl-Test-Harness-3.420.0-r3.ebuild2
-rw-r--r--virtual/perl-Test-Simple/perl-Test-Simple-1.302.162.ebuild2
-rw-r--r--virtual/perl-Test/perl-Test-1.310.0-r3.ebuild2
-rw-r--r--virtual/perl-Text-Balanced/perl-Text-Balanced-2.30.0-r7.ebuild2
-rw-r--r--virtual/perl-Text-ParseWords/perl-Text-ParseWords-3.300.0-r7.ebuild2
-rw-r--r--virtual/perl-Text-Tabs+Wrap/perl-Text-Tabs+Wrap-2013.52.300-r10.ebuild2
-rw-r--r--virtual/perl-Thread-Queue/perl-Thread-Queue-3.130.0.ebuild2
-rw-r--r--virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.130.0-r4.ebuild2
-rw-r--r--virtual/perl-Tie-RefHash/perl-Tie-RefHash-1.390.0-r12.ebuild2
-rw-r--r--virtual/perl-Time-HiRes/perl-Time-HiRes-1.976.0.ebuild2
-rw-r--r--virtual/perl-Time-Local/perl-Time-Local-1.280.0-r1.ebuild2
-rw-r--r--virtual/perl-Time-Piece/perl-Time-Piece-1.330.0.ebuild2
-rw-r--r--virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.270.0-r1.ebuild2
-rw-r--r--virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.260.0-r2.ebuild2
-rw-r--r--virtual/perl-XSLoader/perl-XSLoader-0.300.0-r3.ebuild2
-rw-r--r--virtual/perl-autodie/perl-autodie-2.290.0-r5.ebuild2
-rw-r--r--virtual/perl-bignum/perl-bignum-0.510.0-r1.ebuild2
-rw-r--r--virtual/perl-if/perl-if-0.60.800-r3.ebuild2
-rw-r--r--virtual/perl-libnet/perl-libnet-3.110.0-r3.ebuild2
-rw-r--r--virtual/perl-parent/perl-parent-0.237.0.ebuild2
-rw-r--r--virtual/perl-podlators/perl-podlators-4.110.0.ebuild2
-rw-r--r--virtual/perl-threads-shared/perl-threads-shared-1.600.0.ebuild2
-rw-r--r--virtual/perl-threads/perl-threads-2.220.0-r2.ebuild2
-rw-r--r--virtual/perl-version/perl-version-0.992.400-r1.ebuild2
-rw-r--r--virtual/pkgconfig/pkgconfig-2.ebuild2
-rw-r--r--virtual/python-cffi/python-cffi-1.ebuild2
-rw-r--r--virtual/python-greenlet/python-greenlet-1.0-r2.ebuild4
-rw-r--r--virtual/qmail/qmail-1.03-r1.ebuild4
-rw-r--r--virtual/ruby-ssl/ruby-ssl-11.ebuild2
-rw-r--r--virtual/rubygems/rubygems-15.ebuild2
-rw-r--r--virtual/service-manager/service-manager-0.ebuild2
-rw-r--r--virtual/ssh/ssh-0.ebuild2
-rw-r--r--virtual/tex-base/tex-base-0.ebuild2
-rw-r--r--virtual/texi2dvi/texi2dvi-0-r2.ebuild2
-rw-r--r--virtual/tmpfiles/tmpfiles-0-r1.ebuild2
-rw-r--r--virtual/ttf-fonts/ttf-fonts-1-r1.ebuild2
-rw-r--r--virtual/udev/udev-217-r2.ebuild4
-rw-r--r--virtual/yacc/yacc-0.ebuild2
-rw-r--r--www-client/links/links-2.21.ebuild2
-rw-r--r--www-client/lynx/lynx-2.9.0_pre6-r1.ebuild2
-rw-r--r--www-client/pybugz/pybugz-0.13.ebuild2
-rw-r--r--www-servers/tornado/tornado-6.0.4.ebuild4
-rw-r--r--x11-apps/bdftopcf/bdftopcf-1.1-r1.ebuild2
-rw-r--r--x11-apps/iceauth/iceauth-1.0.8-r1.ebuild2
-rw-r--r--x11-apps/listres/listres-1.0.4.ebuild4
-rw-r--r--x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild2
-rw-r--r--x11-apps/oclock/oclock-1.0.4.ebuild2
-rw-r--r--x11-apps/rgb/rgb-1.0.6-r1.ebuild2
-rw-r--r--x11-apps/scripts/scripts-1.0.1-r1.ebuild2
-rw-r--r--x11-apps/xauth/xauth-1.1.ebuild4
-rw-r--r--x11-apps/xbiff/xbiff-1.0.4.ebuild4
-rw-r--r--x11-apps/xclock/xclock-1.0.9.ebuild2
-rw-r--r--x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild2
-rw-r--r--x11-apps/xeyes/xeyes-1.1.2.ebuild2
-rw-r--r--x11-apps/xf86dga/xf86dga-1.0.3-r1.ebuild2
-rw-r--r--x11-apps/xhost/xhost-1.0.8.ebuild2
-rw-r--r--x11-apps/xinit/xinit-1.4.1.ebuild4
-rw-r--r--x11-apps/xkbcomp/xkbcomp-1.4.4.ebuild2
-rw-r--r--x11-apps/xlogo/xlogo-1.0.5.ebuild4
-rw-r--r--x11-apps/xmessage/xmessage-1.0.5-r1.ebuild2
-rw-r--r--x11-apps/xmore/xmore-1.0.3.ebuild4
-rw-r--r--x11-apps/xpr/xpr-1.0.5-r1.ebuild2
-rw-r--r--x11-apps/xprop/xprop-1.2.5.ebuild2
-rw-r--r--x11-apps/xrdb/xrdb-1.2.0.ebuild2
-rw-r--r--x11-apps/xset/xset-1.2.4-r1.ebuild2
-rw-r--r--x11-apps/xsm/xsm-1.0.4.ebuild2
-rw-r--r--x11-apps/xwud/xwud-1.0.5-r1.ebuild2
-rw-r--r--x11-base/xcb-proto/xcb-proto-1.14.1.ebuild2
-rw-r--r--x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild4
-rw-r--r--x11-base/xorg-proto/xorg-proto-2020.1.ebuild4
-rw-r--r--x11-drivers/xf86-input-libinput/xf86-input-libinput-0.30.0.ebuild4
-rw-r--r--x11-drivers/xf86-input-void/xf86-input-void-1.4.1.ebuild2
-rw-r--r--x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.8.ebuild2
-rw-r--r--x11-libs/cairo/cairo-1.16.0-r4.ebuild2
-rw-r--r--x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.2.ebuild2
-rw-r--r--x11-libs/gtk+/gtk+-2.24.32-r1.ebuild2
-rw-r--r--x11-libs/gtk+/gtk+-3.24.22.ebuild2
-rw-r--r--x11-libs/libICE/libICE-1.0.10.ebuild2
-rw-r--r--x11-libs/libSM/libSM-1.2.3-r1.ebuild2
-rw-r--r--x11-libs/libX11/libX11-1.7.0.ebuild2
-rw-r--r--x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild2
-rw-r--r--x11-libs/libXau/libXau-1.0.9-r1.ebuild2
-rw-r--r--x11-libs/libXaw/libXaw-1.0.13-r2.ebuild2
-rw-r--r--x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild2
-rw-r--r--x11-libs/libXcursor/libXcursor-1.2.0.ebuild2
-rw-r--r--x11-libs/libXdamage/libXdamage-1.1.5.ebuild2
-rw-r--r--x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild2
-rw-r--r--x11-libs/libXext/libXext-1.3.4.ebuild2
-rw-r--r--x11-libs/libXfixes/libXfixes-5.0.3-r3.ebuild2
-rw-r--r--x11-libs/libXfont2/libXfont2-2.0.4.ebuild2
-rw-r--r--x11-libs/libXft/libXft-2.3.3.ebuild2
-rw-r--r--x11-libs/libXi/libXi-1.7.10.ebuild2
-rw-r--r--x11-libs/libXinerama/libXinerama-1.1.4-r1.ebuild2
-rw-r--r--x11-libs/libXmu/libXmu-1.1.3.ebuild2
-rw-r--r--x11-libs/libXrandr/libXrandr-1.5.2.ebuild2
-rw-r--r--x11-libs/libXrender/libXrender-0.9.10-r2.ebuild2
-rw-r--r--x11-libs/libXres/libXres-1.2.0-r1.ebuild2
-rw-r--r--x11-libs/libXt/libXt-1.2.0.ebuild2
-rw-r--r--x11-libs/libXtst/libXtst-1.2.3-r2.ebuild2
-rw-r--r--x11-libs/libXv/libXv-1.0.11-r2.ebuild2
-rw-r--r--x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild2
-rw-r--r--x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild2
-rw-r--r--x11-libs/libdmx/libdmx-1.1.4.ebuild2
-rw-r--r--x11-libs/libfontenc/libfontenc-1.1.4.ebuild2
-rw-r--r--x11-libs/libpciaccess/libpciaccess-0.16.ebuild2
-rw-r--r--x11-libs/libxcb/libxcb-1.14.ebuild2
-rw-r--r--x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild2
-rw-r--r--x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild4
-rw-r--r--x11-libs/pango/pango-1.42.4-r2.ebuild2
-rw-r--r--x11-libs/pixman/pixman-0.40.0.ebuild2
-rw-r--r--x11-libs/tslib/tslib-1.22.ebuild2
-rw-r--r--x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r3.ebuild2
-rw-r--r--x11-libs/xcb-util-image/xcb-util-image-0.4.0-r2.ebuild2
-rw-r--r--x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r2.ebuild2
-rw-r--r--x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r3.ebuild2
-rw-r--r--x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r3.ebuild2
-rw-r--r--x11-libs/xcb-util/xcb-util-0.4.0-r2.ebuild2
-rw-r--r--x11-libs/xtrans/xtrans-1.4.0.ebuild2
-rw-r--r--x11-misc/compose-tables/compose-tables-1.7.0.ebuild2
-rw-r--r--x11-misc/imake/imake-1.0.8.ebuild2
-rw-r--r--x11-misc/makedepend/makedepend-1.0.6.ebuild2
-rw-r--r--x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild2
-rw-r--r--x11-misc/shared-mime-info/shared-mime-info-1.15.ebuild2
-rw-r--r--x11-misc/shared-mime-info/shared-mime-info-2.0-r2.ebuild2
-rw-r--r--x11-misc/util-macros/util-macros-1.19.2-r2.ebuild2
-rw-r--r--x11-misc/util-macros/util-macros-1.19.3.ebuild2
-rw-r--r--x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild2
-rw-r--r--x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild4
-rw-r--r--x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r1.ebuild4
-rw-r--r--x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220.ebuild4
-rw-r--r--x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild2
-rw-r--r--x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.32.0.ebuild4
-rw-r--r--x11-themes/gnome-themes-standard/gnome-themes-standard-3.28.ebuild4
-rw-r--r--x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.28.ebuild4
-rw-r--r--x11-themes/hicolor-icon-theme/hicolor-icon-theme-0.17.ebuild2
-rw-r--r--x11-wm/twm/twm-1.0.11.ebuild4
1806 files changed, 2428 insertions, 2429 deletions
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.2.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.2.ebuild
index b1d53279b097..c955b724587b 100644
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.2.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
LICENSE="LGPL-2.1+"
SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.34.0.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.34.0.ebuild
index 1fed449da18d..8d1cea8031b6 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.34.0.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.34.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
LICENSE="LGPL-2.1+"
SLOT="2"
IUSE="X gtk-doc +introspection"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
RDEPEND="
>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.36.0.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.36.0.ebuild
index f06cc0d3e089..479e193b0099 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.36.0.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.36.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
LICENSE="LGPL-2.1+"
SLOT="2"
IUSE="X gtk-doc +introspection"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
RDEPEND="
>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
diff --git a/app-admin/eselect/eselect-1.4.16.ebuild b/app-admin/eselect/eselect-1.4.16.ebuild
index 555ce6185536..0bf15515e9b5 100644
--- a/app-admin/eselect/eselect-1.4.16.ebuild
+++ b/app-admin/eselect/eselect-1.4.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs vim-syntax"
RDEPEND="sys-apps/sed
diff --git a/app-admin/eselect/eselect-1.4.17.ebuild b/app-admin/eselect/eselect-1.4.17.ebuild
index f4f2698d7b9b..aa1883651084 100644
--- a/app-admin/eselect/eselect-1.4.17.ebuild
+++ b/app-admin/eselect/eselect-1.4.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs vim-syntax"
DEPEND="sys-apps/sed
diff --git a/app-admin/fam/fam-2.7.0_p17_p3.ebuild b/app-admin/fam/fam-2.7.0_p17_p3.ebuild
index a461b7bfd6f2..8188a88c1b52 100644
--- a/app-admin/fam/fam-2.7.0_p17_p3.ebuild
+++ b/app-admin/fam/fam-2.7.0_p17_p3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="static-libs"
DEPEND="
diff --git a/app-admin/genromfs/genromfs-0.5.2.ebuild b/app-admin/genromfs/genromfs-0.5.2.ebuild
index 8bdcc8946afe..830e6620cbee 100644
--- a/app-admin/genromfs/genromfs-0.5.2.ebuild
+++ b/app-admin/genromfs/genromfs-0.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc ~ppc64 s390 x86"
+KEYWORDS="amd64 arm64 ppc ~ppc64 ~s390 x86"
PATCHES=( "${FILESDIR}"/${P}-build.patch )
diff --git a/app-admin/killproc/killproc-2.13-r1.ebuild b/app-admin/killproc/killproc-2.13-r1.ebuild
index 8dde4efdad98..1646adced50f 100644
--- a/app-admin/killproc/killproc-2.13-r1.ebuild
+++ b/app-admin/killproc/killproc-2.13-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.suse.com/pub/projects/init/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
PATCHES=(
"${FILESDIR}/${P}-makefile.patch"
diff --git a/app-admin/makepasswd/makepasswd-1.10.ebuild b/app-admin/makepasswd/makepasswd-1.10.ebuild
index 3d62de699ea0..01909b500c13 100644
--- a/app-admin/makepasswd/makepasswd-1.10.ebuild
+++ b/app-admin/makepasswd/makepasswd-1.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://debian/dists/potato/main/source/admin/${P/-/_}.orig.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE=""
RDEPEND="dev-lang/perl"
diff --git a/app-admin/metalog/metalog-20181125.ebuild b/app-admin/metalog/metalog-20181125.ebuild
index 879997f1e1cc..e06a89c5be0d 100644
--- a/app-admin/metalog/metalog-20181125.ebuild
+++ b/app-admin/metalog/metalog-20181125.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/hvisage/${PN}/archive/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin"
IUSE="unicode"
RDEPEND=">=dev-libs/libpcre-3.4"
diff --git a/app-admin/metalog/metalog-3-r2.ebuild b/app-admin/metalog/metalog-3-r2.ebuild
index 9c63681e4eee..79aec9a466c1 100644
--- a/app-admin/metalog/metalog-3-r2.ebuild
+++ b/app-admin/metalog/metalog-3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="unicode"
RDEPEND=">=dev-libs/libpcre-3.4"
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.27.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.27.ebuild
index d21cb6dee5ae..6b405a179b61 100644
--- a/app-admin/perl-cleaner/perl-cleaner-2.27.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.27.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
else
SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/app-admin/quickswitch/quickswitch-1.05.ebuild b/app-admin/quickswitch/quickswitch-1.05.ebuild
index 33a39aaf63c5..7dd8981f5cf2 100644
--- a/app-admin/quickswitch/quickswitch-1.05.ebuild
+++ b/app-admin/quickswitch/quickswitch-1.05.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ HOMEPAGE="http://quickswitch.sf.net"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc s390 sparc x86"
+KEYWORDS="amd64 ppc ~s390 sparc x86"
IUSE="ncurses"
DEPEND=">=dev-lang/perl-5.6.0"
diff --git a/app-admin/sudo/sudo-1.9.5_p2-r1.ebuild b/app-admin/sudo/sudo-1.9.5_p2-r1.ebuild
index af0d7b0c4bd3..73aaae21c247 100644
--- a/app-admin/sudo/sudo-1.9.5_p2-r1.ebuild
+++ b/app-admin/sudo/sudo-1.9.5_p2-r1.ebuild
@@ -22,7 +22,7 @@ else
SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~sparc-solaris"
fi
fi
diff --git a/app-admin/superadduser/superadduser-1.0.9.ebuild b/app-admin/superadduser/superadduser-1.0.9.ebuild
index 29618956db8d..bb0a3d8ddff5 100644
--- a/app-admin/superadduser/superadduser-1.0.9.ebuild
+++ b/app-admin/superadduser/superadduser-1.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ SRC_URI=""
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="sys-apps/shadow"
diff --git a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
index 41fa3a45483a..49c4a1068751 100644
--- a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{7..9} )
inherit distutils-r1 prefix
SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
DESCRIPTION="Gentoo's installer for web-based applications"
HOMEPAGE="https://sourceforge.net/projects/webapp-config/"
diff --git a/app-arch/bzip2/bzip2-1.0.6-r11.ebuild b/app-arch/bzip2/bzip2-1.0.6-r11.ebuild
index b867474e5570..1484da57cb92 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r11.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="BZIP2"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="static static-libs"
PATCHES=(
diff --git a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
index c6ca84ece131..49d36f93d65a 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz"
LICENSE="BZIP2"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="static static-libs"
PATCHES=(
diff --git a/app-arch/cpio/cpio-2.12-r1.ebuild b/app-arch/cpio/cpio-2.12-r1.ebuild
index 4c3a5cf1d7d0..8e803897a8cc 100644
--- a/app-arch/cpio/cpio-2.12-r1.ebuild
+++ b/app-arch/cpio/cpio-2.12-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls"
PATCHES=(
diff --git a/app-arch/gcab/gcab-1.4.ebuild b/app-arch/gcab/gcab-1.4.ebuild
index 71661b471bf8..38e48924bd1d 100644
--- a/app-arch/gcab/gcab-1.4.ebuild
+++ b/app-arch/gcab/gcab-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/msitools"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="gtk-doc +introspection test vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/app-arch/gzip/gzip-1.10.ebuild b/app-arch/gzip/gzip-1.10.ebuild
index e1c3fc545fcc..c7101f915552 100644
--- a/app-arch/gzip/gzip-1.10.ebuild
+++ b/app-arch/gzip/gzip-1.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/gzip/${P}.tar.xz
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="pic static"
PATCHES=(
diff --git a/app-arch/gzip/gzip-1.9.ebuild b/app-arch/gzip/gzip-1.9.ebuild
index 08f3b6b95e7c..5e55b04b2fff 100644
--- a/app-arch/gzip/gzip-1.9.ebuild
+++ b/app-arch/gzip/gzip-1.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/gzip/${P}.tar.xz
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="pic static"
PATCHES=(
diff --git a/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild b/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild
index 822636019153..ab756306f95b 100644
--- a/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild
+++ b/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="debug symlink"
RDEPEND="symlink? ( !app-arch/pbzip2[symlink] )"
diff --git a/app-arch/lha/lha-114i_p20201004.ebuild b/app-arch/lha/lha-114i_p20201004.ebuild
index 654cab125457..88831bf85bd4 100644
--- a/app-arch/lha/lha-114i_p20201004.ebuild
+++ b/app-arch/lha/lha-114i_p20201004.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jca02266/lha/archive/${MY_COMMIT}.tar.gz -> ${P}.tar
LICENSE="lha"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
S="${WORKDIR}/${PN}-${MY_COMMIT}"
diff --git a/app-arch/libarchive/libarchive-3.5.1.ebuild b/app-arch/libarchive/libarchive-3.5.1.ebuild
index 29fe27756e66..2db8781cfd2a 100644
--- a/app-arch/libarchive/libarchive-3.5.1.ebuild
+++ b/app-arch/libarchive/libarchive-3.5.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
LICENSE="BSD BSD-2 BSD-4 public-domain"
SLOT="0/13"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd"
RDEPEND="
diff --git a/app-arch/lz4/lz4-1.9.3.ebuild b/app-arch/lz4/lz4-1.9.3.ebuild
index 74a473c1e9fe..02eac78fb6dd 100644
--- a/app-arch/lz4/lz4-1.9.3.ebuild
+++ b/app-arch/lz4/lz4-1.9.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/lz4/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2 GPL-2"
# https://abi-laboratory.pro/tracker/timeline/lz4/
SLOT="0/r132"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
CMAKE_USE_DIR=${S}/build/cmake
diff --git a/app-arch/ncompress/ncompress-4.2.4.5.ebuild b/app-arch/ncompress/ncompress-4.2.4.5.ebuild
index ae90effb56e2..6e674e404fac 100644
--- a/app-arch/ncompress/ncompress-4.2.4.5.ebuild
+++ b/app-arch/ncompress/ncompress-4.2.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vapier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE=""
src_compile() {
diff --git a/app-arch/pbzip2/pbzip2-1.1.12.ebuild b/app-arch/pbzip2/pbzip2-1.1.12.ebuild
index b1c5fe68fa03..59a8b73bbc09 100644
--- a/app-arch/pbzip2/pbzip2-1.1.12.ebuild
+++ b/app-arch/pbzip2/pbzip2-1.1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/pbzip2/${PV:0:3}/${PV}/+download/${P}.tar.gz"
LICENSE="BZIP2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="static symlink"
LIB_DEPEND="app-arch/bzip2[static-libs(+)]"
diff --git a/app-arch/pigz/pigz-2.4-r1.ebuild b/app-arch/pigz/pigz-2.4-r1.ebuild
index bd45334879b1..f23df83523ad 100644
--- a/app-arch/pigz/pigz-2.4-r1.ebuild
+++ b/app-arch/pigz/pigz-2.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.zlib.net/pigz/${P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
IUSE="static symlink test"
RESTRICT="!test? ( test )"
diff --git a/app-arch/pixz/pixz-1.0.7.ebuild b/app-arch/pixz/pixz-1.0.7.ebuild
index a8ebba1a088a..83c9e097ed89 100644
--- a/app-arch/pixz/pixz-1.0.7.ebuild
+++ b/app-arch/pixz/pixz-1.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3 autotools
else
SRC_URI="https://github.com/vasi/pixz/releases/download/v${PV}/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
fi
DESCRIPTION="Parallel Indexed XZ compressor"
diff --git a/app-arch/rpm/rpm-4.14.2.1-r1.ebuild b/app-arch/rpm/rpm-4.14.2.1-r1.ebuild
index 093c7b5ef40d..d75365d36031 100644
--- a/app-arch/rpm/rpm-4.14.2.1-r1.ebuild
+++ b/app-arch/rpm/rpm-4.14.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
# Tests are broken. See bug 657500
RESTRICT="test"
diff --git a/app-arch/rpm/rpm-4.16.0.ebuild b/app-arch/rpm/rpm-4.16.0.ebuild
index 444bf99227f5..1742df61ac57 100644
--- a/app-arch/rpm/rpm-4.16.0.ebuild
+++ b/app-arch/rpm/rpm-4.16.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
# Tests are broken. See bug 657500
RESTRICT="test"
diff --git a/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r2.ebuild b/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r2.ebuild
index a255cb3577ec..d2cb2194cd49 100644
--- a/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r2.ebuild
+++ b/app-arch/rpm2targz/rpm2targz-9.0.0.5g-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
LICENSE="BSD-1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=""
diff --git a/app-arch/sharutils/sharutils-4.15.2-r1.ebuild b/app-arch/sharutils/sharutils-4.15.2-r1.ebuild
index abee94661bc9..aa5896e09545 100644
--- a/app-arch/sharutils/sharutils-4.15.2-r1.ebuild
+++ b/app-arch/sharutils/sharutils-4.15.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="nls"
DEPEND="app-arch/xz-utils
diff --git a/app-arch/snappy/snappy-1.1.8.ebuild b/app-arch/snappy/snappy-1.1.8.ebuild
index 64b7812e05e7..4a455d9b01b9 100644
--- a/app-arch/snappy/snappy-1.1.8.ebuild
+++ b/app-arch/snappy/snappy-1.1.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV%%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/app-arch/tar/tar-1.32-r1.ebuild b/app-arch/tar/tar-1.32-r1.ebuild
index db7d8023d601..7d3bb9785671 100644
--- a/app-arch/tar/tar-1.32-r1.ebuild
+++ b/app-arch/tar/tar-1.32-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/tar/${P}.tar.bz2
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="acl elibc_glibc minimal nls selinux userland_GNU xattr"
RDEPEND="
diff --git a/app-arch/unace/unace-2.5-r5.ebuild b/app-arch/unace/unace-2.5-r5.ebuild
index 51a526825234..fd5a75cbe2f2 100644
--- a/app-arch/unace/unace-2.5-r5.ebuild
+++ b/app-arch/unace/unace-2.5-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/non-free/u/unace-nonfree/unace-nonfree_${PV}.orig.
LICENSE="freedist"
SLOT="1"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 s390 x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~sparc-solaris"
IUSE=""
PATCHES=( "${WORKDIR}"/debian/patches/ )
diff --git a/app-arch/unrar/unrar-6.0.3.ebuild b/app-arch/unrar/unrar-6.0.3.ebuild
index 773d93d1e121..f2e3f92d40ea 100644
--- a/app-arch/unrar/unrar-6.0.3.ebuild
+++ b/app-arch/unrar/unrar-6.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="unRAR"
# subslot = soname version
SLOT="0/6"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
IUSE=""
RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
diff --git a/app-arch/unzip/unzip-6.0_p25-r1.ebuild b/app-arch/unzip/unzip-6.0_p25-r1.ebuild
index 54bf325de944..398013305c5d 100644
--- a/app-arch/unzip/unzip-6.0_p25-r1.ebuild
+++ b/app-arch/unzip/unzip-6.0_p25-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz
LICENSE="Info-ZIP"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 natspec unicode"
DEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-arch/xz-utils/xz-utils-5.2.5.ebuild b/app-arch/xz-utils/xz-utils-5.2.5.ebuild
index d4c053d92622..f3623aeb5329 100644
--- a/app-arch/xz-utils/xz-utils-5.2.5.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.5.ebuild
@@ -17,7 +17,7 @@ else
MY_P="${PN/-utils}-${PV/_}"
SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
[[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
S="${WORKDIR}/${MY_P}"
fi
diff --git a/app-arch/zip/zip-3.0-r4.ebuild b/app-arch/zip/zip-3.0-r4.ebuild
index 09c1613a642e..d03dd55d5bf2 100644
--- a/app-arch/zip/zip-3.0-r4.ebuild
+++ b/app-arch/zip/zip-3.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.zip"
LICENSE="Info-ZIP"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
IUSE="bzip2 crypt natspec unicode"
DEPEND="${RDEPEND}"
diff --git a/app-arch/zopfli/zopfli-1.0.2.ebuild b/app-arch/zopfli/zopfli-1.0.2.ebuild
index b1ceb137f61c..3504bf16d766 100644
--- a/app-arch/zopfli/zopfli-1.0.2.ebuild
+++ b/app-arch/zopfli/zopfli-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${P}"
LICENSE="Apache-2.0"
SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
DOCS=( CONTRIBUTORS README README.zopflipng )
diff --git a/app-arch/zopfli/zopfli-1.0.3.ebuild b/app-arch/zopfli/zopfli-1.0.3.ebuild
index 9fcaf2e720e4..d25c4c0ccc17 100644
--- a/app-arch/zopfli/zopfli-1.0.3.ebuild
+++ b/app-arch/zopfli/zopfli-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,6 +13,6 @@ S="${WORKDIR}/${PN}-${P}"
LICENSE="Apache-2.0"
SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
DOCS=( CONTRIBUTORS README README.zopflipng )
diff --git a/app-arch/zstd/zstd-1.4.9.ebuild b/app-arch/zstd/zstd-1.4.9.ebuild
index 0fe3f2a85aec..da3fe8961c8c 100644
--- a/app-arch/zstd/zstd-1.4.9.ebuild
+++ b/app-arch/zstd/zstd-1.4.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( BSD GPL-2 )"
SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="lz4 static-libs +threads"
RDEPEND="app-arch/xz-utils
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
index b86d95dc2ee5..5ff3221ef76d 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$
LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="acl caps nls unicode selinux"
BDEPEND="
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
index bc2a268925bd..36550e7b64e3 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$
LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="acl caps nls unicode"
RDEPEND="acl? ( virtual/acl )
diff --git a/app-crypt/argon2/argon2-20190702.ebuild b/app-crypt/argon2/argon2-20190702.ebuild
index 6d8513674c0c..b8456fce50bf 100644
--- a/app-crypt/argon2/argon2-20190702.ebuild
+++ b/app-crypt/argon2/argon2-20190702.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}
LICENSE="|| ( Apache-2.0 CC0-1.0 )"
SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="static-libs"
S="${WORKDIR}/phc-winner-${P}"
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild
index 65cade88a186..89d2d7bea845 100644
--- a/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="libressl"
DEPEND="!libressl? ( >=dev-libs/openssl-0.9.6:0= )
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.7.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.7.ebuild
index 65cade88a186..89d2d7bea845 100644
--- a/app-crypt/easy-rsa/easy-rsa-3.0.7.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="libressl"
DEPEND="!libressl? ( >=dev-libs/openssl-0.9.6:0= )
diff --git a/app-crypt/gentoo-keys/gentoo-keys-201901130136.ebuild b/app-crypt/gentoo-keys/gentoo-keys-201901130136.ebuild
index cbadedf42bac..1f3b7e7dfb35 100644
--- a/app-crypt/gentoo-keys/gentoo-keys-201901130136.ebuild
+++ b/app-crypt/gentoo-keys/gentoo-keys-201901130136.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2014-2020 Gentoo Authors
+# Copyright 2014-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~dolsen/releases/keyrings/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux"
S="${WORKDIR}"
diff --git a/app-crypt/gnupg/gnupg-2.2.25.ebuild b/app-crypt/gnupg/gnupg-2.2.25.ebuild
index 6b541182a736..98ebf484c160 100644
--- a/app-crypt/gnupg/gnupg-2.2.25.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.25.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 doc ldap nls readline scd-shared-access selinux +smartcard ssl tofu tools usb user-socket wks-server"
# Existence of executables is checked during configuration.
diff --git a/app-crypt/gnupg/gnupg-2.2.27.ebuild b/app-crypt/gnupg/gnupg-2.2.27.ebuild
index 1ba94c31a32d..abbcdf02bd07 100644
--- a/app-crypt/gnupg/gnupg-2.2.27.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.27.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 doc ldap nls readline scd-shared-access selinux +smartcard ssl tofu tools usb user-socket wks-server"
# Existence of executables is checked during configuration.
diff --git a/app-crypt/hashalot/hashalot-0.3-r2.ebuild b/app-crypt/hashalot/hashalot-0.3-r2.ebuild
index 765bf733551b..7f65384a9edd 100644
--- a/app-crypt/hashalot/hashalot-0.3-r2.ebuild
+++ b/app-crypt/hashalot/hashalot-0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,4 +9,4 @@ SRC_URI="https://www.paranoiacs.org/~sluskyb/hacks/hashalot/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/app-crypt/heimdal/heimdal-7.6.0.ebuild b/app-crypt/heimdal/heimdal-7.6.0.ebuild
index f7a97fea37f3..cb90fe7d33b9 100644
--- a/app-crypt/heimdal/heimdal-7.6.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.6.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="afs +berkdb caps gdbm hdb-ldap ipv6 libressl +lmdb otp selinux ssl static-libs test X"
RESTRICT="!test? ( test )"
diff --git a/app-crypt/libb2/libb2-0.98.1-r2.ebuild b/app-crypt/libb2/libb2-0.98.1-r2.ebuild
index 90f130eb4c47..e51689e6a0e3 100644
--- a/app-crypt/libb2/libb2-0.98.1-r2.ebuild
+++ b/app-crypt/libb2/libb2-0.98.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.g
LICENSE="CC0-1.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs native-cflags openmp"
DEPEND="
diff --git a/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild b/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
index a1d32fa5402d..55e78bbb25fe 100644
--- a/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
+++ b/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mhash/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
BDEPEND="dev-lang/perl" # pod2html
diff --git a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild
index cda72695ac4a..f01549b24c46 100644
--- a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild
+++ b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="openafs-krb5-a BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
BDEPEND="virtual/pkgconfig"
RDEPEND=">=app-crypt/mit-krb5-1.8.0
diff --git a/app-crypt/openpgp-keys-django/openpgp-keys-django-20201105.ebuild b/app-crypt/openpgp-keys-django/openpgp-keys-django-20201105.ebuild
index 04c0ae97f09f..f7097a1bad5a 100644
--- a/app-crypt/openpgp-keys-django/openpgp-keys-django-20201105.ebuild
+++ b/app-crypt/openpgp-keys-django/openpgp-keys-django-20201105.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
S=${WORKDIR}
diff --git a/app-crypt/openpgp-keys-django/openpgp-keys-django-20201201.ebuild b/app-crypt/openpgp-keys-django/openpgp-keys-django-20201201.ebuild
index 89d87a7ac86d..10fe99899c44 100644
--- a/app-crypt/openpgp-keys-django/openpgp-keys-django-20201201.ebuild
+++ b/app-crypt/openpgp-keys-django/openpgp-keys-django-20201201.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
S=${WORKDIR}
diff --git a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20200704.ebuild b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20200704.ebuild
index f829b9696742..4625fc542d35 100644
--- a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20200704.ebuild
+++ b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20200704.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${P
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/app-crypt/openpgp-keys-kernel/openpgp-keys-kernel-20201103.ebuild b/app-crypt/openpgp-keys-kernel/openpgp-keys-kernel-20201103.ebuild
index 92a4141ecf78..78b0b20d1536 100644
--- a/app-crypt/openpgp-keys-kernel/openpgp-keys-kernel-20201103.ebuild
+++ b/app-crypt/openpgp-keys-kernel/openpgp-keys-kernel-20201103.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
S=${WORKDIR}
diff --git a/app-crypt/openpgp-keys-linuxcontainers/openpgp-keys-linuxcontainers-20201014.ebuild b/app-crypt/openpgp-keys-linuxcontainers/openpgp-keys-linuxcontainers-20201014.ebuild
index c9e6d6f18da6..45244fd3306e 100644
--- a/app-crypt/openpgp-keys-linuxcontainers/openpgp-keys-linuxcontainers-20201014.ebuild
+++ b/app-crypt/openpgp-keys-linuxcontainers/openpgp-keys-linuxcontainers-20201014.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x4880b8c9bd0e510
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
S="${WORKDIR}"
diff --git a/app-crypt/openpgp-keys-miniupnp/openpgp-keys-miniupnp-20201006.ebuild b/app-crypt/openpgp-keys-miniupnp/openpgp-keys-miniupnp-20201006.ebuild
index 4b07eeca6024..4c5587b7618b 100644
--- a/app-crypt/openpgp-keys-miniupnp/openpgp-keys-miniupnp-20201006.ebuild
+++ b/app-crypt/openpgp-keys-miniupnp/openpgp-keys-miniupnp-20201006.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
S=${WORKDIR}
diff --git a/app-crypt/openpgp-keys-python/openpgp-keys-python-20210121.ebuild b/app-crypt/openpgp-keys-python/openpgp-keys-python-20210121.ebuild
index a8034804ff62..a82c33faecc5 100644
--- a/app-crypt/openpgp-keys-python/openpgp-keys-python-20210121.ebuild
+++ b/app-crypt/openpgp-keys-python/openpgp-keys-python-20210121.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
S=${WORKDIR}
diff --git a/app-crypt/openpgp-keys-terminator/openpgp-keys-terminator-20210306.ebuild b/app-crypt/openpgp-keys-terminator/openpgp-keys-terminator-20210306.ebuild
index 8389ba121a4e..beed99a83aa6 100644
--- a/app-crypt/openpgp-keys-terminator/openpgp-keys-terminator-20210306.ebuild
+++ b/app-crypt/openpgp-keys-terminator/openpgp-keys-terminator-20210306.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/gnome-terminator/terminator/releases/download/v2.1.0
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
S=${WORKDIR}
diff --git a/app-crypt/openpgp-keys-voikko/openpgp-keys-voikko-20201013.ebuild b/app-crypt/openpgp-keys-voikko/openpgp-keys-voikko-20201013.ebuild
index c9c2da1126d9..4f61a197345d 100644
--- a/app-crypt/openpgp-keys-voikko/openpgp-keys-voikko-20201013.ebuild
+++ b/app-crypt/openpgp-keys-voikko/openpgp-keys-voikko-20201013.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://keys.gnupg.net/pks/lookup?op=get&search=0x3D309B604AE3942E -> 4A
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
S="${WORKDIR}"
diff --git a/app-crypt/p11-kit/p11-kit-0.23.22.ebuild b/app-crypt/p11-kit/p11-kit-0.23.22.ebuild
index f373dac47efa..d8fecbda2389 100644
--- a/app-crypt/p11-kit/p11-kit-0.23.22.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.23.22.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+asn1 debug +libffi systemd +trust"
REQUIRED_USE="trust? ( asn1 )"
diff --git a/app-crypt/pinentry/pinentry-1.1.0-r4.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r4.ebuild
index 967f928b26f7..4a7e89129558 100644
--- a/app-crypt/pinentry/pinentry-1.1.0-r4.ebuild
+++ b/app-crypt/pinentry/pinentry-1.1.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="caps emacs gnome-keyring gtk ncurses qt5"
DEPEND="
diff --git a/app-crypt/rhash/rhash-1.3.6-r1.ebuild b/app-crypt/rhash/rhash-1.3.6-r1.ebuild
index 1aae5aeadcb8..4afea509f752 100644
--- a/app-crypt/rhash/rhash-1.3.6-r1.ebuild
+++ b/app-crypt/rhash/rhash-1.3.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~x64-solaris ~x86-solaris"
IUSE="debug nls libressl ssl static-libs"
RDEPEND="
diff --git a/app-crypt/shash/shash-0.2.6-r3.ebuild b/app-crypt/shash/shash-0.2.6-r3.ebuild
index dbcb2f265749..158e48f3af71 100644
--- a/app-crypt/shash/shash-0.2.6-r3.ebuild
+++ b/app-crypt/shash/shash-0.2.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="ftp://mcrypt.hellug.gr/pub/mcrypt/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="static"
DEPEND=">=app-crypt/mhash-0.8.18-r1
diff --git a/app-crypt/veracrypt/veracrypt-1.24_p8.ebuild b/app-crypt/veracrypt/veracrypt-1.24_p8.ebuild
index a0d3a867b3f6..91bc89eb3f73 100644
--- a/app-crypt/veracrypt/veracrypt-1.24_p8.ebuild
+++ b/app-crypt/veracrypt/veracrypt-1.24_p8.ebuild
@@ -2,6 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
+
+WX_GTK_VER="3.0-gtk3"
inherit desktop eapi7-ver linux-info pax-utils toolchain-funcs wxwidgets
MY_PV="$(ver_cut 1-2)-Update$(ver_cut 4)_MacOSX"
@@ -19,8 +21,6 @@ KEYWORDS="amd64"
IUSE="+asm cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc X"
RESTRICT="bindist mirror"
-WX_GTK_VER="3.0-gtk3"
-
RDEPEND="
sys-fs/lvm2
sys-fs/fuse:0
diff --git a/app-dicts/aspell-af/aspell-af-0.50.0.ebuild b/app-dicts/aspell-af/aspell-af-0.50.0.ebuild
index 70c3e696f010..f4c79c820ed0 100644
--- a/app-dicts/aspell-af/aspell-af-0.50.0.ebuild
+++ b/app-dicts/aspell-af/aspell-af-0.50.0.ebuild
@@ -8,4 +8,4 @@ ASPELL_LANG="Afrikaans"
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/app-dicts/aspell-be/aspell-be-0.01-r1.ebuild b/app-dicts/aspell-be/aspell-be-0.01-r1.ebuild
index e2f9bb303f25..8f0a7b14d104 100644
--- a/app-dicts/aspell-be/aspell-be-0.01-r1.ebuild
+++ b/app-dicts/aspell-be/aspell-be-0.01-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN%-*}/dict/${PN/aspell-/}/${MY_P}.tar.bz2"
S="${WORKDIR}/${MY_P}"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="classic"
src_prepare() {
diff --git a/app-dicts/aspell-bg/aspell-bg-4.1.0.ebuild b/app-dicts/aspell-bg/aspell-bg-4.1.0.ebuild
index c0b6874109b1..0a1ca7120237 100644
--- a/app-dicts/aspell-bg/aspell-bg-4.1.0.ebuild
+++ b/app-dicts/aspell-bg/aspell-bg-4.1.0.ebuild
@@ -9,4 +9,4 @@ ASPELL_VERSION=6
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/app-dicts/aspell-br/aspell-br-0.50.2.ebuild b/app-dicts/aspell-br/aspell-br-0.50.2.ebuild
index 2421022b2ac4..9802d4cfd520 100644
--- a/app-dicts/aspell-br/aspell-br-0.50.2.ebuild
+++ b/app-dicts/aspell-br/aspell-br-0.50.2.ebuild
@@ -8,4 +8,4 @@ ASPELL_LANG="Breton"
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/app-dicts/aspell-ca/aspell-ca-2.1.5.1.ebuild b/app-dicts/aspell-ca/aspell-ca-2.1.5.1.ebuild
index 80181b38a753..ed97b348cdb3 100644
--- a/app-dicts/aspell-ca/aspell-ca-2.1.5.1.ebuild
+++ b/app-dicts/aspell-ca/aspell-ca-2.1.5.1.ebuild
@@ -9,4 +9,4 @@ ASPELL_VERSION=6
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/app-dicts/aspell-cs/aspell-cs-20040614.1.ebuild b/app-dicts/aspell-cs/aspell-cs-20040614.1.ebuild
index 40db143e5398..9e1f29f504fe 100644
--- a/app-dicts/aspell-cs/aspell-cs-20040614.1.ebuild
+++ b/app-dicts/aspell-cs/aspell-cs-20040614.1.ebuild
@@ -9,4 +9,4 @@ ASPELL_VERSION=6
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/app-dicts/aspell-cy/aspell-cy-0.50.3.ebuild b/app-dicts/aspell-cy/aspell-cy-0.50.3.ebuild
index 1b48d74831e5..8237b47e0679 100644
--- a/app-dicts/aspell-cy/aspell-cy-0.50.3.ebuild
+++ b/app-dicts/aspell-cy/aspell-cy-0.50.3.ebuild
@@ -8,4 +8,4 @@ ASPELL_LANG="Welsh"
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/app-dicts/aspell-da/aspell-da-1.7.42.ebuild b/app-dicts/aspell-da/aspell-da-1.7.42.ebuild
index d21d06d7d7c0..ef0d29179ac3 100644
--- a/app-dicts/aspell-da/aspell-da-1.7.42.ebuild
+++ b/app-dicts/aspell-da/aspell-da-1.7.42.ebuild
@@ -12,4 +12,4 @@ SRC_URI="https://da.speling.org/filer/new_${P}.tar.bz2"
S="${WORKDIR}/new_${P}"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos"
diff --git a/app-dicts/aspell-de-alt/aspell-de-alt-2.1.1-r1.ebuild b/app-dicts/aspell-de-alt/aspell-de-alt-2.1.1-r1.ebuild
index c2057bcef390..9c69a1f906ff 100644
--- a/app-dicts/aspell-de-alt/aspell-de-alt-2.1.1-r1.ebuild
+++ b/app-dicts/aspell-de-alt/aspell-de-alt-2.1.1-r1.ebuild
@@ -9,7 +9,7 @@ ASPELL_VERSION=6
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
PATCHES=( "${FILESDIR}/${P}-dict-name.patch" )
diff --git a/app-dicts/aspell-de/aspell-de-0.60_pre20030222.ebuild b/app-dicts/aspell-de/aspell-de-0.60_pre20030222.ebuild
index bbb75984fc5f..8ade53922703 100644
--- a/app-dicts/aspell-de/aspell-de-0.60_pre20030222.ebuild
+++ b/app-dicts/aspell-de/aspell-de-0.60_pre20030222.ebuild
@@ -12,4 +12,4 @@ SRC_URI="mirror://gnu/aspell/dict/de/${MY_P}.tar.bz2"
S="${WORKDIR}/${MY_P}"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
diff --git a/app-dicts/aspell-el/aspell-el-0.50.3.ebuild b/app-dicts/aspell-el/aspell-el-0.50.3.ebuild
index 82ed0bcb4ef2..2d8f37f0ac69 100644
--- a/app-dicts/aspell-el/aspell-el-0.50.3.ebuild
+++ b/app-dicts/aspell-el/aspell-el-0.50.3.ebuild
@@ -7,4 +7,4 @@ ASPELL_LANG="Greek"
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/app-dicts/aspell-en/aspell-en-2018.04.16.0.ebuild b/app-dicts/aspell-en/aspell-en-2018.04.16.0.ebuild
index 9d096a88bd51..1a731cecd0c7 100644
--- a/app-dicts/aspell-en/aspell-en-2018.04.16.0.ebuild
+++ b/app-dicts/aspell-en/aspell-en-2018.04.16.0.ebuild
@@ -10,4 +10,4 @@ inherit aspell-dict-r1
SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${PN%-*}${ASPELL_VERSION}-${PN#*-}-$(ver_rs 3 '-').tar.bz2"
LICENSE="myspell-en_CA-KevinAtkinson public-domain Princeton Ispell"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
diff --git a/app-dicts/aspell-eo/aspell-eo-2.1.20000225.2.ebuild b/app-dicts/aspell-eo/aspell-eo-2.1.20000225.2.ebuild
index cd8a38ad1903..34850a815381 100644
--- a/app-dicts/aspell-eo/aspell-eo-2.1.20000225.2.ebuild
+++ b/app-dicts/aspell-eo/aspell-eo-2.1.20000225.2.ebuild
@@ -14,4 +14,4 @@ SRC_URI="mirror://gnu/${PN%-*}/dict/${PN/aspell-/}/${MY_P}.tar.bz2"
S="${WORKDIR}/${MY_P}"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/app-dicts/aspell-es/aspell-es-1.9a.ebuild b/app-dicts/aspell-es/aspell-es-1.9a.ebuild
index 9747afdb61ec..cfa148c63bc1 100644
--- a/app-dicts/aspell-es/aspell-es-1.9a.ebuild
+++ b/app-dicts/aspell-es/aspell-es-1.9a.ebuild
@@ -12,4 +12,4 @@ SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${MY_P}.tar.bz2"
S="${WORKDIR}/${MY_P}"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/app-dicts/aspell-et/aspell-et-0.1.21.1.ebuild b/app-dicts/aspell-et/aspell-et-0.1.21.1.ebuild
index 220265133e27..500ebfb47ea4 100644
--- a/app-dicts/aspell-et/aspell-et-0.1.21.1.ebuild
+++ b/app-dicts/aspell-et/aspell-et-0.1.21.1.ebuild
@@ -9,4 +9,4 @@ ASPELL_VERSION=6
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/app-dicts/aspell-fi/aspell-fi-0.7.0.ebuild b/app-dicts/aspell-fi/aspell-fi-0.7.0.ebuild
index 31905e6505ed..bc2a935d2bd3 100644
--- a/app-dicts/aspell-fi/aspell-fi-0.7.0.ebuild
+++ b/app-dicts/aspell-fi/aspell-fi-0.7.0.ebuild
@@ -9,4 +9,4 @@ ASPELL_VERSION=6
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/app-dicts/aspell-fo/aspell-fo-0.51.0.ebuild b/app-dicts/aspell-fo/aspell-fo-0.51.0.ebuild
index b166c4df9e69..a4d9bee4a71b 100644
--- a/app-dicts/aspell-fo/aspell-fo-0.51.0.ebuild
+++ b/app-dicts/aspell-fo/aspell-fo-0.51.0.ebuild
@@ -7,4 +7,4 @@ ASPELL_LANG="Faroese"
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/app-dicts/aspell-fr/aspell-fr-0.50.3.ebuild b/app-dicts/aspell-fr/aspell-fr-0.50.3.ebuild
index 6ef034221673..313b671b9d5d 100644
--- a/app-dicts/aspell-fr/aspell-fr-0.50.3.ebuild
+++ b/app-dicts/aspell-fr/aspell-fr-0.50.3.ebuild
@@ -8,4 +8,4 @@ ASPELL_LANG="French"
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos"
diff --git a/app-dicts/aspell-ga/aspell-ga-0.50.4.ebuild b/app-dicts/aspell-ga/aspell-ga-0.50.4.ebuild
index 633903c45e17..8b992641d4c5 100644
--- a/app-dicts/aspell-ga/aspell-ga-0.50.4.ebuild
+++ b/app-dicts/aspell-ga/aspell-ga-0.50.4.ebuild
@@ -7,4 +7,4 @@ ASPELL_LANG="Irish"
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/app-dicts/aspell-gl/aspell-gl-0.5.2.ebuild b/app-dicts/aspell-gl/aspell-gl-0.5.2.ebuild
index ba98c253636c..8d51194f31cd 100644
--- a/app-dicts/aspell-gl/aspell-gl-0.5.2.ebuild
+++ b/app-dicts/aspell-gl/aspell-gl-0.5.2.ebuild
@@ -14,4 +14,4 @@ SRC_URI="mirror://gnu/${PN%-*}/dict/${PN/aspell-/}/${MY_P}.tar.bz2"
S="${WORKDIR}/${MY_P}"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/app-dicts/aspell-he/aspell-he-1.0.0.ebuild b/app-dicts/aspell-he/aspell-he-1.0.0.ebuild
index 271deffddb10..ac4e5096e25d 100644
--- a/app-dicts/aspell-he/aspell-he-1.0.0.ebuild
+++ b/app-dicts/aspell-he/aspell-he-1.0.0.ebuild
@@ -9,4 +9,4 @@ ASPELL_VERSION=6
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/app-dicts/aspell-hr/aspell-hr-0.51.0.ebuild b/app-dicts/aspell-hr/aspell-hr-0.51.0.ebuild
index d65e7b1c6331..29fe1f0f3f8e 100644
--- a/app-dicts/aspell-hr/aspell-hr-0.51.0.ebuild
+++ b/app-dicts/aspell-hr/aspell-hr-0.51.0.ebuild
@@ -8,4 +8,4 @@ ASPELL_LANG="Croatian"
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/app-dicts/aspell-hu/aspell-hu-0.99.4.2.0.ebuild b/app-dicts/aspell-hu/aspell-hu-0.99.4.2.0.ebuild
index 3930bc4822cd..e3d7ca7fd7ec 100644
--- a/app-dicts/aspell-hu/aspell-hu-0.99.4.2.0.ebuild
+++ b/app-dicts/aspell-hu/aspell-hu-0.99.4.2.0.ebuild
@@ -9,4 +9,4 @@ ASPELL_VERSION=6
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/app-dicts/aspell-hy/aspell-hy-0.10.0.0.ebuild b/app-dicts/aspell-hy/aspell-hy-0.10.0.0.ebuild
index 7bf4b11a81c4..1c91b7396000 100644
--- a/app-dicts/aspell-hy/aspell-hy-0.10.0.0.ebuild
+++ b/app-dicts/aspell-hy/aspell-hy-0.10.0.0.ebuild
@@ -9,4 +9,4 @@ ASPELL_VERSION=6
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/app-dicts/aspell-is/aspell-is-0.51.1.0-r1.ebuild b/app-dicts/aspell-is/aspell-is-0.51.1.0-r1.ebuild
index cb88b0f40b2d..4e415ab83aaa 100644
--- a/app-dicts/aspell-is/aspell-is-0.51.1.0-r1.ebuild
+++ b/app-dicts/aspell-is/aspell-is-0.51.1.0-r1.ebuild
@@ -8,7 +8,7 @@ ASPELL_LANG="Icelandic"
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
src_prepare() {
default
diff --git a/app-dicts/aspell-it/aspell-it-2.4.20070901.0.ebuild b/app-dicts/aspell-it/aspell-it-2.4.20070901.0.ebuild
index 51fc938acebf..58a6ce0f48b9 100644
--- a/app-dicts/aspell-it/aspell-it-2.4.20070901.0.ebuild
+++ b/app-dicts/aspell-it/aspell-it-2.4.20070901.0.ebuild
@@ -14,4 +14,4 @@ SRC_URI="mirror://sourceforge/linguistico/${MY_P}.tar.bz2"
S="${WORKDIR}/${MY_P}"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/app-dicts/aspell-la/aspell-la-20020503.0.ebuild b/app-dicts/aspell-la/aspell-la-20020503.0.ebuild
index 50719a9b350d..a3290f9685a6 100644
--- a/app-dicts/aspell-la/aspell-la-20020503.0.ebuild
+++ b/app-dicts/aspell-la/aspell-la-20020503.0.ebuild
@@ -9,4 +9,4 @@ ASPELL_VERSION=6
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/app-dicts/aspell-lt/aspell-lt-1.0.1.ebuild b/app-dicts/aspell-lt/aspell-lt-1.0.1.ebuild
index c7cd77d857d1..be54e5af40f8 100644
--- a/app-dicts/aspell-lt/aspell-lt-1.0.1.ebuild
+++ b/app-dicts/aspell-lt/aspell-lt-1.0.1.ebuild
@@ -12,4 +12,4 @@ SRC_URI="mirror://gnu/aspell/dict/lt/${MY_P}.tar.bz2"
S="${WORKDIR}/${MY_P}"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/app-dicts/aspell-nl/aspell-nl-0.50.2.ebuild b/app-dicts/aspell-nl/aspell-nl-0.50.2.ebuild
index e516cca10b2a..8de9091be5c6 100644
--- a/app-dicts/aspell-nl/aspell-nl-0.50.2.ebuild
+++ b/app-dicts/aspell-nl/aspell-nl-0.50.2.ebuild
@@ -8,4 +8,4 @@ ASPELL_LANG="Dutch"
inherit aspell-dict-r1
LICENSE="freedist"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
diff --git a/app-dicts/aspell-no/aspell-no-0.50.2-r1.ebuild b/app-dicts/aspell-no/aspell-no-0.50.2-r1.ebuild
index 5c72e9c42a2b..e9699114ac48 100644
--- a/app-dicts/aspell-no/aspell-no-0.50.2-r1.ebuild
+++ b/app-dicts/aspell-no/aspell-no-0.50.2-r1.ebuild
@@ -8,6 +8,6 @@ ASPELL_LANG="Norwegian"
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND="!app-dicts/aspell-nb"
diff --git a/app-dicts/aspell-pl/aspell-pl-6.0.20120418.0.ebuild b/app-dicts/aspell-pl/aspell-pl-6.0.20120418.0.ebuild
index ae159ba248b6..68e67ee61a48 100644
--- a/app-dicts/aspell-pl/aspell-pl-6.0.20120418.0.ebuild
+++ b/app-dicts/aspell-pl/aspell-pl-6.0.20120418.0.ebuild
@@ -14,4 +14,4 @@ SRC_URI="https://sjp.pl/slownik/ort/sjp-${MY_P}.tar.bz2"
S="${WORKDIR}/${MY_P}"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/app-dicts/aspell-pt-br/aspell-pt-br-20090702.0.ebuild b/app-dicts/aspell-pt-br/aspell-pt-br-20090702.0.ebuild
index 0b69c25e6c3a..4626eb6c8b3a 100644
--- a/app-dicts/aspell-pt-br/aspell-pt-br-20090702.0.ebuild
+++ b/app-dicts/aspell-pt-br/aspell-pt-br-20090702.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/aspell/dict/pt_BR/${MY_P}.tar.bz2"
S="${WORKDIR}/${MY_P}"
LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
# Contains a conflict
RDEPEND="!<app-dicts/aspell-pt-0.50.2-r1"
diff --git a/app-dicts/aspell-pt/aspell-pt-0.50.2-r1.ebuild b/app-dicts/aspell-pt/aspell-pt-0.50.2-r1.ebuild
index 6a8ce3f12076..e0d436e993d4 100644
--- a/app-dicts/aspell-pt/aspell-pt-0.50.2-r1.ebuild
+++ b/app-dicts/aspell-pt/aspell-pt-0.50.2-r1.ebuild
@@ -7,7 +7,7 @@ ASPELL_LANG="Portuguese"
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
src_install() {
aspell-dict-r1_src_install
diff --git a/app-dicts/aspell-ro/aspell-ro-3.3.2.ebuild b/app-dicts/aspell-ro/aspell-ro-3.3.2.ebuild
index 6ccbbda2c317..644196303873 100644
--- a/app-dicts/aspell-ro/aspell-ro-3.3.2.ebuild
+++ b/app-dicts/aspell-ro/aspell-ro-3.3.2.ebuild
@@ -14,4 +14,4 @@ HOMEPAGE="
"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/app-dicts/aspell-ru/aspell-ru-0.99.1-r1.ebuild b/app-dicts/aspell-ru/aspell-ru-0.99.1-r1.ebuild
index d5e6d7fd61b4..47f9bc126826 100644
--- a/app-dicts/aspell-ru/aspell-ru-0.99.1-r1.ebuild
+++ b/app-dicts/aspell-ru/aspell-ru-0.99.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/${PN%-*}/dict/${PN/aspell-/}/${MY_P}.tar.bz2"
S="${WORKDIR}/${MY_P}"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
src_prepare() {
default
diff --git a/app-dicts/aspell-sk/aspell-sk-2.01.2.ebuild b/app-dicts/aspell-sk/aspell-sk-2.01.2.ebuild
index 7a82df212dc9..3b1711982bc6 100644
--- a/app-dicts/aspell-sk/aspell-sk-2.01.2.ebuild
+++ b/app-dicts/aspell-sk/aspell-sk-2.01.2.ebuild
@@ -9,4 +9,4 @@ ASPELL_VERSION=6
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/app-dicts/aspell-sl/aspell-sl-0.50.0.ebuild b/app-dicts/aspell-sl/aspell-sl-0.50.0.ebuild
index 0597fa9d0216..77491a204464 100644
--- a/app-dicts/aspell-sl/aspell-sl-0.50.0.ebuild
+++ b/app-dicts/aspell-sl/aspell-sl-0.50.0.ebuild
@@ -8,4 +8,4 @@ ASPELL_LANG="Slovenian"
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/app-dicts/aspell-sr/aspell-sr-0.02.ebuild b/app-dicts/aspell-sr/aspell-sr-0.02.ebuild
index b5ee316aba6c..a3ae3b96bc61 100644
--- a/app-dicts/aspell-sr/aspell-sr-0.02.ebuild
+++ b/app-dicts/aspell-sr/aspell-sr-0.02.ebuild
@@ -13,4 +13,4 @@ SRC_URI="mirror://gnu/${PN%-*}/dict/${PN/aspell-/}/${MY_P}.tar.bz2"
S="${WORKDIR}/${MY_P}"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/app-dicts/aspell-sv/aspell-sv-0.51.0.ebuild b/app-dicts/aspell-sv/aspell-sv-0.51.0.ebuild
index adb51067956e..96d6eba7a8ac 100644
--- a/app-dicts/aspell-sv/aspell-sv-0.51.0.ebuild
+++ b/app-dicts/aspell-sv/aspell-sv-0.51.0.ebuild
@@ -8,4 +8,4 @@ ASPELL_LANG="Swedish"
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
diff --git a/app-dicts/aspell-uk/aspell-uk-1.4.0.0.ebuild b/app-dicts/aspell-uk/aspell-uk-1.4.0.0.ebuild
index c6c97e09ea5d..0096bed59a1e 100644
--- a/app-dicts/aspell-uk/aspell-uk-1.4.0.0.ebuild
+++ b/app-dicts/aspell-uk/aspell-uk-1.4.0.0.ebuild
@@ -9,4 +9,4 @@ ASPELL_VERSION=6
inherit aspell-dict-r1
LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/app-dicts/aspell-vi/aspell-vi-0.01.1.1.ebuild b/app-dicts/aspell-vi/aspell-vi-0.01.1.1.ebuild
index 45b6847219ba..e4cc034ea6c5 100644
--- a/app-dicts/aspell-vi/aspell-vi-0.01.1.1.ebuild
+++ b/app-dicts/aspell-vi/aspell-vi-0.01.1.1.ebuild
@@ -9,4 +9,4 @@ ASPELL_VERSION=6
inherit aspell-dict-r1
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/app-dicts/mecab-ipadic/mecab-ipadic-2.7.0.20070801.ebuild b/app-dicts/mecab-ipadic/mecab-ipadic-2.7.0.20070801.ebuild
index 26eb474b15c3..5b915ad25e9b 100644
--- a/app-dicts/mecab-ipadic/mecab-ipadic-2.7.0.20070801.ebuild
+++ b/app-dicts/mecab-ipadic/mecab-ipadic-2.7.0.20070801.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN%-*}/${MY_P}.tar.gz"
LICENSE="ipadic"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="unicode"
DEPEND="app-text/mecab[unicode=]"
diff --git a/app-doc/autobook/autobook-1.5.ebuild b/app-doc/autobook/autobook-1.5.ebuild
index d8679abf079e..f59a5425bb6d 100644
--- a/app-doc/autobook/autobook-1.5.ebuild
+++ b/app-doc/autobook/autobook-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="
LICENSE="OPL"
SLOT="0"
-KEYWORDS="amd64 arm hppa ~ia64 ~m68k ppc s390 x86"
+KEYWORDS="amd64 arm hppa ~ia64 ~m68k ppc ~s390 x86"
src_install() {
local HTML_DOCS=( . )
diff --git a/app-doc/blas-docs/blas-docs-3.1.1.ebuild b/app-doc/blas-docs/blas-docs-3.1.1.ebuild
index 5ab3505355d7..2db925469c31 100644
--- a/app-doc/blas-docs/blas-docs-3.1.1.ebuild
+++ b/app-doc/blas-docs/blas-docs-3.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/lapack-man-${PV}.tgz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
S=${WORKDIR}/lapack-${PV}/manpages
diff --git a/app-doc/doxygen/doxygen-1.8.17-r1.ebuild b/app-doc/doxygen/doxygen-1.8.17-r1.ebuild
index c76275551d0d..7043af44c3fb 100644
--- a/app-doc/doxygen/doxygen-1.8.17-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.17-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
else
SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Documentation system for most programming languages"
diff --git a/app-doc/eclass-manpages/eclass-manpages-20200913.ebuild b/app-doc/eclass-manpages/eclass-manpages-20200913.ebuild
index ac63b141f9cf..68c4e97e55e4 100644
--- a/app-doc/eclass-manpages/eclass-manpages-20200913.ebuild
+++ b/app-doc/eclass-manpages/eclass-manpages-20200913.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
# Keep the keywords stable. No need to change to ~arch.
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
BDEPEND="app-arch/xz-utils
sys-apps/gawk"
diff --git a/app-doc/eclass-manpages/eclass-manpages-20210104.ebuild b/app-doc/eclass-manpages/eclass-manpages-20210104.ebuild
index 9ff6806bb404..68c4e97e55e4 100644
--- a/app-doc/eclass-manpages/eclass-manpages-20210104.ebuild
+++ b/app-doc/eclass-manpages/eclass-manpages-20210104.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
# Keep the keywords stable. No need to change to ~arch.
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
BDEPEND="app-arch/xz-utils
sys-apps/gawk"
diff --git a/app-doc/lapack-docs/lapack-docs-3.1.1.ebuild b/app-doc/lapack-docs/lapack-docs-3.1.1.ebuild
index 2d45cc97e1f3..ef89634beb60 100644
--- a/app-doc/lapack-docs/lapack-docs-3.1.1.ebuild
+++ b/app-doc/lapack-docs/lapack-docs-3.1.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/lapack-man-${PV}.tgz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
S="${WORKDIR}/lapack-${PV}/manpages"
diff --git a/app-doc/linkers-and-loaders/linkers-and-loaders-1-r1.ebuild b/app-doc/linkers-and-loaders/linkers-and-loaders-1-r1.ebuild
index cf13d7d4ab84..c5b85d678d10 100644
--- a/app-doc/linkers-and-loaders/linkers-and-loaders-1-r1.ebuild
+++ b/app-doc/linkers-and-loaders/linkers-and-loaders-1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://wh0rd.org/books/${P}.tar.lzma"
LICENSE="all-rights-reserved"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="doc"
RESTRICT="mirror bindist"
diff --git a/app-doc/linux-device-drivers/linux-device-drivers-2.ebuild b/app-doc/linux-device-drivers/linux-device-drivers-2.ebuild
index 26e8e629b622..b9f14bca98b9 100644
--- a/app-doc/linux-device-drivers/linux-device-drivers-2.ebuild
+++ b/app-doc/linux-device-drivers/linux-device-drivers-2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://www.xml.com/ldd/chapter/book/pdf/ldd_book_pdf.zip
LICENSE="FDL-1.1"
SLOT="2"
-KEYWORDS="amd64 arm hppa ~ia64 ppc s390 x86"
+KEYWORDS="amd64 arm hppa ~ia64 ppc ~s390 x86"
IUSE=""
DEPEND="app-arch/unzip"
diff --git a/app-doc/linux-device-drivers/linux-device-drivers-3.ebuild b/app-doc/linux-device-drivers/linux-device-drivers-3.ebuild
index e8f30b536da7..b935656a1bcb 100644
--- a/app-doc/linux-device-drivers/linux-device-drivers-3.ebuild
+++ b/app-doc/linux-device-drivers/linux-device-drivers-3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://lwn.net/images/pdf/LDD3/ldd3_pdf.tar.bz2
LICENSE="CC-BY-SA-2.0"
SLOT="3"
-KEYWORDS="amd64 arm hppa ~ia64 ppc s390 x86"
+KEYWORDS="amd64 arm hppa ~ia64 ppc ~s390 x86"
IUSE=""
DEPEND=""
diff --git a/app-doc/linux-kernel-in-a-nutshell/linux-kernel-in-a-nutshell-1-r1.ebuild b/app-doc/linux-kernel-in-a-nutshell/linux-kernel-in-a-nutshell-1-r1.ebuild
index 6b3fd2cd0b37..00b845739ee0 100644
--- a/app-doc/linux-kernel-in-a-nutshell/linux-kernel-in-a-nutshell-1-r1.ebuild
+++ b/app-doc/linux-kernel-in-a-nutshell/linux-kernel-in-a-nutshell-1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/gregkh/lkn/lkn_pdf.tar.b
LICENSE="CC-BY-SA-2.5"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND=""
diff --git a/app-doc/php-docs/php-docs-20190203.ebuild b/app-doc/php-docs/php-docs-20190203.ebuild
index 9d86193e1f87..8d8f9dca53ca 100644
--- a/app-doc/php-docs/php-docs-20190203.ebuild
+++ b/app-doc/php-docs/php-docs-20190203.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ MY_PN="php_manual"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
RESTRICT="strip binchecks"
diff --git a/app-doc/phrack-all/phrack-all-69.ebuild b/app-doc/phrack-all/phrack-all-69.ebuild
index 21b01bbb6829..772a58306427 100644
--- a/app-doc/phrack-all/phrack-all-69.ebuild
+++ b/app-doc/phrack-all/phrack-all-69.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI=""
LICENSE="metapackage"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
RDEPEND=$(printf '~app-doc/phrack-%02i ' {1..69})
diff --git a/app-doc/phrack/phrack-01.ebuild b/app-doc/phrack/phrack-01.ebuild
index 5ba75dba301a..83ee49380825 100644
--- a/app-doc/phrack/phrack-01.ebuild
+++ b/app-doc/phrack/phrack-01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}
diff --git a/app-doc/phrack/phrack-02.ebuild b/app-doc/phrack/phrack-02.ebuild
index 5ba75dba301a..83ee49380825 100644
--- a/app-doc/phrack/phrack-02.ebuild
+++ b/app-doc/phrack/phrack-02.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}
diff --git a/app-doc/phrack/phrack-03.ebuild b/app-doc/phrack/phrack-03.ebuild
index 5ba75dba301a..83ee49380825 100644
--- a/app-doc/phrack/phrack-03.ebuild
+++ b/app-doc/phrack/phrack-03.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}
diff --git a/app-doc/phrack/phrack-04.ebuild b/app-doc/phrack/phrack-04.ebuild
index 5ba75dba301a..83ee49380825 100644
--- a/app-doc/phrack/phrack-04.ebuild
+++ b/app-doc/phrack/phrack-04.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}
diff --git a/app-doc/phrack/phrack-05.ebuild b/app-doc/phrack/phrack-05.ebuild
index 5ba75dba301a..83ee49380825 100644
--- a/app-doc/phrack/phrack-05.ebuild
+++ b/app-doc/phrack/phrack-05.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}
diff --git a/app-doc/phrack/phrack-06.ebuild b/app-doc/phrack/phrack-06.ebuild
index 5ba75dba301a..83ee49380825 100644
--- a/app-doc/phrack/phrack-06.ebuild
+++ b/app-doc/phrack/phrack-06.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}
diff --git a/app-doc/phrack/phrack-07.ebuild b/app-doc/phrack/phrack-07.ebuild
index 5ba75dba301a..83ee49380825 100644
--- a/app-doc/phrack/phrack-07.ebuild
+++ b/app-doc/phrack/phrack-07.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}
diff --git a/app-doc/phrack/phrack-08.ebuild b/app-doc/phrack/phrack-08.ebuild
index 5ba75dba301a..83ee49380825 100644
--- a/app-doc/phrack/phrack-08.ebuild
+++ b/app-doc/phrack/phrack-08.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}
diff --git a/app-doc/phrack/phrack-09.ebuild b/app-doc/phrack/phrack-09.ebuild
index 5ba75dba301a..83ee49380825 100644
--- a/app-doc/phrack/phrack-09.ebuild
+++ b/app-doc/phrack/phrack-09.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}
diff --git a/app-doc/phrack/phrack-10.ebuild b/app-doc/phrack/phrack-10.ebuild
index ee45c0989258..9193cef70192 100644
--- a/app-doc/phrack/phrack-10.ebuild
+++ b/app-doc/phrack/phrack-10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}
diff --git a/app-doc/phrack/phrack-11.ebuild b/app-doc/phrack/phrack-11.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-11.ebuild
+++ b/app-doc/phrack/phrack-11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-12.ebuild b/app-doc/phrack/phrack-12.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-12.ebuild
+++ b/app-doc/phrack/phrack-12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-13.ebuild b/app-doc/phrack/phrack-13.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-13.ebuild
+++ b/app-doc/phrack/phrack-13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-14.ebuild b/app-doc/phrack/phrack-14.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-14.ebuild
+++ b/app-doc/phrack/phrack-14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-15.ebuild b/app-doc/phrack/phrack-15.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-15.ebuild
+++ b/app-doc/phrack/phrack-15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-16.ebuild b/app-doc/phrack/phrack-16.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-16.ebuild
+++ b/app-doc/phrack/phrack-16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-17.ebuild b/app-doc/phrack/phrack-17.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-17.ebuild
+++ b/app-doc/phrack/phrack-17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-18.ebuild b/app-doc/phrack/phrack-18.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-18.ebuild
+++ b/app-doc/phrack/phrack-18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-19.ebuild b/app-doc/phrack/phrack-19.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-19.ebuild
+++ b/app-doc/phrack/phrack-19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-20.ebuild b/app-doc/phrack/phrack-20.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-20.ebuild
+++ b/app-doc/phrack/phrack-20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-21.ebuild b/app-doc/phrack/phrack-21.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-21.ebuild
+++ b/app-doc/phrack/phrack-21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-22.ebuild b/app-doc/phrack/phrack-22.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-22.ebuild
+++ b/app-doc/phrack/phrack-22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-23.ebuild b/app-doc/phrack/phrack-23.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-23.ebuild
+++ b/app-doc/phrack/phrack-23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-24.ebuild b/app-doc/phrack/phrack-24.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-24.ebuild
+++ b/app-doc/phrack/phrack-24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-25.ebuild b/app-doc/phrack/phrack-25.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-25.ebuild
+++ b/app-doc/phrack/phrack-25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-26.ebuild b/app-doc/phrack/phrack-26.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-26.ebuild
+++ b/app-doc/phrack/phrack-26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-27.ebuild b/app-doc/phrack/phrack-27.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-27.ebuild
+++ b/app-doc/phrack/phrack-27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-28.ebuild b/app-doc/phrack/phrack-28.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-28.ebuild
+++ b/app-doc/phrack/phrack-28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-29.ebuild b/app-doc/phrack/phrack-29.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-29.ebuild
+++ b/app-doc/phrack/phrack-29.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-30.ebuild b/app-doc/phrack/phrack-30.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-30.ebuild
+++ b/app-doc/phrack/phrack-30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-31.ebuild b/app-doc/phrack/phrack-31.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-31.ebuild
+++ b/app-doc/phrack/phrack-31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-32.ebuild b/app-doc/phrack/phrack-32.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-32.ebuild
+++ b/app-doc/phrack/phrack-32.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-33.ebuild b/app-doc/phrack/phrack-33.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-33.ebuild
+++ b/app-doc/phrack/phrack-33.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-34.ebuild b/app-doc/phrack/phrack-34.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-34.ebuild
+++ b/app-doc/phrack/phrack-34.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-35.ebuild b/app-doc/phrack/phrack-35.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-35.ebuild
+++ b/app-doc/phrack/phrack-35.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-36.ebuild b/app-doc/phrack/phrack-36.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-36.ebuild
+++ b/app-doc/phrack/phrack-36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-37.ebuild b/app-doc/phrack/phrack-37.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-37.ebuild
+++ b/app-doc/phrack/phrack-37.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-38.ebuild b/app-doc/phrack/phrack-38.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-38.ebuild
+++ b/app-doc/phrack/phrack-38.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-39.ebuild b/app-doc/phrack/phrack-39.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-39.ebuild
+++ b/app-doc/phrack/phrack-39.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-40.ebuild b/app-doc/phrack/phrack-40.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-40.ebuild
+++ b/app-doc/phrack/phrack-40.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-41.ebuild b/app-doc/phrack/phrack-41.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-41.ebuild
+++ b/app-doc/phrack/phrack-41.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-42.ebuild b/app-doc/phrack/phrack-42.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-42.ebuild
+++ b/app-doc/phrack/phrack-42.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-43.ebuild b/app-doc/phrack/phrack-43.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-43.ebuild
+++ b/app-doc/phrack/phrack-43.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-44.ebuild b/app-doc/phrack/phrack-44.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-44.ebuild
+++ b/app-doc/phrack/phrack-44.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-45.ebuild b/app-doc/phrack/phrack-45.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-45.ebuild
+++ b/app-doc/phrack/phrack-45.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-46.ebuild b/app-doc/phrack/phrack-46.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-46.ebuild
+++ b/app-doc/phrack/phrack-46.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-47.ebuild b/app-doc/phrack/phrack-47.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-47.ebuild
+++ b/app-doc/phrack/phrack-47.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-48.ebuild b/app-doc/phrack/phrack-48.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-48.ebuild
+++ b/app-doc/phrack/phrack-48.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-49.ebuild b/app-doc/phrack/phrack-49.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-49.ebuild
+++ b/app-doc/phrack/phrack-49.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-50.ebuild b/app-doc/phrack/phrack-50.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-50.ebuild
+++ b/app-doc/phrack/phrack-50.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-51.ebuild b/app-doc/phrack/phrack-51.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-51.ebuild
+++ b/app-doc/phrack/phrack-51.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-52.ebuild b/app-doc/phrack/phrack-52.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-52.ebuild
+++ b/app-doc/phrack/phrack-52.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-53.ebuild b/app-doc/phrack/phrack-53.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-53.ebuild
+++ b/app-doc/phrack/phrack-53.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-54.ebuild b/app-doc/phrack/phrack-54.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-54.ebuild
+++ b/app-doc/phrack/phrack-54.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-55.ebuild b/app-doc/phrack/phrack-55.ebuild
index d2a3896cb565..7f5ecde840dc 100644
--- a/app-doc/phrack/phrack-55.ebuild
+++ b/app-doc/phrack/phrack-55.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/Phrack${PV}
diff --git a/app-doc/phrack/phrack-56.ebuild b/app-doc/phrack/phrack-56.ebuild
index d2a3896cb565..7f5ecde840dc 100644
--- a/app-doc/phrack/phrack-56.ebuild
+++ b/app-doc/phrack/phrack-56.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/Phrack${PV}
diff --git a/app-doc/phrack/phrack-57.ebuild b/app-doc/phrack/phrack-57.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-57.ebuild
+++ b/app-doc/phrack/phrack-57.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-58.ebuild b/app-doc/phrack/phrack-58.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-58.ebuild
+++ b/app-doc/phrack/phrack-58.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-59.ebuild b/app-doc/phrack/phrack-59.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-59.ebuild
+++ b/app-doc/phrack/phrack-59.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-60.ebuild b/app-doc/phrack/phrack-60.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-60.ebuild
+++ b/app-doc/phrack/phrack-60.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-61.ebuild b/app-doc/phrack/phrack-61.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-61.ebuild
+++ b/app-doc/phrack/phrack-61.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-62.ebuild b/app-doc/phrack/phrack-62.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-62.ebuild
+++ b/app-doc/phrack/phrack-62.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-63.ebuild b/app-doc/phrack/phrack-63.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-63.ebuild
+++ b/app-doc/phrack/phrack-63.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-64.ebuild b/app-doc/phrack/phrack-64.ebuild
index 22aa041ea46b..cb60e5303224 100644
--- a/app-doc/phrack/phrack-64.ebuild
+++ b/app-doc/phrack/phrack-64.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${PV}
diff --git a/app-doc/phrack/phrack-65.ebuild b/app-doc/phrack/phrack-65.ebuild
index 22aa041ea46b..cb60e5303224 100644
--- a/app-doc/phrack/phrack-65.ebuild
+++ b/app-doc/phrack/phrack-65.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${PV}
diff --git a/app-doc/phrack/phrack-66.ebuild b/app-doc/phrack/phrack-66.ebuild
index bc910703f11e..f9ed40a55ecb 100644
--- a/app-doc/phrack/phrack-66.ebuild
+++ b/app-doc/phrack/phrack-66.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/app-doc/phrack/phrack-67.ebuild b/app-doc/phrack/phrack-67.ebuild
index 22aa041ea46b..cb60e5303224 100644
--- a/app-doc/phrack/phrack-67.ebuild
+++ b/app-doc/phrack/phrack-67.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${PV}
diff --git a/app-doc/phrack/phrack-68.ebuild b/app-doc/phrack/phrack-68.ebuild
index 22aa041ea46b..cb60e5303224 100644
--- a/app-doc/phrack/phrack-68.ebuild
+++ b/app-doc/phrack/phrack-68.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}/${PV}
diff --git a/app-doc/phrack/phrack-69.ebuild b/app-doc/phrack/phrack-69.ebuild
index ee45c0989258..9193cef70192 100644
--- a/app-doc/phrack/phrack-69.ebuild
+++ b/app-doc/phrack/phrack-69.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.phrack.org/archives/tgz/${MY_P}.tar.gz"
LICENSE="phrack"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
S=${WORKDIR}
diff --git a/app-doc/pms-bin/pms-bin-5_p20120920.ebuild b/app-doc/pms-bin/pms-bin-5_p20120920.ebuild
index 72378887a52c..d802a60ed910 100644
--- a/app-doc/pms-bin/pms-bin-5_p20120920.ebuild
+++ b/app-doc/pms-bin/pms-bin-5_p20120920.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${MY_P}-prebuilt.tar.xz"
LICENSE="CC-BY-SA-3.0"
SLOT="${PV#*_p}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="html"
RDEPEND="!app-doc/pms"
diff --git a/app-doc/pms-bin/pms-bin-7_p20180430.ebuild b/app-doc/pms-bin/pms-bin-7_p20180430.ebuild
index ff2136d131ab..c605e8d214af 100644
--- a/app-doc/pms-bin/pms-bin-7_p20180430.ebuild
+++ b/app-doc/pms-bin/pms-bin-7_p20180430.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/pms-${PV}-prebuilt.tar.xz"
LICENSE="CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="html"
RDEPEND="!app-doc/pms"
diff --git a/app-doc/tldp-howto/tldp-howto-20120707.ebuild b/app-doc/tldp-howto/tldp-howto-20120707.ebuild
index b6d808a798ae..4fe2b10bbaec 100644
--- a/app-doc/tldp-howto/tldp-howto-20120707.ebuild
+++ b/app-doc/tldp-howto/tldp-howto-20120707.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="FDL-1.2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="+html htmlsingle pdf text"
REQUIRED_USE="|| ( html htmlsingle pdf text )"
diff --git a/app-doc/xmltoman/xmltoman-0.4-r1.ebuild b/app-doc/xmltoman/xmltoman-0.4-r1.ebuild
index 359faf5403f4..4a3c6ff6acb5 100644
--- a/app-doc/xmltoman/xmltoman-0.4-r1.ebuild
+++ b/app-doc/xmltoman/xmltoman-0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="dev-lang/perl
diff --git a/app-doc/zsh-lovers/zsh-lovers-0.9.0.ebuild b/app-doc/zsh-lovers/zsh-lovers-0.9.0.ebuild
index 67f040c88fc4..a85fa4b40225 100644
--- a/app-doc/zsh-lovers/zsh-lovers-0.9.0.ebuild
+++ b/app-doc/zsh-lovers/zsh-lovers-0.9.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://deb.grml.org/pool/main/z/${PN}/${PN}_${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND="app-text/asciidoc"
diff --git a/app-editors/hexcurse/hexcurse-1.55.ebuild b/app-editors/hexcurse/hexcurse-1.55.ebuild
index 9e8e769027bf..f9f75b142fe6 100644
--- a/app-editors/hexcurse/hexcurse-1.55.ebuild
+++ b/app-editors/hexcurse/hexcurse-1.55.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="http://www.jewfish.net/downloads/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
RDEPEND=">=sys-libs/ncurses-5.2:0="
DEPEND="
diff --git a/app-editors/hexcurse/hexcurse-1.60.0.ebuild b/app-editors/hexcurse/hexcurse-1.60.0.ebuild
index 809227e4d264..02ea4289b7ab 100644
--- a/app-editors/hexcurse/hexcurse-1.60.0.ebuild
+++ b/app-editors/hexcurse/hexcurse-1.60.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LonnyGomes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
RDEPEND=">=sys-libs/ncurses-5.2:0="
DEPEND="${RDEPEND}"
diff --git a/app-editors/hexedit/hexedit-1.2.13.ebuild b/app-editors/hexedit/hexedit-1.2.13.ebuild
index 299f969f1681..31d52fa780a7 100644
--- a/app-editors/hexedit/hexedit-1.2.13.ebuild
+++ b/app-editors/hexedit/hexedit-1.2.13.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://rigaux.org/${P}.src.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
DEPEND="sys-libs/ncurses:="
RDEPEND="${DEPEND}"
diff --git a/app-editors/nano/nano-5.3-r1.ebuild b/app-editors/nano/nano-5.3-r1.ebuild
index d98c2483f54c..18228c493c85 100644
--- a/app-editors/nano/nano-5.3-r1.ebuild
+++ b/app-editors/nano/nano-5.3-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
else
MY_P="${PN}-${PV/_}"
SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-emacs/autoconf-mode/autoconf-mode-2.69-r1.ebuild b/app-emacs/autoconf-mode/autoconf-mode-2.69-r1.ebuild
index e27a97ec473c..8c244ac5698d 100644
--- a/app-emacs/autoconf-mode/autoconf-mode-2.69-r1.ebuild
+++ b/app-emacs/autoconf-mode/autoconf-mode-2.69-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/autoconf/autoconf-${PV}.tar.xz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
S="${WORKDIR}/autoconf-${PV}/lib/emacs"
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/lua-mode/lua-mode-20151025.ebuild b/app-emacs/lua-mode/lua-mode-20151025.ebuild
index bb8ae68887c9..3483cfa36926 100644
--- a/app-emacs/lua-mode/lua-mode-20151025.ebuild
+++ b/app-emacs/lua-mode/lua-mode-20151025.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/immerrr/${PN}/archive/rel-${PV}.tar.gz -> ${P}.tar.g
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
RESTRICT="test" # tests require cask which isn't packaged yet
S="${WORKDIR}/${PN}-rel-${PV}"
diff --git a/app-emacs/lua-mode/lua-mode-20201010.ebuild b/app-emacs/lua-mode/lua-mode-20201010.ebuild
index aede8f2babe0..78393cf9f299 100644
--- a/app-emacs/lua-mode/lua-mode-20201010.ebuild
+++ b/app-emacs/lua-mode/lua-mode-20201010.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/immerrr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
RESTRICT="test" # tests require cask which isn't packaged yet
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/po-mode/po-mode-0.20.1.ebuild b/app-emacs/po-mode/po-mode-0.20.1.ebuild
index 4032b2c3530d..2e0ae8cbc2fb 100644
--- a/app-emacs/po-mode/po-mode-0.20.1.ebuild
+++ b/app-emacs/po-mode/po-mode-0.20.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gettext/gettext-${PV}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
S="${WORKDIR}/gettext-${PV}/gettext-tools/emacs"
ELISP_REMOVE="start-po.el"
diff --git a/app-emulation/pcem/pcem-17.ebuild b/app-emulation/pcem/pcem-17.ebuild
index 71bb036ec266..02406aa065d4 100644
--- a/app-emulation/pcem/pcem-17.ebuild
+++ b/app-emulation/pcem/pcem-17.ebuild
@@ -3,9 +3,8 @@
EAPI=7
-inherit autotools desktop flag-o-matic wxwidgets
-
WX_GTK_VER="3.0-gtk3"
+inherit autotools desktop flag-o-matic wxwidgets
DESCRIPTION="A PC emulator that specializes in running old operating systems and software"
HOMEPAGE="
@@ -41,6 +40,8 @@ src_prepare() {
}
src_configure() {
+ setup-wxwidgets
+
# Does not compile with -fno-common.
# See https://pcem-emulator.co.uk/phpBB3/viewtopic.php?f=3&t=3443
append-cflags -fcommon
@@ -49,6 +50,7 @@ src_configure() {
--enable-release-build
$(use_enable alsa)
$(use_enable networking)
+ --with-wx-config="${WX_CONFIG}"
)
econf "${myeconfargs[@]}"
diff --git a/app-eselect/eselect-awk/eselect-awk-0.3.ebuild b/app-eselect/eselect-awk/eselect-awk-0.3.ebuild
index e9198183143c..0cb84863c25c 100644
--- a/app-eselect/eselect-awk/eselect-awk-0.3.ebuild
+++ b/app-eselect/eselect-awk/eselect-awk-0.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~junghans/distfiles/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux"
IUSE=""
src_install() {
diff --git a/app-eselect/eselect-blas/eselect-blas-0.1.ebuild b/app-eselect/eselect-blas/eselect-blas-0.1.ebuild
index 25d90273d93f..786faf501089 100644
--- a/app-eselect/eselect-blas/eselect-blas-0.1.ebuild
+++ b/app-eselect/eselect-blas/eselect-blas-0.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
IUSE=""
# Need skel.bash lib
diff --git a/app-eselect/eselect-cblas/eselect-cblas-0.1.ebuild b/app-eselect/eselect-cblas/eselect-cblas-0.1.ebuild
index a46c23dea8d9..a47f65439b7f 100644
--- a/app-eselect/eselect-cblas/eselect-cblas-0.1.ebuild
+++ b/app-eselect/eselect-cblas/eselect-cblas-0.1.ebuild
@@ -10,7 +10,7 @@ S=${WORKDIR}
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
IUSE=""
# Need skel.bash lib
diff --git a/app-eselect/eselect-ctags/eselect-ctags-1.18.ebuild b/app-eselect/eselect-ctags/eselect-ctags-1.18.ebuild
index bd240b07212a..8945418fed81 100644
--- a/app-eselect/eselect-ctags/eselect-ctags-1.18.ebuild
+++ b/app-eselect/eselect-ctags/eselect-ctags-1.18.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${MY_P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND=">=app-admin/eselect-1.2.3"
diff --git a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
index 0988b176837f..156ec2d94f61 100644
--- a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
+++ b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/fontconfig.eselect-${PV}.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=app-admin/eselect-1.2.3
diff --git a/app-eselect/eselect-iptables/eselect-iptables-20200508.ebuild b/app-eselect/eselect-iptables/eselect-iptables-20200508.ebuild
index 61cc0e96e623..d0c4b6ab4f07 100644
--- a/app-eselect/eselect-iptables/eselect-iptables-20200508.ebuild
+++ b/app-eselect/eselect-iptables/eselect-iptables-20200508.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~chutzpah/dist/iptables/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND="app-admin/eselect"
diff --git a/app-eselect/eselect-lapack/eselect-lapack-0.2.ebuild b/app-eselect/eselect-lapack/eselect-lapack-0.2.ebuild
index 6cb46d64419b..8da64ca2effa 100644
--- a/app-eselect/eselect-lapack/eselect-lapack-0.2.ebuild
+++ b/app-eselect/eselect-lapack/eselect-lapack-0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
# Need skel.bash lib
diff --git a/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1-r1.ebuild b/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1-r1.ebuild
index 3de5ab7cae83..15b745817032 100644
--- a/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1-r1.ebuild
+++ b/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/eselect-lib-bin-symlink/releases/download/${P
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="app-admin/eselect"
diff --git a/app-eselect/eselect-package-manager/eselect-package-manager-20110108-r1.ebuild b/app-eselect/eselect-package-manager/eselect-package-manager-20110108-r1.ebuild
index abbf609934e0..288d2f5e3789 100644
--- a/app-eselect/eselect-package-manager/eselect-package-manager-20110108-r1.ebuild
+++ b/app-eselect/eselect-package-manager/eselect-package-manager-20110108-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
RDEPEND=">=app-admin/eselect-1.1.1"
diff --git a/app-eselect/eselect-pinentry/eselect-pinentry-0.7.1.ebuild b/app-eselect/eselect-pinentry/eselect-pinentry-0.7.1.ebuild
index 259f89e9bf28..2dc9957138ff 100644
--- a/app-eselect/eselect-pinentry/eselect-pinentry-0.7.1.ebuild
+++ b/app-eselect/eselect-pinentry/eselect-pinentry-0.7.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=app-eselect/eselect-lib-bin-symlink-0.1.1"
diff --git a/app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild b/app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild
index 82b03e8f4ee3..89ce5b1a1c4b 100644
--- a/app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild
+++ b/app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="https://dev.gentoo.org/~titanofold/${P}.tbz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="app-admin/eselect"
diff --git a/app-eselect/eselect-python/eselect-python-20190417.ebuild b/app-eselect/eselect-python/eselect-python-20190417.ebuild
index 930562377361..60eab9db5366 100644
--- a/app-eselect/eselect-python/eselect-python-20190417.ebuild
+++ b/app-eselect/eselect-python/eselect-python-20190417.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "99999999" ]] ; then
EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
else
SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Eselect module for management of multiple Python versions"
diff --git a/app-eselect/eselect-python/eselect-python-20200719.ebuild b/app-eselect/eselect-python/eselect-python-20200719.ebuild
index 2fd178dab1cd..491fe41f0407 100644
--- a/app-eselect/eselect-python/eselect-python-20200719.ebuild
+++ b/app-eselect/eselect-python/eselect-python-20200719.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "99999999" ]] ; then
EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
else
SRC_URI="https://dev.gentoo.org/~chutzpah/dist/misc/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Eselect module for management of multiple Python versions"
diff --git a/app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild
index c3ffa133a3f8..b46bee41a864 100644
--- a/app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild
+++ b/app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-${PVR}.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=app-admin/eselect-1.0.2"
diff --git a/app-eselect/eselect-ruby/eselect-ruby-20190121.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20190121.ebuild
index 64cb581b0288..537b289e53b5 100644
--- a/app-eselect/eselect-ruby/eselect-ruby-20190121.ebuild
+++ b/app-eselect/eselect-ruby/eselect-ruby-20190121.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-${PVR}.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=app-admin/eselect-1.0.2"
diff --git a/app-eselect/eselect-sh/eselect-sh-0.4.1.ebuild b/app-eselect/eselect-sh/eselect-sh-0.4.1.ebuild
index 3d9ffccebcbc..9ef05f9405f5 100644
--- a/app-eselect/eselect-sh/eselect-sh-0.4.1.ebuild
+++ b/app-eselect/eselect-sh/eselect-sh-0.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ S=${WORKDIR}
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="app-eselect/eselect-lib-bin-symlink"
diff --git a/app-eselect/eselect-vi/eselect-vi-1.2.ebuild b/app-eselect/eselect-vi/eselect-vi-1.2.ebuild
index 6c770039c9e4..979d4d7e5845 100644
--- a/app-eselect/eselect-vi/eselect-vi-1.2.ebuild
+++ b/app-eselect/eselect-vi/eselect-vi-1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="app-admin/eselect"
diff --git a/app-eselect/eselect-xvmc/eselect-xvmc-0.4.ebuild b/app-eselect/eselect-xvmc/eselect-xvmc-0.4.ebuild
index 55db22119025..074886319d91 100644
--- a/app-eselect/eselect-xvmc/eselect-xvmc-0.4.ebuild
+++ b/app-eselect/eselect-xvmc/eselect-xvmc-0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -9,7 +9,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE=""
DEPEND=""
diff --git a/app-i18n/man-pages-it/man-pages-it-4.00.ebuild b/app-i18n/man-pages-it/man-pages-it-4.00.ebuild
index a906f31e90cf..64eb687c683e 100644
--- a/app-i18n/man-pages-it/man-pages-it-4.00.ebuild
+++ b/app-i18n/man-pages-it/man-pages-it-4.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.pluto.it/pub/pluto/ildp/man/${P}.tar.xz"
LICENSE="man-pages GPL-2+ BSD MIT FDL-1.1+ public-domain man-pages-posix"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE=""
RDEPEND="virtual/man"
diff --git a/app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild b/app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild
index 2b922228c951..de70fa027bd0 100644
--- a/app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild
+++ b/app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="http://linuxjm.osdn.jp/${P}.tar.gz
LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="virtual/man"
diff --git a/app-i18n/man-pages-l10n/man-pages-l10n-4.2.0-r1.ebuild b/app-i18n/man-pages-l10n/man-pages-l10n-4.2.0-r1.ebuild
index 66a74300de84..5d58f5e413a2 100644
--- a/app-i18n/man-pages-l10n/man-pages-l10n-4.2.0-r1.ebuild
+++ b/app-i18n/man-pages-l10n/man-pages-l10n-4.2.0-r1.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
# build failure for es and it, so omit them for now #769314
MY_L10N=(de fr nl pl pt-BR ro)
IUSE="${MY_L10N[@]/#/l10n_}"
diff --git a/app-i18n/man-pages-ru/man-pages-ru-5.03.2390.2390.20191017.ebuild b/app-i18n/man-pages-ru/man-pages-ru-5.03.2390.2390.20191017.ebuild
index 2c369158deef..9fc6918f3025 100644
--- a/app-i18n/man-pages-ru/man-pages-ru-5.03.2390.2390.20191017.ebuild
+++ b/app-i18n/man-pages-ru/man-pages-ru-5.03.2390.2390.20191017.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.sourceforge.net/${PN}/source-tar/${PN}_${MY_PV}.tar.bz
LICENSE="FDL-1.3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="virtual/man"
diff --git a/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.2.ebuild b/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.2.ebuild
index b83619576f59..506aaac3a01f 100644
--- a/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.2.ebuild
+++ b/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="FDL-1.2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="virtual/man"
diff --git a/app-i18n/unicode-data/unicode-data-12.0.0.ebuild b/app-i18n/unicode-data/unicode-data-12.0.0.ebuild
index d61241208f21..1d5570ba7d79 100644
--- a/app-i18n/unicode-data/unicode-data-12.0.0.ebuild
+++ b/app-i18n/unicode-data/unicode-data-12.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.unicode.org/Public/zipped/${PV}/UCD.zip -> ${P}-UCD.zip
LICENSE="unicode"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
DEPEND="app-arch/unzip"
diff --git a/app-i18n/unicode-data/unicode-data-13.0.0.ebuild b/app-i18n/unicode-data/unicode-data-13.0.0.ebuild
index d7236ea9b467..df4a20d9eb03 100644
--- a/app-i18n/unicode-data/unicode-data-13.0.0.ebuild
+++ b/app-i18n/unicode-data/unicode-data-13.0.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://unicode.org/Public/zipped/${PV}/UCD.zip -> ${P}-UCD.zip
LICENSE="unicode"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
DEPEND="app-arch/unzip"
diff --git a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
index 5ad7624ea5b6..1aecc57e1922 100644
--- a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
+++ b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"
LICENSE="openssl"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
RDEPEND="!<dev-libs/openssl-1.0.2d-r1:0"
DEPEND="${RDEPEND}"
diff --git a/app-misc/ca-certificates/ca-certificates-20200601.3.53.ebuild b/app-misc/ca-certificates/ca-certificates-20200601.3.53.ebuild
index db37dd8ef656..83ea8bf5d723 100644
--- a/app-misc/ca-certificates/ca-certificates-20200601.3.53.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20200601.3.53.ebuild
@@ -51,7 +51,7 @@ fi
LICENSE="MPL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
${PRECOMPILED} || IUSE+=" cacert"
diff --git a/app-misc/ca-certificates/ca-certificates-20210119.3.62.ebuild b/app-misc/ca-certificates/ca-certificates-20210119.3.62.ebuild
index f49a7923491d..267df1da9ccf 100644
--- a/app-misc/ca-certificates/ca-certificates-20210119.3.62.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20210119.3.62.ebuild
@@ -50,7 +50,7 @@ fi
LICENSE="MPL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
${PRECOMPILED} || IUSE+=" cacert"
diff --git a/app-misc/datefudge/datefudge-1.24.ebuild b/app-misc/datefudge/datefudge-1.24.ebuild
index 34bdcbffa6cc..002e37e93e9b 100644
--- a/app-misc/datefudge/datefudge-1.24.ebuild
+++ b/app-misc/datefudge/datefudge-1.24.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
src_prepare() {
default
diff --git a/app-misc/delay/delay-1.6-r2.ebuild b/app-misc/delay/delay-1.6-r2.ebuild
index cec69b36fbad..e4feba5f19c2 100644
--- a/app-misc/delay/delay-1.6-r2.ebuild
+++ b/app-misc/delay/delay-1.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://onegeek.org/~tom/software/delay/dl/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
RDEPEND="sys-libs/ncurses:0="
DEPEND="
diff --git a/app-misc/dtach/dtach-0.9.ebuild b/app-misc/dtach/dtach-0.9.ebuild
index 976bf60c519d..8818a3545e01 100644
--- a/app-misc/dtach/dtach-0.9.ebuild
+++ b/app-misc/dtach/dtach-0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
IUSE=""
src_install() {
diff --git a/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild b/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
index 28db668bb039..39f32a983569 100644
--- a/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
+++ b/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
S="${WORKDIR}"
diff --git a/app-misc/mime-types/mime-types-9.ebuild b/app-misc/mime-types/mime-types-9.ebuild
index 0dbc34536408..aff82ac6baf1 100644
--- a/app-misc/mime-types/mime-types-9.ebuild
+++ b/app-misc/mime-types/mime-types-9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
src_install() {
insinto /etc
diff --git a/app-misc/pax-utils/pax-utils-1.2.6.ebuild b/app-misc/pax-utils/pax-utils-1.2.6.ebuild
index a3e63fcd1d5c..a7af2334fd53 100644
--- a/app-misc/pax-utils/pax-utils-1.2.6.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="caps debug kernel_linux python seccomp"
RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
diff --git a/app-misc/pax-utils/pax-utils-1.2.9.ebuild b/app-misc/pax-utils/pax-utils-1.2.9.ebuild
index 083c808c99e9..e87baee7cd23 100644
--- a/app-misc/pax-utils/pax-utils-1.2.9.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="caps debug kernel_linux python seccomp"
RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
diff --git a/app-misc/realpath/realpath-1.18.ebuild b/app-misc/realpath/realpath-1.18.ebuild
index dcaeab4fe8b0..2187339bb817 100644
--- a/app-misc/realpath/realpath-1.18.ebuild
+++ b/app-misc/realpath/realpath-1.18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls"
RDEPEND="
diff --git a/app-misc/rl/rl-0.2.7-r1.ebuild b/app-misc/rl/rl-0.2.7-r1.ebuild
index 25fd63c8898b..1f1c47f2ee0f 100644
--- a/app-misc/rl/rl-0.2.7-r1.ebuild
+++ b/app-misc/rl/rl-0.2.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://arthurdejong.org/rl/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ia64 ~mips ppc s390 sparc x86"
+KEYWORDS="amd64 ~ia64 ~mips ppc ~s390 sparc x86"
IUSE="debug"
DOCS=( AUTHORS ChangeLog INSTALL NEWS README TODO )
diff --git a/app-misc/screen/screen-4.8.0-r1.ebuild b/app-misc/screen/screen-4.8.0-r1.ebuild
index 30a4c5053768..e0b624d80bfb 100644
--- a/app-misc/screen/screen-4.8.0-r1.ebuild
+++ b/app-misc/screen/screen-4.8.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
if [[ "${PV}" != 9999 ]] ; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
diff --git a/app-misc/screen/screen-4.8.0-r2.ebuild b/app-misc/screen/screen-4.8.0-r2.ebuild
index 8c0c7cfd6710..589b58f29346 100644
--- a/app-misc/screen/screen-4.8.0-r2.ebuild
+++ b/app-misc/screen/screen-4.8.0-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
if [[ "${PV}" != 9999 ]] ; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
diff --git a/app-misc/tmux/tmux-3.1c.ebuild b/app-misc/tmux/tmux-3.1c.ebuild
index 398b9ae47ef7..83e054ebd04a 100644
--- a/app-misc/tmux/tmux-3.1c.ebuild
+++ b/app-misc/tmux/tmux-3.1c.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == 9999 ]] ; then
else
SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
[[ "${PV}" == *_rc* ]] || \
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
S="${WORKDIR}/${P/_/-}"
fi
diff --git a/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild b/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild
index 288ff1329e49..f5604a4dac31 100644
--- a/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild
+++ b/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="static"
RDEPEND=">=sys-libs/zlib-1.1.4:0="
diff --git a/app-portage/eix/eix-0.34.12.ebuild b/app-portage/eix/eix-0.34.12.ebuild
index e192a95b4aa1..0971f52d7527 100644
--- a/app-portage/eix/eix-0.34.12.ebuild
+++ b/app-portage/eix/eix-0.34.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug doc nls sqlite"
DEPEND="
diff --git a/app-portage/elicense/elicense-1.0.2.ebuild b/app-portage/elicense/elicense-1.0.2.ebuild
index ef9e869dc8b9..4c89c0d9be20 100644
--- a/app-portage/elicense/elicense-1.0.2.ebuild
+++ b/app-portage/elicense/elicense-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
SRC_URI="https://github.com/Whissi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 mips ppc ppc64 ~riscv s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 mips ppc ppc64 ~riscv ~s390 sparc x86"
fi
DESCRIPTION="Tool to find installed packages in Gentoo with non-accepted license(s)"
diff --git a/app-portage/elt-patches/elt-patches-20170317.ebuild b/app-portage/elt-patches/elt-patches-20170317.ebuild
index 47f2452760ff..ca1ace6d802f 100644
--- a/app-portage/elt-patches/elt-patches-20170317.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170317.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
DEPEND="app-arch/xz-utils"
diff --git a/app-portage/elt-patches/elt-patches-20170422.ebuild b/app-portage/elt-patches/elt-patches-20170422.ebuild
index 2124e62a66f7..5ba29a48c22e 100644
--- a/app-portage/elt-patches/elt-patches-20170422.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170422.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="sys-apps/gentoo-functions"
diff --git a/app-portage/elt-patches/elt-patches-20170815.ebuild b/app-portage/elt-patches/elt-patches-20170815.ebuild
index 6ed89f62d29d..cff8fbb89abc 100644
--- a/app-portage/elt-patches/elt-patches-20170815.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170815.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="sys-apps/gentoo-functions"
diff --git a/app-portage/esearch/esearch-1.3-r3.ebuild b/app-portage/esearch/esearch-1.3-r3.ebuild
index aa064e8bf0c8..9ada78838ce7 100644
--- a/app-portage/esearch/esearch-1.3-r3.ebuild
+++ b/app-portage/esearch/esearch-1.3-r3.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
SLOT="0"
IUSE="l10n_fr l10n_it"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
DEPEND="sys-apps/portage"
RDEPEND="${DEPEND}"
diff --git a/app-portage/gemato/gemato-15.2.ebuild b/app-portage/gemato/gemato-15.2.ebuild
index b3e6555f5fdb..e742c325bf45 100644
--- a/app-portage/gemato/gemato-15.2.ebuild
+++ b/app-portage/gemato/gemato-15.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
IUSE="+gpg tools"
RDEPEND="
diff --git a/app-portage/genlop/genlop-0.30.10-r2.ebuild b/app-portage/genlop/genlop-0.30.10-r2.ebuild
index 52ec4293a994..65d3383ba30b 100644
--- a/app-portage/genlop/genlop-0.30.10-r2.ebuild
+++ b/app-portage/genlop/genlop-0.30.10-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
DEPEND="
dev-lang/perl
diff --git a/app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild b/app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild
index e6cfee926d80..b5d01fea1c2e 100644
--- a/app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND="
sys-apps/portage[${PYTHON_USEDEP}]"
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.6-r2.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.6-r2.ebuild
index 0b265a74e52a..b0e2ee15b199 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.6-r2.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.6-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://dev.gentoo.org/~zmedico/dist/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="ipv6"
RDEPEND="
diff --git a/app-portage/repoman/repoman-2.3.23.ebuild b/app-portage/repoman/repoman-2.3.23.ebuild
index db84da43b526..b3feb3e073da 100644
--- a/app-portage/repoman/repoman-2.3.23.ebuild
+++ b/app-portage/repoman/repoman-2.3.23.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
S="${WORKDIR}/${P}/repoman"
else
SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
diff --git a/app-portage/repoman/repoman-3.0.2.ebuild b/app-portage/repoman/repoman-3.0.2.ebuild
index 5b7a22311567..51b9c15a580a 100644
--- a/app-portage/repoman/repoman-3.0.2.ebuild
+++ b/app-portage/repoman/repoman-3.0.2.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
S="${WORKDIR}/${P}/repoman"
else
SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
diff --git a/app-shells/bash/bash-2.05b_p13.ebuild b/app-shells/bash/bash-2.05b_p13.ebuild
index 9c9e3fec805e..cdacaa870073 100644
--- a/app-shells/bash/bash-2.05b_p13.ebuild
+++ b/app-shells/bash/bash-2.05b_p13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
LICENSE="GPL-2"
SLOT="${MY_PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="afs +net nls +readline static"
LIB_DEPEND=">=sys-libs/ncurses-5.2-r2[static-libs(+)]
diff --git a/app-shells/bash/bash-3.0_p22.ebuild b/app-shells/bash/bash-3.0_p22.ebuild
index d6a10f4002e5..9cb8f4f7c86e 100644
--- a/app-shells/bash/bash-3.0_p22.ebuild
+++ b/app-shells/bash/bash-3.0_p22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
LICENSE="GPL-2"
SLOT="${MY_PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="afs +net nls +readline static"
LIB_DEPEND=">=sys-libs/ncurses-5.2-r2[static-libs(+)]
diff --git a/app-shells/bash/bash-3.1_p23.ebuild b/app-shells/bash/bash-3.1_p23.ebuild
index cf6a8d6a93cb..1b7c72acdbfd 100644
--- a/app-shells/bash/bash-3.1_p23.ebuild
+++ b/app-shells/bash/bash-3.1_p23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
LICENSE="GPL-2"
SLOT="${MY_PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="afs +net nls +readline static"
LIB_DEPEND=">=sys-libs/ncurses-5.2-r2[static-libs(+)]
diff --git a/app-shells/bash/bash-3.2_p57.ebuild b/app-shells/bash/bash-3.2_p57.ebuild
index 2a5bfa279ff9..be7420d869e7 100644
--- a/app-shells/bash/bash-3.2_p57.ebuild
+++ b/app-shells/bash/bash-3.2_p57.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
LICENSE="GPL-2"
SLOT="${MY_PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="afs +net nls +readline static"
LIB_DEPEND=">=sys-libs/ncurses-5.2-r2[static-libs(+)]
diff --git a/app-shells/bash/bash-4.0_p44.ebuild b/app-shells/bash/bash-4.0_p44.ebuild
index 878f660af57e..2814366f9f94 100644
--- a/app-shells/bash/bash-4.0_p44.ebuild
+++ b/app-shells/bash/bash-4.0_p44.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
LICENSE="GPL-3"
SLOT="${MY_PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="afs mem-scramble +net nls +readline static"
LIB_DEPEND=">=sys-libs/ncurses-5.2-r2[static-libs(+)]
diff --git a/app-shells/bash/bash-4.1_p17.ebuild b/app-shells/bash/bash-4.1_p17.ebuild
index 198646cc65f4..da915e1f0dd5 100644
--- a/app-shells/bash/bash-4.1_p17.ebuild
+++ b/app-shells/bash/bash-4.1_p17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
LICENSE="GPL-3"
SLOT="${MY_PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="afs mem-scramble +net nls +readline static"
LIB_DEPEND=">=sys-libs/ncurses-5.2-r2[static-libs(+)]
diff --git a/app-shells/bash/bash-4.2_p53.ebuild b/app-shells/bash/bash-4.2_p53.ebuild
index 1ab928bd118a..30c860c3ff58 100644
--- a/app-shells/bash/bash-4.2_p53.ebuild
+++ b/app-shells/bash/bash-4.2_p53.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
LICENSE="GPL-3"
SLOT="${MY_PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="afs mem-scramble +net nls +readline static"
LIB_DEPEND=">=sys-libs/ncurses-5.2-r2[static-libs(+)]
diff --git a/app-shells/bash/bash-4.3_p48-r2.ebuild b/app-shells/bash/bash-4.3_p48-r2.ebuild
index bb767f76384c..14f08b6aed1d 100644
--- a/app-shells/bash/bash-4.3_p48-r2.ebuild
+++ b/app-shells/bash/bash-4.3_p48-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -37,7 +37,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
LICENSE="GPL-3"
SLOT="${MY_PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
DEPEND=">=sys-libs/ncurses-5.2-r2:0=
diff --git a/app-shells/bash/bash-4.4_p23-r2.ebuild b/app-shells/bash/bash-4.4_p23-r2.ebuild
index f039711106da..3badc1359f27 100644
--- a/app-shells/bash/bash-4.4_p23-r2.ebuild
+++ b/app-shells/bash/bash-4.4_p23-r2.ebuild
@@ -46,7 +46,7 @@ fi
LICENSE="GPL-3"
SLOT="${MY_PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
DEPEND="
diff --git a/app-shells/bash/bash-5.0_p11-r1.ebuild b/app-shells/bash/bash-5.0_p11-r1.ebuild
index 99fbb1ab59de..bb06e48ea224 100644
--- a/app-shells/bash/bash-5.0_p11-r1.ebuild
+++ b/app-shells/bash/bash-5.0_p11-r1.ebuild
@@ -46,7 +46,7 @@ fi
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
DEPEND="
diff --git a/app-shells/bash/bash-5.0_p18.ebuild b/app-shells/bash/bash-5.0_p18.ebuild
index e22d27a3b3ba..80582cbf2ae4 100644
--- a/app-shells/bash/bash-5.0_p18.ebuild
+++ b/app-shells/bash/bash-5.0_p18.ebuild
@@ -46,7 +46,7 @@ fi
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
DEPEND="
diff --git a/app-shells/push/push-2.0-r1.ebuild b/app-shells/push/push-2.0-r1.ebuild
index 8703d5d2b912..0b0c030545bc 100644
--- a/app-shells/push/push-2.0-r1.ebuild
+++ b/app-shells/push/push-2.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
IUSE=""
src_install() {
diff --git a/app-shells/push/push-3.4.ebuild b/app-shells/push/push-3.4.ebuild
index e6bb2c8e3cc0..c819b031441a 100644
--- a/app-shells/push/push-3.4.ebuild
+++ b/app-shells/push/push-3.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
src_compile() { :; }
diff --git a/app-shells/quoter/quoter-4.2.ebuild b/app-shells/quoter/quoter-4.2.ebuild
index e88b2824b1b7..3516054fa1e3 100644
--- a/app-shells/quoter/quoter-4.2.ebuild
+++ b/app-shells/quoter/quoter-4.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
src_configure() {
tc-export CC
diff --git a/app-shells/tcsh/tcsh-6.22.02.ebuild b/app-shells/tcsh/tcsh-6.22.02.ebuild
index 5170f861ce10..02fa21d5200c 100644
--- a/app-shells/tcsh/tcsh-6.22.02.ebuild
+++ b/app-shells/tcsh/tcsh-6.22.02.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls doc"
RESTRICT="test"
diff --git a/app-text/asciidoc/asciidoc-9.0.2-r1.ebuild b/app-text/asciidoc/asciidoc-9.0.2-r1.ebuild
index 72c38cb14f03..952821000c67 100644
--- a/app-text/asciidoc/asciidoc-9.0.2-r1.ebuild
+++ b/app-text/asciidoc/asciidoc-9.0.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-text/aspell/aspell-0.60.8.ebuild b/app-text/aspell/aspell-0.60.8.ebuild
index 6207c44dc5a8..287ddb29290a 100644
--- a/app-text/aspell/aspell-0.60.8.ebuild
+++ b/app-text/aspell/aspell-0.60.8.ebuild
@@ -17,7 +17,7 @@ fi
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
IUSE="nls unicode"
PDEPEND="app-dicts/aspell-en"
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
index 00efd553725c..faaa5b36fd23 100644
--- a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
dev-libs/libxml2
diff --git a/app-text/dbacl/dbacl-1.14.ebuild b/app-text/dbacl/dbacl-1.14.ebuild
index ff1c35d70389..2d58f06146d4 100644
--- a/app-text/dbacl/dbacl-1.14.ebuild
+++ b/app-text/dbacl/dbacl-1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="http://www.lbreyer.com/gpl/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 s390 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="interactive"
RDEPEND="interactive? (
diff --git a/app-text/delta/delta-20060803-r1.ebuild b/app-text/delta/delta-20060803-r1.ebuild
index 4f0369adcbb8..9334fa0e374c 100644
--- a/app-text/delta/delta-20060803-r1.ebuild
+++ b/app-text/delta/delta-20060803-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://delta.tigris.org/files/documents/3103/${STUPID_NUM}/${PN}-${MY_P
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos"
IUSE=""
DEPEND="dev-lang/perl"
diff --git a/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild b/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild
index 0a5bdf8683ff..ec808cb9bab2 100644
--- a/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild
+++ b/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# No EAPI=7 support in wxwidgets.eclass.
EAPI=7
+WX_GTK_VER="3.0-gtk3"
inherit autotools wxwidgets
DESCRIPTION="A simple tool for visually comparing two PDF files"
@@ -29,7 +29,7 @@ IUSE=""
DEPEND="app-text/poppler[cairo]
dev-libs/glib
x11-libs/cairo
- x11-libs/wxGTK:3.0-gtk3[X]"
+ x11-libs/wxGTK:${WX_GTK_VER}[X]"
RDEPEND="${DEPEND}"
PATCHES=( "${FILESDIR}/${P}-no-poppler-cairo-check.patch" )
@@ -40,7 +40,6 @@ src_prepare() {
}
src_configure() {
- WX_GTK_VER="3.0-gtk3"
setup-wxwidgets
default
}
diff --git a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
index ff35e2651fe5..e3203a498c06 100644
--- a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
+++ b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/project/docbook/docbook-dsssl/${PV}/$
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
IUSE=""
RDEPEND="
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild
index 928f01013d7e..b416d65c3188 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
IUSE=""
DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
index 928f01013d7e..b416d65c3188 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
IUSE=""
DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild
index 8f58b7ab5143..852ffee2772c 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
IUSE=""
DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
index de80f946e64e..cbe5e272c54d 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild
index 42cd2d5cbe69..84f3d91be5b6 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
IUSE=""
DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild
index a4ed3e2f4d15..99211490d99c 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
IUSE=""
DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild
index 14f15f538111..22e1cdd8526f 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
IUSE=""
DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
index ebaf2e04218b..484d0e72473a 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
IUSE=""
DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild
index d87738d5d619..f3a0e790fbe6 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="jadetex"
DEPEND=">=dev-lang/perl-5
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
index 0bda68359cde..f049bf68fffd 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
index cb13e91ee151..ee06649a6b4a 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
index cb13e91ee151..ee06649a6b4a 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
index 901970ab03b6..175a7581c5ed 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
index 901970ab03b6..175a7581c5ed 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
index e62bebcb25ce..ed1cf3333f8f 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
IUSE=""
RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
index ffae4c7c48e5..aff340d83df8 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
IUSE=""
RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
index bfec21f1fcec..dbc3dcd8699a 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
LICENSE="docbook"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
IUSE=""
RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild
index 579c448bc0a7..81f3232d06e4 100644
--- a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild
+++ b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="ruby"
RDEPEND=">=app-text/build-docbook-catalog-1.4
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
index 2d652f9131f6..c09f42d5032a 100644
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="ruby"
RDEPEND="
diff --git a/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
index bd850d269574..b3d97459e00e 100644
--- a/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
+++ b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/docbook2x/${P}.tar.gz"
HOMEPAGE="http://docbook2x.sourceforge.net/"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
LICENSE="MIT"
diff --git a/app-text/dvipng/dvipng-1.17.ebuild b/app-text/dvipng/dvipng-1.17.ebuild
index 068bb18ba2aa..80b7d38c3a40 100644
--- a/app-text/dvipng/dvipng-1.17.ebuild
+++ b/app-text/dvipng/dvipng-1.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-3+ Texinfo-manual"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
IUSE="truetype test"
RESTRICT="!test? ( test )"
diff --git a/app-text/dvipsk/dvipsk-2020.1_p20200406.ebuild b/app-text/dvipsk/dvipsk-2020.1_p20200406.ebuild
index e9431319423e..4c38721a3d80 100644
--- a/app-text/dvipsk/dvipsk-2020.1_p20200406.ebuild
+++ b/app-text/dvipsk/dvipsk-2020.1_p20200406.ebuild
@@ -25,7 +25,7 @@ SRC_URI="${SRC_URI} ) "
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc source"
DEPEND=">=dev-libs/kpathsea-6.2.1"
diff --git a/app-text/epspdf/epspdf-0.6.3-r1.ebuild b/app-text/epspdf/epspdf-0.6.3-r1.ebuild
index e71c82bf02d9..d19bd91cc735 100644
--- a/app-text/epspdf/epspdf-0.6.3-r1.ebuild
+++ b/app-text/epspdf/epspdf-0.6.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://tex.aanhet.net/epspdf/${PN}.${PV}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc tk"
DEPEND="sys-apps/texinfo"
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild
index 362f03559a7c..29656ad43154 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -23,7 +23,7 @@ fi
LICENSE="AGPL-3 CPL-1.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="cups dbus gtk l10n_de static-libs tiff unicode X"
LANGS="ja ko zh-CN zh-TW"
diff --git a/app-text/libexttextcat/libexttextcat-3.4.5.ebuild b/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
index c0e6600643fa..01e091381ee4 100644
--- a/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
+++ b/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="static-libs"
DEPEND=""
diff --git a/app-text/libpaper/libpaper-1.1.24_p5.ebuild b/app-text/libpaper/libpaper-1.1.24_p5.ebuild
index 82f55efb16ed..04b3e1b4c65b 100644
--- a/app-text/libpaper/libpaper-1.1.24_p5.ebuild
+++ b/app-text/libpaper/libpaper-1.1.24_p5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/libp/libpaper/${PN}_${MY_PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-text/manpager/manpager-1.ebuild b/app-text/manpager/manpager-1.ebuild
index 7a79443f990d..49301d4d54ef 100644
--- a/app-text/manpager/manpager-1.ebuild
+++ b/app-text/manpager/manpager-1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
S=${WORKDIR}
diff --git a/app-text/mecab/mecab-0.996-r1.ebuild b/app-text/mecab/mecab-0.996-r1.ebuild
index 31bcbdce7259..c12722e282a3 100644
--- a/app-text/mecab/mecab-0.996-r1.ebuild
+++ b/app-text/mecab/mecab-0.996-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -10,7 +10,7 @@ HOMEPAGE="https://taku910.github.io/mecab/"
SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz"
LICENSE="|| ( BSD LGPL-2.1 GPL-2 )"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
SLOT="0"
IUSE="static-libs unicode"
diff --git a/app-text/openjade/openjade-1.3.2-r9.ebuild b/app-text/openjade/openjade-1.3.2-r9.ebuild
index 407f7b7a435b..caab0f225c9e 100644
--- a/app-text/openjade/openjade-1.3.2-r9.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/app-text/opensp/opensp-1.5.2-r3.ebuild b/app-text/opensp/opensp-1.5.2-r3.ebuild
index 1fb1a96f4000..4343444bd39e 100644
--- a/app-text/opensp/opensp-1.5.2-r3.ebuild
+++ b/app-text/opensp/opensp-1.5.2-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/openjade/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc nls static-libs test"
RESTRICT="!test? ( test )"
diff --git a/app-text/pdfjam/pdfjam-2.08-r1.ebuild b/app-text/pdfjam/pdfjam-2.08-r1.ebuild
index 692950ac5474..69826d88b34c 100644
--- a/app-text/pdfjam/pdfjam-2.08-r1.ebuild
+++ b/app-text/pdfjam/pdfjam-2.08-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.warwick.ac.uk/go/pdfjam/${PN}_${MY_PV}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE=""
S="${WORKDIR}"/${PN}
diff --git a/app-text/po4a/po4a-0.57.ebuild b/app-text/po4a/po4a-0.57.ebuild
index 7444d4ee569f..6dd16a0287b3 100644
--- a/app-text/po4a/po4a-0.57.ebuild
+++ b/app-text/po4a/po4a-0.57.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/app-text/poppler-data/poppler-data-0.4.10.ebuild b/app-text/poppler-data/poppler-data-0.4.10.ebuild
index 852c9a5491b4..09992c6a315c 100644
--- a/app-text/poppler-data/poppler-data-0.4.10.ebuild
+++ b/app-text/poppler-data/poppler-data-0.4.10.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://poppler.freedesktop.org/"
SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz"
LICENSE="BSD GPL-2 MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""
diff --git a/app-text/poppler/poppler-20.11.0.ebuild b/app-text/poppler/poppler-20.11.0.ebuild
index 975d1342c8b4..b18996f2a132 100644
--- a/app-text/poppler/poppler-20.11.0.ebuild
+++ b/app-text/poppler/poppler-20.11.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
SLOT="0/9999"
else
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0/104" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
fi
diff --git a/app-text/ps2eps/ps2eps-1.68.ebuild b/app-text/ps2eps/ps2eps-1.68.ebuild
index 30bdbe08d154..bbb3620563bf 100644
--- a/app-text/ps2eps/ps2eps-1.68.ebuild
+++ b/app-text/ps2eps/ps2eps-1.68.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.tm.uka.de/~bless/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
app-text/ghostscript-gpl
diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20200406.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20200406.ebuild
index 272bb9fe883e..9b76ee5ec683 100644
--- a/app-text/ps2pkm/ps2pkm-1.8_p20200406.ebuild
+++ b/app-text/ps2pkm/ps2pkm-1.8_p20200406.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-sou
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-libs/kpathsea-6.2.1"
diff --git a/app-text/qpdf/qpdf-10.0.4.ebuild b/app-text/qpdf/qpdf-10.0.4.ebuild
index b39294df3f29..da30b1934de3 100644
--- a/app-text/qpdf/qpdf-10.0.4.ebuild
+++ b/app-text/qpdf/qpdf-10.0.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
LICENSE="|| ( Apache-2.0 Artistic-2 )"
# subslot = libqpdf soname version
SLOT="0/28"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
IUSE="doc examples libressl ssl test"
RESTRICT="!test? ( test )"
diff --git a/app-text/rarian/rarian-0.8.1-r3.ebuild b/app-text/rarian/rarian-0.8.1-r3.ebuild
index cec1db78048f..9247ad3e910c 100644
--- a/app-text/rarian/rarian-0.8.1-r3.ebuild
+++ b/app-text/rarian/rarian-0.8.1-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://${PN}.freedesktop.org/Releases/${P}.tar.gz
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND="
diff --git a/app-text/rman/rman-3.2-r1.ebuild b/app-text/rman/rman-3.2-r1.ebuild
index 4527f2dbaadb..82199ea901d9 100644
--- a/app-text/rman/rman-3.2-r1.ebuild
+++ b/app-text/rman/rman-3.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/polyglotman/${P}.tar.gz"
LICENSE="Artistic"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
RESTRICT="test"
diff --git a/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild
index a3d62ec869e6..e36c055a77dd 100644
--- a/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild
+++ b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/${DTD_FIL
LICENSE="FDL-1.1"
SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=dev-libs/libxml2-2.4.19"
diff --git a/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild b/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
index fce56eecf964..d8abdc835b6a 100644
--- a/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
+++ b/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/dist/${PN}/${P}-gentoo.tar.gz"
# install-catalog is GPL
LICENSE="FDL-1.1+ GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=""
diff --git a/app-text/teckit/teckit-2.5.10.ebuild b/app-text/teckit/teckit-2.5.10.ebuild
index dce514539bd8..84fc007894c0 100644
--- a/app-text/teckit/teckit-2.5.10.ebuild
+++ b/app-text/teckit/teckit-2.5.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/silnrsi/teckit/releases/download/v${PV}/${P}.tar.gz"
LICENSE="|| ( CPL-0.5 LGPL-2.1 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
dev-libs/expat
diff --git a/app-text/texi2html/texi2html-5.0-r1.ebuild b/app-text/texi2html/texi2html-5.0-r1.ebuild
index 5ea9b5a78ad0..5643b6089563 100644
--- a/app-text/texi2html/texi2html-5.0-r1.ebuild
+++ b/app-text/texi2html/texi2html-5.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
LICENSE="GPL-2+ || ( GPL-2 CC-BY-SA-1.0 ) Texinfo-manual LGPL-2+ MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="unicode"
RESTRICT="test" #411523
diff --git a/app-text/texlive/texlive-2020-r9.ebuild b/app-text/texlive/texlive-2020-r9.ebuild
index 724092f9c785..ed2ef41dd1ed 100644
--- a/app-text/texlive/texlive-2020-r9.ebuild
+++ b/app-text/texlive/texlive-2020-r9.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://tug.org/texlive/"
LICENSE="metapackage"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="cjk context extra epspdf games graphics
humanities luatex metapost music pdfannotextractor png pstricks publishers
science tex4ht texi2html truetype xetex xml X"
diff --git a/app-text/tree/tree-1.8.0.ebuild b/app-text/tree/tree-1.8.0.ebuild
index dde5bef051ef..bcac09b3ccdf 100644
--- a/app-text/tree/tree-1.8.0.ebuild
+++ b/app-text/tree/tree-1.8.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE=""
RDEPEND=""
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20200406.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20200406.ebuild
index 293df0af0ba9..e211ff725b7d 100644
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20200406.ebuild
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20200406.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/texlive/texlive-${PV#*_p}-source.tar.xz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
# Note about blockers: it is a freetype2 based replacement for ttf2pk and
diff --git a/app-text/xmlto/xmlto-0.0.28-r3.ebuild b/app-text/xmlto/xmlto-0.0.28-r3.ebuild
index fcc8c8274dcd..75fca16f2d61 100644
--- a/app-text/xmlto/xmlto-0.0.28-r3.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="latex text"
RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
diff --git a/app-text/yelp-tools/yelp-tools-3.32.2.ebuild b/app-text/yelp-tools/yelp-tools-3.32.2.ebuild
index 97eac351891b..dea6311f4d66 100644
--- a/app-text/yelp-tools/yelp-tools-3.32.2.ebuild
+++ b/app-text/yelp-tools/yelp-tools-3.32.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="
diff --git a/app-vim/cfengine-syntax/cfengine-syntax-20141019.ebuild b/app-vim/cfengine-syntax/cfengine-syntax-20141019.ebuild
index ece327603d8e..5bc129da5027 100644
--- a/app-vim/cfengine-syntax/cfengine-syntax-20141019.ebuild
+++ b/app-vim/cfengine-syntax/cfengine-syntax-20141019.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,7 +7,7 @@ inherit vim-plugin
DESCRIPTION="vim plugin: Cfengine 3 configuration files syntax"
HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2904 https://github.com/neilhwatson/vim_cf3"
LICENSE="GPL-3+"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
VIM_PLUGIN_HELPTEXT=\
"This plugin provides syntax highlighting for Cfengine configuration
diff --git a/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild b/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
index c04a8ee628a4..7e8abbc1e05b 100644
--- a/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
+++ b/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,7 +8,7 @@ inherit vim-plugin
DESCRIPTION="vim plugin: syntax highlighting for dhcpd.conf"
HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=744"
LICENSE="vim"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
VIM_PLUGIN_HELPTEXT="This plugin provides syntax highlighting for dhcpd.conf files."
diff --git a/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild b/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild
index 6c84945e0813..ddeee7b7b8db 100644
--- a/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild
+++ b/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="vim"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
DEPEND="!<app-vim/gentoo-syntax-20070506"
RDEPEND="${DEPEND}"
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20201216.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20201216.ebuild
index 4f2b304b22b5..d36c89efc9ed 100644
--- a/app-vim/gentoo-syntax/gentoo-syntax-20201216.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20201216.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2"
LICENSE="vim"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="ignore-glep31"
VIM_PLUGIN_HELPFILES="gentoo-syntax"
diff --git a/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild b/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild
index 90422fa07210..601005bf2004 100644
--- a/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild
+++ b/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild
@@ -8,4 +8,4 @@ inherit vim-plugin
DESCRIPTION="vim plugin: Syntax highlighting for GLib, Gtk+, Xlib, Gimp, Gnome, and more"
HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1000"
LICENSE="vim"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
diff --git a/app-vim/info/info-1.7-r2.ebuild b/app-vim/info/info-1.7-r2.ebuild
index a0ff16bff546..6a15d0ae680f 100644
--- a/app-vim/info/info-1.7-r2.ebuild
+++ b/app-vim/info/info-1.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,7 +8,7 @@ inherit vim-plugin
DESCRIPTION="vim plugin: GNU info documentation browser"
HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=21"
LICENSE="BSD"
-KEYWORDS="~alpha amd64 ~ia64 ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~s390 sparc x86"
IUSE=""
VIM_PLUGIN_HELPTEXT="This plugin adds the :Info command."
diff --git a/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild b/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild
index cafa395a54b9..1440ffa45093 100644
--- a/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild
+++ b/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,6 +9,6 @@ DESCRIPTION="vim plugin: ntp.conf syntax highlighting"
HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=778"
LICENSE="vim"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
VIM_PLUGIN_HELPTEXT="This plugin provides syntax highlighting for ntp.conf files."
diff --git a/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild b/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild
index 92fc988f039f..d34fc442dfc7 100644
--- a/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild
+++ b/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild
@@ -21,7 +21,7 @@ else
URI_PV=${MY_PV:=${GOOGLETEST_COMMIT}}
fi
SRC_URI="https://github.com/google/googletest/archive/${URI_PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
S="${WORKDIR}"/googletest-${MY_PV}
fi
diff --git a/dev-db/freetds/freetds-1.2.18.ebuild b/dev-db/freetds/freetds-1.2.18.ebuild
index e8b1511db368..1efdc86b1872 100644
--- a/dev-db/freetds/freetds-1.2.18.ebuild
+++ b/dev-db/freetds/freetds-1.2.18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.freetds.org/pub/${PN}/current/${MY_PN}.${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos"
IUSE="debug gnutls iconv kerberos libressl mssql iodbc odbc ssl static-libs"
# iODBC and unixODBC are mutually-exclusive choices for
diff --git a/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild b/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild
index 74c9b7367fbb..1841cfc7411c 100644
--- a/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild
+++ b/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${P}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="doc firebird mysql oci8 postgres +sqlite static-libs"
REQUIRED_USE="|| ( mysql postgres sqlite firebird oci8 )"
diff --git a/dev-db/libdbi/libdbi-0.9.0.ebuild b/dev-db/libdbi/libdbi-0.9.0.ebuild
index 694cc0c0822e..bc6daa9ac86e 100644
--- a/dev-db/libdbi/libdbi-0.9.0.ebuild
+++ b/dev-db/libdbi/libdbi-0.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="http://libdbi.sourceforge.net/"
LICENSE="LGPL-2.1"
IUSE="doc static-libs"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
SLOT=0
DOCS=( AUTHORS ChangeLog README README.osx TODO )
diff --git a/dev-db/libiodbc/libiodbc-3.52.12-r1.ebuild b/dev-db/libiodbc/libiodbc-3.52.12-r1.ebuild
index ebcf516830df..b06337d9e90f 100644
--- a/dev-db/libiodbc/libiodbc-3.52.12-r1.ebuild
+++ b/dev-db/libiodbc/libiodbc-3.52.12-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.iodbc.org/"
SRC_URI="https://github.com/openlink/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${MY_PN}-${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
LICENSE="|| ( LGPL-2 BSD )"
SLOT="0"
IUSE="gtk"
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild
index 65570a7fd69c..c6da89cae390 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild
@@ -12,7 +12,7 @@ else
MY_PV=${PV/_b/-b}
SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz"
S="${WORKDIR%/}/${PN}-${MY_PV}-src"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 sparc x86"
fi
inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild
index 9caa67e3bbbd..e4d90aeaa555 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild
@@ -11,7 +11,7 @@ else
MY_PV=${PV/_b/-b}
SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz"
S="${WORKDIR%/}/${PN}-${MY_PV}-src"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 sparc x86"
fi
CMAKE_ECLASS=cmake
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.22.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.22.ebuild
index d7b0089ba715..b6cc7e4f6d80 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.22.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ HOMEPAGE="https://dev.mysql.com/downloads/"
LICENSE="GPL-2"
SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-${PV}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
SLOT="0/21"
IUSE="ldap libressl static-libs"
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.23-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.23-r1.ebuild
index 9c2d649a5211..4923fe57f0c3 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.23-r1.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.23-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${PV}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
S="${WORKDIR}/mysql-${PV}"
fi
diff --git a/dev-db/qdbm/qdbm-1.8.78-r2.ebuild b/dev-db/qdbm/qdbm-1.8.78-r2.ebuild
index 6ca565cc881a..ca400e7d94c0 100644
--- a/dev-db/qdbm/qdbm-1.8.78-r2.ebuild
+++ b/dev-db/qdbm/qdbm-1.8.78-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -13,7 +13,7 @@ SRC_URI="https://fallabs.com/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="bzip2 cxx debug java lzo perl ruby static-libs zlib"
RDEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/dev-db/sqlite/sqlite-3.34.1.ebuild b/dev-db/sqlite/sqlite-3.34.1.ebuild
index 3da495bc28ef..623578707fa3 100644
--- a/dev-db/sqlite/sqlite-3.34.1.ebuild
+++ b/dev-db/sqlite/sqlite-3.34.1.ebuild
@@ -22,7 +22,7 @@ fi
LICENSE="public-domain"
SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
if [[ "${PV}" == "9999" ]]; then
PROPERTIES="live"
diff --git a/dev-db/unixODBC/unixODBC-2.3.9.ebuild b/dev-db/unixODBC/unixODBC-2.3.9.ebuild
index cefa55fb11f0..ec457a936c35 100644
--- a/dev-db/unixODBC/unixODBC-2.3.9.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.3.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.unixodbc.org/pub/${PN}/${P}.tar.gz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+minimal odbcmanual static-libs unicode"
RDEPEND="
diff --git a/dev-lang/bff/bff-1.0.5.ebuild b/dev-lang/bff/bff-1.0.5.ebuild
index 00466aa5e9c4..d22d2aaa961a 100644
--- a/dev-lang/bff/bff-1.0.5.ebuild
+++ b/dev-lang/bff/bff-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/apankrat/bff"
SRC_URI="https://github.com/apankrat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm ~ia64 ~m68k ppc ppc64 s390 x86"
+KEYWORDS="amd64 arm ~ia64 ~m68k ppc ppc64 ~s390 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/mujs/mujs-1.0.9.ebuild b/dev-lang/mujs/mujs-1.0.9.ebuild
index 352f7eef3635..9ec22acb2d71 100644
--- a/dev-lang/mujs/mujs-1.0.9.ebuild
+++ b/dev-lang/mujs/mujs-1.0.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ccxvii/mujs/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="ISC"
# subslot matches SONAME
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
IUSE="static-libs"
RDEPEND="sys-libs/readline:0="
diff --git a/dev-lang/mujs/mujs-1.1.0.ebuild b/dev-lang/mujs/mujs-1.1.0.ebuild
index ea1dbb25d52b..c8b2f49f3e40 100644
--- a/dev-lang/mujs/mujs-1.1.0.ebuild
+++ b/dev-lang/mujs/mujs-1.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ccxvii/mujs/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="ISC"
# subslot matches SONAME
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
IUSE="static-libs"
RDEPEND="sys-libs/readline:0="
diff --git a/dev-lang/perl/perl-5.30.3.ebuild b/dev-lang/perl/perl-5.30.3.ebuild
index 8f88325107c3..30310a2fc646 100644
--- a/dev-lang/perl/perl-5.30.3.ebuild
+++ b/dev-lang/perl/perl-5.30.3.ebuild
@@ -51,7 +51,7 @@ LICENSE="|| ( Artistic GPL-1+ )"
SLOT="0/${SUBSLOT}"
if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
IUSE="berkdb debug doc gdbm ithreads"
diff --git a/dev-lang/python-exec-conf/python-exec-conf-2.4.6.ebuild b/dev-lang/python-exec-conf/python-exec-conf-2.4.6.ebuild
index 73d029f6bc30..24af3f9bf9b9 100644
--- a/dev-lang/python-exec-conf/python-exec-conf-2.4.6.ebuild
+++ b/dev-lang/python-exec-conf/python-exec-conf-2.4.6.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="BSD-2"
SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Internal Python project hack. Do not copy it. Ever.
IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_}"
diff --git a/dev-lang/python-exec/python-exec-2.4.6-r4.ebuild b/dev-lang/python-exec/python-exec-2.4.6-r4.ebuild
index b5e8490db8cd..0f1f8c94ce6d 100644
--- a/dev-lang/python-exec/python-exec-2.4.6-r4.ebuild
+++ b/dev-lang/python-exec/python-exec-2.4.6-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgorny/python-exec/releases/download/v${PV}/${P}.tar
LICENSE="BSD-2"
SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Internal Python project hack. Do not copy it. Ever.
IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_} +native-symlinks"
diff --git a/dev-lang/ruby/ruby-2.5.8.ebuild b/dev-lang/ruby/ruby-2.5.8.ebuild
index e722111acf8c..e2623355eb45 100644
--- a/dev-lang/ruby/ruby-2.5.8.ebuild
+++ b/dev-lang/ruby/ruby-2.5.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.ruby-lang.org/"
SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86"
IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 +ssl static-libs tk xemacs"
RDEPEND="
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r9.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r9.ebuild
index 3808367d5171..b736bb0eadeb 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r9.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -19,7 +19,7 @@ SRC_URI="https://archive.mozilla.org/pub/js/${TARBALL_P}.tar.gz
LICENSE="NPL-1.1"
SLOT="0/mozjs185"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 x86 ~x64-macos"
IUSE="debug minimal static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r2.ebuild b/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r2.ebuild
index 5b47c03a9c44..bca42f7ddb2e 100644
--- a/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r2.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-52.9.1_pre1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.mozilla.org/pub/spidermonkey/prereleases/52/pre1/mozjs-52.9.
LICENSE="NPL-1.1"
SLOT="52"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 x86"
IUSE="debug minimal +system-icu test"
# Disable tests:
diff --git a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r4.ebuild b/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r4.ebuild
index 52f96f099364..4404665f45e1 100644
--- a/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r4.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-60.5.2_p0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="https://dev.gentoo.org/~axs/distfiles/${MY_P}.tar.bz2
LICENSE="NPL-1.1"
SLOT="60"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="debug +jit minimal +system-icu test"
# Disable tests:
diff --git a/dev-lang/tcl/tcl-8.5.17-r1.ebuild b/dev-lang/tcl/tcl-8.5.17-r1.ebuild
index 0b26a10bb60b..86e4b0194833 100644
--- a/dev-lang/tcl/tcl-8.5.17-r1.ebuild
+++ b/dev-lang/tcl/tcl-8.5.17-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
LICENSE="tcltk"
SLOT="0/8.5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
IUSE="debug threads"
RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-lang/tcl/tcl-8.6.8.ebuild b/dev-lang/tcl/tcl-8.6.8.ebuild
index ed39cbd358ed..b431e41fe4c6 100644
--- a/dev-lang/tcl/tcl-8.6.8.ebuild
+++ b/dev-lang/tcl/tcl-8.6.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz"
LICENSE="tcltk"
SLOT="0/8.6"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug +threads"
RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-lang/tk/tk-8.6.8.ebuild b/dev-lang/tk/tk-8.6.8.ebuild
index 46072ae5d35f..e279039f0511 100644
--- a/dev-lang/tk/tk-8.6.8.ebuild
+++ b/dev-lang/tk/tk-8.6.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
LICENSE="tcltk"
SLOT="0/8.6"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug +threads truetype aqua xscreensaver"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/vala/vala-0.36.20.ebuild b/dev-lang/vala/vala-0.36.20.ebuild
index 7eed0b4d5307..109cbd7c8710 100644
--- a/dev-lang/vala/vala-0.36.20.ebuild
+++ b/dev-lang/vala/vala-0.36.20.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
LICENSE="LGPL-2.1"
SLOT="0.36"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/vala/vala-0.40.20.ebuild b/dev-lang/vala/vala-0.40.20.ebuild
index 07b8e08051f4..069516b86217 100644
--- a/dev-lang/vala/vala-0.40.20.ebuild
+++ b/dev-lang/vala/vala-0.40.20.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
LICENSE="LGPL-2.1"
SLOT="0.40"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux"
IUSE="test valadoc"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/vala/vala-0.40.23.ebuild b/dev-lang/vala/vala-0.40.23.ebuild
index 07b8e08051f4..069516b86217 100644
--- a/dev-lang/vala/vala-0.40.23.ebuild
+++ b/dev-lang/vala/vala-0.40.23.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
LICENSE="LGPL-2.1"
SLOT="0.40"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux"
IUSE="test valadoc"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/vala/vala-0.44.11.ebuild b/dev-lang/vala/vala-0.44.11.ebuild
index a45edae6d298..6494a3728ab4 100644
--- a/dev-lang/vala/vala-0.44.11.ebuild
+++ b/dev-lang/vala/vala-0.44.11.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
LICENSE="LGPL-2.1+"
SLOT="0.44"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux"
IUSE="test valadoc"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/vala/vala-0.46.10.ebuild b/dev-lang/vala/vala-0.46.10.ebuild
index 34568945839d..446e0c12bab2 100644
--- a/dev-lang/vala/vala-0.46.10.ebuild
+++ b/dev-lang/vala/vala-0.46.10.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
LICENSE="LGPL-2.1+"
SLOT="0.46"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux"
IUSE="test valadoc"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/vala/vala-0.46.13.ebuild b/dev-lang/vala/vala-0.46.13.ebuild
index 34568945839d..446e0c12bab2 100644
--- a/dev-lang/vala/vala-0.46.13.ebuild
+++ b/dev-lang/vala/vala-0.46.13.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
LICENSE="LGPL-2.1+"
SLOT="0.46"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux"
IUSE="test valadoc"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/vala/vala-0.48.6.ebuild b/dev-lang/vala/vala-0.48.6.ebuild
index 20f1897d7cd3..98616f0f84a1 100644
--- a/dev-lang/vala/vala-0.48.6.ebuild
+++ b/dev-lang/vala/vala-0.48.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
LICENSE="LGPL-2.1+"
SLOT="0.48"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux"
IUSE="test valadoc"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/vala/vala-0.48.9.ebuild b/dev-lang/vala/vala-0.48.9.ebuild
index 20f1897d7cd3..98616f0f84a1 100644
--- a/dev-lang/vala/vala-0.48.9.ebuild
+++ b/dev-lang/vala/vala-0.48.9.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
LICENSE="LGPL-2.1+"
SLOT="0.48"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux"
IUSE="test valadoc"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.16.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.16.ebuild
index f7bb3107cfd5..1b53d1e5f20b 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.7.16.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.7.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
LICENSE="LGPL-2.1+"
SLOT="0/8" # soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="gtk-doc fonts +introspection stemmer"
RDEPEND="
diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.17.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.17.ebuild
index f0dacd30fe6e..e9e70fa8765d 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.7.17.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.7.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
LICENSE="LGPL-2.1+"
SLOT="0/8" # soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="gtk-doc fonts +introspection stemmer"
RDEPEND="
diff --git a/dev-libs/apr/apr-1.6.3-r4.ebuild b/dev-libs/apr/apr-1.6.3-r4.ebuild
index b3c7995ee263..b25c5dc772b0 100644
--- a/dev-libs/apr/apr-1.6.3-r4.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
diff --git a/dev-libs/apr/apr-1.7.0-r1.ebuild b/dev-libs/apr/apr-1.7.0-r1.ebuild
index f4a3aa30f6b1..344bb0f76e8e 100644
--- a/dev-libs/apr/apr-1.7.0-r1.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
diff --git a/dev-libs/atf/atf-0.21-r2.ebuild b/dev-libs/atf/atf-0.21-r2.ebuild
index 8d9f4fa2bb97..5376ddf5e0a5 100644
--- a/dev-libs/atf/atf-0.21-r2.ebuild
+++ b/dev-libs/atf/atf-0.21-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/jmmv/atf/releases/download/${P}/${P}.tar.gz"
LICENSE="BSD BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="virtual/pkgconfig"
diff --git a/dev-libs/atk/atk-2.34.1.ebuild b/dev-libs/atk/atk-2.34.1.ebuild
index 85ea16e0c695..9f1c1f60cd2f 100644
--- a/dev-libs/atk/atk-2.34.1.ebuild
+++ b/dev-libs/atk/atk-2.34.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="gtk-doc +introspection"
RDEPEND="
diff --git a/dev-libs/atk/atk-2.36.0.ebuild b/dev-libs/atk/atk-2.36.0.ebuild
index 85ea16e0c695..9f1c1f60cd2f 100644
--- a/dev-libs/atk/atk-2.36.0.ebuild
+++ b/dev-libs/atk/atk-2.36.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="gtk-doc +introspection"
RDEPEND="
diff --git a/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild b/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild
index 0731963bc186..7211307e2d0b 100644
--- a/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild
@@ -15,7 +15,7 @@ LICENSE="boehm-gc"
# SONAME: libgc.so.1 libgccpp.so.1
# We've been using subslot 0 for these instead of "1.1".
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="cxx static-libs +threads"
RDEPEND=">=dev-libs/libatomic_ops-7.4[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/cgilib/cgilib-0.7-r1.ebuild b/dev-libs/cgilib/cgilib-0.7-r1.ebuild
index 265ae95244fd..bb5ecf9baa14 100644
--- a/dev-libs/cgilib/cgilib-0.7-r1.ebuild
+++ b/dev-libs/cgilib/cgilib-0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://www.infodrom.org/projects/cgilib/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="static-libs"
DOCS=( AUTHORS ChangeLog README cookies.txt )
diff --git a/dev-libs/check/check-0.15.2-r1.ebuild b/dev-libs/check/check-0.15.2-r1.ebuild
index cdad4dc1aee8..a96de0605c27 100644
--- a/dev-libs/check/check-0.15.2-r1.ebuild
+++ b/dev-libs/check/check-0.15.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libcheck/check/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc subunit test"
# Tests seem to timeout on ppc* systems, #736661
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild
index 32fdde1ac701..be8a2a12ff5c 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
LICENSE="BSD-with-attribution"
SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom"
CDEPEND="
diff --git a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
index 0da7888c532e..7a4c8e0d4df1 100644
--- a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
LICENSE="|| ( GPL-2 AFL-2.1 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="debug static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild b/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
index 2a8cb6021859..60e05ee68fbf 100644
--- a/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
+++ b/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dmalloc.com/releases/${P}.tgz"
LICENSE="CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="threads"
BDEPEND="sys-apps/texinfo"
diff --git a/dev-libs/elfutils/elfutils-0.182.ebuild b/dev-libs/elfutils/elfutils-0.182.ebuild
index 52d48a39e1fa..f3f42d8023f9 100644
--- a/dev-libs/elfutils/elfutils-0.182.ebuild
+++ b/dev-libs/elfutils/elfutils-0.182.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind zstd"
RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
diff --git a/dev-libs/elfutils/elfutils-0.183.ebuild b/dev-libs/elfutils/elfutils-0.183.ebuild
index 52f97e28cca1..42f230d96e40 100644
--- a/dev-libs/elfutils/elfutils-0.183.ebuild
+++ b/dev-libs/elfutils/elfutils-0.183.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind zstd"
RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
diff --git a/dev-libs/eventlog/eventlog-0.2.12.ebuild b/dev-libs/eventlog/eventlog-0.2.12.ebuild
index 4314da457d3d..6f92f6855637 100644
--- a/dev-libs/eventlog/eventlog-0.2.12.ebuild
+++ b/dev-libs/eventlog/eventlog-0.2.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="http://www.balabit.com/downloads/files/eventlog/0.2//eventlog_${PV}.tar
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="static-libs"
DEPEND=""
diff --git a/dev-libs/expat/expat-2.2.10.ebuild b/dev-libs/expat/expat-2.2.10.ebuild
index cf18a8043d2b..99f114217cbf 100644
--- a/dev-libs/expat/expat-2.2.10.ebuild
+++ b/dev-libs/expat/expat-2.2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="elibc_FreeBSD examples static-libs unicode"
BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
diff --git a/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild b/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
index f0ef81ef037a..ea9b98a522cd 100644
--- a/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
+++ b/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.fastcgi.com/dist/fcgi-2.4.1-SNAP-0910052249.tar.gz"
LICENSE="FastCGI"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="html"
S="${WORKDIR}/${PN}-2.4.1-SNAP-0910052249"
diff --git a/dev-libs/fribidi/fribidi-1.0.9.ebuild b/dev-libs/fribidi/fribidi-1.0.9.ebuild
index eec75c2b00f0..294d074af9b8 100644
--- a/dev-libs/fribidi/fribidi-1.0.9.ebuild
+++ b/dev-libs/fribidi/fribidi-1.0.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.xz
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND=""
diff --git a/dev-libs/geoip/geoip-1.6.12.ebuild b/dev-libs/geoip/geoip-1.6.12.ebuild
index 8d3acd5e9c69..427939a236fb 100644
--- a/dev-libs/geoip/geoip-1.6.12.ebuild
+++ b/dev-libs/geoip/geoip-1.6.12.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-api-c-${PV}"
# GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
LICENSE="LGPL-2.1 GPL-2 MaxMind2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="static-libs"
RESTRICT="test"
diff --git a/dev-libs/glib/glib-2.66.7.ebuild b/dev-libs/glib/glib-2.66.7.ebuild
index 417cda9f1dd4..0f1be9803c93 100644
--- a/dev-libs/glib/glib-2.66.7.ebuild
+++ b/dev-libs/glib/glib-2.66.7.ebuild
@@ -14,7 +14,7 @@ SLOT="2"
IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs sysprof systemtap test utils xattr"
RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
# * libelf isn't strictly necessary, but makes gresource tool more useful, and
# the check is automagic in gio/meson.build. gresource is not a multilib tool
diff --git a/dev-libs/gmp/gmp-6.2.1.ebuild b/dev-libs/gmp/gmp-6.2.1.ebuild
index e78f841aa4d6..88429c313ca6 100644
--- a/dev-libs/gmp/gmp-6.2.1.ebuild
+++ b/dev-libs/gmp/gmp-6.2.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
LICENSE="|| ( LGPL-3+ GPL-2+ )"
# The subslot reflects the C & C++ SONAMEs.
SLOT="0/10.4"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+asm doc +cxx pic static-libs"
BDEPEND="sys-devel/m4
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.62.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.62.0.ebuild
index 9237db2d3ea1..61d843c91f08 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.62.0.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.62.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
LICENSE="HPND"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}"
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild
index 9237db2d3ea1..61d843c91f08 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.64.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
LICENSE="HPND"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}"
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.62.0-r1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.62.0-r1.ebuild
index b2247558d7c3..c5f131a94c7d 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.62.0-r1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.62.0-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
IUSE="doctool gtk-doc test"
RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# virtual/pkgconfig needed at runtime, bug #505408
RDEPEND="
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild
index 22d9fced0c39..603d9639eb04 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.64.1-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
IUSE="doctool gtk-doc test"
RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# virtual/pkgconfig needed at runtime, bug #505408
RDEPEND="
diff --git a/dev-libs/hiredis/hiredis-0.14.1.ebuild b/dev-libs/hiredis/hiredis-0.14.1.ebuild
index 81bbbb4420c3..8711e421b030 100644
--- a/dev-libs/hiredis/hiredis-0.14.1.ebuild
+++ b/dev-libs/hiredis/hiredis-0.14.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/redis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0/0.14"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-solaris"
IUSE="examples static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/hiredis/hiredis-1.0.0.ebuild b/dev-libs/hiredis/hiredis-1.0.0.ebuild
index b9046749771f..b66961f6faf0 100644
--- a/dev-libs/hiredis/hiredis-1.0.0.ebuild
+++ b/dev-libs/hiredis/hiredis-1.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/redis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0/1.0.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-solaris"
IUSE="examples ssl static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/inih/inih-52.ebuild b/dev-libs/inih/inih-52.ebuild
index 09154cf1b6eb..a9416cdfe171 100644
--- a/dev-libs/inih/inih-52.ebuild
+++ b/dev-libs/inih/inih-52.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="inih (INI not invented here) simple .INI file parser"
HOMEPAGE="https://github.com/benhoyt/inih"
SRC_URI="https://github.com/benhoyt/inih/archive/r${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-libs/iniparser/iniparser-3.1-r2.ebuild b/dev-libs/iniparser/iniparser-3.1-r2.ebuild
index b1d29efbc66f..43064dc3c80b 100644
--- a/dev-libs/iniparser/iniparser-3.1-r2.ebuild
+++ b/dev-libs/iniparser/iniparser-3.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ndevilla.free.fr/iniparser/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc examples"
# the tests are rather examples than tests, no point in running them
RESTRICT="test"
diff --git a/dev-libs/iniparser/iniparser-4.1.ebuild b/dev-libs/iniparser/iniparser-4.1.ebuild
index d524ee1cfc13..d964286c74f8 100644
--- a/dev-libs/iniparser/iniparser-4.1.ebuild
+++ b/dev-libs/iniparser/iniparser-4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ndevilla/iniparser/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="MIT"
SLOT="4"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc examples"
BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-libs/isl/isl-0.23-r1.ebuild b/dev-libs/isl/isl-0.23-r1.ebuild
index d0c02bfe7c8f..5668340ffa59 100644
--- a/dev-libs/isl/isl-0.23-r1.ebuild
+++ b/dev-libs/isl/isl-0.23-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0/23"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/jansson/jansson-2.13.1-r1.ebuild b/dev-libs/jansson/jansson-2.13.1-r1.ebuild
index 1f926f3cbf18..0ea1a8080ff6 100644
--- a/dev-libs/jansson/jansson-2.13.1-r1.ebuild
+++ b/dev-libs/jansson/jansson-2.13.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.digip.org/jansson/releases/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
IUSE="doc static-libs"
BDEPEND="doc? ( dev-python/sphinx )"
diff --git a/dev-libs/jemalloc/jemalloc-5.2.1.ebuild b/dev-libs/jemalloc/jemalloc-5.2.1.ebuild
index de9d97d0f769..0042c4ffac6d 100644
--- a/dev-libs/jemalloc/jemalloc-5.2.1.ebuild
+++ b/dev-libs/jemalloc/jemalloc-5.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.b
LICENSE="BSD"
SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
IUSE="debug hardened lazy-lock prof static-libs stats xmalloc"
HTML_DOCS=( doc/jemalloc.html )
PATCHES=( "${FILESDIR}/${PN}-5.2.0-gentoo-fixups.patch" )
diff --git a/dev-libs/json-c/json-c-0.15.ebuild b/dev-libs/json-c/json-c-0.15.ebuild
index dcdc8fd0cc0c..70e366eb88de 100644
--- a/dev-libs/json-c/json-c-0.15.ebuild
+++ b/dev-libs/json-c/json-c-0.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="cpu_flags_x86_rdrand doc static-libs threads"
BDEPEND="doc? ( >=app-doc/doxygen-1.8.13 )"
diff --git a/dev-libs/json-glib/json-glib-1.4.4.ebuild b/dev-libs/json-glib/json-glib-1.4.4.ebuild
index 0f1020925a1d..b3751377d233 100644
--- a/dev-libs/json-glib/json-glib-1.4.4.ebuild
+++ b/dev-libs/json-glib/json-glib-1.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="gtk-doc +introspection"
RDEPEND="
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild
index ad08408b0a6a..1b704d188812 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="|| ( public-domain MIT )"
SLOT="0/24"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
index 31c1b29293c5..5c858b99e519 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="|| ( public-domain MIT )"
SLOT="0/24"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/kpathsea/kpathsea-6.3.2_p20200406.ebuild b/dev-libs/kpathsea/kpathsea-6.3.2_p20200406.ebuild
index 365d871b16e3..e3494ced7f73 100644
--- a/dev-libs/kpathsea/kpathsea-6.3.2_p20200406.ebuild
+++ b/dev-libs/kpathsea/kpathsea-6.3.2_p20200406.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-sou
LICENSE="GPL-2"
SLOT="0/${PV%_p*}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc source static-libs"
S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
diff --git a/dev-libs/libaio/libaio-0.3.112.ebuild b/dev-libs/libaio/libaio-0.3.112.ebuild
index 4795bb4a812b..93a8952b8ee0 100644
--- a/dev-libs/libaio/libaio-0.3.112.ebuild
+++ b/dev-libs/libaio/libaio-0.3.112.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -12,7 +12,7 @@ if [[ "${PV}" == 9999 ]] ; then
EGIT_REPO_URI="https://pagure.io/libaio.git"
else
SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
fi
LICENSE="LGPL-2"
SLOT="0"
diff --git a/dev-libs/libassuan/libassuan-2.5.3.ebuild b/dev-libs/libassuan/libassuan-2.5.3.ebuild
index 35ede059a696..6b7c07a83540 100644
--- a/dev-libs/libassuan/libassuan-2.5.3.ebuild
+++ b/dev-libs/libassuan/libassuan-2.5.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="GPL-3 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND=">=dev-libs/libgpg-error-1.8"
DEPEND="${RDEPEND}"
diff --git a/dev-libs/libassuan/libassuan-2.5.4.ebuild b/dev-libs/libassuan/libassuan-2.5.4.ebuild
index 1005af834462..869dbf172ae6 100644
--- a/dev-libs/libassuan/libassuan-2.5.4.ebuild
+++ b/dev-libs/libassuan/libassuan-2.5.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="GPL-3 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND=">=dev-libs/libgpg-error-1.17"
DEPEND="${RDEPEND}"
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild
index e8b75ba46a6b..9216699224d4 100644
--- a/dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ivmai/${PN}/releases/download/v${PV}/${P}.tar.gz"
LICENSE="MIT boehm-gc GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
multilib_src_configure() {
ECONF_SOURCE="${S}" econf \
diff --git a/dev-libs/libbsd/libbsd-0.10.0.ebuild b/dev-libs/libbsd/libbsd-0.10.0.ebuild
index f4a24da07906..ba68dc9c223d 100644
--- a/dev-libs/libbsd/libbsd-0.10.0.ebuild
+++ b/dev-libs/libbsd/libbsd-0.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
LICENSE="BSD BSD-2 BSD-4 ISC"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="static-libs"
DEPEND=">=sys-kernel/linux-headers-3.17"
diff --git a/dev-libs/libcbor/libcbor-0.8.0.ebuild b/dev-libs/libcbor/libcbor-0.8.0.ebuild
index a59a570f5eb1..825d999239cf 100644
--- a/dev-libs/libcbor/libcbor-0.8.0.ebuild
+++ b/dev-libs/libcbor/libcbor-0.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/PJK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="+custom-alloc doc test"
BDEPEND="
diff --git a/dev-libs/libcroco/libcroco-0.6.13.ebuild b/dev-libs/libcroco/libcroco-0.6.13.ebuild
index 0c9998c63a95..b3717ad99083 100644
--- a/dev-libs/libcroco/libcroco-0.6.13.ebuild
+++ b/dev-libs/libcroco/libcroco-0.6.13.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/libcroco/"
LICENSE="LGPL-2"
SLOT="0.6"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild b/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
index 5c2fddc9776d..62e9be489eca 100644
--- a/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
+++ b/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="doc examples static-libs"
BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-libs/libedit/libedit-20191211.3.1.ebuild b/dev-libs/libedit/libedit-20191211.3.1.ebuild
index c5be4154428c..da519ddc580f 100644
--- a/dev-libs/libedit/libedit-20191211.3.1.ebuild
+++ b/dev-libs/libedit/libedit-20191211.3.1.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="static-libs"
RDEPEND=">=sys-libs/ncurses-5.9-r3[static-libs?,${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libev/libev-4.33.ebuild b/dev-libs/libev/libev-4.33.ebuild
index 9b095c166782..4b9fb143c7fc 100644
--- a/dev-libs/libev/libev-4.33.ebuild
+++ b/dev-libs/libev/libev-4.33.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://dist.schmorp.de/libev/${P}.tar.gz
LICENSE="|| ( BSD GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="static-libs"
DOCS=( Changes README )
diff --git a/dev-libs/libevdev/libevdev-1.10.0.ebuild b/dev-libs/libevdev/libevdev-1.10.0.ebuild
index 03c27dfc74e0..0330325b6d33 100644
--- a/dev-libs/libevdev/libevdev-1.10.0.ebuild
+++ b/dev-libs/libevdev/libevdev-1.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
inherit git-r3
else
SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
fi
LICENSE="MIT"
diff --git a/dev-libs/libevent/libevent-2.1.11.ebuild b/dev-libs/libevent/libevent-2.1.11.ebuild
index 5addf6160254..10869e3ffaff 100644
--- a/dev-libs/libevent/libevent-2.1.11.ebuild
+++ b/dev-libs/libevent/libevent-2.1.11.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0/2.1-7"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="debug libressl +ssl static-libs test +threads"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libffi/libffi-3.3-r2.ebuild b/dev-libs/libffi/libffi-3.3-r2.ebuild
index fc243c08f0f6..b9b5a0100834 100644
--- a/dev-libs/libffi/libffi-3.3-r2.ebuild
+++ b/dev-libs/libffi/libffi-3.3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.ta
LICENSE="MIT"
SLOT="0/7" # SONAME=libffi.so.7
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug pax_kernel static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libfido2/libfido2-1.5.0-r1.ebuild b/dev-libs/libfido2/libfido2-1.5.0-r1.ebuild
index 5fdacec0f103..e836ac168b5d 100644
--- a/dev-libs/libfido2/libfido2-1.5.0-r1.ebuild
+++ b/dev-libs/libfido2/libfido2-1.5.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="libressl +static-libs"
DEPEND="
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild
index 4a892f63e455..104cd442afc7 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2.1 MIT"
SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc o-flag-munging static-libs"
RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild
index 4a892f63e455..104cd442afc7 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2.1 MIT"
SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc o-flag-munging static-libs"
RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libgpg-error/libgpg-error-1.38.ebuild b/dev-libs/libgpg-error/libgpg-error-1.38.ebuild
index d37b93f1d197..571ad56f1c0d 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.38.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.38.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="common-lisp nls static-libs"
RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/libgpg-error/libgpg-error-1.41.ebuild b/dev-libs/libgpg-error/libgpg-error-1.41.ebuild
index 6064c953b05e..813c76a9b5d2 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.41.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.41.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="common-lisp nls static-libs"
RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/libgudev/libgudev-233-r1.ebuild b/dev-libs/libgudev/libgudev-233-r1.ebuild
index ff398aff9a35..a6e45f420cd1 100644
--- a/dev-libs/libgudev/libgudev-233-r1.ebuild
+++ b/dev-libs/libgudev/libgudev-233-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgudev"
LICENSE="LGPL-2.1+"
SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="introspection static-libs"
COMMON_DEPEND="
diff --git a/dev-libs/libintl/libintl-0.21.ebuild b/dev-libs/libintl/libintl-0.21.ebuild
index 85dd82bf4f60..fc9a7abf4a83 100644
--- a/dev-libs/libintl/libintl-0.21.ebuild
+++ b/dev-libs/libintl/libintl-0.21.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="static-libs +threads"
DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libksba/libksba-1.3.5-r1.ebuild b/dev-libs/libksba/libksba-1.3.5-r1.ebuild
index 6db218588f6e..1d6f3735e791 100644
--- a/dev-libs/libksba/libksba-1.3.5-r1.ebuild
+++ b/dev-libs/libksba/libksba-1.3.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
LICENSE="LGPL-3+ GPL-2+ GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libksba/libksba-1.5.0.ebuild b/dev-libs/libksba/libksba-1.5.0.ebuild
index d629c6b29300..6b66a7c049fb 100644
--- a/dev-libs/libksba/libksba-1.5.0.ebuild
+++ b/dev-libs/libksba/libksba-1.5.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
LICENSE="LGPL-3+ GPL-2+ GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libltdl/libltdl-2.4.6.ebuild b/dev-libs/libltdl/libltdl-2.4.6.ebuild
index 019882fda44e..31fd0f949972 100644
--- a/dev-libs/libltdl/libltdl-2.4.6.ebuild
+++ b/dev-libs/libltdl/libltdl-2.4.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/libtool/${MY_P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
# libltdl doesn't have a testsuite.
RESTRICT="test"
diff --git a/dev-libs/liblzw/liblzw-0.2-r1.ebuild b/dev-libs/liblzw/liblzw-0.2-r1.ebuild
index cf4eda2ecdfd..199a30521694 100644
--- a/dev-libs/liblzw/liblzw-0.2-r1.ebuild
+++ b/dev-libs/liblzw/liblzw-0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/freestdf/${P}.tar.lzma"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ia64 ~m68k s390 x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ~m68k ~s390 x86"
src_configure() {
econf --disable-static
diff --git a/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild b/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild
index 07703af4feb4..7a0292538c63 100644
--- a/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild
+++ b/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="debug hsieh +libevent sasl static-libs"
DEPEND="net-misc/memcached
diff --git a/dev-libs/libmix/libmix-2.05-r7.ebuild b/dev-libs/libmix/libmix-2.05-r7.ebuild
index b372ae36efaa..0bedbeabb8a3 100644
--- a/dev-libs/libmix/libmix-2.05-r7.ebuild
+++ b/dev-libs/libmix/libmix-2.05-r7.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-v${PV}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux"
IUSE="static-libs"
PATCHES=(
diff --git a/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild b/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild
index ac019166123b..9ddf9f32ef53 100644
--- a/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild
+++ b/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
MY_P="${PN}-9999"
else
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos ~x64-solaris"
MY_PV="${PV/_alpha/alpha}"
MY_P="${PN}-${MY_PV}"
SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
diff --git a/dev-libs/libnatspec/libnatspec-0.3.0.ebuild b/dev-libs/libnatspec/libnatspec-0.3.0.ebuild
index 958d7b084fb2..02e0a60d3cb2 100644
--- a/dev-libs/libnatspec/libnatspec-0.3.0.ebuild
+++ b/dev-libs/libnatspec/libnatspec-0.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/natspec/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="doc"
RDEPEND="dev-libs/popt"
diff --git a/dev-libs/libnl/libnl-1.1.4-r1.ebuild b/dev-libs/libnl/libnl-1.1.4-r1.ebuild
index e353d9ccc9be..8f3ad2437d6f 100644
--- a/dev-libs/libnl/libnl-1.1.4-r1.ebuild
+++ b/dev-libs/libnl/libnl-1.1.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.infradead.org/~tgr/libnl/files/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="1.1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc static-libs"
DEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-libs/libnl/libnl-3.5.0.ebuild b/dev-libs/libnl/libnl-3.5.0.ebuild
index 2c8d76055e42..ea0332a4ef97 100644
--- a/dev-libs/libnl/libnl-3.5.0.ebuild
+++ b/dev-libs/libnl/libnl-3.5.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${LIBNL_P}"
LICENSE="LGPL-2.1 utils? ( GPL-2 )"
SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="+debug static-libs python +threads utils"
RDEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/dev-libs/libpcre/libpcre-8.44.ebuild b/dev-libs/libpcre/libpcre-8.44.ebuild
index 4c1eeea38bc7..7fc49955cbfd 100644
--- a/dev-libs/libpcre/libpcre-8.44.ebuild
+++ b/dev-libs/libpcre/libpcre-8.44.ebuild
@@ -18,7 +18,7 @@ fi
LICENSE="BSD"
SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
REQUIRED_USE="readline? ( !libedit )
libedit? ( !readline )"
diff --git a/dev-libs/libpcre2/libpcre2-10.35.ebuild b/dev-libs/libpcre2/libpcre2-10.35.ebuild
index f785b364fbe0..9ffdaa44babf 100644
--- a/dev-libs/libpcre2/libpcre2-10.35.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.35.ebuild
@@ -25,7 +25,7 @@ fi
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
REQUIRED_USE="?? ( libedit readline )"
diff --git a/dev-libs/libpipeline/libpipeline-1.5.2.ebuild b/dev-libs/libpipeline/libpipeline-1.5.2.ebuild
index a892d88117a0..49a89ee95a4e 100644
--- a/dev-libs/libpipeline/libpipeline-1.5.2.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.5.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libpipeline/libpipeline-1.5.3.ebuild b/dev-libs/libpipeline/libpipeline-1.5.3.ebuild
index 8c19f8a1b990..c841cfd67015 100644
--- a/dev-libs/libpipeline/libpipeline-1.5.3.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.5.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild b/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild
index 9db4fbaa641f..3440248d88e0 100644
--- a/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild
+++ b/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
multilib_src_configure() {
diff --git a/dev-libs/libsodium/libsodium-1.0.18.ebuild b/dev-libs/libsodium/libsodium-1.0.18.ebuild
index 220e1a8d1c63..5e188c2c3b36 100644
--- a/dev-libs/libsodium/libsodium-1.0.18.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
LICENSE="ISC"
SLOT="0/23"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
PATCHES=(
diff --git a/dev-libs/libtasn1/libtasn1-4.13.ebuild b/dev-libs/libtasn1/libtasn1-4.13.ebuild
index 33a39406d1e9..0670215fc266 100644
--- a/dev-libs/libtasn1/libtasn1-4.13.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3 LGPL-2.1"
SLOT="0/6" # subslot = libtasn1 soname version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs test valgrind"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libtasn1/libtasn1-4.16.0.ebuild b/dev-libs/libtasn1/libtasn1-4.16.0.ebuild
index 930631602f40..208c031ba4e9 100644
--- a/dev-libs/libtasn1/libtasn1-4.16.0.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.16.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3 LGPL-2.1"
SLOT="0/6" # subslot = libtasn1 soname version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs test valgrind"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libtommath/libtommath-1.2.0.ebuild b/dev-libs/libtommath/libtommath-1.2.0.ebuild
index 98ca746cc7d9..401c2d508d60 100644
--- a/dev-libs/libtommath/libtommath-1.2.0.ebuild
+++ b/dev-libs/libtommath/libtommath-1.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libtom/libtommath/releases/download/v${PV}/ltm-${PV}
LICENSE="Unlicense"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="doc examples static-libs"
BDEPEND="sys-devel/libtool"
diff --git a/dev-libs/libunistring/libunistring-0.9.10-r1.ebuild b/dev-libs/libunistring/libunistring-0.9.10-r1.ebuild
index 521b7e2ce71b..7c569f145a3c 100644
--- a/dev-libs/libunistring/libunistring-0.9.10-r1.ebuild
+++ b/dev-libs/libunistring/libunistring-0.9.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="|| ( LGPL-3+ GPL-2+ ) || ( FDL-1.2 GPL-3+ )"
SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs"
PATCHES=(
diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild
index ffe991fdd59a..38896bfba2bd 100644
--- a/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild
+++ b/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN/-compat}/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="debug examples static-libs"
RDEPEND=">=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/libuv/libuv-1.40.0.ebuild b/dev-libs/libuv/libuv-1.40.0.ebuild
index fe965cd36cfa..74d8000909c1 100644
--- a/dev-libs/libuv/libuv-1.40.0.ebuild
+++ b/dev-libs/libuv/libuv-1.40.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD BSD-2 ISC MIT"
SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RESTRICT="test"
diff --git a/dev-libs/libverto/libverto-0.3.1-r1.ebuild b/dev-libs/libverto/libverto-0.3.1-r1.ebuild
index 6964058d33d5..298ede94f7a8 100644
--- a/dev-libs/libverto/libverto-0.3.1-r1.ebuild
+++ b/dev-libs/libverto/libverto-0.3.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/latchset/libverto/releases/download/${PV}/${P}.tar.g
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="glib +libev libevent tevent +threads static-libs"
REQUIRED_USE="|| ( glib libev libevent tevent ) "
diff --git a/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild b/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild
index 90fa9a8308a8..07ac3c9aac1d 100644
--- a/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.10-r4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug examples icu ipv6 lzma +python readline static-libs test"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libxml2/libxml2-2.9.10-r5.ebuild b/dev-libs/libxml2/libxml2-2.9.10-r5.ebuild
index 4107e6d0d0ad..97ea995cd045 100644
--- a/dev-libs/libxml2/libxml2-2.9.10-r5.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.10-r5.ebuild
@@ -30,7 +30,7 @@ S="${WORKDIR}/${PN}-${PV%_rc*}"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug examples icu ipv6 lzma +python readline static-libs test"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
index 254c2b32d9d2..91f4f334349f 100644
--- a/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.34-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="crypt debug examples static-libs elibc_Darwin"
BDEPEND=">=virtual/pkgconfig-1"
diff --git a/dev-libs/libyaml/libyaml-0.2.2.ebuild b/dev-libs/libyaml/libyaml-0.2.2.ebuild
index 75975f00a462..15024cc5efbc 100644
--- a/dev-libs/libyaml/libyaml-0.2.2.ebuild
+++ b/dev-libs/libyaml/libyaml-0.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/yaml/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libyaml/libyaml-0.2.5.ebuild b/dev-libs/libyaml/libyaml-0.2.5.ebuild
index 4cc51836cb2a..98fc658a8de1 100644
--- a/dev-libs/libyaml/libyaml-0.2.5.ebuild
+++ b/dev-libs/libyaml/libyaml-0.2.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/yaml/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/log4cpp/log4cpp-1.1.3.ebuild b/dev-libs/log4cpp/log4cpp-1.1.3.ebuild
index 705c161ed490..2fdc153e4873 100644
--- a/dev-libs/log4cpp/log4cpp-1.1.3.ebuild
+++ b/dev-libs/log4cpp/log4cpp-1.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0/5"
-KEYWORDS="amd64 ~arm ppc s390 x86"
+KEYWORDS="amd64 ~arm ppc ~s390 x86"
IUSE="doc static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/lzo/lzo-2.10.ebuild b/dev-libs/lzo/lzo-2.10.ebuild
index b7fc48293da7..d21765fe4f99 100644
--- a/dev-libs/lzo/lzo-2.10.ebuild
+++ b/dev-libs/lzo/lzo-2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oberhumer.com/opensource/lzo/download/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples static-libs"
multilib_src_configure() {
diff --git a/dev-libs/mm/mm-1.4.2-r2.ebuild b/dev-libs/mm/mm-1.4.2-r2.ebuild
index ddbbd173ac9a..b643ff1f18c0 100644
--- a/dev-libs/mm/mm-1.4.2-r2.ebuild
+++ b/dev-libs/mm/mm-1.4.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/mm/${P}.tar.gz"
LICENSE="mm"
SLOT="1.2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
src_prepare() {
diff --git a/dev-libs/mpc/mpc-1.2.1.ebuild b/dev-libs/mpc/mpc-1.2.1.ebuild
index f82ab1ed44e6..f2b23959fc05 100644
--- a/dev-libs/mpc/mpc-1.2.1.ebuild
+++ b/dev-libs/mpc/mpc-1.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0/3" # libmpc.so.3
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
DEPEND=">=dev-libs/gmp-5.0.0:0=[${MULTILIB_USEDEP},static-libs?]
diff --git a/dev-libs/mpfr/mpfr-4.1.0.ebuild b/dev-libs/mpfr/mpfr-4.1.0.ebuild
index e812670ea0dc..286e23371367 100644
--- a/dev-libs/mpfr/mpfr-4.1.0.ebuild
+++ b/dev-libs/mpfr/mpfr-4.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.mpfr.org/mpfr-${PV}/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0/6" # libmpfr.so version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND=">=dev-libs/gmp-5.0.0[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/nettle/nettle-3.6-r2.ebuild b/dev-libs/nettle/nettle-3.6-r2.ebuild
index 9a9d30443dcd..84e3f7d49d24 100644
--- a/dev-libs/nettle/nettle-3.6-r2.ebuild
+++ b/dev-libs/nettle/nettle-3.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="|| ( LGPL-3 LGPL-2.1 )"
SLOT="0/8-6" # subslot = libnettle - libhogweed soname version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+asm doc +gmp static-libs test cpu_flags_x86_aes cpu_flags_arm_neon cpu_flags_x86_sha"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/nettle/nettle-3.7.2.ebuild b/dev-libs/nettle/nettle-3.7.2.ebuild
index 49360f415d28..3ab22392b654 100644
--- a/dev-libs/nettle/nettle-3.7.2.ebuild
+++ b/dev-libs/nettle/nettle-3.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="|| ( LGPL-3 LGPL-2.1 )"
SLOT="0/8-6" # subslot = libnettle - libhogweed soname version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+asm doc +gmp static-libs test cpu_flags_x86_aes cpu_flags_arm_neon cpu_flags_x86_sha"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/npth/npth-1.6-r1.ebuild b/dev-libs/npth/npth-1.6-r1.ebuild
index 9c72209ed635..003688741725 100644
--- a/dev-libs/npth/npth-1.6-r1.ebuild
+++ b/dev-libs/npth/npth-1.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
src_prepare() {
default
diff --git a/dev-libs/nspr/nspr-4.26.ebuild b/dev-libs/nspr/nspr-4.26.ebuild
index d3b29336fc1a..b94d931b6a6a 100644
--- a/dev-libs/nspr/nspr-4.26.ebuild
+++ b/dev-libs/nspr/nspr-4.26.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
IUSE="debug elibc_musl"
MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nspr/nspr-4.28.ebuild b/dev-libs/nspr/nspr-4.28.ebuild
index d3b29336fc1a..b94d931b6a6a 100644
--- a/dev-libs/nspr/nspr-4.28.ebuild
+++ b/dev-libs/nspr/nspr-4.28.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
IUSE="debug elibc_musl"
MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nspr/nspr-4.29.ebuild b/dev-libs/nspr/nspr-4.29.ebuild
index 72a4a2f0f762..1c632936ea8e 100644
--- a/dev-libs/nspr/nspr-4.29.ebuild
+++ b/dev-libs/nspr/nspr-4.29.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
IUSE="debug elibc_musl"
MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nspr/nspr-4.30.ebuild b/dev-libs/nspr/nspr-4.30.ebuild
index 72a4a2f0f762..1c632936ea8e 100644
--- a/dev-libs/nspr/nspr-4.30.ebuild
+++ b/dev-libs/nspr/nspr-4.30.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
IUSE="debug elibc_musl"
MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nss-pem/nss-pem-1.0.7.ebuild b/dev-libs/nss-pem/nss-pem-1.0.7.ebuild
index 08a1f04cb08c..e43a5cdaac95 100644
--- a/dev-libs/nss-pem/nss-pem-1.0.7.ebuild
+++ b/dev-libs/nss-pem/nss-pem-1.0.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kdudka/${PN}/releases/download/${P}/${P}.tar.xz"
LICENSE="MPL-1.1"
SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-solaris"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-solaris"
IUSE=""
BDEPEND=" >=dev-libs/nss-3.50-r1 "
diff --git a/dev-libs/nss/nss-3.58-r2.ebuild b/dev-libs/nss/nss-3.58-r2.ebuild
index 50de523f59f0..8ca8cd6f203e 100644
--- a/dev-libs/nss/nss-3.58-r2.ebuild
+++ b/dev-libs/nss/nss-3.58-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE="cacert utils"
# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
RDEPEND="
diff --git a/dev-libs/nss/nss-3.63.ebuild b/dev-libs/nss/nss-3.63.ebuild
index 026fd9ebc50b..447c0480c7d0 100644
--- a/dev-libs/nss/nss-3.63.ebuild
+++ b/dev-libs/nss/nss-3.63.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE="cacert utils"
# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
RDEPEND="
diff --git a/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild b/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild
index a4c616e538da..57411083c8d4 100644
--- a/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.9.6-r1.ebuild
@@ -21,7 +21,7 @@ fi
LICENSE="BSD-2"
SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
IUSE="crnl-as-line-terminator static-libs"
if [[ "${PV}" != "9999" ]]; then
diff --git a/dev-libs/openct/openct-0.6.20-r4.ebuild b/dev-libs/openct/openct-0.6.20-r4.ebuild
index d7ab099419d0..7c44328e3709 100644
--- a/dev-libs/openct/openct-0.6.20-r4.ebuild
+++ b/dev-libs/openct/openct-0.6.20-r4.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="library for accessing smart card terminals"
HOMEPAGE="https://github.com/OpenSC/openct/wiki"
SRC_URI="mirror://sourceforge/opensc/${PN}/${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
LICENSE="LGPL-2.1"
SLOT="0"
diff --git a/dev-libs/openssl/openssl-1.0.2u.ebuild b/dev-libs/openssl/openssl-1.0.2u.ebuild
index ab6d946a8b33..d63f34628d6a 100644
--- a/dev-libs/openssl/openssl-1.0.2u.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2u.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -37,7 +37,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
LICENSE="openssl"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
RESTRICT="!bindist? ( bindist )
!test? ( test )"
diff --git a/dev-libs/openssl/openssl-1.1.1k.ebuild b/dev-libs/openssl/openssl-1.1.1k.ebuild
index 2763945ae17a..77e5341fd9e7 100644
--- a/dev-libs/openssl/openssl-1.1.1k.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1k.ebuild
@@ -27,7 +27,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
LICENSE="openssl"
SLOT="0/1.1" # .so version of libssl/libcrypto
[[ "${PV}" = *_pre* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
RESTRICT="!bindist? ( bindist )
!test? ( test )"
diff --git a/dev-libs/popt/popt-1.16-r2.ebuild b/dev-libs/popt/popt-1.16-r2.ebuild
index e79a8d71fd52..5e46e3a68b81 100644
--- a/dev-libs/popt/popt-1.16-r2.ebuild
+++ b/dev-libs/popt/popt-1.16-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://rpm5.org/files/popt/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
IUSE="nls static-libs"
RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/popt/popt-1.18.ebuild b/dev-libs/popt/popt-1.18.ebuild
index 40d8c55b0881..296a95e62b02 100644
--- a/dev-libs/popt/popt-1.18.ebuild
+++ b/dev-libs/popt/popt-1.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.rpm.org/${PN}/releases/${PN}-1.x/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls static-libs"
RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild b/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild
index f6604b26b18c..9a6f86d79c89 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.
LICENSE="BSD-2"
# Subslot == SONAME version
SLOT="0/1.0.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/protobuf/protobuf-3.12.2.ebuild b/dev-libs/protobuf/protobuf-3.12.2.ebuild
index e86ba1284f34..30bc1134cda7 100644
--- a/dev-libs/protobuf/protobuf-3.12.2.ebuild
+++ b/dev-libs/protobuf/protobuf-3.12.2.ebuild
@@ -22,7 +22,7 @@ fi
LICENSE="BSD"
SLOT="0/23"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="emacs examples static-libs test zlib"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/protobuf/protobuf-3.13.0.ebuild b/dev-libs/protobuf/protobuf-3.13.0.ebuild
index 416c4ef82989..25ec4601ee41 100644
--- a/dev-libs/protobuf/protobuf-3.13.0.ebuild
+++ b/dev-libs/protobuf/protobuf-3.13.0.ebuild
@@ -22,7 +22,7 @@ fi
LICENSE="BSD"
SLOT="0/24"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="emacs examples static-libs test zlib"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/ptexenc/ptexenc-1.3.8_p20200406.ebuild b/dev-libs/ptexenc/ptexenc-1.3.8_p20200406.ebuild
index d9ea39be2bf8..b55a38d5234a 100644
--- a/dev-libs/ptexenc/ptexenc-1.3.8_p20200406.ebuild
+++ b/dev-libs/ptexenc/ptexenc-1.3.8_p20200406.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-sou
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos"
IUSE="iconv static-libs"
DEPEND="iconv? ( virtual/libiconv )
diff --git a/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild b/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild
index 81ac5051433f..c087822d6333 100644
--- a/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild
+++ b/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/libstemmer_c"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris"
# This could be used to package both libstemmer_c and libstemmer_java together.
IUSE="static-libs"
diff --git a/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild b/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild
index 29649a33250f..e0070835f0bf 100644
--- a/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild
+++ b/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV//./_}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
IUSE="debug doc static-libs +stl"
RDEPEND=""
diff --git a/dev-libs/vala-common/vala-common-0.48.6.ebuild b/dev-libs/vala-common/vala-common-0.48.6.ebuild
index d64b5929db95..d666b35e44fd 100644
--- a/dev-libs/vala-common/vala-common-0.48.6.ebuild
+++ b/dev-libs/vala-common/vala-common-0.48.6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
IUSE=""
RDEPEND=""
diff --git a/dev-libs/vala-common/vala-common-0.48.9.ebuild b/dev-libs/vala-common/vala-common-0.48.9.ebuild
index 51429ad4aeb1..d666b35e44fd 100644
--- a/dev-libs/vala-common/vala-common-0.48.9.ebuild
+++ b/dev-libs/vala-common/vala-common-0.48.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
IUSE=""
RDEPEND=""
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.20.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.20.ebuild
index b7cea107f247..923dc813b366 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-1.20.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
inherit git-r3 autotools
else
SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
fi
LICENSE="MIT"
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild
index 133b8ddb93a2..29b329aaa875 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
LICENSE="BSD"
SLOT="0/4.51"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="abyss +cgi +curl +cxx +libxml2 threads test"
diff --git a/dev-libs/xxhash/xxhash-0.7.3.ebuild b/dev-libs/xxhash/xxhash-0.7.3.ebuild
index 4c309bb8f6d2..fbebd117c825 100644
--- a/dev-libs/xxhash/xxhash-0.7.3.ebuild
+++ b/dev-libs/xxhash/xxhash-0.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD-2 GPL-2+"
# https://abi-laboratory.pro/tracker/timeline/xxhash
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
IUSE="static-libs"
S="${WORKDIR}/xxHash-${PV}"
diff --git a/dev-libs/xxhash/xxhash-0.8.0.ebuild b/dev-libs/xxhash/xxhash-0.8.0.ebuild
index b822e784d75e..fbebd117c825 100644
--- a/dev-libs/xxhash/xxhash-0.8.0.ebuild
+++ b/dev-libs/xxhash/xxhash-0.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD-2 GPL-2+"
# https://abi-laboratory.pro/tracker/timeline/xxhash
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
IUSE="static-libs"
S="${WORKDIR}/xxHash-${PV}"
diff --git a/dev-libs/zziplib/zziplib-0.13.72.ebuild b/dev-libs/zziplib/zziplib-0.13.72.ebuild
index e448080e8f18..b1cf6149a20c 100644
--- a/dev-libs/zziplib/zziplib-0.13.72.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.72.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/gdraheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
SLOT="0/13"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="sdl static-libs"
# Tests require internet access
diff --git a/dev-perl/Algorithm-Diff/Algorithm-Diff-1.190.300-r1.ebuild b/dev-perl/Algorithm-Diff/Algorithm-Diff-1.190.300-r1.ebuild
index bd4c370998bb..4aeb1e27e944 100644
--- a/dev-perl/Algorithm-Diff/Algorithm-Diff-1.190.300-r1.ebuild
+++ b/dev-perl/Algorithm-Diff/Algorithm-Diff-1.190.300-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Compute intelligent differences between two files / lists"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
src_prepare() {
local file
diff --git a/dev-perl/Alien-Build/Alien-Build-2.230.0.ebuild b/dev-perl/Alien-Build/Alien-Build-2.230.0.ebuild
index a2366a9ccc59..dc86d901e685 100644
--- a/dev-perl/Alien-Build/Alien-Build-2.230.0.ebuild
+++ b/dev-perl/Alien-Build/Alien-Build-2.230.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Build external dependencies for use in CPAN"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="test zip"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Alien-Libxml2/Alien-Libxml2-0.160.0.ebuild b/dev-perl/Alien-Libxml2/Alien-Libxml2-0.160.0.ebuild
index 4ba8b8f17513..e3d40b9fddf4 100644
--- a/dev-perl/Alien-Libxml2/Alien-Libxml2-0.160.0.ebuild
+++ b/dev-perl/Alien-Libxml2/Alien-Libxml2-0.160.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Install the C libxml2 library on your system"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.690.0-r2.ebuild b/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.690.0-r2.ebuild
index 0a4a0642410f..dca023a66329 100644
--- a/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.690.0-r2.ebuild
+++ b/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.690.0-r2.ebuild
@@ -16,7 +16,7 @@ IUSE="gstreamer opengl test"
RESTRICT="!test? ( test )"
RDEPEND="
- >=x11-libs/wxGTK-3:3.0[gstreamer=,opengl=,tiff,X]
+ >=x11-libs/wxGTK-3:${WX_GTK_VER}[gstreamer=,opengl=,tiff,X]
>=dev-perl/Module-Pluggable-2.600.0
"
BDEPEND="${RDEPEND}
diff --git a/dev-perl/App-pwhich/App-pwhich-1.160.0.ebuild b/dev-perl/App-pwhich/App-pwhich-1.160.0.ebuild
index 9ab034c33573..1be7b4f7b514 100644
--- a/dev-perl/App-pwhich/App-pwhich-1.160.0.ebuild
+++ b/dev-perl/App-pwhich/App-pwhich-1.160.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Perl-only 'which'"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Archive-Zip/Archive-Zip-1.640.0.ebuild b/dev-perl/Archive-Zip/Archive-Zip-1.640.0.ebuild
index 639ae824e16b..666b47be4f4a 100644
--- a/dev-perl/Archive-Zip/Archive-Zip-1.640.0.ebuild
+++ b/dev-perl/Archive-Zip/Archive-Zip-1.640.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="A wrapper that lets you read Zip archive members as if they were files"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Archive-Zip/Archive-Zip-1.680.0.ebuild b/dev-perl/Archive-Zip/Archive-Zip-1.680.0.ebuild
index 7626d9fa5591..dd8c04b28435 100644
--- a/dev-perl/Archive-Zip/Archive-Zip-1.680.0.ebuild
+++ b/dev-perl/Archive-Zip/Archive-Zip-1.680.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="A wrapper that lets you read Zip archive members as if they were files"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Authen-PAM/Authen-PAM-0.160.0-r3.ebuild b/dev-perl/Authen-PAM/Authen-PAM-0.160.0-r3.ebuild
index 1722eabb4ed5..a24963cfd70d 100644
--- a/dev-perl/Authen-PAM/Authen-PAM-0.160.0-r3.ebuild
+++ b/dev-perl/Authen-PAM/Authen-PAM-0.160.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Interface to PAM library"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="examples"
RDEPEND="sys-libs/pam"
diff --git a/dev-perl/Authen-SASL/Authen-SASL-2.160.0-r2.ebuild b/dev-perl/Authen-SASL/Authen-SASL-2.160.0-r2.ebuild
index ad3b945e5965..dc809919abee 100644
--- a/dev-perl/Authen-SASL/Authen-SASL-2.160.0-r2.ebuild
+++ b/dev-perl/Authen-SASL/Authen-SASL-2.160.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="A Perl SASL interface"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="kerberos test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/BSD-Resource/BSD-Resource-1.291.100-r2.ebuild b/dev-perl/BSD-Resource/BSD-Resource-1.291.100-r2.ebuild
index b0d2d10c013d..df804b41a9d4 100644
--- a/dev-perl/BSD-Resource/BSD-Resource-1.291.100-r2.ebuild
+++ b/dev-perl/BSD-Resource/BSD-Resource-1.291.100-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Perl module for BSD process resource limit and priority functions"
LICENSE="|| ( Artistic-2 LGPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
BDEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/CGI/CGI-4.470.0.ebuild b/dev-perl/CGI/CGI-4.470.0.ebuild
index 3ff1b5e88202..968bac85dce0 100644
--- a/dev-perl/CGI/CGI-4.470.0.ebuild
+++ b/dev-perl/CGI/CGI-4.470.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Simple Common Gateway Interface Class"
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r2.ebuild b/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r2.ebuild
index dc88d801afc1..67062d8ffe62 100644
--- a/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r2.ebuild
+++ b/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.danga.com/memcached/ https://metacpan.org/release/Cache-Mem
# Bug: https://bugs.gentoo.org/721730
LICENSE="|| ( Artistic GPL-1 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
RDEPEND="
virtual/perl-Encode
diff --git a/dev-perl/Canary-Stability/Canary-Stability-2013.0.0.ebuild b/dev-perl/Canary-Stability/Canary-Stability-2013.0.0.ebuild
index 03a04ba5a6a9..c351f330c8fe 100644
--- a/dev-perl/Canary-Stability/Canary-Stability-2013.0.0.ebuild
+++ b/dev-perl/Canary-Stability/Canary-Stability-2013.0.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Canary to check perl compatibility for schmorp's modules"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
BDEPEND="
virtual/perl-ExtUtils-MakeMaker
diff --git a/dev-perl/Capture-Tiny/Capture-Tiny-0.480.0.ebuild b/dev-perl/Capture-Tiny/Capture-Tiny-0.480.0.ebuild
index a757683ba371..d9dac305abba 100644
--- a/dev-perl/Capture-Tiny/Capture-Tiny-0.480.0.ebuild
+++ b/dev-perl/Capture-Tiny/Capture-Tiny-0.480.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Capture STDOUT and STDERR from Perl, XS or external programs"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Class-Inspector/Class-Inspector-1.360.0.ebuild b/dev-perl/Class-Inspector/Class-Inspector-1.360.0.ebuild
index b2806387c691..dc6225aabf1e 100644
--- a/dev-perl/Class-Inspector/Class-Inspector-1.360.0.ebuild
+++ b/dev-perl/Class-Inspector/Class-Inspector-1.360.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Provides information about Classes"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Class-Load/Class-Load-0.250.0.ebuild b/dev-perl/Class-Load/Class-Load-0.250.0.ebuild
index 972ad87be8a0..0ffc073f64d5 100644
--- a/dev-perl/Class-Load/Class-Load-0.250.0.ebuild
+++ b/dev-perl/Class-Load/Class-Load-0.250.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="A working (require q{Class::Name}) and more"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Class-MakeMethods/Class-MakeMethods-1.10.0-r2.ebuild b/dev-perl/Class-MakeMethods/Class-MakeMethods-1.10.0-r2.ebuild
index 6a55d14ab6a4..77c289709721 100644
--- a/dev-perl/Class-MakeMethods/Class-MakeMethods-1.10.0-r2.ebuild
+++ b/dev-perl/Class-MakeMethods/Class-MakeMethods-1.10.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,5 +10,5 @@ inherit perl-module
DESCRIPTION="Automated method creation module for Perl"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc s390 sparc x86 ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~s390 sparc x86 ~x86-solaris"
PATCHES=( "${FILESDIR}/${P}-perl526.patch" )
diff --git a/dev-perl/Convert-ASN1/Convert-ASN1-0.270.0-r1.ebuild b/dev-perl/Convert-ASN1/Convert-ASN1-0.270.0-r1.ebuild
index 1773d87bbb8d..d5d017213653 100644
--- a/dev-perl/Convert-ASN1/Convert-ASN1-0.270.0-r1.ebuild
+++ b/dev-perl/Convert-ASN1/Convert-ASN1-0.270.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Standard en/decode of ASN.1 structures"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.190.0.ebuild b/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.190.0.ebuild
index 61d483379bbf..f7852a59aa23 100644
--- a/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.190.0.ebuild
+++ b/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.190.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="cPanel fork of JSON::XS, fast and correct serializing"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Crypt-OpenSSL-Bignum/Crypt-OpenSSL-Bignum-0.90.0.ebuild b/dev-perl/Crypt-OpenSSL-Bignum/Crypt-OpenSSL-Bignum-0.90.0.ebuild
index 811d4d1b0208..4a065975b96b 100644
--- a/dev-perl/Crypt-OpenSSL-Bignum/Crypt-OpenSSL-Bignum-0.90.0.ebuild
+++ b/dev-perl/Crypt-OpenSSL-Bignum/Crypt-OpenSSL-Bignum-0.90.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="OpenSSL's multiprecision integer arithmetic"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="libressl"
RDEPEND="
diff --git a/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.280.0-r3.ebuild b/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.280.0-r3.ebuild
index a648ced844d5..6cd8aad5104c 100644
--- a/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.280.0-r3.ebuild
+++ b/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.280.0-r3.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Crypt::OpenSSL::RSA module for perl"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="libressl"
RDEPEND="dev-perl/Crypt-OpenSSL-Bignum
diff --git a/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.110.0.ebuild b/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.110.0.ebuild
index 4078b72b51ba..74699495b5ca 100644
--- a/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.110.0.ebuild
+++ b/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.110.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="OpenSSL/LibreSSL pseudo-random number generator access"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="libressl"
RDEPEND="
diff --git a/dev-perl/Crypt-RC4/Crypt-RC4-2.020.0-r1.ebuild b/dev-perl/Crypt-RC4/Crypt-RC4-2.020.0-r1.ebuild
index 4422698a0c87..0ac9ba62aa1a 100644
--- a/dev-perl/Crypt-RC4/Crypt-RC4-2.020.0-r1.ebuild
+++ b/dev-perl/Crypt-RC4/Crypt-RC4-2.020.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Implements the RC4 encryption algorithm"
LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~x64-solaris ~x86-solaris"
IUSE=""
SRC_TEST="do"
diff --git a/dev-perl/Crypt-SmbHash/Crypt-SmbHash-0.120.0-r2.ebuild b/dev-perl/Crypt-SmbHash/Crypt-SmbHash-0.120.0-r2.ebuild
index 86d29ea9cc52..94a3ef26922f 100644
--- a/dev-perl/Crypt-SmbHash/Crypt-SmbHash-0.120.0-r2.ebuild
+++ b/dev-perl/Crypt-SmbHash/Crypt-SmbHash-0.120.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="LM/NT hashing, for Samba's smbpasswd entries"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="dev-perl/Digest-MD4"
diff --git a/dev-perl/Curses/Curses-1.360.0.ebuild b/dev-perl/Curses/Curses-1.360.0.ebuild
index 03b4b796205e..694ddf345303 100644
--- a/dev-perl/Curses/Curses-1.360.0.ebuild
+++ b/dev-perl/Curses/Curses-1.360.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Curses interface modules for Perl"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~sparc-solaris ~x86-solaris"
IUSE="+unicode test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/CursesWidgets/CursesWidgets-1.997.0-r2.ebuild b/dev-perl/CursesWidgets/CursesWidgets-1.997.0-r2.ebuild
index be2db4646e7d..882092b165fd 100644
--- a/dev-perl/CursesWidgets/CursesWidgets-1.997.0-r2.ebuild
+++ b/dev-perl/CursesWidgets/CursesWidgets-1.997.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,7 @@ SRC_URI+=" http://www.digitalmages.com/perl/CursesWidgets/downloads/${PN}-${DIST
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="amd64 ~ia64 ppc s390 sparc x86"
+KEYWORDS="amd64 ~ia64 ppc ~s390 sparc x86"
IUSE=""
RDEPEND=">=sys-libs/ncurses-5
diff --git a/dev-perl/DBD-Pg/DBD-Pg-3.7.0.ebuild b/dev-perl/DBD-Pg/DBD-Pg-3.7.0.ebuild
index 58a3f99ec49d..697dbdda80b2 100644
--- a/dev-perl/DBD-Pg/DBD-Pg-3.7.0.ebuild
+++ b/dev-perl/DBD-Pg/DBD-Pg-3.7.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="PostgreSQL database driver for the DBI module"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/DBD-SQLite/DBD-SQLite-1.560.0.ebuild b/dev-perl/DBD-SQLite/DBD-SQLite-1.560.0.ebuild
index a67652f0ac6d..c5f7edf00dfb 100644
--- a/dev-perl/DBD-SQLite/DBD-SQLite-1.560.0.ebuild
+++ b/dev-perl/DBD-SQLite/DBD-SQLite-1.560.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Self Contained RDBMS in a DBI Driver"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~x64-solaris ~x86-solaris"
IUSE="test system-sqlite"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/DBD-SQLite/DBD-SQLite-1.580.0.ebuild b/dev-perl/DBD-SQLite/DBD-SQLite-1.580.0.ebuild
index ce08aaffa5fc..da4e5b3da015 100644
--- a/dev-perl/DBD-SQLite/DBD-SQLite-1.580.0.ebuild
+++ b/dev-perl/DBD-SQLite/DBD-SQLite-1.580.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Self Contained RDBMS in a DBI Driver"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
IUSE="test system-sqlite"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/DBD-SQLite/DBD-SQLite-1.660.0.ebuild b/dev-perl/DBD-SQLite/DBD-SQLite-1.660.0.ebuild
index 076e33f8a9c6..d0bcdbc1d56b 100644
--- a/dev-perl/DBD-SQLite/DBD-SQLite-1.660.0.ebuild
+++ b/dev-perl/DBD-SQLite/DBD-SQLite-1.660.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Self Contained RDBMS in a DBI Driver"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
IUSE="test system-sqlite"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.44.0-r1.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.44.0-r1.ebuild
index a8d314336cd8..368b0fcd08c4 100644
--- a/dev-perl/DBD-mysql/DBD-mysql-4.44.0-r1.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.44.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit eutils perl-module
DESCRIPTION="MySQL driver for the Perl5 Database Interface (DBI)"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="test +ssl"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.50.0.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.50.0.ebuild
index da1a8c541932..5e9f59ecde83 100644
--- a/dev-perl/DBD-mysql/DBD-mysql-4.50.0.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit eutils perl-module
DESCRIPTION="MySQL driver for the Perl5 Database Interface (DBI)"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="mariadb +mysql test +ssl"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/DBI/DBI-1.643.0.ebuild b/dev-perl/DBI/DBI-1.643.0.ebuild
index 2684e864d953..ede2cb18aa9b 100644
--- a/dev-perl/DBI/DBI-1.643.0.ebuild
+++ b/dev-perl/DBI/DBI-1.643.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Database independent interface for Perl"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Data-OptList/Data-OptList-0.110.0.ebuild b/dev-perl/Data-OptList/Data-OptList-0.110.0.ebuild
index 03f6531851dc..57ff9b157392 100644
--- a/dev-perl/Data-OptList/Data-OptList-0.110.0.ebuild
+++ b/dev-perl/Data-OptList/Data-OptList-0.110.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="parse and validate simple name/value option pairs"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Date-Manip/Date-Manip-6.600.0.ebuild b/dev-perl/Date-Manip/Date-Manip-6.600.0.ebuild
index f38bd5bf7f59..24869a4ab821 100644
--- a/dev-perl/Date-Manip/Date-Manip-6.600.0.ebuild
+++ b/dev-perl/Date-Manip/Date-Manip-6.600.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Perl date manipulation routines"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="elibc_musl test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Devel-CheckBin/Devel-CheckBin-0.40.0.ebuild b/dev-perl/Devel-CheckBin/Devel-CheckBin-0.40.0.ebuild
index 1f44ba25ae32..d05896c0c58b 100644
--- a/dev-perl/Devel-CheckBin/Devel-CheckBin-0.40.0.ebuild
+++ b/dev-perl/Devel-CheckBin/Devel-CheckBin-0.40.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="check that a command is available"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Devel-Hide/Devel-Hide-0.0.900.ebuild b/dev-perl/Devel-Hide/Devel-Hide-0.0.900.ebuild
index 51f47b0b922b..5ede9f857d9b 100644
--- a/dev-perl/Devel-Hide/Devel-Hide-0.0.900.ebuild
+++ b/dev-perl/Devel-Hide/Devel-Hide-0.0.900.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Forces the unavailability of specified Perl modules (for testing)"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Digest-BubbleBabble/Digest-BubbleBabble-0.20.0-r1.ebuild b/dev-perl/Digest-BubbleBabble/Digest-BubbleBabble-0.20.0-r1.ebuild
index 2ad477f1ff77..25ce58ce0d0f 100644
--- a/dev-perl/Digest-BubbleBabble/Digest-BubbleBabble-0.20.0-r1.ebuild
+++ b/dev-perl/Digest-BubbleBabble/Digest-BubbleBabble-0.20.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Create bubble-babble fingerprints"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
PATCHES=( "${FILESDIR}/0.02-dot-in-inc.patch" ) # https://github.com/btrott/Digest-BubbleBabble/pull/1
SRC_TEST="do parallel"
diff --git a/dev-perl/Digest-GOST/Digest-GOST-0.60.0-r1.ebuild b/dev-perl/Digest-GOST/Digest-GOST-0.60.0-r1.ebuild
index 62a7d5645125..52a3c3bb7e5a 100644
--- a/dev-perl/Digest-GOST/Digest-GOST-0.60.0-r1.ebuild
+++ b/dev-perl/Digest-GOST/Digest-GOST-0.60.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Perl interface to the GOST R 34.11-94 digest algorithm"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Digest-HMAC/Digest-HMAC-1.30.0-r1.ebuild b/dev-perl/Digest-HMAC/Digest-HMAC-1.30.0-r1.ebuild
index 3de7217299c0..334793360369 100644
--- a/dev-perl/Digest-HMAC/Digest-HMAC-1.30.0-r1.ebuild
+++ b/dev-perl/Digest-HMAC/Digest-HMAC-1.30.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Keyed Hashing for Message Authentication"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="virtual/perl-Digest-MD5
diff --git a/dev-perl/Digest-MD4/Digest-MD4-1.900.0-r1.ebuild b/dev-perl/Digest-MD4/Digest-MD4-1.900.0-r1.ebuild
index 1be70afb601c..710cf820ca0e 100644
--- a/dev-perl/Digest-MD4/Digest-MD4-1.900.0-r1.ebuild
+++ b/dev-perl/Digest-MD4/Digest-MD4-1.900.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,6 +11,6 @@ inherit perl-module
DESCRIPTION="MD4 message digest algorithm"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
SRC_TEST="do"
diff --git a/dev-perl/Digest-Perl-MD5/Digest-Perl-MD5-1.900.0.ebuild b/dev-perl/Digest-Perl-MD5/Digest-Perl-MD5-1.900.0.ebuild
index dfc9b2286ee8..00009dea4f40 100644
--- a/dev-perl/Digest-Perl-MD5/Digest-Perl-MD5-1.900.0.ebuild
+++ b/dev-perl/Digest-Perl-MD5/Digest-Perl-MD5-1.900.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Pure perl implementation of MD5"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/Digest-SHA1/Digest-SHA1-2.130.0-r1.ebuild b/dev-perl/Digest-SHA1/Digest-SHA1-2.130.0-r1.ebuild
index fce8df1a2e64..f9dad3c09dee 100644
--- a/dev-perl/Digest-SHA1/Digest-SHA1-2.130.0-r1.ebuild
+++ b/dev-perl/Digest-SHA1/Digest-SHA1-2.130.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="NIST SHA message digest algorithm"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="virtual/perl-Digest"
diff --git a/dev-perl/Dist-CheckConflicts/Dist-CheckConflicts-0.110.0.ebuild b/dev-perl/Dist-CheckConflicts/Dist-CheckConflicts-0.110.0.ebuild
index f3d3f64601db..e7bdbcf5bcd5 100644
--- a/dev-perl/Dist-CheckConflicts/Dist-CheckConflicts-0.110.0.ebuild
+++ b/dev-perl/Dist-CheckConflicts/Dist-CheckConflicts-0.110.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Declare version conflicts for your dist"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Encode-Detect/Encode-Detect-1.10.0-r1.ebuild b/dev-perl/Encode-Detect/Encode-Detect-1.10.0-r1.ebuild
index 616f949ca4e0..219da4881662 100644
--- a/dev-perl/Encode-Detect/Encode-Detect-1.10.0-r1.ebuild
+++ b/dev-perl/Encode-Detect/Encode-Detect-1.10.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Encode::Detect - An Encode::Encoding subclass that detects the enco
LICENSE="MPL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE=""
RDEPEND=""
diff --git a/dev-perl/Encode-EUCJPASCII/Encode-EUCJPASCII-0.30.0.ebuild b/dev-perl/Encode-EUCJPASCII/Encode-EUCJPASCII-0.30.0.ebuild
index b113d2f9cd7c..2daaa5d72cf3 100644
--- a/dev-perl/Encode-EUCJPASCII/Encode-EUCJPASCII-0.30.0.ebuild
+++ b/dev-perl/Encode-EUCJPASCII/Encode-EUCJPASCII-0.30.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="An eucJP-open mapping"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
PERL_RM_FILES=( "t/pod.t" )
diff --git a/dev-perl/Encode-HanExtra/Encode-HanExtra-0.230.0-r2.ebuild b/dev-perl/Encode-HanExtra/Encode-HanExtra-0.230.0-r2.ebuild
index 53f1238e1b83..bfdb14487c11 100644
--- a/dev-perl/Encode-HanExtra/Encode-HanExtra-0.230.0-r2.ebuild
+++ b/dev-perl/Encode-HanExtra/Encode-HanExtra-0.230.0-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Extra sets of Chinese encodings"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="virtual/perl-Encode"
diff --git a/dev-perl/Encode-Locale/Encode-Locale-1.50.0.ebuild b/dev-perl/Encode-Locale/Encode-Locale-1.50.0.ebuild
index 49dce8655cbc..5ff150df1f7a 100644
--- a/dev-perl/Encode-Locale/Encode-Locale-1.50.0.ebuild
+++ b/dev-perl/Encode-Locale/Encode-Locale-1.50.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Determine the locale encoding"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Error/Error-0.170.250.ebuild b/dev-perl/Error/Error-0.170.250.ebuild
index 20b04e264b9d..56bc8de0ae55 100644
--- a/dev-perl/Error/Error-0.170.250.ebuild
+++ b/dev-perl/Error/Error-0.170.250.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Error/exception handling in an OO-ish way"
LICENSE+=" MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Expect/Expect-1.350.0.ebuild b/dev-perl/Expect/Expect-1.350.0.ebuild
index b062bda4bad6..50f4052060bc 100644
--- a/dev-perl/Expect/Expect-1.350.0.ebuild
+++ b/dev-perl/Expect/Expect-1.350.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Expect for Perl"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="test minimal"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/ExtUtils-Config/ExtUtils-Config-0.8.0.ebuild b/dev-perl/ExtUtils-Config/ExtUtils-Config-0.8.0.ebuild
index f793e70d6115..9b2c90ec6c3d 100644
--- a/dev-perl/ExtUtils-Config/ExtUtils-Config-0.8.0.ebuild
+++ b/dev-perl/ExtUtils-Config/ExtUtils-Config-0.8.0.ebuild
@@ -8,7 +8,7 @@ inherit perl-module
DESCRIPTION="A wrapper for perl's configuration"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.26.0.ebuild b/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.26.0.ebuild
index d4b2d7a9bc50..e88ff5a877d8 100644
--- a/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.26.0.ebuild
+++ b/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.26.0.ebuild
@@ -8,7 +8,7 @@ inherit perl-module
DESCRIPTION="Various portability utilities for module builders"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.11.0.ebuild b/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.11.0.ebuild
index fa04314cd984..24fa9fe1b7d0 100644
--- a/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.11.0.ebuild
+++ b/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.11.0.ebuild
@@ -8,7 +8,7 @@ inherit perl-module
DESCRIPTION="Build.PL install path logic made easy"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/ExtUtils-PkgConfig/ExtUtils-PkgConfig-1.160.0.ebuild b/dev-perl/ExtUtils-PkgConfig/ExtUtils-PkgConfig-1.160.0.ebuild
index a21cdcd00aea..8b0c017ef488 100644
--- a/dev-perl/ExtUtils-PkgConfig/ExtUtils-PkgConfig-1.160.0.ebuild
+++ b/dev-perl/ExtUtils-PkgConfig/ExtUtils-PkgConfig-1.160.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Simplistic perl interface to pkg-config"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="
diff --git a/dev-perl/FCGI/FCGI-0.780.0.ebuild b/dev-perl/FCGI/FCGI-0.780.0.ebuild
index 4fc8f3975c5c..a993548fb8c5 100644
--- a/dev-perl/FCGI/FCGI-0.780.0.ebuild
+++ b/dev-perl/FCGI/FCGI-0.780.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Fast CGI module"
LICENSE="FastCGI"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/FFI-CheckLib/FFI-CheckLib-0.250.0.ebuild b/dev-perl/FFI-CheckLib/FFI-CheckLib-0.250.0.ebuild
index 9cab73f5f793..19bbde523481 100644
--- a/dev-perl/FFI-CheckLib/FFI-CheckLib-0.250.0.ebuild
+++ b/dev-perl/FFI-CheckLib/FFI-CheckLib-0.250.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Check that a library is available for FFI"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/File-BaseDir/File-BaseDir-0.70.0.ebuild b/dev-perl/File-BaseDir/File-BaseDir-0.70.0.ebuild
index a7047383020e..c5a7822f735e 100644
--- a/dev-perl/File-BaseDir/File-BaseDir-0.70.0.ebuild
+++ b/dev-perl/File-BaseDir/File-BaseDir-0.70.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Use the Freedesktop.org base directory specification"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/File-DesktopEntry/File-DesktopEntry-0.220.0.ebuild b/dev-perl/File-DesktopEntry/File-DesktopEntry-0.220.0.ebuild
index cd09cdec712d..15888855f8fc 100644
--- a/dev-perl/File-DesktopEntry/File-DesktopEntry-0.220.0.ebuild
+++ b/dev-perl/File-DesktopEntry/File-DesktopEntry-0.220.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Object to handle .desktop files"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/File-Find-Rule/File-Find-Rule-0.340.0.ebuild b/dev-perl/File-Find-Rule/File-Find-Rule-0.340.0.ebuild
index 4b573ff79e8b..ff34ad4cb674 100644
--- a/dev-perl/File-Find-Rule/File-Find-Rule-0.340.0.ebuild
+++ b/dev-perl/File-Find-Rule/File-Find-Rule-0.340.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Alternative interface to File::Find"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/File-Listing/File-Listing-6.40.0-r1.ebuild b/dev-perl/File-Listing/File-Listing-6.40.0-r1.ebuild
index 038c1763358e..c030668cae4d 100644
--- a/dev-perl/File-Listing/File-Listing-6.40.0-r1.ebuild
+++ b/dev-perl/File-Listing/File-Listing-6.40.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Parse directory listings"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/File-MimeInfo/File-MimeInfo-0.280.0.ebuild b/dev-perl/File-MimeInfo/File-MimeInfo-0.280.0.ebuild
index ef1cc5311332..d6c613de2a09 100644
--- a/dev-perl/File-MimeInfo/File-MimeInfo-0.280.0.ebuild
+++ b/dev-perl/File-MimeInfo/File-MimeInfo-0.280.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Determine file type"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/File-ShareDir-Install/File-ShareDir-Install-0.110.0.ebuild b/dev-perl/File-ShareDir-Install/File-ShareDir-Install-0.110.0.ebuild
index 5764c6e41546..4c2e2612f035 100644
--- a/dev-perl/File-ShareDir-Install/File-ShareDir-Install-0.110.0.ebuild
+++ b/dev-perl/File-ShareDir-Install/File-ShareDir-Install-0.110.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Install shared files"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/File-ShareDir/File-ShareDir-1.104.0.ebuild b/dev-perl/File-ShareDir/File-ShareDir-1.104.0.ebuild
index 974ed5ec2c18..a9ece85974cd 100644
--- a/dev-perl/File-ShareDir/File-ShareDir-1.104.0.ebuild
+++ b/dev-perl/File-ShareDir/File-ShareDir-1.104.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Locate per-dist and per-module shared files"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/File-Slurp-Tiny/File-Slurp-Tiny-0.4.0.ebuild b/dev-perl/File-Slurp-Tiny/File-Slurp-Tiny-0.4.0.ebuild
index a9f6986fb101..a53631b00ea5 100644
--- a/dev-perl/File-Slurp-Tiny/File-Slurp-Tiny-0.4.0.ebuild
+++ b/dev-perl/File-Slurp-Tiny/File-Slurp-Tiny-0.4.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="A simple, sane and efficient file slurper"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/File-Slurp/File-Slurp-9999.270.0.ebuild b/dev-perl/File-Slurp/File-Slurp-9999.270.0.ebuild
index ea1773d1b911..68aa6be21935 100644
--- a/dev-perl/File-Slurp/File-Slurp-9999.270.0.ebuild
+++ b/dev-perl/File-Slurp/File-Slurp-9999.270.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Simple and Efficient Reading/Writing/Modifying of Complete Files"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/File-Stat-Bits/File-Stat-Bits-1.10.0-r1.ebuild b/dev-perl/File-Stat-Bits/File-Stat-Bits-1.10.0-r1.ebuild
index c47610a8b9df..b355febf7353 100644
--- a/dev-perl/File-Stat-Bits/File-Stat-Bits-1.10.0-r1.ebuild
+++ b/dev-perl/File-Stat-Bits/File-Stat-Bits-1.10.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ DESCRIPTION="File stat bit mask constants"
LICENSE="|| ( GPL-2 GPL-3 )" # GPL-2+
SLOT="0"
-KEYWORDS="amd64 s390 x86"
+KEYWORDS="amd64 ~s390 x86"
IUSE=""
SRC_TEST="do"
diff --git a/dev-perl/File-Which/File-Which-1.220.0.ebuild b/dev-perl/File-Which/File-Which-1.220.0.ebuild
index 60040978f14c..80568db07d5c 100644
--- a/dev-perl/File-Which/File-Which-1.220.0.ebuild
+++ b/dev-perl/File-Which/File-Which-1.220.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Perl module implementing 'which' internally"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test +pwhich"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/File-chdir/File-chdir-0.101.100.ebuild b/dev-perl/File-chdir/File-chdir-0.101.100.ebuild
index e16f2969c727..9ab48e7cdefb 100644
--- a/dev-perl/File-chdir/File-chdir-0.101.100.ebuild
+++ b/dev-perl/File-chdir/File-chdir-0.101.100.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="An alternative to File::Spec and CWD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Font-TTF/Font-TTF-1.60.0-r1.ebuild b/dev-perl/Font-TTF/Font-TTF-1.60.0-r1.ebuild
index bf514d339a9a..6a7c870e7413 100644
--- a/dev-perl/Font-TTF/Font-TTF-1.60.0-r1.ebuild
+++ b/dev-perl/Font-TTF/Font-TTF-1.60.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="module for compiling and altering fonts"
LICENSE="Artistic-2 OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
virtual/perl-IO-Compress
diff --git a/dev-perl/GSSAPI/GSSAPI-0.280.0-r1.ebuild b/dev-perl/GSSAPI/GSSAPI-0.280.0-r1.ebuild
index 685884b4d652..ae7a3752e5f8 100644
--- a/dev-perl/GSSAPI/GSSAPI-0.280.0-r1.ebuild
+++ b/dev-perl/GSSAPI/GSSAPI-0.280.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="GSSAPI - Perl extension providing access to the GSSAPIv2 library"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Geo-IP/Geo-IP-1.510.0.ebuild b/dev-perl/Geo-IP/Geo-IP-1.510.0.ebuild
index 57fa7d230407..e742c4b5e111 100644
--- a/dev-perl/Geo-IP/Geo-IP-1.510.0.ebuild
+++ b/dev-perl/Geo-IP/Geo-IP-1.510.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module multilib
DESCRIPTION="Look up country by IP Address"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
DEPEND="dev-libs/geoip"
diff --git a/dev-perl/HTML-Clean/HTML-Clean-0.800.0-r2.ebuild b/dev-perl/HTML-Clean/HTML-Clean-0.800.0-r2.ebuild
index 31d8ee94a61c..a39cb5e26b28 100644
--- a/dev-perl/HTML-Clean/HTML-Clean-0.800.0-r2.ebuild
+++ b/dev-perl/HTML-Clean/HTML-Clean-0.800.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Cleans up HTML code for web browsers, not humans"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="!<app-text/html-xml-utils-5.3"
diff --git a/dev-perl/HTML-Parser/HTML-Parser-3.720.0.ebuild b/dev-perl/HTML-Parser/HTML-Parser-3.720.0.ebuild
index bebd4426692a..67e4aab578d2 100644
--- a/dev-perl/HTML-Parser/HTML-Parser-3.720.0.ebuild
+++ b/dev-perl/HTML-Parser/HTML-Parser-3.720.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Parse <HEAD> section of HTML documents"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/HTML-Tagset/HTML-Tagset-3.200.0-r1.ebuild b/dev-perl/HTML-Tagset/HTML-Tagset-3.200.0-r1.ebuild
index 2f5b0bc33d6a..d89dee6137bd 100644
--- a/dev-perl/HTML-Tagset/HTML-Tagset-3.200.0-r1.ebuild
+++ b/dev-perl/HTML-Tagset/HTML-Tagset-3.200.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Data tables useful in parsing HTML"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
SRC_TEST="do"
diff --git a/dev-perl/HTTP-Cookies/HTTP-Cookies-6.40.0.ebuild b/dev-perl/HTTP-Cookies/HTTP-Cookies-6.40.0.ebuild
index f5e1b69a51f0..a90f99537465 100644
--- a/dev-perl/HTTP-Cookies/HTTP-Cookies-6.40.0.ebuild
+++ b/dev-perl/HTTP-Cookies/HTTP-Cookies-6.40.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Storage of cookies"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/HTTP-Daemon/HTTP-Daemon-6.10.0-r2.ebuild b/dev-perl/HTTP-Daemon/HTTP-Daemon-6.10.0-r2.ebuild
index 6649cbd7d900..d8bed322be68 100644
--- a/dev-perl/HTTP-Daemon/HTTP-Daemon-6.10.0-r2.ebuild
+++ b/dev-perl/HTTP-Daemon/HTTP-Daemon-6.10.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Base class for simple HTTP servers"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/HTTP-Daemon/HTTP-Daemon-6.60.0.ebuild b/dev-perl/HTTP-Daemon/HTTP-Daemon-6.60.0.ebuild
index 594a01705f5c..36e0fc57d1b0 100644
--- a/dev-perl/HTTP-Daemon/HTTP-Daemon-6.60.0.ebuild
+++ b/dev-perl/HTTP-Daemon/HTTP-Daemon-6.60.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Base class for simple HTTP servers"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/HTTP-Date/HTTP-Date-6.20.0-r1.ebuild b/dev-perl/HTTP-Date/HTTP-Date-6.20.0-r1.ebuild
index 209e287c958d..4fe24de8401d 100644
--- a/dev-perl/HTTP-Date/HTTP-Date-6.20.0-r1.ebuild
+++ b/dev-perl/HTTP-Date/HTTP-Date-6.20.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Date conversion for HTTP date formats"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/HTTP-Message/HTTP-Message-6.130.0.ebuild b/dev-perl/HTTP-Message/HTTP-Message-6.130.0.ebuild
index 7f2152f1fcae..b0e2d0ec225e 100644
--- a/dev-perl/HTTP-Message/HTTP-Message-6.130.0.ebuild
+++ b/dev-perl/HTTP-Message/HTTP-Message-6.130.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Base class for Request/Response"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.10.0-r1.ebuild b/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.10.0-r1.ebuild
index 389970fcbe55..84c0de40592d 100644
--- a/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.10.0-r1.ebuild
+++ b/dev-perl/HTTP-Negotiate/HTTP-Negotiate-6.10.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="HTTP content negotiation"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/IO-HTML/IO-HTML-1.1.0.ebuild b/dev-perl/IO-HTML/IO-HTML-1.1.0.ebuild
index 8d63fa10cc33..19c6dbe52908 100644
--- a/dev-perl/IO-HTML/IO-HTML-1.1.0.ebuild
+++ b/dev-perl/IO-HTML/IO-HTML-1.1.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Open an HTML file with automatic charset detection"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.720.0-r1.ebuild b/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.720.0-r1.ebuild
index 668ce77419c1..b0dfc4eed57d 100644
--- a/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.720.0-r1.ebuild
+++ b/dev-perl/IO-Socket-INET6/IO-Socket-INET6-2.720.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Work with IO sockets in ipv6"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="dev-perl/Socket6"
diff --git a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.52.0.ebuild b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.52.0.ebuild
index 0065bc9899a9..aeddf8f10289 100644
--- a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.52.0.ebuild
+++ b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.52.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Nearly transparent SSL encapsulation for IO::Socket::INET"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="idn"
RDEPEND="
diff --git a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.66.0.ebuild b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.66.0.ebuild
index 645acc510b0c..f9ad803d8b7b 100644
--- a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.66.0.ebuild
+++ b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.66.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Nearly transparent SSL encapsulation for IO::Socket::INET"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="idn"
RDEPEND="
diff --git a/dev-perl/IO-String/IO-String-1.80.0-r1.ebuild b/dev-perl/IO-String/IO-String-1.80.0-r1.ebuild
index 84921f6e48e9..53b86616d5ef 100644
--- a/dev-perl/IO-String/IO-String-1.80.0-r1.ebuild
+++ b/dev-perl/IO-String/IO-String-1.80.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="IO::File interface for in-core strings"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
SRC_TEST="do"
diff --git a/dev-perl/IO-Stty/IO-Stty-0.30.0.ebuild b/dev-perl/IO-Stty/IO-Stty-0.30.0.ebuild
index 7e7055207dbf..58c2b8fb9070 100644
--- a/dev-perl/IO-Stty/IO-Stty-0.30.0.ebuild
+++ b/dev-perl/IO-Stty/IO-Stty-0.30.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Change and print terminal line settings"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/IO-Tty/IO-Tty-1.120.0.ebuild b/dev-perl/IO-Tty/IO-Tty-1.120.0.ebuild
index a669e9cb0d58..9a38b26b601a 100644
--- a/dev-perl/IO-Tty/IO-Tty-1.120.0.ebuild
+++ b/dev-perl/IO-Tty/IO-Tty-1.120.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="IO::Tty and IO::Pty modules for Perl"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
SRC_TEST=do
diff --git a/dev-perl/IO-stringy/IO-stringy-2.111.0.ebuild b/dev-perl/IO-stringy/IO-stringy-2.111.0.ebuild
index ea579d24703e..66dd4814182f 100644
--- a/dev-perl/IO-stringy/IO-stringy-2.111.0.ebuild
+++ b/dev-perl/IO-stringy/IO-stringy-2.111.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="A Perl module for I/O on in-core objects like strings and arrays"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/IPC-System-Simple/IPC-System-Simple-1.250.0.ebuild b/dev-perl/IPC-System-Simple/IPC-System-Simple-1.250.0.ebuild
index ed92000ff70e..f8cad535b96c 100644
--- a/dev-perl/IPC-System-Simple/IPC-System-Simple-1.250.0.ebuild
+++ b/dev-perl/IPC-System-Simple/IPC-System-Simple-1.250.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Run commands simply, with detailed diagnostics"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Importer/Importer-0.24.0.ebuild b/dev-perl/Importer/Importer-0.24.0.ebuild
index ea57207e4a98..ee57c3680b38 100644
--- a/dev-perl/Importer/Importer-0.24.0.ebuild
+++ b/dev-perl/Importer/Importer-0.24.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Alternative interface to modules that export symbols"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.3.9.ebuild b/dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.3.9.ebuild
index 9de58a64100b..2c3c05f8910c 100644
--- a/dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.3.9.ebuild
+++ b/dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.3.9.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Use Cpanel::JSON::XS with a fallback to JSON::XS and JSON::PP"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test +xs"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/JSON-XS/JSON-XS-3.40.0.ebuild b/dev-perl/JSON-XS/JSON-XS-3.40.0.ebuild
index 9c3d171355fc..18a9c984eb9c 100644
--- a/dev-perl/JSON-XS/JSON-XS-3.40.0.ebuild
+++ b/dev-perl/JSON-XS/JSON-XS-3.40.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="JSON::XS - JSON serialising/deserialising, done correctly and fast"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Jcode/Jcode-2.70.0-r1.ebuild b/dev-perl/Jcode/Jcode-2.70.0-r1.ebuild
index d3e4ff001ac6..f6959655a87f 100644
--- a/dev-perl/Jcode/Jcode-2.70.0-r1.ebuild
+++ b/dev-perl/Jcode/Jcode-2.70.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Japanese transcoding module for Perl"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=virtual/perl-MIME-Base64-2.1"
diff --git a/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.20.0-r1.ebuild b/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.20.0-r1.ebuild
index 13ad579de9d5..eb95629eedbf 100644
--- a/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.20.0-r1.ebuild
+++ b/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.20.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Media types and mailcap processing"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.70.0.ebuild b/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.70.0.ebuild
index ddd99d384771..fa9dc9c826f4 100644
--- a/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.70.0.ebuild
+++ b/dev-perl/LWP-Protocol-https/LWP-Protocol-https-6.70.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Provide https support for LWP::UserAgent"
SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
RDEPEND="
app-misc/ca-certificates
diff --git a/dev-perl/Locale-Maketext-Lexicon/Locale-Maketext-Lexicon-1.0.0.ebuild b/dev-perl/Locale-Maketext-Lexicon/Locale-Maketext-Lexicon-1.0.0.ebuild
index 8a1570178726..4ffa4b353793 100644
--- a/dev-perl/Locale-Maketext-Lexicon/Locale-Maketext-Lexicon-1.0.0.ebuild
+++ b/dev-perl/Locale-Maketext-Lexicon/Locale-Maketext-Lexicon-1.0.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Use other catalog formats in Maketext"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Locale-gettext/Locale-gettext-1.70.0.ebuild b/dev-perl/Locale-gettext/Locale-gettext-1.70.0.ebuild
index d469211fff5e..53dda4704d9d 100644
--- a/dev-perl/Locale-gettext/Locale-gettext-1.70.0.ebuild
+++ b/dev-perl/Locale-gettext/Locale-gettext-1.70.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="A Perl module for accessing the GNU locale utilities"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="sys-devel/gettext"
diff --git a/dev-perl/MIME-Charset/MIME-Charset-1.12.2.ebuild b/dev-perl/MIME-Charset/MIME-Charset-1.12.2.ebuild
index b1212414922c..099b6eb79797 100644
--- a/dev-perl/MIME-Charset/MIME-Charset-1.12.2.ebuild
+++ b/dev-perl/MIME-Charset/MIME-Charset-1.12.2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Charset Informations for MIME"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="l10n_ja l10n_zh"
PATCHES=(
"${FILESDIR}/1.012-makefilepl.patch"
diff --git a/dev-perl/Mail-DKIM/Mail-DKIM-0.440.0.ebuild b/dev-perl/Mail-DKIM/Mail-DKIM-0.440.0.ebuild
index 7d25aebdae69..fe84141d538f 100644
--- a/dev-perl/Mail-DKIM/Mail-DKIM-0.440.0.ebuild
+++ b/dev-perl/Mail-DKIM/Mail-DKIM-0.440.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Signs/verifies Internet mail using DKIM message signatures"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Mail-SPF/Mail-SPF-2.9.0-r2.ebuild b/dev-perl/Mail-SPF/Mail-SPF-2.9.0-r2.ebuild
index b87b7569d716..e68b9ca728f4 100644
--- a/dev-perl/Mail-SPF/Mail-SPF-2.9.0-r2.ebuild
+++ b/dev-perl/Mail-SPF/Mail-SPF-2.9.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ DESCRIPTION="An object-oriented implementation of Sender Policy Framework"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/MailTools/MailTools-2.190.0.ebuild b/dev-perl/MailTools/MailTools-2.190.0.ebuild
index 444a4d0e055a..8a0989162263 100644
--- a/dev-perl/MailTools/MailTools-2.190.0.ebuild
+++ b/dev-perl/MailTools/MailTools-2.190.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Manipulation of electronic mail addresses"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild b/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild
index 4b1151c4ea49..8f336ae148e9 100644
--- a/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild
+++ b/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild
@@ -8,7 +8,7 @@ inherit perl-module
DESCRIPTION='A tiny replacement for Module::Build'
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Module-Build/Module-Build-0.422.400.ebuild b/dev-perl/Module-Build/Module-Build-0.422.400.ebuild
index 4c8d5df17de8..8b00c7550d53 100644
--- a/dev-perl/Module-Build/Module-Build-0.422.400.ebuild
+++ b/dev-perl/Module-Build/Module-Build-0.422.400.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Build and install Perl modules"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Module-Implementation/Module-Implementation-0.90.0.ebuild b/dev-perl/Module-Implementation/Module-Implementation-0.90.0.ebuild
index 6c06fdc10d72..7ad0ad1e7430 100644
--- a/dev-perl/Module-Implementation/Module-Implementation-0.90.0.ebuild
+++ b/dev-perl/Module-Implementation/Module-Implementation-0.90.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Loads one of several alternate underlying implementations for a mod
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Module-Runtime/Module-Runtime-0.16.0.ebuild b/dev-perl/Module-Runtime/Module-Runtime-0.16.0.ebuild
index 51c95c3fd2ca..fa5c643e6dbe 100644
--- a/dev-perl/Module-Runtime/Module-Runtime-0.16.0.ebuild
+++ b/dev-perl/Module-Runtime/Module-Runtime-0.16.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Runtime module handling"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Mozilla-CA/Mozilla-CA-20999999.ebuild b/dev-perl/Mozilla-CA/Mozilla-CA-20999999.ebuild
index 2d466ae9e1a2..c48da38cbd41 100644
--- a/dev-perl/Mozilla-CA/Mozilla-CA-20999999.ebuild
+++ b/dev-perl/Mozilla-CA/Mozilla-CA-20999999.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Mozilla's CA cert bundle in PEM format (Gentoo stub)"
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="app-misc/ca-certificates"
diff --git a/dev-perl/Net-CIDR-Lite/Net-CIDR-Lite-0.210.0-r1.ebuild b/dev-perl/Net-CIDR-Lite/Net-CIDR-Lite-0.210.0-r1.ebuild
index 39059f9876c9..764ac90513e3 100644
--- a/dev-perl/Net-CIDR-Lite/Net-CIDR-Lite-0.210.0-r1.ebuild
+++ b/dev-perl/Net-CIDR-Lite/Net-CIDR-Lite-0.210.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Perl extension for merging IPv4 or IPv6 CIDR addresses"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Net-DBus/Net-DBus-1.1.0.ebuild b/dev-perl/Net-DBus/Net-DBus-1.1.0.ebuild
index 03ec8847ed52..e247ee240ef1 100644
--- a/dev-perl/Net-DBus/Net-DBus-1.1.0.ebuild
+++ b/dev-perl/Net-DBus/Net-DBus-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Perl extension for the DBus message system"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Net-DNS-Resolver-Mock/Net-DNS-Resolver-Mock-1.201.710.310.ebuild b/dev-perl/Net-DNS-Resolver-Mock/Net-DNS-Resolver-Mock-1.201.710.310.ebuild
index cb3c2189ad83..fe0e8cb4474b 100644
--- a/dev-perl/Net-DNS-Resolver-Mock/Net-DNS-Resolver-Mock-1.201.710.310.ebuild
+++ b/dev-perl/Net-DNS-Resolver-Mock/Net-DNS-Resolver-Mock-1.201.710.310.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Mock a DNS Resolver object for testing"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Net-DNS-Resolver-Programmable/Net-DNS-Resolver-Programmable-0.9.0.ebuild b/dev-perl/Net-DNS-Resolver-Programmable/Net-DNS-Resolver-Programmable-0.9.0.ebuild
index e794c17a4470..97afbc7c5e63 100644
--- a/dev-perl/Net-DNS-Resolver-Programmable/Net-DNS-Resolver-Programmable-0.9.0.ebuild
+++ b/dev-perl/Net-DNS-Resolver-Programmable/Net-DNS-Resolver-Programmable-0.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="programmable DNS resolver class for offline emulation of DNS"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.30.0.ebuild b/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.30.0.ebuild
index 8ad078ae9fc8..acf5a99df345 100644
--- a/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.30.0.ebuild
+++ b/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.30.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="DNSSEC extensions to Net::DNS"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Net-DNS/Net-DNS-1.100.0.ebuild b/dev-perl/Net-DNS/Net-DNS-1.100.0.ebuild
index 55c2e16e7dc1..80c1617fbe5a 100644
--- a/dev-perl/Net-DNS/Net-DNS-1.100.0.ebuild
+++ b/dev-perl/Net-DNS/Net-DNS-1.100.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ inherit toolchain-funcs perl-module
DESCRIPTION="Perl Net::DNS - Perl DNS Resolver Module"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="+ipv6 test minimal"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Net-DNS/Net-DNS-1.130.0.ebuild b/dev-perl/Net-DNS/Net-DNS-1.130.0.ebuild
index ac4dce01f41e..10b7402b16c3 100644
--- a/dev-perl/Net-DNS/Net-DNS-1.130.0.ebuild
+++ b/dev-perl/Net-DNS/Net-DNS-1.130.0.ebuild
@@ -11,7 +11,7 @@ inherit toolchain-funcs perl-module
DESCRIPTION="Perl Interface to the Domain Name System"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+ipv6 test minimal"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Net-Daemon/Net-Daemon-0.480.0-r2.ebuild b/dev-perl/Net-Daemon/Net-Daemon-0.480.0-r2.ebuild
index cb505c4074d1..b71b42be35de 100644
--- a/dev-perl/Net-Daemon/Net-Daemon-0.480.0-r2.ebuild
+++ b/dev-perl/Net-Daemon/Net-Daemon-0.480.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Abstract base class for portable servers"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
PATCHES=(
"${FILESDIR}/${P}-perl526.patch"
diff --git a/dev-perl/Net-HTTP/Net-HTTP-6.170.0.ebuild b/dev-perl/Net-HTTP/Net-HTTP-6.170.0.ebuild
index 0fd4ae1c06f6..f648e8cea885 100644
--- a/dev-perl/Net-HTTP/Net-HTTP-6.170.0.ebuild
+++ b/dev-perl/Net-HTTP/Net-HTTP-6.170.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Low-level HTTP connection (client)"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
IUSE="minimal test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Net-IP/Net-IP-1.260.0-r1.ebuild b/dev-perl/Net-IP/Net-IP-1.260.0-r1.ebuild
index cf438ee20bc3..959086c86639 100644
--- a/dev-perl/Net-IP/Net-IP-1.260.0-r1.ebuild
+++ b/dev-perl/Net-IP/Net-IP-1.260.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Perl extension for manipulating IPv4/IPv6 addresses"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE=""
PATCHES=( "${FILESDIR}/initip-0.patch" )
diff --git a/dev-perl/Net-LibIDN/Net-LibIDN-0.120.0-r2.ebuild b/dev-perl/Net-LibIDN/Net-LibIDN-0.120.0-r2.ebuild
index 242535379699..9d0af4f57e5f 100644
--- a/dev-perl/Net-LibIDN/Net-LibIDN-0.120.0-r2.ebuild
+++ b/dev-perl/Net-LibIDN/Net-LibIDN-0.120.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Perl bindings for GNU Libidn"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="net-dns/libidn:0="
diff --git a/dev-perl/Net-LibIDN2/Net-LibIDN2-1.0.0-r1.ebuild b/dev-perl/Net-LibIDN2/Net-LibIDN2-1.0.0-r1.ebuild
index 879c331e8705..f9cb58388fde 100644
--- a/dev-perl/Net-LibIDN2/Net-LibIDN2-1.0.0-r1.ebuild
+++ b/dev-perl/Net-LibIDN2/Net-LibIDN2-1.0.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Perl bindings for GNU Libidn2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Net-Patricia/Net-Patricia-1.220.0-r1.ebuild b/dev-perl/Net-Patricia/Net-Patricia-1.220.0-r1.ebuild
index 937703e5824e..7fec77a03430 100644
--- a/dev-perl/Net-Patricia/Net-Patricia-1.220.0-r1.ebuild
+++ b/dev-perl/Net-Patricia/Net-Patricia-1.220.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Patricia Trie perl module for fast IP address lookups"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="ipv6"
RDEPEND="dev-perl/Net-CIDR-Lite
diff --git a/dev-perl/Net-SMTP-SSL/Net-SMTP-SSL-1.40.0.ebuild b/dev-perl/Net-SMTP-SSL/Net-SMTP-SSL-1.40.0.ebuild
index 7e4e85c4e133..626c938c284c 100644
--- a/dev-perl/Net-SMTP-SSL/Net-SMTP-SSL-1.40.0.ebuild
+++ b/dev-perl/Net-SMTP-SSL/Net-SMTP-SSL-1.40.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="(Deprecated) SSL support for Net::SMTP"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.880.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.880.0.ebuild
index fef8456706e8..afd6bf8a87ce 100644
--- a/dev-perl/Net-SSLeay/Net-SSLeay-1.880.0.ebuild
+++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.880.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl extension for using OpenSSL"
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="libressl test minimal examples"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/NetAddr-IP/NetAddr-IP-4.79.0.ebuild b/dev-perl/NetAddr-IP/NetAddr-IP-4.79.0.ebuild
index e14b1d9d5bf6..b1a98a32c69b 100644
--- a/dev-perl/NetAddr-IP/NetAddr-IP-4.79.0.ebuild
+++ b/dev-perl/NetAddr-IP/NetAddr-IP-4.79.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Manipulation and operations on IP addresses"
SLOT="0"
LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="ipv6 test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Number-Compare/Number-Compare-0.30.0-r1.ebuild b/dev-perl/Number-Compare/Number-Compare-0.30.0-r1.ebuild
index fc5bc9671ae5..1f35866d87dc 100644
--- a/dev-perl/Number-Compare/Number-Compare-0.30.0-r1.ebuild
+++ b/dev-perl/Number-Compare/Number-Compare-0.30.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Numeric comparisons"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
SRC_TEST=do
diff --git a/dev-perl/OLE-StorageLite/OLE-StorageLite-0.190.0-r1.ebuild b/dev-perl/OLE-StorageLite/OLE-StorageLite-0.190.0-r1.ebuild
index 5c7629fa340d..53e149f37f8b 100644
--- a/dev-perl/OLE-StorageLite/OLE-StorageLite-0.190.0-r1.ebuild
+++ b/dev-perl/OLE-StorageLite/OLE-StorageLite-0.190.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Simple Class for OLE document interface"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
SRC_TEST="do"
diff --git a/dev-perl/Package-Stash-XS/Package-Stash-XS-0.280.0.ebuild b/dev-perl/Package-Stash-XS/Package-Stash-XS-0.280.0.ebuild
index cf6195878820..1d676b7f875a 100644
--- a/dev-perl/Package-Stash-XS/Package-Stash-XS-0.280.0.ebuild
+++ b/dev-perl/Package-Stash-XS/Package-Stash-XS-0.280.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Faster and more correct implementation of the Package::Stash API"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Package-Stash/Package-Stash-0.370.0.ebuild b/dev-perl/Package-Stash/Package-Stash-0.370.0.ebuild
index 13989c531e7b..a1d6cb979b99 100644
--- a/dev-perl/Package-Stash/Package-Stash-0.370.0.ebuild
+++ b/dev-perl/Package-Stash/Package-Stash-0.370.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Routines for manipulating stashes"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
IUSE="test minimal"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Params-Util/Params-Util-1.70.0.ebuild b/dev-perl/Params-Util/Params-Util-1.70.0.ebuild
index 4944a5dededd..492ff420f932 100644
--- a/dev-perl/Params-Util/Params-Util-1.70.0.ebuild
+++ b/dev-perl/Params-Util/Params-Util-1.70.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Utility functions to aid in parameter checking"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.15.ebuild b/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.15.ebuild
index 1dbbdc9ef449..b41220a6d036 100644
--- a/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.15.ebuild
+++ b/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.15.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Generate Recursive-Descent Parsers"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test examples"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Path-Class/Path-Class-0.370.0.ebuild b/dev-perl/Path-Class/Path-Class-0.370.0.ebuild
index 52f178bf94fe..43264640fe58 100644
--- a/dev-perl/Path-Class/Path-Class-0.370.0.ebuild
+++ b/dev-perl/Path-Class/Path-Class-0.370.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Cross-platform path specification manipulation"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Path-Tiny/Path-Tiny-0.104.0.ebuild b/dev-perl/Path-Tiny/Path-Tiny-0.104.0.ebuild
index 5689199b4af5..bf7ed3a2700c 100644
--- a/dev-perl/Path-Tiny/Path-Tiny-0.104.0.ebuild
+++ b/dev-perl/Path-Tiny/Path-Tiny-0.104.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="File path utility"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test minimal"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/PlRPC/PlRPC-0.202.0-r3.ebuild b/dev-perl/PlRPC/PlRPC-0.202.0-r3.ebuild
index ea74bdaf5094..9897298905c7 100644
--- a/dev-perl/PlRPC/PlRPC-0.202.0-r3.ebuild
+++ b/dev-perl/PlRPC/PlRPC-0.202.0-r3.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}
DESCRIPTION="The Perl RPC Module"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=virtual/perl-Storable-1.0.7
diff --git a/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0.ebuild b/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0.ebuild
index 153644f9df35..27ac1a7557bd 100644
--- a/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0.ebuild
+++ b/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ DESCRIPTION="Convert Pod data to formatted LaTeX"
LICENSE="|| ( GPL-1+ Artistic )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="
diff --git a/dev-perl/Pod-Parser/Pod-Parser-1.630.0-r1.ebuild b/dev-perl/Pod-Parser/Pod-Parser-1.630.0-r1.ebuild
index d3c5c66e61e0..4e625cf2863d 100644
--- a/dev-perl/Pod-Parser/Pod-Parser-1.630.0-r1.ebuild
+++ b/dev-perl/Pod-Parser/Pod-Parser-1.630.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="POD filters and translators"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Probe-Perl/Probe-Perl-0.30.0.ebuild b/dev-perl/Probe-Perl/Probe-Perl-0.30.0.ebuild
index 3f50622b7efb..942b5d65a979 100644
--- a/dev-perl/Probe-Perl/Probe-Perl-0.30.0.ebuild
+++ b/dev-perl/Probe-Perl/Probe-Perl-0.30.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Information about the currently running perl"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/SGMLSpm/SGMLSpm-1.1-r1.ebuild b/dev-perl/SGMLSpm/SGMLSpm-1.1-r1.ebuild
index c2b72c2812e9..a53278738f4b 100644
--- a/dev-perl/SGMLSpm/SGMLSpm-1.1-r1.ebuild
+++ b/dev-perl/SGMLSpm/SGMLSpm-1.1-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Perl library for parsing the output of nsgmls"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="dev-perl/Module-Build"
diff --git a/dev-perl/SUPER/SUPER-1.201.411.170.ebuild b/dev-perl/SUPER/SUPER-1.201.411.170.ebuild
index 216294e09ada..af68a2242b06 100644
--- a/dev-perl/SUPER/SUPER-1.201.411.170.ebuild
+++ b/dev-perl/SUPER/SUPER-1.201.411.170.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="control superclass method dispatch"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Socket6/Socket6-0.280.0.ebuild b/dev-perl/Socket6/Socket6-0.280.0.ebuild
index 863ae28fb1a0..d8c73563b00f 100644
--- a/dev-perl/Socket6/Socket6-0.280.0.ebuild
+++ b/dev-perl/Socket6/Socket6-0.280.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="IPv6 related part of the C socket.h defines and structure manipulat
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
src_unpack() {
diff --git a/dev-perl/Spreadsheet-ParseExcel/Spreadsheet-ParseExcel-0.650.0.ebuild b/dev-perl/Spreadsheet-ParseExcel/Spreadsheet-ParseExcel-0.650.0.ebuild
index cd6123daf2aa..5bd6befc8442 100644
--- a/dev-perl/Spreadsheet-ParseExcel/Spreadsheet-ParseExcel-0.650.0.ebuild
+++ b/dev-perl/Spreadsheet-ParseExcel/Spreadsheet-ParseExcel-0.650.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Read information from an Excel file"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~x64-solaris ~x86-solaris"
IUSE="test cjk unicode"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Spreadsheet-WriteExcel/Spreadsheet-WriteExcel-2.400.0.ebuild b/dev-perl/Spreadsheet-WriteExcel/Spreadsheet-WriteExcel-2.400.0.ebuild
index 47e5a667998d..21b52135ff00 100644
--- a/dev-perl/Spreadsheet-WriteExcel/Spreadsheet-WriteExcel-2.400.0.ebuild
+++ b/dev-perl/Spreadsheet-WriteExcel/Spreadsheet-WriteExcel-2.400.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Write cross-platform Excel binary file"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="virtual/perl-File-Temp
diff --git a/dev-perl/String-CRC32/String-CRC32-1.600.0.ebuild b/dev-perl/String-CRC32/String-CRC32-1.600.0.ebuild
index ccd8b317c17a..1738a4b1d3aa 100644
--- a/dev-perl/String-CRC32/String-CRC32-1.600.0.ebuild
+++ b/dev-perl/String-CRC32/String-CRC32-1.600.0.ebuild
@@ -11,5 +11,5 @@ DESCRIPTION="Perl interface for cyclic redundancy check generation"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE=""
diff --git a/dev-perl/Sub-Identify/Sub-Identify-0.140.0.ebuild b/dev-perl/Sub-Identify/Sub-Identify-0.140.0.ebuild
index d8fcc62b663e..a9b5e6d6269d 100644
--- a/dev-perl/Sub-Identify/Sub-Identify-0.140.0.ebuild
+++ b/dev-perl/Sub-Identify/Sub-Identify-0.140.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Retrieve names of code references"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Sub-Info/Sub-Info-0.2.0.ebuild b/dev-perl/Sub-Info/Sub-Info-0.2.0.ebuild
index 1f7044517e80..94cf1e6dabf8 100644
--- a/dev-perl/Sub-Info/Sub-Info-0.2.0.ebuild
+++ b/dev-perl/Sub-Info/Sub-Info-0.2.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Tool for inspecting subroutines"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Sub-Install/Sub-Install-0.928.0.ebuild b/dev-perl/Sub-Install/Sub-Install-0.928.0.ebuild
index 5d17975ae948..7a0001126869 100644
--- a/dev-perl/Sub-Install/Sub-Install-0.928.0.ebuild
+++ b/dev-perl/Sub-Install/Sub-Install-0.928.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Install subroutines into packages easily"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Sub-Name/Sub-Name-0.210.0.ebuild b/dev-perl/Sub-Name/Sub-Name-0.210.0.ebuild
index 043c17ec6ad7..6acc654eedaf 100644
--- a/dev-perl/Sub-Name/Sub-Name-0.210.0.ebuild
+++ b/dev-perl/Sub-Name/Sub-Name-0.210.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="(Re)name a sub"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test suggested"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Sub-Uplevel/Sub-Uplevel-0.280.0.ebuild b/dev-perl/Sub-Uplevel/Sub-Uplevel-0.280.0.ebuild
index 382bf9dea054..38e80162a6ab 100644
--- a/dev-perl/Sub-Uplevel/Sub-Uplevel-0.280.0.ebuild
+++ b/dev-perl/Sub-Uplevel/Sub-Uplevel-0.280.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Apparently run a function in a higher stack frame"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Taint-Runtime/Taint-Runtime-0.30.0-r1.ebuild b/dev-perl/Taint-Runtime/Taint-Runtime-0.30.0-r1.ebuild
index 3d44a0097827..fe1796e4322e 100644
--- a/dev-perl/Taint-Runtime/Taint-Runtime-0.30.0-r1.ebuild
+++ b/dev-perl/Taint-Runtime/Taint-Runtime-0.30.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Runtime enable taint checking"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
SRC_TEST=do
diff --git a/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.310.0.ebuild b/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.310.0.ebuild
index 79e27905f9c3..644367424b3d 100644
--- a/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.310.0.ebuild
+++ b/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.310.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="GNU Readline XS library wrapper"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~s390 sparc x86"
IUSE=""
RDEPEND=">=sys-libs/readline-6.2:0="
diff --git a/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.360.0.ebuild b/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.360.0.ebuild
index ddeb538331a6..ee7a1d834dca 100644
--- a/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.360.0.ebuild
+++ b/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.360.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="GNU Readline XS library wrapper"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=sys-libs/readline-6.2:0="
diff --git a/dev-perl/Term-Screen/Term-Screen-1.60.0.ebuild b/dev-perl/Term-Screen/Term-Screen-1.60.0.ebuild
index f1859b1a249a..1149dcacd1f5 100644
--- a/dev-perl/Term-Screen/Term-Screen-1.60.0.ebuild
+++ b/dev-perl/Term-Screen/Term-Screen-1.60.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="A simple Term::Cap based screen positioning module"
SLOT="0"
-KEYWORDS="amd64 s390 x86"
+KEYWORDS="amd64 ~s390 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Term-ScreenColor/Term-ScreenColor-1.200.0-r1.ebuild b/dev-perl/Term-ScreenColor/Term-ScreenColor-1.200.0-r1.ebuild
index 22b61d25e919..7d6443a8d8b6 100644
--- a/dev-perl/Term-ScreenColor/Term-ScreenColor-1.200.0-r1.ebuild
+++ b/dev-perl/Term-ScreenColor/Term-ScreenColor-1.200.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ DESCRIPTION="A Term::Screen based screen positioning and coloring module"
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="amd64 s390 x86"
+KEYWORDS="amd64 ~s390 x86"
IUSE=""
RDEPEND=">=dev-perl/Term-Screen-1.30.0"
diff --git a/dev-perl/Term-Table/Term-Table-0.8.0.ebuild b/dev-perl/Term-Table/Term-Table-0.8.0.ebuild
index 249f89c81076..4209e7d8aed1 100644
--- a/dev-perl/Term-Table/Term-Table-0.8.0.ebuild
+++ b/dev-perl/Term-Table/Term-Table-0.8.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module optfeature
DESCRIPTION="Format a header and rows into a table"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/TermReadKey/TermReadKey-2.370.0.ebuild b/dev-perl/TermReadKey/TermReadKey-2.370.0.ebuild
index 093b85ee5494..2919eb8839aa 100644
--- a/dev-perl/TermReadKey/TermReadKey-2.370.0.ebuild
+++ b/dev-perl/TermReadKey/TermReadKey-2.370.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Change terminal modes, and perform non-blocking reads"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/perl-ExtUtils-MakeMaker-6.580.0"
diff --git a/dev-perl/Test-Deep/Test-Deep-1.126.0.ebuild b/dev-perl/Test-Deep/Test-Deep-1.126.0.ebuild
index 7806346e9088..57a25b809534 100644
--- a/dev-perl/Test-Deep/Test-Deep-1.126.0.ebuild
+++ b/dev-perl/Test-Deep/Test-Deep-1.126.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Extremely flexible deep comparison testing"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Test-Deep/Test-Deep-1.127.0.ebuild b/dev-perl/Test-Deep/Test-Deep-1.127.0.ebuild
index a9d71b8e9e8f..31787b93c901 100644
--- a/dev-perl/Test-Deep/Test-Deep-1.127.0.ebuild
+++ b/dev-perl/Test-Deep/Test-Deep-1.127.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Extremely flexible deep comparison testing"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Test-Exception/Test-Exception-0.430.0.ebuild b/dev-perl/Test-Exception/Test-Exception-0.430.0.ebuild
index 09041f70716e..797aa969351f 100644
--- a/dev-perl/Test-Exception/Test-Exception-0.430.0.ebuild
+++ b/dev-perl/Test-Exception/Test-Exception-0.430.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Test functions for exception based code"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/Test-FailWarnings/Test-FailWarnings-0.8.0-r1.ebuild b/dev-perl/Test-FailWarnings/Test-FailWarnings-0.8.0-r1.ebuild
index 4fb54ccc00c4..2c673fd99056 100644
--- a/dev-perl/Test-FailWarnings/Test-FailWarnings-0.8.0-r1.ebuild
+++ b/dev-perl/Test-FailWarnings/Test-FailWarnings-0.8.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Add test failures if warnings are caught"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
LICENSE="Apache-2.0"
diff --git a/dev-perl/Test-Fatal/Test-Fatal-0.14.0.ebuild b/dev-perl/Test-Fatal/Test-Fatal-0.14.0.ebuild
index 728794efeabe..c9ee60cb6d36 100644
--- a/dev-perl/Test-Fatal/Test-Fatal-0.14.0.ebuild
+++ b/dev-perl/Test-Fatal/Test-Fatal-0.14.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Incredibly simple helpers for testing code with exceptions"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Test-Inter/Test-Inter-1.60.0.ebuild b/dev-perl/Test-Inter/Test-Inter-1.60.0.ebuild
index bd9c29724442..25274aa9de4a 100644
--- a/dev-perl/Test-Inter/Test-Inter-1.60.0.ebuild
+++ b/dev-perl/Test-Inter/Test-Inter-1.60.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Framework for more readable interactive test scripts"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Test-Inter/Test-Inter-1.90.0.ebuild b/dev-perl/Test-Inter/Test-Inter-1.90.0.ebuild
index 230b7bb189d2..beb4aca97273 100644
--- a/dev-perl/Test-Inter/Test-Inter-1.90.0.ebuild
+++ b/dev-perl/Test-Inter/Test-Inter-1.90.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Framework for more readable interactive test scripts"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Test-LeakTrace/Test-LeakTrace-0.160.0.ebuild b/dev-perl/Test-LeakTrace/Test-LeakTrace-0.160.0.ebuild
index 27419ffb2ea0..c1bf7be7d318 100644
--- a/dev-perl/Test-LeakTrace/Test-LeakTrace-0.160.0.ebuild
+++ b/dev-perl/Test-LeakTrace/Test-LeakTrace-0.160.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Traces memory leaks"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/Test-MockModule/Test-MockModule-0.130.0.ebuild b/dev-perl/Test-MockModule/Test-MockModule-0.130.0.ebuild
index 27bd6875b506..42c72c5af697 100644
--- a/dev-perl/Test-MockModule/Test-MockModule-0.130.0.ebuild
+++ b/dev-perl/Test-MockModule/Test-MockModule-0.130.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Override subroutines in a module for unit testing"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Test-MockRandom/Test-MockRandom-1.10.0.ebuild b/dev-perl/Test-MockRandom/Test-MockRandom-1.10.0.ebuild
index 584c28a505c4..0bc052484f44 100644
--- a/dev-perl/Test-MockRandom/Test-MockRandom-1.10.0.ebuild
+++ b/dev-perl/Test-MockRandom/Test-MockRandom-1.10.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Replaces random number generation with non-random number generation
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test minimal examples"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Test-Needs/Test-Needs-0.2.5.ebuild b/dev-perl/Test-Needs/Test-Needs-0.2.5.ebuild
index 0ef9dcfc8c04..e849641a81e8 100644
--- a/dev-perl/Test-Needs/Test-Needs-0.2.5.ebuild
+++ b/dev-perl/Test-Needs/Test-Needs-0.2.5.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Skip tests when modules not available"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Test-NoWarnings/Test-NoWarnings-1.40.0-r3.ebuild b/dev-perl/Test-NoWarnings/Test-NoWarnings-1.40.0-r3.ebuild
index e0b1d590d6e0..619aeba6c790 100644
--- a/dev-perl/Test-NoWarnings/Test-NoWarnings-1.40.0-r3.ebuild
+++ b/dev-perl/Test-NoWarnings/Test-NoWarnings-1.40.0-r3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Make sure you didn't emit any warnings while testing"
SLOT="0"
LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="virtual/perl-Test-Simple"
diff --git a/dev-perl/Test-Requires/Test-Requires-0.100.0.ebuild b/dev-perl/Test-Requires/Test-Requires-0.100.0.ebuild
index 484134188220..8ca8b20e8b65 100644
--- a/dev-perl/Test-Requires/Test-Requires-0.100.0.ebuild
+++ b/dev-perl/Test-Requires/Test-Requires-0.100.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Checks to see if the module can be loaded"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
IUSE=""
RDEPEND=">=virtual/perl-Test-Simple-0.470.0"
diff --git a/dev-perl/Test-RequiresInternet/Test-RequiresInternet-0.50.0.ebuild b/dev-perl/Test-RequiresInternet/Test-RequiresInternet-0.50.0.ebuild
index b695edfa2cd2..122c630d7089 100644
--- a/dev-perl/Test-RequiresInternet/Test-RequiresInternet-0.50.0.ebuild
+++ b/dev-perl/Test-RequiresInternet/Test-RequiresInternet-0.50.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Easily test network connectivity"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Test-Script/Test-Script-1.230.0.ebuild b/dev-perl/Test-Script/Test-Script-1.230.0.ebuild
index 5a3e4ff4a069..b0213dbbad22 100644
--- a/dev-perl/Test-Script/Test-Script-1.230.0.ebuild
+++ b/dev-perl/Test-Script/Test-Script-1.230.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Cross-platform basic tests for scripts"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Test-Warn/Test-Warn-0.320.0.ebuild b/dev-perl/Test-Warn/Test-Warn-0.320.0.ebuild
index b42332acd790..593055ffc4f3 100644
--- a/dev-perl/Test-Warn/Test-Warn-0.320.0.ebuild
+++ b/dev-perl/Test-Warn/Test-Warn-0.320.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Perl extension to test methods for warnings"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Test2-Suite/Test2-Suite-0.0.77.ebuild b/dev-perl/Test2-Suite/Test2-Suite-0.0.77.ebuild
index 1a286334f4cf..e72d450dd20b 100644
--- a/dev-perl/Test2-Suite/Test2-Suite-0.0.77.ebuild
+++ b/dev-perl/Test2-Suite/Test2-Suite-0.0.77.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="A rich set of tools built upon the Test2 framework"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Text-CSV_XS/Text-CSV_XS-1.340.0.ebuild b/dev-perl/Text-CSV_XS/Text-CSV_XS-1.340.0.ebuild
index a96ba4ab4cf9..bfdc45ebb1e8 100644
--- a/dev-perl/Text-CSV_XS/Text-CSV_XS-1.340.0.ebuild
+++ b/dev-perl/Text-CSV_XS/Text-CSV_XS-1.340.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
DESCRIPTION="Comma-separated values manipulation routines"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Text-CharWidth/Text-CharWidth-0.40.0-r1.ebuild b/dev-perl/Text-CharWidth/Text-CharWidth-0.40.0-r1.ebuild
index 9788f5b57182..8a7221d3eb72 100644
--- a/dev-perl/Text-CharWidth/Text-CharWidth-0.40.0-r1.ebuild
+++ b/dev-perl/Text-CharWidth/Text-CharWidth-0.40.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Get number of occupied columns of a string on terminal"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
SRC_TEST="do"
diff --git a/dev-perl/Text-Diff/Text-Diff-1.450.0.ebuild b/dev-perl/Text-Diff/Text-Diff-1.450.0.ebuild
index 025b3cb071f1..884ce5d9211b 100644
--- a/dev-perl/Text-Diff/Text-Diff-1.450.0.ebuild
+++ b/dev-perl/Text-Diff/Text-Diff-1.450.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Perform diffs on files and record sets"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/Text-Glob/Text-Glob-0.110.0.ebuild b/dev-perl/Text-Glob/Text-Glob-0.110.0.ebuild
index a3d03d7890eb..7c7e54ad2851 100644
--- a/dev-perl/Text-Glob/Text-Glob-0.110.0.ebuild
+++ b/dev-perl/Text-Glob/Text-Glob-0.110.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Match globbing patterns against text"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Text-Iconv/Text-Iconv-1.700.0-r2.ebuild b/dev-perl/Text-Iconv/Text-Iconv-1.700.0-r2.ebuild
index 6e3d1b81fa83..bfa07f15b6bd 100644
--- a/dev-perl/Text-Iconv/Text-Iconv-1.700.0-r2.ebuild
+++ b/dev-perl/Text-Iconv/Text-Iconv-1.700.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="A Perl interface to the iconv() codeset conversion function"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
IUSE=""
RDEPEND="virtual/libiconv"
diff --git a/dev-perl/Text-Reform/Text-Reform-1.200.0-r1.ebuild b/dev-perl/Text-Reform/Text-Reform-1.200.0-r1.ebuild
index 3751241c025c..b90e78878c71 100644
--- a/dev-perl/Text-Reform/Text-Reform-1.200.0-r1.ebuild
+++ b/dev-perl/Text-Reform/Text-Reform-1.200.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Manual text wrapping and reformatting"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Text-Unidecode/Text-Unidecode-1.300.0.ebuild b/dev-perl/Text-Unidecode/Text-Unidecode-1.300.0.ebuild
index 59e49c694878..d35f6a0eec52 100644
--- a/dev-perl/Text-Unidecode/Text-Unidecode-1.300.0.ebuild
+++ b/dev-perl/Text-Unidecode/Text-Unidecode-1.300.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Plain ASCII transliterations of Unicode text"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=""
diff --git a/dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r1.ebuild b/dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r1.ebuild
index 94b0812288b1..856cdba9852e 100644
--- a/dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r1.ebuild
+++ b/dev-perl/Text-WrapI18N/Text-WrapI18N-0.60.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Internationalized substitute of Text::Wrap"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="dev-perl/Text-CharWidth"
diff --git a/dev-perl/Tie-IxHash/Tie-IxHash-1.230.0.ebuild b/dev-perl/Tie-IxHash/Tie-IxHash-1.230.0.ebuild
index 15c858e176c3..3f333c87d6c9 100644
--- a/dev-perl/Tie-IxHash/Tie-IxHash-1.230.0.ebuild
+++ b/dev-perl/Tie-IxHash/Tie-IxHash-1.230.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Ordered associative arrays for Perl"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/TimeDate/TimeDate-2.300.0.ebuild b/dev-perl/TimeDate/TimeDate-2.300.0.ebuild
index 358dde7fca5e..0bc0de9c024d 100644
--- a/dev-perl/TimeDate/TimeDate-2.300.0.ebuild
+++ b/dev-perl/TimeDate/TimeDate-2.300.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="A Date/Time Parsing Perl Module"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
SRC_TEST=do
diff --git a/dev-perl/Tk/Tk-804.33.0.ebuild b/dev-perl/Tk/Tk-804.33.0.ebuild
index 401a0117d395..989083490fe4 100644
--- a/dev-perl/Tk/Tk-804.33.0.ebuild
+++ b/dev-perl/Tk/Tk-804.33.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ DESCRIPTION="A Perl Module for Tk"
LICENSE+=" tcltk BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE=""
DEPEND="
diff --git a/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.310.0.ebuild b/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.310.0.ebuild
index 941f56ff4d4e..6968c00771c4 100644
--- a/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.310.0.ebuild
+++ b/dev-perl/Tree-DAG_Node/Tree-DAG_Node-1.310.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="(Super)class for representing nodes in a tree"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Try-Tiny/Try-Tiny-0.300.0.ebuild b/dev-perl/Try-Tiny/Try-Tiny-0.300.0.ebuild
index c9b86bbaac87..527071bca29d 100644
--- a/dev-perl/Try-Tiny/Try-Tiny-0.300.0.ebuild
+++ b/dev-perl/Try-Tiny/Try-Tiny-0.300.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Minimal try/catch with proper localization of \$@"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test minimal"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Types-Serialiser/Types-Serialiser-1.0.0-r1.ebuild b/dev-perl/Types-Serialiser/Types-Serialiser-1.0.0-r1.ebuild
index 7aacd65b6a4d..f5076d14963e 100644
--- a/dev-perl/Types-Serialiser/Types-Serialiser-1.0.0-r1.ebuild
+++ b/dev-perl/Types-Serialiser/Types-Serialiser-1.0.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="simple data types for common serialisation formats"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/URI/URI-1.710.0.ebuild b/dev-perl/URI/URI-1.710.0.ebuild
index b4ecd32ee45a..1b154d5b6cd1 100644
--- a/dev-perl/URI/URI-1.710.0.ebuild
+++ b/dev-perl/URI/URI-1.710.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Uniform Resource Identifiers (absolute and relative)"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/URI/URI-1.730.0.ebuild b/dev-perl/URI/URI-1.730.0.ebuild
index e345611ed9f8..d51e06eb95f0 100644
--- a/dev-perl/URI/URI-1.730.0.ebuild
+++ b/dev-perl/URI/URI-1.730.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Uniform Resource Identifiers (absolute and relative)"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-1.330.0-r1.ebuild b/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-1.330.0-r1.ebuild
index 5e7172bf94b4..5ba4de59865d 100644
--- a/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-1.330.0-r1.ebuild
+++ b/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-1.330.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="East Asian Width properties"
LICENSE="CC0-1.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="virtual/perl-File-Spec"
diff --git a/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2017.4.0-r1.ebuild b/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2017.4.0-r1.ebuild
index 8720374070ac..c48adc8648b4 100644
--- a/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2017.4.0-r1.ebuild
+++ b/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2017.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="UAX #14 Unicode Line Breaking Algorithm"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="dev-perl/MIME-Charset
diff --git a/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2019.1.0.ebuild b/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2019.1.0.ebuild
index 01141eff5254..60ab51b72600 100644
--- a/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2019.1.0.ebuild
+++ b/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2019.1.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="UAX #14 Unicode Line Breaking Algorithm"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="dev-perl/MIME-Charset
diff --git a/dev-perl/Unicode-Map/Unicode-Map-0.112.0-r1.ebuild b/dev-perl/Unicode-Map/Unicode-Map-0.112.0-r1.ebuild
index b4a9874ad784..cd9e5a5b2802 100644
--- a/dev-perl/Unicode-Map/Unicode-Map-0.112.0-r1.ebuild
+++ b/dev-perl/Unicode-Map/Unicode-Map-0.112.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Map charsets from and to utf16 code"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~x64-solaris ~x86-solaris"
IUSE=""
SRC_TEST="do"
diff --git a/dev-perl/Unicode-Map8/Unicode-Map8-0.130.0.ebuild b/dev-perl/Unicode-Map8/Unicode-Map8-0.130.0.ebuild
index fddc2f9cd6a9..fe150022de5a 100644
--- a/dev-perl/Unicode-Map8/Unicode-Map8-0.130.0.ebuild
+++ b/dev-perl/Unicode-Map8/Unicode-Map8-0.130.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Convert between most 8bit encodings"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND=">=dev-perl/Unicode-String-2.06"
diff --git a/dev-perl/Unicode-MapUTF8/Unicode-MapUTF8-1.110.0-r2.ebuild b/dev-perl/Unicode-MapUTF8/Unicode-MapUTF8-1.110.0-r2.ebuild
index 149555d8957a..e566935d6a39 100644
--- a/dev-perl/Unicode-MapUTF8/Unicode-MapUTF8-1.110.0-r2.ebuild
+++ b/dev-perl/Unicode-MapUTF8/Unicode-MapUTF8-1.110.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Conversions to and from arbitrary character sets and UTF8"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="dev-perl/Unicode-Map
diff --git a/dev-perl/Unicode-String/Unicode-String-2.100.0.ebuild b/dev-perl/Unicode-String/Unicode-String-2.100.0.ebuild
index f6b144e460dd..a0e700f1cdbb 100644
--- a/dev-perl/Unicode-String/Unicode-String-2.100.0.ebuild
+++ b/dev-perl/Unicode-String/Unicode-String-2.100.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="String manipulation for Unicode strings"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux"
IUSE=""
RDEPEND=">=virtual/perl-MIME-Base64-2.11"
diff --git a/dev-perl/Unicode-UTF8/Unicode-UTF8-0.620.0.ebuild b/dev-perl/Unicode-UTF8/Unicode-UTF8-0.620.0.ebuild
index 51bf01819506..fff638d52f74 100644
--- a/dev-perl/Unicode-UTF8/Unicode-UTF8-0.620.0.ebuild
+++ b/dev-perl/Unicode-UTF8/Unicode-UTF8-0.620.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Encoding and decoding of UTF-8 encoding form"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Variable-Magic/Variable-Magic-0.620.0.ebuild b/dev-perl/Variable-Magic/Variable-Magic-0.620.0.ebuild
index 4d9b879f9fcd..d5e3de19bb34 100644
--- a/dev-perl/Variable-Magic/Variable-Magic-0.620.0.ebuild
+++ b/dev-perl/Variable-Magic/Variable-Magic-0.620.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Associate user-defined magic to variables from Perl"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/WWW-RobotRules/WWW-RobotRules-6.20.0-r1.ebuild b/dev-perl/WWW-RobotRules/WWW-RobotRules-6.20.0-r1.ebuild
index 08f0b53d969c..98ffdaaa5f27 100644
--- a/dev-perl/WWW-RobotRules/WWW-RobotRules-6.20.0-r1.ebuild
+++ b/dev-perl/WWW-RobotRules/WWW-RobotRules-6.20.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Parse /robots.txt file"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
!<dev-perl/libwww-perl-6
diff --git a/dev-perl/X11-Protocol/X11-Protocol-0.560.0-r1.ebuild b/dev-perl/X11-Protocol/X11-Protocol-0.560.0-r1.ebuild
index a4592c81a701..ba6dc111f5f9 100644
--- a/dev-perl/X11-Protocol/X11-Protocol-0.560.0-r1.ebuild
+++ b/dev-perl/X11-Protocol/X11-Protocol-0.560.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ DESCRIPTION="Client-side interface to the X11 Protocol"
LICENSE="${LICENSE} MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE=""
RDEPEND="x11-libs/libXrender
diff --git a/dev-perl/XML-Filter-BufferText/XML-Filter-BufferText-1.10.0-r1.ebuild b/dev-perl/XML-Filter-BufferText/XML-Filter-BufferText-1.10.0-r1.ebuild
index cbb6219fa846..25ce97caa232 100644
--- a/dev-perl/XML-Filter-BufferText/XML-Filter-BufferText-1.10.0-r1.ebuild
+++ b/dev-perl/XML-Filter-BufferText/XML-Filter-BufferText-1.10.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Filter to put all characters() in one event"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=dev-perl/XML-SAX-0.12"
diff --git a/dev-perl/XML-Handler-YAWriter/XML-Handler-YAWriter-0.230.0-r2.ebuild b/dev-perl/XML-Handler-YAWriter/XML-Handler-YAWriter-0.230.0-r2.ebuild
index 6f14a06ac31a..7fee2ad3fb38 100644
--- a/dev-perl/XML-Handler-YAWriter/XML-Handler-YAWriter-0.230.0-r2.ebuild
+++ b/dev-perl/XML-Handler-YAWriter/XML-Handler-YAWriter-0.230.0-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A Perl module providing a simple API to parsed XML instances"
LICENSE="GPL-2" # GPL
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=dev-perl/libxml-perl-0.07-r1"
diff --git a/dev-perl/XML-LibXML/XML-LibXML-2.13.200.ebuild b/dev-perl/XML-LibXML/XML-LibXML-2.13.200.ebuild
index 0a2f904266e8..f147c47d362c 100644
--- a/dev-perl/XML-LibXML/XML-LibXML-2.13.200.ebuild
+++ b/dev-perl/XML-LibXML/XML-LibXML-2.13.200.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Perl binding for libxml2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="test minimal"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/XML-LibXML/XML-LibXML-2.20.100.ebuild b/dev-perl/XML-LibXML/XML-LibXML-2.20.100.ebuild
index 34f5d221eb2e..6d299633b342 100644
--- a/dev-perl/XML-LibXML/XML-LibXML-2.20.100.ebuild
+++ b/dev-perl/XML-LibXML/XML-LibXML-2.20.100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Perl binding for libxml2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
IUSE="test minimal"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/XML-NamespaceSupport/XML-NamespaceSupport-1.120.0.ebuild b/dev-perl/XML-NamespaceSupport/XML-NamespaceSupport-1.120.0.ebuild
index 2ad6ec4e1abb..c0e9f50e690f 100644
--- a/dev-perl/XML-NamespaceSupport/XML-NamespaceSupport-1.120.0.ebuild
+++ b/dev-perl/XML-NamespaceSupport/XML-NamespaceSupport-1.120.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="A Perl module that offers a simple to process namespaced XML names"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/XML-Parser/XML-Parser-2.440.0.ebuild b/dev-perl/XML-Parser/XML-Parser-2.440.0.ebuild
index c578350d3157..744eee96e008 100644
--- a/dev-perl/XML-Parser/XML-Parser-2.440.0.ebuild
+++ b/dev-perl/XML-Parser/XML-Parser-2.440.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module multilib
DESCRIPTION="A Perl extension interface to James Clark's XML parser, expat"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=dev-libs/expat-1.95.1-r1"
diff --git a/dev-perl/XML-SAX-Base/XML-SAX-Base-1.90.0.ebuild b/dev-perl/XML-SAX-Base/XML-SAX-Base-1.90.0.ebuild
index d218ba8d7109..712950cd472e 100644
--- a/dev-perl/XML-SAX-Base/XML-SAX-Base-1.90.0.ebuild
+++ b/dev-perl/XML-SAX-Base/XML-SAX-Base-1.90.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Base class SAX Drivers and Filters"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/XML-SAX-Expat/XML-SAX-Expat-0.510.0.ebuild b/dev-perl/XML-SAX-Expat/XML-SAX-Expat-0.510.0.ebuild
index a83e529addc0..86212b80ea2c 100644
--- a/dev-perl/XML-SAX-Expat/XML-SAX-Expat-0.510.0.ebuild
+++ b/dev-perl/XML-SAX-Expat/XML-SAX-Expat-0.510.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="SAX2 Driver for Expat"
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/XML-SAX-Writer/XML-SAX-Writer-0.570.0.ebuild b/dev-perl/XML-SAX-Writer/XML-SAX-Writer-0.570.0.ebuild
index 841b33479a5b..036fa50beadb 100644
--- a/dev-perl/XML-SAX-Writer/XML-SAX-Writer-0.570.0.ebuild
+++ b/dev-perl/XML-SAX-Writer/XML-SAX-Writer-0.570.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="SAX2 XML Writer"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/XML-SAX/XML-SAX-0.990.0-r1.ebuild b/dev-perl/XML-SAX/XML-SAX-0.990.0-r1.ebuild
index 4c4a0b1517b6..62dc8bcbe2c0 100644
--- a/dev-perl/XML-SAX/XML-SAX-0.990.0-r1.ebuild
+++ b/dev-perl/XML-SAX/XML-SAX-0.990.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module eutils
DESCRIPTION="Perl module for using and building Perl SAX2 XML parsers, filters, and drivers"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/XML-SAX/XML-SAX-1.0.0.ebuild b/dev-perl/XML-SAX/XML-SAX-1.0.0.ebuild
index 3881e2b83762..0c248d998f98 100644
--- a/dev-perl/XML-SAX/XML-SAX-1.0.0.ebuild
+++ b/dev-perl/XML-SAX/XML-SAX-1.0.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module eutils
DESCRIPTION="Perl module for using and building Perl SAX2 XML parsers, filters, and drivers"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/XML-Simple/XML-Simple-2.250.0.ebuild b/dev-perl/XML-Simple/XML-Simple-2.250.0.ebuild
index 62190bd7991a..8bc1c7abf5de 100644
--- a/dev-perl/XML-Simple/XML-Simple-2.250.0.ebuild
+++ b/dev-perl/XML-Simple/XML-Simple-2.250.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="An API for simple XML files"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/XML-Twig/XML-Twig-3.520.0.ebuild b/dev-perl/XML-Twig/XML-Twig-3.520.0.ebuild
index 809f63940957..90b6b08999c2 100644
--- a/dev-perl/XML-Twig/XML-Twig-3.520.0.ebuild
+++ b/dev-perl/XML-Twig/XML-Twig-3.520.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Process huge XML documents in tree mode"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="nls test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/XML-XPath/XML-XPath-1.420.0.ebuild b/dev-perl/XML-XPath/XML-XPath-1.420.0.ebuild
index b86f913ae194..bcea82c83d59 100644
--- a/dev-perl/XML-XPath/XML-XPath-1.420.0.ebuild
+++ b/dev-perl/XML-XPath/XML-XPath-1.420.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="A XPath Perl Module"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/YAML-LibYAML/YAML-LibYAML-0.690.0.ebuild b/dev-perl/YAML-LibYAML/YAML-LibYAML-0.690.0.ebuild
index 5f8d0df7c3a3..7f977ad4b819 100644
--- a/dev-perl/YAML-LibYAML/YAML-LibYAML-0.690.0.ebuild
+++ b/dev-perl/YAML-LibYAML/YAML-LibYAML-0.690.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Perl YAML Serialization using XS and libyaml"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=""
diff --git a/dev-perl/YAML-Tiny/YAML-Tiny-1.730.0.ebuild b/dev-perl/YAML-Tiny/YAML-Tiny-1.730.0.ebuild
index 19550fd7ae41..3a8e1ab55df2 100644
--- a/dev-perl/YAML-Tiny/YAML-Tiny-1.730.0.ebuild
+++ b/dev-perl/YAML-Tiny/YAML-Tiny-1.730.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Read/Write YAML files with as little code as possible"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test minimal"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/common-sense/common-sense-3.740.0-r1.ebuild b/dev-perl/common-sense/common-sense-3.740.0-r1.ebuild
index f5dc3938f15e..48364281e566 100644
--- a/dev-perl/common-sense/common-sense-3.740.0-r1.ebuild
+++ b/dev-perl/common-sense/common-sense-3.740.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Save a tree AND a kitten, use common::sense!"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/libintl-perl/libintl-perl-1.280.0.ebuild b/dev-perl/libintl-perl/libintl-perl-1.280.0.ebuild
index a7fdb9ccf73b..7971c852c50e 100644
--- a/dev-perl/libintl-perl/libintl-perl-1.280.0.ebuild
+++ b/dev-perl/libintl-perl/libintl-perl-1.280.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://guido-flohr.net/projects/libintl-perl https://metacpan.org/rele
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="virtual/libintl"
diff --git a/dev-perl/libintl-perl/libintl-perl-1.310.0.ebuild b/dev-perl/libintl-perl/libintl-perl-1.310.0.ebuild
index 0532a9678b5a..92f2cbddf09c 100644
--- a/dev-perl/libintl-perl/libintl-perl-1.310.0.ebuild
+++ b/dev-perl/libintl-perl/libintl-perl-1.310.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://guido-flohr.net/projects/libintl-perl https://metacpan.org/rele
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="minimal"
RDEPEND="
diff --git a/dev-perl/libwww-perl/libwww-perl-6.270.0.ebuild b/dev-perl/libwww-perl/libwww-perl-6.270.0.ebuild
index e25d3f0d29f2..32823ef6458f 100644
--- a/dev-perl/libwww-perl/libwww-perl-6.270.0.ebuild
+++ b/dev-perl/libwww-perl/libwww-perl-6.270.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="A collection of Perl Modules for the WWW"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
IUSE="ssl test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/libxml-perl/libxml-perl-0.80.0-r2.ebuild b/dev-perl/libxml-perl/libxml-perl-0.80.0-r2.ebuild
index aa35de6e493c..bc7499e98fcd 100644
--- a/dev-perl/libxml-perl/libxml-perl-0.80.0-r2.ebuild
+++ b/dev-perl/libxml-perl/libxml-perl-0.80.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Collection of Perl modules for working with XML"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=dev-perl/XML-Parser-2.29"
diff --git a/dev-perl/perl-ldap/perl-ldap-0.650.0.ebuild b/dev-perl/perl-ldap/perl-ldap-0.650.0.ebuild
index f75e5c91c261..99093904cf1b 100644
--- a/dev-perl/perl-ldap/perl-ldap-0.650.0.ebuild
+++ b/dev-perl/perl-ldap/perl-ldap-0.650.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Perl modules which provide an object-oriented interface to LDAP servers"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="sasl xml ssl"
RDEPEND="
diff --git a/dev-perl/prefork/prefork-1.40.0-r2.ebuild b/dev-perl/prefork/prefork-1.40.0-r2.ebuild
index 64e9f9301d32..a2c7e4449e27 100644
--- a/dev-perl/prefork/prefork-1.40.0-r2.ebuild
+++ b/dev-perl/prefork/prefork-1.40.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Optimized module loading for forking or non-forking processes"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/perl-File-Spec-0.80
diff --git a/dev-python/Babel/Babel-2.8.1.ebuild b/dev-python/Babel/Babel-2.8.1.ebuild
index 5a7f182b03d8..59a1c0b8d639 100644
--- a/dev-python/Babel/Babel-2.8.1.ebuild
+++ b/dev-python/Babel/Babel-2.8.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/Babel/Babel-2.9.0.ebuild b/dev-python/Babel/Babel-2.9.0.ebuild
index ba3e4b0e24f6..55fd72ae8906 100644
--- a/dev-python/Babel/Babel-2.9.0.ebuild
+++ b/dev-python/Babel/Babel-2.9.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
$(python_gen_cond_dep '
diff --git a/dev-python/PyContracts/PyContracts-1.8.14-r1.ebuild b/dev-python/PyContracts/PyContracts-1.8.14-r1.ebuild
index 7e25442ba3fe..4158f29912c4 100644
--- a/dev-python/PyContracts/PyContracts-1.8.14-r1.ebuild
+++ b/dev-python/PyContracts/PyContracts-1.8.14-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
dev-python/decorator[${PYTHON_USEDEP}]
diff --git a/dev-python/PySocks/PySocks-1.7.1-r1.ebuild b/dev-python/PySocks/PySocks-1.7.1-r1.ebuild
index 915b7ef408d4..c60ca7082284 100644
--- a/dev-python/PySocks/PySocks-1.7.1-r1.ebuild
+++ b/dev-python/PySocks/PySocks-1.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
#BDEPEND="
# test? (
diff --git a/dev-python/alabaster/alabaster-0.7.12.ebuild b/dev-python/alabaster/alabaster-0.7.12.ebuild
index 9c2b768f0e04..5444d8f8791a 100644
--- a/dev-python/alabaster/alabaster-0.7.12.ebuild
+++ b/dev-python/alabaster/alabaster-0.7.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,5 +13,5 @@ HOMEPAGE="https://github.com/bitprophet/alabaster"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
SLOT="0"
diff --git a/dev-python/apipkg/apipkg-1.5-r1.ebuild b/dev-python/apipkg/apipkg-1.5-r1.ebuild
index 2fc79a826f27..a32262c3cb97 100644
--- a/dev-python/apipkg/apipkg-1.5-r1.ebuild
+++ b/dev-python/apipkg/apipkg-1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/setuptools_scm[${PYTHON_USEDEP}]"
diff --git a/dev-python/appdirs/appdirs-1.4.4-r1.ebuild b/dev-python/appdirs/appdirs-1.4.4-r1.ebuild
index 9522bb0ce96e..2c070beea70b 100644
--- a/dev-python/appdirs/appdirs-1.4.4-r1.ebuild
+++ b/dev-python/appdirs/appdirs-1.4.4-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ActiveState/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
PATCHES=( "${FILESDIR}"/${PN}-1.4.4-distutils.patch )
diff --git a/dev-python/asn1crypto/asn1crypto-1.4.0.ebuild b/dev-python/asn1crypto/asn1crypto-1.4.0.ebuild
index 77fdd52519b4..80f7356a0891 100644
--- a/dev-python/asn1crypto/asn1crypto-1.4.0.ebuild
+++ b/dev-python/asn1crypto/asn1crypto-1.4.0.ebuild
@@ -15,6 +15,6 @@ SRC_URI="https://github.com/wbond/asn1crypto/archive/${PV}.tar.gz -> ${P}.gh.tar
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
distutils_enable_tests unittest
diff --git a/dev-python/attrs/attrs-20.3.0.ebuild b/dev-python/attrs/attrs-20.3.0.ebuild
index e5b6e39a31b2..af3ec98234cb 100644
--- a/dev-python/attrs/attrs-20.3.0.ebuild
+++ b/dev-python/attrs/attrs-20.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/dev-python/automat/automat-20.2.0.ebuild b/dev-python/automat/automat-20.2.0.ebuild
index 8fde852ede28..feef8214377f 100644
--- a/dev-python/automat/automat-20.2.0.ebuild
+++ b/dev-python/automat/automat-20.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="examples"
RDEPEND="
diff --git a/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild b/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild
index 84349a1c3ee7..031ef01a7191 100644
--- a/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild
+++ b/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
RDEPEND="
$(python_gen_cond_dep '
diff --git a/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild b/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild
index b1cc623a5497..4869d4555631 100644
--- a/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild
+++ b/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
RDEPEND="
$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
diff --git a/dev-python/bcrypt/bcrypt-3.2.0.ebuild b/dev-python/bcrypt/bcrypt-3.2.0.ebuild
index 0e9bd9404280..e5b8f95aa9f1 100644
--- a/dev-python/bcrypt/bcrypt-3.2.0.ebuild
+++ b/dev-python/bcrypt/bcrypt-3.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
RDEPEND="
$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
diff --git a/dev-python/bleach/bleach-3.3.0.ebuild b/dev-python/bleach/bleach-3.3.0.ebuild
index 9deda895f393..ab3eb65399eb 100644
--- a/dev-python/bleach/bleach-3.3.0.ebuild
+++ b/dev-python/bleach/bleach-3.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
RDEPEND="
dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/breathe/breathe-4.27.0.ebuild b/dev-python/breathe/breathe-4.27.0.ebuild
index 2b72e5f1515e..74dfdea18311 100644
--- a/dev-python/breathe/breathe-4.27.0.ebuild
+++ b/dev-python/breathe/breathe-4.27.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/michaeljones/breathe/archive/v${PV}.tar.gz -> ${P}.t
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
app-doc/doxygen
diff --git a/dev-python/certifi/certifi-10001-r1.ebuild b/dev-python/certifi/certifi-10001-r1.ebuild
index 6bbe3d45fc75..1d1d279eaa06 100644
--- a/dev-python/certifi/certifi-10001-r1.ebuild
+++ b/dev-python/certifi/certifi-10001-r1.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="CC0-1.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="app-misc/ca-certificates"
diff --git a/dev-python/cffi/cffi-1.14.4.ebuild b/dev-python/cffi/cffi-1.14.4.ebuild
index aa88f853f6c1..23b4c805013b 100644
--- a/dev-python/cffi/cffi-1.14.4.ebuild
+++ b/dev-python/cffi/cffi-1.14.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/characteristic/characteristic-14.3.0-r3.ebuild b/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
index 5514656bc340..a1eb0a58239b 100644
--- a/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
+++ b/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
distutils_enable_tests pytest
distutils_enable_sphinx docs
diff --git a/dev-python/chardet/chardet-3.0.4-r1.ebuild b/dev-python/chardet/chardet-3.0.4-r1.ebuild
index f118f7e1ace2..642dd0038b64 100644
--- a/dev-python/chardet/chardet-3.0.4-r1.ebuild
+++ b/dev-python/chardet/chardet-3.0.4-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/chardet/chardet/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
DEPEND="
test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )
diff --git a/dev-python/chardet/chardet-4.0.0.ebuild b/dev-python/chardet/chardet-4.0.0.ebuild
index 4efb9f221668..6c3731959e0f 100644
--- a/dev-python/chardet/chardet-4.0.0.ebuild
+++ b/dev-python/chardet/chardet-4.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/chardet/chardet/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
BDEPEND="
test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )
diff --git a/dev-python/cliff/cliff-3.7.0.ebuild b/dev-python/cliff/cliff-3.7.0.ebuild
index 5254b30b3a81..0fbb09d634f2 100644
--- a/dev-python/cliff/cliff-3.7.0.ebuild
+++ b/dev-python/cliff/cliff-3.7.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
diff --git a/dev-python/constantly/constantly-15.1.0-r1.ebuild b/dev-python/constantly/constantly-15.1.0-r1.ebuild
index 7b6d30d709de..1cd19a721f67 100644
--- a/dev-python/constantly/constantly-15.1.0-r1.ebuild
+++ b/dev-python/constantly/constantly-15.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/twisted/constantly/archive/${PV}.tar.gz -> ${P}.gh.t
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/contextlib2/contextlib2-0.6.0_p1-r1.ebuild b/dev-python/contextlib2/contextlib2-0.6.0_p1-r1.ebuild
index dbfe59682c98..948d0835b5f6 100644
--- a/dev-python/contextlib2/contextlib2-0.6.0_p1-r1.ebuild
+++ b/dev-python/contextlib2/contextlib2-0.6.0_p1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
LICENSE="PSF-2.4"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
IUSE="test"
DEPEND="
diff --git a/dev-python/cookies/cookies-2.2.1-r1.ebuild b/dev-python/cookies/cookies-2.2.1-r1.ebuild
index fbbc6fcdcd2b..bedff780fcab 100644
--- a/dev-python/cookies/cookies-2.2.1-r1.ebuild
+++ b/dev-python/cookies/cookies-2.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
PATCHES=(
# https://gitlab.com/sashahart/cookies/merge_requests/2
diff --git a/dev-python/coverage/coverage-5.4.ebuild b/dev-python/coverage/coverage-5.4.ebuild
index 89003283d675..a5ee7547ba8d 100644
--- a/dev-python/coverage/coverage-5.4.ebuild
+++ b/dev-python/coverage/coverage-5.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
#IUSE="test"
# The tests are impossible to appease. Please run them externally
# via tox. Or fix the ebuild if you have hours of time to spend
diff --git a/dev-python/cryptography/cryptography-3.2.1.ebuild b/dev-python/cryptography/cryptography-3.2.1.ebuild
index a9ad4eb512bc..47aec5679472 100644
--- a/dev-python/cryptography/cryptography-3.2.1.ebuild
+++ b/dev-python/cryptography/cryptography-3.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
LICENSE="|| ( Apache-2.0 BSD )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="libressl idna"
RDEPEND="
diff --git a/dev-python/cssselect/cssselect-1.1.0-r1.ebuild b/dev-python/cssselect/cssselect-1.1.0-r1.ebuild
index af1bac98e8f8..608b70918f69 100644
--- a/dev-python/cssselect/cssselect-1.1.0-r1.ebuild
+++ b/dev-python/cssselect/cssselect-1.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/scrapy/cssselect/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/decorator/decorator-4.4.2-r1.ebuild b/dev-python/decorator/decorator-4.4.2-r1.ebuild
index 51ce4f3ee858..3a0f60f27c83 100644
--- a/dev-python/decorator/decorator-4.4.2-r1.ebuild
+++ b/dev-python/decorator/decorator-4.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
DOCS=( CHANGES.md )
diff --git a/dev-python/defusedxml/defusedxml-0.7.1.ebuild b/dev-python/defusedxml/defusedxml-0.7.1.ebuild
index 91437c8e063a..a882da0fde8a 100644
--- a/dev-python/defusedxml/defusedxml-0.7.1.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.7.1.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${P/_/.}
LICENSE="PSF-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="examples"
distutils_enable_tests setup.py
diff --git a/dev-python/docutils-glep/docutils-glep-1.2.ebuild b/dev-python/docutils-glep/docutils-glep-1.2.ebuild
index ac8385266f52..68829e5c2b2c 100644
--- a/dev-python/docutils-glep/docutils-glep-1.2.ebuild
+++ b/dev-python/docutils-glep/docutils-glep-1.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND=">=dev-python/docutils-0.10[${PYTHON_USEDEP}]"
diff --git a/dev-python/docutils/docutils-0.16-r1.ebuild b/dev-python/docutils/docutils-0.16-r1.ebuild
index 0a7ed2cc55ea..4d307148b564 100644
--- a/dev-python/docutils/docutils-0.16-r1.ebuild
+++ b/dev-python/docutils/docutils-0.16-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2 GPL-3 public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/execnet/execnet-1.8.0.ebuild b/dev-python/execnet/execnet-1.8.0.ebuild
index 5446c28c7144..b86f89ac8282 100644
--- a/dev-python/execnet/execnet-1.8.0.ebuild
+++ b/dev-python/execnet/execnet-1.8.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
RDEPEND=">=dev-python/apipkg-1.4[${PYTHON_USEDEP}]"
BDEPEND="
diff --git a/dev-python/extras/extras-1.0.0-r1.ebuild b/dev-python/extras/extras-1.0.0-r1.ebuild
index 051319148062..2351a030899e 100644
--- a/dev-python/extras/extras-1.0.0-r1.ebuild
+++ b/dev-python/extras/extras-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/feedparser/feedparser-5.2.1-r1.ebuild b/dev-python/feedparser/feedparser-5.2.1-r1.ebuild
index 41c4d4e49de4..c32c70f42190 100644
--- a/dev-python/feedparser/feedparser-5.2.1-r1.ebuild
+++ b/dev-python/feedparser/feedparser-5.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
# sgmllib is licensed under PSF-2.
LICENSE="BSD-2 PSF-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE=""
# Tests have issues with chardet installed, and are just kind of buggy.
diff --git a/dev-python/feedparser/feedparser-6.0.2.ebuild b/dev-python/feedparser/feedparser-6.0.2.ebuild
index 32e1126a6b75..3eede0f31b71 100644
--- a/dev-python/feedparser/feedparser-6.0.2.ebuild
+++ b/dev-python/feedparser/feedparser-6.0.2.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
RDEPEND="dev-python/sgmllib3k[${PYTHON_USEDEP}]"
diff --git a/dev-python/fixtures/fixtures-3.0.0-r1.ebuild b/dev-python/fixtures/fixtures-3.0.0-r1.ebuild
index 5c8dace60356..71ec760338e1 100644
--- a/dev-python/fixtures/fixtures-3.0.0-r1.ebuild
+++ b/dev-python/fixtures/fixtures-3.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="|| ( Apache-2.0 BSD )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/flaky/flaky-3.7.0-r1.ebuild b/dev-python/flaky/flaky-3.7.0-r1.ebuild
index 0855abc38d36..d69580ae4761 100644
--- a/dev-python/flaky/flaky-3.7.0-r1.ebuild
+++ b/dev-python/flaky/flaky-3.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/freezegun/freezegun-1.1.0.ebuild b/dev-python/freezegun/freezegun-1.1.0.ebuild
index 5cd43783fec4..dae25d175b6a 100644
--- a/dev-python/freezegun/freezegun-1.1.0.ebuild
+++ b/dev-python/freezegun/freezegun-1.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
RDEPEND="
>dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
diff --git a/dev-python/fs/fs-2.4.12.ebuild b/dev-python/fs/fs-2.4.12.ebuild
index 6ad7b1373417..9f28a0de2033 100644
--- a/dev-python/fs/fs-2.4.12.ebuild
+++ b/dev-python/fs/fs-2.4.12.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
diff --git a/dev-python/future/future-0.18.2-r1.ebuild b/dev-python/future/future-0.18.2-r1.ebuild
index eb74fd897738..a959673b21e1 100644
--- a/dev-python/future/future-0.18.2-r1.ebuild
+++ b/dev-python/future/future-0.18.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc"
# TODO: restore numpy when python2.7 is gone
diff --git a/dev-python/genty/genty-1.3.2-r1.ebuild b/dev-python/genty/genty-1.3.2-r1.ebuild
index 6dce348abcea..27672aeb111a 100644
--- a/dev-python/genty/genty-1.3.2-r1.ebuild
+++ b/dev-python/genty/genty-1.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
RDEPEND="
dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/gevent/gevent-21.1.2.ebuild b/dev-python/gevent/gevent-21.1.2.ebuild
index 04a526a33eaa..147f0a72c836 100644
--- a/dev-python/gevent/gevent-21.1.2.ebuild
+++ b/dev-python/gevent/gevent-21.1.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="doc examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/gmpy/gmpy-2.0.8-r2.ebuild b/dev-python/gmpy/gmpy-2.0.8-r2.ebuild
index 43ac48fffed1..dc45e33a9a13 100644
--- a/dev-python/gmpy/gmpy-2.0.8-r2.ebuild
+++ b/dev-python/gmpy/gmpy-2.0.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${MY_P}
LICENSE="LGPL-3+"
SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="mpir"
RDEPEND="
diff --git a/dev-python/greenlet/greenlet-1.0.0.ebuild b/dev-python/greenlet/greenlet-1.0.0.ebuild
index 49849f9ef4fa..0148cca6d50f 100644
--- a/dev-python/greenlet/greenlet-1.0.0.ebuild
+++ b/dev-python/greenlet/greenlet-1.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 -hppa -ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 -hppa -ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
distutils_enable_sphinx docs
diff --git a/dev-python/hpack/hpack-3.0.0.ebuild b/dev-python/hpack/hpack-3.0.0.ebuild
index 91821dca464d..b52fcbda7054 100644
--- a/dev-python/hpack/hpack-3.0.0.ebuild
+++ b/dev-python/hpack/hpack-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/hpack/hpack-4.0.0.ebuild b/dev-python/hpack/hpack-4.0.0.ebuild
index c193796c48a5..c35586ef47f4 100644
--- a/dev-python/hpack/hpack-4.0.0.ebuild
+++ b/dev-python/hpack/hpack-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
# dev-python/pytest-relaxed causes tests to fail
BDEPEND="
diff --git a/dev-python/html5lib/html5lib-1.1.ebuild b/dev-python/html5lib/html5lib-1.1.ebuild
index b8943055c1d0..3dc621cb73c5 100644
--- a/dev-python/html5lib/html5lib-1.1.ebuild
+++ b/dev-python/html5lib/html5lib-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
IUSE="test"
RESTRICT+=" !test? ( test )"
diff --git a/dev-python/http-parser/http-parser-0.9.0.ebuild b/dev-python/http-parser/http-parser-0.9.0.ebuild
index 2f96d3d1b687..578ae2661d5b 100644
--- a/dev-python/http-parser/http-parser-0.9.0.ebuild
+++ b/dev-python/http-parser/http-parser-0.9.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86"
IUSE="examples"
BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/hyper-h2/hyper-h2-3.2.0.ebuild b/dev-python/hyper-h2/hyper-h2-3.2.0.ebuild
index f23d440839af..50176089cdd7 100644
--- a/dev-python/hyper-h2/hyper-h2-3.2.0.ebuild
+++ b/dev-python/hyper-h2/hyper-h2-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/hyper-h2/hyper-h2-4.0.0.ebuild b/dev-python/hyper-h2/hyper-h2-4.0.0.ebuild
index 7428ae83de83..9698bdee39b8 100644
--- a/dev-python/hyper-h2/hyper-h2-4.0.0.ebuild
+++ b/dev-python/hyper-h2/hyper-h2-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND="
>=dev-python/hyperframe-6.0[${PYTHON_USEDEP}]
diff --git a/dev-python/hyperframe/hyperframe-5.2.0.ebuild b/dev-python/hyperframe/hyperframe-5.2.0.ebuild
index 27973ec7a22d..58177a229f38 100644
--- a/dev-python/hyperframe/hyperframe-5.2.0.ebuild
+++ b/dev-python/hyperframe/hyperframe-5.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
distutils_enable_tests pytest
diff --git a/dev-python/hyperframe/hyperframe-6.0.0.ebuild b/dev-python/hyperframe/hyperframe-6.0.0.ebuild
index 27973ec7a22d..58177a229f38 100644
--- a/dev-python/hyperframe/hyperframe-6.0.0.ebuild
+++ b/dev-python/hyperframe/hyperframe-6.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
distutils_enable_tests pytest
diff --git a/dev-python/hyperlink/hyperlink-21.0.0.ebuild b/dev-python/hyperlink/hyperlink-21.0.0.ebuild
index 85b1db2b1216..5bb178771045 100644
--- a/dev-python/hyperlink/hyperlink-21.0.0.ebuild
+++ b/dev-python/hyperlink/hyperlink-21.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
RDEPEND="
dev-python/idna[${PYTHON_USEDEP}]"
diff --git a/dev-python/idna/idna-2.10-r1.ebuild b/dev-python/idna/idna-2.10-r1.ebuild
index dd592b620866..ffcaa9e9171d 100644
--- a/dev-python/idna/idna-2.10-r1.ebuild
+++ b/dev-python/idna/idna-2.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
distutils_enable_tests setup.py
diff --git a/dev-python/imagesize/imagesize-1.2.0.ebuild b/dev-python/imagesize/imagesize-1.2.0.ebuild
index 748675bd0c16..7e782a25b696 100644
--- a/dev-python/imagesize/imagesize-1.2.0.ebuild
+++ b/dev-python/imagesize/imagesize-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
distutils_enable_tests pytest
diff --git a/dev-python/importlib_resources/importlib_resources-5.1.2.ebuild b/dev-python/importlib_resources/importlib_resources-5.1.2.ebuild
index 275931cbfcaf..52a925d170a6 100644
--- a/dev-python/importlib_resources/importlib_resources-5.1.2.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-5.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
RDEPEND="
$(python_gen_cond_dep '
diff --git a/dev-python/incremental/incremental-21.3.0.ebuild b/dev-python/incremental/incremental-21.3.0.ebuild
index 9bd54b7fb328..fb8dc0a493c8 100644
--- a/dev-python/incremental/incremental-21.3.0.ebuild
+++ b/dev-python/incremental/incremental-21.3.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE=""
RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/inflect/inflect-5.3.0.ebuild b/dev-python/inflect/inflect-5.3.0.ebuild
index 51494a99a3c2..30e5e91f1fcc 100644
--- a/dev-python/inflect/inflect-5.3.0.ebuild
+++ b/dev-python/inflect/inflect-5.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
BDEPEND="
>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/iso8601/iso8601-0.1.14.ebuild b/dev-python/iso8601/iso8601-0.1.14.ebuild
index 1cfde114660f..7d75b51bfd54 100644
--- a/dev-python/iso8601/iso8601-0.1.14.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.14.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
distutils_enable_tests pytest
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-5.0.0-r1.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-5.0.0-r1.ebuild
index 672f54bd89b9..7f15d0ca5d82 100644
--- a/dev-python/jaraco-itertools/jaraco-itertools-5.0.0-r1.ebuild
+++ b/dev-python/jaraco-itertools/jaraco-itertools-5.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-8.2.0.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-8.2.0.ebuild
index e8d3c3e05c7b..2a67ba2ceeae 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-8.2.0.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-8.2.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND="
$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
diff --git a/dev-python/jinja/jinja-2.11.3.ebuild b/dev-python/jinja/jinja-2.11.3.ebuild
index 3783acbf475f..86b6853a94c4 100644
--- a/dev-python/jinja/jinja-2.11.3.ebuild
+++ b/dev-python/jinja/jinja-2.11.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
IUSE="examples"
RDEPEND="
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild
index 79d3dfb064ae..30848f95a677 100644
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild
+++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
BDEPEND="
dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/linecache2/linecache2-1.0.0-r1.ebuild b/dev-python/linecache2/linecache2-1.0.0-r1.ebuild
index d279f0c13d5c..790f2a6ec713 100644
--- a/dev-python/linecache2/linecache2-1.0.0-r1.ebuild
+++ b/dev-python/linecache2/linecache2-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="PSF-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/lxml/lxml-4.6.2-r1.ebuild b/dev-python/lxml/lxml-4.6.2-r1.ebuild
index 136e3412e2d8..422afe2febfd 100644
--- a/dev-python/lxml/lxml-4.6.2-r1.ebuild
+++ b/dev-python/lxml/lxml-4.6.2-r1.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/lxml-${P}
LICENSE="BSD ElementTree GPL-2 PSF-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc examples +threads test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/lxml/lxml-4.6.3.ebuild b/dev-python/lxml/lxml-4.6.3.ebuild
index 88c015cb1c63..f600d3a5f551 100644
--- a/dev-python/lxml/lxml-4.6.3.ebuild
+++ b/dev-python/lxml/lxml-4.6.3.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/lxml-${P}
LICENSE="BSD ElementTree GPL-2 PSF-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc examples +threads test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/m2crypto/m2crypto-0.35.2-r1.ebuild b/dev-python/m2crypto/m2crypto-0.35.2-r1.ebuild
index 06d5f2cdc7bd..a96e594465a2 100644
--- a/dev-python/m2crypto/m2crypto-0.35.2-r1.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.35.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="libressl"
RDEPEND="
diff --git a/dev-python/m2r/m2r-0.2.1.ebuild b/dev-python/m2r/m2r-0.2.1.ebuild
index 405e56548d8b..cc8e39ecf1ce 100644
--- a/dev-python/m2r/m2r-0.2.1.ebuild
+++ b/dev-python/m2r/m2r-0.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/miyakogi/m2r/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
IUSE="test"
RDEPEND="
diff --git a/dev-python/mako/mako-1.1.4.ebuild b/dev-python/mako/mako-1.1.4.ebuild
index 0635d0c9de7b..d594599e9532 100644
--- a/dev-python/mako/mako-1.1.4.ebuild
+++ b/dev-python/mako/mako-1.1.4.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="doc"
RDEPEND=">=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/markupsafe/markupsafe-1.1.1-r1.ebuild b/dev-python/markupsafe/markupsafe-1.1.1-r1.ebuild
index eb1391a51acb..7976e15d628b 100644
--- a/dev-python/markupsafe/markupsafe-1.1.1-r1.ebuild
+++ b/dev-python/markupsafe/markupsafe-1.1.1-r1.ebuild
@@ -17,6 +17,6 @@ S=${WORKDIR}/${MY_P}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
distutils_enable_tests pytest
diff --git a/dev-python/mccabe/mccabe-0.6.1-r1.ebuild b/dev-python/mccabe/mccabe-0.6.1-r1.ebuild
index 9bc59da97a58..1dbf2901b6e6 100644
--- a/dev-python/mccabe/mccabe-0.6.1-r1.ebuild
+++ b/dev-python/mccabe/mccabe-0.6.1-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="flake8 plugin: McCabe complexity checker"
HOMEPAGE="https://github.com/PyCQA/mccabe"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/mccabe/mccabe-0.6.1-r2.ebuild b/dev-python/mccabe/mccabe-0.6.1-r2.ebuild
index be5d36b7517e..17f04f0db442 100644
--- a/dev-python/mccabe/mccabe-0.6.1-r2.ebuild
+++ b/dev-python/mccabe/mccabe-0.6.1-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="flake8 plugin: McCabe complexity checker"
HOMEPAGE="https://github.com/PyCQA/mccabe"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/mistune/mistune-0.8.4-r1.ebuild b/dev-python/mistune/mistune-0.8.4-r1.ebuild
index c5c4373cb865..8f74ce7bbbf1 100644
--- a/dev-python/mistune/mistune-0.8.4-r1.ebuild
+++ b/dev-python/mistune/mistune-0.8.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
distutils_enable_tests nose
diff --git a/dev-python/mock/mock-4.0.3.ebuild b/dev-python/mock/mock-4.0.3.ebuild
index 976ae95cf9b3..d8149f697701 100644
--- a/dev-python/mock/mock-4.0.3.ebuild
+++ b/dev-python/mock/mock-4.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/testing-cabal/mock/archive/${PV}.tar.gz -> ${P}.gh.t
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
RDEPEND="
$(python_gen_cond_dep '
diff --git a/dev-python/more-itertools/more-itertools-8.7.0.ebuild b/dev-python/more-itertools/more-itertools-8.7.0.ebuild
index c905f82e778d..95870b22a186 100644
--- a/dev-python/more-itertools/more-itertools-8.7.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-8.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
BDEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/namespace-paste/namespace-paste-1-r1.ebuild b/dev-python/namespace-paste/namespace-paste-1-r1.ebuild
index d31072f66365..d549dc639e05 100644
--- a/dev-python/namespace-paste/namespace-paste-1-r1.ebuild
+++ b/dev-python/namespace-paste/namespace-paste-1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI=""
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
IUSE=""
RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild b/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
index 58f3aa6a92ec..a807227661d5 100644
--- a/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
+++ b/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/namespace-zope/namespace-zope-1-r1.ebuild b/dev-python/namespace-zope/namespace-zope-1-r1.ebuild
index 2cb35aeb5ce3..9b43ad087782 100644
--- a/dev-python/namespace-zope/namespace-zope-1-r1.ebuild
+++ b/dev-python/namespace-zope/namespace-zope-1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
index e44dc2439e8a..cf5a74bab0ca 100644
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P/-/_}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
RDEPEND="
dev-python/pyaes[${PYTHON_USEDEP}]
diff --git a/dev-python/nose-exclude/nose-exclude-0.5.0-r1.ebuild b/dev-python/nose-exclude/nose-exclude-0.5.0-r1.ebuild
index 5a82bbe040dc..6188c953cc22 100644
--- a/dev-python/nose-exclude/nose-exclude-0.5.0-r1.ebuild
+++ b/dev-python/nose-exclude/nose-exclude-0.5.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
diff --git a/dev-python/nose/nose-1.3.7-r7.ebuild b/dev-python/nose/nose-1.3.7-r7.ebuild
index cb4a2f995f7f..e1eeb12eb28e 100644
--- a/dev-python/nose/nose-1.3.7-r7.ebuild
+++ b/dev-python/nose/nose-1.3.7-r7.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="coverage examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/packaging/packaging-20.9.ebuild b/dev-python/packaging/packaging-20.9.ebuild
index be4e5dac3f7b..de215cedc140 100644
--- a/dev-python/packaging/packaging-20.9.ebuild
+++ b/dev-python/packaging/packaging-20.9.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
SLOT="0"
LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
>=dev-python/pyparsing-2.1.10[${PYTHON_USEDEP}]
diff --git a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
index 52f7ebf262a6..787649359a7f 100644
--- a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
+++ b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pallets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]
dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/parameterized/parameterized-0.8.1.ebuild b/dev-python/parameterized/parameterized-0.8.1.ebuild
index f2b02af469fc..4f8e4aa54d49 100644
--- a/dev-python/parameterized/parameterized-0.8.1.ebuild
+++ b/dev-python/parameterized/parameterized-0.8.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
BDEPEND="
test? (
diff --git a/dev-python/paste/paste-3.5.0.ebuild b/dev-python/paste/paste-3.5.0.ebuild
index b1b13bd62dd6..a6676874a12a 100644
--- a/dev-python/paste/paste-3.5.0.ebuild
+++ b/dev-python/paste/paste-3.5.0.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris"
RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
>=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pastedeploy/pastedeploy-2.1.1.ebuild b/dev-python/pastedeploy/pastedeploy-2.1.1.ebuild
index 3fd14532a87e..dd594a81dba5 100644
--- a/dev-python/pastedeploy/pastedeploy-2.1.1.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/Pylons/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
IUSE="doc"
RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]"
diff --git a/dev-python/path-py/path-py-15.1.2.ebuild b/dev-python/path-py/path-py-15.1.2.ebuild
index 84e71862c2f7..952732bf19c9 100644
--- a/dev-python/path-py/path-py-15.1.2.ebuild
+++ b/dev-python/path-py/path-py-15.1.2.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${MY_P}
SLOT="0"
LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
RDEPEND="
dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/pathlib2/pathlib2-2.3.5-r1.ebuild b/dev-python/pathlib2/pathlib2-2.3.5-r1.ebuild
index b207f1a0409d..1719f9c6231b 100644
--- a/dev-python/pathlib2/pathlib2-2.3.5-r1.ebuild
+++ b/dev-python/pathlib2/pathlib2-2.3.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pbr/pbr-5.5.1.ebuild b/dev-python/pbr/pbr-5.5.1.ebuild
index 0bfdd188ec73..0192a5da39a3 100644
--- a/dev-python/pbr/pbr-5.5.1.ebuild
+++ b/dev-python/pbr/pbr-5.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pep8/pep8-1.7.1.ebuild b/dev-python/pep8/pep8-1.7.1.ebuild
index 638b86656ec8..c3789694baf1 100644
--- a/dev-python/pep8/pep8-1.7.1.ebuild
+++ b/dev-python/pep8/pep8-1.7.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
distutils_enable_tests pytest
diff --git a/dev-python/ply/ply-3.11-r1.ebuild b/dev-python/ply/ply-3.11-r1.ebuild
index bce5e31fb1ea..50c6368b1aae 100644
--- a/dev-python/ply/ply-3.11-r1.ebuild
+++ b/dev-python/ply/ply-3.11-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples"
DOCS=( ANNOUNCE CHANGES TODO )
diff --git a/dev-python/pretend/pretend-1.0.9-r1.ebuild b/dev-python/pretend/pretend-1.0.9-r1.ebuild
index 11253edb60cc..a67448559291 100644
--- a/dev-python/pretend/pretend-1.0.9-r1.ebuild
+++ b/dev-python/pretend/pretend-1.0.9-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/alex/pretend/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/priority/priority-1.3.0.ebuild b/dev-python/priority/priority-1.3.0.ebuild
index 614124489d6d..3e4f4d560589 100644
--- a/dev-python/priority/priority-1.3.0.ebuild
+++ b/dev-python/priority/priority-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
DEPEND="
test? ( >=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}] )
diff --git a/dev-python/process-tests/process-tests-2.1.1.ebuild b/dev-python/process-tests/process-tests-2.1.1.ebuild
index 09e5c7299ccf..4e4cc28e2b28 100644
--- a/dev-python/process-tests/process-tests-2.1.1.ebuild
+++ b/dev-python/process-tests/process-tests-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
# There are no tests at all, under TODO
# see https://pypi.org/project/process-tests/2.0.2/
diff --git a/dev-python/psutil/psutil-5.7.0-r1.ebuild b/dev-python/psutil/psutil-5.7.0-r1.ebuild
index f109b97bad1a..bba7bd27b88f 100644
--- a/dev-python/psutil/psutil-5.7.0-r1.ebuild
+++ b/dev-python/psutil/psutil-5.7.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/py/py-1.10.0.ebuild b/dev-python/py/py-1.10.0.ebuild
index 3635064c547f..6b5eed15729a 100644
--- a/dev-python/py/py-1.10.0.ebuild
+++ b/dev-python/py/py-1.10.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# This package is unmaintained and keeps being broken periodically.
RESTRICT=test
diff --git a/dev-python/pyaes/pyaes-1.6.1-r2.ebuild b/dev-python/pyaes/pyaes-1.6.1-r2.ebuild
index bd68548f3e16..4cb20ac8ed76 100644
--- a/dev-python/pyaes/pyaes-1.6.1-r2.ebuild
+++ b/dev-python/pyaes/pyaes-1.6.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r1.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r1.ebuild
index 77cfba6b41ed..c416a1032297 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r1.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pyasn1/pyasn1-0.4.8-r1.ebuild b/dev-python/pyasn1/pyasn1-0.4.8-r1.ebuild
index 5602fcc890b8..58089f93eb7d 100644
--- a/dev-python/pyasn1/pyasn1-0.4.8-r1.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.4.8-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
IUSE="doc"
distutils_enable_tests setup.py
diff --git a/dev-python/pycodestyle/pycodestyle-2.6.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.6.0.ebuild
index e10f3f67579a..fc530c8b7c7c 100644
--- a/dev-python/pycodestyle/pycodestyle-2.6.0.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
distutils_enable_tests setup.py
distutils_enable_sphinx docs
diff --git a/dev-python/pycparser/pycparser-2.20-r1.ebuild b/dev-python/pycparser/pycparser-2.20-r1.ebuild
index 54812ddec555..873583b5dd3c 100644
--- a/dev-python/pycparser/pycparser-2.20-r1.ebuild
+++ b/dev-python/pycparser/pycparser-2.20-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="dev-python/ply:=[${PYTHON_USEDEP}]"
BDEPEND="${RDEPEND}
diff --git a/dev-python/pydecomp/pydecomp-0.3-r1.ebuild b/dev-python/pydecomp/pydecomp-0.3-r1.ebuild
index ad1e3693d2ce..0286a6a7e8a1 100644
--- a/dev-python/pydecomp/pydecomp-0.3-r1.ebuild
+++ b/dev-python/pydecomp/pydecomp-0.3-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/pyDeComp-${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
S="${WORKDIR}/pyDeComp-${PV}"
fi
diff --git a/dev-python/pydot/pydot-1.4.1.ebuild b/dev-python/pydot/pydot-1.4.1.ebuild
index 76013bf45132..bc7ca9262c71 100644
--- a/dev-python/pydot/pydot-1.4.1.ebuild
+++ b/dev-python/pydot/pydot-1.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/erocarrera/pydot/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pyelftools/pyelftools-0.27.ebuild b/dev-python/pyelftools/pyelftools-0.27.ebuild
index 7106d8ff4099..7d4d5c852b50 100644
--- a/dev-python/pyelftools/pyelftools-0.27.ebuild
+++ b/dev-python/pyelftools/pyelftools-0.27.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/eliben/pyelftools/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="examples"
python_test() {
diff --git a/dev-python/pyflakes/pyflakes-2.2.0.ebuild b/dev-python/pyflakes/pyflakes-2.2.0.ebuild
index 505e705ad4df..879458907120 100644
--- a/dev-python/pyflakes/pyflakes-2.2.0.ebuild
+++ b/dev-python/pyflakes/pyflakes-2.2.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Should be included in the next release
PATCHES=( "${FILESDIR}/${P}-fix-tests.patch" )
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild
index 1d2bba107d7e..76504eb3fcad 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
IUSE="examples ssl test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pygments/pygments-2.8.0.ebuild b/dev-python/pygments/pygments-2.8.0.ebuild
index b900dcb8f524..353c3d255988 100644
--- a/dev-python/pygments/pygments-2.8.0.ebuild
+++ b/dev-python/pygments/pygments-2.8.0.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
BDEPEND="
test? (
diff --git a/dev-python/pygobject/pygobject-3.34.0-r1.ebuild b/dev-python/pygobject/pygobject-3.34.0-r1.ebuild
index 346b245a0cbf..ea33657d5dfc 100644
--- a/dev-python/pygobject/pygobject-3.34.0-r1.ebuild
+++ b/dev-python/pygobject/pygobject-3.34.0-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pygobject.readthedocs.io/"
LICENSE="LGPL-2.1+"
SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+cairo examples test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pygobject/pygobject-3.36.1-r1.ebuild b/dev-python/pygobject/pygobject-3.36.1-r1.ebuild
index 959d8634b3e4..deef37c33c70 100644
--- a/dev-python/pygobject/pygobject-3.36.1-r1.ebuild
+++ b/dev-python/pygobject/pygobject-3.36.1-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pygobject.readthedocs.io/"
LICENSE="LGPL-2.1+"
SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+cairo examples test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild b/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild
index 042a22c608a3..ef041451533a 100644
--- a/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild
+++ b/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="examples"
distutils_enable_sphinx doc \
diff --git a/dev-python/pyinotify/pyinotify-0.9.6.ebuild b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
index 1bdc75399db1..bef1ccac9373 100644
--- a/dev-python/pyinotify/pyinotify-0.9.6.ebuild
+++ b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="https://seb.dbzteam.org/pub/pyinotify/releases/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="examples"
python_install_all() {
diff --git a/dev-python/pynacl/pynacl-1.4.0.ebuild b/dev-python/pynacl/pynacl-1.4.0.ebuild
index dc75b1924acb..3783b2151cab 100644
--- a/dev-python/pynacl/pynacl-1.4.0.ebuild
+++ b/dev-python/pynacl/pynacl-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/pyopenssl/pyopenssl-19.1.0-r1.ebuild b/dev-python/pyopenssl/pyopenssl-19.1.0-r1.ebuild
index 1a8ad022ee31..180a40299af2 100644
--- a/dev-python/pyopenssl/pyopenssl-19.1.0-r1.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-19.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild b/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild
index cdadddb55bf4..b6e871b2aee4 100644
--- a/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples"
distutils_enable_tests setup.py
diff --git a/dev-python/pyquery/pyquery-1.4.3.ebuild b/dev-python/pyquery/pyquery-1.4.3.ebuild
index 28d71489fb79..5e3ce4f6ef3f 100644
--- a/dev-python/pyquery/pyquery-1.4.3.ebuild
+++ b/dev-python/pyquery/pyquery-1.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
IUSE="test"
RDEPEND="
diff --git a/dev-python/pyserial/pyserial-3.5.ebuild b/dev-python/pyserial/pyserial-3.5.ebuild
index db2599cad303..09d95613426c 100644
--- a/dev-python/pyserial/pyserial-3.5.ebuild
+++ b/dev-python/pyserial/pyserial-3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="PSF-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
IUSE="examples"
DOCS=( CHANGES.rst README.rst )
diff --git a/dev-python/pytest-cov/pytest-cov-2.11.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.11.1.ebuild
index 60cf89a6e397..81320aa23f8b 100644
--- a/dev-python/pytest-cov/pytest-cov-2.11.1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.11.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild b/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
index e330402fc90f..1c1f5817b43c 100644
--- a/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
+++ b/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE=""
RDEPEND="
diff --git a/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r1.ebuild b/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r1.ebuild
index 90b4e0cd5c96..2d2a9a122119 100644
--- a/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r1.ebuild
+++ b/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
RDEPEND="
dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-forked/pytest-forked-1.3.0-r1.ebuild b/dev-python/pytest-forked/pytest-forked-1.3.0-r1.ebuild
index b54117230464..036599bf6d73 100644
--- a/dev-python/pytest-forked/pytest-forked-1.3.0-r1.ebuild
+++ b/dev-python/pytest-forked/pytest-forked-1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
index ed3b51316fee..7a36fd6f0175 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
index 22817dc45a0c..31c4799825ca 100644
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
+++ b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
RDEPEND="
dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
diff --git a/dev-python/python-dateutil/python-dateutil-2.8.1-r2.ebuild b/dev-python/python-dateutil/python-dateutil-2.8.1-r2.ebuild
index d3fec10e8648..290fe1479d59 100644
--- a/dev-python/python-dateutil/python-dateutil-2.8.1-r2.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.8.1-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
RDEPEND="
>=dev-python/six-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/python-docs/python-docs-2.7.18.ebuild b/dev-python/python-docs/python-docs-2.7.18.ebuild
index 69b83c700c31..69cbb66a42be 100644
--- a/dev-python/python-docs/python-docs-2.7.18.ebuild
+++ b/dev-python/python-docs/python-docs-2.7.18.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
LICENSE="PSF-2"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
src_install() {
rm -r _sources || die
diff --git a/dev-python/python-docs/python-docs-3.6.13.ebuild b/dev-python/python-docs/python-docs-3.6.13.ebuild
index 69b83c700c31..69cbb66a42be 100644
--- a/dev-python/python-docs/python-docs-3.6.13.ebuild
+++ b/dev-python/python-docs/python-docs-3.6.13.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
LICENSE="PSF-2"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
src_install() {
rm -r _sources || die
diff --git a/dev-python/python-docs/python-docs-3.7.10.ebuild b/dev-python/python-docs/python-docs-3.7.10.ebuild
index 69b83c700c31..69cbb66a42be 100644
--- a/dev-python/python-docs/python-docs-3.7.10.ebuild
+++ b/dev-python/python-docs/python-docs-3.7.10.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
LICENSE="PSF-2"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
src_install() {
rm -r _sources || die
diff --git a/dev-python/python-docs/python-docs-3.8.8.ebuild b/dev-python/python-docs/python-docs-3.8.8.ebuild
index 69b83c700c31..69cbb66a42be 100644
--- a/dev-python/python-docs/python-docs-3.8.8.ebuild
+++ b/dev-python/python-docs/python-docs-3.8.8.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
LICENSE="PSF-2"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
src_install() {
rm -r _sources || die
diff --git a/dev-python/python-docs/python-docs-3.9.2.ebuild b/dev-python/python-docs/python-docs-3.9.2.ebuild
index 69b83c700c31..69cbb66a42be 100644
--- a/dev-python/python-docs/python-docs-3.9.2.ebuild
+++ b/dev-python/python-docs/python-docs-3.9.2.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
LICENSE="PSF-2"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
src_install() {
rm -r _sources || die
diff --git a/dev-python/python-libevdev/python-libevdev-0.9.ebuild b/dev-python/python-libevdev/python-libevdev-0.9.ebuild
index d55a2bc9813d..2a2c585a28c3 100644
--- a/dev-python/python-libevdev/python-libevdev-0.9.ebuild
+++ b/dev-python/python-libevdev/python-libevdev-0.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.freedesktop.org/libevdev/${PN}/-/archive/${PV}/${P}.tar.
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild b/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
index a3008585fa47..282094f11695 100644
--- a/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
+++ b/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE=""
python_test() {
diff --git a/dev-python/pytz/pytz-2021.1.ebuild b/dev-python/pytz/pytz-2021.1.ebuild
index 8795a50315d9..683b90162f70 100644
--- a/dev-python/pytz/pytz-2021.1.ebuild
+++ b/dev-python/pytz/pytz-2021.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
IUSE=""
DEPEND="
diff --git a/dev-python/pyxattr/pyxattr-0.7.2.ebuild b/dev-python/pyxattr/pyxattr-0.7.2.ebuild
index 605596a12e96..84db4e73c8a6 100644
--- a/dev-python/pyxattr/pyxattr-0.7.2.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.7.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="sys-apps/attr:="
DEPEND="${RDEPEND}"
diff --git a/dev-python/pyyaml/pyyaml-5.3.1-r1.ebuild b/dev-python/pyyaml/pyyaml-5.3.1-r1.ebuild
index 83a0aedb6ac0..386e9cc6b6ff 100644
--- a/dev-python/pyyaml/pyyaml-5.3.1-r1.ebuild
+++ b/dev-python/pyyaml/pyyaml-5.3.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/yaml/pyyaml/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
IUSE="examples +libyaml"
RDEPEND="libyaml? ( dev-libs/libyaml:= )"
diff --git a/dev-python/pyyaml/pyyaml-5.4.1.ebuild b/dev-python/pyyaml/pyyaml-5.4.1.ebuild
index 29202aa45d75..02dca8baddc8 100644
--- a/dev-python/pyyaml/pyyaml-5.4.1.ebuild
+++ b/dev-python/pyyaml/pyyaml-5.4.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/yaml/pyyaml/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
IUSE="examples +libyaml"
BDEPEND="
diff --git a/dev-python/regex/regex-2020.4.4-r1.ebuild b/dev-python/regex/regex-2020.4.4-r1.ebuild
index f3243ad82643..7002d20c1622 100644
--- a/dev-python/regex/regex-2020.4.4-r1.ebuild
+++ b/dev-python/regex/regex-2020.4.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
IUSE="doc"
python_test() {
diff --git a/dev-python/requests/requests-2.25.1-r1.ebuild b/dev-python/requests/requests-2.25.1-r1.ebuild
index cac0b7294a20..0ade640f1331 100644
--- a/dev-python/requests/requests-2.25.1-r1.ebuild
+++ b/dev-python/requests/requests-2.25.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="socks5"
RDEPEND="
diff --git a/dev-python/responses/responses-0.12.1.ebuild b/dev-python/responses/responses-0.12.1.ebuild
index 18636f4e65c1..f81ba3dd5bf9 100644
--- a/dev-python/responses/responses-0.12.1.ebuild
+++ b/dev-python/responses/responses-0.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="
diff --git a/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild b/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
index 1010ce55d502..8138b43386f7 100644
--- a/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
+++ b/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="dev-python/regex[${PYTHON_USEDEP}]"
diff --git a/dev-python/rst-linker/rst-linker-2.1.1.ebuild b/dev-python/rst-linker/rst-linker-2.1.1.ebuild
index 9295845dd971..5a7f3141a7ef 100644
--- a/dev-python/rst-linker/rst-linker-2.1.1.ebuild
+++ b/dev-python/rst-linker/rst-linker-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND="
$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
diff --git a/dev-python/scandir/scandir-1.10.0-r2.ebuild b/dev-python/scandir/scandir-1.10.0-r2.ebuild
index aecba9e0483f..e7b5cb0def6e 100644
--- a/dev-python/scandir/scandir-1.10.0-r2.ebuild
+++ b/dev-python/scandir/scandir-1.10.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
python_test() {
"${EPYTHON}" test/run_tests.py -v || die "tests failed under ${EPYTHON}"
diff --git a/dev-python/service_identity/service_identity-18.1.0-r1.ebuild b/dev-python/service_identity/service_identity-18.1.0-r1.ebuild
index dc960968e486..251840182d70 100644
--- a/dev-python/service_identity/service_identity-18.1.0-r1.ebuild
+++ b/dev-python/service_identity/service_identity-18.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ S=${WORKDIR}/${P/_/-}
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
# TODO: upstream made pyopenssl optional
RDEPEND="
diff --git a/dev-python/setuptools-git/setuptools-git-1.2-r2.ebuild b/dev-python/setuptools-git/setuptools-git-1.2-r2.ebuild
index 0c2176168d14..dcd5ea54a7f3 100644
--- a/dev-python/setuptools-git/setuptools-git-1.2-r2.ebuild
+++ b/dev-python/setuptools-git/setuptools-git-1.2-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
dev-vcs/git"
diff --git a/dev-python/setuptools/setuptools-53.1.0.ebuild b/dev-python/setuptools/setuptools-53.1.0.ebuild
index 4231ee0d4ba4..c104805cb434 100644
--- a/dev-python/setuptools/setuptools-53.1.0.ebuild
+++ b/dev-python/setuptools/setuptools-53.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
BDEPEND="
test? (
diff --git a/dev-python/setuptools_scm/setuptools_scm-6.0.1.ebuild b/dev-python/setuptools_scm/setuptools_scm-6.0.1.ebuild
index 5aa242450693..91f07f977c40 100644
--- a/dev-python/setuptools_scm/setuptools_scm-6.0.1.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-6.0.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
BDEPEND="
!!<dev-python/setuptools_scm-2
diff --git a/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild b/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
index 7e9bfa71d7ac..7d34b5788ff5 100644
--- a/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
+++ b/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
@@ -12,4 +12,4 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="PSF-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
diff --git a/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild b/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
index 8978530ef627..4a3ada9a491b 100644
--- a/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
+++ b/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
LICENSE="ZPL"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE=""
DEPEND="app-arch/unzip"
diff --git a/dev-python/simplejson/simplejson-3.17.2-r1.ebuild b/dev-python/simplejson/simplejson-3.17.2-r1.ebuild
index f8c998496126..bd730ca32187 100644
--- a/dev-python/simplejson/simplejson-3.17.2-r1.ebuild
+++ b/dev-python/simplejson/simplejson-3.17.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="|| ( MIT AFL-2.1 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
DOCS=( README.rst CHANGES.txt )
diff --git a/dev-python/six/six-1.15.0-r1.ebuild b/dev-python/six/six-1.15.0-r1.ebuild
index 1a5b132e0112..7c34eb62693a 100644
--- a/dev-python/six/six-1.15.0-r1.ebuild
+++ b/dev-python/six/six-1.15.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
distutils_enable_sphinx documentation --no-autodoc
distutils_enable_tests pytest
diff --git a/dev-python/snakeoil/snakeoil-0.9.2-r1.ebuild b/dev-python/snakeoil/snakeoil-0.9.2-r1.ebuild
index 33301d8a9ac2..221b582e9b7d 100644
--- a/dev-python/snakeoil/snakeoil-0.9.2-r1.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.9.2-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
inherit git-r3
else
- KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
fi
diff --git a/dev-python/snowballstemmer/snowballstemmer-2.1.0.ebuild b/dev-python/snowballstemmer/snowballstemmer-2.1.0.ebuild
index 2da4295832ff..f937b51bf3a6 100644
--- a/dev-python/snowballstemmer/snowballstemmer-2.1.0.ebuild
+++ b/dev-python/snowballstemmer/snowballstemmer-2.1.0.ebuild
@@ -14,4 +14,4 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris"
diff --git a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.0.ebuild b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.0.ebuild
index 815d6c7300cf..b67727c008a9 100644
--- a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.0.ebuild
+++ b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,4 +16,4 @@ SRC_URI="https://github.com/ryan-roemer/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
diff --git a/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild b/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild
index 1b7db60ddaf1..173b41169dcb 100644
--- a/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild
+++ b/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
>=dev-python/sphinx-1.7.5[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild b/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
index cf1388d85f4c..554b180f0f9b 100644
--- a/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
+++ b/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sloria/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
index 403755326fdf..0028fc1941f7 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
+++ b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,5 +13,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE=""
diff --git a/dev-python/sphinx/sphinx-3.5.1.ebuild b/dev-python/sphinx/sphinx-3.5.1.ebuild
index e2e6c8771f8a..537e5d1c404c 100644
--- a/dev-python/sphinx/sphinx-3.5.1.ebuild
+++ b/dev-python/sphinx/sphinx-3.5.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="doc latex test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.5.1.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.5.1.ebuild
index 4623a628d9d8..c0cfcc26e230 100644
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.5.1.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
IUSE=""
PDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
index c16e54a21042..1fd703331894 100644
--- a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
+++ b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc"
DEPEND="
diff --git a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild
index 5c3ff26f53c7..8a5b38c3c9eb 100644
--- a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild
+++ b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
PDEPEND="
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild
index 9c3ef71ac4e3..85d0069d35ec 100644
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/sphinx-doc/sphinxcontrib-websupport/archive/${PV}.ta
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
RDEPEND="
>=dev-python/six-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
index 0a11e5a0e551..21e6b21982ee 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="examples +sqlite test"
REQUIRED_USE="test? ( sqlite )"
diff --git a/dev-python/sqlparse/sqlparse-0.3.1.ebuild b/dev-python/sqlparse/sqlparse-0.3.1.ebuild
index aafd0b8b1178..c692f9e7651e 100644
--- a/dev-python/sqlparse/sqlparse-0.3.1.ebuild
+++ b/dev-python/sqlparse/sqlparse-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
S="${WORKDIR}"/${P#python-}
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
LICENSE="BSD-2"
BDEPEND="
diff --git a/dev-python/sqlparse/sqlparse-0.4.1.ebuild b/dev-python/sqlparse/sqlparse-0.4.1.ebuild
index a354f14f34a6..e00487611aa8 100644
--- a/dev-python/sqlparse/sqlparse-0.4.1.ebuild
+++ b/dev-python/sqlparse/sqlparse-0.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
S="${WORKDIR}"/${P#python-}
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
LICENSE="BSD-2"
distutils_enable_sphinx docs/source
diff --git a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
index 2d1ab1606377..8c37254d9a30 100644
--- a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
+++ b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~dolsen/releases/ssl-fetch/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
RDEPEND=">=dev-python/requests-1.2.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/stestr/stestr-2.1.0-r1.ebuild b/dev-python/stestr/stestr-2.1.0-r1.ebuild
index 17c04bb67e58..1de050c25a05 100644
--- a/dev-python/stestr/stestr-2.1.0-r1.ebuild
+++ b/dev-python/stestr/stestr-2.1.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
DEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
RDEPEND="
diff --git a/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild b/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
index 86806a294408..c005434b76e8 100644
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
+++ b/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/danielrichman/${PN}/archive/version-${PV}.tar.gz ->
SLOT="0"
LICENSE="GPL-3+"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/subunit/subunit-1.4.0.ebuild b/dev-python/subunit/subunit-1.4.0.ebuild
index 7368317c24c3..ad4beecffb57 100644
--- a/dev-python/subunit/subunit-1.4.0.ebuild
+++ b/dev-python/subunit/subunit-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
LICENSE="Apache-2.0 BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/termcolor/termcolor-1.1.0-r2.ebuild b/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
index 7dffd6265ebc..fff6a124e17f 100644
--- a/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
+++ b/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
# no tests...
RESTRICT="test"
diff --git a/dev-python/testresources/testresources-2.0.1.ebuild b/dev-python/testresources/testresources-2.0.1.ebuild
index 7d4ca57ffd00..20aab49f4082 100644
--- a/dev-python/testresources/testresources-2.0.1.ebuild
+++ b/dev-python/testresources/testresources-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild b/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild
index 8d9cdc1f24d1..236199bd4748 100644
--- a/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild
+++ b/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/testtools/testtools-2.4.0-r1.ebuild b/dev-python/testtools/testtools-2.4.0-r1.ebuild
index 149e6bb7de88..9bf6119906e6 100644
--- a/dev-python/testtools/testtools-2.4.0-r1.ebuild
+++ b/dev-python/testtools/testtools-2.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
RDEPEND="
>=dev-python/extras-1.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/toml/toml-0.10.2.ebuild b/dev-python/toml/toml-0.10.2.ebuild
index 9cd8b5459a6d..4186052ec315 100644
--- a/dev-python/toml/toml-0.10.2.ebuild
+++ b/dev-python/toml/toml-0.10.2.ebuild
@@ -17,7 +17,7 @@ IUSE="test"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
test? (
diff --git a/dev-python/traceback2/traceback2-1.4.0-r1.ebuild b/dev-python/traceback2/traceback2-1.4.0-r1.ebuild
index b43a845e41b4..d0efd47ec9ae 100644
--- a/dev-python/traceback2/traceback2-1.4.0-r1.ebuild
+++ b/dev-python/traceback2/traceback2-1.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="PSF-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
RDEPEND="
dev-python/linecache2[${PYTHON_USEDEP}]"
diff --git a/dev-python/twisted/twisted-19.10.0.ebuild b/dev-python/twisted/twisted-19.10.0.ebuild
index 7adf62c2fa3c..cd70c36f469b 100644
--- a/dev-python/twisted/twisted-19.10.0.ebuild
+++ b/dev-python/twisted/twisted-19.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,7 +19,7 @@ SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
S=${WORKDIR}/${TWISTED_P}
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/twisted/twisted-20.3.0.ebuild b/dev-python/twisted/twisted-20.3.0.ebuild
index 9f0c353d6be7..48c006ad930f 100644
--- a/dev-python/twisted/twisted-20.3.0.ebuild
+++ b/dev-python/twisted/twisted-20.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="https://twistedmatrix.com/Releases/${TWISTED_PN}"
SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/u-msgpack/u-msgpack-2.7.1.ebuild b/dev-python/u-msgpack/u-msgpack-2.7.1.ebuild
index 60aa1d89037d..0106418683c1 100644
--- a/dev-python/u-msgpack/u-msgpack-2.7.1.ebuild
+++ b/dev-python/u-msgpack/u-msgpack-2.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/unittest-or-fail/unittest-or-fail-1.ebuild b/dev-python/unittest-or-fail/unittest-or-fail-1.ebuild
index 4e9207c29765..735771c62d89 100644
--- a/dev-python/unittest-or-fail/unittest-or-fail-1.ebuild
+++ b/dev-python/unittest-or-fail/unittest-or-fail-1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Warning: do not use distutils_enable_tests to avoid a circular
# dependency on itself!
diff --git a/dev-python/unittest2/unittest2-1.1.0-r1.ebuild b/dev-python/unittest2/unittest2-1.1.0-r1.ebuild
index a7708783c330..91794288fa37 100644
--- a/dev-python/unittest2/unittest2-1.1.0-r1.ebuild
+++ b/dev-python/unittest2/unittest2-1.1.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
RDEPEND="
dev-python/linecache2[${PYTHON_USEDEP}]
diff --git a/dev-python/urllib3/urllib3-1.26.4.ebuild b/dev-python/urllib3/urllib3-1.26.4.ebuild
index 3bef0b34c6fb..c23d80a6edef 100644
--- a/dev-python/urllib3/urllib3-1.26.4.ebuild
+++ b/dev-python/urllib3/urllib3-1.26.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="brotli test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/voluptuous/voluptuous-0.12.1.ebuild b/dev-python/voluptuous/voluptuous-0.12.1.ebuild
index 09c15fc59007..3e923fb6121c 100644
--- a/dev-python/voluptuous/voluptuous-0.12.1.ebuild
+++ b/dev-python/voluptuous/voluptuous-0.12.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
PATCHES=( "${FILESDIR}"/${PN}-0.11.5-fix-doctest.patch )
diff --git a/dev-python/waitress/waitress-1.4.4.ebuild b/dev-python/waitress/waitress-1.4.4.ebuild
index bf1f4dca9eb4..9b23010e2db0 100644
--- a/dev-python/waitress/waitress-1.4.4.ebuild
+++ b/dev-python/waitress/waitress-1.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="ZPL"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
distutils_enable_tests pytest
diff --git a/dev-python/wcwidth/wcwidth-0.2.5-r1.ebuild b/dev-python/wcwidth/wcwidth-0.2.5-r1.ebuild
index c8aee3b5e75e..be8b8824c2f8 100644
--- a/dev-python/wcwidth/wcwidth-0.2.5-r1.ebuild
+++ b/dev-python/wcwidth/wcwidth-0.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="
SLOT="0"
LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
$(python_gen_cond_dep '
diff --git a/dev-python/webcolors/webcolors-1.11.1.ebuild b/dev-python/webcolors/webcolors-1.11.1.ebuild
index 3574702f0853..c6ef920b7c0d 100644
--- a/dev-python/webcolors/webcolors-1.11.1.ebuild
+++ b/dev-python/webcolors/webcolors-1.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
BDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/webencodings/webencodings-0.5.1-r1.ebuild b/dev-python/webencodings/webencodings-0.5.1-r1.ebuild
index 0d1ac7f202fb..ed53ab0cc7a4 100644
--- a/dev-python/webencodings/webencodings-0.5.1-r1.ebuild
+++ b/dev-python/webencodings/webencodings-0.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
distutils_enable_tests pytest
diff --git a/dev-python/webob/webob-1.8.7.ebuild b/dev-python/webob/webob-1.8.7.ebuild
index bb8093403280..a27b41c0fbe7 100644
--- a/dev-python/webob/webob-1.8.7.ebuild
+++ b/dev-python/webob/webob-1.8.7.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
distutils_enable_sphinx docs 'dev-python/alabaster'
distutils_enable_tests pytest
diff --git a/dev-python/wheel/wheel-0.36.2.ebuild b/dev-python/wheel/wheel-0.36.2.ebuild
index af7365f141a0..ba6720c20438 100644
--- a/dev-python/wheel/wheel-0.36.2.ebuild
+++ b/dev-python/wheel/wheel-0.36.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/pypa/wheel/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
distutils_enable_tests pytest
diff --git a/dev-python/whoosh/whoosh-2.7.4-r1.ebuild b/dev-python/whoosh/whoosh-2.7.4-r1.ebuild
index 39d504d1329f..f119f38f5063 100644
--- a/dev-python/whoosh/whoosh-2.7.4-r1.ebuild
+++ b/dev-python/whoosh/whoosh-2.7.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P^}"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-solaris"
PATCHES=(
"${FILESDIR}"/${PN}-2.7.4-tests-specify-utf8.patch
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild
index f71b496603b3..fcabead12956 100644
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
RDEPEND="
dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/zipp/zipp-3.4.1.ebuild b/dev-python/zipp/zipp-3.4.1.ebuild
index 4cfd6efb2c21..e7eae1e79a92 100644
--- a/dev-python/zipp/zipp-3.4.1.ebuild
+++ b/dev-python/zipp/zipp-3.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
BDEPEND="
dev-python/toml[${PYTHON_USEDEP}]
diff --git a/dev-python/zope-event/zope-event-4.5.0-r1.ebuild b/dev-python/zope-event/zope-event-4.5.0-r1.ebuild
index e1641a8cd67f..f388c709d8a6 100644
--- a/dev-python/zope-event/zope-event-4.5.0-r1.ebuild
+++ b/dev-python/zope-event/zope-event-4.5.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="ZPL"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
diff --git a/dev-python/zope-interface/zope-interface-5.2.0.ebuild b/dev-python/zope-interface/zope-interface-5.2.0.ebuild
index f90a575d669c..d32bfed76738 100644
--- a/dev-python/zope-interface/zope-interface-5.2.0.ebuild
+++ b/dev-python/zope-interface/zope-interface-5.2.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="ZPL"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
BDEPEND="
diff --git a/dev-python/zope-testing/zope-testing-4.9.ebuild b/dev-python/zope-testing/zope-testing-4.9.ebuild
index 6fe6fefc7a00..9b96eb325345 100644
--- a/dev-python/zope-testing/zope-testing-4.9.ebuild
+++ b/dev-python/zope-testing/zope-testing-4.9.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="ZPL"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
diff --git a/dev-ruby/backports/backports-3.15.0.ebuild b/dev-ruby/backports/backports-3.15.0.ebuild
index adc2dfaaf5bd..990c15260f9a 100644
--- a/dev-ruby/backports/backports-3.15.0.ebuild
+++ b/dev-ruby/backports/backports-3.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/marcandre/backports"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/builder/builder-3.2.3.ebuild b/dev-ruby/builder/builder-3.2.3.ebuild
index 17e483b6c13d..d4d5ce8d8872 100644
--- a/dev-ruby/builder/builder-3.2.3.ebuild
+++ b/dev-ruby/builder/builder-3.2.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://onestepback.org/"
LICENSE="MIT"
SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
diff --git a/dev-ruby/bundler/bundler-2.1.4.ebuild b/dev-ruby/bundler/bundler-2.1.4.ebuild
index 5f123936bd0e..e54f8b880962 100644
--- a/dev-ruby/bundler/bundler-2.1.4.ebuild
+++ b/dev-ruby/bundler/bundler-2.1.4.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://github.com/carlhuda/bundler"
LICENSE="MIT"
SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+doc test"
ruby_add_rdepend virtual/rubygems
diff --git a/dev-ruby/childprocess/childprocess-3.0.0.ebuild b/dev-ruby/childprocess/childprocess-3.0.0.ebuild
index 780c28cf29e0..8ab0dffa83b8 100644
--- a/dev-ruby/childprocess/childprocess-3.0.0.ebuild
+++ b/dev-ruby/childprocess/childprocess-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/jarib/childprocess"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
IUSE=""
ruby_add_rdepend ">=dev-ruby/ffi-1.0.11"
diff --git a/dev-ruby/coderay/coderay-1.1.2.ebuild b/dev-ruby/coderay/coderay-1.1.2.ebuild
index c4117e4eed7b..171b6fb51105 100644
--- a/dev-ruby/coderay/coderay-1.1.2.ebuild
+++ b/dev-ruby/coderay/coderay-1.1.2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rubychan/coderay/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
# Redcloth is an optional but automagically tested dependency. This
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.2.1.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.2.1.ebuild
index 30d3f3b3ac88..31e9d98356bb 100644
--- a/dev-ruby/did_you_mean/did_you_mean-1.2.1.ebuild
+++ b/dev-ruby/did_you_mean/did_you_mean-1.2.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/yuki24/did_you_mean"
LICENSE="MIT"
SLOT="2.5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "test? ( dev-ruby/test-unit )"
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.3.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.3.ebuild
index d419417e5c06..f2e950fee8a4 100644
--- a/dev-ruby/diff-lcs/diff-lcs-1.3.ebuild
+++ b/dev-ruby/diff-lcs/diff-lcs-1.3.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="https://github.com/halostatue/diff-lcs"
LICENSE="|| ( MIT Ruby GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
diff --git a/dev-ruby/gherkin/gherkin-5.1.0.ebuild b/dev-ruby/gherkin/gherkin-5.1.0.ebuild
index 39c87437f0ba..fb6de66d1c2e 100644
--- a/dev-ruby/gherkin/gherkin-5.1.0.ebuild
+++ b/dev-ruby/gherkin/gherkin-5.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -19,6 +19,6 @@ DESCRIPTION="Fast Gherkin lexer and parser"
HOMEPAGE="https://github.com/cucumber/gherkin"
LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
SLOT="5"
IUSE=""
diff --git a/dev-ruby/json/json-2.3.0.ebuild b/dev-ruby/json/json-2.3.0.ebuild
index 4d4ad773d37b..815eee4af5c5 100644
--- a/dev-ruby/json/json-2.3.0.ebuild
+++ b/dev-ruby/json/json-2.3.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="A JSON implementation as a Ruby extension"
HOMEPAGE="https://github.com/flori/json"
LICENSE="Ruby"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="2"
IUSE=""
diff --git a/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild b/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild
index dc613adee85f..229517189a1e 100644
--- a/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild
+++ b/dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/evanphx/kpeg"
LICENSE="MIT"
SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
PATCHES=( "${FILESDIR}/${P}-utf8.patch" )
diff --git a/dev-ruby/minitest/minitest-4.7.5-r2.ebuild b/dev-ruby/minitest/minitest-4.7.5-r2.ebuild
index d4ec4b2f1b43..7e90ce511f7d 100644
--- a/dev-ruby/minitest/minitest-4.7.5-r2.ebuild
+++ b/dev-ruby/minitest/minitest-4.7.5-r2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/seattlerb/minitest"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
each_ruby_prepare() {
diff --git a/dev-ruby/minitest/minitest-5.11.3.ebuild b/dev-ruby/minitest/minitest-5.11.3.ebuild
index a6496139cb03..a12171d5a2c7 100644
--- a/dev-ruby/minitest/minitest-5.11.3.ebuild
+++ b/dev-ruby/minitest/minitest-5.11.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/seattlerb/minitest"
LICENSE="MIT"
SLOT="5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
each_ruby_test() {
diff --git a/dev-ruby/multi_json/multi_json-1.14.1.ebuild b/dev-ruby/multi_json/multi_json-1.14.1.ebuild
index 35719d69df26..797521a074c1 100644
--- a/dev-ruby/multi_json/multi_json-1.14.1.ebuild
+++ b/dev-ruby/multi_json/multi_json-1.14.1.ebuild
@@ -20,7 +20,7 @@ DESCRIPTION="A gem to provide swappable JSON backends"
HOMEPAGE="https://github.com/intridea/multi_json"
LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/multi_test/multi_test-0.1.2.ebuild b/dev-ruby/multi_test/multi_test-0.1.2.ebuild
index c9a294accd92..ceb73819824e 100644
--- a/dev-ruby/multi_test/multi_test-0.1.2.ebuild
+++ b/dev-ruby/multi_test/multi_test-0.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -15,7 +15,7 @@ DESCRIPTION="A uniform interface for Ruby testing libraries"
HOMEPAGE="http://cukes.info/"
LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/nokogiri/nokogiri-1.11.1-r1.ebuild b/dev-ruby/nokogiri/nokogiri-1.11.1-r1.ebuild
index 12f3cadf0f20..77baeeff1663 100644
--- a/dev-ruby/nokogiri/nokogiri-1.11.1-r1.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.11.1-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://www.nokogiri.org/"
LICENSE="MIT"
SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/power_assert/power_assert-1.1.5.ebuild b/dev-ruby/power_assert/power_assert-1.1.5.ebuild
index 912787352b39..1056c61f570d 100644
--- a/dev-ruby/power_assert/power_assert-1.1.5.ebuild
+++ b/dev-ruby/power_assert/power_assert-1.1.5.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/k-tsj/power_assert"
SRC_URI="https://github.com/k-tsj/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( Ruby BSD-2 )"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/racc/racc-1.4.14.ebuild b/dev-ruby/racc/racc-1.4.14.ebuild
index 4a515f7c8d3e..37c88a48322c 100644
--- a/dev-ruby/racc/racc-1.4.14.ebuild
+++ b/dev-ruby/racc/racc-1.4.14.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/tenderlove/racc"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/rake/rake-12.3.3.ebuild b/dev-ruby/rake/rake-12.3.3.ebuild
index 9644d17d3af1..56e8a203e5cb 100644
--- a/dev-ruby/rake/rake-12.3.3.ebuild
+++ b/dev-ruby/rake/rake-12.3.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/ruby/rake/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
DEPEND+=" app-arch/gzip"
diff --git a/dev-ruby/rdoc/rdoc-6.1.2.ebuild b/dev-ruby/rdoc/rdoc-6.1.2.ebuild
index d8d39f4353b2..a14a325b929c 100644
--- a/dev-ruby/rdoc/rdoc-6.1.2.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.1.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/ruby/rdoc/"
SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Ruby MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE="doc"
diff --git a/dev-ruby/rexical/rexical-1.0.7.ebuild b/dev-ruby/rexical/rexical-1.0.7.ebuild
index c63c66cb5849..013d42d15b1e 100644
--- a/dev-ruby/rexical/rexical-1.0.7.ebuild
+++ b/dev-ruby/rexical/rexical-1.0.7.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Rexical is a lexical scanner generator"
HOMEPAGE="https://github.com/tenderlove/rexical/tree/master"
LICENSE="LGPL-2" # plus exception
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild b/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
index ec0a17977dff..1b261a08012a 100644
--- a/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "test? (
diff --git a/dev-ruby/rspec-core/rspec-core-3.8.2.ebuild b/dev-ruby/rspec-core/rspec-core-3.8.2.ebuild
index 800ee70f12d3..4e6ee66dbb71 100644
--- a/dev-ruby/rspec-core/rspec-core-3.8.2.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.8.2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
LICENSE="MIT"
SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="highlight"
SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild
index de9d0481b977..1e6a4c2af165 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_rdepend ">=dev-ruby/diff-lcs-1.1.3"
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.8.4.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.8.4.ebuild
index 5ac4ce629b00..1177b5849e92 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.8.4.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.8.4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
LICENSE="MIT"
SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild
index c426fb6338be..13c8935cccb4 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.8.1.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.8.1.ebuild
index 983af7e1811a..1348e1d322c7 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.8.1.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.8.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
LICENSE="MIT"
SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-support/rspec-support-3.8.2.ebuild b/dev-ruby/rspec-support/rspec-support-3.8.2.ebuild
index f23b0bb0f0b0..65f0b8ad83e6 100644
--- a/dev-ruby/rspec-support/rspec-support-3.8.2.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.8.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
LICENSE="MIT"
SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.8.0:3 >=dev-ruby/thread_order-1.1.0 )"
diff --git a/dev-ruby/rspec/rspec-2.99.0.ebuild b/dev-ruby/rspec/rspec-2.99.0.ebuild
index c26736c20d34..c2425910bce2 100644
--- a/dev-ruby/rspec/rspec-2.99.0.ebuild
+++ b/dev-ruby/rspec/rspec-2.99.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://rspec.rubyforge.org/"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec/rspec-3.8.0.ebuild b/dev-ruby/rspec/rspec-3.8.0.ebuild
index 74edd01d143f..6ec99af3d2f6 100644
--- a/dev-ruby/rspec/rspec-3.8.0.ebuild
+++ b/dev-ruby/rspec/rspec-3.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/rspec/rspec"
LICENSE="MIT"
SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
IUSE=""
SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rubygems/rubygems-2.7.10.ebuild b/dev-ruby/rubygems/rubygems-2.7.10.ebuild
index 8b1737eed5b0..26cd1d35aae7 100644
--- a/dev-ruby/rubygems/rubygems-2.7.10.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.7.10.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2 || ( Ruby MIT )"
SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE="server test"
RESTRICT="!test? ( test )"
diff --git a/dev-ruby/syntax/syntax-1.2.2.ebuild b/dev-ruby/syntax/syntax-1.2.2.ebuild
index b2ff8d8d6f9f..325db2885e28 100644
--- a/dev-ruby/syntax/syntax-1.2.2.ebuild
+++ b/dev-ruby/syntax/syntax-1.2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/dblock/syntax/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test doc"
ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
diff --git a/dev-ruby/test-unit/test-unit-3.3.3.ebuild b/dev-ruby/test-unit/test-unit-3.3.3.ebuild
index bc1ea80fd21c..6518be294874 100644
--- a/dev-ruby/test-unit/test-unit-3.3.3.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.3.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://rubygems.org/gems/test-unit"
LICENSE="|| ( Ruby GPL-2 ) PSF-2"
SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
ruby_add_rdepend "dev-ruby/power_assert"
diff --git a/dev-ruby/thread_order/thread_order-1.1.1.ebuild b/dev-ruby/thread_order/thread_order-1.1.1.ebuild
index 1bc90a94a353..41508f0eef59 100644
--- a/dev-ruby/thread_order/thread_order-1.1.1.ebuild
+++ b/dev-ruby/thread_order/thread_order-1.1.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/JoshCheek/thread_order"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/xmlrpc/xmlrpc-0.3.0.ebuild b/dev-ruby/xmlrpc/xmlrpc-0.3.0.ebuild
index a0ed76280cb2..744ddc5820d5 100644
--- a/dev-ruby/xmlrpc/xmlrpc-0.3.0.ebuild
+++ b/dev-ruby/xmlrpc/xmlrpc-0.3.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/xmlrpc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Ruby"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
ruby_add_bdepend "test? ( dev-ruby/test-unit )"
diff --git a/dev-ruby/yajl-ruby/yajl-ruby-1.4.1.ebuild b/dev-ruby/yajl-ruby/yajl-ruby-1.4.1.ebuild
index 55bd34c534a1..740fb58ca514 100644
--- a/dev-ruby/yajl-ruby/yajl-ruby-1.4.1.ebuild
+++ b/dev-ruby/yajl-ruby/yajl-ruby-1.4.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/brianmario/yajl-ruby"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="${RDEPEND} dev-libs/yajl"
diff --git a/dev-scheme/guile/guile-1.8.8-r3.ebuild b/dev-scheme/guile/guile-1.8.8-r3.ebuild
index 2dde4709bf46..6f26c850ab32 100644
--- a/dev-scheme/guile/guile-1.8.8-r3.ebuild
+++ b/dev-scheme/guile/guile-1.8.8-r3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gnu.org/software/guile/"
SRC_URI="mirror://gnu/guile/${P}.tar.gz"
LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="debug debug-freelist debug-malloc +deprecated discouraged emacs networking nls readline +regex +threads"
RESTRICT="!regex? ( test )"
diff --git a/dev-scheme/guile/guile-2.0.14-r3.ebuild b/dev-scheme/guile/guile-2.0.14-r3.ebuild
index 41331bb755df..de674a417c37 100644
--- a/dev-scheme/guile/guile-2.0.14-r3.ebuild
+++ b/dev-scheme/guile/guile-2.0.14-r3.ebuild
@@ -7,7 +7,7 @@ inherit flag-o-matic autotools ltprune
DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
HOMEPAGE="https://www.gnu.org/software/guile/"
SRC_URI="mirror://gnu/guile/${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
LICENSE="LGPL-3+"
IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls
# emacs useflag removal not working
diff --git a/dev-scheme/guile/guile-2.2.6.ebuild b/dev-scheme/guile/guile-2.2.6.ebuild
index a15c5f5dafe4..7e08347d859f 100644
--- a/dev-scheme/guile/guile-2.2.6.ebuild
+++ b/dev-scheme/guile/guile-2.2.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/guile/${P}.tar.gz"
LICENSE="LGPL-3+"
SLOT="12/2.2-1" # libguile-2.2.so.1 => 2.2-1
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls
REQUIRED_USE="regex" # workaround for bug 596322
RESTRICT="strip"
diff --git a/dev-scheme/guile/guile-2.2.7.ebuild b/dev-scheme/guile/guile-2.2.7.ebuild
index b8688bf0e917..41715f39ed11 100644
--- a/dev-scheme/guile/guile-2.2.7.ebuild
+++ b/dev-scheme/guile/guile-2.2.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/guile/${P}.tar.gz"
LICENSE="LGPL-3+"
SLOT="12/2.2-1" # libguile-2.2.so.1 => 2.2-1
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls
REQUIRED_USE="regex" # workaround for bug 596322
RESTRICT="strip"
diff --git a/dev-tcltk/blt/blt-2.4z-r13.ebuild b/dev-tcltk/blt/blt-2.4z-r13.ebuild
index 2e633acc10a5..707585cbd27a 100644
--- a/dev-tcltk/blt/blt-2.4z-r13.ebuild
+++ b/dev-tcltk/blt/blt-2.4z-r13.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
IUSE="jpeg static-libs X"
SLOT="0"
LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND="
dev-lang/tk:0=
diff --git a/dev-tcltk/expect/expect-5.45.4.ebuild b/dev-tcltk/expect/expect-5.45.4.ebuild
index 77ad3b8dd295..3fcdd715f660 100644
--- a/dev-tcltk/expect/expect-5.45.4.ebuild
+++ b/dev-tcltk/expect/expect-5.45.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
IUSE="debug doc threads"
# We need dejagnu for src_test, but dejagnu needs expect
diff --git a/dev-tcltk/tcllib/tcllib-1.20.ebuild b/dev-tcltk/tcllib/tcllib-1.20.ebuild
index 45760d915524..f2eeb5a864fb 100644
--- a/dev-tcltk/tcllib/tcllib-1.20.ebuild
+++ b/dev-tcltk/tcllib/tcllib-1.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.xz"
LICENSE="BSD"
SLOT="0"
IUSE="examples"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
RESTRICT="!test? ( test )"
RDEPEND="
diff --git a/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild b/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild
index ed89bad9d1e5..8e543fcbc1c3 100644
--- a/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild
+++ b/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/downloads/tDOM/${PN}/${MY_P}.tgz"
LICENSE="MPL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="static-libs threads"
DEPEND="
diff --git a/dev-tcltk/tdom/tdom-0.9.1.ebuild b/dev-tcltk/tdom/tdom-0.9.1.ebuild
index 2a2c41d9b9ff..7d92fdc9e4e1 100644
--- a/dev-tcltk/tdom/tdom-0.9.1.ebuild
+++ b/dev-tcltk/tdom/tdom-0.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://tdom.org/downloads/${P}-src.tgz"
LICENSE="MPL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="static-libs threads"
DEPEND="
diff --git a/dev-tcltk/tix/tix-8.4.3-r1.ebuild b/dev-tcltk/tix/tix-8.4.3-r1.ebuild
index f7b7e623a740..3692ccbd2de8 100644
--- a/dev-tcltk/tix/tix-8.4.3-r1.ebuild
+++ b/dev-tcltk/tix/tix-8.4.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/tix/${MY_P}-src.tar.gz"
IUSE=""
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
RESTRICT="test"
diff --git a/dev-tex/bibtexu/bibtexu-3.71_p20200406.ebuild b/dev-tex/bibtexu/bibtexu-3.71_p20200406.ebuild
index c022b026fab1..d0e30caf6f13 100644
--- a/dev-tex/bibtexu/bibtexu-3.71_p20200406.ebuild
+++ b/dev-tex/bibtexu/bibtexu-3.71_p20200406.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-sou
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc source"
RDEPEND=">=dev-libs/kpathsea-6.2.1:=
diff --git a/dev-tex/glossaries/glossaries-4.41.ebuild b/dev-tex/glossaries/glossaries-4.41.ebuild
index 588cf1a95b94..258722127a49 100644
--- a/dev-tex/glossaries/glossaries-4.41.ebuild
+++ b/dev-tex/glossaries/glossaries-4.41.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://mirrors.ctan.org/macros/latex/contrib/glossaries.zip -> ${P}.zip
LICENSE="LPPL-1.2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="doc examples"
RDEPEND="dev-lang/perl
diff --git a/dev-tex/latex-beamer/latex-beamer-3.59.ebuild b/dev-tex/latex-beamer/latex-beamer-3.59.ebuild
index ad5a4864a629..632559bbee46 100644
--- a/dev-tex/latex-beamer/latex-beamer-3.59.ebuild
+++ b/dev-tex/latex-beamer/latex-beamer-3.59.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/josephwright/beamer/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="GPL-2 FDL-1.2 LPPL-1.3c"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
DEPEND="dev-texlive/texlive-latex"
diff --git a/dev-tex/latex-beamer/latex-beamer-3.60.ebuild b/dev-tex/latex-beamer/latex-beamer-3.60.ebuild
index 7c0d98c2a58e..bd2b9ecb452b 100644
--- a/dev-tex/latex-beamer/latex-beamer-3.60.ebuild
+++ b/dev-tex/latex-beamer/latex-beamer-3.60.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/beamer-${PV}"
LICENSE="GPL-2 FDL-1.2 LPPL-1.3c"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
BDEPEND="dev-texlive/texlive-latex"
diff --git a/dev-tex/latex-beamer/latex-beamer-3.61.ebuild b/dev-tex/latex-beamer/latex-beamer-3.61.ebuild
index 7c0d98c2a58e..bd2b9ecb452b 100644
--- a/dev-tex/latex-beamer/latex-beamer-3.61.ebuild
+++ b/dev-tex/latex-beamer/latex-beamer-3.61.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/beamer-${PV}"
LICENSE="GPL-2 FDL-1.2 LPPL-1.3c"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
BDEPEND="dev-texlive/texlive-latex"
diff --git a/dev-tex/latexdiff/latexdiff-1.3.1.1.ebuild b/dev-tex/latexdiff/latexdiff-1.3.1.1.ebuild
index 9330b2a48162..157df8a32ccb 100644
--- a/dev-tex/latexdiff/latexdiff-1.3.1.1.ebuild
+++ b/dev-tex/latexdiff/latexdiff-1.3.1.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
EGIT_REPO_URI="https://github.com/ftilmann/latexdiff.git"
else
SRC_URI="https://github.com/ftilmann/latexdiff/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
fi
LICENSE="GPL-3"
diff --git a/dev-tex/latexmk/latexmk-456.ebuild b/dev-tex/latexmk/latexmk-456.ebuild
index a52dab2f94b8..7be8d249f0ba 100644
--- a/dev-tex/latexmk/latexmk-456.ebuild
+++ b/dev-tex/latexmk/latexmk-456.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.phys.psu.edu/~collins/software/latexmk/${P}.zip"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
RDEPEND="virtual/latex-base
dev-lang/perl"
diff --git a/dev-tex/pgf/pgf-3.1.4b-r2.ebuild b/dev-tex/pgf/pgf-3.1.4b-r2.ebuild
index 5e578c7ce128..74694bbb1382 100644
--- a/dev-tex/pgf/pgf-3.1.4b-r2.ebuild
+++ b/dev-tex/pgf/pgf-3.1.4b-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI=" https://github.com/pgf-tikz/pgf/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="GPL-2 LPPL-1.3c FDL-1.2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc source"
RDEPEND="dev-texlive/texlive-latexrecommended"
diff --git a/dev-texlive/texlive-basic/texlive-basic-2020-r1.ebuild b/dev-texlive/texlive-basic/texlive-basic-2020-r1.ebuild
index d4d68cbe857d..44706f7774c7 100644
--- a/dev-texlive/texlive-basic/texlive-basic-2020-r1.ebuild
+++ b/dev-texlive/texlive-basic/texlive-basic-2020-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="TeXLive Essential programs and files"
LICENSE=" GPL-1 GPL-2 LPPL-1.3 LPPL-1.3c MIT OFL public-domain TeX TeX-other-free "
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="!<app-text/dvipsk-5.996_p20160523
>=app-text/texlive-core-2020[luajittex?]
diff --git a/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2020.ebuild b/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2020.ebuild
index 430608bfd39b..23b84ea04901 100644
--- a/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2020.ebuild
+++ b/dev-texlive/texlive-bibtexextra/texlive-bibtexextra-2020.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive BibTeX additional styles"
LICENSE=" Artistic-2 GPL-2 BSD-4 "
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-latex-2020
"
diff --git a/dev-texlive/texlive-context/texlive-context-2020.ebuild b/dev-texlive/texlive-context/texlive-context-2020.ebuild
index 9e64a303de35..08443f2ff32d 100644
--- a/dev-texlive/texlive-context/texlive-context-2020.ebuild
+++ b/dev-texlive/texlive-context/texlive-context-2020.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive ConTeXt and packages"
LICENSE=" BSD BSD-2 GPL-1 GPL-2 GPL-3 public-domain TeX-other-free "
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2020
>=dev-texlive/texlive-latex-2010
diff --git a/dev-texlive/texlive-fontsextra/texlive-fontsextra-2020.ebuild b/dev-texlive/texlive-fontsextra/texlive-fontsextra-2020.ebuild
index f2aaac6f6478..60ac858b6855 100644
--- a/dev-texlive/texlive-fontsextra/texlive-fontsextra-2020.ebuild
+++ b/dev-texlive/texlive-fontsextra/texlive-fontsextra-2020.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Additional fonts"
LICENSE=" Apache-2.0 GPL-2 LPPL-1.3 "
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2020
"
diff --git a/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2020.ebuild b/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2020.ebuild
index 35807cb0876b..6ee93a18c9fe 100644
--- a/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2020.ebuild
+++ b/dev-texlive/texlive-fontsrecommended/texlive-fontsrecommended-2020.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Recommended fonts"
LICENSE=" BSD GPL-1 GPL-2 LPPL-1.3 "
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2020
"
diff --git a/dev-texlive/texlive-fontutils/texlive-fontutils-2020.ebuild b/dev-texlive/texlive-fontutils/texlive-fontutils-2020.ebuild
index c338b4e2b815..65825dc2d54e 100644
--- a/dev-texlive/texlive-fontutils/texlive-fontutils-2020.ebuild
+++ b/dev-texlive/texlive-fontutils/texlive-fontutils-2020.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Graphics and font utilities"
LICENSE=" Artistic GPL-1 GPL-2 LPPL-1.3 public-domain TeX TeX-other-free "
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2020
"
diff --git a/dev-texlive/texlive-formatsextra/texlive-formatsextra-2020-r2.ebuild b/dev-texlive/texlive-formatsextra/texlive-formatsextra-2020-r2.ebuild
index 0ffb8993215b..c648ce66d5f2 100644
--- a/dev-texlive/texlive-formatsextra/texlive-formatsextra-2020-r2.ebuild
+++ b/dev-texlive/texlive-formatsextra/texlive-formatsextra-2020-r2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Additional formats"
LICENSE=" GPL-1 GPL-2 GPL-3 LPPL-1.3 public-domain TeX "
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2020
>=dev-texlive/texlive-latex-2020
diff --git a/dev-texlive/texlive-games/texlive-games-2020.ebuild b/dev-texlive/texlive-games/texlive-games-2020.ebuild
index 559d300b92c6..33128fcc6a32 100644
--- a/dev-texlive/texlive-games/texlive-games-2020.ebuild
+++ b/dev-texlive/texlive-games/texlive-games-2020.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Games typesetting"
LICENSE=" GPL-2 CC-BY-SA-4.0 "
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-latex-2020
"
diff --git a/dev-texlive/texlive-humanities/texlive-humanities-2020.ebuild b/dev-texlive/texlive-humanities/texlive-humanities-2020.ebuild
index 1ca6871e8f0a..e47f6ea7a4eb 100644
--- a/dev-texlive/texlive-humanities/texlive-humanities-2020.ebuild
+++ b/dev-texlive/texlive-humanities/texlive-humanities-2020.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Humanities packages"
LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c "
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-latex-2020
"
diff --git a/dev-texlive/texlive-langarabic/texlive-langarabic-2020.ebuild b/dev-texlive/texlive-langarabic/texlive-langarabic-2020.ebuild
index 7571ab693de2..d8332f597fb3 100644
--- a/dev-texlive/texlive-langarabic/texlive-langarabic-2020.ebuild
+++ b/dev-texlive/texlive-langarabic/texlive-langarabic-2020.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Arabic"
LICENSE=" CC-BY-SA-4.0 GPL-2 GPL-3+ LPPL-1.3 LPPL-1.3c MIT "
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2020
"
diff --git a/dev-texlive/texlive-langchinese/texlive-langchinese-2020.ebuild b/dev-texlive/texlive-langchinese/texlive-langchinese-2020.ebuild
index e4d3a166968f..d5813c73a326 100644
--- a/dev-texlive/texlive-langchinese/texlive-langchinese-2020.ebuild
+++ b/dev-texlive/texlive-langchinese/texlive-langchinese-2020.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Chinese"
LICENSE=" FDL-1.1 GPL-1 GPL-2 LGPL-2 LPPL-1.3 LPPL-1.3c public-domain TeX TeX-other-free "
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-langcjk-2020
"
diff --git a/dev-texlive/texlive-langcjk/texlive-langcjk-2020.ebuild b/dev-texlive/texlive-langcjk/texlive-langcjk-2020.ebuild
index c1701847b165..d5a9bdc8153e 100644
--- a/dev-texlive/texlive-langcjk/texlive-langcjk-2020.ebuild
+++ b/dev-texlive/texlive-langcjk/texlive-langcjk-2020.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Chinese/Japanese/Korean (base)"
LICENSE=" BSD GPL-2 GPL-3 LPPL-1.3 LPPL-1.3c MIT TeX "
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2020
>=app-text/texlive-core-2010[cjk]
diff --git a/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2020.ebuild b/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2020.ebuild
index 5d91816ec0ab..f6ad81ab2646 100644
--- a/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2020.ebuild
+++ b/dev-texlive/texlive-langcyrillic/texlive-langcyrillic-2020.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Cyrillic"
LICENSE=" GPL-1 GPL-2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free "
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2020
>=dev-texlive/texlive-latex-2020
diff --git a/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2020.ebuild b/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2020.ebuild
index 5e4c8cdadf6f..e4232f5ae982 100644
--- a/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2020.ebuild
+++ b/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2020.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Czech/Slovak"
LICENSE=" GPL-1 GPL-2 LPPL-1.3 TeX-other-free "
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2020
>=dev-texlive/texlive-latex-2020
diff --git a/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2021.ebuild b/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2021.ebuild
index 4799531da4bd..3161240e552a 100644
--- a/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2021.ebuild
+++ b/dev-texlive/texlive-langczechslovak/texlive-langczechslovak-2021.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Czech/Slovak"
LICENSE=" GPL-1 GPL-2 LPPL-1.3 TeX-other-free "
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2021
>=dev-texlive/texlive-latex-2021
diff --git a/dev-texlive/texlive-langenglish/texlive-langenglish-2020.ebuild b/dev-texlive/texlive-langenglish/texlive-langenglish-2020.ebuild
index 091b1981b6d5..f8a3481ed4f4 100644
--- a/dev-texlive/texlive-langenglish/texlive-langenglish-2020.ebuild
+++ b/dev-texlive/texlive-langenglish/texlive-langenglish-2020.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive US and UK English"
LICENSE=" FDL-1.1 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX TeX-other-free "
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2020
"
diff --git a/dev-texlive/texlive-langeuropean/texlive-langeuropean-2020.ebuild b/dev-texlive/texlive-langeuropean/texlive-langeuropean-2020.ebuild
index 161b6cbe968d..6dc2037fd331 100644
--- a/dev-texlive/texlive-langeuropean/texlive-langeuropean-2020.ebuild
+++ b/dev-texlive/texlive-langeuropean/texlive-langeuropean-2020.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Other European languages"
LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX-other-free "
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2020
"
diff --git a/dev-texlive/texlive-langfrench/texlive-langfrench-2020.ebuild b/dev-texlive/texlive-langfrench/texlive-langfrench-2020.ebuild
index e785e3eb8bfd..707971fa2665 100644
--- a/dev-texlive/texlive-langfrench/texlive-langfrench-2020.ebuild
+++ b/dev-texlive/texlive-langfrench/texlive-langfrench-2020.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive French"
LICENSE=" GPL-2 CC-BY-SA-4.0 "
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2020
"
diff --git a/dev-texlive/texlive-langgerman/texlive-langgerman-2020.ebuild b/dev-texlive/texlive-langgerman/texlive-langgerman-2020.ebuild
index f05e5ddef3be..0e0303abce0b 100644
--- a/dev-texlive/texlive-langgerman/texlive-langgerman-2020.ebuild
+++ b/dev-texlive/texlive-langgerman/texlive-langgerman-2020.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive German"
LICENSE=" FDL-1.1 GPL-1 GPL-2 LPPL-1.3 LPPL-1.3c MIT OPL TeX-other-free "
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2020
"
diff --git a/dev-texlive/texlive-langgreek/texlive-langgreek-2020.ebuild b/dev-texlive/texlive-langgreek/texlive-langgreek-2020.ebuild
index 5c985a2d43e6..d48cf69b30fe 100644
--- a/dev-texlive/texlive-langgreek/texlive-langgreek-2020.ebuild
+++ b/dev-texlive/texlive-langgreek/texlive-langgreek-2020.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Greek"
LICENSE=" GPL-1 GPL-2 LGPL-3 LPPL-1.3 LPPL-1.3c public-domain TeX-other-free "
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2020
"
diff --git a/dev-texlive/texlive-langitalian/texlive-langitalian-2020.ebuild b/dev-texlive/texlive-langitalian/texlive-langitalian-2020.ebuild
index 7b0f2db7e6fd..a9a03f244d9b 100644
--- a/dev-texlive/texlive-langitalian/texlive-langitalian-2020.ebuild
+++ b/dev-texlive/texlive-langitalian/texlive-langitalian-2020.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Italian"
LICENSE=" FDL-1.1 GPL-1 GPL-2 LGPL-2 LPPL-1.3 LPPL-1.3c TeX-other-free "
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2020
"
diff --git a/dev-texlive/texlive-langjapanese/texlive-langjapanese-2020.ebuild b/dev-texlive/texlive-langjapanese/texlive-langjapanese-2020.ebuild
index 55ebfd9132cb..1f9c21908b27 100644
--- a/dev-texlive/texlive-langjapanese/texlive-langjapanese-2020.ebuild
+++ b/dev-texlive/texlive-langjapanese/texlive-langjapanese-2020.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Japanese"
LICENSE=" BSD BSD-2 GPL-1 GPL-2 GPL-3 LPPL-1.3 MIT OFL public-domain TeX TeX-other-free "
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-langcjk-2020
"
diff --git a/dev-texlive/texlive-langkorean/texlive-langkorean-2020.ebuild b/dev-texlive/texlive-langkorean/texlive-langkorean-2020.ebuild
index 93eff3abf7d5..aa3137085460 100644
--- a/dev-texlive/texlive-langkorean/texlive-langkorean-2020.ebuild
+++ b/dev-texlive/texlive-langkorean/texlive-langkorean-2020.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Korean"
LICENSE=" FDL-1.1 GPL-2 LPPL-1.3 OFL TeX-other-free "
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-langcjk-2020
"
diff --git a/dev-texlive/texlive-langother/texlive-langother-2020.ebuild b/dev-texlive/texlive-langother/texlive-langother-2020.ebuild
index 1707e380a339..564e3caa7773 100644
--- a/dev-texlive/texlive-langother/texlive-langother-2020.ebuild
+++ b/dev-texlive/texlive-langother/texlive-langother-2020.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Other languages"
LICENSE=" CC-BY-SA-4.0 GPL-1 GPL-2 LPPL-1.3 "
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2020
>=dev-texlive/texlive-basic-2019
diff --git a/dev-texlive/texlive-langpolish/texlive-langpolish-2020.ebuild b/dev-texlive/texlive-langpolish/texlive-langpolish-2020.ebuild
index 6a81d54f136d..0c566235c87c 100644
--- a/dev-texlive/texlive-langpolish/texlive-langpolish-2020.ebuild
+++ b/dev-texlive/texlive-langpolish/texlive-langpolish-2020.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Polish"
LICENSE=" FDL-1.1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX "
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-latex-2020
>=dev-texlive/texlive-basic-2020
diff --git a/dev-texlive/texlive-langportuguese/texlive-langportuguese-2020.ebuild b/dev-texlive/texlive-langportuguese/texlive-langportuguese-2020.ebuild
index d89c0f7434d9..c03c7082bf0d 100644
--- a/dev-texlive/texlive-langportuguese/texlive-langportuguese-2020.ebuild
+++ b/dev-texlive/texlive-langportuguese/texlive-langportuguese-2020.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Portuguese"
LICENSE=" GPL-1 GPL-2 GPL-2+ "
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2020
"
diff --git a/dev-texlive/texlive-langspanish/texlive-langspanish-2020.ebuild b/dev-texlive/texlive-langspanish/texlive-langspanish-2020.ebuild
index 7707faed5325..cd27dc1ed011 100644
--- a/dev-texlive/texlive-langspanish/texlive-langspanish-2020.ebuild
+++ b/dev-texlive/texlive-langspanish/texlive-langspanish-2020.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Spanish"
LICENSE=" GPL-2 LPPL-1.3 public-domain TeX-other-free "
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2020
"
diff --git a/dev-texlive/texlive-latex/texlive-latex-2020.ebuild b/dev-texlive/texlive-latex/texlive-latex-2020.ebuild
index 33adfc07ed36..a17c98ea2904 100644
--- a/dev-texlive/texlive-latex/texlive-latex-2020.ebuild
+++ b/dev-texlive/texlive-latex/texlive-latex-2020.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LaTeX fundamental packages"
LICENSE=" GPL-2 LPPL-1.3 LPPL-1.3c public-domain "
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2020
!~dev-texlive/texlive-latexrecommended-2019
diff --git a/dev-texlive/texlive-latexextra/texlive-latexextra-2020-r2.ebuild b/dev-texlive/texlive-latexextra/texlive-latexextra-2020-r2.ebuild
index 3c74b3fd7b29..1d53d654d1ed 100644
--- a/dev-texlive/texlive-latexextra/texlive-latexextra-2020-r2.ebuild
+++ b/dev-texlive/texlive-latexextra/texlive-latexextra-2020-r2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LaTeX additional packages"
LICENSE=" Apache-2.0 Artistic BSD CC-BY-SA-4.0 GPL-1 GPL-2 GPL-3 GPL-3+ LPPL-1.3 "
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-latexrecommended-2020
>=dev-texlive/texlive-pictures-2020
diff --git a/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2020.ebuild b/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2020.ebuild
index 12f4689a4911..5fe700959668 100644
--- a/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2020.ebuild
+++ b/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2020.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LaTeX recommended packages"
LICENSE=" GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT "
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-latex-2020
"
diff --git a/dev-texlive/texlive-luatex/texlive-luatex-2020-r2.ebuild b/dev-texlive/texlive-luatex/texlive-luatex-2020-r2.ebuild
index 7c3ed5844cc9..5a08b24b4593 100644
--- a/dev-texlive/texlive-luatex/texlive-luatex-2020-r2.ebuild
+++ b/dev-texlive/texlive-luatex/texlive-luatex-2020-r2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive LuaTeX packages"
LICENSE=" BSD FDL-1.1 GPL-2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free "
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2020
>=dev-texlive/texlive-fontsrecommended-2020
diff --git a/dev-texlive/texlive-mathscience/texlive-mathscience-2020.ebuild b/dev-texlive/texlive-mathscience/texlive-mathscience-2020.ebuild
index fd1d7fdfda2d..c658bdaa1133 100644
--- a/dev-texlive/texlive-mathscience/texlive-mathscience-2020.ebuild
+++ b/dev-texlive/texlive-mathscience/texlive-mathscience-2020.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Mathematics, natural sciences, computer science packages"
LICENSE=" BSD BSD-2 CC-BY-SA-4.0 GPL-1 GPL-2 GPL-3 GPL-3+ "
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-fontsrecommended-2020
>=dev-texlive/texlive-latex-2020
diff --git a/dev-texlive/texlive-metapost/texlive-metapost-2020-r1.ebuild b/dev-texlive/texlive-metapost/texlive-metapost-2020-r1.ebuild
index 726a09ac55b5..3865afc0d5ed 100644
--- a/dev-texlive/texlive-metapost/texlive-metapost-2020-r1.ebuild
+++ b/dev-texlive/texlive-metapost/texlive-metapost-2020-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive MetaPost and Metafont packages"
LICENSE=" CC-BY-SA-4.0 GPL-1 GPL-2 GPL-2+ GPL-3+ LGPL-2 LPPL-1.3 MIT public-domain TeX-other-free "
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2020
"
diff --git a/dev-texlive/texlive-music/texlive-music-2020.ebuild b/dev-texlive/texlive-music/texlive-music-2020.ebuild
index f474869357ba..f6e3fa12a73b 100644
--- a/dev-texlive/texlive-music/texlive-music-2020.ebuild
+++ b/dev-texlive/texlive-music/texlive-music-2020.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Music packages"
LICENSE=" FDL-1.1 GPL-1 GPL-2 GPL-2+ "
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-latex-2020
"
diff --git a/dev-texlive/texlive-pictures/texlive-pictures-2020-r2.ebuild b/dev-texlive/texlive-pictures/texlive-pictures-2020-r2.ebuild
index 40f3607ddfa8..616f6316a207 100644
--- a/dev-texlive/texlive-pictures/texlive-pictures-2020-r2.ebuild
+++ b/dev-texlive/texlive-pictures/texlive-pictures-2020-r2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Graphics, pictures, diagrams"
LICENSE=" Apache-2.0 BSD-2 GPL-2 GPL-2+ CC-BY-SA-4.0 "
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2020
>=dev-tex/pgf-3.0.1
diff --git a/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2020.ebuild b/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2020.ebuild
index ffa69b7cecf0..eb52f6c4d892 100644
--- a/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2020.ebuild
+++ b/dev-texlive/texlive-plaingeneric/texlive-plaingeneric-2020.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Plain (La)TeX packages"
LICENSE=" GPL-1 GPL-2 GPL-3 LPPL-1.3 LPPL-1.3c public-domain TeX TeX-other-free "
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2020
"
diff --git a/dev-texlive/texlive-pstricks/texlive-pstricks-2020.ebuild b/dev-texlive/texlive-pstricks/texlive-pstricks-2020.ebuild
index 064db1963fc5..f69bbc61f5c4 100644
--- a/dev-texlive/texlive-pstricks/texlive-pstricks-2020.ebuild
+++ b/dev-texlive/texlive-pstricks/texlive-pstricks-2020.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive PSTricks"
LICENSE=" GPL-1 GPL-2 LGPL-2 LGPL-3 LPPL-1.2 LPPL-1.3 LPPL-1.3c "
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2020
>=dev-texlive/texlive-plaingeneric-2020
diff --git a/dev-texlive/texlive-publishers/texlive-publishers-2020.ebuild b/dev-texlive/texlive-publishers/texlive-publishers-2020.ebuild
index d573a36c50b9..a94306993ffd 100644
--- a/dev-texlive/texlive-publishers/texlive-publishers-2020.ebuild
+++ b/dev-texlive/texlive-publishers/texlive-publishers-2020.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive Publisher styles, theses, etc."
LICENSE=" Apache-2.0 BSD GPL-2 CC0-1.0 "
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-latex-2020
"
diff --git a/dev-texlive/texlive-xetex/texlive-xetex-2020.ebuild b/dev-texlive/texlive-xetex/texlive-xetex-2020.ebuild
index 92205ec4b024..ea871047b31a 100644
--- a/dev-texlive/texlive-xetex/texlive-xetex-2020.ebuild
+++ b/dev-texlive/texlive-xetex/texlive-xetex-2020.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="TeXLive XeTeX and packages"
LICENSE=" Apache-2.0 GPL-1 GPL-2 LGPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT CC-BY-4.0 "
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-texlive/texlive-basic-2020
>=dev-texlive/texlive-latexextra-2010
diff --git a/dev-util/aruba/aruba-0.6.2-r2.ebuild b/dev-util/aruba/aruba-0.6.2-r2.ebuild
index 63e3a70e5fbb..2f0ef589dad6 100644
--- a/dev-util/aruba/aruba-0.6.2-r2.ebuild
+++ b/dev-util/aruba/aruba-0.6.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,7 +16,7 @@ DESCRIPTION="Cucumber steps for driving out command line applications"
HOMEPAGE="https://github.com/cucumber/aruba"
LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
SLOT="0"
IUSE=""
diff --git a/dev-util/byacc/byacc-20200330.ebuild b/dev-util/byacc/byacc-20200330.ebuild
index bb2ce413af79..b7181571aa4b 100644
--- a/dev-util/byacc/byacc-20200330.ebuild
+++ b/dev-util/byacc/byacc-20200330.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
diff --git a/dev-util/byacc/byacc-20200910.ebuild b/dev-util/byacc/byacc-20200910.ebuild
index bb2ce413af79..b7181571aa4b 100644
--- a/dev-util/byacc/byacc-20200910.ebuild
+++ b/dev-util/byacc/byacc-20200910.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
diff --git a/dev-util/catalyst/catalyst-3.0.17.ebuild b/dev-util/catalyst/catalyst-3.0.17.ebuild
index af6dd3d18754..5793fe90faef 100644
--- a/dev-util/catalyst/catalyst-3.0.17.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.17.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999* ]]; then
EGIT_BRANCH="master"
else
SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
fi
PYTHON_COMPAT=( python3_{8,9} )
diff --git a/dev-util/ccache/ccache-4.2.ebuild b/dev-util/ccache/ccache-4.2.ebuild
index fd6f6858d85d..543cf2ad6286 100644
--- a/dev-util/ccache/ccache-4.2.ebuild
+++ b/dev-util/ccache/ccache-4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
LICENSE="GPL-3 LGPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="test"
DEPEND=""
diff --git a/dev-util/cgvg/cgvg-1.6.3.ebuild b/dev-util/cgvg/cgvg-1.6.3.ebuild
index 81dae35db07e..ba43b30f7172 100644
--- a/dev-util/cgvg/cgvg-1.6.3.ebuild
+++ b/dev-util/cgvg/cgvg-1.6.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://uzix.org/cgvg/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
RDEPEND="dev-lang/perl"
DEPEND="${RDEPEND}"
diff --git a/dev-util/cmake/cmake-3.18.5.ebuild b/dev-util/cmake/cmake-3.18.5.ebuild
index 021bf938c8d9..be86fdd110e6 100644
--- a/dev-util/cmake/cmake-3.18.5.ebuild
+++ b/dev-util/cmake/cmake-3.18.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
LICENSE="CMake"
SLOT="0"
[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs ncurses qt5 test"
RESTRICT="!test? ( test )"
diff --git a/dev-util/colm/colm-0.13.0.7.ebuild b/dev-util/colm/colm-0.13.0.7.ebuild
index 5b28484b3b1c..4fed19084baf 100644
--- a/dev-util/colm/colm-0.13.0.7.ebuild
+++ b/dev-util/colm/colm-0.13.0.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
BDEPEND="app-text/asciidoc"
diff --git a/dev-util/colm/colm-0.14.7.ebuild b/dev-util/colm/colm-0.14.7.ebuild
index 444e033d235e..a22badfbe4df 100644
--- a/dev-util/colm/colm-0.14.7.ebuild
+++ b/dev-util/colm/colm-0.14.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="doc"
BDEPEND="
diff --git a/dev-util/cppunit/cppunit-1.14.0.ebuild b/dev-util/cppunit/cppunit-1.14.0.ebuild
index 73e0b0e8e661..f8d6b23177e3 100644
--- a/dev-util/cppunit/cppunit-1.14.0.ebuild
+++ b/dev-util/cppunit/cppunit-1.14.0.ebuild
@@ -15,7 +15,7 @@ LICENSE="LGPL-2.1"
SLOT="0"
# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
[[ ${PV} = 9999 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="doc examples static-libs"
RDEPEND=""
diff --git a/dev-util/cppunit/cppunit-1.15.1-r2.ebuild b/dev-util/cppunit/cppunit-1.15.1-r2.ebuild
index 12d9b51ade87..5e3684f870d7 100644
--- a/dev-util/cppunit/cppunit-1.15.1-r2.ebuild
+++ b/dev-util/cppunit/cppunit-1.15.1-r2.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/cppunit.git"
else
SRC_URI="https://dev-www.libreoffice.org/src/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
fi
LICENSE="LGPL-2.1"
SLOT="0/1.15"
diff --git a/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild b/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild
index d67758d2596a..d236dfdf7e4f 100644
--- a/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild
+++ b/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -10,7 +10,7 @@ SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/dev-util/cscope/cscope-15.8a-r1.ebuild b/dev-util/cscope/cscope-15.8a-r1.ebuild
index 1dc92f952e48..560fb85eb311 100644
--- a/dev-util/cscope/cscope-15.8a-r1.ebuild
+++ b/dev-util/cscope/cscope-15.8a-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
LICENSE="BSD GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="emacs"
RDEPEND=">=sys-libs/ncurses-5.2:0=
diff --git a/dev-util/ctags/ctags-20190331.ebuild b/dev-util/ctags/ctags-20190331.ebuild
index 667aae24cf15..cfd6b8d756ae 100644
--- a/dev-util/ctags/ctags-20190331.ebuild
+++ b/dev-util/ctags/ctags-20190331.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/universal-ctags/ctags/archive/${COMMITHASH}.tar.gz -
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="json xml yaml"
CDEPEND="
diff --git a/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild b/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild
index 14b3610ba9c6..8be0d4dfaf35 100644
--- a/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild
+++ b/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby-core/archive/v${PV}.tar.gz ->
RUBY_S="cucumber-ruby-core-${PV}"
LICENSE="Ruby"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
SLOT="$(ver_cut 1-2)"
IUSE="test"
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
index 208fee6a9ffd..109e8741fd07 100644
--- a/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
+++ b/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,5 +14,5 @@ DESCRIPTION="a simpler alternative to Regular Expressions"
HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
SLOT="6.0"
diff --git a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
index dec93497b0fe..62ce751f726a 100644
--- a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
+++ b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,5 +14,5 @@ DESCRIPTION="Cucumber tag expressions for ruby"
HOMEPAGE="https://docs.cucumber.io/tag-expressions/"
LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
SLOT="1"
diff --git a/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild b/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild
index 0da795ecad21..1566152f684f 100644
--- a/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild
+++ b/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,7 @@ DESCRIPTION="Executable feature scenarios"
HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
LICENSE="Ruby"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
SLOT="0"
IUSE="test"
diff --git a/dev-util/cucumber/cucumber-3.1.2.ebuild b/dev-util/cucumber/cucumber-3.1.2.ebuild
index 3a08be31777e..bffd18f6ac02 100644
--- a/dev-util/cucumber/cucumber-3.1.2.ebuild
+++ b/dev-util/cucumber/cucumber-3.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}
RUBY_S="cucumber-ruby-${PV}"
LICENSE="Ruby"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
SLOT="0"
IUSE="examples test"
diff --git a/dev-util/cunit/cunit-2.1_p3.ebuild b/dev-util/cunit/cunit-2.1_p3.ebuild
index 240c4c062af8..c3b986ffac21 100644
--- a/dev-util/cunit/cunit-2.1_p3.ebuild
+++ b/dev-util/cunit/cunit-2.1_p3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/cunit/${MY_P}.tar.bz2"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="ncurses static-libs"
RDEPEND="ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )"
diff --git a/dev-util/dejagnu/dejagnu-1.6.2.ebuild b/dev-util/dejagnu/dejagnu-1.6.2.ebuild
index 5a9d42b87d53..aef6b3c5cf26 100644
--- a/dev-util/dejagnu/dejagnu-1.6.2.ebuild
+++ b/dev-util/dejagnu/dejagnu-1.6.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="dev-lang/tcl
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild
index e840c118b763..c9c70c4e60d2 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="emacs"
RDEPEND=">=dev-libs/glib-2.12:2
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
index 9735307edd5e..2cce1246a33e 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="emacs"
RDEPEND=">=dev-libs/glib-2.12:2"
diff --git a/dev-util/dialog/dialog-1.3.20170131.ebuild b/dev-util/dialog/dialog-1.3.20170131.ebuild
index db301d4e57c9..f6a0ef2a49f9 100644
--- a/dev-util/dialog/dialog-1.3.20170131.ebuild
+++ b/dev-util/dialog/dialog-1.3.20170131.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="ftp://invisible-island.net/${PN}/${MY_P}.tgz"
LICENSE="GPL-2"
SLOT="0/14"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="examples minimal nls static-libs unicode"
RDEPEND="
diff --git a/dev-util/dialog/dialog-1.3.20200327.ebuild b/dev-util/dialog/dialog-1.3.20200327.ebuild
index 87b962bd543a..3be5a5d049b2 100644
--- a/dev-util/dialog/dialog-1.3.20200327.ebuild
+++ b/dev-util/dialog/dialog-1.3.20200327.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~jer/${DIA_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/15"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="examples minimal nls static-libs unicode"
RDEPEND="
diff --git a/dev-util/diffstat/diffstat-1.63.ebuild b/dev-util/diffstat/diffstat-1.63.ebuild
index 1023f662646d..dbb0ae8eb11f 100644
--- a/dev-util/diffstat/diffstat-1.63.ebuild
+++ b/dev-util/diffstat/diffstat-1.63.ebuild
@@ -9,5 +9,5 @@ SRC_URI="https://invisible-mirror.net/archives/${PN}/${P}.tgz"
LICENSE="HPND"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE=""
diff --git a/dev-util/diffstat/diffstat-1.64.ebuild b/dev-util/diffstat/diffstat-1.64.ebuild
index 7d3b27a36b50..d3caf103fc0e 100644
--- a/dev-util/diffstat/diffstat-1.64.ebuild
+++ b/dev-util/diffstat/diffstat-1.64.ebuild
@@ -9,4 +9,4 @@ SRC_URI="https://invisible-mirror.net/archives/${PN}/${P}.tgz"
LICENSE="HPND"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.66.7.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.66.7.ebuild
index ce9171f385e4..8edc360f90f7 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.66.7.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.66.7.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE=""
RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/glib-utils/glib-utils-2.66.7.ebuild b/dev-util/glib-utils/glib-utils-2.66.7.ebuild
index 8b84e0c8ae06..49e929118d26 100644
--- a/dev-util/glib-utils/glib-utils-2.66.7.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.66.7.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
RDEPEND="${PYTHON_DEPS}
!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/gob/gob-2.0.20.ebuild b/dev-util/gob/gob-2.0.20.ebuild
index 1e11184047df..cbb2cea1b114 100644
--- a/dev-util/gob/gob-2.0.20.ebuild
+++ b/dev-util/gob/gob-2.0.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.jirka.org/gob.html"
LICENSE="GPL-2+"
SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
RDEPEND=">=dev-libs/glib-2.4:2"
diff --git a/dev-util/gperf/gperf-3.1.ebuild b/dev-util/gperf/gperf-3.1.ebuild
index 9dfa8b32aa7a..621895047b88 100644
--- a/dev-util/gperf/gperf-3.1.ebuild
+++ b/dev-util/gperf/gperf-3.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/gperf/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
src_prepare() {
sed -i \
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild
index 11d4c9b7e440..8068a6397922 100644
--- a/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild
+++ b/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtk.org/gtk-doc/"
LICENSE="GPL-2 FDL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.33.1.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.33.1.ebuild
index 791def1339e3..303d509eb38a 100644
--- a/dev-util/gtk-doc-am/gtk-doc-am-1.33.1.ebuild
+++ b/dev-util/gtk-doc-am/gtk-doc-am-1.33.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/DocumentationProject/GtkDoc"
LICENSE="GPL-2 FDL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="!<dev-util/gtk-doc-${GNOME_ORG_PVP}"
PDEPEND="virtual/pkgconfig"
diff --git a/dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild
index 360fe3b62e3e..a04cee03cdd3 100644
--- a/dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtk.org/gtk-doc/"
LICENSE="GPL-2 FDL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
IUSE="debug doc emacs"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild b/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
index 104510578e78..31d24720fdee 100644
--- a/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtk.org/gtk-doc/"
LICENSE="GPL-2 FDL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
IUSE="debug doc emacs"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/gtk-doc/gtk-doc-1.33.1-r4.ebuild b/dev-util/gtk-doc/gtk-doc-1.33.1-r4.ebuild
index c47d56cb5e2c..18c12d44b238 100644
--- a/dev-util/gtk-doc/gtk-doc-1.33.1-r4.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.33.1-r4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/DocumentationProject/GtkDoc"
LICENSE="GPL-2 FDL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
IUSE="emacs test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.20.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.20.ebuild
index e76f297c4a5e..ae5c75c34c83 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.20.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.20.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# man page was previously installed by gtk+:3 ebuild
RDEPEND="
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild
index da8468021f13..5d650a3c1b1b 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# man page was previously installed by gtk+:3 ebuild
RDEPEND="
diff --git a/dev-util/indent/indent-2.2.12.ebuild b/dev-util/indent/indent-2.2.12.ebuild
index a3c8834d1a88..bf0c13f9b9d0 100644
--- a/dev-util/indent/indent-2.2.12.ebuild
+++ b/dev-util/indent/indent-2.2.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="nls"
BDEPEND="
diff --git a/dev-util/intltool/intltool-0.51.0-r2.ebuild b/dev-util/intltool/intltool-0.51.0-r2.ebuild
index 2965449e0eda..57610db9bc65 100644
--- a/dev-util/intltool/intltool-0.51.0-r2.ebuild
+++ b/dev-util/intltool/intltool-0.51.0-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="
diff --git a/dev-util/itstool/itstool-2.0.6-r1.ebuild b/dev-util/itstool/itstool-2.0.6-r1.ebuild
index 2ee27907e0e9..b19f6de375fd 100644
--- a/dev-util/itstool/itstool-2.0.6-r1.ebuild
+++ b/dev-util/itstool/itstool-2.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="http://files.itstool.org/itstool/${P}.tar.bz2"
# files in /usr/share/itstool/its are under a special exception || GPL-3+
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/kyua/kyua-0.13-r2.ebuild b/dev-util/kyua/kyua-0.13-r2.ebuild
index 21bd972f1b1f..1a0cd80bcf21 100644
--- a/dev-util/kyua/kyua-0.13-r2.ebuild
+++ b/dev-util/kyua/kyua-0.13-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/jmmv/kyua/releases/download/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
IUSE="test"
# Tests fail
diff --git a/dev-util/meson-format-array/meson-format-array-0.ebuild b/dev-util/meson-format-array/meson-format-array-0.ebuild
index c4b0d0f59e7d..35784b4af86b 100644
--- a/dev-util/meson-format-array/meson-format-array-0.ebuild
+++ b/dev-util/meson-format-array/meson-format-array-0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/meson/meson-0.55.3.ebuild b/dev-util/meson/meson-0.55.3.ebuild
index 6652fcc49a6d..222ec56e86e0 100644
--- a/dev-util/meson/meson-0.55.3.ebuild
+++ b/dev-util/meson/meson-0.55.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999* ]]; then
inherit git-r3
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/meson/meson-0.56.2.ebuild b/dev-util/meson/meson-0.56.2.ebuild
index bc780abea9a6..20afc602e2bf 100644
--- a/dev-util/meson/meson-0.56.2.ebuild
+++ b/dev-util/meson/meson-0.56.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999* ]]; then
inherit git-r3
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/ninja/ninja-1.10.0.ebuild b/dev-util/ninja/ninja-1.10.0.ebuild
index 36caa68d673c..65080c06b8b7 100644
--- a/dev-util/ninja/ninja-1.10.0.ebuild
+++ b/dev-util/ninja/ninja-1.10.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
else
SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/ninja/ninja-1.10.1.ebuild b/dev-util/ninja/ninja-1.10.1.ebuild
index 2e7cf0756d5f..dc00405e447b 100644
--- a/dev-util/ninja/ninja-1.10.1.ebuild
+++ b/dev-util/ninja/ninja-1.10.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
else
SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
index c5b170d76c04..786d229b8a5c 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
else
SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
fi
DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/patchutils/patchutils-0.3.4.ebuild b/dev-util/patchutils/patchutils-0.3.4.ebuild
index 4ae2f9018696..83ac11044fb0 100644
--- a/dev-util/patchutils/patchutils-0.3.4.ebuild
+++ b/dev-util/patchutils/patchutils-0.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://cyberelk.net/tim/data/patchutils/stable/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE=""
PATCHES=(
diff --git a/dev-util/pkgconf/pkgconf-1.6.3.ebuild b/dev-util/pkgconf/pkgconf-1.6.3.ebuild
index 1338eee18e3d..1593586bcec8 100644
--- a/dev-util/pkgconf/pkgconf-1.6.3.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2020 Gentoo Authors
+# Copyright 2012-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://git.sr.ht/~kaniini/pkgconf"
else
SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
fi
DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
index 73edc7072dd3..087cbbe7251b 100644
--- a/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="https://anongit.freedesktop.org/git/pkg-config.git"
inherit autotools git-2
else
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
fi
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
index 4b4e246111c5..d854a38b0820 100644
--- a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
inherit autotools git-r3
else
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
fi
diff --git a/dev-util/ragel/ragel-6.10.ebuild b/dev-util/ragel/ragel-6.10.ebuild
index 00b8d07df42b..e28001024b64 100644
--- a/dev-util/ragel/ragel-6.10.ebuild
+++ b/dev-util/ragel/ragel-6.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.colm.net/files/ragel/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# We need to get the txl language in Portage to have the tests :(
RESTRICT="test"
diff --git a/dev-util/ragel/ragel-7.0.0.12.ebuild b/dev-util/ragel/ragel-7.0.0.12.ebuild
index 4e9ea84551da..9b8dc312fa61 100644
--- a/dev-util/ragel/ragel-7.0.0.12.ebuild
+++ b/dev-util/ragel/ragel-7.0.0.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="vim-syntax"
DEPEND="~dev-util/colm-0.13.0.7"
diff --git a/dev-util/ragel/ragel-7.0.4.ebuild b/dev-util/ragel/ragel-7.0.4.ebuild
index 786191b6bf63..f97334957561 100644
--- a/dev-util/ragel/ragel-7.0.4.ebuild
+++ b/dev-util/ragel/ragel-7.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="doc"
# Notes from bug #766090
diff --git a/dev-util/re2c/re2c-2.0.3.ebuild b/dev-util/re2c/re2c-2.0.3.ebuild
index a556857c71d9..6057a230e385 100644
--- a/dev-util/re2c/re2c-2.0.3.ebuild
+++ b/dev-util/re2c/re2c-2.0.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.xz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug"
src_configure() {
diff --git a/dev-util/sel/sel-0.08.4-r2.ebuild b/dev-util/sel/sel-0.08.4-r2.ebuild
index c301ba522d1b..9b221d67450c 100644
--- a/dev-util/sel/sel-0.08.4-r2.ebuild
+++ b/dev-util/sel/sel-0.08.4-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.rninet.de/darkstar/sel.html"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="amd64 ppc s390 sparc x86"
+KEYWORDS="amd64 ppc ~s390 sparc x86"
RDEPEND="sys-libs/ncurses:0="
BDEPEND="virtual/pkgconfig"
diff --git a/dev-util/shadowman/shadowman-2.ebuild b/dev-util/shadowman/shadowman-2.ebuild
index 1f8ac445a79e..a9ade3439891 100644
--- a/dev-util/shadowman/shadowman-2.ebuild
+++ b/dev-util/shadowman/shadowman-2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/shadowman/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE=""
RDEPEND="app-admin/eselect"
diff --git a/dev-util/shflags/shflags-1.0.3.ebuild b/dev-util/shflags/shflags-1.0.3.ebuild
index b03ab47675da..1fd9584fc8c9 100644
--- a/dev-util/shflags/shflags-1.0.3.ebuild
+++ b/dev-util/shflags/shflags-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/kward/shflags/archive/${PV}.tar.gz -> ${P}.tgz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="examples"
src_test() {
diff --git a/dev-util/shflags/shflags-1.2.3.ebuild b/dev-util/shflags/shflags-1.2.3.ebuild
index 87735aff81d9..6233ce0dfd89 100644
--- a/dev-util/shflags/shflags-1.2.3.ebuild
+++ b/dev-util/shflags/shflags-1.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/kward/shflags/archive/v${PV}.tar.gz -> ${P}.tgz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="examples"
src_test() {
diff --git a/dev-util/shtool/shtool-2.0.8-r1.ebuild b/dev-util/shtool/shtool-2.0.8-r1.ebuild
index 993cd50fb8cd..bd2306568a42 100644
--- a/dev-util/shtool/shtool-2.0.8-r1.ebuild
+++ b/dev-util/shtool/shtool-2.0.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ia64 ppc s390 sparc x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc ~s390 sparc x86"
IUSE=""
DEPEND="dev-lang/perl"
diff --git a/dev-util/strace/strace-5.8.ebuild b/dev-util/strace/strace-5.8.ebuild
index ccb5d555782b..c6e695ce32de 100644
--- a/dev-util/strace/strace-5.8.ebuild
+++ b/dev-util/strace/strace-5.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3 autotools
else
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
fi
DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
diff --git a/dev-util/systemtap/systemtap-4.0-r1.ebuild b/dev-util/systemtap/systemtap-4.0-r1.ebuild
index de5dabdc1044..b3029b7de5ec 100644
--- a/dev-util/systemtap/systemtap-4.0-r1.ebuild
+++ b/dev-util/systemtap/systemtap-4.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="libvirt selinux sqlite +ssl test zeroconf"
RESTRICT="!test? ( test )"
diff --git a/dev-util/treecc/treecc-0.3.10-r1.ebuild b/dev-util/treecc/treecc-0.3.10-r1.ebuild
index a543a684d021..b85b682bef2e 100644
--- a/dev-util/treecc/treecc-0.3.10-r1.ebuild
+++ b/dev-util/treecc/treecc-0.3.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://download.savannah.gnu.org/releases/dotgnu-pnet/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
IUSE="doc examples"
DEPEND="doc? ( app-text/texi2html )"
diff --git a/dev-util/unifdef/unifdef-2.10.ebuild b/dev-util/unifdef/unifdef-2.10.ebuild
index d8af09ead551..8a1a627ca6c4 100644
--- a/dev-util/unifdef/unifdef-2.10.ebuild
+++ b/dev-util/unifdef/unifdef-2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://dotat.at/prog/unifdef/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
DOCS=( README )
diff --git a/dev-util/yacc/yacc-1.9.1-r6.ebuild b/dev-util/yacc/yacc-1.9.1-r6.ebuild
index 02614959534b..15a1b35331fb 100644
--- a/dev-util/yacc/yacc-1.9.1-r6.ebuild
+++ b/dev-util/yacc/yacc-1.9.1-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="ftp://metalab.unc.edu/pub/Linux/devel/compiler-tools/${P}.tar.Z"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
PATCHES=(
# mkstemp patch from byacc ebuild.
diff --git a/dev-vcs/cvs/cvs-1.12.12-r13.ebuild b/dev-vcs/cvs/cvs-1.12.12-r13.ebuild
index 1767d29d5beb..a2a40c346069 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r13.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r13.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
LICENSE="GPL-2 LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="crypt doc kerberos nls pam server"
RESTRICT="test"
diff --git a/dev-vcs/cvsps/cvsps-2.2_beta1-r1.ebuild b/dev-vcs/cvsps/cvsps-2.2_beta1-r1.ebuild
index 2d52bc371cad..99c652f13668 100644
--- a/dev-vcs/cvsps/cvsps-2.2_beta1-r1.ebuild
+++ b/dev-vcs/cvsps/cvsps-2.2_beta1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.cobite.com/cvsps/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="sys-libs/zlib"
diff --git a/dev-vcs/cvsps/cvsps-3.13-r2.ebuild b/dev-vcs/cvsps/cvsps-3.13-r2.ebuild
index c7d9c099265b..cf0a5e63580c 100644
--- a/dev-vcs/cvsps/cvsps-3.13-r2.ebuild
+++ b/dev-vcs/cvsps/cvsps-3.13-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="sys-libs/zlib"
diff --git a/dev-vcs/git/git-2.26.2.ebuild b/dev-vcs/git/git-2.26.2.ebuild
index 5c1c3d2155b9..b171de2abbf0 100644
--- a/dev-vcs/git/git-2.26.2.ebuild
+++ b/dev-vcs/git/git-2.26.2.ebuild
@@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
)"
[[ "${PV}" == *_rc* ]] || \
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/dev-vcs/git/git-2.26.3.ebuild b/dev-vcs/git/git-2.26.3.ebuild
index 5c1c3d2155b9..b171de2abbf0 100644
--- a/dev-vcs/git/git-2.26.3.ebuild
+++ b/dev-vcs/git/git-2.26.3.ebuild
@@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
)"
[[ "${PV}" == *_rc* ]] || \
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild
index c5dffc683898..7bdeda838f0d 100644
--- a/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.6.0-r1.ebuild
@@ -2,10 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-MY_PV="${PV/_/-}"
+WX_GTK_VER="3.0-gtk3"
inherit cmake fcaps flag-o-matic multilib toolchain-funcs wxwidgets
+MY_PV="${PV/_/-}"
+
DESCRIPTION="A PlayStation 2 emulator"
HOMEPAGE="https://pcsx2.net/"
SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
@@ -32,7 +34,7 @@ RDEPEND="
x11-libs/libICE[abi_x86_32(-)]
x11-libs/libX11[abi_x86_32(-)]
x11-libs/libXext[abi_x86_32(-)]
- >=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3[abi_x86_32(-),X]
+ x11-libs/wxGTK:${WX_GTK_VER}[abi_x86_32(-),X]
"
DEPEND="${RDEPEND}
dev-cpp/pngpp
@@ -96,7 +98,7 @@ src_configure() {
-DUSE_VTUNE=FALSE
)
- WX_GTK_VER="3.0-gtk3" setup-wxwidgets
+ setup-wxwidgets
cmake_src_configure
}
diff --git a/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
index d394535a1003..a358ecfb9dae 100644
--- a/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.6.0-r2.ebuild
@@ -2,10 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-MY_PV="${PV/_/-}"
+WX_GTK_VER="3.0-gtk3"
inherit cmake fcaps flag-o-matic multilib toolchain-funcs wxwidgets
+MY_PV="${PV/_/-}"
+
DESCRIPTION="A PlayStation 2 emulator"
HOMEPAGE="https://pcsx2.net/"
SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
@@ -32,7 +34,7 @@ RDEPEND="
x11-libs/libICE[abi_x86_32(-)]
x11-libs/libX11[abi_x86_32(-)]
x11-libs/libXext[abi_x86_32(-)]
- >=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3[abi_x86_32(-),X]
+ x11-libs/wxGTK:${WX_GTK_VER}[abi_x86_32(-),X]
"
DEPEND="${RDEPEND}"
@@ -93,7 +95,7 @@ src_configure() {
-DUSE_VTUNE=FALSE
)
- WX_GTK_VER="3.0-gtk3" setup-wxwidgets
+ setup-wxwidgets
cmake_src_configure
}
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 1555b343b49a..6fd902402b8c 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -3,6 +3,7 @@
EAPI=7
+WX_GTK_VER="3.0-gtk3"
inherit cmake fcaps flag-o-matic git-r3 toolchain-funcs wxwidgets
DESCRIPTION="A PlayStation 2 emulator"
@@ -38,7 +39,7 @@ RDEPEND="
x11-libs/libICE
x11-libs/libX11
x11-libs/libXext
- x11-libs/wxGTK:3.0-gtk3[X]
+ x11-libs/wxGTK:${WX_GTK_VER}[X]
"
DEPEND="${RDEPEND}"
BDEPEND="test? ( dev-cpp/gtest )"
@@ -81,7 +82,7 @@ src_configure() {
-DUSE_VTUNE=FALSE
)
- WX_GTK_VER="3.0-gtk3" setup-wxwidgets
+ setup-wxwidgets
cmake_src_configure
}
diff --git a/games-misc/games-envd/games-envd-0.ebuild b/games-misc/games-envd/games-envd-0.ebuild
index 77d85f5e4231..fe4002ec2d46 100644
--- a/games-misc/games-envd/games-envd-0.ebuild
+++ b/games-misc/games-envd/games-envd-0.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc64 s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
S=${WORKDIR}
diff --git a/games-strategy/megaglest/megaglest-3.11.1-r100.ebuild b/games-strategy/megaglest/megaglest-3.11.1-r100.ebuild
index d19c6ffd579d..353d0ce3f9b6 100644
--- a/games-strategy/megaglest/megaglest-3.11.1-r100.ebuild
+++ b/games-strategy/megaglest/megaglest-3.11.1-r100.ebuild
@@ -14,6 +14,7 @@ LUA_COMPAT=( lua5-{1..2} )
# Only needed by certain features
VIRTUALX_REQUIRED="manual"
+WX_GTK_VER="3.0"
inherit cmake desktop flag-o-matic lua-single virtualx wxwidgets xdg-utils
DESCRIPTION="Cross-platform 3D realtime strategy game"
@@ -43,9 +44,9 @@ RDEPEND="${LUA_DEPS}
virtual/glu
x11-libs/libX11
x11-libs/libXext
- editor? ( x11-libs/wxGTK:3.0[X,opengl] )
+ editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
fribidi? ( dev-libs/fribidi )
- model-viewer? ( x11-libs/wxGTK:3.0[X] )
+ model-viewer? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
dev-libs/xerces-c[icu]
media-libs/ftgl
media-libs/glew:=
@@ -73,7 +74,6 @@ src_prepare() {
cmake_src_prepare
if use editor || use model-viewer ; then
- WX_GTK_VER="3.0"
setup-wxwidgets
fi
}
diff --git a/games-strategy/megaglest/megaglest-3.13.0.ebuild b/games-strategy/megaglest/megaglest-3.13.0.ebuild
index 9b8867d2938c..212ab76aac3a 100644
--- a/games-strategy/megaglest/megaglest-3.13.0.ebuild
+++ b/games-strategy/megaglest/megaglest-3.13.0.ebuild
@@ -13,6 +13,7 @@ LUA_COMPAT=( lua5-{1..2} )
# Only needed by certain features
VIRTUALX_REQUIRED="manual"
+WX_GTK_VER="3.0-gtk3"
inherit cmake desktop flag-o-matic lua-single virtualx wxwidgets xdg-utils
DESCRIPTION="Cross-platform 3D realtime strategy game"
@@ -49,9 +50,9 @@ RDEPEND="
virtual/jpeg:0=
x11-libs/libX11
x11-libs/libXext
- editor? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] )
+ editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
fribidi? ( dev-libs/fribidi )
- model-viewer? ( x11-libs/wxGTK:3.0-gtk3[X] )
+ model-viewer? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
videos? ( media-video/vlc )
"
DEPEND="${RDEPEND}"
@@ -69,7 +70,6 @@ src_prepare() {
cmake_src_prepare
if use editor || use model-viewer ; then
- WX_GTK_VER="3.0"
setup-wxwidgets
fi
}
diff --git a/gnome-base/dconf/dconf-0.34.0.ebuild b/gnome-base/dconf/dconf-0.34.0.ebuild
index f8c053be7442..e19de8eaa2f4 100644
--- a/gnome-base/dconf/dconf-0.34.0.ebuild
+++ b/gnome-base/dconf/dconf-0.34.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/dconf"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux"
IUSE="gtk-doc"
RESTRICT="!test? ( test )" # IUSE=test comes from virtualx.eclass
diff --git a/gnome-base/dconf/dconf-0.36.0.ebuild b/gnome-base/dconf/dconf-0.36.0.ebuild
index c861d09ab81b..aa94127feb70 100644
--- a/gnome-base/dconf/dconf-0.36.0.ebuild
+++ b/gnome-base/dconf/dconf-0.36.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/dconf"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
IUSE="gtk-doc"
RESTRICT="!test? ( test )" # IUSE=test comes from virtualx.eclass
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.34.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.34.0.ebuild
index f096ec15dd5a..eec124ad5513 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.34.0.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.34.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
LICENSE="LGPL-2.1+"
SLOT="0"
IUSE="+introspection"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
DEPEND="!<gnome-base/gdm-3.8"
RDEPEND="${DEPEND}"
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.36.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.36.1.ebuild
index a0350d3fe224..26d730e77fa7 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.36.1.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.36.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
LICENSE="LGPL-2.1+"
SLOT="0"
IUSE="+introspection"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
BDEPEND="
introspection? ( >=dev-libs/gobject-introspection-1.54:= )
diff --git a/gnome-base/librsvg/librsvg-2.40.21.ebuild b/gnome-base/librsvg/librsvg-2.40.21.ebuild
index f16fab8717d7..8c57841ec7c8 100644
--- a/gnome-base/librsvg/librsvg-2.40.21.ebuild
+++ b/gnome-base/librsvg/librsvg-2.40.21.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
LICENSE="LGPL-2+"
SLOT="2"
-KEYWORDS="~alpha arm hppa ~ia64 ~mips ppc s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha arm hppa ~ia64 ~mips ppc ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+introspection tools +vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.36.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.36.1.ebuild
index b46aeebbfb48..08f7b3920576 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.36.1.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.36.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/yelp-xsl"
LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
>=dev-libs/libxml2-2.6.12:=
diff --git a/mail-filter/maildrop/maildrop-3.0.0.ebuild b/mail-filter/maildrop/maildrop-3.0.0.ebuild
index ec2d6a34412a..19404652d9ca 100644
--- a/mail-filter/maildrop/maildrop-3.0.0.ebuild
+++ b/mail-filter/maildrop/maildrop-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.courier-mta.org/maildrop/"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="berkdb debug dovecot fam gdbm ldap mysql postgres static-libs authlib +tools trashquota"
CDEPEND="!mail-mta/courier
diff --git a/mail-filter/procmail/procmail-3.22-r14.ebuild b/mail-filter/procmail/procmail-3.22-r14.ebuild
index 47a3f029c6ab..a6c3facf7b92 100644
--- a/mail-filter/procmail/procmail-3.22-r14.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.procmail.org/${P}.tar.gz"
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
IUSE="mbox selinux"
DEPEND="virtual/mta"
diff --git a/mail-filter/spamassassin/spamassassin-3.4.4-r4.ebuild b/mail-filter/spamassassin/spamassassin-3.4.4-r4.ebuild
index 5b15b0b3ad6b..d905b6a1b8aa 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.4-r4.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.4-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
LICENSE="Apache-2.0 GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
RESTRICT="!test? ( test )"
diff --git a/mail-mta/courier/courier-1.0.14.ebuild b/mail-mta/courier/courier-1.0.14.ebuild
index 795a78c203b9..4ad365ca157f 100644
--- a/mail-mta/courier/courier-1.0.14.ebuild
+++ b/mail-mta/courier/courier-1.0.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="postgres ldap libressl mysql pam nls ipv6 spell fax crypt norewrite \
fam web webmail gnutls"
diff --git a/mail-mta/courier/courier-1.0.5.ebuild b/mail-mta/courier/courier-1.0.5.ebuild
index 470c2a9a78fe..243d53af7dea 100644
--- a/mail-mta/courier/courier-1.0.5.ebuild
+++ b/mail-mta/courier/courier-1.0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="postgres ldap libressl mysql pam nls ipv6 spell fax crypt norewrite \
fam web webmail gnutls"
diff --git a/mail-mta/ssmtp/ssmtp-2.64-r3.ebuild b/mail-mta/ssmtp/ssmtp-2.64-r3.ebuild
index 7a6224993762..6e6194768623 100644
--- a/mail-mta/ssmtp/ssmtp-2.64-r3.ebuild
+++ b/mail-mta/ssmtp/ssmtp-2.64-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://debian/pool/main/s/ssmtp/${P/-/_}.orig.tar.bz2
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="ipv6 libressl +ssl gnutls +mta"
DEPEND="ssl? (
diff --git a/media-fonts/aquafont/aquafont-2.7-r4.ebuild b/media-fonts/aquafont/aquafont-2.7-r4.ebuild
index cc2a5116ca42..1f85f7b6a174 100644
--- a/media-fonts/aquafont/aquafont-2.7-r4.ebuild
+++ b/media-fonts/aquafont/aquafont-2.7-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.geocities.jp/teardrops_in_aquablue/fnt/${MY_P}.zip"
LICENSE="aquafont"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="X"
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild b/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild
index a03a0952e0a4..c4f6b055f116 100644
--- a/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild
+++ b/media-fonts/aquapfont/aquapfont-2.6-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://aquablue.milkcafe.to/tears/font/${MY_P}.zip"
LICENSE="aquafont"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-fonts/arabeyes-fonts/arabeyes-fonts-2.0-r1.ebuild b/media-fonts/arabeyes-fonts/arabeyes-fonts-2.0-r1.ebuild
index bf87ffb9f679..5791ca8f0dae 100644
--- a/media-fonts/arabeyes-fonts/arabeyes-fonts-2.0-r1.ebuild
+++ b/media-fonts/arabeyes-fonts/arabeyes-fonts-2.0-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_PN}_${PV}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm ~ia64 ppc s390 sparc x86"
+KEYWORDS="amd64 arm ~ia64 ppc ~s390 sparc x86"
DOCS=( README ChangeLog )
diff --git a/media-fonts/arkpandora/arkpandora-2.04.ebuild b/media-fonts/arkpandora/arkpandora-2.04.ebuild
index 9d3057e647b8..b8405ba6368d 100644
--- a/media-fonts/arkpandora/arkpandora-2.04.ebuild
+++ b/media-fonts/arkpandora/arkpandora-2.04.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="BitstreamVera"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ppc64 ~s390 sparc x86"
IUSE=""
DOCS=( CHANGELOG.TXT local.conf.arkpandora )
diff --git a/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild b/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild
index bd3155d8c0f8..80e59d5e619e 100644
--- a/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild
+++ b/media-fonts/arphicfonts/arphicfonts-0.2.20080216.1-r2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"
LICENSE="Arphic"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
# No binaries, only fonts
diff --git a/media-fonts/artwiz-aleczapka-en/artwiz-aleczapka-en-1.3.ebuild b/media-fonts/artwiz-aleczapka-en/artwiz-aleczapka-en-1.3.ebuild
index dbf0cfa2b15d..20fa21bab7a7 100644
--- a/media-fonts/artwiz-aleczapka-en/artwiz-aleczapka-en-1.3.ebuild
+++ b/media-fonts/artwiz-aleczapka-en/artwiz-aleczapka-en-1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/artwizaleczapka/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
DOCS="AUTHORS BUGS ChangeLog NEWS README VERSION"
FONT_SUFFIX="pcf"
diff --git a/media-fonts/artwiz-latin1/artwiz-latin1-1.1.ebuild b/media-fonts/artwiz-latin1/artwiz-latin1-1.1.ebuild
index 59351d420aff..e5bcdf2df8be 100644
--- a/media-fonts/artwiz-latin1/artwiz-latin1-1.1.ebuild
+++ b/media-fonts/artwiz-latin1/artwiz-latin1-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/artwiz-latin1/${P}.tgz"
LICENSE="GPL-2"
SLOT=0
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
S="${WORKDIR}/${PN}"
diff --git a/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild b/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild
index 93d343aa01f0..ff3f555b193e 100644
--- a/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild
+++ b/media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="unicode"
RESTRICT="binchecks strip"
diff --git a/media-fonts/cantarell/cantarell-0.201.ebuild b/media-fonts/cantarell/cantarell-0.201.ebuild
index ff27a99bd655..6b6e1bf355be 100644
--- a/media-fonts/cantarell/cantarell-0.201.ebuild
+++ b/media-fonts/cantarell/cantarell-0.201.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/CantarellFonts"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
BDEPEND="
diff --git a/media-fonts/cheapskatefonts/cheapskatefonts-1.0.ebuild b/media-fonts/cheapskatefonts/cheapskatefonts-1.0.ebuild
index d7cee7c5e455..28a1b84e1d0b 100644
--- a/media-fonts/cheapskatefonts/cheapskatefonts-1.0.ebuild
+++ b/media-fonts/cheapskatefonts/cheapskatefonts-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -23,7 +23,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~s390 sparc x86"
BDEPEND="app-arch/unzip"
diff --git a/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild b/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild
index 7a8bfebf7231..4e67ad4061de 100644
--- a/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild
+++ b/media-fonts/cronyx-fonts/cronyx-fonts-2.3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ~s390 sparc x86"
S="${WORKDIR}/${MY_P//_/-}.orig"
diff --git a/media-fonts/culmus/culmus-0.120-r5.ebuild b/media-fonts/culmus/culmus-0.120-r5.ebuild
index 572a3bfcc36c..71388eb2eecf 100644
--- a/media-fonts/culmus/culmus-0.120-r5.ebuild
+++ b/media-fonts/culmus/culmus-0.120-r5.ebuild
@@ -37,7 +37,7 @@ S="${WORKDIR}"
LICENSE="|| ( GPL-2 LICENSE-BITSTREAM ) ancient? ( MIT ) fancy? ( GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="ancient fancy fontforge taamey"
RDEPEND="!media-fonts/culmus-ancient"
diff --git a/media-fonts/culmus/culmus-0.133-r1.ebuild b/media-fonts/culmus/culmus-0.133-r1.ebuild
index 170ad94a7b61..1c2c789c19fc 100644
--- a/media-fonts/culmus/culmus-0.133-r1.ebuild
+++ b/media-fonts/culmus/culmus-0.133-r1.ebuild
@@ -37,7 +37,7 @@ S="${WORKDIR}"
LICENSE="|| ( GPL-2 LICENSE-BITSTREAM ) ancient? ( MIT ) fancy? ( GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="ancient fancy fontforge taamey"
RDEPEND="!media-fonts/culmus-ancient"
diff --git a/media-fonts/dejavu/dejavu-2.37.ebuild b/media-fonts/dejavu/dejavu-2.37.ebuild
index ee96333abcb1..17d2bac9cd99 100644
--- a/media-fonts/dejavu/dejavu-2.37.ebuild
+++ b/media-fonts/dejavu/dejavu-2.37.ebuild
@@ -26,7 +26,7 @@ fi
LICENSE="BitstreamVera"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="fontforge"
BDEPEND="
diff --git a/media-fonts/efont-unicode/efont-unicode-0.4.2-r1.ebuild b/media-fonts/efont-unicode/efont-unicode-0.4.2-r1.ebuild
index 3b6c06864858..54496dfc60e9 100644
--- a/media-fonts/efont-unicode/efont-unicode-0.4.2-r1.ebuild
+++ b/media-fonts/efont-unicode/efont-unicode-0.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="http://openlab.jp/efont/dist/unicode-bdf/${MY_P}.tar.bz2"
# naga10 has free-noncomm license
LICENSE="public-domain BAEKMUK BSD MIT HPND free-noncomm"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
IUSE=""
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-fonts/encodings/encodings-1.0.5-r1.ebuild b/media-fonts/encodings/encodings-1.0.5-r1.ebuild
index 6ba58462fc85..3e7bceb439af 100644
--- a/media-fonts/encodings/encodings-1.0.5-r1.ebuild
+++ b/media-fonts/encodings/encodings-1.0.5-r1.ebuild
@@ -9,7 +9,7 @@ inherit font xorg-3
DESCRIPTION="X.Org font encodings"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
BDEPEND="x11-apps/mkfontscale
>=media-fonts/font-util-1.1.1-r1"
diff --git a/media-fonts/farsi-fonts/farsi-fonts-0.4.ebuild b/media-fonts/farsi-fonts/farsi-fonts-0.4.ebuild
index 8e1db37712b6..39c0e5d1dc9c 100644
--- a/media-fonts/farsi-fonts/farsi-fonts-0.4.ebuild
+++ b/media-fonts/farsi-fonts/farsi-fonts-0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.farsiweb.ir/font/farsifonts-${PV}.zip"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~s390 sparc x86 ~ppc-macos"
BDEPEND="app-arch/unzip"
diff --git a/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r2.ebuild b/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r2.ebuild
index 2672ca433a65..9d67d6bf9d5c 100644
--- a/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,5 +6,5 @@ inherit xorg-3
DESCRIPTION="X.Org Adobe bitmap fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="nls"
diff --git a/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r2.ebuild b/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r2.ebuild
index 52d39c26c7de..3b22c52fc748 100644
--- a/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,5 +6,5 @@ inherit xorg-3
DESCRIPTION="X.Org Adobe bitmap fonts"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="nls"
diff --git a/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r2.ebuild b/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r2.ebuild
index 8d3898dd1a7b..b0c614fa8753 100644
--- a/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r2.ebuild
+++ b/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,5 +6,5 @@ inherit xorg-3
DESCRIPTION="X.Org Adobe Utopia bitmap fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="nls"
diff --git a/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r2.ebuild b/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r2.ebuild
index 8d3898dd1a7b..b0c614fa8753 100644
--- a/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r2.ebuild
+++ b/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,5 +6,5 @@ inherit xorg-3
DESCRIPTION="X.Org Adobe Utopia bitmap fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="nls"
diff --git a/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r2.ebuild b/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r2.ebuild
index 474bb11c4108..72e630345302 100644
--- a/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r2.ebuild
+++ b/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org Adobe Utopia Type 1 fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-alias/font-alias-1.0.4.ebuild b/media-fonts/font-alias/font-alias-1.0.4.ebuild
index f8eb02725890..39335266b553 100644
--- a/media-fonts/font-alias/font-alias-1.0.4.ebuild
+++ b/media-fonts/font-alias/font-alias-1.0.4.ebuild
@@ -6,7 +6,7 @@ inherit xorg-3
DESCRIPTION="X.Org font aliases"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
BDEPEND="x11-apps/mkfontscale
>=media-fonts/font-util-1.1.1-r1"
diff --git a/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r2.ebuild b/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r2.ebuild
index 6d30209c008f..8e18d5ade230 100644
--- a/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org arabic bitmap fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r2.ebuild b/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r2.ebuild
index 1c1637dd3e20..0cdbae7c2887 100644
--- a/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,5 +7,5 @@ inherit xorg-3
DESCRIPTION="X.Org Bigelow & Holmes bitmap fonts"
LICENSE="public-domain" # bitmap font, not copyrightable
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="nls"
diff --git a/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r2.ebuild b/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r2.ebuild
index 1c1637dd3e20..0cdbae7c2887 100644
--- a/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,5 +7,5 @@ inherit xorg-3
DESCRIPTION="X.Org Bigelow & Holmes bitmap fonts"
LICENSE="public-domain" # bitmap font, not copyrightable
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="nls"
diff --git a/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r2.ebuild b/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r2.ebuild
index 21210c2e5da6..7f5550843503 100644
--- a/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,5 +7,5 @@ inherit xorg-3
DESCRIPTION="X.Org Bigelow & Holmes Lucida bitmap fonts"
LICENSE="public-domain" # bitmap font, not copyrightable
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="nls"
diff --git a/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r2.ebuild b/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r2.ebuild
index 21210c2e5da6..7f5550843503 100644
--- a/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,5 +7,5 @@ inherit xorg-3
DESCRIPTION="X.Org Bigelow & Holmes Lucida bitmap fonts"
LICENSE="public-domain" # bitmap font, not copyrightable
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="nls"
diff --git a/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r2.ebuild b/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r2.ebuild
index 76c1d8e4c597..71265887b679 100644
--- a/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r2.ebuild
+++ b/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,4 +7,4 @@ inherit xorg-3
DESCRIPTION="X.Org Bigelow & Holmes TrueType fonts"
LICENSE="bh-luxi"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
diff --git a/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r2.ebuild b/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r2.ebuild
index 2e4e51fa48ab..6fee2e93fbe7 100644
--- a/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r2.ebuild
+++ b/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,4 +7,4 @@ inherit xorg-3
DESCRIPTION="X.Org Bigelow & Holmes Type 1 fonts"
LICENSE="bh-luxi"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
diff --git a/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r2.ebuild b/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r2.ebuild
index 4a57a66191a1..5848dfb1b92a 100644
--- a/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org Bitstream bitmap fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r2.ebuild b/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r2.ebuild
index 4a57a66191a1..5848dfb1b92a 100644
--- a/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org Bitstream bitmap fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r2.ebuild b/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r2.ebuild
index 2d1c2a853ec4..a0bf00766b09 100644
--- a/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r2.ebuild
+++ b/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="Bitstream Speedo fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r2.ebuild b/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r2.ebuild
index e99a081c4475..c6b06c477939 100644
--- a/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r2.ebuild
+++ b/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org Bitstream Type 1 fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r2.ebuild b/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r2.ebuild
index 0ea6344054ad..991244b3dfbe 100644
--- a/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r2.ebuild
+++ b/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org Cronyx cyrillic fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r2.ebuild b/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r2.ebuild
index 97a0ae4517e2..fd023b1399de 100644
--- a/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org cursor font"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux"
diff --git a/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r2.ebuild b/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r2.ebuild
index 1ada6b708c63..76b4878a823c 100644
--- a/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org Daewoo fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r2.ebuild b/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r2.ebuild
index feaf5b637777..aed6d6503d23 100644
--- a/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org DEC fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r2.ebuild b/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r2.ebuild
index 016d23994a3c..18ed26c1168b 100644
--- a/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r2.ebuild
+++ b/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org IBM Courier font"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r2.ebuild b/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r2.ebuild
index f5420cc188ba..12ef8c613e96 100644
--- a/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org the Institute of Software, Academia Sinica (chinese) fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r2.ebuild b/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r2.ebuild
index ff470db33362..86b269579c0d 100644
--- a/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit xorg-3
DESCRIPTION="X.Org JIS (japanese) fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r2.ebuild b/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r2.ebuild
index 514f54eaa8f0..3288407a72f7 100644
--- a/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,4 +7,4 @@ inherit xorg-3
DESCRIPTION="X.Org micro-misc font"
LICENSE="public-domain"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r2.ebuild b/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r2.ebuild
index 85d4228eef0d..155b004dc30b 100644
--- a/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r2.ebuild
+++ b/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org misc-cyrillic fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.4.ebuild b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.4.ebuild
index 9c37d377dee9..cc90bec8672c 100644
--- a/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.4.ebuild
+++ b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ inherit xorg-3
DESCRIPTION="Miscellaneous Ethiopic fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
XORG_CONFIGURE_OPTIONS=(
--with-fontrootdir="${EPREFIX}/usr/share/fonts"
diff --git a/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r2.ebuild b/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r2.ebuild
index 6b7ef5c84d63..af71d1f13afc 100644
--- a/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r2.ebuild
+++ b/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,4 +8,4 @@ inherit xorg-3
DESCRIPTION="X.Org Syriac fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r2.ebuild b/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r2.ebuild
index ae84191bbd6f..f1bff67b1534 100644
--- a/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r2.ebuild
+++ b/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r2.ebuild
@@ -6,5 +6,5 @@ inherit xorg-3
DESCRIPTION="X.Org miscellaneous fonts"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="nls"
diff --git a/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r2.ebuild b/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r2.ebuild
index c4ad306a5fd8..6b31f60b690e 100644
--- a/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org ClearlyU fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r2.ebuild b/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r2.ebuild
index f4caf44c0de4..5f5c4d835fc0 100644
--- a/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r2.ebuild
+++ b/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,5 +6,5 @@ inherit xorg-3
DESCRIPTION="X.Org Schumacher fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="nls"
diff --git a/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r2.ebuild b/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r2.ebuild
index d88de8254a8d..64ce06800d82 100644
--- a/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r2.ebuild
+++ b/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org Screen cyrillic fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r2.ebuild b/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r2.ebuild
index 52d135d9c804..ba1cbafde195 100644
--- a/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org Sony fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r2.ebuild b/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r2.ebuild
index 8fd3654fdfa4..8b6012366f3a 100644
--- a/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org Sun fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
diff --git a/media-fonts/font-util/font-util-1.3.2-r1.ebuild b/media-fonts/font-util/font-util-1.3.2-r1.ebuild
index 4f18316ba318..ad6cf7ca5cef 100644
--- a/media-fonts/font-util/font-util-1.3.2-r1.ebuild
+++ b/media-fonts/font-util/font-util-1.3.2-r1.ebuild
@@ -8,7 +8,7 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/font/util.git"
DESCRIPTION="X.Org font utilities"
HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/util"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=""
diff --git a/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r2.ebuild b/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r2.ebuild
index 8729a7de05c5..b76e244b5520 100644
--- a/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r2.ebuild
+++ b/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org Winitzki cyrillic font"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r2.ebuild b/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r2.ebuild
index 471d046c2304..2916ee929121 100644
--- a/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r2.ebuild
+++ b/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,4 +6,4 @@ inherit xorg-3
DESCRIPTION="X.Org XFree86 Type 1 font"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/media-fonts/free-bangla-font/free-bangla-font-0.2.ebuild b/media-fonts/free-bangla-font/free-bangla-font-0.2.ebuild
index dfc1cf8bfa72..6508ee993bb0 100644
--- a/media-fonts/free-bangla-font/free-bangla-font-0.2.ebuild
+++ b/media-fonts/free-bangla-font/free-bangla-font-0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -21,7 +21,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc s390 x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ~s390 x86"
S="${WORKDIR}"
FONT_S="${S}"
diff --git a/media-fonts/freefonts/freefonts-0.10-r4.ebuild b/media-fonts/freefonts/freefonts-0.10-r4.ebuild
index e10798ed49fd..11d9ac649d6e 100644
--- a/media-fonts/freefonts/freefonts-0.10-r4.ebuild
+++ b/media-fonts/freefonts/freefonts-0.10-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://gimp/fonts/${P}.tar.gz"
LICENSE="freedist free-noncomm all-rights-reserved"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
IUSE="X"
RESTRICT="mirror bindist"
diff --git a/media-fonts/fs-fonts/fs-fonts-0.1_alpha3.ebuild b/media-fonts/fs-fonts/fs-fonts-0.1_alpha3.ebuild
index da8d74170273..7f4ec58189b4 100644
--- a/media-fonts/fs-fonts/fs-fonts-0.1_alpha3.ebuild
+++ b/media-fonts/fs-fonts/fs-fonts-0.1_alpha3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/x-tt/7862/${MY_P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-fonts/hunkyfonts/hunkyfonts-0.3.1.ebuild b/media-fonts/hunkyfonts/hunkyfonts-0.3.1.ebuild
index d1c616d95bf8..593b007733de 100644
--- a/media-fonts/hunkyfonts/hunkyfonts-0.3.1.ebuild
+++ b/media-fonts/hunkyfonts/hunkyfonts-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/hunkyfonts/${P}.tar.bz2"
LICENSE="BitstreamVera public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ~s390 sparc x86"
DOCS="ChangeLog README"
FONT_S="${S}/TTF"
diff --git a/media-fonts/intlfonts/intlfonts-1.2.1-r1.ebuild b/media-fonts/intlfonts/intlfonts-1.2.1-r1.ebuild
index c22792604c37..93ee81bfb5c2 100644
--- a/media-fonts/intlfonts/intlfonts-1.2.1-r1.ebuild
+++ b/media-fonts/intlfonts/intlfonts-1.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="public-domain HPND non-free? ( free-noncomm )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="bdf non-free"
DEPEND="x11-apps/bdftopcf
diff --git a/media-fonts/intlfonts/intlfonts-1.4.1.ebuild b/media-fonts/intlfonts/intlfonts-1.4.1.ebuild
index 527821f33366..084c018b002b 100644
--- a/media-fonts/intlfonts/intlfonts-1.4.1.ebuild
+++ b/media-fonts/intlfonts/intlfonts-1.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="public-domain HPND GPL-3+-with-font-exception"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="bdf"
BDEPEND="x11-apps/bdftopcf
diff --git a/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild b/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild
index bc498dddca88..294fbf88151d 100644
--- a/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild
+++ b/media-fonts/ipamonafont/ipamonafont-1.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2005-2020 Gentoo Authors
+# Copyright 2005-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://freebsd.sin.openmirrors.asia/pub/FreeBSD/ports/local-distfiles/h
LICENSE="grass-ipafonts mplus-fonts public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 sparc x86"
IUSE=""
RESTRICT="mirror"
diff --git a/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild b/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild
index 485dd301e976..3d8379098fdc 100644
--- a/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild
+++ b/media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="IPAfont"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
RESTRICT="binchecks strip"
diff --git a/media-fonts/jisx0213-fonts/jisx0213-fonts-20040425-r2.ebuild b/media-fonts/jisx0213-fonts/jisx0213-fonts-20040425-r2.ebuild
index 50c4d231d241..bddc1d5c9c15 100644
--- a/media-fonts/jisx0213-fonts/jisx0213-fonts-20040425-r2.ebuild
+++ b/media-fonts/jisx0213-fonts/jisx0213-fonts-20040425-r2.ebuild
@@ -26,7 +26,7 @@ S="${WORKDIR}"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ~s390 sparc x86"
IUSE=""
RESTRICT="binchecks strip"
diff --git a/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild b/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild
index 2ffb968c5dbe..90a8a9d7945b 100644
--- a/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild
+++ b/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge.jp/efont/5411/${P}.tar.bz2"
LICENSE="free-noncomm"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-fonts/konfont/konfont-0.1.ebuild b/media-fonts/konfont/konfont-0.1.ebuild
index 63f9462684d0..888c3edff092 100644
--- a/media-fonts/konfont/konfont-0.1.ebuild
+++ b/media-fonts/konfont/konfont-0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/dists/potato/main/source/utils/${MY_P}.tar.gz"
LICENSE="public-domain"
SLOT=0
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~s390 sparc x86"
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-fonts/lfpfonts-fix/lfpfonts-fix-0.83-r2.ebuild b/media-fonts/lfpfonts-fix/lfpfonts-fix-0.83-r2.ebuild
index 0ca9ecfb3c00..c63a906d7f0f 100644
--- a/media-fonts/lfpfonts-fix/lfpfonts-fix-0.83-r2.ebuild
+++ b/media-fonts/lfpfonts-fix/lfpfonts-fix-0.83-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://sourceforge.net/projects/xfonts/"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ~s390 sparc x86"
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-fonts/lfpfonts-var/lfpfonts-var-0.84.ebuild b/media-fonts/lfpfonts-var/lfpfonts-var-0.84.ebuild
index 51a641d3a3c1..19ed0e03a331 100644
--- a/media-fonts/lfpfonts-var/lfpfonts-var-0.84.ebuild
+++ b/media-fonts/lfpfonts-var/lfpfonts-var-0.84.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xfonts/${PN}-src-${PV}.tar.bz2"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ~s390 sparc x86"
IUSE=""
S="${WORKDIR}/${PN}-src"
diff --git a/media-fonts/lohit-assamese/lohit-assamese-2.91.5.ebuild b/media-fonts/lohit-assamese/lohit-assamese-2.91.5.ebuild
index f23786e39c09..10b7d1a0de6d 100644
--- a/media-fonts/lohit-assamese/lohit-assamese-2.91.5.ebuild
+++ b/media-fonts/lohit-assamese/lohit-assamese-2.91.5.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
IUSE=""
RESTRICT="test binchecks"
diff --git a/media-fonts/lohit-bengali/lohit-bengali-2.91.5.ebuild b/media-fonts/lohit-bengali/lohit-bengali-2.91.5.ebuild
index 0df85af8cac6..ce13de591d79 100644
--- a/media-fonts/lohit-bengali/lohit-bengali-2.91.5.ebuild
+++ b/media-fonts/lohit-bengali/lohit-bengali-2.91.5.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
IUSE=""
RESTRICT="test binchecks"
diff --git a/media-fonts/lohit-devanagari/lohit-devanagari-2.95.4.ebuild b/media-fonts/lohit-devanagari/lohit-devanagari-2.95.4.ebuild
index eb1c8d02d618..7da3d3f14295 100644
--- a/media-fonts/lohit-devanagari/lohit-devanagari-2.95.4.ebuild
+++ b/media-fonts/lohit-devanagari/lohit-devanagari-2.95.4.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
IUSE=""
RESTRICT="test binchecks"
diff --git a/media-fonts/lohit-fonts/lohit-fonts-2.20150220.ebuild b/media-fonts/lohit-fonts/lohit-fonts-2.20150220.ebuild
index c1300771e5d2..35ead3b019cb 100644
--- a/media-fonts/lohit-fonts/lohit-fonts-2.20150220.ebuild
+++ b/media-fonts/lohit-fonts/lohit-fonts-2.20150220.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://pagure.io/lohit"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
IUSE=""
RDEPEND="
diff --git a/media-fonts/lohit-gujarati/lohit-gujarati-2.92.4.ebuild b/media-fonts/lohit-gujarati/lohit-gujarati-2.92.4.ebuild
index 4e34613223c5..10e584ffc135 100644
--- a/media-fonts/lohit-gujarati/lohit-gujarati-2.92.4.ebuild
+++ b/media-fonts/lohit-gujarati/lohit-gujarati-2.92.4.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
IUSE=""
RESTRICT="test binchecks"
diff --git a/media-fonts/lohit-gurmukhi/lohit-gurmukhi-2.91.2.ebuild b/media-fonts/lohit-gurmukhi/lohit-gurmukhi-2.91.2.ebuild
index aa1fcb2af67b..fca948b40ba7 100644
--- a/media-fonts/lohit-gurmukhi/lohit-gurmukhi-2.91.2.ebuild
+++ b/media-fonts/lohit-gurmukhi/lohit-gurmukhi-2.91.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
IUSE=""
RESTRICT="test binchecks"
diff --git a/media-fonts/lohit-kannada/lohit-kannada-2.5.4.ebuild b/media-fonts/lohit-kannada/lohit-kannada-2.5.4.ebuild
index 763fcd28d068..3121fb2f5999 100644
--- a/media-fonts/lohit-kannada/lohit-kannada-2.5.4.ebuild
+++ b/media-fonts/lohit-kannada/lohit-kannada-2.5.4.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
IUSE=""
RESTRICT="test binchecks"
diff --git a/media-fonts/lohit-malayalam/lohit-malayalam-2.92.2.ebuild b/media-fonts/lohit-malayalam/lohit-malayalam-2.92.2.ebuild
index 813129c4b5e6..3a42dfcaaa96 100644
--- a/media-fonts/lohit-malayalam/lohit-malayalam-2.92.2.ebuild
+++ b/media-fonts/lohit-malayalam/lohit-malayalam-2.92.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
IUSE=""
RESTRICT="test binchecks"
diff --git a/media-fonts/lohit-marathi/lohit-marathi-2.94.2.ebuild b/media-fonts/lohit-marathi/lohit-marathi-2.94.2.ebuild
index bbcc675ce363..91a79b43c823 100644
--- a/media-fonts/lohit-marathi/lohit-marathi-2.94.2.ebuild
+++ b/media-fonts/lohit-marathi/lohit-marathi-2.94.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
RESTRICT="test binchecks"
diff --git a/media-fonts/lohit-nepali/lohit-nepali-2.94.2.ebuild b/media-fonts/lohit-nepali/lohit-nepali-2.94.2.ebuild
index 37829854b4fd..97fbbcf1990d 100644
--- a/media-fonts/lohit-nepali/lohit-nepali-2.94.2.ebuild
+++ b/media-fonts/lohit-nepali/lohit-nepali-2.94.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
IUSE=""
RESTRICT="test binchecks"
diff --git a/media-fonts/lohit-odia/lohit-odia-2.91.2.ebuild b/media-fonts/lohit-odia/lohit-odia-2.91.2.ebuild
index 7773d8429957..802e5e4b9daf 100644
--- a/media-fonts/lohit-odia/lohit-odia-2.91.2.ebuild
+++ b/media-fonts/lohit-odia/lohit-odia-2.91.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
IUSE=""
RESTRICT="test binchecks"
diff --git a/media-fonts/lohit-tamil-classical/lohit-tamil-classical-2.5.4.ebuild b/media-fonts/lohit-tamil-classical/lohit-tamil-classical-2.5.4.ebuild
index 51748719214f..dc6d9b3252ba 100644
--- a/media-fonts/lohit-tamil-classical/lohit-tamil-classical-2.5.4.ebuild
+++ b/media-fonts/lohit-tamil-classical/lohit-tamil-classical-2.5.4.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
IUSE=""
RESTRICT="test binchecks"
diff --git a/media-fonts/lohit-tamil/lohit-tamil-2.91.3.ebuild b/media-fonts/lohit-tamil/lohit-tamil-2.91.3.ebuild
index 2371e0cbfdfd..58c60bd359c6 100644
--- a/media-fonts/lohit-tamil/lohit-tamil-2.91.3.ebuild
+++ b/media-fonts/lohit-tamil/lohit-tamil-2.91.3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
IUSE=""
RESTRICT="test binchecks"
diff --git a/media-fonts/lohit-telugu/lohit-telugu-2.5.5.ebuild b/media-fonts/lohit-telugu/lohit-telugu-2.5.5.ebuild
index 432ae239c39f..eb050ad6dc5b 100644
--- a/media-fonts/lohit-telugu/lohit-telugu-2.5.5.ebuild
+++ b/media-fonts/lohit-telugu/lohit-telugu-2.5.5.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${FONT_SUFFIX}-${PV}"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos"
IUSE=""
RESTRICT="test binchecks"
diff --git a/media-fonts/mikachan-font-otf/mikachan-font-otf-9.1-r1.ebuild b/media-fonts/mikachan-font-otf/mikachan-font-otf-9.1-r1.ebuild
index eff41885b6c0..7d5a9676fe9b 100644
--- a/media-fonts/mikachan-font-otf/mikachan-font-otf-9.1-r1.ebuild
+++ b/media-fonts/mikachan-font-otf/mikachan-font-otf-9.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
LICENSE="free-noncomm"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-fonts/mikachan-font-ttc/mikachan-font-ttc-9.1.ebuild b/media-fonts/mikachan-font-ttc/mikachan-font-ttc-9.1.ebuild
index 373b73b4a539..f380eda5d593 100644
--- a/media-fonts/mikachan-font-ttc/mikachan-font-ttc-9.1.ebuild
+++ b/media-fonts/mikachan-font-ttc/mikachan-font-ttc-9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${P/-ttc/}.tar.bz2
LICENSE="free-noncomm"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r2.ebuild b/media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r2.ebuild
index 3efd878526fb..cb5f1c11dbea 100644
--- a/media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r2.ebuild
+++ b/media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge.jp/mikachan/5513/${MY_PN}-${PV}.tar.bz2
LICENSE="free-noncomm"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-fonts/monafont/monafont-2.90-r2.ebuild b/media-fonts/monafont/monafont-2.90-r2.ebuild
index 3450333bdb20..23269cffe90b 100644
--- a/media-fonts/monafont/monafont-2.90-r2.ebuild
+++ b/media-fonts/monafont/monafont-2.90-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="truetype"
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-fonts/mplus-fonts/mplus-fonts-2.2.4-r1.ebuild b/media-fonts/mplus-fonts/mplus-fonts-2.2.4-r1.ebuild
index 2faea35b0f11..7df74fe1160e 100644
--- a/media-fonts/mplus-fonts/mplus-fonts-2.2.4-r1.ebuild
+++ b/media-fonts/mplus-fonts/mplus-fonts-2.2.4-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="mplus-fonts"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="X"
# Only installs fonts
diff --git a/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild b/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild
index d6ba66c64cff..95ca8328ef39 100644
--- a/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild
+++ b/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="Arphic"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~s390 sparc x86"
IUSE=""
FONT_CONF=(
diff --git a/media-fonts/pcf2bdf/pcf2bdf-1.04-r1.ebuild b/media-fonts/pcf2bdf/pcf2bdf-1.04-r1.ebuild
index 7eab5517e193..492fe348bc17 100644
--- a/media-fonts/pcf2bdf/pcf2bdf-1.04-r1.ebuild
+++ b/media-fonts/pcf2bdf/pcf2bdf-1.04-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.tsg.ne.jp/GANA/S/pcf2bdf/${P}.tgz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~s390 sparc x86"
IUSE=""
S=${WORKDIR}
diff --git a/media-fonts/sazanami/sazanami-20040629.ebuild b/media-fonts/sazanami/sazanami-20040629.ebuild
index 8a554d86bc52..6e8ea002c816 100644
--- a/media-fonts/sazanami/sazanami-20040629.ebuild
+++ b/media-fonts/sazanami/sazanami-20040629.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge.jp/efont/10087/${P}.tar.bz2"
LICENSE="mplus-fonts public-domain" #446166
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-fonts/sgi-fonts/sgi-fonts-1.0.ebuild b/media-fonts/sgi-fonts/sgi-fonts-1.0.ebuild
index 901d78e55e58..e4de15ecba43 100644
--- a/media-fonts/sgi-fonts/sgi-fonts-1.0.ebuild
+++ b/media-fonts/sgi-fonts/sgi-fonts-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.suse.com/pub/suse/i386/9.1/suse/noarch/${RPM_P}.rpm"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ppc64 ~s390 sparc x86"
S="${WORKDIR}/usr/X11R6/lib/X11/fonts/misc/sgi"
diff --git a/media-fonts/shinonome/shinonome-0.9.11.ebuild b/media-fonts/shinonome/shinonome-0.9.11.ebuild
index 487effcd21cc..a3f0cbe7a044 100644
--- a/media-fonts/shinonome/shinonome-0.9.11.ebuild
+++ b/media-fonts/shinonome/shinonome-0.9.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://openlab.jp/efont/dist/shinonome/${P}.tar.bz2"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86"
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-fonts/sil-charis/sil-charis-5.000-r1.ebuild b/media-fonts/sil-charis/sil-charis-5.000-r1.ebuild
index da202e039d6c..9515389b71b7 100644
--- a/media-fonts/sil-charis/sil-charis-5.000-r1.ebuild
+++ b/media-fonts/sil-charis/sil-charis-5.000-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
IUSE="compact"
BDEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-doulos/sil-doulos-5.000-r1.ebuild b/media-fonts/sil-doulos/sil-doulos-5.000-r1.ebuild
index 3d81a974858d..0156d6f2205e 100644
--- a/media-fonts/sil-doulos/sil-doulos-5.000-r1.ebuild
+++ b/media-fonts/sil-doulos/sil-doulos-5.000-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
BDEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-ezra/sil-ezra-2.51.ebuild b/media-fonts/sil-ezra/sil-ezra-2.51.ebuild
index 359947c1b384..ff554a8a6006 100644
--- a/media-fonts/sil-ezra/sil-ezra-2.51.ebuild
+++ b/media-fonts/sil-ezra/sil-ezra-2.51.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${MY_P}.zip"
LICENSE="MIT OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~s390 sparc x86"
IUSE="doc"
BDEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-galatia/sil-galatia-2.1.ebuild b/media-fonts/sil-galatia/sil-galatia-2.1.ebuild
index bf80fdc8930c..a1ac4c2e9e26 100644
--- a/media-fonts/sil-galatia/sil-galatia-2.1.ebuild
+++ b/media-fonts/sil-galatia/sil-galatia-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${MY_P}.zip"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
BDEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-gentium/sil-gentium-5.000-r1.ebuild b/media-fonts/sil-gentium/sil-gentium-5.000-r1.ebuild
index fb7bf477d703..8f3216b13978 100644
--- a/media-fonts/sil-gentium/sil-gentium-5.000-r1.ebuild
+++ b/media-fonts/sil-gentium/sil-gentium-5.000-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos"
IUSE="compact doc"
BDEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-padauk/sil-padauk-2.8-r1.ebuild b/media-fonts/sil-padauk/sil-padauk-2.8-r1.ebuild
index 2fc416dc3a24..a8facac41705 100644
--- a/media-fonts/sil-padauk/sil-padauk-2.8-r1.ebuild
+++ b/media-fonts/sil-padauk/sil-padauk-2.8-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_PN}-2.80"
LICENSE="OFL"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
BDEPEND="app-arch/unzip"
diff --git a/media-fonts/tengwar-fonts/tengwar-fonts-1.9d.ebuild b/media-fonts/tengwar-fonts/tengwar-fonts-1.9d.ebuild
index f3d8c4b99344..452aeec74670 100644
--- a/media-fonts/tengwar-fonts/tengwar-fonts-1.9d.ebuild
+++ b/media-fonts/tengwar-fonts/tengwar-fonts-1.9d.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="free-noncomm"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86"
BDEPEND="app-arch/unzip"
diff --git a/media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild b/media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild
index f2d54be2cd99..6a3557a63634 100644
--- a/media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild
+++ b/media-fonts/texcm-ttf/texcm-ttf-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.zip"
LICENSE="bakoma"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
BDEPEND="app-arch/unzip"
diff --git a/media-fonts/ttf-bitstream-vera/ttf-bitstream-vera-1.10-r3.ebuild b/media-fonts/ttf-bitstream-vera/ttf-bitstream-vera-1.10-r3.ebuild
index aa4bbb816780..db509cf9d11b 100644
--- a/media-fonts/ttf-bitstream-vera/ttf-bitstream-vera-1.10-r3.ebuild
+++ b/media-fonts/ttf-bitstream-vera/ttf-bitstream-vera-1.10-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI=mirror://gnome/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.t
LICENSE="BitstreamVera"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
DOCS="COPYRIGHT.TXT README.TXT RELEASENOTES.TXT"
FONT_SUFFIX="ttf"
diff --git a/media-fonts/unfonts-extra/unfonts-extra-1.0.2_pre080608-r1.ebuild b/media-fonts/unfonts-extra/unfonts-extra-1.0.2_pre080608-r1.ebuild
index 7f99a77338ce..7ef7e6e8e4da 100644
--- a/media-fonts/unfonts-extra/unfonts-extra-1.0.2_pre080608-r1.ebuild
+++ b/media-fonts/unfonts-extra/unfonts-extra-1.0.2_pre080608-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/un-fonts-extra-${MY_PV}-r1.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild b/media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild
index 4f0ea6480ecb..25a45f071002 100644
--- a/media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild
+++ b/media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/un-fonts-core-${MY_PV}-r1.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild b/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild
index e67e08a79ea7..4f5f95202bb8 100644
--- a/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild
+++ b/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild
@@ -33,7 +33,7 @@ SRC_URI="mirror://gentoo/${PN}-${MY_PV}.fc13.src.rpm"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
!media-fonts/gnu-gs-fonts-std
diff --git a/media-fonts/urwvn-fonts/urwvn-fonts-3.05.ebuild b/media-fonts/urwvn-fonts/urwvn-fonts-3.05.ebuild
index 2eb40386ed5c..748a963d2100 100644
--- a/media-fonts/urwvn-fonts/urwvn-fonts-3.05.ebuild
+++ b/media-fonts/urwvn-fonts/urwvn-fonts-3.05.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}-ttf"
LICENSE="GPL-2 Aladdin" # bug #434262
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~s390 sparc x86"
IUSE=""
FONT_CONF=( "${FILESDIR}/65-urwvn.conf" )
diff --git a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r4.ebuild b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r4.ebuild
index 636a9d6442be..a93ce57a9f47 100644
--- a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r4.ebuild
+++ b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.pobox.com/~jmknoble/fonts/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ~s390 sparc x86"
BDEPEND="
x11-misc/imake
diff --git a/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild b/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild
index 69688882626e..d76445218ae6 100644
--- a/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild
+++ b/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ~s390 sparc x86"
IUSE=""
# Only installs fonts
RESTRICT="strip binchecks"
diff --git a/media-gfx/ebdftopcf/ebdftopcf-2.ebuild b/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
index 9d7d4f6cc57d..6db2d76e9187 100644
--- a/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
+++ b/media-gfx/ebdftopcf/ebdftopcf-2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE=""
# these apps are used at runtime by ebdftopcf
diff --git a/media-gfx/fontforge/fontforge-20200314.ebuild b/media-gfx/fontforge/fontforge-20200314.ebuild
index 3572b345a24f..8136d074c603 100644
--- a/media-gfx/fontforge/fontforge-20200314.ebuild
+++ b/media-gfx/fontforge/fontforge-20200314.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforg
LICENSE="BSD GPL-3+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="doc truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode woff2 X"
RESTRICT="!test? ( test )"
diff --git a/media-gfx/graphite2/graphite2-1.3.14.ebuild b/media-gfx/graphite2/graphite2-1.3.14.ebuild
index 2916af32a841..7293cfb0a10e 100644
--- a/media-gfx/graphite2/graphite2-1.3.14.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.14.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="perl test"
RESTRICT="!test? ( test )"
diff --git a/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild b/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
index e17e6e89118a..6cf05d68b56f 100644
--- a/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www2.graphviz.org/Packages/stable/portable_source/${P}.tar.gz"
LICENSE="CPL-1.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
IUSE="+cairo devil doc examples gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD"
REQUIRED_USE="
diff --git a/media-gfx/transfig/transfig-3.2.5e-r1.ebuild b/media-gfx/transfig/transfig-3.2.5e-r1.ebuild
index 5c2d730704e1..6be4674857ca 100644
--- a/media-gfx/transfig/transfig-3.2.5e-r1.ebuild
+++ b/media-gfx/transfig/transfig-3.2.5e-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/mcj/${MY_P}.tar.gz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
RDEPEND="x11-libs/libXpm
virtual/jpeg
diff --git a/media-libs/aalib/aalib-1.4_rc5-r9.ebuild b/media-libs/aalib/aalib-1.4_rc5-r9.ebuild
index 418f35e62be0..03e172822833 100644
--- a/media-libs/aalib/aalib-1.4_rc5-r9.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc5-r9.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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="X slang gpm static-libs"
RDEPEND="
diff --git a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild
index 9d01156b5ebf..6b51d5adc5b4 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 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="doc static-libs"
# Test test-bz106632 is known to be broken, see bug #751232
diff --git a/media-libs/freetype/freetype-2.10.4.ebuild b/media-libs/freetype/freetype-2.10.4.ebuild
index 2a38b5388bee..0575eaa7fb6e 100644
--- a/media-libs/freetype/freetype-2.10.4.ebuild
+++ b/media-libs/freetype/freetype-2.10.4.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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 4edfdff9cffa..d0df3131095d 100644
--- a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
+++ b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="static-libs"
DEPEND=">=media-libs/freetype-2.0.9
diff --git a/media-libs/gd/gd-2.3.0.ebuild b/media-libs/gd/gd-2.3.0.ebuild
index 4824a477708f..2bbd3e5bb1d8 100644
--- a/media-libs/gd/gd-2.3.0.ebuild
+++ b/media-libs/gd/gd-2.3.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/lib${P}"
LICENSE="gd IJG HPND BSD"
SLOT="2/3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="cpu_flags_x86_sse fontconfig +jpeg +png static-libs test tiff truetype webp xpm zlib"
RESTRICT="!test? ( test )"
diff --git a/media-libs/gd/gd-2.3.1.ebuild b/media-libs/gd/gd-2.3.1.ebuild
index 81b85e2979fe..99fe254589bc 100644
--- a/media-libs/gd/gd-2.3.1.ebuild
+++ b/media-libs/gd/gd-2.3.1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/lib${P}"
LICENSE="gd IJG HPND BSD"
SLOT="2/3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="cpu_flags_x86_sse fontconfig +jpeg +png static-libs test tiff truetype webp xpm zlib"
RESTRICT="!test? ( test )"
diff --git a/media-libs/giflib/giflib-5.2.1-r1.ebuild b/media-libs/giflib/giflib-5.2.1-r1.ebuild
index a64dbd61c8f1..aa570a52f460 100644
--- a/media-libs/giflib/giflib-5.2.1-r1.ebuild
+++ b/media-libs/giflib/giflib-5.2.1-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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs"
PATCHES=(
diff --git a/media-libs/glu/glu-9.0.1.ebuild b/media-libs/glu/glu-9.0.1.ebuild
index f173ada5ae1c..956eacac0623 100644
--- a/media-libs/glu/glu-9.0.1.ebuild
+++ b/media-libs/glu/glu-9.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="SGI-B-2.0"
diff --git a/media-libs/imlib2/imlib2-1.6.1.ebuild b/media-libs/imlib2/imlib2-1.6.1.ebuild
index 26f1343b243c..f34224e684a1 100644
--- a/media-libs/imlib2/imlib2-1.6.1.ebuild
+++ b/media-libs/imlib2/imlib2-1.6.1.ebuild
@@ -12,7 +12,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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+X bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 doc +gif +jpeg mp3 +png +shm
static-libs +tiff +webp zlib"
diff --git a/media-libs/jbig2dec/jbig2dec-0.18.ebuild b/media-libs/jbig2dec/jbig2dec-0.18.ebuild
index 85b3fddff201..fd2742d804a1 100644
--- a/media-libs/jbig2dec/jbig2dec-0.18.ebuild
+++ b/media-libs/jbig2dec/jbig2dec-0.18.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ArtifexSoftware/${PN}/archive/${PV}.tar.gz -> ${P}.t
LICENSE="AGPL-3"
SLOT="0/$(ver_cut 1-2)" #698428
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="png static-libs test"
RESTRICT="!test? ( test )"
diff --git a/media-libs/jbigkit/jbigkit-2.1.ebuild b/media-libs/jbigkit/jbigkit-2.1.ebuild
index 58cb0a9b89a1..b6912dc72909 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/${PV}" # Since we install unversioned libraries, use ${PV} subslots.
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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/lcms/lcms-2.11.ebuild b/media-libs/lcms/lcms-2.11.ebuild
index a7e28b7c9264..d35c2fd1aa2c 100644
--- a/media-libs/lcms/lcms-2.11.ebuild
+++ b/media-libs/lcms/lcms-2.11.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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc jpeg static-libs test +threads tiff"
RESTRICT="!test? ( test )"
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 b08741e892ea..a6923db9c7c4 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
DEPEND="virtual/pkgconfig"
diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild b/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild
index b368ed8f2360..9ed1a88f320d 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -14,7 +14,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 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="cxx doc imlib java mono ncurses opengl ruby slang static-libs test truetype X"
RESTRICT="!test? ( test )"
REQUIRED_USE=""
diff --git a/media-libs/libggi/libggi-2.2.2-r1.ebuild b/media-libs/libggi/libggi-2.2.2-r1.ebuild
index 0602ea31a216..e662b15728d5 100644
--- a/media-libs/libggi/libggi-2.2.2-r1.ebuild
+++ b/media-libs/libggi/libggi-2.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 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/libid3tag/libid3tag-0.15.1b-r4.ebuild b/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
index 538b52133549..58fc3dd68d63 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug"
RDEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libpng/libpng-1.6.37-r2.ebuild b/media-libs/libpng/libpng-1.6.37-r2.ebuild
index 864911bfec3d..d33afa9ad4bd 100644
--- a/media-libs/libpng/libpng-1.6.37-r2.ebuild
+++ b/media-libs/libpng/libpng-1.6.37-r2.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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="apng cpu_flags_arm_neon cpu_flags_x86_sse static-libs"
RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild b/media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild
index c81aef8573ca..a37f08ca0724 100644
--- a/media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild
@@ -11,7 +11,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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
BDEPEND="virtual/pkgconfig"
diff --git a/media-libs/libuninameslist/libuninameslist-20091231-r1.ebuild b/media-libs/libuninameslist/libuninameslist-20091231-r1.ebuild
index 5b94c812b36c..4ea179d8d318 100644
--- a/media-libs/libuninameslist/libuninameslist-20091231-r1.ebuild
+++ b/media-libs/libuninameslist/libuninameslist-20091231-r1.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/${PN}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
src_configure() {
econf --disable-static
diff --git a/media-libs/libv4l/libv4l-1.20.0.ebuild b/media-libs/libv4l/libv4l-1.20.0.ebuild
index d92276eb4f44..c00574fbf535 100644
--- a/media-libs/libv4l/libv4l-1.20.0.ebuild
+++ b/media-libs/libv4l/libv4l-1.20.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
LICENSE="LGPL-2.1+"
SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="dvb jpeg"
RDEPEND="
diff --git a/media-libs/libwebp/libwebp-1.1.0.ebuild b/media-libs/libwebp/libwebp-1.1.0.ebuild
index 0802570c55e4..f338c5100529 100644
--- a/media-libs/libwebp/libwebp-1.1.0.ebuild
+++ b/media-libs/libwebp/libwebp-1.1.0.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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg opengl +png static-libs swap-16bit-csp tiff"
# TODO: dev-lang/swig bindings in swig/ subdirectory
diff --git a/media-libs/netpbm/netpbm-10.76.00.ebuild b/media-libs/netpbm/netpbm-10.76.00.ebuild
index a1fcc051cc55..26002ad583cf 100644
--- a/media-libs/netpbm/netpbm-10.76.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.76.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~riscv s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
BDEPEND="app-arch/xz-utils
diff --git a/media-libs/openjpeg/openjpeg-2.4.0.ebuild b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
index d14c44cab8ae..58bad868b8f3 100644
--- a/media-libs/openjpeg/openjpeg-2.4.0.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.4.0.ebuild
@@ -17,7 +17,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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs test"
RESTRICT="!test? ( test )"
diff --git a/media-libs/tiff/tiff-4.2.0.ebuild b/media-libs/tiff/tiff-4.2.0.ebuild
index 69bb47338e2a..11406fce52cc 100644
--- a/media-libs/tiff/tiff-4.2.0.ebuild
+++ b/media-libs/tiff/tiff-4.2.0.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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
RESTRICT="!test? ( test )"
diff --git a/media-libs/urt/urt-3.1b-r3.ebuild b/media-libs/urt/urt-3.1b-r3.ebuild
index 2670c6df6421..8e3dfffe9940 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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
IUSE="gif postscript static-libs tiff tools X"
RDEPEND="
diff --git a/media-radio/tqsl/tqsl-2.5.1.ebuild b/media-radio/tqsl/tqsl-2.5.1.ebuild
index a6cbd247c04e..479817e6c433 100644
--- a/media-radio/tqsl/tqsl-2.5.1.ebuild
+++ b/media-radio/tqsl/tqsl-2.5.1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit cmake-utils wxwidgets vcs-snapshot
+WX_GTK_VER="3.0"
+inherit cmake wxwidgets vcs-snapshot
DESCRIPTION="ARRL Logbook of the World"
HOMEPAGE="http://www.arrl.org/tqsl-download"
@@ -12,21 +13,20 @@ SRC_URI="https://github.com/rich0/trustedqsl-tqsl/archive/v${PV}.tar.gz -> ${P}.
LICENSE="LOTW"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND="dev-libs/expat:=
- dev-libs/openssl:0=
- net-misc/curl:=
- sys-libs/db:=
- sys-libs/zlib:=
- x11-libs/wxGTK:3.0="
+RDEPEND="
+ dev-libs/expat:=
+ dev-libs/openssl:0=
+ net-misc/curl:=
+ sys-libs/db:=
+ sys-libs/zlib:=
+ x11-libs/wxGTK:${WX_GTK_VER}="
DEPEND="${RDEPEND}"
DOCS=( AUTHORS.txt INSTALL README )
-HTML_DOCS=( html )
+HTML_DOCS=( html/. )
-WX_GTK_VER=3.0
-
-pkg_setup() {
+src_configure() {
setup-wxwidgets
+ cmake_src_configure
}
diff --git a/media-sound/rplay/rplay-3.3.2-r3.ebuild b/media-sound/rplay/rplay-3.3.2-r3.ebuild
index 0daa2f8a38d4..b0daba33d9a6 100644
--- a/media-sound/rplay/rplay-3.3.2-r3.ebuild
+++ b/media-sound/rplay/rplay-3.3.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://rplay.doit.org/dist/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="media-sound/gsm"
diff --git a/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild b/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild
index ce2c9c3830b9..0aaba40bef35 100644
--- a/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild
+++ b/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://www.mpeg.org/pub_ftp/mpeg/mssg/${MY_P}.tar.gz"
LICENSE="mpeg2enc"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
RESTRICT="mirror bindist" #465088
S="${WORKDIR}/mpeg2"
diff --git a/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild b/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild
index e7d8ef4f773d..85157b99bc89 100644
--- a/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
# GPL-2 for the init scripts
LICENSE="HPND BSD GPL-2"
SLOT="0/40"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="
X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql
netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib
diff --git a/net-analyzer/netcat/netcat-110-r9.ebuild b/net-analyzer/netcat/netcat-110-r9.ebuild
index b0b8ace9d97b..89afaec191e1 100644
--- a/net-analyzer/netcat/netcat-110-r9.ebuild
+++ b/net-analyzer/netcat/netcat-110-r9.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
LICENSE="netcat"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris ~x64-solaris"
IUSE="crypt ipv6 static"
LIB_DEPEND="crypt? ( dev-libs/libmix[static-libs(+)] )"
diff --git a/net-analyzer/netselect/netselect-0.4-r1.ebuild b/net-analyzer/netselect/netselect-0.4-r1.ebuild
index 34aafe6fa113..cf688a073401 100644
--- a/net-analyzer/netselect/netselect-0.4-r1.ebuild
+++ b/net-analyzer/netselect/netselect-0.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="ipv6"
PATCHES=(
diff --git a/net-analyzer/ngrep/ngrep-1.47.ebuild b/net-analyzer/ngrep/ngrep-1.47.ebuild
index 6ca8a342aa3a..768d8053525b 100644
--- a/net-analyzer/ngrep/ngrep-1.47.ebuild
+++ b/net-analyzer/ngrep/ngrep-1.47.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/jpr5/ngrep/archive/V${PV/./_}.tar.gz -> ${P}.tar.gz"
LICENSE="ngrep"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="ipv6"
DEPEND="
diff --git a/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild b/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild
index d47b82ff6739..4381c801ab89 100644
--- a/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild
+++ b/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://nmbscan.g76r.eu/down/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86"
RDEPEND="net-dns/bind-tools
net-fs/samba
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild
index 217b3f570c80..d0a366b2b4b6 100644
--- a/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="+drop-root libressl smi ssl samba suid test"
RESTRICT="!test? ( test )"
diff --git a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
index d3a014f2b31d..03742866ec3d 100644
--- a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${P/_}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="+drop-root libressl +smi +ssl +samba suid test"
# Assorted failures: bug #768498
RESTRICT="test"
diff --git a/net-analyzer/traceroute/traceroute-2.1.0.ebuild b/net-analyzer/traceroute/traceroute-2.1.0.ebuild
index f84fb8817101..08c8de8deef6 100644
--- a/net-analyzer/traceroute/traceroute-2.1.0.ebuild
+++ b/net-analyzer/traceroute/traceroute-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/traceroute/${P}.tar.gz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="static"
RDEPEND="!<net-misc/iputils-20121221-r1
diff --git a/net-dialup/linux-atm/linux-atm-2.5.2.ebuild b/net-dialup/linux-atm/linux-atm-2.5.2.ebuild
index d8ce786426d4..95830d567a09 100644
--- a/net-dialup/linux-atm/linux-atm-2.5.2.ebuild
+++ b/net-dialup/linux-atm/linux-atm-2.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="static-libs"
RDEPEND=""
diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
index 55083572fc97..b5461864bb7c 100644
--- a/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
+++ b/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.ohse.de/uwe/releases/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="nls"
DEPEND="nls? ( virtual/libintl )"
diff --git a/net-dialup/mgetty/mgetty-1.2.1-r1.ebuild b/net-dialup/mgetty/mgetty-1.2.1-r1.ebuild
index 7ebadecad3d3..6d00377e5829 100644
--- a/net-dialup/mgetty/mgetty-1.2.1-r1.ebuild
+++ b/net-dialup/mgetty/mgetty-1.2.1-r1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="${DEPEND}
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="+fax fidonet split-usr"
pkg_setup() {
diff --git a/net-dialup/minicom/minicom-2.7.1.ebuild b/net-dialup/minicom/minicom-2.7.1.ebuild
index 8484224b3e10..4ae4c38c5c6f 100644
--- a/net-dialup/minicom/minicom-2.7.1.ebuild
+++ b/net-dialup/minicom/minicom-2.7.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://alioth-archive.debian.org/releases/minicom/Source/${PV}/${P}.ta
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="nls"
COMMON_DEPEND="sys-libs/ncurses:="
diff --git a/net-dns/c-ares/c-ares-1.17.1.ebuild b/net-dns/c-ares/c-ares-1.17.1.ebuild
index 4d7c73e9bc7a..c3284b27c36a 100644
--- a/net-dns/c-ares/c-ares-1.17.1.ebuild
+++ b/net-dns/c-ares/c-ares-1.17.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://c-ares.haxx.se/"
SRC_URI="https://${PN}.haxx.se/download/${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris"
IUSE="static-libs"
# Subslot = SONAME of libcares.so.2
diff --git a/net-dns/idnkit/idnkit-1.0-r2.ebuild b/net-dns/idnkit/idnkit-1.0-r2.ebuild
index 609d5068ddd8..e6466af1ecae 100644
--- a/net-dns/idnkit/idnkit-1.0-r2.ebuild
+++ b/net-dns/idnkit/idnkit-1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="https://www.nic.ad.jp/ja/idn/idnkit/download/sources/${P}-src.tar.gz"
LICENSE="JNIC"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="static-libs"
DEPEND="virtual/libiconv"
diff --git a/net-dns/idnkit/idnkit-2.3.ebuild b/net-dns/idnkit/idnkit-2.3.ebuild
index e80d11bc44b0..8645ae443d0f 100644
--- a/net-dns/idnkit/idnkit-2.3.ebuild
+++ b/net-dns/idnkit/idnkit-2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://jprs.co.jp/idn/${P}.tar.bz2"
LICENSE="JPRS"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="liteonly static-libs"
RDEPEND="
virtual/libiconv
diff --git a/net-dns/libidn/libidn-1.36.ebuild b/net-dns/libidn/libidn-1.36.ebuild
index 4673ff12c3fe..fc9779677ca6 100644
--- a/net-dns/libidn/libidn-1.36.ebuild
+++ b/net-dns/libidn/libidn-1.36.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
SLOT="0/12"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs java mono nls"
DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
diff --git a/net-dns/libidn2/libidn2-2.3.0.ebuild b/net-dns/libidn2/libidn2-2.3.0.ebuild
index 381ffbc6392e..5e9b5e4c2734 100644
--- a/net-dns/libidn2/libidn2-2.3.0.ebuild
+++ b/net-dns/libidn2/libidn2-2.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
LICENSE="GPL-2+ LGPL-3+"
SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND="
diff --git a/net-firewall/iptables/iptables-1.8.5.ebuild b/net-firewall/iptables/iptables-1.8.5.ebuild
index 26f59275fe57..a6ba56cb3543 100644
--- a/net-firewall/iptables/iptables-1.8.5.ebuild
+++ b/net-firewall/iptables/iptables-1.8.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
# Subslot reflects PV when libxtables and/or libip*tc was changed
# the last time.
SLOT="0/1.8.3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="conntrack ipv6 netlink nftables pcap static-libs"
BUILD_DEPEND="
diff --git a/net-fs/libnfs/libnfs-4.0.0.ebuild b/net-fs/libnfs/libnfs-4.0.0.ebuild
index efb7a26ea550..f2cdf5f1c4c6 100644
--- a/net-fs/libnfs/libnfs-4.0.0.ebuild
+++ b/net-fs/libnfs/libnfs-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git"
else
SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 x86"
S="${WORKDIR}/${PN}-${P}"
fi
diff --git a/net-fs/nfs-utils/nfs-utils-2.5.1.ebuild b/net-fs/nfs-utils/nfs-utils-2.5.1.ebuild
index 31b5706372dd..af962af74ca6 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
else
SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
fi
LICENSE="GPL-2"
diff --git a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
index b17b87a27db5..00e51fb882ef 100644
--- a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
+++ b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -19,7 +19,7 @@ SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/${MY_P}.tar.gz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="ipv6 libressl readline ssl"
RDEPEND="
diff --git a/net-ftp/ftpbase/ftpbase-0.01-r4.ebuild b/net-ftp/ftpbase/ftpbase-0.01-r4.ebuild
index 19eee733db9e..dc3a2253a339 100644
--- a/net-ftp/ftpbase/ftpbase-0.01-r4.ebuild
+++ b/net-ftp/ftpbase/ftpbase-0.01-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="pam"
DEPEND="pam? ( sys-libs/pam )
diff --git a/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild b/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild
index d4befbf65a61..5f9d6bc5416d 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/software/network/tftp/${PN}/${P}.tar.xz"
LICENSE="BSD-4"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos"
IUSE="ipv6 readline selinux tcpd"
CDEPEND="
diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild
index 9ff59b89d0c4..1152c63c9016 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="http://security.appspot.com/downloads/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="caps libressl pam tcpd ssl selinux xinetd"
DEPEND="caps? ( >=sys-libs/libcap-2 )
diff --git a/net-irc/irssi/irssi-1.2.2-r1.ebuild b/net-irc/irssi/irssi-1.2.2-r1.ebuild
index f26fe2a1b73c..6347e3177724 100644
--- a/net-irc/irssi/irssi-1.2.2-r1.ebuild
+++ b/net-irc/irssi/irssi-1.2.2-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="otr +perl selinux socks5 +proxy libressl"
COMMON_DEPEND="
diff --git a/net-libs/c-client/c-client-2007f-r6.ebuild b/net-libs/c-client/c-client-2007f-r6.ebuild
index 56771f441299..331c311b1211 100644
--- a/net-libs/c-client/c-client-2007f-r6.ebuild
+++ b/net-libs/c-client/c-client-2007f-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="doc +ipv6 kerberos kernel_linux kernel_FreeBSD libressl pam ssl static-libs topal chappa"
RDEPEND="
diff --git a/net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild b/net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild
index a95655f28ac6..4a8abc450eec 100644
--- a/net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.69.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit flag-o-matic
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
DESCRIPTION="Courier authentication library"
SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
diff --git a/net-libs/courier-authlib/courier-authlib-0.71.0.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.0.ebuild
index be6b3354a070..cd7055818b7a 100644
--- a/net-libs/courier-authlib/courier-authlib-0.71.0.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.71.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit flag-o-matic
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
DESCRIPTION="Courier authentication library"
SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
diff --git a/net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild b/net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild
index bab50bd7818f..8015be8a0066 100644
--- a/net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild
+++ b/net-libs/courier-unicode/courier-unicode-2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.courier-mta.org/"
SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
src_configure() {
diff --git a/net-libs/courier-unicode/courier-unicode-2.1.ebuild b/net-libs/courier-unicode/courier-unicode-2.1.ebuild
index 6dc015faefea..483c9d41a566 100644
--- a/net-libs/courier-unicode/courier-unicode-2.1.ebuild
+++ b/net-libs/courier-unicode/courier-unicode-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.courier-mta.org/"
SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
src_install() {
diff --git a/net-libs/glib-networking/glib-networking-2.62.4.ebuild b/net-libs/glib-networking/glib-networking-2.62.4.ebuild
index d1a91d25ddae..69c56a5b2990 100644
--- a/net-libs/glib-networking/glib-networking-2.62.4.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.62.4.ebuild
@@ -12,7 +12,7 @@ LICENSE="LGPL-2.1+"
SLOT="0"
IUSE="+gnome +libproxy +ssl test"
RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
>=dev-libs/glib-2.60.0:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/glib-networking/glib-networking-2.64.3.ebuild b/net-libs/glib-networking/glib-networking-2.64.3.ebuild
index f22fb43f04ad..07241df42db4 100644
--- a/net-libs/glib-networking/glib-networking-2.64.3.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.64.3.ebuild
@@ -12,7 +12,7 @@ LICENSE="LGPL-2.1+"
SLOT="0"
IUSE="+gnome +libproxy +ssl test"
RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
>=dev-libs/glib-2.64.0:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/gnutls/gnutls-3.6.15.ebuild b/net-libs/gnutls/gnutls-3.6.15.ebuild
index 462583d91fa7..b5557dc3ffcd 100644
--- a/net-libs/gnutls/gnutls-3.6.15.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
LICENSE="GPL-3 LGPL-2.1+"
SLOT="0/30" # libgnutls.so number
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
REQUIRED_USE="
diff --git a/net-libs/ldns/ldns-1.7.1-r1.ebuild b/net-libs/ldns/ldns-1.7.1-r1.ebuild
index fac411168db6..8daddf361c00 100644
--- a/net-libs/ldns/ldns-1.7.1-r1.ebuild
+++ b/net-libs/ldns/ldns-1.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/3"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="+dane doc +ecdsa ed25519 ed448 gost libressl python static-libs vim-syntax"
# configure will die if ecdsa is enabled and ssl is not
diff --git a/net-libs/libgsasl/libgsasl-1.10.0.ebuild b/net-libs/libgsasl/libgsasl-1.10.0.ebuild
index 6d5ade330e41..e7c73d483335 100644
--- a/net-libs/libgsasl/libgsasl-1.10.0.ebuild
+++ b/net-libs/libgsasl/libgsasl-1.10.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN/lib}/${P}.tar.gz"
LICENSE="GPL-3 LGPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="idn gcrypt kerberos nls ntlm static-libs"
DEPEND="
diff --git a/net-libs/libgssglue/libgssglue-0.4-r1.ebuild b/net-libs/libgssglue/libgssglue-0.4-r1.ebuild
index c83a1554679b..1229298a72c3 100644
--- a/net-libs/libgssglue/libgssglue-0.4-r1.ebuild
+++ b/net-libs/libgssglue/libgssglue-0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="!app-crypt/libgssapi"
diff --git a/net-libs/liblockfile/liblockfile-1.16.ebuild b/net-libs/liblockfile/liblockfile-1.16.ebuild
index 5d0dad140895..3140e575a8bc 100644
--- a/net-libs/liblockfile/liblockfile-1.16.ebuild
+++ b/net-libs/liblockfile/liblockfile-1.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/miquels/liblockfile/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND="acct-group/mail"
diff --git a/net-libs/libmnl/libmnl-1.0.4.ebuild b/net-libs/libmnl/libmnl-1.0.4.ebuild
index cf35872a9050..d4616af8611b 100644
--- a/net-libs/libmnl/libmnl-1.0.4.ebuild
+++ b/net-libs/libmnl/libmnl-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0/0.2.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux"
IUSE="examples static-libs"
src_configure() {
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild
index d6f8e58fef86..62ad204c78dc 100644
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="static-libs"
RDEPEND="
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild
index 89f383a35d21..319887c21a9d 100644
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="static-libs"
RDEPEND="
diff --git a/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild b/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
index bc3f07fa53d5..53e90911786d 100644
--- a/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
+++ b/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
PATCHES=( "${DISTDIR}/${PATCH_FN}" )
diff --git a/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild b/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild
index b4fd1d02e3fc..af55e3a7b0e0 100644
--- a/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild
+++ b/net-libs/libnfsidmap/libnfsidmap-0.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://fedorapeople.org/~steved/${PN}/${PV}/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="ldap static-libs"
DEPEND="ldap? ( net-nds/openldap )"
diff --git a/net-libs/libnsl/libnsl-0-r1.ebuild b/net-libs/libnsl/libnsl-0-r1.ebuild
index ae0c841aa3e9..f523651c7a2a 100644
--- a/net-libs/libnsl/libnsl-0-r1.ebuild
+++ b/net-libs/libnsl/libnsl-0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/thkukuk/libnsl"
SLOT="0/1"
LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
diff --git a/net-libs/libnsl/libnsl-1.3.0-r1.ebuild b/net-libs/libnsl/libnsl-1.3.0-r1.ebuild
index 812614e3944b..e16f5f60ba89 100644
--- a/net-libs/libnsl/libnsl-1.3.0-r1.ebuild
+++ b/net-libs/libnsl/libnsl-1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SLOT="0/2"
LICENSE="LGPL-2.1+"
# Stabilize together with glibc-2.26!
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
diff --git a/net-libs/libntlm/libntlm-1.6.ebuild b/net-libs/libntlm/libntlm-1.6.ebuild
index 3e6348ee0afc..d7355b7a51d8 100644
--- a/net-libs/libntlm/libntlm-1.6.ebuild
+++ b/net-libs/libntlm/libntlm-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://www.nongnu.org/${PN}/releases/${P}.tar.gz"
SLOT="0"
LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux"
IUSE="static-libs"
src_configure() {
diff --git a/net-libs/libpcap/libpcap-1.10.0.ebuild b/net-libs/libpcap/libpcap-1.10.0.ebuild
index 84b0f8780fd2..d14f51abdc5d 100644
--- a/net-libs/libpcap/libpcap-1.10.0.ebuild
+++ b/net-libs/libpcap/libpcap-1.10.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${P/_pre/-bp}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug"
RDEPEND="
diff --git a/net-libs/libpsl/libpsl-0.21.0.ebuild b/net-libs/libpsl/libpsl-0.21.0.ebuild
index d939d58cf048..f00be3c56585 100644
--- a/net-libs/libpsl/libpsl-0.21.0.ebuild
+++ b/net-libs/libpsl/libpsl-0.21.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="icu +idn +man"
RDEPEND="
diff --git a/net-libs/librsync/librsync-2.3.1.ebuild b/net-libs/librsync/librsync-2.3.1.ebuild
index a8a8e5749026..5cdb27d2e655 100644
--- a/net-libs/librsync/librsync-2.3.1.ebuild
+++ b/net-libs/librsync/librsync-2.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="LGPL-2.1"
SLOT="0/2.2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
RDEPEND="
dev-libs/popt
diff --git a/net-libs/libsmi/libsmi-0.5.0-r1.ebuild b/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
index 6b0294947d29..712c25b0a296 100644
--- a/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
+++ b/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://www.ibr.cs.tu-bs.de/projects/libsmi/download/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="static-libs"
RESTRICT="test"
diff --git a/net-libs/libsoup/libsoup-2.70.0.ebuild b/net-libs/libsoup/libsoup-2.70.0.ebuild
index 55d0bc8ab39e..fb3e43069562 100644
--- a/net-libs/libsoup/libsoup-2.70.0.ebuild
+++ b/net-libs/libsoup/libsoup-2.70.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,7 +17,7 @@ IUSE="brotli gssapi gtk-doc +introspection samba ssl test +vala"
RESTRICT="!test? ( test )"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
DEPEND="
>=dev-libs/glib-2.58:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild b/net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild
index 3e48a3afea49..1ee9017fd30e 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
IUSE="gcrypt libressl mbedtls zlib"
REQUIRED_USE="?? ( gcrypt mbedtls )"
RESTRICT="test"
diff --git a/net-libs/libtirpc/libtirpc-1.2.6.ebuild b/net-libs/libtirpc/libtirpc-1.2.6.ebuild
index a4c292c39f1b..c257e2ba3a0c 100644
--- a/net-libs/libtirpc/libtirpc-1.2.6.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
LICENSE="GPL-2"
SLOT="0/3" # subslot matches SONAME major
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="ipv6 kerberos static-libs"
RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/net-libs/miniupnpc/miniupnpc-2.2.1.ebuild b/net-libs/miniupnpc/miniupnpc-2.2.1.ebuild
index 69cd49ce7d3b..7ac6dc55a8fa 100644
--- a/net-libs/miniupnpc/miniupnpc-2.2.1.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
LICENSE="BSD"
SLOT="0/17"
-KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86"
IUSE="ipv6 kernel_linux static-libs"
RDEPEND=""
diff --git a/net-libs/nghttp2/nghttp2-1.41.0.ebuild b/net-libs/nghttp2/nghttp2-1.41.0.ebuild
index 1673a2300ef0..4e440e370c50 100644
--- a/net-libs/nghttp2/nghttp2-1.41.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.41.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# TODO: Add python support.
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
inherit autotools git-r3
else
SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris"
fi
DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/rest/rest-0.8.1.ebuild b/net-libs/rest/rest-0.8.1.ebuild
index 76001caf195d..e51b57ddc0ef 100644
--- a/net-libs/rest/rest-0.8.1.ebuild
+++ b/net-libs/rest/rest-0.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1"
SLOT="0.7"
IUSE="+introspection test"
RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86"
# Coverage testing should not be enabled
RDEPEND="
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
index 9c6d2e074dce..865a87574ece 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/thkukuk/rpcsvc-proto"
SLOT="0"
LICENSE="LGPL-2.1+ BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
DEPEND="elibc_glibc? ( sys-libs/glibc[rpc(-)] )"
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.2.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.2.ebuild
index a07ee40040e2..0d012345ff83 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.2.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/thkukuk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
SLOT="0"
LICENSE="LGPL-2.1+ BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE=""
# sys-devel/gettext is only for libintl detection macros.
diff --git a/net-mail/autorespond/autorespond-2.0.4.ebuild b/net-mail/autorespond/autorespond-2.0.4.ebuild
index ce4bb83c1c39..538933c4132a 100644
--- a/net-mail/autorespond/autorespond-2.0.4.ebuild
+++ b/net-mail/autorespond/autorespond-2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/qmailadmin/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~s390 sparc x86"
RDEPEND="virtual/qmail"
PATCHES=(
diff --git a/net-mail/checkpassword/checkpassword-0.90-r4.ebuild b/net-mail/checkpassword/checkpassword-0.90-r4.ebuild
index 65815d9b39b4..5ced6f5bd2f0 100644
--- a/net-mail/checkpassword/checkpassword-0.90-r4.ebuild
+++ b/net-mail/checkpassword/checkpassword-0.90-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://cr.yp.to/checkpwd/${P}.tar.gz"
LICENSE="all-rights-reserved"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="static"
RESTRICT="mirror bindist"
diff --git a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild
index a3b6fc0bb173..4f7d262535da 100644
--- a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild
+++ b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.fehcom.de/qmail/smtpauth.html"
LICENSE="public-domain RSA"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
DEPEND="acct-user/cmd5checkpw"
diff --git a/net-mail/courier-imap/courier-imap-5.0.7.ebuild b/net-mail/courier-imap/courier-imap-5.0.7.ebuild
index cce241a2107b..2e22ac2f7fe8 100644
--- a/net-mail/courier-imap/courier-imap-5.0.7.ebuild
+++ b/net-mail/courier-imap/courier-imap-5.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="berkdb debug fam +gdbm gnutls ipv6 libressl selinux trashquota"
REQUIRED_USE="|| ( berkdb gdbm )"
diff --git a/net-mail/dot-forward/dot-forward-0.71-r4.ebuild b/net-mail/dot-forward/dot-forward-0.71-r4.ebuild
index 1adf2b19eebe..7c1df47bf994 100644
--- a/net-mail/dot-forward/dot-forward-0.71-r4.ebuild
+++ b/net-mail/dot-forward/dot-forward-0.71-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://cr.yp.to/software/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
# See bug 97850
diff --git a/net-mail/dovecot/dovecot-2.3.13-r100.ebuild b/net-mail/dovecot/dovecot-2.3.13-r100.ebuild
index 674e1df17407..539b2a181350 100644
--- a/net-mail/dovecot/dovecot-2.3.13-r100.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.13-r100.ebuild
@@ -30,7 +30,7 @@ HOMEPAGE="https://www.dovecot.org/"
SLOT="0"
LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib zstd"
diff --git a/net-mail/fetchmail/fetchmail-6.4.8.ebuild b/net-mail/fetchmail/fetchmail-6.4.8.ebuild
index 603849b9aa6d..4dfbc9b83b55 100644
--- a/net-mail/fetchmail/fetchmail-6.4.8.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="GPL-2 public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="ssl nls kerberos tk socks libressl"
REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-mail/mailbase/mailbase-1.5-r2.ebuild b/net-mail/mailbase/mailbase-1.5-r2.ebuild
index e7d481a196e8..5cc221243da2 100644
--- a/net-mail/mailbase/mailbase-1.5-r2.ebuild
+++ b/net-mail/mailbase/mailbase-1.5-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="pam"
RDEPEND="
diff --git a/net-mail/metamail/metamail-2.7.53.3-r2.ebuild b/net-mail/metamail/metamail-2.7.53.3-r2.ebuild
index f32b283204d4..49217dd8a9a3 100644
--- a/net-mail/metamail/metamail-2.7.53.3-r2.ebuild
+++ b/net-mail/metamail/metamail-2.7.53.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="http://ftp.funet.fi/pub/unix/mail/metamail/mm${MY_PV}.tar.Z
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="static-libs"
DEPEND="sys-libs/ncurses
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild
index a71c6727a327..20bdc0db0cff 100644
--- a/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild
+++ b/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ia64 ppc s390 sparc x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc ~s390 sparc x86"
IUSE="maildrop"
# the RESTRICT is because the vpopmail lib directory is locked down
# and non-root can't access them.
diff --git a/net-mail/queue-fix/queue-fix-1.4-r3.ebuild b/net-mail/queue-fix/queue-fix-1.4-r3.ebuild
index 01ae38b12b08..9ca616c75b14 100644
--- a/net-mail/queue-fix/queue-fix-1.4-r3.ebuild
+++ b/net-mail/queue-fix/queue-fix-1.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="http://www.netmeridian.com/e-huss/${P}.tar.gz
LICENSE="all-rights-reserved public-domain" # includes code from qmail
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ~s390 sparc x86"
RESTRICT="mirror bindist"
PDEPEND="virtual/qmail"
diff --git a/net-mail/queue-repair/queue-repair-0.9.0-r2.ebuild b/net-mail/queue-repair/queue-repair-0.9.0-r2.ebuild
index 8a35395794c7..75f2d05da3ab 100644
--- a/net-mail/queue-repair/queue-repair-0.9.0-r2.ebuild
+++ b/net-mail/queue-repair/queue-repair-0.9.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://pyropus.ca/software/queue-repair/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RESTRICT="test" # no tests
diff --git a/net-mail/randomsig/randomsig-1.10.0.ebuild b/net-mail/randomsig/randomsig-1.10.0.ebuild
index 7ef507fc5e15..f850d7cfcf8f 100644
--- a/net-mail/randomsig/randomsig-1.10.0.ebuild
+++ b/net-mail/randomsig/randomsig-1.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://suso.suso.org/programs/randomsig/downloads/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 s390 sparc x86"
+KEYWORDS="~amd64 ~s390 sparc x86"
RDEPEND="dev-lang/perl"
DEPEND="${RDEPEND}"
diff --git a/net-mail/smtptools/smtptools-0.2.3-r1.ebuild b/net-mail/smtptools/smtptools-0.2.3-r1.ebuild
index ea829ce42cac..be42f11b7cd1 100644
--- a/net-mail/smtptools/smtptools-0.2.3-r1.ebuild
+++ b/net-mail/smtptools/smtptools-0.2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.ohse.de/uwe/releases/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 x86"
RDEPEND="!net-mail/qtools"
PATCHES=(
diff --git a/net-misc/curl/curl-7.74.0-r2.ebuild b/net-misc/curl/curl-7.74.0-r2.ebuild
index 66fabfa2438e..4ab9c7b34631 100644
--- a/net-misc/curl/curl-7.74.0-r2.ebuild
+++ b/net-misc/curl/curl-7.74.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
LICENSE="curl"
SLOT="0"
#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap libressl mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads winssl zstd"
IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
IUSE+=" nghttp3 quiche"
diff --git a/net-misc/dhcpcd/dhcpcd-8.1.9-r1.ebuild b/net-misc/dhcpcd/dhcpcd-8.1.9-r1.ebuild
index 87278eab090f..77c0de3e8f74 100644
--- a/net-misc/dhcpcd/dhcpcd-8.1.9-r1.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-8.1.9-r1.ebuild
@@ -14,7 +14,7 @@ else
MY_P="${MY_P/_rc/-rc}"
SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz
https://dev.gentoo.org/~polynomial-c/${P}-patches-01.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
S="${WORKDIR}/${MY_P}"
fi
diff --git a/net-misc/dhcpcd/dhcpcd-9.3.4.ebuild b/net-misc/dhcpcd/dhcpcd-9.3.4.ebuild
index 605de50d9c24..2b787b26667d 100644
--- a/net-misc/dhcpcd/dhcpcd-9.3.4.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9.3.4.ebuild
@@ -13,7 +13,7 @@ else
MY_P="${MY_P/_beta/-beta}"
MY_P="${MY_P/_rc/-rc}"
SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
- KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
S="${WORKDIR}/${MY_P}"
fi
diff --git a/net-misc/dropbear/dropbear-2020.81-r2.ebuild b/net-misc/dropbear/dropbear-2020.81-r2.ebuild
index 54c40455d06c..06a278f6bece 100644
--- a/net-misc/dropbear/dropbear-2020.81-r2.ebuild
+++ b/net-misc/dropbear/dropbear-2020.81-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
LICENSE="MIT GPL-2" # (init script is GPL-2 #426056)
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib"
LIB_DEPEND="
diff --git a/net-misc/ethertypes/ethertypes-0.ebuild b/net-misc/ethertypes/ethertypes-0.ebuild
index 49477fe2b1b6..7990052a3340 100644
--- a/net-misc/ethertypes/ethertypes-0.ebuild
+++ b/net-misc/ethertypes/ethertypes-0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND="
!<net-firewall/ebtables-2.0.10.4-r2
diff --git a/net-misc/htpdate/htpdate-1.2.2.ebuild b/net-misc/htpdate/htpdate-1.2.2.ebuild
index fd145b43e0fb..4869d4ad827a 100644
--- a/net-misc/htpdate/htpdate-1.2.2.ebuild
+++ b/net-misc/htpdate/htpdate-1.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.vervest.org/htp/archive/c/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ~ppc64 s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
DEPEND=""
RDEPEND=""
diff --git a/net-misc/ipcalc/ipcalc-0.42_p2.ebuild b/net-misc/ipcalc/ipcalc-0.42_p2.ebuild
index cae6e413db63..0ad1312186d1 100644
--- a/net-misc/ipcalc/ipcalc-0.42_p2.ebuild
+++ b/net-misc/ipcalc/ipcalc-0.42_p2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="
mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}.orig.tar.gz
mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
SLOT="0"
RDEPEND=">=dev-lang/perl-5.6.0"
diff --git a/net-misc/iputils/iputils-20190709-r1.ebuild b/net-misc/iputils/iputils-20190709-r1.ebuild
index 45ccb52a468b..edf1a3d338d0 100644
--- a/net-misc/iputils/iputils-20190709-r1.ebuild
+++ b/net-misc/iputils/iputils-20190709-r1.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == "99999999" ]] ; then
else
SRC_URI="https://github.com/iputils/iputils/archive/s${PV}.tar.gz -> ${P}.tar.gz
https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
fi
DESCRIPTION="Network monitoring tools including ping and ping6"
diff --git a/net-misc/iputils/iputils-20200821-r2.ebuild b/net-misc/iputils/iputils-20200821-r2.ebuild
index f27cae1570d5..2cb005a71580 100644
--- a/net-misc/iputils/iputils-20200821-r2.ebuild
+++ b/net-misc/iputils/iputils-20200821-r2.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "99999999" ]] ; then
else
SRC_URI="https://github.com/iputils/iputils/archive/s${PV}.tar.gz -> ${P}.tar.gz
https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
- KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
fi
DESCRIPTION="Network monitoring tools including ping and ping6"
diff --git a/net-misc/jwhois/jwhois-4.0-r1.ebuild b/net-misc/jwhois/jwhois-4.0-r1.ebuild
index cfff28580d71..1295e7ccaa1b 100644
--- a/net-misc/jwhois/jwhois-4.0-r1.ebuild
+++ b/net-misc/jwhois/jwhois-4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="idn nls"
RDEPEND="idn? ( net-dns/libidn )"
diff --git a/net-misc/keychain/keychain-2.8.5.ebuild b/net-misc/keychain/keychain-2.8.5.ebuild
index 46f1e43d8fb0..46c5f47290f6 100644
--- a/net-misc/keychain/keychain-2.8.5.ebuild
+++ b/net-misc/keychain/keychain-2.8.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="dev-lang/perl"
diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
index bf3050d07acf..98ec51669c88 100644
--- a/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
+++ b/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sctp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( GPL-2+ LGPL-2.1 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="kernel_linux static-libs"
# This is only supposed to work with Linux to begin with.
diff --git a/net-misc/memcached/memcached-1.6.9.ebuild b/net-misc/memcached/memcached-1.6.9.ebuild
index 21021457846f..a78e6283331d 100644
--- a/net-misc/memcached/memcached-1.6.9.ebuild
+++ b/net-misc/memcached/memcached-1.6.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
RDEPEND=">=dev-libs/libevent-1.4:=
diff --git a/net-misc/netdate/netdate-1.2-r1.ebuild b/net-misc/netdate/netdate-1.2-r1.ebuild
index 64967d98b5cd..8af8c8914d72 100644
--- a/net-misc/netdate/netdate-1.2-r1.ebuild
+++ b/net-misc/netdate/netdate-1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.suse.com/pub/people/kukuk/ipv6/${P}.tar.bz2"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="amd64 arm ~mips s390 sparc x86"
+KEYWORDS="amd64 arm ~mips ~s390 sparc x86"
S="${WORKDIR}/${PN}"
diff --git a/net-misc/netifrc/netifrc-0.7.1-r1.ebuild b/net-misc/netifrc/netifrc-0.7.1-r1.ebuild
index 41edf1341cce..8e7932308d7c 100644
--- a/net-misc/netifrc/netifrc-0.7.1-r1.ebuild
+++ b/net-misc/netifrc/netifrc-0.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
fi
LICENSE="BSD-2"
diff --git a/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild b/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild
index 53005490a476..e5ccf9884938 100644
--- a/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild
+++ b/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/main/b/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/net-misc/netkit-rsh/netkit-rsh-0.17-r11.ebuild b/net-misc/netkit-rsh/netkit-rsh-0.17-r11.ebuild
index 9b64b5b6e695..79affc6cedaa 100644
--- a/net-misc/netkit-rsh/netkit-rsh-0.17-r11.ebuild
+++ b/net-misc/netkit-rsh/netkit-rsh-0.17-r11.ebuild
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="pam"
RDEPEND="
diff --git a/net-misc/ntp/ntp-4.2.8_p15.ebuild b/net-misc/ntp/ntp-4.2.8_p15.ebuild
index dbad8c7dc8db..b7c9a5ca8f9d 100644
--- a/net-misc/ntp/ntp-4.2.8_p15.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar
LICENSE="HPND BSD ISC"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
COMMON_DEPEND="readline? ( >=sys-libs/readline-4.1:0= )
diff --git a/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild b/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild
index b45336a7bb4e..8f65c14883e6 100644
--- a/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild
+++ b/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="libressl selinux"
DEPEND="
diff --git a/net-misc/openssh/openssh-8.4_p1-r3.ebuild b/net-misc/openssh/openssh-8.4_p1-r3.ebuild
index fc00136b3125..a0feaf7d4238 100644
--- a/net-misc/openssh/openssh-8.4_p1-r3.ebuild
+++ b/net-misc/openssh/openssh-8.4_p1-r3.ebuild
@@ -34,7 +34,7 @@ S="${WORKDIR}/${PARCH}"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Probably want to drop ssl defaulting to on in a future version.
IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss"
diff --git a/net-misc/openssh/openssh-8.5_p1-r1.ebuild b/net-misc/openssh/openssh-8.5_p1-r1.ebuild
index 7d73c214eb8f..452199f46340 100644
--- a/net-misc/openssh/openssh-8.5_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-8.5_p1-r1.ebuild
@@ -33,7 +33,7 @@ S="${WORKDIR}/${PARCH}"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Probably want to drop ssl defaulting to on in a future version.
IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss"
diff --git a/net-misc/pipes/pipes-1.16.1-r1.ebuild b/net-misc/pipes/pipes-1.16.1-r1.ebuild
index d876994479fb..11036b37088e 100644
--- a/net-misc/pipes/pipes-1.16.1-r1.ebuild
+++ b/net-misc/pipes/pipes-1.16.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc s390 x86"
+KEYWORDS="amd64 ppc ~s390 x86"
PATCHES=(
"${FILESDIR}"/${P}-execlp.patch
)
diff --git a/net-misc/rsync/rsync-3.2.3-r2.ebuild b/net-misc/rsync/rsync-3.2.3-r2.ebuild
index 3b73247a47c9..adc05ad7cc76 100644
--- a/net-misc/rsync/rsync-3.2.3-r2.ebuild
+++ b/net-misc/rsync/rsync-3.2.3-r2.ebuild
@@ -16,7 +16,7 @@ else
SRC_DIR="src-previews"
else
SRC_DIR="src"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"
S="${WORKDIR}/${P/_/}"
diff --git a/net-misc/suite3270/suite3270-4.0_p13.ebuild b/net-misc/suite3270/suite3270-4.0_p13.ebuild
index 3c7df279e0b3..abd0aab0e1a6 100644
--- a/net-misc/suite3270/suite3270-4.0_p13.ebuild
+++ b/net-misc/suite3270/suite3270-4.0_p13.ebuild
@@ -21,7 +21,7 @@ SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc s390 sparc x86"
+KEYWORDS="amd64 ppc ~s390 sparc x86"
IUSE="cjk doc ncurses ssl tcl X"
RDEPEND="ssl? ( dev-libs/openssl:0= )
diff --git a/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild b/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild
index ba2df695c456..ede40e95565b 100644
--- a/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild
+++ b/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~mschiff/distfiles/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="nls xinetd"
RDEPEND="sys-libs/ncurses:="
diff --git a/net-misc/unix2tcp/unix2tcp-0.8.2-r1.ebuild b/net-misc/unix2tcp/unix2tcp-0.8.2-r1.ebuild
index c732bfbb0c3b..5c2afd689c0c 100644
--- a/net-misc/unix2tcp/unix2tcp-0.8.2-r1.ebuild
+++ b/net-misc/unix2tcp/unix2tcp-0.8.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,6 +9,6 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ia64 ppc s390 x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc ~s390 x86"
DOCS=( ChangeLog README )
diff --git a/net-misc/wget/wget-1.20.3-r3.ebuild b/net-misc/wget/wget-1.20.3-r3.ebuild
index 051abe808c93..8efcfe141f9c 100644
--- a/net-misc/wget/wget-1.20.3-r3.ebuild
+++ b/net-misc/wget/wget-1.20.3-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/wget/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="cookie_check debug gnutls idn ipv6 libressl metalink nls ntlm pcre +ssl static test uuid zlib"
REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
RESTRICT="!test? ( test )"
diff --git a/net-misc/whois/whois-5.5.6-r1.ebuild b/net-misc/whois/whois-5.5.6-r1.ebuild
index 233d7a01bc69..2b98a55ddf5e 100644
--- a/net-misc/whois/whois-5.5.6-r1.ebuild
+++ b/net-misc/whois/whois-5.5.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999 ]] ; then
else
#SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
fi
LICENSE="GPL-2"
SLOT="0"
diff --git a/net-nds/rpcbind/rpcbind-1.2.5.ebuild b/net-nds/rpcbind/rpcbind-1.2.5.ebuild
index 5662759cd0f7..dba9155d7bdb 100644
--- a/net-nds/rpcbind/rpcbind-1.2.5.ebuild
+++ b/net-nds/rpcbind/rpcbind-1.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit autotools git-r3
else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
fi
DESCRIPTION="portmap replacement which supports RPC over various protocols"
diff --git a/net-print/cups-filters/cups-filters-1.28.3.ebuild b/net-print/cups-filters/cups-filters-1.28.3.ebuild
index 44bbe713db84..589687b5cf87 100644
--- a/net-print/cups-filters/cups-filters-1.28.3.ebuild
+++ b/net-print/cups-filters/cups-filters-1.28.3.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
else
SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
fi
DESCRIPTION="Cups filters"
HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
diff --git a/net-print/cups-filters/cups-filters-1.28.7.ebuild b/net-print/cups-filters/cups-filters-1.28.7.ebuild
index 44bbe713db84..589687b5cf87 100644
--- a/net-print/cups-filters/cups-filters-1.28.7.ebuild
+++ b/net-print/cups-filters/cups-filters-1.28.7.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
else
SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
fi
DESCRIPTION="Cups filters"
HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
diff --git a/net-print/cups-windows/cups-windows-6.0-r1.ebuild b/net-print/cups-windows/cups-windows-6.0-r1.ebuild
index a07178068f4a..d1f32d6457db 100644
--- a/net-print/cups-windows/cups-windows-6.0-r1.ebuild
+++ b/net-print/cups-windows/cups-windows-6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}-source.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
RDEPEND=">=net-print/cups-1.2"
DEPEND="${RDEPEND}"
diff --git a/net-print/cups/cups-2.3.3-r2.ebuild b/net-print/cups/cups-2.3.3-r2.ebuild
index a367e9deed5b..6b09cae365af 100644
--- a/net-print/cups/cups-2.3.3-r2.ebuild
+++ b/net-print/cups/cups-2.3.3-r2.ebuild
@@ -19,7 +19,7 @@ else
#SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
SRC_URI="https://github.com/apple/cups/releases/download/v${MY_PV}/${MY_P}-source.tar.gz"
if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *_rc* ]] ; then
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
fi
fi
diff --git a/net-proxy/dante/dante-1.4.1-r2.ebuild b/net-proxy/dante/dante-1.4.1-r2.ebuild
index 040fefa416f3..268abe481b9b 100644
--- a/net-proxy/dante/dante-1.4.1-r2.ebuild
+++ b/net-proxy/dante/dante-1.4.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://www.inet.no/dante/files/${P}.tar.gz"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="debug kerberos pam selinux static-libs tcpd upnp"
CDEPEND="
diff --git a/perl-core/File-Temp/File-Temp-0.230.900.ebuild b/perl-core/File-Temp/File-Temp-0.230.900.ebuild
index 56c100a1f5f1..1b90ecfc7978 100644
--- a/perl-core/File-Temp/File-Temp-0.230.900.ebuild
+++ b/perl-core/File-Temp/File-Temp-0.230.900.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="File::Temp can be used to create and open temporary files in a safe way"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
# bug 390719
diff --git a/perl-core/IO-Zlib/IO-Zlib-1.100.0.ebuild b/perl-core/IO-Zlib/IO-Zlib-1.100.0.ebuild
index b076689a58fb..64aadb605fd9 100644
--- a/perl-core/IO-Zlib/IO-Zlib-1.100.0.ebuild
+++ b/perl-core/IO-Zlib/IO-Zlib-1.100.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="IO:: style interface to Compress::Zlib"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="virtual/perl-IO-Compress"
diff --git a/profiles/arch/s390/make.defaults b/profiles/arch/s390/make.defaults
index 97f32f2a91fa..fc8cc4a45203 100644
--- a/profiles/arch/s390/make.defaults
+++ b/profiles/arch/s390/make.defaults
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
ARCH="s390"
-ACCEPT_KEYWORDS="s390"
+ACCEPT_KEYWORDS="s390 ~s390"
MULTILIB_ABIS="s390"
DEFAULT_ABI="s390"
diff --git a/profiles/arch/s390/package.use.stable.mask b/profiles/arch/s390/package.use.stable.mask
deleted file mode 100644
index aaf7d617fab5..000000000000
--- a/profiles/arch/s390/package.use.stable.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Marek Szuba <marecki@gentoo.org> (2021-02-09)
-# Lua has been dropped to ~s390
-net-mail/dovecot lua
-
diff --git a/profiles/arches.desc b/profiles/arches.desc
index 3086cf534b5b..3159347e91f0 100644
--- a/profiles/arches.desc
+++ b/profiles/arches.desc
@@ -22,7 +22,7 @@ mips testing
ppc stable
ppc64 stable
riscv testing
-s390 stable
+s390 testing
sparc stable
x86 stable
diff --git a/sci-calculators/pcalc/pcalc-3-r1.ebuild b/sci-calculators/pcalc/pcalc-3-r1.ebuild
index f514c1693805..3c4fa225091f 100644
--- a/sci-calculators/pcalc/pcalc-3-r1.ebuild
+++ b/sci-calculators/pcalc/pcalc-3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pcalc/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
DEPEND="sys-devel/flex"
diff --git a/sci-libs/libcerf/libcerf-1.5.ebuild b/sci-libs/libcerf/libcerf-1.5.ebuild
index 5bebed231186..67e76bff0cb4 100644
--- a/sci-libs/libcerf/libcerf-1.5.ebuild
+++ b/sci-libs/libcerf/libcerf-1.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://apps.jcns.fz-juelich.de/src/${PN}/${P}.tgz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="doc static-libs test"
RESTRICT="!test? ( test )"
diff --git a/sci-libs/mpir/mpir-3.0.0.ebuild b/sci-libs/mpir/mpir-3.0.0.ebuild
index 28e0345af632..ccd38ea08c0d 100644
--- a/sci-libs/mpir/mpir-3.0.0.ebuild
+++ b/sci-libs/mpir/mpir-3.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.mpir.org/${P}.tar.bz2"
LICENSE="LGPL-3"
SLOT="0/23"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="+cxx cpudetection static-libs"
DEPEND="
diff --git a/sys-apps/acl/acl-2.2.53-r1.ebuild b/sys-apps/acl/acl-2.2.53-r1.ebuild
index 36ef9c8cb34a..1c5fd4005593 100644
--- a/sys-apps/acl/acl-2.2.53-r1.ebuild
+++ b/sys-apps/acl/acl-2.2.53-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="nls static-libs"
RDEPEND="
diff --git a/sys-apps/attr/attr-2.4.48-r4.ebuild b/sys-apps/attr/attr-2.4.48-r4.ebuild
index 4ed1fc5d9cc0..02c33f7c1f4f 100644
--- a/sys-apps/attr/attr-2.4.48-r4.ebuild
+++ b/sys-apps/attr/attr-2.4.48-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="debug nls static-libs"
BDEPEND="nls? ( sys-devel/gettext )"
diff --git a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
index 81f43cd133be..c3d6a9fa3dce 100644
--- a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/baselayout.git/snapshot/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="build kernel_linux"
pkg_setup() {
diff --git a/sys-apps/baselayout/baselayout-2.7.ebuild b/sys-apps/baselayout/baselayout-2.7.ebuild
index 1a631d10b938..cb06c4a3e20d 100644
--- a/sys-apps/baselayout/baselayout-2.7.ebuild
+++ b/sys-apps/baselayout/baselayout-2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
inherit git-r3
else
SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
fi
LICENSE="GPL-2"
diff --git a/sys-apps/busybox/busybox-1.32.1.ebuild b/sys-apps/busybox/busybox-1.32.1.ebuild
index a0431ffc93b7..0dd974da1e38 100644
--- a/sys-apps/busybox/busybox-1.32.1.ebuild
+++ b/sys-apps/busybox/busybox-1.32.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
else
MY_P=${PN}-${PV/_/-}
SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
fi
LICENSE="GPL-2" # GPL-2 only
diff --git a/sys-apps/coreutils/coreutils-8.31-r1.ebuild b/sys-apps/coreutils/coreutils-8.31-r1.ebuild
index 25a6f051df0d..ff8eae00d6cf 100644
--- a/sys-apps/coreutils/coreutils-8.31-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-8.31-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr"
RESTRICT="!test? ( test )"
diff --git a/sys-apps/coreutils/coreutils-8.32-r1.ebuild b/sys-apps/coreutils/coreutils-8.32-r1.ebuild
index 8328b9c5c3f2..9b25f987a67a 100644
--- a/sys-apps/coreutils/coreutils-8.32-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-8.32-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,7 +19,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr"
RESTRICT="!test? ( test )"
diff --git a/sys-apps/cpint/cpint-2.5.3.ebuild b/sys-apps/cpint/cpint-2.5.3.ebuild
index b37f49d86e9e..bd4d469d1d09 100644
--- a/sys-apps/cpint/cpint-2.5.3.ebuild
+++ b/sys-apps/cpint/cpint-2.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://linuxvm.org/Patches/s390/${PN}${MY_PV}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="s390"
+KEYWORDS="~s390"
PATCHES=(
"${FILESDIR}"/${P}-build.patch
diff --git a/sys-apps/cracklib-words/cracklib-words-2.9.6.ebuild b/sys-apps/cracklib-words/cracklib-words-2.9.6.ebuild
index 1202ed1d2956..6f3b6cfc1d80 100644
--- a/sys-apps/cracklib-words/cracklib-words-2.9.6.ebuild
+++ b/sys-apps/cracklib-words/cracklib-words-2.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/cracklib/cracklib/releases/download/${P/-words}/${P}
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
S=${WORKDIR}
diff --git a/sys-apps/daisydog/daisydog-2014.05.30.ebuild b/sys-apps/daisydog/daisydog-2014.05.30.ebuild
index d5d854b5ecb8..83d0bc40f97a 100644
--- a/sys-apps/daisydog/daisydog-2014.05.30.ebuild
+++ b/sys-apps/daisydog/daisydog-2014.05.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="static"
S=${WORKDIR}
diff --git a/sys-apps/debianutils/debianutils-4.11.1.ebuild b/sys-apps/debianutils/debianutils-4.11.1.ebuild
index 20486d2d14c8..aed53a2826c1 100644
--- a/sys-apps/debianutils/debianutils-4.11.1.ebuild
+++ b/sys-apps/debianutils/debianutils-4.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
LICENSE="BSD GPL-2 SMAIL"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
IUSE="+installkernel static"
PDEPEND="
diff --git a/sys-apps/debianutils/debianutils-4.11.2.ebuild b/sys-apps/debianutils/debianutils-4.11.2.ebuild
index 574dc9bc8357..b2f49f05f042 100644
--- a/sys-apps/debianutils/debianutils-4.11.2.ebuild
+++ b/sys-apps/debianutils/debianutils-4.11.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
LICENSE="BSD GPL-2 SMAIL"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
IUSE="+installkernel static"
PDEPEND="
diff --git a/sys-apps/diffutils/diffutils-3.7-r1.ebuild b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
index 7a31a9305625..bf54a0da3b24 100644
--- a/sys-apps/diffutils/diffutils-3.7-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls static"
BDEPEND="nls? ( sys-devel/gettext )"
diff --git a/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild b/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild
index 33e8a3bb876c..cc4289a7d690 100644
--- a/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild
+++ b/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -12,7 +12,7 @@ SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="static-libs"
RDEPEND="sys-fs/xfsprogs"
diff --git a/sys-apps/ed/ed-1.16.ebuild b/sys-apps/ed/ed-1.16.ebuild
index 573eddf03f08..36d23d4f679a 100644
--- a/sys-apps/ed/ed-1.16.ebuild
+++ b/sys-apps/ed/ed-1.16.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
[[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="sys-apps/texinfo"
diff --git a/sys-apps/fakeroot/fakeroot-1.22.ebuild b/sys-apps/fakeroot/fakeroot-1.22.ebuild
index 5c9e0a601819..de5c08838429 100644
--- a/sys-apps/fakeroot/fakeroot-1.22.ebuild
+++ b/sys-apps/fakeroot/fakeroot-1.22.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="acl debug test"
RESTRICT="!test? ( test )"
diff --git a/sys-apps/fbset/fbset-2.1.ebuild b/sys-apps/fbset/fbset-2.1.ebuild
index 282b230b79a3..398f486926dd 100644
--- a/sys-apps/fbset/fbset-2.1.ebuild
+++ b/sys-apps/fbset/fbset-2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://users.telenet.be/geertu/Linux/fbdev/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="static"
BDEPEND="sys-devel/bison
diff --git a/sys-apps/file/file-5.39-r4.ebuild b/sys-apps/file/file-5.39-r4.ebuild
index 838363d4023f..9f5f522c9cf9 100644
--- a/sys-apps/file/file-5.39-r4.ebuild
+++ b/sys-apps/file/file-5.39-r4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit autotools git-r3
else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/findutils/findutils-4.7.0.ebuild b/sys-apps/findutils/findutils-4.7.0.ebuild
index d2bc6103e747..611bb9a6662a 100644
--- a/sys-apps/findutils/findutils-4.7.0.ebuild
+++ b/sys-apps/findutils/findutils-4.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls selinux static test"
RESTRICT="!test? ( test )"
diff --git a/sys-apps/gawk/gawk-4.2.1-r1.ebuild b/sys-apps/gawk/gawk-4.2.1-r1.ebuild
index 62e8aecbcd67..0fb4a83be30e 100644
--- a/sys-apps/gawk/gawk-4.2.1-r1.ebuild
+++ b/sys-apps/gawk/gawk-4.2.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="mpfr nls readline"
RDEPEND="
diff --git a/sys-apps/gawk/gawk-5.0.1.ebuild b/sys-apps/gawk/gawk-5.0.1.ebuild
index f253f21675ac..4d4f28b7627a 100644
--- a/sys-apps/gawk/gawk-5.0.1.ebuild
+++ b/sys-apps/gawk/gawk-5.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="mpfr nls readline"
RDEPEND="
diff --git a/sys-apps/gawk/gawk-5.1.0.ebuild b/sys-apps/gawk/gawk-5.1.0.ebuild
index 6850a412e15b..3ab54c018ff1 100644
--- a/sys-apps/gawk/gawk-5.1.0.ebuild
+++ b/sys-apps/gawk/gawk-5.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="mpfr nls readline"
RDEPEND="
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild
index 7ccbb3427ae7..a750147b5940 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git"
else
SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
fi
inherit toolchain-funcs flag-o-matic
diff --git a/sys-apps/grep/grep-3.4.ebuild b/sys-apps/grep/grep-3.4.ebuild
index a33a051b2f6b..f5d5e94847ea 100644
--- a/sys-apps/grep/grep-3.4.ebuild
+++ b/sys-apps/grep/grep-3.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls pcre static"
LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
diff --git a/sys-apps/groff/groff-1.22.4.ebuild b/sys-apps/groff/groff-1.22.4.ebuild
index 9b743edaf3b4..722ce444a7fc 100644
--- a/sys-apps/groff/groff-1.22.4.ebuild
+++ b/sys-apps/groff/groff-1.22.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/groff/${MY_P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
[[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples uchardet X"
RDEPEND="
diff --git a/sys-apps/help2man/help2man-1.47.17.ebuild b/sys-apps/help2man/help2man-1.47.17.ebuild
index 8832b330c3db..31a7f04f2fc2 100644
--- a/sys-apps/help2man/help2man-1.47.17.ebuild
+++ b/sys-apps/help2man/help2man-1.47.17.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls"
RDEPEND="dev-lang/perl
diff --git a/sys-apps/hwids/hwids-20200813.1.ebuild b/sys-apps/hwids/hwids-20200813.1.ebuild
index 13c9146d0919..59c05f9466ef 100644
--- a/sys-apps/hwids/hwids-20200813.1.ebuild
+++ b/sys-apps/hwids/hwids-20200813.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2020 Gentoo Authors
+# Copyright 2012-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == 99999999 ]]; then
EGIT_REPO_URI="https://github.com/gentoo/hwids.git"
else
SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
fi
LICENSE="|| ( GPL-2 BSD ) public-domain"
diff --git a/sys-apps/hwids/hwids-20201207.ebuild b/sys-apps/hwids/hwids-20201207.ebuild
index 03bc78831389..bc8ac535bc86 100644
--- a/sys-apps/hwids/hwids-20201207.ebuild
+++ b/sys-apps/hwids/hwids-20201207.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 99999999 ]]; then
EGIT_REPO_URI="https://github.com/gentoo/hwids.git"
else
SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
fi
LICENSE="|| ( GPL-2 BSD ) public-domain"
diff --git a/sys-apps/install-xattr/install-xattr-0.5.ebuild b/sys-apps/install-xattr/install-xattr-0.5.ebuild
index 8fea04f5cca6..1f82857f7016 100644
--- a/sys-apps/install-xattr/install-xattr-0.5.ebuild
+++ b/sys-apps/install-xattr/install-xattr-0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="https://dev.gentoo.org/~blueness/install-xattr/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
S=${WORKDIR}/${PN}
fi
diff --git a/sys-apps/iproute2/iproute2-5.7.0.ebuild b/sys-apps/iproute2/iproute2-5.7.0.ebuild
index b3f552ae70f1..bc327d2142f7 100644
--- a/sys-apps/iproute2/iproute2-5.7.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
fi
DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/keyutils/keyutils-1.6.1.ebuild b/sys-apps/keyutils/keyutils-1.6.1.ebuild
index 3189087a0eff..35de8f2bff11 100644
--- a/sys-apps/keyutils/keyutils-1.6.1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
LICENSE="GPL-2 LGPL-2.1"
SLOT="0/1.9"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="static static-libs test"
RESTRICT="!test? ( test )"
diff --git a/sys-apps/kmod/kmod-27-r2.ebuild b/sys-apps/kmod/kmod-27-r2.ebuild
index 38da6ab55f76..c086f244d301 100644
--- a/sys-apps/kmod/kmod-27-r2.ebuild
+++ b/sys-apps/kmod/kmod-27-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
inherit git-r3
else
SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
#inherit libtool
fi
diff --git a/sys-apps/kmod/kmod-28.ebuild b/sys-apps/kmod/kmod-28.ebuild
index a84238120335..b631bb43ef36 100644
--- a/sys-apps/kmod/kmod-28.ebuild
+++ b/sys-apps/kmod/kmod-28.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
inherit git-r3
else
SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
#inherit libtool
fi
diff --git a/sys-apps/less/less-563-r1.ebuild b/sys-apps/less/less-563-r1.ebuild
index 3b0f698785b3..10671e00e64e 100644
--- a/sys-apps/less/less-563-r1.ebuild
+++ b/sys-apps/less/less-563-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
LICENSE="|| ( GPL-3 BSD-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="pcre unicode"
DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild b/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild
index 02f6bc5de4cf..66c47462c988 100644
--- a/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild
+++ b/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/lsb/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
# Perl isn't needed at runtime, it is just used to generate the man page.
DEPEND="dev-lang/perl"
diff --git a/sys-apps/makedev/makedev-3.23.1-r1.ebuild b/sys-apps/makedev/makedev-3.23.1-r1.ebuild
index 4b1c6985f562..76e6f9ca7489 100644
--- a/sys-apps/makedev/makedev-3.23.1-r1.ebuild
+++ b/sys-apps/makedev/makedev-3.23.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="https://people.redhat.com/nalin/MAKEDEV/${MY_P}-${MY_REL}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="build selinux"
RDEPEND="!<sys-apps/baselayout-2.0.0_rc"
diff --git a/sys-apps/man-db/man-db-2.9.3-r1.ebuild b/sys-apps/man-db/man-db-2.9.3-r1.ebuild
index e43583cc2ddd..2dc1438844d8 100644
--- a/sys-apps/man-db/man-db-2.9.3-r1.ebuild
+++ b/sys-apps/man-db/man-db-2.9.3-r1.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" = 9999* ]] ; then
EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
else
SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
fi
LICENSE="GPL-3"
diff --git a/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild b/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild
index eecfc34e6335..57a02ed6d718 100644
--- a/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild
+++ b/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/${PN}/${MY_P}.tar.xz"
LICENSE="man-pages-posix-2013"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE=""
RESTRICT="binchecks"
diff --git a/sys-apps/man-pages-posix/man-pages-posix-2017a.ebuild b/sys-apps/man-pages-posix/man-pages-posix-2017a.ebuild
index 10385ec76269..f29b60c9e04b 100644
--- a/sys-apps/man-pages-posix/man-pages-posix-2017a.ebuild
+++ b/sys-apps/man-pages-posix/man-pages-posix-2017a.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/${PN}/${MY_P}.tar.xz"
LICENSE="man-pages-posix-2013"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE=""
RESTRICT="binchecks"
diff --git a/sys-apps/man-pages/man-pages-5.09.ebuild b/sys-apps/man-pages/man-pages-5.09.ebuild
index 5095446eeaad..58d24ea28c5d 100644
--- a/sys-apps/man-pages/man-pages-5.09.ebuild
+++ b/sys-apps/man-pages/man-pages-5.09.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
LICENSE="man-pages GPL-2+ BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE_L10N=" de fr it ja nl pl ru zh-CN"
IUSE="${IUSE_L10N// / l10n_}"
RESTRICT="binchecks"
diff --git a/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild b/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild
index b6f687b457f3..bc8fbeabb0ba 100644
--- a/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="mirror://gentoo/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
fi
DESCRIPTION="Standard Linux networking tools"
diff --git a/sys-apps/openrc/openrc-0.42.1-r1.ebuild b/sys-apps/openrc/openrc-0.42.1-r1.ebuild
index 61b6aefded84..24ee8a894fc5 100644
--- a/sys-apps/openrc/openrc-0.42.1-r1.ebuild
+++ b/sys-apps/openrc/openrc-0.42.1-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
fi
LICENSE="BSD-2"
diff --git a/sys-apps/opentmpfiles/opentmpfiles-0.1.1.ebuild b/sys-apps/opentmpfiles/opentmpfiles-0.1.1.ebuild
index 9eaf5bbe8c8a..a6b86fd844a4 100644
--- a/sys-apps/opentmpfiles/opentmpfiles-0.1.1.ebuild
+++ b/sys-apps/opentmpfiles/opentmpfiles-0.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
else
SRC_URI="https://github.com/openrc/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
fi
DESCRIPTION="A standalone utility to process systemd-style tmpfiles.d files"
diff --git a/sys-apps/opentmpfiles/opentmpfiles-0.1.2.ebuild b/sys-apps/opentmpfiles/opentmpfiles-0.1.2.ebuild
index 5a2d6b4f872f..bbb0974eb09d 100644
--- a/sys-apps/opentmpfiles/opentmpfiles-0.1.2.ebuild
+++ b/sys-apps/opentmpfiles/opentmpfiles-0.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
else
SRC_URI="https://github.com/openrc/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
fi
DESCRIPTION="A standalone utility to process systemd-style tmpfiles.d files"
diff --git a/sys-apps/opentmpfiles/opentmpfiles-0.1.3.ebuild b/sys-apps/opentmpfiles/opentmpfiles-0.1.3.ebuild
index 40ca9a593feb..1bad7f87f314 100644
--- a/sys-apps/opentmpfiles/opentmpfiles-0.1.3.ebuild
+++ b/sys-apps/opentmpfiles/opentmpfiles-0.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
else
SRC_URI="https://github.com/openrc/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
fi
DESCRIPTION="A standalone utility to process systemd-style tmpfiles.d files"
diff --git a/sys-apps/opentmpfiles/opentmpfiles-0.2.ebuild b/sys-apps/opentmpfiles/opentmpfiles-0.2.ebuild
index 961ff750fd52..dd790533d3ca 100644
--- a/sys-apps/opentmpfiles/opentmpfiles-0.2.ebuild
+++ b/sys-apps/opentmpfiles/opentmpfiles-0.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
else
SRC_URI="https://github.com/openrc/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A standalone utility to process systemd-style tmpfiles.d files"
diff --git a/sys-apps/paxctl/paxctl-0.9.ebuild b/sys-apps/paxctl/paxctl-0.9.ebuild
index ce9b3b68d648..fb860239f86d 100644
--- a/sys-apps/paxctl/paxctl-0.9.ebuild
+++ b/sys-apps/paxctl/paxctl-0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -9,7 +9,7 @@ DESCRIPTION="Manages various PaX related program header flags for Elf32, Elf64,
HOMEPAGE="https://pax.grsecurity.net"
SRC_URI="https://pax.grsecurity.net/${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
LICENSE="GPL-2"
SLOT="0"
diff --git a/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild b/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild
index 31bab28faa8c..e40e798ccb3d 100644
--- a/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild
+++ b/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="dns +kmod static-libs +udev zlib"
# Have the sub-libs in RDEPEND with [static-libs] since, logically,
diff --git a/sys-apps/pciutils/pciutils-3.6.4.ebuild b/sys-apps/pciutils/pciutils-3.6.4.ebuild
index b38747d368e7..b5b0621bd7df 100644
--- a/sys-apps/pciutils/pciutils-3.6.4.ebuild
+++ b/sys-apps/pciutils/pciutils-3.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="dns +kmod static-libs +udev zlib"
# Have the sub-libs in RDEPEND with [static-libs] since, logically,
diff --git a/sys-apps/pciutils/pciutils-3.7.0.ebuild b/sys-apps/pciutils/pciutils-3.7.0.ebuild
index 36b179d35a62..b5b0621bd7df 100644
--- a/sys-apps/pciutils/pciutils-3.7.0.ebuild
+++ b/sys-apps/pciutils/pciutils-3.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="dns +kmod static-libs +udev zlib"
# Have the sub-libs in RDEPEND with [static-libs] since, logically,
diff --git a/sys-apps/portage/portage-2.3.99-r2.ebuild b/sys-apps/portage/portage-2.3.99-r2.ebuild
index b0d41add84fb..554dc9f76977 100644
--- a/sys-apps/portage/portage-2.3.99-r2.ebuild
+++ b/sys-apps/portage/portage-2.3.99-r2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
SLOT="0"
IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
diff --git a/sys-apps/portage/portage-3.0.13.ebuild b/sys-apps/portage/portage-3.0.13.ebuild
index 2ca4d26888a0..489969e0c4a6 100644
--- a/sys-apps/portage/portage-3.0.13.ebuild
+++ b/sys-apps/portage/portage-3.0.13.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
SLOT="0"
IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
RESTRICT="!test? ( test )"
diff --git a/sys-apps/portage/portage-3.0.17-r2.ebuild b/sys-apps/portage/portage-3.0.17-r2.ebuild
index 560c768fea18..c15b19433d3d 100644
--- a/sys-apps/portage/portage-3.0.17-r2.ebuild
+++ b/sys-apps/portage/portage-3.0.17-r2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
SLOT="0"
IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
RESTRICT="!test? ( test )"
diff --git a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r2.ebuild b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r2.ebuild
index 13405ae87e68..569d87f745e5 100644
--- a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r2.ebuild
+++ b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.garloff.de/kurt/linux/${SRC_NAME}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
RDEPEND=">=sys-apps/sg3_utils-1.24
<sys-apps/sg3_utils-1.44
diff --git a/sys-apps/s390-tools/s390-tools-2.12.0.ebuild b/sys-apps/s390-tools/s390-tools-2.12.0.ebuild
index 06c2fdd5d481..4c890c3a9d1a 100644
--- a/sys-apps/s390-tools/s390-tools-2.12.0.ebuild
+++ b/sys-apps/s390-tools/s390-tools-2.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ibm-${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="-* s390"
+KEYWORDS="-* ~s390"
IUSE="cryptsetup fuse ncurses openssl pfm snmp zlib"
RDEPEND="fuse? ( sys-fs/fuse:0= )
diff --git a/sys-apps/s390-tools/s390-tools-2.9.0.ebuild b/sys-apps/s390-tools/s390-tools-2.9.0.ebuild
index a6710b34ad7e..d62f83652230 100644
--- a/sys-apps/s390-tools/s390-tools-2.9.0.ebuild
+++ b/sys-apps/s390-tools/s390-tools-2.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ibm-${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="-* s390"
+KEYWORDS="-* ~s390"
IUSE="cryptsetup fuse ncurses openssl pfm snmp zlib"
RDEPEND="fuse? ( sys-fs/fuse:0= )
diff --git a/sys-apps/sandbox/sandbox-2.20.ebuild b/sys-apps/sandbox/sandbox-2.20.ebuild
index 30e031ff6d97..a49b3d6f0a4e 100644
--- a/sys-apps/sandbox/sandbox-2.20.ebuild
+++ b/sys-apps/sandbox/sandbox-2.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE=""
DEPEND="app-arch/xz-utils
diff --git a/sys-apps/sed/sed-4.7.ebuild b/sys-apps/sed/sed-4.7.ebuild
index 28c5f7cfc63d..2a14ae4d0069 100644
--- a/sys-apps/sed/sed-4.7.ebuild
+++ b/sys-apps/sed/sed-4.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/sed/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="acl nls selinux static"
RDEPEND="
diff --git a/sys-apps/sed/sed-4.8.ebuild b/sys-apps/sed/sed-4.8.ebuild
index 35656086a9aa..5053c0f23803 100644
--- a/sys-apps/sed/sed-4.8.ebuild
+++ b/sys-apps/sed/sed-4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/sed/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="acl nls selinux static"
RDEPEND="
diff --git a/sys-apps/setserial/setserial-2.17-r5.ebuild b/sys-apps/setserial/setserial-2.17-r5.ebuild
index 47b3a4a2421b..62ff18bf70b7 100644
--- a/sys-apps/setserial/setserial-2.17-r5.ebuild
+++ b/sys-apps/setserial/setserial-2.17-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
PATCHES=(
"${FILESDIR}"/${P}-spelling.patch
diff --git a/sys-apps/shadow/shadow-4.8-r5.ebuild b/sys-apps/shadow/shadow-4.8-r5.ebuild
index b04fd057bc5e..3217bbd41153 100644
--- a/sys-apps/shadow/shadow-4.8-r5.ebuild
+++ b/sys-apps/shadow/shadow-4.8-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="acl audit bcrypt cracklib nls pam selinux skey split-usr +su xattr"
# Taken from the man/Makefile.am file.
LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
diff --git a/sys-apps/sysvinit/sysvinit-2.97.ebuild b/sys-apps/sysvinit/sysvinit-2.97.ebuild
index 9a08cbac04aa..6476fe8b57e6 100644
--- a/sys-apps/sysvinit/sysvinit-2.97.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.97.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
[[ "${PV}" == *beta* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="selinux ibm static kernel_FreeBSD"
CDEPEND="
diff --git a/sys-apps/texinfo/texinfo-6.6-r1.ebuild b/sys-apps/texinfo/texinfo-6.6-r1.ebuild
index 4814e56f518c..efa2711dee61 100644
--- a/sys-apps/texinfo/texinfo-6.6-r1.ebuild
+++ b/sys-apps/texinfo/texinfo-6.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Note: if your package uses the texi2dvi utility, it must depend on the
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="nls static"
RDEPEND="
diff --git a/sys-apps/texinfo/texinfo-6.7.ebuild b/sys-apps/texinfo/texinfo-6.7.ebuild
index 9050516349a3..caa8be913bbc 100644
--- a/sys-apps/texinfo/texinfo-6.7.ebuild
+++ b/sys-apps/texinfo/texinfo-6.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls +standalone static"
RDEPEND="
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
index 03a26b48ecbf..8b033c331a30 100644
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
+++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86"
IUSE="bindist perl libressl"
DEPEND="
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
index d12f321d1d5c..2089ae8eda88 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
IUSE="ipv6 qmail-spp selinux"
RESTRICT="test"
diff --git a/sys-apps/usbutils/usbutils-012.ebuild b/sys-apps/usbutils/usbutils-012.ebuild
index 2913e5b5d45b..31a5985fb585 100644
--- a/sys-apps/usbutils/usbutils-012.ebuild
+++ b/sys-apps/usbutils/usbutils-012.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-apps/usbutils/usbutils-013.ebuild b/sys-apps/usbutils/usbutils-013.ebuild
index f47c0e63e898..4b99cf62766f 100644
--- a/sys-apps/usbutils/usbutils-013.ebuild
+++ b/sys-apps/usbutils/usbutils-013.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-apps/utempter/utempter-0.5.5.6.ebuild b/sys-apps/utempter/utempter-0.5.5.6.ebuild
index 5017f8c69337..6d31a543cdcb 100644
--- a/sys-apps/utempter/utempter-0.5.5.6.ebuild
+++ b/sys-apps/utempter/utempter-0.5.5.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${MY_P}.src.rpm"
LICENSE="|| ( MIT LGPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="
diff --git a/sys-apps/util-linux/util-linux-2.33.2.ebuild b/sys-apps/util-linux/util-linux-2.33.2.ebuild
index 84549290f15f..9c28caeacb69 100644
--- a/sys-apps/util-linux/util-linux-2.33.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.33.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
else
[[ "${PV}" = *_rc* ]] || \
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
fi
diff --git a/sys-apps/util-linux/util-linux-2.35.2.ebuild b/sys-apps/util-linux/util-linux-2.35.2.ebuild
index ba8b1c61789e..0613d2237741 100644
--- a/sys-apps/util-linux/util-linux-2.35.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.35.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
else
[[ "${PV}" = *_rc* ]] || \
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
fi
diff --git a/sys-apps/which/which-2.21.ebuild b/sys-apps/which/which-2.21.ebuild
index 831688cf7c05..a0a57a10d289 100644
--- a/sys-apps/which/which-2.21.ebuild
+++ b/sys-apps/which/which-2.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://carlowood.github.io/which/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
src_configure() {
append-lfs-flags
diff --git a/sys-apps/xinetd/xinetd-2.3.15.3.ebuild b/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
index 2f5b894f0bb9..7a903b612a35 100644
--- a/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/openSUSE/xinetd/releases/download/${PV}/${P}.tar.xz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="perl selinux tcpd"
DEPEND="
diff --git a/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild b/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild
index ce7ec276c563..a0e3397d02c6 100644
--- a/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild
+++ b/sys-auth/pam_mktemp/pam_mktemp-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.openwall.com/pam/modules/${PN}/${P}.tar.gz"
LICENSE="BSD-2" # LICENSE file says "heavily cut-down 'BSD license'"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="selinux +prevent-removal"
RDEPEND="sys-libs/pam
diff --git a/sys-auth/pam_ssh/pam_ssh-2.3.ebuild b/sys-auth/pam_ssh/pam_ssh-2.3.ebuild
index 8902246102f6..de6d6ae8af09 100644
--- a/sys-auth/pam_ssh/pam_ssh-2.3.ebuild
+++ b/sys-auth/pam_ssh/pam_ssh-2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pam-ssh/${P}.tar.xz"
LICENSE="BSD-2 BSD ISC"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
# Only supports OpenSSH via `ssh-agent` #282993
DEPEND="sys-libs/pam
diff --git a/sys-auth/pambase/pambase-20201103.ebuild b/sys-auth/pambase/pambase-20201103.ebuild
index c837b987f059..2f870076f0f1 100644
--- a/sys-auth/pambase/pambase-20201103.ebuild
+++ b/sys-auth/pambase/pambase-20201103.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://github.com/gentoo/pambase.git"
else
SRC_URI="https://github.com/gentoo/pambase/archive/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
S="${WORKDIR}/${PN}-${P}"
fi
diff --git a/sys-auth/pambase/pambase-999999999.ebuild b/sys-auth/pambase/pambase-999999999.ebuild
index 36d85c75ffcc..b4166689528b 100644
--- a/sys-auth/pambase/pambase-999999999.ebuild
+++ b/sys-auth/pambase/pambase-999999999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://github.com/gentoo/pambase.git"
else
SRC_URI="https://github.com/gentoo/pambase/archive/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
S="${WORKDIR}/${PN}-${P}"
fi
diff --git a/sys-auth/passwdqc/passwdqc-1.4.0-r1.ebuild b/sys-auth/passwdqc/passwdqc-1.4.0-r1.ebuild
index 3c77402c7fad..1d15065d7a0e 100644
--- a/sys-auth/passwdqc/passwdqc-1.4.0-r1.ebuild
+++ b/sys-auth/passwdqc/passwdqc-1.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.openwall.com/${PN}/${P}.tar.gz"
LICENSE="Openwall BSD public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="sys-libs/pam"
DEPEND="${RDEPEND}"
diff --git a/sys-auth/realtime-base/realtime-base-0.1.ebuild b/sys-auth/realtime-base/realtime-base-0.1.ebuild
index 1765c6c4d942..2faa18931f6f 100644
--- a/sys-auth/realtime-base/realtime-base-0.1.ebuild
+++ b/sys-auth/realtime-base/realtime-base-0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI=""
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
DEPEND=""
diff --git a/sys-auth/skey/skey-1.1.5-r11.ebuild b/sys-auth/skey/skey-1.1.5-r11.ebuild
index 7ac90385b5a0..5fac943577f3 100644
--- a/sys-auth/skey/skey-1.1.5-r11.ebuild
+++ b/sys-auth/skey/skey-1.1.5-r11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
LICENSE="BSD MIT RSA BEER-WARE"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="static-libs"
DEPEND="dev-lang/perl
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild
index 1e994549f378..8e318177d327 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="static test"
RESTRICT="!test? ( test )"
diff --git a/sys-cluster/sanlock/sanlock-3.8.2.ebuild b/sys-cluster/sanlock/sanlock-3.8.2.ebuild
index 502eb2a09f30..8426d4f6d3ca 100644
--- a/sys-cluster/sanlock/sanlock-3.8.2.ebuild
+++ b/sys-cluster/sanlock/sanlock-3.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
LICENSE="LGPL-2+ GPL-2 GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-devel/autoconf-archive/autoconf-archive-2018.03.13.ebuild b/sys-devel/autoconf-archive/autoconf-archive-2018.03.13.ebuild
index eec5d1167158..3be013f350cf 100644
--- a/sys-devel/autoconf-archive/autoconf-archive-2018.03.13.ebuild
+++ b/sys-devel/autoconf-archive/autoconf-archive-2018.03.13.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
# File collisions. #540246
diff --git a/sys-devel/autoconf-archive/autoconf-archive-2019.01.06.ebuild b/sys-devel/autoconf-archive/autoconf-archive-2019.01.06.ebuild
index 69958439af22..87b98f88cd12 100644
--- a/sys-devel/autoconf-archive/autoconf-archive-2019.01.06.ebuild
+++ b/sys-devel/autoconf-archive/autoconf-archive-2019.01.06.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
# File collisions. #540246
diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild
index 56b9b6aa6744..5ebc1a0be296 100644
--- a/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild
+++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
S="${WORKDIR}"
diff --git a/sys-devel/autoconf/autoconf-2.13-r1.ebuild b/sys-devel/autoconf/autoconf-2.13-r1.ebuild
index fddff76d6a75..51e415706fdb 100644
--- a/sys-devel/autoconf/autoconf-2.13-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.13-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="${PV:0:3}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="userland_BSD"
DEPEND=">=sys-apps/texinfo-4.3
diff --git a/sys-devel/autoconf/autoconf-2.64-r1.ebuild b/sys-devel/autoconf/autoconf-2.64-r1.ebuild
index c0c649a24024..efed7086f51a 100644
--- a/sys-devel/autoconf/autoconf-2.64-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.64-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE=""
DEPEND=">=sys-devel/m4-1.4.6
diff --git a/sys-devel/autoconf/autoconf-2.69-r5.ebuild b/sys-devel/autoconf/autoconf-2.69-r5.ebuild
index 856f5d6b85fb..c85719fd173a 100644
--- a/sys-devel/autoconf/autoconf-2.69-r5.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69-r5.ebuild
@@ -10,7 +10,7 @@ else
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz
https://dev.gentoo.org/~polynomial-c/dist/${P}-runstatedir_patches.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
inherit toolchain-autoconf
diff --git a/sys-devel/autogen/autogen-5.18.16-r1.ebuild b/sys-devel/autogen/autogen-5.18.16-r1.ebuild
index f823be3106e6..580f8317fbc3 100644
--- a/sys-devel/autogen/autogen-5.18.16-r1.ebuild
+++ b/sys-devel/autogen/autogen-5.18.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/rel${PV}/${P}.tar.xz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="libopts static-libs"
RDEPEND=">=dev-scheme/guile-2.0:=
diff --git a/sys-devel/automake-wrapper/automake-wrapper-11.ebuild b/sys-devel/automake-wrapper/automake-wrapper-11.ebuild
index ce6e5d6dead1..1516e27afb7d 100644
--- a/sys-devel/automake-wrapper/automake-wrapper-11.ebuild
+++ b/sys-devel/automake-wrapper/automake-wrapper-11.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
S=${WORKDIR}
diff --git a/sys-devel/automake/automake-1.10.3-r3.ebuild b/sys-devel/automake/automake-1.10.3-r3.ebuild
index f70d8537f23a..a85f4c5a1e3b 100644
--- a/sys-devel/automake/automake-1.10.3-r3.ebuild
+++ b/sys-devel/automake/automake-1.10.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
# Use Gentoo versioning for slotting.
SLOT="${PV:0:4}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RESTRICT="test"
diff --git a/sys-devel/automake/automake-1.11.6-r3.ebuild b/sys-devel/automake/automake-1.11.6-r3.ebuild
index 58ccde9a40ba..8b96c4f83141 100644
--- a/sys-devel/automake/automake-1.11.6-r3.ebuild
+++ b/sys-devel/automake/automake-1.11.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
# Use Gentoo versioning for slotting.
SLOT="${PV:0:4}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE=""
RESTRICT="test"
diff --git a/sys-devel/automake/automake-1.12.6-r2.ebuild b/sys-devel/automake/automake-1.12.6-r2.ebuild
index 3292e87d89b9..c5b185148183 100644
--- a/sys-devel/automake/automake-1.12.6-r2.ebuild
+++ b/sys-devel/automake/automake-1.12.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
# Use Gentoo versioning for slotting.
SLOT="${PV:0:4}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RESTRICT="test"
diff --git a/sys-devel/automake/automake-1.13.4-r2.ebuild b/sys-devel/automake/automake-1.13.4-r2.ebuild
index 3eac0d586c94..286477158c2a 100644
--- a/sys-devel/automake/automake-1.13.4-r2.ebuild
+++ b/sys-devel/automake/automake-1.13.4-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
# Use Gentoo versioning for slotting.
SLOT="${PV:0:4}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RESTRICT="test"
diff --git a/sys-devel/automake/automake-1.14.1-r2.ebuild b/sys-devel/automake/automake-1.14.1-r2.ebuild
index 45228bc94880..d9af1685d569 100644
--- a/sys-devel/automake/automake-1.14.1-r2.ebuild
+++ b/sys-devel/automake/automake-1.14.1-r2.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://www.gnu.org/software/automake/"
LICENSE="GPL-2"
# Use Gentoo versioning for slotting.
SLOT="${PV:0:4}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RESTRICT="test"
diff --git a/sys-devel/automake/automake-1.15.1-r2.ebuild b/sys-devel/automake/automake-1.15.1-r2.ebuild
index 63846a747b26..61626303e82b 100644
--- a/sys-devel/automake/automake-1.15.1-r2.ebuild
+++ b/sys-devel/automake/automake-1.15.1-r2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]] ; then
inherit git-r3
else
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
if [[ ${PV/_beta} == ${PV} ]]; then
MY_P=${P}
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
diff --git a/sys-devel/automake/automake-1.16.2-r1.ebuild b/sys-devel/automake/automake-1.16.2-r1.ebuild
index 987c21303241..1cab2f8a07e2 100644
--- a/sys-devel/automake/automake-1.16.2-r1.ebuild
+++ b/sys-devel/automake/automake-1.16.2-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
inherit git-r3
else
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
if [[ ${PV/_beta} == ${PV} ]]; then
MY_P="${P}"
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
diff --git a/sys-devel/automake/automake-1.4_p6-r2.ebuild b/sys-devel/automake/automake-1.4_p6-r2.ebuild
index 328151c0dcb6..47f6590cfc3b 100644
--- a/sys-devel/automake/automake-1.4_p6-r2.ebuild
+++ b/sys-devel/automake/automake-1.4_p6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
# Use Gentoo versioning for slotting.
SLOT="${PV:0:3}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.5-r2.ebuild b/sys-devel/automake/automake-1.5-r2.ebuild
index 5d33bc94d3d5..740ac091ff4c 100644
--- a/sys-devel/automake/automake-1.5-r2.ebuild
+++ b/sys-devel/automake/automake-1.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
# Use Gentoo versioning for slotting.
SLOT="${PV:0:3}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.6.3-r2.ebuild b/sys-devel/automake/automake-1.6.3-r2.ebuild
index 6c0cd2f16749..2f2920295686 100644
--- a/sys-devel/automake/automake-1.6.3-r2.ebuild
+++ b/sys-devel/automake/automake-1.6.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
# Use Gentoo versioning for slotting.
SLOT="${PV:0:3}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.7.9-r3.ebuild b/sys-devel/automake/automake-1.7.9-r3.ebuild
index df9f506f48e6..8ec3a1b1d3a4 100644
--- a/sys-devel/automake/automake-1.7.9-r3.ebuild
+++ b/sys-devel/automake/automake-1.7.9-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
# Use Gentoo versioning for slotting.
SLOT="${PV:0:3}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.8.5-r5.ebuild b/sys-devel/automake/automake-1.8.5-r5.ebuild
index f545e1e2fdee..6c6447a52c01 100644
--- a/sys-devel/automake/automake-1.8.5-r5.ebuild
+++ b/sys-devel/automake/automake-1.8.5-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
# Use Gentoo versioning for slotting.
SLOT="${PV:0:3}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="dev-lang/perl
diff --git a/sys-devel/automake/automake-1.9.6-r5.ebuild b/sys-devel/automake/automake-1.9.6-r5.ebuild
index bfb4a120b038..ef506d0fa073 100644
--- a/sys-devel/automake/automake-1.9.6-r5.ebuild
+++ b/sys-devel/automake/automake-1.9.6-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
# Use Gentoo versioning for slotting.
SLOT="${PV:0:3}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RESTRICT="test"
diff --git a/sys-devel/bc/bc-1.06.95-r2.ebuild b/sys-devel/bc/bc-1.06.95-r2.ebuild
index d67b981e1fb6..dedabc2bd35c 100644
--- a/sys-devel/bc/bc-1.06.95-r2.ebuild
+++ b/sys-devel/bc/bc-1.06.95-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://alpha.gnu.org/gnu/bc/${P}.tar.bz2
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="libedit readline static"
RDEPEND="
diff --git a/sys-devel/bc/bc-1.07.1-r3.ebuild b/sys-devel/bc/bc-1.07.1-r3.ebuild
index c99b7094b6a0..84f22cd7fd26 100644
--- a/sys-devel/bc/bc-1.07.1-r3.ebuild
+++ b/sys-devel/bc/bc-1.07.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/bc/${P}.tar.gz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="libedit readline static"
RDEPEND="
diff --git a/sys-devel/binutils-config/binutils-config-5.3.2.ebuild b/sys-devel/binutils-config/binutils-config-5.3.2.ebuild
index bdf7169f6c44..20b16e75f89f 100644
--- a/sys-devel/binutils-config/binutils-config-5.3.2.ebuild
+++ b/sys-devel/binutils-config/binutils-config-5.3.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
fi
DESCRIPTION="Utility to change the binutils version being used"
diff --git a/sys-devel/binutils/binutils-2.32-r1.ebuild b/sys-devel/binutils/binutils-2.32-r1.ebuild
index 3daa17a457bc..7bd6b4fbdc07 100644
--- a/sys-devel/binutils/binutils-2.32-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.32-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -36,7 +36,7 @@ case ${PV} in
*)
SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
SLOT=$(get_version_component_range 1-2)
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
;;
esac
diff --git a/sys-devel/binutils/binutils-2.33.1-r1.ebuild b/sys-devel/binutils/binutils-2.33.1-r1.ebuild
index fe16e589ba71..50ec9616243c 100644
--- a/sys-devel/binutils/binutils-2.33.1-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.33.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -33,7 +33,7 @@ case ${PV} in
*)
SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
SLOT=$(ver_cut 1-2)
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
;;
esac
diff --git a/sys-devel/binutils/binutils-2.34-r2.ebuild b/sys-devel/binutils/binutils-2.34-r2.ebuild
index 21e6befdb77e..d9683b91ae79 100644
--- a/sys-devel/binutils/binutils-2.34-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.34-r2.ebuild
@@ -33,7 +33,7 @@ case ${PV} in
*)
SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
SLOT=$(ver_cut 1-2)
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
;;
esac
diff --git a/sys-devel/binutils/binutils-2.35.1-r1.ebuild b/sys-devel/binutils/binutils-2.35.1-r1.ebuild
index 18c80a28f881..dd45dd4daf55 100644
--- a/sys-devel/binutils/binutils-2.35.1-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.35.1-r1.ebuild
@@ -33,7 +33,7 @@ else
https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
SLOT=$(ver_cut 1-2)
# live ebuild
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
fi
#
diff --git a/sys-devel/bison/bison-3.6.4.ebuild b/sys-devel/bison/bison-3.6.4.ebuild
index e1e669c683cc..b725646217b4 100644
--- a/sys-devel/bison/bison-3.6.4.ebuild
+++ b/sys-devel/bison/bison-3.6.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples nls static test"
RESTRICT="!test? ( test )"
diff --git a/sys-devel/bison/bison-3.7.3.ebuild b/sys-devel/bison/bison-3.7.3.ebuild
index 2c6afcf7e953..29b8d4641091 100644
--- a/sys-devel/bison/bison-3.7.3.ebuild
+++ b/sys-devel/bison/bison-3.7.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples nls static test"
RESTRICT="!test? ( test )"
diff --git a/sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild b/sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild
index a5d14415fd20..abe648762767 100644
--- a/sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild
+++ b/sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE=""
S="${WORKDIR}/boost.m4-1489691f65aecb593e33abc3e56ac482dd67da7b"
diff --git a/sys-devel/crossdev/crossdev-20201129.ebuild b/sys-devel/crossdev/crossdev-20201129.ebuild
index ca781e39af17..19acd6a295a1 100644
--- a/sys-devel/crossdev/crossdev-20201129.ebuild
+++ b/sys-devel/crossdev/crossdev-20201129.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
else
SRC_URI="mirror://gentoo/${P}.tar.xz
https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
fi
DESCRIPTION="Gentoo Cross-toolchain generator"
diff --git a/sys-devel/distcc/distcc-3.3.3-r3.ebuild b/sys-devel/distcc/distcc-3.3.3-r3.ebuild
index 729f2211d694..c535bb1a9fe3 100644
--- a/sys-devel/distcc/distcc-3.3.3-r3.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/distcc/distcc/releases/download/v${PV}/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="gssapi gtk hardened ipv6 selinux xinetd zeroconf"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-devel/flex/flex-2.6.1.ebuild b/sys-devel/flex/flex-2.6.1.ebuild
index e96485aed826..d732bb861ffa 100644
--- a/sys-devel/flex/flex-2.6.1.ebuild
+++ b/sys-devel/flex/flex-2.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/westes/flex/releases/download/v${PV}/${P}.tar.xz"
LICENSE="FLEX"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls static test"
RESTRICT="!test? ( test )"
diff --git a/sys-devel/flex/flex-2.6.4-r1.ebuild b/sys-devel/flex/flex-2.6.4-r1.ebuild
index 2470db3ad1ac..9c73a8e03c37 100644
--- a/sys-devel/flex/flex-2.6.4-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/westes/${PN}/releases/download/v${PV}/${P}.tar.gz"
LICENSE="FLEX"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls static test"
RESTRICT="!test? ( test )"
diff --git a/sys-devel/gcc-config/gcc-config-2.3.2-r1.ebuild b/sys-devel/gcc-config/gcc-config-2.3.2-r1.ebuild
index f2c2954c4d2b..41607b404c0c 100644
--- a/sys-devel/gcc-config/gcc-config-2.3.2-r1.ebuild
+++ b/sys-devel/gcc-config/gcc-config-2.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
fi
DESCRIPTION="Utility to manage compilers"
diff --git a/sys-devel/gcc-config/gcc-config-2.3.3.ebuild b/sys-devel/gcc-config/gcc-config-2.3.3.ebuild
index d925ad38fcbe..786a945b65f3 100644
--- a/sys-devel/gcc-config/gcc-config-2.3.3.ebuild
+++ b/sys-devel/gcc-config/gcc-config-2.3.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
fi
DESCRIPTION="Utility to manage compilers"
diff --git a/sys-devel/gcc/gcc-10.2.0-r5.ebuild b/sys-devel/gcc/gcc-10.2.0-r5.ebuild
index 6f45e04980e9..57ab8a6d1e17 100644
--- a/sys-devel/gcc/gcc-10.2.0-r5.ebuild
+++ b/sys-devel/gcc/gcc-10.2.0-r5.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="6"
inherit toolchain
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
RDEPEND=""
BDEPEND="${CATEGORY}/binutils"
diff --git a/sys-devel/gcc/gcc-6.5.0-r3.ebuild b/sys-devel/gcc/gcc-6.5.0-r3.ebuild
index 1f5abdd961ef..9cea619a7e52 100644
--- a/sys-devel/gcc/gcc-6.5.0-r3.ebuild
+++ b/sys-devel/gcc/gcc-6.5.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -7,7 +7,7 @@ PATCH_VER="5"
inherit toolchain
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-7.5.0-r1.ebuild b/sys-devel/gcc/gcc-7.5.0-r1.ebuild
index 2dbab112f4b6..689958930bd1 100644
--- a/sys-devel/gcc/gcc-7.5.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-7.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -7,7 +7,7 @@ PATCH_VER="3"
inherit toolchain
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos"
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-8.4.0-r1.ebuild b/sys-devel/gcc/gcc-8.4.0-r1.ebuild
index 39a1e242e776..e5b72b981c98 100644
--- a/sys-devel/gcc/gcc-8.4.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-8.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -7,7 +7,7 @@ PATCH_VER="2"
inherit toolchain
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-8.4.0-r2.ebuild b/sys-devel/gcc/gcc-8.4.0-r2.ebuild
index 8f29a70e4a6f..1a3c971222b7 100644
--- a/sys-devel/gcc/gcc-8.4.0-r2.ebuild
+++ b/sys-devel/gcc/gcc-8.4.0-r2.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="3"
inherit toolchain
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-9.3.0-r1.ebuild b/sys-devel/gcc/gcc-9.3.0-r1.ebuild
index c08d53c6cb79..7c475bdd0eb2 100644
--- a/sys-devel/gcc/gcc-9.3.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-9.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -7,7 +7,7 @@ PATCH_VER="3"
inherit toolchain
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-9.3.0-r2.ebuild b/sys-devel/gcc/gcc-9.3.0-r2.ebuild
index 6798a18d2a28..d955f1876654 100644
--- a/sys-devel/gcc/gcc-9.3.0-r2.ebuild
+++ b/sys-devel/gcc/gcc-9.3.0-r2.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="4"
inherit toolchain
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/sys-devel/gdb/gdb-10.1.ebuild b/sys-devel/gdb/gdb-10.1.ebuild
index f3521cbb0702..793afc4be213 100644
--- a/sys-devel/gdb/gdb-10.1.ebuild
+++ b/sys-devel/gdb/gdb-10.1.ebuild
@@ -44,7 +44,7 @@ SRC_URI="${SRC_URI}
LICENSE="GPL-2 LGPL-2"
SLOT="0"
if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
IUSE="cet lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
REQUIRED_USE="
diff --git a/sys-devel/gettext/gettext-0.21.ebuild b/sys-devel/gettext/gettext-0.21.ebuild
index 739a11c7d2ab..f16b3d86e91f 100644
--- a/sys-devel/gettext/gettext-0.21.ebuild
+++ b/sys-devel/gettext/gettext-0.21.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == *_rc* ]] ; then
S="${WORKDIR}/${P/_/-}"
else
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
fi
# Only libasprintf is under the LGPL (and libintl is in a sep package),
# so put that license behind USE=cxx.
diff --git a/sys-devel/gnuconfig/gnuconfig-20200621.ebuild b/sys-devel/gnuconfig/gnuconfig-20200621.ebuild
index d47b32a1ba7c..5dbe1179e09e 100644
--- a/sys-devel/gnuconfig/gnuconfig-20200621.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20200621.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
inherit git-r3
else
SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
S="${WORKDIR}"
fi
diff --git a/sys-devel/libtool/libtool-2.4.6-r6.ebuild b/sys-devel/libtool/libtool-2.4.6-r6.ebuild
index 05d90a944acc..cf041ceafab1 100644
--- a/sys-devel/libtool/libtool-2.4.6-r6.ebuild
+++ b/sys-devel/libtool/libtool-2.4.6-r6.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
fi
DESCRIPTION="A shared library tool for developers"
diff --git a/sys-devel/m4/m4-1.4.18-r2.ebuild b/sys-devel/m4/m4-1.4.18-r2.ebuild
index e8f9585638d5..6350bc24bdca 100644
--- a/sys-devel/m4/m4-1.4.18-r2.ebuild
+++ b/sys-devel/m4/m4-1.4.18-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples"
# remember: cannot dep on autoconf since it needs us
diff --git a/sys-devel/make/make-4.2.1-r4.ebuild b/sys-devel/make/make-4.2.1-r4.ebuild
index 7879250d9da0..d5fead12467a 100644
--- a/sys-devel/make/make-4.2.1-r4.ebuild
+++ b/sys-devel/make/make-4.2.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu//make/${P}.tar.bz2"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="guile nls static"
CDEPEND="guile? ( >=dev-scheme/guile-1.8:= )"
diff --git a/sys-devel/make/make-4.3.ebuild b/sys-devel/make/make-4.3.ebuild
index b8d40a96bfeb..bd0a3434e14e 100644
--- a/sys-devel/make/make-4.3.ebuild
+++ b/sys-devel/make/make-4.3.ebuild
@@ -11,7 +11,7 @@ if [[ "$(ver_cut 3)" -ge 90 ]] ; then
SRC_URI="https://alpha.gnu.org/gnu//make/${P}.tar.gz"
else
SRC_URI="mirror://gnu//make/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="GPL-3+"
SLOT="0"
diff --git a/sys-devel/patch/patch-2.7.6-r4.ebuild b/sys-devel/patch/patch-2.7.6-r4.ebuild
index e3ec281181ab..5919bbb39640 100644
--- a/sys-devel/patch/patch-2.7.6-r4.ebuild
+++ b/sys-devel/patch/patch-2.7.6-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static test xattr"
RESTRICT="!test? ( test )"
diff --git a/sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild b/sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild
index e1e7186ca1e9..41d8d411cee0 100644
--- a/sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild
+++ b/sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.arm.linux.org.uk/pub/armlinux/source/other/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ~s390 sparc x86"
IUSE=""
src_prepare() {
diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
index 42ae3e6e9397..5c0a691593f8 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
LICENSE="GPL-2+"
SLOT="0/12" # libcryptsetup.so version
[[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
# we don't support nss since it doesn't allow cryptsetup to be built statically
# and it's missing ripemd160 support so it can't provide full backward compatibility
diff --git a/sys-fs/dosfstools/dosfstools-4.1.ebuild b/sys-fs/dosfstools/dosfstools-4.1.ebuild
index 123303adec5b..c4382e2ef1dd 100644
--- a/sys-fs/dosfstools/dosfstools-4.1.ebuild
+++ b/sys-fs/dosfstools/dosfstools-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${P}.
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="compat test +udev"
RESTRICT="!test? ( test )"
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild
index a66e5f0def32..9325951632f0 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$
LICENSE="GPL-2 BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="cron fuse nls static-libs elibc_FreeBSD"
RDEPEND="~sys-libs/${PN}-libs-${PV}
diff --git a/sys-fs/eudev/eudev-3.2.10.ebuild b/sys-fs/eudev/eudev-3.2.10.ebuild
index f7ba93d53eef..3296733f6bf4 100644
--- a/sys-fs/eudev/eudev-3.2.10.ebuild
+++ b/sys-fs/eudev/eudev-3.2.10.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
inherit git-r3
else
SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
fi
DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/eudev/eudev-3.2.5.ebuild b/sys-fs/eudev/eudev-3.2.5.ebuild
index 697e11f2dedd..e7cf8529cb8d 100644
--- a/sys-fs/eudev/eudev-3.2.5.ebuild
+++ b/sys-fs/eudev/eudev-3.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
inherit git-r3
else
SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
fi
DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/eudev/eudev-3.2.9.ebuild b/sys-fs/eudev/eudev-3.2.9.ebuild
index 5d106dc8f46c..3296733f6bf4 100644
--- a/sys-fs/eudev/eudev-3.2.9.ebuild
+++ b/sys-fs/eudev/eudev-3.2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
inherit git-r3
else
SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
fi
DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild b/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild
index 9b4d50930d3d..43e86a78bf49 100644
--- a/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild
+++ b/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://jfs.sourceforge.net/project/pub/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
IUSE="static"
LIB_DEPEND="sys-apps/util-linux:=[static-libs]"
diff --git a/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild
index 413eaae8b611..339b9d3d225f 100644
--- a/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only"
REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin )
systemd? ( udev )"
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.4_p1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.4_p1.ebuild
index 21394c8c9e94..f3ca8774fcad 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.4_p1.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.4_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="debug lz4 lzma lzo xattr zstd"
RDEPEND="
diff --git a/sys-fs/static-dev/static-dev-0.1.ebuild b/sys-fs/static-dev/static-dev-0.1.ebuild
index 9140ba94e4b3..c1a62712d168 100644
--- a/sys-fs/static-dev/static-dev-0.1.ebuild
+++ b/sys-fs/static-dev/static-dev-0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -9,7 +9,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="sys-apps/makedev"
diff --git a/sys-fs/sysfsutils/sysfsutils-2.1.0.ebuild b/sys-fs/sysfsutils/sysfsutils-2.1.0.ebuild
index 6f67ecfa8829..fb7858589804 100644
--- a/sys-fs/sysfsutils/sysfsutils-2.1.0.ebuild
+++ b/sys-fs/sysfsutils/sysfsutils-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/linux-diag/${P}.tar.gz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="static-libs"
src_prepare() {
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild
index 4dc6675505f4..26fa347f726f 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ if [ "${PV}" = "9999" ]; then
else
SRC_URI="https://gitweb.gentoo.org/proj/${OLD_PN}.git/snapshot/${OLD_P}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${OLD_P}"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
fi
DESCRIPTION="udev startup scripts for openrc"
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-34.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-34.ebuild
index 4dc6675505f4..26fa347f726f 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-34.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-34.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ if [ "${PV}" = "9999" ]; then
else
SRC_URI="https://gitweb.gentoo.org/proj/${OLD_PN}.git/snapshot/${OLD_P}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${OLD_P}"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
fi
DESCRIPTION="udev startup scripts for openrc"
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
index 6086fa54d5fe..ad1b32f6671d 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ if [ "${PV}" = "9999" ]; then
else
SRC_URI="https://gitweb.gentoo.org/proj/${OLD_PN}.git/snapshot/${OLD_P}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${OLD_P}"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
DESCRIPTION="udev startup scripts for openrc"
diff --git a/sys-fs/udev/udev-243-r2.ebuild b/sys-fs/udev/udev-243-r2.ebuild
index c294a693ef17..17bba8fefb42 100644
--- a/sys-fs/udev/udev-243-r2.ebuild
+++ b/sys-fs/udev/udev-243-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2003-2020 Gentoo Authors
+# Copyright 2003-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ else
MY_P=systemd-${MY_PV}
S=${WORKDIR}/${MY_P}
SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
fi
DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/udev/udev-245.5-r1.ebuild b/sys-fs/udev/udev-245.5-r1.ebuild
index cd11295946d5..aa7adfc82320 100644
--- a/sys-fs/udev/udev-245.5-r1.ebuild
+++ b/sys-fs/udev/udev-245.5-r1.ebuild
@@ -19,7 +19,7 @@ else
MY_P=${MY_PN}-${MY_PV}
S=${WORKDIR}/${MY_P}
SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
fi
DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/xfsprogs/xfsprogs-5.10.0-r1.ebuild b/sys-fs/xfsprogs/xfsprogs-5.10.0-r1.ebuild
index 2e7069b810eb..19dbee6bd0e0 100644
--- a/sys-fs/xfsprogs/xfsprogs-5.10.0-r1.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-5.10.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="icu libedit nls"
RDEPEND=">=sys-apps/util-linux-2.17.2
diff --git a/sys-kernel/genkernel/genkernel-3.5.3.3.ebuild b/sys-kernel/genkernel/genkernel-3.5.3.3.ebuild
index e2687014b2ab..2f5c7f2a94be 100644
--- a/sys-kernel/genkernel/genkernel-3.5.3.3.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.5.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# genkernel-9999 -> latest Git branch "master"
@@ -43,7 +43,7 @@ then
else
SRC_URI="mirror://gentoo/${P}.tar.xz
${COMMON_URI}"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
fi
DESCRIPTION="Gentoo automatic kernel building scripts"
diff --git a/sys-kernel/genkernel/genkernel-4.0.10.ebuild b/sys-kernel/genkernel/genkernel-4.0.10.ebuild
index 1c6d49a886aa..982c379f4ad4 100644
--- a/sys-kernel/genkernel/genkernel-4.0.10.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# genkernel-9999 -> latest Git branch "master"
@@ -78,7 +78,7 @@ if [[ ${PV} == 9999* ]] ; then
else
SRC_URI="https://dev.gentoo.org/~whissi/dist/genkernel/${P}.tar.xz
${COMMON_URI}"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
fi
DESCRIPTION="Gentoo automatic kernel building scripts"
diff --git a/sys-kernel/genkernel/genkernel-4.1.2-r3.ebuild b/sys-kernel/genkernel/genkernel-4.1.2-r3.ebuild
index c771295edb42..8635d2185822 100644
--- a/sys-kernel/genkernel/genkernel-4.1.2-r3.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.1.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# genkernel-9999 -> latest Git branch "master"
@@ -86,7 +86,7 @@ if [[ ${PV} == 9999* ]] ; then
else
SRC_URI="https://dev.gentoo.org/~whissi/dist/genkernel/${P}.tar.xz
${COMMON_URI}"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
fi
DESCRIPTION="Gentoo automatic kernel building scripts"
diff --git a/sys-kernel/genkernel/genkernel-4.2.1-r1.ebuild b/sys-kernel/genkernel/genkernel-4.2.1-r1.ebuild
index 3f102169d528..8ef9edd2ce09 100644
--- a/sys-kernel/genkernel/genkernel-4.2.1-r1.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.2.1-r1.ebuild
@@ -86,7 +86,7 @@ if [[ ${PV} == 9999* ]] ; then
else
SRC_URI="https://dev.gentoo.org/~whissi/dist/genkernel/${P}.tar.xz
${COMMON_URI}"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
fi
DESCRIPTION="Gentoo automatic kernel building scripts"
diff --git a/sys-kernel/installkernel-gentoo/installkernel-gentoo-2.ebuild b/sys-kernel/installkernel-gentoo/installkernel-gentoo-2.ebuild
index c30f84004297..74dcbbccea80 100644
--- a/sys-kernel/installkernel-gentoo/installkernel-gentoo-2.ebuild
+++ b/sys-kernel/installkernel-gentoo/installkernel-gentoo-2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/mgorny/installkernel-gentoo/archive/v${PV}.tar.gz
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
RDEPEND="
>=sys-apps/debianutils-4.9-r1
diff --git a/sys-kernel/linux-firmware/linux-firmware-20200316.ebuild b/sys-kernel/linux-firmware/linux-firmware-20200316.ebuild
index 3ffe531947f9..6adb5d6b7369 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20200316.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20200316.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
fi
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
fi
DESCRIPTION="Linux firmware files"
diff --git a/sys-kernel/linux-firmware/linux-firmware-20200421.ebuild b/sys-kernel/linux-firmware/linux-firmware-20200421.ebuild
index 3ffe531947f9..6adb5d6b7369 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20200421.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20200421.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
fi
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
fi
DESCRIPTION="Linux firmware files"
diff --git a/sys-kernel/linux-firmware/linux-firmware-20200519.ebuild b/sys-kernel/linux-firmware/linux-firmware-20200519.ebuild
index 3ffe531947f9..6adb5d6b7369 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20200519.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20200519.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
fi
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
fi
DESCRIPTION="Linux firmware files"
diff --git a/sys-kernel/linux-firmware/linux-firmware-20200619.ebuild b/sys-kernel/linux-firmware/linux-firmware-20200619.ebuild
index 3ffe531947f9..6adb5d6b7369 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20200619.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20200619.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
fi
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
fi
DESCRIPTION="Linux firmware files"
diff --git a/sys-kernel/linux-firmware/linux-firmware-20200721.ebuild b/sys-kernel/linux-firmware/linux-firmware-20200721.ebuild
index 3ffe531947f9..6adb5d6b7369 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20200721.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20200721.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
fi
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
fi
DESCRIPTION="Linux firmware files"
diff --git a/sys-kernel/linux-firmware/linux-firmware-20200817.ebuild b/sys-kernel/linux-firmware/linux-firmware-20200817.ebuild
index 3ffe531947f9..6adb5d6b7369 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20200817.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20200817.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
fi
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
fi
DESCRIPTION="Linux firmware files"
diff --git a/sys-kernel/linux-firmware/linux-firmware-20200918.ebuild b/sys-kernel/linux-firmware/linux-firmware-20200918.ebuild
index 3ffe531947f9..6adb5d6b7369 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20200918.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20200918.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
fi
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
fi
DESCRIPTION="Linux firmware files"
diff --git a/sys-kernel/linux-firmware/linux-firmware-20201022-r3.ebuild b/sys-kernel/linux-firmware/linux-firmware-20201022-r3.ebuild
index 6a7390b61534..568a5d37cf17 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20201022-r3.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20201022-r3.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
fi
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
fi
DESCRIPTION="Linux firmware files"
diff --git a/sys-kernel/linux-firmware/linux-firmware-20201218.ebuild b/sys-kernel/linux-firmware/linux-firmware-20201218.ebuild
index f735352e7f05..0722e63d6298 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20201218.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20201218.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
fi
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
fi
DESCRIPTION="Linux firmware files"
diff --git a/sys-kernel/linux-firmware/linux-firmware-20210208.ebuild b/sys-kernel/linux-firmware/linux-firmware-20210208.ebuild
index f735352e7f05..0722e63d6298 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20210208.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20210208.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
fi
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
fi
DESCRIPTION="Linux firmware files"
diff --git a/sys-kernel/linux-firmware/linux-firmware-20210315.ebuild b/sys-kernel/linux-firmware/linux-firmware-20210315.ebuild
index 36abf9f7eca8..fa0f36c91a02 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20210315.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20210315.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
fi
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
fi
DESCRIPTION="Linux firmware files"
diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
index f735352e7f05..0722e63d6298 100644
--- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
fi
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
fi
DESCRIPTION="Linux firmware files"
diff --git a/sys-kernel/linux-headers/linux-headers-3.18.ebuild b/sys-kernel/linux-headers/linux-headers-3.18.ebuild
index 1574835523eb..a9b5d7f61969 100644
--- a/sys-kernel/linux-headers/linux-headers-3.18.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-3.18.ebuild
@@ -12,7 +12,7 @@ PATCH_VER="1"
SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
DEPEND="app-arch/xz-utils
dev-lang/perl"
diff --git a/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild b/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild
index 4b167e1ada31..0bf7828fca73 100644
--- a/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild
@@ -12,7 +12,7 @@ PATCH_VER="1"
SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
DEPEND="app-arch/xz-utils
dev-lang/perl"
diff --git a/sys-kernel/linux-headers/linux-headers-4.19.ebuild b/sys-kernel/linux-headers/linux-headers-4.19.ebuild
index 66e8b26589d5..fa07a3ed3b91 100644
--- a/sys-kernel/linux-headers/linux-headers-4.19.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.19.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
${PATCH_VER:+https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}
"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
DEPEND="app-arch/xz-utils
dev-lang/perl"
diff --git a/sys-kernel/linux-headers/linux-headers-4.4.ebuild b/sys-kernel/linux-headers/linux-headers-4.4.ebuild
index 4b167e1ada31..0bf7828fca73 100644
--- a/sys-kernel/linux-headers/linux-headers-4.4.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.4.ebuild
@@ -12,7 +12,7 @@ PATCH_VER="1"
SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
DEPEND="app-arch/xz-utils
dev-lang/perl"
diff --git a/sys-kernel/linux-headers/linux-headers-5.10.ebuild b/sys-kernel/linux-headers/linux-headers-5.10.ebuild
index f1a29850d479..2ca94a6ef16a 100644
--- a/sys-kernel/linux-headers/linux-headers-5.10.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.10.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${KERNEL_URI}
${PATCH_VER:+https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}
"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
DEPEND="app-arch/xz-utils
dev-lang/perl"
diff --git a/sys-kernel/linux-headers/linux-headers-5.4-r1.ebuild b/sys-kernel/linux-headers/linux-headers-5.4-r1.ebuild
index c76039abfd80..827a8767d0fd 100644
--- a/sys-kernel/linux-headers/linux-headers-5.4-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.4-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${KERNEL_URI}
${PATCH_VER:+https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}
"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
DEPEND="app-arch/xz-utils
dev-lang/perl"
diff --git a/sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild b/sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild
index 250ddd0694e7..33fab42049f8 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
LICENSE="|| ( GPL-3 LGPL-3 )"
SLOT="0/${PV}"
IUSE="64-bit-bfd multitarget nls static-libs"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
BDEPEND="nls? ( sys-devel/gettext )"
DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
diff --git a/sys-libs/binutils-libs/binutils-libs-2.35.1-r1.ebuild b/sys-libs/binutils-libs/binutils-libs-2.35.1-r1.ebuild
index c047eed3ff51..cc777feefc39 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.35.1-r1.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.35.1-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
LICENSE="|| ( GPL-3 LGPL-3 )"
SLOT="0/${PV}"
IUSE="64-bit-bfd cet multitarget nls static-libs"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
BDEPEND="nls? ( sys-devel/gettext )"
DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
diff --git a/sys-libs/cracklib/cracklib-2.9.7.ebuild b/sys-libs/cracklib/cracklib-2.9.7.ebuild
index 534b552abb88..65506cf48985 100644
--- a/sys-libs/cracklib/cracklib-2.9.7.ebuild
+++ b/sys-libs/cracklib/cracklib-2.9.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="nls python static-libs zlib"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-libs/db/db-1.85-r4.ebuild b/sys-libs/db/db-1.85-r4.ebuild
index e643d4f2ed68..3efe710bb3e8 100644
--- a/sys-libs/db/db-1.85-r4.ebuild
+++ b/sys-libs/db/db-1.85-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="http://download.oracle.com/berkeley-db/db.${PV}.tar.gz
LICENSE="Sleepycat"
SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
DEPEND=""
diff --git a/sys-libs/db/db-3.2.9_p2-r1.ebuild b/sys-libs/db/db-3.2.9_p2-r1.ebuild
index 804eb7f92543..09e4131d8b99 100644
--- a/sys-libs/db/db-3.2.9_p2-r1.ebuild
+++ b/sys-libs/db/db-3.2.9_p2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -28,7 +28,7 @@ LICENSE="Sleepycat"
SLOT="3"
# This ebuild is to be the compatibility ebuild for when db4 is put
# in the tree.
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="doc"
RESTRICT="!test? ( test )"
diff --git a/sys-libs/db/db-4.2.52_p5-r3.ebuild b/sys-libs/db/db-4.2.52_p5-r3.ebuild
index 9280a2a20aeb..e31ffdfadaac 100644
--- a/sys-libs/db/db-4.2.52_p5-r3.ebuild
+++ b/sys-libs/db/db-4.2.52_p5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -27,7 +27,7 @@ done
LICENSE="Sleepycat"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
IUSE="tcl java doc cxx"
RESTRICT="!test? ( test )"
diff --git a/sys-libs/db/db-4.3.29_p1-r3.ebuild b/sys-libs/db/db-4.3.29_p1-r3.ebuild
index 6203db5bb196..e4bdf106da58 100644
--- a/sys-libs/db/db-4.3.29_p1-r3.ebuild
+++ b/sys-libs/db/db-4.3.29_p1-r3.ebuild
@@ -27,7 +27,7 @@ done
LICENSE="Sleepycat"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86"
IUSE="tcl java doc cxx"
RESTRICT="!test? ( test )"
diff --git a/sys-libs/db/db-4.5.20_p2-r3.ebuild b/sys-libs/db/db-4.5.20_p2-r3.ebuild
index daddf6588b80..df21a49880a9 100644
--- a/sys-libs/db/db-4.5.20_p2-r3.ebuild
+++ b/sys-libs/db/db-4.5.20_p2-r3.ebuild
@@ -27,7 +27,7 @@ done
LICENSE="Sleepycat"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="tcl java doc cxx"
RESTRICT="!test? ( test )"
diff --git a/sys-libs/db/db-4.6.21_p4-r2.ebuild b/sys-libs/db/db-4.6.21_p4-r2.ebuild
index 4f065e64ff7b..10a378826ba3 100644
--- a/sys-libs/db/db-4.6.21_p4-r2.ebuild
+++ b/sys-libs/db/db-4.6.21_p4-r2.ebuild
@@ -27,7 +27,7 @@ done
LICENSE="Sleepycat"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="tcl java doc cxx"
RESTRICT="!test? ( test )"
diff --git a/sys-libs/db/db-4.7.25_p4-r2.ebuild b/sys-libs/db/db-4.7.25_p4-r2.ebuild
index f7474414846a..4f6c58ec0a7a 100644
--- a/sys-libs/db/db-4.7.25_p4-r2.ebuild
+++ b/sys-libs/db/db-4.7.25_p4-r2.ebuild
@@ -29,7 +29,7 @@ done
LICENSE="Sleepycat"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86"
IUSE="doc java cxx tcl test"
# the entire testsuite needs the TCL functionality
diff --git a/sys-libs/db/db-4.8.30-r3.ebuild b/sys-libs/db/db-4.8.30-r3.ebuild
index 1e116e00d1da..20f5227a5f68 100644
--- a/sys-libs/db/db-4.8.30-r3.ebuild
+++ b/sys-libs/db/db-4.8.30-r3.ebuild
@@ -29,7 +29,7 @@ done
LICENSE="Sleepycat"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="doc java cxx tcl test"
REQUIRED_USE="test? ( tcl )"
diff --git a/sys-libs/db/db-5.3.28-r4.ebuild b/sys-libs/db/db-5.3.28-r4.ebuild
index 99876d1e9ebe..25079725abbe 100644
--- a/sys-libs/db/db-5.3.28-r4.ebuild
+++ b/sys-libs/db/db-5.3.28-r4.ebuild
@@ -29,7 +29,7 @@ done
LICENSE="Sleepycat"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~riscv ~s390 sparc x86"
IUSE="doc java cxx tcl test"
REQUIRED_USE="test? ( tcl )"
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.6.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.6.ebuild
index 0112e42b9627..722e3a0df067 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.6.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="static-libs"
RDEPEND="!sys-libs/com_err
diff --git a/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild b/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild
index c09b44335626..d261e5c1d6f6 100644
--- a/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild
+++ b/sys-libs/gdbm/gdbm-1.18.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gdbm/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0/6" # libgdbm.so version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+berkdb nls +readline static-libs"
DEPEND="
diff --git a/sys-libs/glibc/glibc-2.25-r11.ebuild b/sys-libs/glibc/glibc-2.25-r11.ebuild
index 1946fcf4489c..b70c3072d169 100644
--- a/sys-libs/glibc/glibc-2.25-r11.ebuild
+++ b/sys-libs/glibc/glibc-2.25-r11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -9,7 +9,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library"
HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
EMULTILIB_PKG="true"
# Configuration variables
diff --git a/sys-libs/glibc/glibc-2.31-r7.ebuild b/sys-libs/glibc/glibc-2.31-r7.ebuild
index 0e8b9b9b849e..705736325e46 100644
--- a/sys-libs/glibc/glibc-2.31-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.31-r7.ebuild
@@ -23,7 +23,7 @@ PATCH_DEV=dilfridge
if [[ ${PV} == 9999* ]]; then
inherit git-r3
else
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
fi
diff --git a/sys-libs/glibc/glibc-2.32-r6.ebuild b/sys-libs/glibc/glibc-2.32-r6.ebuild
index ed0b3e0bf165..d4b3ec16bc9f 100644
--- a/sys-libs/glibc/glibc-2.32-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.32-r6.ebuild
@@ -23,7 +23,7 @@ PATCH_DEV=slyfox
if [[ ${PV} == 9999* ]]; then
inherit git-r3
else
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
SRC_URI+=" riscv? ( https://dev.gentoo.org/~dilfridge/distfiles/backport-rv32.txz )"
diff --git a/sys-libs/glibc/glibc-2.32-r7.ebuild b/sys-libs/glibc/glibc-2.32-r7.ebuild
index 2ead5dd7c01d..60f158334e6d 100644
--- a/sys-libs/glibc/glibc-2.32-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.32-r7.ebuild
@@ -23,7 +23,7 @@ PATCH_DEV=dilfridge
if [[ ${PV} == 9999* ]]; then
inherit git-r3
else
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
SRC_URI+=" riscv? ( https://dev.gentoo.org/~dilfridge/distfiles/backport-rv32.txz )"
diff --git a/sys-libs/gpm/gpm-1.20.7-r2.ebuild b/sys-libs/gpm/gpm-1.20.7-r2.ebuild
index e94da64bea36..a07412002d3b 100644
--- a/sys-libs/gpm/gpm-1.20.7-r2.ebuild
+++ b/sys-libs/gpm/gpm-1.20.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# emacs support disabled due to #99533 #335900
@@ -14,7 +14,7 @@ SRC_URI="https://www.nico.schottelius.org/software/${PN}/archives/${P}.tar.lzma
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="selinux static-libs"
RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
diff --git a/sys-libs/libcap/libcap-2.43.ebuild b/sys-libs/libcap/libcap-2.43.ebuild
index 1362bc3efe33..201a82584cd9 100644
--- a/sys-libs/libcap/libcap-2.43.ebuild
+++ b/sys-libs/libcap/libcap-2.43.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P}
# it's available under either of the licenses
LICENSE="|| ( GPL-2 BSD )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="pam static-libs"
# While the build system optionally uses gperf, we don't DEPEND on it because
diff --git a/sys-libs/libseccomp/libseccomp-2.4.3.ebuild b/sys-libs/libseccomp/libseccomp-2.4.3.ebuild
index fb7d1492bd88..f6e555a5b8d7 100644
--- a/sys-libs/libseccomp/libseccomp-2.4.3.ebuild
+++ b/sys-libs/libseccomp/libseccomp-2.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# TODO: Add python support.
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="-* amd64 arm arm64 hppa ~mips ppc ppc64 s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="-* amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
IUSE="static-libs"
# We need newer kernel headers; we don't keep strict control of the exact
diff --git a/sys-libs/libseccomp/libseccomp-2.4.4.ebuild b/sys-libs/libseccomp/libseccomp-2.4.4.ebuild
index fb7d1492bd88..f6e555a5b8d7 100644
--- a/sys-libs/libseccomp/libseccomp-2.4.4.ebuild
+++ b/sys-libs/libseccomp/libseccomp-2.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# TODO: Add python support.
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="-* amd64 arm arm64 hppa ~mips ppc ppc64 s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="-* amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
IUSE="static-libs"
# We need newer kernel headers; we don't keep strict control of the exact
diff --git a/sys-libs/libutempter/libutempter-1.1.6-r3.ebuild b/sys-libs/libutempter/libutempter-1.1.6-r3.ebuild
index 0633a5a51eab..7d8cc191d940 100644
--- a/sys-libs/libutempter/libutempter-1.1.6-r3.ebuild
+++ b/sys-libs/libutempter/libutempter-1.1.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.altlinux.org/pub/people/ldv/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="static-libs elibc_FreeBSD"
RDEPEND="
diff --git a/sys-libs/mtdev/mtdev-1.1.6.ebuild b/sys-libs/mtdev/mtdev-1.1.6.ebuild
index e5b67d21ce83..537a0e95a37c 100644
--- a/sys-libs/mtdev/mtdev-1.1.6.ebuild
+++ b/sys-libs/mtdev/mtdev-1.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://bitmath.org/code/mtdev/${P}.tar.bz2"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE=""
DEPEND=">=sys-kernel/linux-headers-2.6.31"
diff --git a/sys-libs/ncurses-compat/ncurses-compat-6.1_p20190609.ebuild b/sys-libs/ncurses-compat/ncurses-compat-6.1_p20190609.ebuild
index cbf320d863af..0c319e1dadb0 100644
--- a/sys-libs/ncurses-compat/ncurses-compat-6.1_p20190609.ebuild
+++ b/sys-libs/ncurses-compat/ncurses-compat-6.1_p20190609.ebuild
@@ -23,7 +23,7 @@ fi
LICENSE="MIT"
# The subslot reflects the SONAME.
SLOT="5/5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="gpm tinfo unicode"
DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
diff --git a/sys-libs/ncurses/ncurses-6.2-r1.ebuild b/sys-libs/ncurses/ncurses-6.2-r1.ebuild
index 3876d51a41e1..2580c7337191 100644
--- a/sys-libs/ncurses/ncurses-6.2-r1.ebuild
+++ b/sys-libs/ncurses/ncurses-6.2-r1.ebuild
@@ -19,7 +19,7 @@ fi
LICENSE="MIT"
# The subslot reflects the SONAME.
SLOT="0/6"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode"
RESTRICT="!test? ( test )"
diff --git a/sys-libs/pam/pam-1.5.1.ebuild b/sys-libs/pam/pam-1.5.1.ebuild
index d8b000a112c8..868d19db4770 100644
--- a/sys-libs/pam/pam-1.5.1.ebuild
+++ b/sys-libs/pam/pam-1.5.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/linux-pam/linux-pam/releases/download/v${PV}/${MY_P}
LICENSE="|| ( BSD GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="audit berkdb debug nis selinux"
BDEPEND="
diff --git a/sys-libs/pwdb/pwdb-0.62-r1.ebuild b/sys-libs/pwdb/pwdb-0.62-r1.ebuild
index 1aac533a8f7f..98ef1fbf86bb 100644
--- a/sys-libs/pwdb/pwdb-0.62-r1.ebuild
+++ b/sys-libs/pwdb/pwdb-0.62-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="|| ( BSD GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="selinux"
RESTRICT="test" #122603
diff --git a/sys-libs/readline/readline-8.0_p4.ebuild b/sys-libs/readline/readline-8.0_p4.ebuild
index 89d0c6f52b78..e417adad0535 100644
--- a/sys-libs/readline/readline-8.0_p4.ebuild
+++ b/sys-libs/readline/readline-8.0_p4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -41,7 +41,7 @@ esac
LICENSE="GPL-3"
SLOT="0/8" # subslot matches SONAME major
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="static-libs +unicode utils"
RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,${MULTILIB_USEDEP}]"
diff --git a/sys-libs/slang/slang-2.3.2.ebuild b/sys-libs/slang/slang-2.3.2.ebuild
index 31370451d21d..6a2d4ae7390f 100644
--- a/sys-libs/slang/slang-2.3.2.ebuild
+++ b/sys-libs/slang/slang-2.3.2.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_pre* ]] ; then
else
SRC_URI="http://www.jedsoft.org/releases/${PN}/${P}.tar.bz2
http://www.jedsoft.org/releases/${PN}/old/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
SLOT="0"
diff --git a/sys-libs/timezone-data/timezone-data-2021a.ebuild b/sys-libs/timezone-data/timezone-data-2021a.ebuild
index b7dce14ae8a4..2e39bb4f3ecf 100644
--- a/sys-libs/timezone-data/timezone-data-2021a.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2021a.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.t
LICENSE="BSD public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls leaps-timezone elibc_FreeBSD zic-slim"
DEPEND="nls? ( virtual/libintl )"
diff --git a/sys-libs/zlib/zlib-1.2.11-r3.ebuild b/sys-libs/zlib/zlib-1.2.11-r3.ebuild
index c68284ca127d..494ff7ef3899 100644
--- a/sys-libs/zlib/zlib-1.2.11-r3.ebuild
+++ b/sys-libs/zlib/zlib-1.2.11-r3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://zlib.net/${P}.tar.gz
LICENSE="ZLIB"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="minizip static-libs"
BDEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )"
diff --git a/sys-process/audit/audit-2.8.5-r2.ebuild b/sys-process/audit/audit-2.8.5-r2.ebuild
index a2bf423ee499..e70218a14ef6 100644
--- a/sys-process/audit/audit-2.8.5-r2.ebuild
+++ b/sys-process/audit/audit-2.8.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -22,7 +22,7 @@ SRC_URI+=" https://github.com/linux-audit/audit-userspace/commit/017e6c6ab95df55
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="gssapi ldap python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
# Testcases are pretty useless as they are built for RedHat users/groups and kernels.
diff --git a/sys-process/audit/audit-3.0.ebuild b/sys-process/audit/audit-3.0.ebuild
index 1c1a102da5a1..d63564e38f4d 100644
--- a/sys-process/audit/audit-3.0.ebuild
+++ b/sys-process/audit/audit-3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="gssapi ldap python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-process/cronbase/cronbase-0.3.7-r6.ebuild b/sys-process/cronbase/cronbase-0.3.7-r6.ebuild
index 4db71a54c97c..ff274f0d977a 100644
--- a/sys-process/cronbase/cronbase-0.3.7-r6.ebuild
+++ b/sys-process/cronbase/cronbase-0.3.7-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE=""
S=${WORKDIR}
diff --git a/sys-process/daemontools/daemontools-0.76-r8.ebuild b/sys-process/daemontools/daemontools-0.76-r8.ebuild
index 1336b621ffe4..7c5e6ee0b3f9 100644
--- a/sys-process/daemontools/daemontools-0.76-r8.ebuild
+++ b/sys-process/daemontools/daemontools-0.76-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="http://cr.yp.to/daemontools/${P}.tar.gz
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="selinux static"
DEPEND=""
diff --git a/sys-process/dcron/dcron-4.5-r2.ebuild b/sys-process/dcron/dcron-4.5-r2.ebuild
index e32a6336c9ec..bc17faba17b9 100644
--- a/sys-process/dcron/dcron-4.5-r2.ebuild
+++ b/sys-process/dcron/dcron-4.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -9,7 +9,7 @@ DESCRIPTION="A cute little cron from Matt Dillon"
HOMEPAGE="http://www.jimpryor.net/linux/dcron.html http://apollo.backplane.com/FreeSrc/"
SRC_URI="http://www.jimpryor.net/linux/releases/${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
LICENSE="GPL-2"
SLOT="0"
diff --git a/sys-process/lsof/lsof-4.93.2-r1.ebuild b/sys-process/lsof/lsof-4.93.2-r1.ebuild
index cb17296fd864..b0aa61597ced 100644
--- a/sys-process/lsof/lsof-4.93.2-r1.ebuild
+++ b/sys-process/lsof/lsof-4.93.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/lsof-org/lsof/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="lsof"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="examples ipv6 rpc selinux"
RDEPEND="rpc? ( net-libs/libtirpc )
diff --git a/sys-process/numad/numad-0.5-r3.ebuild b/sys-process/numad/numad-0.5-r3.ebuild
index 799fce8dec83..5708c2782607 100644
--- a/sys-process/numad/numad-0.5-r3.ebuild
+++ b/sys-process/numad/numad-0.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]]; then
else
EGIT_COMMIT="334278ff3d774d105939743436d7378a189e8693"
SRC_URI="mirror://gentoo/numad-0.5-${EGIT_COMMIT:0:7}.tar.bz2"
- KEYWORDS="amd64 -arm ~arm64 ~ppc64 -s390 x86"
+ KEYWORDS="amd64 -arm ~arm64 ~ppc64 ~s390 x86"
S="${WORKDIR}/${PN}-${EGIT_COMMIT:0:7}"
fi
diff --git a/sys-process/numad/numad-9999.ebuild b/sys-process/numad/numad-9999.ebuild
index 11e23c799437..ddf19989ed7c 100644
--- a/sys-process/numad/numad-9999.ebuild
+++ b/sys-process/numad/numad-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]]; then
else
EGIT_COMMIT=""
SRC_URI="mirror://gentoo/numad-0.5-${EGIT_COMMIT:0:7}.tar.bz2"
- KEYWORDS="~amd64 -arm ~arm64 ~ppc64 -s390 ~x86"
+ KEYWORDS="~amd64 -arm ~arm64 ~ppc64 ~s390 ~x86"
S="${WORKDIR}/${PN}-${EGIT_COMMIT:0:7}"
fi
diff --git a/sys-process/procps/procps-3.3.16-r2.ebuild b/sys-process/procps/procps-3.3.16-r2.ebuild
index c3adece77bba..9bab87700256 100644
--- a/sys-process/procps/procps-3.3.16-r2.ebuild
+++ b/sys-process/procps/procps-3.3.16-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz"
LICENSE="GPL-2"
SLOT="0/8" # libprocps.so
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode"
RESTRICT="!test? ( test )"
diff --git a/sys-process/procps/procps-3.3.17.ebuild b/sys-process/procps/procps-3.3.17.ebuild
index db59e397ad2e..2c987f6efbd1 100644
--- a/sys-process/procps/procps-3.3.17.ebuild
+++ b/sys-process/procps/procps-3.3.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz"
LICENSE="GPL-2"
SLOT="0/8" # libprocps.so
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode"
RESTRICT="!test? ( test )"
diff --git a/sys-process/psmisc/psmisc-23.3-r1.ebuild b/sys-process/psmisc/psmisc-23.3-r1.ebuild
index 09a5c56c9241..ea42dd495511 100644
--- a/sys-process/psmisc/psmisc-23.3-r1.ebuild
+++ b/sys-process/psmisc/psmisc-23.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="ipv6 nls selinux X"
RDEPEND=">=sys-libs/ncurses-5.7-r7:0=
diff --git a/sys-process/runit/runit-2.1.1-r2.ebuild b/sys-process/runit/runit-2.1.1-r2.ebuild
index 0185b4aaf959..d556c6541a80 100644
--- a/sys-process/runit/runit-2.1.1-r2.ebuild
+++ b/sys-process/runit/runit-2.1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://smarden.org/runit/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="static"
S=${WORKDIR}/admin/${P}/src
diff --git a/virtual/acl/acl-0-r1.ebuild b/virtual/acl/acl-0-r1.ebuild
index 28c500d66e0e..e11d8f4dece9 100644
--- a/virtual/acl/acl-0-r1.ebuild
+++ b/virtual/acl/acl-0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
DESCRIPTION="Virtual for acl support (sys/acl.h)"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="static-libs"
RDEPEND="kernel_linux? ( sys-apps/acl[static-libs?] )"
diff --git a/virtual/acl/acl-0-r2.ebuild b/virtual/acl/acl-0-r2.ebuild
index 1d28dc736888..2512ced6742a 100644
--- a/virtual/acl/acl-0-r2.ebuild
+++ b/virtual/acl/acl-0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,7 +7,7 @@ inherit multilib-build
DESCRIPTION="Virtual for acl support (sys/acl.h)"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="static-libs"
RDEPEND="kernel_linux? ( >=sys-apps/acl-2.2.52-r1[static-libs?,${MULTILIB_USEDEP}] )"
diff --git a/virtual/acl/acl-0.ebuild b/virtual/acl/acl-0.ebuild
index 76fc7cd652b2..5a49692b323f 100644
--- a/virtual/acl/acl-0.ebuild
+++ b/virtual/acl/acl-0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
DESCRIPTION="Virtual for acl support (sys/acl.h)"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="kernel_linux? ( sys-apps/acl )"
diff --git a/virtual/awk/awk-1.ebuild b/virtual/awk/awk-1.ebuild
index 226d14fd6130..1d8e9c62e988 100644
--- a/virtual/awk/awk-1.ebuild
+++ b/virtual/awk/awk-1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for awk implementation"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| (
diff --git a/virtual/checkpassword/checkpassword-0.ebuild b/virtual/checkpassword/checkpassword-0.ebuild
index d33b2087b597..d3488e6bb9c8 100644
--- a/virtual/checkpassword/checkpassword-0.ebuild
+++ b/virtual/checkpassword/checkpassword-0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
DESCRIPTION="Virtual for checkpassword compatible applications"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
RDEPEND="|| (
net-mail/checkpassword
diff --git a/virtual/cron/cron-0-r2.ebuild b/virtual/cron/cron-0-r2.ebuild
index c4445da2f11a..12961fa0ba3d 100644
--- a/virtual/cron/cron-0-r2.ebuild
+++ b/virtual/cron/cron-0-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
DESCRIPTION="Virtual for cron"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND="|| ( sys-process/cronie
sys-process/bcron
diff --git a/virtual/daemontools/daemontools-0.ebuild b/virtual/daemontools/daemontools-0.ebuild
index ee73905622e7..1216dbb97b60 100644
--- a/virtual/daemontools/daemontools-0.ebuild
+++ b/virtual/daemontools/daemontools-0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
DESCRIPTION="Virtual for daemontools"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
RDEPEND="|| (
sys-process/daemontools
diff --git a/virtual/dev-manager/dev-manager-0-r2.ebuild b/virtual/dev-manager/dev-manager-0-r2.ebuild
index a53a86593ec0..fe76f6f4e586 100644
--- a/virtual/dev-manager/dev-manager-0-r2.ebuild
+++ b/virtual/dev-manager/dev-manager-0-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
DESCRIPTION="Virtual for the device filesystem manager"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND="
|| (
diff --git a/virtual/editor/editor-0-r3.ebuild b/virtual/editor/editor-0-r3.ebuild
index 815bde607681..ea5ecdf59df8 100644
--- a/virtual/editor/editor-0-r3.ebuild
+++ b/virtual/editor/editor-0-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for editor"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Add a package to RDEPEND only if the editor:
# - can edit ordinary text files,
diff --git a/virtual/eject/eject-0-r1.ebuild b/virtual/eject/eject-0-r1.ebuild
index 185772dd9eb7..7762bcb232ca 100644
--- a/virtual/eject/eject-0-r1.ebuild
+++ b/virtual/eject/eject-0-r1.ebuild
@@ -5,6 +5,6 @@ EAPI=6
DESCRIPTION="Virtual for the eject command"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="|| ( >=sys-apps/util-linux-2.22 sys-block/eject-bsd )"
diff --git a/virtual/fam/fam-0-r1.ebuild b/virtual/fam/fam-0-r1.ebuild
index 5e13000af5eb..552a7b7905c4 100644
--- a/virtual/fam/fam-0-r1.ebuild
+++ b/virtual/fam/fam-0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,6 +7,6 @@ inherit multilib-build
DESCRIPTION="A virtual package to choose between gamin and fam"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
RDEPEND="|| ( >=app-admin/gamin-0.1.10-r1[${MULTILIB_USEDEP}] >=app-admin/fam-2.7.0-r6[${MULTILIB_USEDEP}] )"
diff --git a/virtual/fortran/fortran-0.ebuild b/virtual/fortran/fortran-0.ebuild
index f6c5360348d5..c0ba0173346d 100644
--- a/virtual/fortran/fortran-0.ebuild
+++ b/virtual/fortran/fortran-0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
DESCRIPTION="Virtual for Fortran Compiler"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
IUSE="openmp"
RDEPEND="
diff --git a/virtual/glu/glu-9.0-r2.ebuild b/virtual/glu/glu-9.0-r2.ebuild
index 1cbfe0b5795b..e94237566efd 100644
--- a/virtual/glu/glu-9.0-r2.ebuild
+++ b/virtual/glu/glu-9.0-r2.ebuild
@@ -7,7 +7,7 @@ inherit multilib-build
DESCRIPTION="Virtual for OpenGL utility library"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| (
diff --git a/virtual/gsasl/gsasl-2.ebuild b/virtual/gsasl/gsasl-2.ebuild
index de5c82ccb799..f63434d90ebe 100644
--- a/virtual/gsasl/gsasl-2.ebuild
+++ b/virtual/gsasl/gsasl-2.ebuild
@@ -5,6 +5,6 @@ EAPI=5
DESCRIPTION="Virtual for the GNU SASL library"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
RDEPEND="|| ( net-libs/libgsasl net-misc/gsasl )"
diff --git a/virtual/httpd-basic/httpd-basic-0-r2.ebuild b/virtual/httpd-basic/httpd-basic-0-r2.ebuild
index 4fcba68870b5..d50da3cc39cb 100644
--- a/virtual/httpd-basic/httpd-basic-0-r2.ebuild
+++ b/virtual/httpd-basic/httpd-basic-0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=5
DESCRIPTION="Virtual for static HTML-enabled webservers"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="|| (
www-servers/apache
diff --git a/virtual/httpd-cgi/httpd-cgi-0-r1.ebuild b/virtual/httpd-cgi/httpd-cgi-0-r1.ebuild
index f444ee767fbd..52a0b6503059 100644
--- a/virtual/httpd-cgi/httpd-cgi-0-r1.ebuild
+++ b/virtual/httpd-cgi/httpd-cgi-0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
DESCRIPTION="Virtual for CGI-enabled webservers"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="|| (
www-servers/apache
diff --git a/virtual/httpd-cgi/httpd-cgi-0-r2.ebuild b/virtual/httpd-cgi/httpd-cgi-0-r2.ebuild
index 7327f555c1ef..0098c6630efa 100644
--- a/virtual/httpd-cgi/httpd-cgi-0-r2.ebuild
+++ b/virtual/httpd-cgi/httpd-cgi-0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=5
DESCRIPTION="Virtual for CGI-enabled webservers"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="|| (
www-servers/apache
diff --git a/virtual/httpd-fastcgi/httpd-fastcgi-0-r1.ebuild b/virtual/httpd-fastcgi/httpd-fastcgi-0-r1.ebuild
index b9f6ae59c6bd..9003a31d99f1 100644
--- a/virtual/httpd-fastcgi/httpd-fastcgi-0-r1.ebuild
+++ b/virtual/httpd-fastcgi/httpd-fastcgi-0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
DESCRIPTION="Virtual for FastCGI-enabled webservers"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="|| (
www-apache/mod_fcgid
diff --git a/virtual/imagemagick-tools/imagemagick-tools-0.ebuild b/virtual/imagemagick-tools/imagemagick-tools-0.ebuild
index d1fed377f82e..ee794ef24074 100644
--- a/virtual/imagemagick-tools/imagemagick-tools-0.ebuild
+++ b/virtual/imagemagick-tools/imagemagick-tools-0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for imagemagick command line tools"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="jpeg perl png svg tiff"
# This virtual is to be used **ONLY** for depending on the runtime
diff --git a/virtual/imap-c-client/imap-c-client-2.ebuild b/virtual/imap-c-client/imap-c-client-2.ebuild
index 29ddc0bc49cb..8d5baefe94c9 100644
--- a/virtual/imap-c-client/imap-c-client-2.ebuild
+++ b/virtual/imap-c-client/imap-c-client-2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
DESCRIPTION="Virtual for IMAP c-client"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="kerberos ssl"
RDEPEND=" || ( net-libs/c-client[kerberos=,ssl=]
diff --git a/virtual/inetd/inetd-0.ebuild b/virtual/inetd/inetd-0.ebuild
index 6d88a7aee2fb..6e2ccb0f497f 100644
--- a/virtual/inetd/inetd-0.ebuild
+++ b/virtual/inetd/inetd-0.ebuild
@@ -5,7 +5,7 @@ EAPI=5
DESCRIPTION="Virtual for the internet super-server daemon"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
RDEPEND="|| ( sys-apps/xinetd
sys-apps/netkit-base
diff --git a/virtual/jpeg/jpeg-100.ebuild b/virtual/jpeg/jpeg-100.ebuild
index 051be864dee6..9f8f55c5ff20 100644
--- a/virtual/jpeg/jpeg-100.ebuild
+++ b/virtual/jpeg/jpeg-100.ebuild
@@ -7,7 +7,7 @@ inherit multilib-build
DESCRIPTION="Virtual to select between libjpeg-turbo and IJG jpeg for source-based packages"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND="|| (
diff --git a/virtual/krb5/krb5-0-r1.ebuild b/virtual/krb5/krb5-0-r1.ebuild
index 08151dae9051..6fa878cf65b9 100644
--- a/virtual/krb5/krb5-0-r1.ebuild
+++ b/virtual/krb5/krb5-0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,7 +7,7 @@ inherit multilib-build
DESCRIPTION="Virtual for Kerberos V implementation"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
RDEPEND="
|| (
diff --git a/virtual/latex-base/latex-base-1.0.ebuild b/virtual/latex-base/latex-base-1.0.ebuild
index 9b5626f60144..c42161aba067 100644
--- a/virtual/latex-base/latex-base-1.0.ebuild
+++ b/virtual/latex-base/latex-base-1.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for basic LaTeX binaries"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
dev-texlive/texlive-latexrecommended
diff --git a/virtual/libc/libc-1-r1.ebuild b/virtual/libc/libc-1-r1.ebuild
index 81a326f38cc9..8dfc96b19918 100644
--- a/virtual/libc/libc-1-r1.ebuild
+++ b/virtual/libc/libc-1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for the C library"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# explicitly depend on SLOT 2.2 of glibc, because it sets
# a different SLOT for cross-compiling
diff --git a/virtual/libcrypt/libcrypt-1-r1.ebuild b/virtual/libcrypt/libcrypt-1-r1.ebuild
index 88ed53afc7b2..fc93d79bc4c0 100644
--- a/virtual/libcrypt/libcrypt-1-r1.ebuild
+++ b/virtual/libcrypt/libcrypt-1-r1.ebuild
@@ -8,7 +8,7 @@ inherit multilib-build
DESCRIPTION="Virtual for libcrypt.so"
SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+static-libs"
RDEPEND="
diff --git a/virtual/libcrypt/libcrypt-2.ebuild b/virtual/libcrypt/libcrypt-2.ebuild
index c4848800e7da..3397b3f2ce91 100644
--- a/virtual/libcrypt/libcrypt-2.ebuild
+++ b/virtual/libcrypt/libcrypt-2.ebuild
@@ -8,7 +8,7 @@ inherit multilib-build
DESCRIPTION="Virtual for libcrypt.so"
SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+static-libs"
RDEPEND="
diff --git a/virtual/libelf/libelf-3.ebuild b/virtual/libelf/libelf-3.ebuild
index 57e3b8c9d987..ecdcf1ea6941 100644
--- a/virtual/libelf/libelf-3.ebuild
+++ b/virtual/libelf/libelf-3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,7 +7,7 @@ inherit multilib-build
DESCRIPTION="Virtual for libelf.so.1 provider dev-libs/elfutils"
SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
>=dev-libs/elfutils-0.155-r1:0/0[${MULTILIB_USEDEP}]"
diff --git a/virtual/libffi/libffi-3.3_rc0.ebuild b/virtual/libffi/libffi-3.3_rc0.ebuild
index 968552a7ca86..476d24f1b96c 100644
--- a/virtual/libffi/libffi-3.3_rc0.ebuild
+++ b/virtual/libffi/libffi-3.3_rc0.ebuild
@@ -10,6 +10,6 @@ inherit multilib-build
DESCRIPTION="A virtual for the Foreign Function Interface implementation"
SLOT="0/7" # SONAME=libffi.so.7
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND=">=dev-libs/libffi-3.3_rc0:0/7[${MULTILIB_USEDEP}]"
diff --git a/virtual/libiconv/libiconv-0-r1.ebuild b/virtual/libiconv/libiconv-0-r1.ebuild
index 46dd8eec626b..c3d8e4195e15 100644
--- a/virtual/libiconv/libiconv-0-r1.ebuild
+++ b/virtual/libiconv/libiconv-0-r1.ebuild
@@ -7,7 +7,7 @@ inherit multilib-build
DESCRIPTION="Virtual for the GNU conversion library"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="elibc_glibc elibc_uclibc elibc_musl elibc_mintlib"
# - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
diff --git a/virtual/libiconv/libiconv-0-r2.ebuild b/virtual/libiconv/libiconv-0-r2.ebuild
index 46dd8eec626b..c3d8e4195e15 100644
--- a/virtual/libiconv/libiconv-0-r2.ebuild
+++ b/virtual/libiconv/libiconv-0-r2.ebuild
@@ -7,7 +7,7 @@ inherit multilib-build
DESCRIPTION="Virtual for the GNU conversion library"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="elibc_glibc elibc_uclibc elibc_musl elibc_mintlib"
# - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
diff --git a/virtual/libiconv/libiconv-0.ebuild b/virtual/libiconv/libiconv-0.ebuild
index cc3db13268a2..3b915c020cc9 100644
--- a/virtual/libiconv/libiconv-0.ebuild
+++ b/virtual/libiconv/libiconv-0.ebuild
@@ -5,7 +5,7 @@ EAPI=5
DESCRIPTION="Virtual for the GNU conversion library"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="elibc_glibc elibc_uclibc elibc_musl"
# - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
diff --git a/virtual/libintl/libintl-0-r1.ebuild b/virtual/libintl/libintl-0-r1.ebuild
index 86be0e43df4a..d4079d94402d 100644
--- a/virtual/libintl/libintl-0-r1.ebuild
+++ b/virtual/libintl/libintl-0-r1.ebuild
@@ -7,7 +7,7 @@ inherit multilib-build
DESCRIPTION="Virtual for the GNU Internationalization Library"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="elibc_glibc elibc_uclibc"
# - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
diff --git a/virtual/libintl/libintl-0-r2.ebuild b/virtual/libintl/libintl-0-r2.ebuild
index 462d1b41e280..2c25e5cae7b8 100644
--- a/virtual/libintl/libintl-0-r2.ebuild
+++ b/virtual/libintl/libintl-0-r2.ebuild
@@ -7,7 +7,7 @@ inherit multilib-build
DESCRIPTION="Virtual for the GNU Internationalization Library"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="elibc_glibc elibc_musl elibc_uclibc"
# - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
diff --git a/virtual/libintl/libintl-0.ebuild b/virtual/libintl/libintl-0.ebuild
index b88f72c79802..bf1a8ec9e2a4 100644
--- a/virtual/libintl/libintl-0.ebuild
+++ b/virtual/libintl/libintl-0.ebuild
@@ -5,7 +5,7 @@ EAPI=5
DESCRIPTION="Virtual for the GNU Internationalization Library"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="elibc_glibc elibc_uclibc"
# - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
diff --git a/virtual/libudev/libudev-215-r1.ebuild b/virtual/libudev/libudev-215-r1.ebuild
index e85f06c93c1b..f6f3e21b2055 100644
--- a/virtual/libudev/libudev-215-r1.ebuild
+++ b/virtual/libudev/libudev-215-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -6,7 +6,7 @@ inherit multilib-build
DESCRIPTION="Virtual for libudev providers"
SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="static-libs systemd"
REQUIRED_USE="systemd? ( !static-libs )"
diff --git a/virtual/libudev/libudev-232-r2.ebuild b/virtual/libudev/libudev-232-r2.ebuild
index 9456f927db26..25755a501e92 100644
--- a/virtual/libudev/libudev-232-r2.ebuild
+++ b/virtual/libudev/libudev-232-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,7 +6,7 @@ inherit multilib-build
DESCRIPTION="Virtual for libudev providers"
SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="static-libs systemd"
RDEPEND="
diff --git a/virtual/libudev/libudev-232-r3.ebuild b/virtual/libudev/libudev-232-r3.ebuild
index 75050714b76a..bb360be5a48a 100644
--- a/virtual/libudev/libudev-232-r3.ebuild
+++ b/virtual/libudev/libudev-232-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,7 +6,7 @@ inherit multilib-build
DESCRIPTION="Virtual for libudev providers"
SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="static-libs systemd"
RDEPEND="
diff --git a/virtual/libusb/libusb-0-r2.ebuild b/virtual/libusb/libusb-0-r2.ebuild
index 9d9569a95587..ef20a0b0deea 100644
--- a/virtual/libusb/libusb-0-r2.ebuild
+++ b/virtual/libusb/libusb-0-r2.ebuild
@@ -6,6 +6,6 @@ inherit multilib-build
DESCRIPTION="Virtual for libusb"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
RDEPEND=">=dev-libs/libusb-compat-0.1.5-r2[${MULTILIB_USEDEP}]"
diff --git a/virtual/libusb/libusb-1-r1.ebuild b/virtual/libusb/libusb-1-r1.ebuild
index 6ee24bc8de89..2f33b4fe60a3 100644
--- a/virtual/libusb/libusb-1-r1.ebuild
+++ b/virtual/libusb/libusb-1-r1.ebuild
@@ -6,7 +6,7 @@ inherit multilib-build
DESCRIPTION="Virtual for libusb"
SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="udev"
RDEPEND=">=dev-libs/libusb-1.0.9-r2:1[udev(+)?,${MULTILIB_USEDEP}]"
diff --git a/virtual/linuxtv-dvb-headers/linuxtv-dvb-headers-5.8.ebuild b/virtual/linuxtv-dvb-headers/linuxtv-dvb-headers-5.8.ebuild
index 76f29a92b096..5bc94cbcc4fd 100644
--- a/virtual/linuxtv-dvb-headers/linuxtv-dvb-headers-5.8.ebuild
+++ b/virtual/linuxtv-dvb-headers/linuxtv-dvb-headers-5.8.ebuild
@@ -5,6 +5,6 @@ EAPI=5
DESCRIPTION="Virtual Package installing the Header files for DVB"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND=">=sys-kernel/linux-headers-3.7"
diff --git a/virtual/logger/logger-0-r1.ebuild b/virtual/logger/logger-0-r1.ebuild
index 30cd27af2e3d..845ae4b8917d 100644
--- a/virtual/logger/logger-0-r1.ebuild
+++ b/virtual/logger/logger-0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for system loggers"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="|| (
app-admin/metalog
diff --git a/virtual/mailx/mailx-3.ebuild b/virtual/mailx/mailx-3.ebuild
index 9d78949e9569..1e3f0da43b6a 100644
--- a/virtual/mailx/mailx-3.ebuild
+++ b/virtual/mailx/mailx-3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for mail implementations"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
RDEPEND="|| ( net-mail/mailutils
mail-client/mailx
diff --git a/virtual/man/man-0-r3.ebuild b/virtual/man/man-0-r3.ebuild
index 170265ee0c87..95b3e7b1548e 100644
--- a/virtual/man/man-0-r3.ebuild
+++ b/virtual/man/man-0-r3.ebuild
@@ -5,6 +5,6 @@ EAPI=7
DESCRIPTION="Virtual for man"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="sys-apps/man-db"
diff --git a/virtual/mda/mda-0.ebuild b/virtual/mda/mda-0.ebuild
index 20c25a2a3df3..324702c867fc 100644
--- a/virtual/mda/mda-0.ebuild
+++ b/virtual/mda/mda-0.ebuild
@@ -5,7 +5,7 @@ EAPI=5
DESCRIPTION="Virtual for Message Delivery Agents"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
# mail-mta/citadel is from sunrise
RDEPEND="|| ( mail-filter/procmail
diff --git a/virtual/mta/mta-1-r2.ebuild b/virtual/mta/mta-1-r2.ebuild
index ae96b255e5d1..c59d134f43b9 100644
--- a/virtual/mta/mta-1-r2.ebuild
+++ b/virtual/mta/mta-1-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for Message Transfer Agents"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# mail-mta/citadel is from sunrise
RDEPEND="|| ( mail-mta/nullmailer
diff --git a/virtual/mysql/mysql-5.6-r13.ebuild b/virtual/mysql/mysql-5.6-r13.ebuild
index 5f49130fc390..88a384980563 100644
--- a/virtual/mysql/mysql-5.6-r13.ebuild
+++ b/virtual/mysql/mysql-5.6-r13.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
DESCRIPTION="Virtual for MySQL database server"
SLOT="0/18"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~x64-solaris ~x86-solaris"
IUSE="embedded +server static"
RDEPEND="|| (
diff --git a/virtual/opengl/opengl-7.0-r2.ebuild b/virtual/opengl/opengl-7.0-r2.ebuild
index 79a968e0ef78..6db5165c07e6 100644
--- a/virtual/opengl/opengl-7.0-r2.ebuild
+++ b/virtual/opengl/opengl-7.0-r2.ebuild
@@ -7,7 +7,7 @@ inherit multilib-build
DESCRIPTION="Virtual for OpenGL implementation"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| (
diff --git a/virtual/os-headers/os-headers-0-r2.ebuild b/virtual/os-headers/os-headers-0-r2.ebuild
index eda4672c73d9..f13ba726a1c5 100644
--- a/virtual/os-headers/os-headers-0-r2.ebuild
+++ b/virtual/os-headers/os-headers-0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for operating system headers"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# depend on SLOT 0 of linux-headers, because kernel-2.eclass
# sets a different SLOT for cross-building
diff --git a/virtual/package-manager/package-manager-1.ebuild b/virtual/package-manager/package-manager-1.ebuild
index 1513f0532a81..c5d4122621c0 100644
--- a/virtual/package-manager/package-manager-1.ebuild
+++ b/virtual/package-manager/package-manager-1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for the package manager"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| (
diff --git a/virtual/pager/pager-0.ebuild b/virtual/pager/pager-0.ebuild
index 70a7826189e2..2f0f8be3657c 100644
--- a/virtual/pager/pager-0.ebuild
+++ b/virtual/pager/pager-0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for command-line pagers"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="|| ( sys-apps/less
sys-apps/most
diff --git a/virtual/perl-Archive-Tar/perl-Archive-Tar-2.320.0.ebuild b/virtual/perl-Archive-Tar/perl-Archive-Tar-2.320.0.ebuild
index 7b574d4deee6..a3fbf30ef753 100644
--- a/virtual/perl-Archive-Tar/perl-Archive-Tar-2.320.0.ebuild
+++ b/virtual/perl-Archive-Tar/perl-Archive-Tar-2.320.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Attribute-Handlers/perl-Attribute-Handlers-1.10.0-r3.ebuild b/virtual/perl-Attribute-Handlers/perl-Attribute-Handlers-1.10.0-r3.ebuild
index ec20f56d2069..ffa75f024ab8 100644
--- a/virtual/perl-Attribute-Handlers/perl-Attribute-Handlers-1.10.0-r3.ebuild
+++ b/virtual/perl-Attribute-Handlers/perl-Attribute-Handlers-1.10.0-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-AutoLoader/perl-AutoLoader-5.740.0-r9.ebuild b/virtual/perl-AutoLoader/perl-AutoLoader-5.740.0-r9.ebuild
index ec20f56d2069..ffa75f024ab8 100644
--- a/virtual/perl-AutoLoader/perl-AutoLoader-5.740.0-r9.ebuild
+++ b/virtual/perl-AutoLoader/perl-AutoLoader-5.740.0-r9.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.140.0-r6.ebuild b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.140.0-r6.ebuild
index ec20f56d2069..ffa75f024ab8 100644
--- a/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.140.0-r6.ebuild
+++ b/virtual/perl-CPAN-Meta-Requirements/perl-CPAN-Meta-Requirements-2.140.0-r6.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.18.0-r6.ebuild b/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.18.0-r6.ebuild
index ec20f56d2069..ffa75f024ab8 100644
--- a/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.18.0-r6.ebuild
+++ b/virtual/perl-CPAN-Meta-YAML/perl-CPAN-Meta-YAML-0.18.0-r6.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.10-r4.ebuild b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.10-r4.ebuild
index 8c740d920459..cc7b7674c77f 100644
--- a/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.10-r4.ebuild
+++ b/virtual/perl-CPAN-Meta/perl-CPAN-Meta-2.150.10-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-CPAN/perl-CPAN-2.220.0.ebuild b/virtual/perl-CPAN/perl-CPAN-2.220.0.ebuild
index 7b574d4deee6..a3fbf30ef753 100644
--- a/virtual/perl-CPAN/perl-CPAN-2.220.0.ebuild
+++ b/virtual/perl-CPAN/perl-CPAN-2.220.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Carp/perl-Carp-1.500.0-r3.ebuild b/virtual/perl-Carp/perl-Carp-1.500.0-r3.ebuild
index ec20f56d2069..ffa75f024ab8 100644
--- a/virtual/perl-Carp/perl-Carp-1.500.0-r3.ebuild
+++ b/virtual/perl-Carp/perl-Carp-1.500.0-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.89.0-r1.ebuild b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.89.0-r1.ebuild
index 63a9a1db72ff..bafed6dba1f3 100644
--- a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.89.0-r1.ebuild
+++ b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.89.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30.2* =dev-lang/perl-5.30.3* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.84.0.ebuild b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.84.0.ebuild
index 7b574d4deee6..a3fbf30ef753 100644
--- a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.84.0.ebuild
+++ b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.84.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-DB_File/perl-DB_File-1.843.0.ebuild b/virtual/perl-DB_File/perl-DB_File-1.843.0.ebuild
index e69d1a3e2315..3e38a90499c6 100644
--- a/virtual/perl-DB_File/perl-DB_File-1.843.0.ebuild
+++ b/virtual/perl-DB_File/perl-DB_File-1.843.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30*[berkdb] ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.0-r2.ebuild b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.0-r2.ebuild
index cb099b7c0c79..f00794387935 100644
--- a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.0-r2.ebuild
+++ b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.174.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32.0* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.520.0.ebuild b/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.520.0.ebuild
index 7b574d4deee6..a3fbf30ef753 100644
--- a/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.520.0.ebuild
+++ b/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.520.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Digest-MD5/perl-Digest-MD5-2.550.0-r2.ebuild b/virtual/perl-Digest-MD5/perl-Digest-MD5-2.550.0-r2.ebuild
index 7b574d4deee6..a3fbf30ef753 100644
--- a/virtual/perl-Digest-MD5/perl-Digest-MD5-2.550.0-r2.ebuild
+++ b/virtual/perl-Digest-MD5/perl-Digest-MD5-2.550.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Digest-SHA/perl-Digest-SHA-6.20.0-r1.ebuild b/virtual/perl-Digest-SHA/perl-Digest-SHA-6.20.0-r1.ebuild
index ec20f56d2069..ffa75f024ab8 100644
--- a/virtual/perl-Digest-SHA/perl-Digest-SHA-6.20.0-r1.ebuild
+++ b/virtual/perl-Digest-SHA/perl-Digest-SHA-6.20.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Digest/perl-Digest-1.170.100_rc-r10.ebuild b/virtual/perl-Digest/perl-Digest-1.170.100_rc-r10.ebuild
index ec20f56d2069..ffa75f024ab8 100644
--- a/virtual/perl-Digest/perl-Digest-1.170.100_rc-r10.ebuild
+++ b/virtual/perl-Digest/perl-Digest-1.170.100_rc-r10.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Dumpvalue/perl-Dumpvalue-1.180.0-r5.ebuild b/virtual/perl-Dumpvalue/perl-Dumpvalue-1.180.0-r5.ebuild
index 9f87d5e62962..7373641fdebb 100644
--- a/virtual/perl-Dumpvalue/perl-Dumpvalue-1.180.0-r5.ebuild
+++ b/virtual/perl-Dumpvalue/perl-Dumpvalue-1.180.0-r5.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Encode/perl-Encode-3.10.0.ebuild b/virtual/perl-Encode/perl-Encode-3.10.0.ebuild
index 7b574d4deee6..a3fbf30ef753 100644
--- a/virtual/perl-Encode/perl-Encode-3.10.0.ebuild
+++ b/virtual/perl-Encode/perl-Encode-3.10.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Exporter/perl-Exporter-5.730.0-r2.ebuild b/virtual/perl-Exporter/perl-Exporter-5.730.0-r2.ebuild
index 7b574d4deee6..a3fbf30ef753 100644
--- a/virtual/perl-Exporter/perl-Exporter-5.730.0-r2.ebuild
+++ b/virtual/perl-Exporter/perl-Exporter-5.730.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.231.ebuild b/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.231.ebuild
index 7b574d4deee6..a3fbf30ef753 100644
--- a/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.231.ebuild
+++ b/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.231.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.250.0-r3.ebuild b/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.250.0-r3.ebuild
index ec20f56d2069..ffa75f024ab8 100644
--- a/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.250.0-r3.ebuild
+++ b/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.250.0-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-2.140.0-r3.ebuild b/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-2.140.0-r3.ebuild
index a324dec3d8a4..c129138f247d 100644
--- a/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-2.140.0-r3.ebuild
+++ b/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-2.140.0-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ExtUtils-Install"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.340.0-r2.ebuild b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.340.0-r2.ebuild
index 7b574d4deee6..a3fbf30ef753 100644
--- a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.340.0-r2.ebuild
+++ b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.340.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.720.0-r1.ebuild b/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.720.0-r1.ebuild
index 98c1f70aaa20..4437c13809e1 100644
--- a/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.720.0-r1.ebuild
+++ b/virtual/perl-ExtUtils-Manifest/perl-ExtUtils-Manifest-1.720.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.400.0-r1.ebuild b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.400.0-r1.ebuild
index 98c1f70aaa20..4437c13809e1 100644
--- a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.400.0-r1.ebuild
+++ b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.400.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-File-Path/perl-File-Path-2.160.0-r1.ebuild b/virtual/perl-File-Path/perl-File-Path-2.160.0-r1.ebuild
index 98c1f70aaa20..4437c13809e1 100644
--- a/virtual/perl-File-Path/perl-File-Path-2.160.0-r1.ebuild
+++ b/virtual/perl-File-Path/perl-File-Path-2.160.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-File-Spec/perl-File-Spec-3.780.0-r1.ebuild b/virtual/perl-File-Spec/perl-File-Spec-3.780.0-r1.ebuild
index 98c1f70aaa20..4437c13809e1 100644
--- a/virtual/perl-File-Spec/perl-File-Spec-3.780.0-r1.ebuild
+++ b/virtual/perl-File-Spec/perl-File-Spec-3.780.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-File-Temp/perl-File-Temp-0.230.900.ebuild b/virtual/perl-File-Temp/perl-File-Temp-0.230.900.ebuild
index 65cc71261e53..bab6aff56c6e 100644
--- a/virtual/perl-File-Temp/perl-File-Temp-0.230.900.ebuild
+++ b/virtual/perl-File-Temp/perl-File-Temp-0.230.900.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
~perl-core/${PN#perl-}-${PV}
diff --git a/virtual/perl-Filter-Simple/perl-Filter-Simple-0.950.0-r2.ebuild b/virtual/perl-Filter-Simple/perl-Filter-Simple-0.950.0-r2.ebuild
index 1600bcf58177..bf1d95963245 100644
--- a/virtual/perl-Filter-Simple/perl-Filter-Simple-0.950.0-r2.ebuild
+++ b/virtual/perl-Filter-Simple/perl-Filter-Simple-0.950.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for perl-core/Filter-Simple"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Getopt-Long/perl-Getopt-Long-2.500.0-r2.ebuild b/virtual/perl-Getopt-Long/perl-Getopt-Long-2.500.0-r2.ebuild
index 7b574d4deee6..a3fbf30ef753 100644
--- a/virtual/perl-Getopt-Long/perl-Getopt-Long-2.500.0-r2.ebuild
+++ b/virtual/perl-Getopt-Long/perl-Getopt-Long-2.500.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.76.0-r1.ebuild b/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.76.0-r1.ebuild
index 75baaaa28512..047230aac7ac 100644
--- a/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.76.0-r1.ebuild
+++ b/virtual/perl-HTTP-Tiny/perl-HTTP-Tiny-0.76.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.430.0-r2.ebuild b/virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.430.0-r2.ebuild
index b247f640c3cb..941ec479b48a 100644
--- a/virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.430.0-r2.ebuild
+++ b/virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.430.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for I18N-LangTags"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/I18N-LangTags-${PV} )
diff --git a/virtual/perl-IO-Compress/perl-IO-Compress-2.84.0.ebuild b/virtual/perl-IO-Compress/perl-IO-Compress-2.84.0.ebuild
index 82ac29389177..7d8e852bedbc 100644
--- a/virtual/perl-IO-Compress/perl-IO-Compress-2.84.0.ebuild
+++ b/virtual/perl-IO-Compress/perl-IO-Compress-2.84.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.390.0-r3.ebuild b/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.390.0-r3.ebuild
index 98c1f70aaa20..4437c13809e1 100644
--- a/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.390.0-r3.ebuild
+++ b/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.390.0-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-IO-Zlib/perl-IO-Zlib-1.100.0-r14.ebuild b/virtual/perl-IO-Zlib/perl-IO-Zlib-1.100.0-r14.ebuild
index 98c1f70aaa20..4437c13809e1 100644
--- a/virtual/perl-IO-Zlib/perl-IO-Zlib-1.100.0-r14.ebuild
+++ b/virtual/perl-IO-Zlib/perl-IO-Zlib-1.100.0-r14.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-IO/perl-IO-1.400.0.ebuild b/virtual/perl-IO/perl-IO-1.400.0.ebuild
index 7b574d4deee6..a3fbf30ef753 100644
--- a/virtual/perl-IO/perl-IO-1.400.0.ebuild
+++ b/virtual/perl-IO/perl-IO-1.400.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-IPC-Cmd/perl-IPC-Cmd-1.20.0.ebuild b/virtual/perl-IPC-Cmd/perl-IPC-Cmd-1.20.0.ebuild
index 7b574d4deee6..a3fbf30ef753 100644
--- a/virtual/perl-IPC-Cmd/perl-IPC-Cmd-1.20.0.ebuild
+++ b/virtual/perl-IPC-Cmd/perl-IPC-Cmd-1.20.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-JSON-PP/perl-JSON-PP-4.20.0.ebuild b/virtual/perl-JSON-PP/perl-JSON-PP-4.20.0.ebuild
index 7b574d4deee6..a3fbf30ef753 100644
--- a/virtual/perl-JSON-PP/perl-JSON-PP-4.20.0.ebuild
+++ b/virtual/perl-JSON-PP/perl-JSON-PP-4.20.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Locale-Maketext-Simple/perl-Locale-Maketext-Simple-0.210.100_rc-r10.ebuild b/virtual/perl-Locale-Maketext-Simple/perl-Locale-Maketext-Simple-0.210.100_rc-r10.ebuild
index 98c1f70aaa20..4437c13809e1 100644
--- a/virtual/perl-Locale-Maketext-Simple/perl-Locale-Maketext-Simple-0.210.100_rc-r10.ebuild
+++ b/virtual/perl-Locale-Maketext-Simple/perl-Locale-Maketext-Simple-0.210.100_rc-r10.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.290.0-r3.ebuild b/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.290.0-r3.ebuild
index 43c0a9017a7b..1246548fcb31 100644
--- a/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.290.0-r3.ebuild
+++ b/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.290.0-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-MIME-Base64/perl-MIME-Base64-3.150.0-r7.ebuild b/virtual/perl-MIME-Base64/perl-MIME-Base64-3.150.0-r7.ebuild
index 98c1f70aaa20..4437c13809e1 100644
--- a/virtual/perl-MIME-Base64/perl-MIME-Base64-3.150.0-r7.ebuild
+++ b/virtual/perl-MIME-Base64/perl-MIME-Base64-3.150.0-r7.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.500.800.ebuild b/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.500.800.ebuild
index 7b574d4deee6..a3fbf30ef753 100644
--- a/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.500.800.ebuild
+++ b/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.500.800.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.816.ebuild b/virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.816.ebuild
index 7b574d4deee6..a3fbf30ef753 100644
--- a/virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.816.ebuild
+++ b/virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.816.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Math-BigRat/perl-Math-BigRat-0.261.400-r1.ebuild b/virtual/perl-Math-BigRat/perl-Math-BigRat-0.261.400-r1.ebuild
index ec20f56d2069..ffa75f024ab8 100644
--- a/virtual/perl-Math-BigRat/perl-Math-BigRat-0.261.400-r1.ebuild
+++ b/virtual/perl-Math-BigRat/perl-Math-BigRat-0.261.400-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Math-Complex/perl-Math-Complex-1.590.100-r4.ebuild b/virtual/perl-Math-Complex/perl-Math-Complex-1.590.100-r4.ebuild
index 28e4006bce38..5c0ca2ca0adf 100644
--- a/virtual/perl-Math-Complex/perl-Math-Complex-1.590.100-r4.ebuild
+++ b/virtual/perl-Math-Complex/perl-Math-Complex-1.590.100-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Memoize/perl-Memoize-1.30.100_rc-r10.ebuild b/virtual/perl-Memoize/perl-Memoize-1.30.100_rc-r10.ebuild
index ec20f56d2069..ffa75f024ab8 100644
--- a/virtual/perl-Memoize/perl-Memoize-1.30.100_rc-r10.ebuild
+++ b/virtual/perl-Memoize/perl-Memoize-1.30.100_rc-r10.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.6.13.0_rc.ebuild b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.6.13.0_rc.ebuild
index 48a969e400d3..7699d239337d 100644
--- a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.6.13.0_rc.ebuild
+++ b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.6.13.0_rc.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Check https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/virtual/perl-Module-CoreList
# When bumping this package.
diff --git a/virtual/perl-Module-Load-Conditional/perl-Module-Load-Conditional-0.680.0-r3.ebuild b/virtual/perl-Module-Load-Conditional/perl-Module-Load-Conditional-0.680.0-r3.ebuild
index 7b574d4deee6..a3fbf30ef753 100644
--- a/virtual/perl-Module-Load-Conditional/perl-Module-Load-Conditional-0.680.0-r3.ebuild
+++ b/virtual/perl-Module-Load-Conditional/perl-Module-Load-Conditional-0.680.0-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Module-Load/perl-Module-Load-0.340.0-r1.ebuild b/virtual/perl-Module-Load/perl-Module-Load-0.340.0-r1.ebuild
index 98c1f70aaa20..4437c13809e1 100644
--- a/virtual/perl-Module-Load/perl-Module-Load-0.340.0-r1.ebuild
+++ b/virtual/perl-Module-Load/perl-Module-Load-0.340.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Module-Loaded/perl-Module-Loaded-0.80.0-r13.ebuild b/virtual/perl-Module-Loaded/perl-Module-Loaded-0.80.0-r13.ebuild
index cb7b2b9d8759..fa00dcd54d63 100644
--- a/virtual/perl-Module-Loaded/perl-Module-Loaded-0.80.0-r13.ebuild
+++ b/virtual/perl-Module-Loaded/perl-Module-Loaded-0.80.0-r13.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.36.ebuild b/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.36.ebuild
index 7b574d4deee6..a3fbf30ef753 100644
--- a/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.36.ebuild
+++ b/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.36.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Net-Ping/perl-Net-Ping-2.710.0.ebuild b/virtual/perl-Net-Ping/perl-Net-Ping-2.710.0.ebuild
index cf43785eb919..6452c1b5f892 100644
--- a/virtual/perl-Net-Ping/perl-Net-Ping-2.710.0.ebuild
+++ b/virtual/perl-Net-Ping/perl-Net-Ping-2.710.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Params-Check/perl-Params-Check-0.380.0-r10.ebuild b/virtual/perl-Params-Check/perl-Params-Check-0.380.0-r10.ebuild
index 98c1f70aaa20..4437c13809e1 100644
--- a/virtual/perl-Params-Check/perl-Params-Check-0.380.0-r10.ebuild
+++ b/virtual/perl-Params-Check/perl-Params-Check-0.380.0-r10.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-2.150.10-r4.ebuild b/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-2.150.10-r4.ebuild
index 98c1f70aaa20..4437c13809e1 100644
--- a/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-2.150.10-r4.ebuild
+++ b/virtual/perl-Parse-CPAN-Meta/perl-Parse-CPAN-Meta-2.150.10-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Perl-OSType/perl-Perl-OSType-1.10.0-r4.ebuild b/virtual/perl-Perl-OSType/perl-Perl-OSType-1.10.0-r4.ebuild
index 98c1f70aaa20..4437c13809e1 100644
--- a/virtual/perl-Perl-OSType/perl-Perl-OSType-1.10.0-r4.ebuild
+++ b/virtual/perl-Perl-OSType/perl-Perl-OSType-1.10.0-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Pod-Escapes/perl-Pod-Escapes-1.70.0-r7.ebuild b/virtual/perl-Pod-Escapes/perl-Pod-Escapes-1.70.0-r7.ebuild
index 95282a07afe6..b8e2cdcf5a50 100644
--- a/virtual/perl-Pod-Escapes/perl-Pod-Escapes-1.70.0-r7.ebuild
+++ b/virtual/perl-Pod-Escapes/perl-Pod-Escapes-1.70.0-r7.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Pod-Parser/perl-Pod-Parser-1.630.0-r8.ebuild b/virtual/perl-Pod-Parser/perl-Pod-Parser-1.630.0-r8.ebuild
index 4a54735a5d97..084f185d12d5 100644
--- a/virtual/perl-Pod-Parser/perl-Pod-Parser-1.630.0-r8.ebuild
+++ b/virtual/perl-Pod-Parser/perl-Pod-Parser-1.630.0-r8.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( ~dev-perl/Pod-Parser-1.630.0 =dev-lang/perl-5.30* )
diff --git a/virtual/perl-Pod-Simple/perl-Pod-Simple-3.350.0-r3.ebuild b/virtual/perl-Pod-Simple/perl-Pod-Simple-3.350.0-r3.ebuild
index 7b574d4deee6..a3fbf30ef753 100644
--- a/virtual/perl-Pod-Simple/perl-Pod-Simple-3.350.0-r3.ebuild
+++ b/virtual/perl-Pod-Simple/perl-Pod-Simple-3.350.0-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Safe/perl-Safe-2.400.0-r3.ebuild b/virtual/perl-Safe/perl-Safe-2.400.0-r3.ebuild
index 7b574d4deee6..a3fbf30ef753 100644
--- a/virtual/perl-Safe/perl-Safe-2.400.0-r3.ebuild
+++ b/virtual/perl-Safe/perl-Safe-2.400.0-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.500.0-r2.ebuild b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.500.0-r2.ebuild
index ade2ff3221c3..3c5e6f5627ad 100644
--- a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.500.0-r2.ebuild
+++ b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.500.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for Scalar::Util and List::Util, also distributed as Scalar::List::Utils"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Socket/perl-Socket-2.27.0-r2.ebuild b/virtual/perl-Socket/perl-Socket-2.27.0-r2.ebuild
index 7b574d4deee6..a3fbf30ef753 100644
--- a/virtual/perl-Socket/perl-Socket-2.27.0-r2.ebuild
+++ b/virtual/perl-Socket/perl-Socket-2.27.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Storable/perl-Storable-3.150.0.ebuild b/virtual/perl-Storable/perl-Storable-3.150.0.ebuild
index 7b574d4deee6..a3fbf30ef753 100644
--- a/virtual/perl-Storable/perl-Storable-3.150.0.ebuild
+++ b/virtual/perl-Storable/perl-Storable-3.150.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Sys-Syslog/perl-Sys-Syslog-0.350.0-r3.ebuild b/virtual/perl-Sys-Syslog/perl-Sys-Syslog-0.350.0-r3.ebuild
index 7b574d4deee6..a3fbf30ef753 100644
--- a/virtual/perl-Sys-Syslog/perl-Sys-Syslog-0.350.0-r3.ebuild
+++ b/virtual/perl-Sys-Syslog/perl-Sys-Syslog-0.350.0-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Term-ANSIColor/perl-Term-ANSIColor-4.60.0-r3.ebuild b/virtual/perl-Term-ANSIColor/perl-Term-ANSIColor-4.60.0-r3.ebuild
index 7b574d4deee6..a3fbf30ef753 100644
--- a/virtual/perl-Term-ANSIColor/perl-Term-ANSIColor-4.60.0-r3.ebuild
+++ b/virtual/perl-Term-ANSIColor/perl-Term-ANSIColor-4.60.0-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Term-ReadLine/perl-Term-ReadLine-1.170.0-r4.ebuild b/virtual/perl-Term-ReadLine/perl-Term-ReadLine-1.170.0-r4.ebuild
index 98c1f70aaa20..4437c13809e1 100644
--- a/virtual/perl-Term-ReadLine/perl-Term-ReadLine-1.170.0-r4.ebuild
+++ b/virtual/perl-Term-ReadLine/perl-Term-ReadLine-1.170.0-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Test-Harness/perl-Test-Harness-3.420.0-r3.ebuild b/virtual/perl-Test-Harness/perl-Test-Harness-3.420.0-r3.ebuild
index 98c1f70aaa20..4437c13809e1 100644
--- a/virtual/perl-Test-Harness/perl-Test-Harness-3.420.0-r3.ebuild
+++ b/virtual/perl-Test-Harness/perl-Test-Harness-3.420.0-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Test-Simple/perl-Test-Simple-1.302.162.ebuild b/virtual/perl-Test-Simple/perl-Test-Simple-1.302.162.ebuild
index 4e10491d2c78..4a8a90199ac2 100644
--- a/virtual/perl-Test-Simple/perl-Test-Simple-1.302.162.ebuild
+++ b/virtual/perl-Test-Simple/perl-Test-Simple-1.302.162.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Test/perl-Test-1.310.0-r3.ebuild b/virtual/perl-Test/perl-Test-1.310.0-r3.ebuild
index 98c1f70aaa20..4437c13809e1 100644
--- a/virtual/perl-Test/perl-Test-1.310.0-r3.ebuild
+++ b/virtual/perl-Test/perl-Test-1.310.0-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Text-Balanced/perl-Text-Balanced-2.30.0-r7.ebuild b/virtual/perl-Text-Balanced/perl-Text-Balanced-2.30.0-r7.ebuild
index 98c1f70aaa20..4437c13809e1 100644
--- a/virtual/perl-Text-Balanced/perl-Text-Balanced-2.30.0-r7.ebuild
+++ b/virtual/perl-Text-Balanced/perl-Text-Balanced-2.30.0-r7.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Text-ParseWords/perl-Text-ParseWords-3.300.0-r7.ebuild b/virtual/perl-Text-ParseWords/perl-Text-ParseWords-3.300.0-r7.ebuild
index 98c1f70aaa20..4437c13809e1 100644
--- a/virtual/perl-Text-ParseWords/perl-Text-ParseWords-3.300.0-r7.ebuild
+++ b/virtual/perl-Text-ParseWords/perl-Text-ParseWords-3.300.0-r7.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Text-Tabs+Wrap/perl-Text-Tabs+Wrap-2013.52.300-r10.ebuild b/virtual/perl-Text-Tabs+Wrap/perl-Text-Tabs+Wrap-2013.52.300-r10.ebuild
index 56b67bc27b51..fce270e11fbf 100644
--- a/virtual/perl-Text-Tabs+Wrap/perl-Text-Tabs+Wrap-2013.52.300-r10.ebuild
+++ b/virtual/perl-Text-Tabs+Wrap/perl-Text-Tabs+Wrap-2013.52.300-r10.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for Text::Tabs and Text::Wrap, also distributed as Text::Tabs+Wrap"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Thread-Queue/perl-Thread-Queue-3.130.0.ebuild b/virtual/perl-Thread-Queue/perl-Thread-Queue-3.130.0.ebuild
index 7b574d4deee6..a3fbf30ef753 100644
--- a/virtual/perl-Thread-Queue/perl-Thread-Queue-3.130.0.ebuild
+++ b/virtual/perl-Thread-Queue/perl-Thread-Queue-3.130.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.130.0-r4.ebuild b/virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.130.0-r4.ebuild
index 2ad35f4a991a..41f0c910d571 100644
--- a/virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.130.0-r4.ebuild
+++ b/virtual/perl-Thread-Semaphore/perl-Thread-Semaphore-2.130.0-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Tie-RefHash/perl-Tie-RefHash-1.390.0-r12.ebuild b/virtual/perl-Tie-RefHash/perl-Tie-RefHash-1.390.0-r12.ebuild
index 98c1f70aaa20..4437c13809e1 100644
--- a/virtual/perl-Tie-RefHash/perl-Tie-RefHash-1.390.0-r12.ebuild
+++ b/virtual/perl-Tie-RefHash/perl-Tie-RefHash-1.390.0-r12.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Time-HiRes/perl-Time-HiRes-1.976.0.ebuild b/virtual/perl-Time-HiRes/perl-Time-HiRes-1.976.0.ebuild
index 7b574d4deee6..a3fbf30ef753 100644
--- a/virtual/perl-Time-HiRes/perl-Time-HiRes-1.976.0.ebuild
+++ b/virtual/perl-Time-HiRes/perl-Time-HiRes-1.976.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Time-Local/perl-Time-Local-1.280.0-r1.ebuild b/virtual/perl-Time-Local/perl-Time-Local-1.280.0-r1.ebuild
index 98c1f70aaa20..4437c13809e1 100644
--- a/virtual/perl-Time-Local/perl-Time-Local-1.280.0-r1.ebuild
+++ b/virtual/perl-Time-Local/perl-Time-Local-1.280.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Time-Piece/perl-Time-Piece-1.330.0.ebuild b/virtual/perl-Time-Piece/perl-Time-Piece-1.330.0.ebuild
index 7b574d4deee6..a3fbf30ef753 100644
--- a/virtual/perl-Time-Piece/perl-Time-Piece-1.330.0.ebuild
+++ b/virtual/perl-Time-Piece/perl-Time-Piece-1.330.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.270.0-r1.ebuild b/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.270.0-r1.ebuild
index 98c1f70aaa20..4437c13809e1 100644
--- a/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.270.0-r1.ebuild
+++ b/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.270.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.260.0-r2.ebuild b/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.260.0-r2.ebuild
index e7532b8c8020..0db0af2c959c 100644
--- a/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.260.0-r2.ebuild
+++ b/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.260.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-XSLoader/perl-XSLoader-0.300.0-r3.ebuild b/virtual/perl-XSLoader/perl-XSLoader-0.300.0-r3.ebuild
index 98c1f70aaa20..4437c13809e1 100644
--- a/virtual/perl-XSLoader/perl-XSLoader-0.300.0-r3.ebuild
+++ b/virtual/perl-XSLoader/perl-XSLoader-0.300.0-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-autodie/perl-autodie-2.290.0-r5.ebuild b/virtual/perl-autodie/perl-autodie-2.290.0-r5.ebuild
index e7532b8c8020..0db0af2c959c 100644
--- a/virtual/perl-autodie/perl-autodie-2.290.0-r5.ebuild
+++ b/virtual/perl-autodie/perl-autodie-2.290.0-r5.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-bignum/perl-bignum-0.510.0-r1.ebuild b/virtual/perl-bignum/perl-bignum-0.510.0-r1.ebuild
index ec20f56d2069..ffa75f024ab8 100644
--- a/virtual/perl-bignum/perl-bignum-0.510.0-r1.ebuild
+++ b/virtual/perl-bignum/perl-bignum-0.510.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-if/perl-if-0.60.800-r3.ebuild b/virtual/perl-if/perl-if-0.60.800-r3.ebuild
index 98c1f70aaa20..4437c13809e1 100644
--- a/virtual/perl-if/perl-if-0.60.800-r3.ebuild
+++ b/virtual/perl-if/perl-if-0.60.800-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-libnet/perl-libnet-3.110.0-r3.ebuild b/virtual/perl-libnet/perl-libnet-3.110.0-r3.ebuild
index 98c1f70aaa20..4437c13809e1 100644
--- a/virtual/perl-libnet/perl-libnet-3.110.0-r3.ebuild
+++ b/virtual/perl-libnet/perl-libnet-3.110.0-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-parent/perl-parent-0.237.0.ebuild b/virtual/perl-parent/perl-parent-0.237.0.ebuild
index 7b574d4deee6..a3fbf30ef753 100644
--- a/virtual/perl-parent/perl-parent-0.237.0.ebuild
+++ b/virtual/perl-parent/perl-parent-0.237.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-podlators/perl-podlators-4.110.0.ebuild b/virtual/perl-podlators/perl-podlators-4.110.0.ebuild
index 7b574d4deee6..a3fbf30ef753 100644
--- a/virtual/perl-podlators/perl-podlators-4.110.0.ebuild
+++ b/virtual/perl-podlators/perl-podlators-4.110.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-threads-shared/perl-threads-shared-1.600.0.ebuild b/virtual/perl-threads-shared/perl-threads-shared-1.600.0.ebuild
index 7b574d4deee6..a3fbf30ef753 100644
--- a/virtual/perl-threads-shared/perl-threads-shared-1.600.0.ebuild
+++ b/virtual/perl-threads-shared/perl-threads-shared-1.600.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-threads/perl-threads-2.220.0-r2.ebuild b/virtual/perl-threads/perl-threads-2.220.0-r2.ebuild
index 6a588a9ca3b5..f9501c1835d0 100644
--- a/virtual/perl-threads/perl-threads-2.220.0-r2.ebuild
+++ b/virtual/perl-threads/perl-threads-2.220.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.30*[ithreads] ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-version/perl-version-0.992.400-r1.ebuild b/virtual/perl-version/perl-version-0.992.400-r1.ebuild
index 98c1f70aaa20..4437c13809e1 100644
--- a/virtual/perl-version/perl-version-0.992.400-r1.ebuild
+++ b/virtual/perl-version/perl-version-0.992.400-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for ${PN#perl-}"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| ( =dev-lang/perl-5.32* =dev-lang/perl-5.30* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/pkgconfig/pkgconfig-2.ebuild b/virtual/pkgconfig/pkgconfig-2.ebuild
index 8f2feeed5127..1eca8044c4c2 100644
--- a/virtual/pkgconfig/pkgconfig-2.ebuild
+++ b/virtual/pkgconfig/pkgconfig-2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for the pkg-config implementation"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| (
diff --git a/virtual/python-cffi/python-cffi-1.ebuild b/virtual/python-cffi/python-cffi-1.ebuild
index 728422a20971..a0c5152fd180 100644
--- a/virtual/python-cffi/python-cffi-1.ebuild
+++ b/virtual/python-cffi/python-cffi-1.ebuild
@@ -9,7 +9,7 @@ inherit python-r1
DESCRIPTION="A virtual for the Python cffi package"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# built-in in PyPy and PyPy3
diff --git a/virtual/python-greenlet/python-greenlet-1.0-r2.ebuild b/virtual/python-greenlet/python-greenlet-1.0-r2.ebuild
index ef33e81e0a8b..84228fb56183 100644
--- a/virtual/python-greenlet/python-greenlet-1.0-r2.ebuild
+++ b/virtual/python-greenlet/python-greenlet-1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ inherit python-r1
DESCRIPTION="A virtual for Python greenlet module"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
diff --git a/virtual/qmail/qmail-1.03-r1.ebuild b/virtual/qmail/qmail-1.03-r1.ebuild
index 9ee5e3e09f49..0636f82f6630 100644
--- a/virtual/qmail/qmail-1.03-r1.ebuild
+++ b/virtual/qmail/qmail-1.03-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="Virtual for qmail"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
RDEPEND="|| (
mail-mta/netqmail
diff --git a/virtual/ruby-ssl/ruby-ssl-11.ebuild b/virtual/ruby-ssl/ruby-ssl-11.ebuild
index 5d43772f319b..07dc70675b19 100644
--- a/virtual/ruby-ssl/ruby-ssl-11.ebuild
+++ b/virtual/ruby-ssl/ruby-ssl-11.ebuild
@@ -8,7 +8,7 @@ inherit ruby-ng
DESCRIPTION="Virtual ebuild for the Ruby OpenSSL bindings"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
ruby_targets_ruby25? ( dev-lang/ruby:2.5[ssl] )
diff --git a/virtual/rubygems/rubygems-15.ebuild b/virtual/rubygems/rubygems-15.ebuild
index 2ab6e8b5bc36..802b5dcf588b 100644
--- a/virtual/rubygems/rubygems-15.ebuild
+++ b/virtual/rubygems/rubygems-15.ebuild
@@ -8,7 +8,7 @@ inherit ruby-ng
DESCRIPTION="Virtual ebuild for rubygems"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
ruby_targets_ruby25? ( >=dev-ruby/rubygems-2.7.3[ruby_targets_ruby25] )
diff --git a/virtual/service-manager/service-manager-0.ebuild b/virtual/service-manager/service-manager-0.ebuild
index 5ee03b4a6b7b..7a578009863b 100644
--- a/virtual/service-manager/service-manager-0.ebuild
+++ b/virtual/service-manager/service-manager-0.ebuild
@@ -5,7 +5,7 @@ EAPI=5
DESCRIPTION="Virtual for various service managers"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="kernel_linux prefix"
RDEPEND="
diff --git a/virtual/ssh/ssh-0.ebuild b/virtual/ssh/ssh-0.ebuild
index d94cc9cdfaee..d1ff1e609e76 100644
--- a/virtual/ssh/ssh-0.ebuild
+++ b/virtual/ssh/ssh-0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
DESCRIPTION="Virtual for SSH client and server"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="minimal"
RDEPEND="
diff --git a/virtual/tex-base/tex-base-0.ebuild b/virtual/tex-base/tex-base-0.ebuild
index bf8433b1c997..060ef551941b 100644
--- a/virtual/tex-base/tex-base-0.ebuild
+++ b/virtual/tex-base/tex-base-0.ebuild
@@ -5,7 +5,7 @@ EAPI=5
DESCRIPTION="Virtual for basic TeX binaries (tex, kpathsea)"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
app-text/texlive-core
diff --git a/virtual/texi2dvi/texi2dvi-0-r2.ebuild b/virtual/texi2dvi/texi2dvi-0-r2.ebuild
index 7dcb96d1025c..2381933dbcf6 100644
--- a/virtual/texi2dvi/texi2dvi-0-r2.ebuild
+++ b/virtual/texi2dvi/texi2dvi-0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=5
DESCRIPTION="Virtual for texi2dvi (and texi2pdf)"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="sys-apps/texinfo
virtual/latex-base
diff --git a/virtual/tmpfiles/tmpfiles-0-r1.ebuild b/virtual/tmpfiles/tmpfiles-0-r1.ebuild
index bc7eceee211f..03ef36018950 100644
--- a/virtual/tmpfiles/tmpfiles-0-r1.ebuild
+++ b/virtual/tmpfiles/tmpfiles-0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual to select between different tmpfiles.d handlers"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
|| (
diff --git a/virtual/ttf-fonts/ttf-fonts-1-r1.ebuild b/virtual/ttf-fonts/ttf-fonts-1-r1.ebuild
index 92b40f0536ae..e7d304965f44 100644
--- a/virtual/ttf-fonts/ttf-fonts-1-r1.ebuild
+++ b/virtual/ttf-fonts/ttf-fonts-1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
DESCRIPTION="Virtual for Serif/Sans/Monospace font packages"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
RDEPEND="|| (
media-fonts/liberation-fonts
diff --git a/virtual/udev/udev-217-r2.ebuild b/virtual/udev/udev-217-r2.ebuild
index a4d4a51402b5..4d445b5c3369 100644
--- a/virtual/udev/udev-217-r2.ebuild
+++ b/virtual/udev/udev-217-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="Virtual to select between different udev daemon providers"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND="
|| (
diff --git a/virtual/yacc/yacc-0.ebuild b/virtual/yacc/yacc-0.ebuild
index f543c630c608..d0c70a348964 100644
--- a/virtual/yacc/yacc-0.ebuild
+++ b/virtual/yacc/yacc-0.ebuild
@@ -5,6 +5,6 @@ EAPI=5
DESCRIPTION="virtual for yacc (yet another compiler compiler)"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="|| ( sys-devel/bison dev-util/byacc dev-util/yacc )"
diff --git a/www-client/links/links-2.21.ebuild b/www-client/links/links-2.21.ebuild
index 296aa5e67378..e61c5b57a2ab 100644
--- a/www-client/links/links-2.21.ebuild
+++ b/www-client/links/links-2.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent libressl livecd lzip lzma ssl suid svga tiff unicode X zlib zstd"
GRAPHICS_DEPEND="media-libs/libpng:0="
diff --git a/www-client/lynx/lynx-2.9.0_pre6-r1.ebuild b/www-client/lynx/lynx-2.9.0_pre6-r1.ebuild
index 98b5eadc21e0..ff70679bd2a4 100644
--- a/www-client/lynx/lynx-2.9.0_pre6-r1.ebuild
+++ b/www-client/lynx/lynx-2.9.0_pre6-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://invisible-mirror.net/archives/lynx/tarballs/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 cjk gnutls idn ipv6 nls ssl unicode libressl"
RDEPEND="
diff --git a/www-client/pybugz/pybugz-0.13.ebuild b/www-client/pybugz/pybugz-0.13.ebuild
index ee5cc7b8b743..263a9fda68c9 100644
--- a/www-client/pybugz/pybugz-0.13.ebuild
+++ b/www-client/pybugz/pybugz-0.13.ebuild
@@ -10,7 +10,7 @@ if [ "${PV}" = "9999" ]; then
inherit git-r3
else
SRC_URI="https://github.com/williamh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
fi
inherit bash-completion-r1 distutils-r1
diff --git a/www-servers/tornado/tornado-6.0.4.ebuild b/www-servers/tornado/tornado-6.0.4.ebuild
index a84f9c45e3cd..4e12f2e4081b 100644
--- a/www-servers/tornado/tornado-6.0.4.ebuild
+++ b/www-servers/tornado/tornado-6.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="examples test"
RESTRICT="!test? ( test )"
diff --git a/x11-apps/bdftopcf/bdftopcf-1.1-r1.ebuild b/x11-apps/bdftopcf/bdftopcf-1.1-r1.ebuild
index 888702be4340..98813c66ccca 100644
--- a/x11-apps/bdftopcf/bdftopcf-1.1-r1.ebuild
+++ b/x11-apps/bdftopcf/bdftopcf-1.1-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="X.Org bdftopcf application"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
DEPEND="x11-base/xorg-proto"
RDEPEND=""
diff --git a/x11-apps/iceauth/iceauth-1.0.8-r1.ebuild b/x11-apps/iceauth/iceauth-1.0.8-r1.ebuild
index 73eea2d9a317..725a27ddf3e4 100644
--- a/x11-apps/iceauth/iceauth-1.0.8-r1.ebuild
+++ b/x11-apps/iceauth/iceauth-1.0.8-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="ICE authority file utility"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris ~x86-winnt"
RDEPEND="x11-libs/libICE"
DEPEND="${RDEPEND}
diff --git a/x11-apps/listres/listres-1.0.4.ebuild b/x11-apps/listres/listres-1.0.4.ebuild
index aa1a298af7a4..892b157132fc 100644
--- a/x11-apps/listres/listres-1.0.4.ebuild
+++ b/x11-apps/listres/listres-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
inherit xorg-3
DESCRIPTION="list resources in widgets"
-KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libX11
x11-libs/libXt
diff --git a/x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild b/x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild
index 0c62a985f5d6..2080a1afbec0 100644
--- a/x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild
+++ b/x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="create an index of scalable font files for X"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
COMMON_DEPEND="
diff --git a/x11-apps/oclock/oclock-1.0.4.ebuild b/x11-apps/oclock/oclock-1.0.4.ebuild
index 5a42ee056ade..00d5c6932221 100644
--- a/x11-apps/oclock/oclock-1.0.4.ebuild
+++ b/x11-apps/oclock/oclock-1.0.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="round X clock"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
x11-libs/libX11
diff --git a/x11-apps/rgb/rgb-1.0.6-r1.ebuild b/x11-apps/rgb/rgb-1.0.6-r1.ebuild
index de007ca57a85..d868e0412fa4 100644
--- a/x11-apps/rgb/rgb-1.0.6-r1.ebuild
+++ b/x11-apps/rgb/rgb-1.0.6-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="uncompile an rgb color-name database"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
DEPEND="${RDEPEND}
x11-base/xorg-proto"
BDEPEND="x11-misc/util-macros"
diff --git a/x11-apps/scripts/scripts-1.0.1-r1.ebuild b/x11-apps/scripts/scripts-1.0.1-r1.ebuild
index fabcb457abf6..9b0911defb8e 100644
--- a/x11-apps/scripts/scripts-1.0.1-r1.ebuild
+++ b/x11-apps/scripts/scripts-1.0.1-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="start an X program on a remote machine"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="x11-libs/libX11"
DEPEND="${RDEPEND}"
diff --git a/x11-apps/xauth/xauth-1.1.ebuild b/x11-apps/xauth/xauth-1.1.ebuild
index c4f8be1aced2..d81c5122af45 100644
--- a/x11-apps/xauth/xauth-1.1.ebuild
+++ b/x11-apps/xauth/xauth-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ inherit xorg-3
if [[ ${PV} == 9999* ]]; then
SRC_URI=""
else
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
fi
DESCRIPTION="X authority file utility"
diff --git a/x11-apps/xbiff/xbiff-1.0.4.ebuild b/x11-apps/xbiff/xbiff-1.0.4.ebuild
index 33f769d9cbe6..301758d0f6b0 100644
--- a/x11-apps/xbiff/xbiff-1.0.4.ebuild
+++ b/x11-apps/xbiff/xbiff-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="mailbox flag for X"
-KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xclock/xclock-1.0.9.ebuild b/x11-apps/xclock/xclock-1.0.9.ebuild
index d4a8b4edc2a3..bf6c70530969 100644
--- a/x11-apps/xclock/xclock-1.0.9.ebuild
+++ b/x11-apps/xclock/xclock-1.0.9.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="analog / digital clock for X"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
IUSE=""
RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild b/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild
index a274b1b04b3f..4d8a74d7c394 100644
--- a/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild
+++ b/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="X.Org xdbedizzy application"
-KEYWORDS="amd64 arm ~mips ppc ppc64 s390 ~sparc x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sparc x86"
RDEPEND="
x11-libs/libXext
diff --git a/x11-apps/xeyes/xeyes-1.1.2.ebuild b/x11-apps/xeyes/xeyes-1.1.2.ebuild
index 770341c49443..538de503da5a 100644
--- a/x11-apps/xeyes/xeyes-1.1.2.ebuild
+++ b/x11-apps/xeyes/xeyes-1.1.2.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="X.Org xeyes application"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc64-solaris"
RDEPEND="
x11-libs/libX11
diff --git a/x11-apps/xf86dga/xf86dga-1.0.3-r1.ebuild b/x11-apps/xf86dga/xf86dga-1.0.3-r1.ebuild
index 026024a2e083..62228643dfca 100644
--- a/x11-apps/xf86dga/xf86dga-1.0.3-r1.ebuild
+++ b/x11-apps/xf86dga/xf86dga-1.0.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="Test program for the XFree86-DGA extension"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
RDEPEND="
x11-libs/libX11
diff --git a/x11-apps/xhost/xhost-1.0.8.ebuild b/x11-apps/xhost/xhost-1.0.8.ebuild
index bae4c85eb3ae..6b32368a13b7 100644
--- a/x11-apps/xhost/xhost-1.0.8.ebuild
+++ b/x11-apps/xhost/xhost-1.0.8.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="Controls host and/or user access to a running X server"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="ipv6"
RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xinit/xinit-1.4.1.ebuild b/x11-apps/xinit/xinit-1.4.1.ebuild
index cf9e8a891ece..f347aebee1ec 100644
--- a/x11-apps/xinit/xinit-1.4.1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ inherit xorg-3
DESCRIPTION="X Window System initializer"
LICENSE="${LICENSE} GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm-linux ~x86-linux"
IUSE="twm"
RDEPEND="
diff --git a/x11-apps/xkbcomp/xkbcomp-1.4.4.ebuild b/x11-apps/xkbcomp/xkbcomp-1.4.4.ebuild
index c6266542a1c9..c8bac72168f4 100644
--- a/x11-apps/xkbcomp/xkbcomp-1.4.4.ebuild
+++ b/x11-apps/xkbcomp/xkbcomp-1.4.4.ebuild
@@ -6,7 +6,7 @@ EAPI=7
inherit xorg-3
DESCRIPTION="XKB keyboard description compiler"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE=""
DEPEND="
>=x11-libs/libX11-1.6.9
diff --git a/x11-apps/xlogo/xlogo-1.0.5.ebuild b/x11-apps/xlogo/xlogo-1.0.5.ebuild
index 3f0f962c5e56..e8c3fbcf83ae 100644
--- a/x11-apps/xlogo/xlogo-1.0.5.ebuild
+++ b/x11-apps/xlogo/xlogo-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="X Window System logo"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE=""
RDEPEND="x11-libs/libXrender
diff --git a/x11-apps/xmessage/xmessage-1.0.5-r1.ebuild b/x11-apps/xmessage/xmessage-1.0.5-r1.ebuild
index 4fd4eea96584..7286fc92f98e 100644
--- a/x11-apps/xmessage/xmessage-1.0.5-r1.ebuild
+++ b/x11-apps/xmessage/xmessage-1.0.5-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="display a message or query in a window (X-based /bin/echo)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="x11-libs/libXaw
x11-libs/libXt"
diff --git a/x11-apps/xmore/xmore-1.0.3.ebuild b/x11-apps/xmore/xmore-1.0.3.ebuild
index 8702ffb7618b..45987247f95c 100644
--- a/x11-apps/xmore/xmore-1.0.3.ebuild
+++ b/x11-apps/xmore/xmore-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
inherit xorg-3
DESCRIPTION="plain text display program for the X Window System"
-KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 s390 ~sparc x86"
+KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
IUSE=""
RDEPEND="
diff --git a/x11-apps/xpr/xpr-1.0.5-r1.ebuild b/x11-apps/xpr/xpr-1.0.5-r1.ebuild
index 77fb0e499e38..d94b953c894b 100644
--- a/x11-apps/xpr/xpr-1.0.5-r1.ebuild
+++ b/x11-apps/xpr/xpr-1.0.5-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
inherit xorg-3
DESCRIPTION="X.Org xpr application"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
RDEPEND="
x11-libs/libX11
diff --git a/x11-apps/xprop/xprop-1.2.5.ebuild b/x11-apps/xprop/xprop-1.2.5.ebuild
index 882c7eeae5be..c942b74ed6cd 100644
--- a/x11-apps/xprop/xprop-1.2.5.ebuild
+++ b/x11-apps/xprop/xprop-1.2.5.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="property displayer for X"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
RDEPEND="x11-libs/libX11"
DEPEND="${RDEPEND}
diff --git a/x11-apps/xrdb/xrdb-1.2.0.ebuild b/x11-apps/xrdb/xrdb-1.2.0.ebuild
index da18db9c6098..f6214f3a7709 100644
--- a/x11-apps/xrdb/xrdb-1.2.0.ebuild
+++ b/x11-apps/xrdb/xrdb-1.2.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
inherit xorg-3
DESCRIPTION="X server resource database utility"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="x11-libs/libXmu
diff --git a/x11-apps/xset/xset-1.2.4-r1.ebuild b/x11-apps/xset/xset-1.2.4-r1.ebuild
index a4ea81db5022..9d83f67dcbca 100644
--- a/x11-apps/xset/xset-1.2.4-r1.ebuild
+++ b/x11-apps/xset/xset-1.2.4-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="X.Org xset application"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
x11-libs/libX11
diff --git a/x11-apps/xsm/xsm-1.0.4.ebuild b/x11-apps/xsm/xsm-1.0.4.ebuild
index a29b381dec80..fe9a8866b40d 100644
--- a/x11-apps/xsm/xsm-1.0.4.ebuild
+++ b/x11-apps/xsm/xsm-1.0.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="X Session Manager"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
RDEPEND="x11-libs/libXaw
x11-libs/libX11
diff --git a/x11-apps/xwud/xwud-1.0.5-r1.ebuild b/x11-apps/xwud/xwud-1.0.5-r1.ebuild
index fd8509a23cbc..067ad0c9ceee 100644
--- a/x11-apps/xwud/xwud-1.0.5-r1.ebuild
+++ b/x11-apps/xwud/xwud-1.0.5-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="image displayer for X"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
RDEPEND="x11-libs/libX11"
DEPEND="${RDEPEND}
diff --git a/x11-base/xcb-proto/xcb-proto-1.14.1.ebuild b/x11-base/xcb-proto/xcb-proto-1.14.1.ebuild
index 935942fbc234..e7aaddbcc928 100644
--- a/x11-base/xcb-proto/xcb-proto-1.14.1.ebuild
+++ b/x11-base/xcb-proto/xcb-proto-1.14.1.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="X C-language Bindings protocol headers"
HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/proto/xcbproto"
EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild
index d07b1188f95b..2c489dbcbd66 100644
--- a/x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI=""
LICENSE="metapackage"
SLOT="0"
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
fi
IUSE_INPUT_DEVICES="
diff --git a/x11-base/xorg-proto/xorg-proto-2020.1.ebuild b/x11-base/xorg-proto/xorg-proto-2020.1.ebuild
index 938908c713b4..60b24a0bb11a 100644
--- a/x11-base/xorg-proto/xorg-proto-2020.1.ebuild
+++ b/x11-base/xorg-proto/xorg-proto-2020.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,7 +19,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
if [[ ${PV} = 9999* ]]; then
SRC_URI=""
else
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz"
S="${WORKDIR}/${MY_P}"
fi
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.30.0.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.30.0.ebuild
index ab9e4ddef1aa..d30c811957c7 100644
--- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.30.0.ebuild
+++ b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.30.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,7 +7,7 @@ inherit linux-info xorg-3
DESCRIPTION="X.org input driver based on libinput"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE=""
RDEPEND=">=dev-libs/libinput-1.7.0:0="
diff --git a/x11-drivers/xf86-input-void/xf86-input-void-1.4.1.ebuild b/x11-drivers/xf86-input-void/xf86-input-void-1.4.1.ebuild
index 8a037ad91f84..6727b99d7eba 100644
--- a/x11-drivers/xf86-input-void/xf86-input-void-1.4.1.ebuild
+++ b/x11-drivers/xf86-input-void/xf86-input-void-1.4.1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="null input driver"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="x11-base/xorg-server"
DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.8.ebuild b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.8.ebuild
index 93c6b8a3bb46..ab64adc06bea 100644
--- a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.8.ebuild
+++ b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.8.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="X.Org driver for dummy cards"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="dga"
RDEPEND="x11-base/xorg-server"
diff --git a/x11-libs/cairo/cairo-1.16.0-r4.ebuild b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
index ad47d14ae82a..d5b20a6b4204 100644
--- a/x11-libs/cairo/cairo-1.16.0-r4.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.2.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.2.ebuild
index 0f0e1a0568f4..fcacd794de71 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.2.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
LICENSE="LGPL-2.1+"
SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="gtk-doc +introspection jpeg tiff"
# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
diff --git a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
index b3088a14531d..314ce203961e 100644
--- a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
xinerama? ( !aqua )
"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Upstream wants us to do their job:
# https://bugzilla.gnome.org/show_bug.cgi?id=768663#c1
diff --git a/x11-libs/gtk+/gtk+-3.24.22.ebuild b/x11-libs/gtk+/gtk+-3.24.22.ebuild
index 1c4e24f58d1c..73b9db0e1af9 100644
--- a/x11-libs/gtk+/gtk+-3.24.22.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.22.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
xinerama? ( X )
"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Upstream wants us to do their job:
# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/libICE/libICE-1.0.10.ebuild b/x11-libs/libICE/libICE-1.0.10.ebuild
index 27e32298e669..6b3d3f96ab55 100644
--- a/x11-libs/libICE/libICE-1.0.10.ebuild
+++ b/x11-libs/libICE/libICE-1.0.10.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
DESCRIPTION="X.Org Inter-Client Exchange library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="ipv6"
DEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libSM/libSM-1.2.3-r1.ebuild b/x11-libs/libSM/libSM-1.2.3-r1.ebuild
index 21729a16b039..f53cb5e85b63 100644
--- a/x11-libs/libSM/libSM-1.2.3-r1.ebuild
+++ b/x11-libs/libSM/libSM-1.2.3-r1.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X.Org Session Management library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="ipv6 +uuid"
RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libX11/libX11-1.7.0.ebuild b/x11-libs/libX11/libX11-1.7.0.ebuild
index 3881d061f725..caba9f751d6a 100644
--- a/x11-libs/libX11/libX11-1.7.0.ebuild
+++ b/x11-libs/libX11/libX11-1.7.0.ebuild
@@ -9,7 +9,7 @@ inherit toolchain-funcs xorg-3
DESCRIPTION="X.Org X11 library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="ipv6 test"
RESTRICT="!test? ( test )"
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
index d7591e403978..5176136ebc5a 100644
--- a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
+++ b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X.Org XScrnSaver library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
RDEPEND="
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXau/libXau-1.0.9-r1.ebuild b/x11-libs/libXau/libXau-1.0.9-r1.ebuild
index 9dff3b61ae35..b5e091454221 100644
--- a/x11-libs/libXau/libXau-1.0.9-r1.ebuild
+++ b/x11-libs/libXau/libXau-1.0.9-r1.ebuild
@@ -9,6 +9,6 @@ inherit xorg-3
DESCRIPTION="X.Org X authorization library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
DEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/libXaw/libXaw-1.0.13-r2.ebuild b/x11-libs/libXaw/libXaw-1.0.13-r2.ebuild
index a54fd6e7b14c..7d459d2bd178 100644
--- a/x11-libs/libXaw/libXaw-1.0.13-r2.ebuild
+++ b/x11-libs/libXaw/libXaw-1.0.13-r2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X.Org Xaw library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="deprecated"
RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild b/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
index af8d2b271b59..7e6f997b3ec2 100644
--- a/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
+++ b/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X.Org Xcomposite library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/x11-libs/libXcursor/libXcursor-1.2.0.ebuild b/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
index 4198367f8cad..81bf3e51b438 100644
--- a/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
+++ b/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
DESCRIPTION="X.Org Xcursor library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXdamage/libXdamage-1.1.5.ebuild b/x11-libs/libXdamage/libXdamage-1.1.5.ebuild
index 34988a59c866..08f830f3af2e 100644
--- a/x11-libs/libXdamage/libXdamage-1.1.5.ebuild
+++ b/x11-libs/libXdamage/libXdamage-1.1.5.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
DESCRIPTION="X.Org Xdamage library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="
diff --git a/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
index 7cdd79ac2fa6..b1bacc30fa75 100644
--- a/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
+++ b/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X.Org X Display Manager Control Protocol library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="elibc_glibc? ( dev-libs/libbsd )"
diff --git a/x11-libs/libXext/libXext-1.3.4.ebuild b/x11-libs/libXext/libXext-1.3.4.ebuild
index 57e4afac809f..b813cc143a9a 100644
--- a/x11-libs/libXext/libXext-1.3.4.ebuild
+++ b/x11-libs/libXext/libXext-1.3.4.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X.Org Xext library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/libXfixes/libXfixes-5.0.3-r3.ebuild b/x11-libs/libXfixes/libXfixes-5.0.3-r3.ebuild
index 833e7594c892..bb712bb9da89 100644
--- a/x11-libs/libXfixes/libXfixes-5.0.3-r3.ebuild
+++ b/x11-libs/libXfixes/libXfixes-5.0.3-r3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X.Org Xfixes library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
RDEPEND="
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/libXfont2/libXfont2-2.0.4.ebuild b/x11-libs/libXfont2/libXfont2-2.0.4.ebuild
index d05a1a3f65df..22ade10fa26c 100644
--- a/x11-libs/libXfont2/libXfont2-2.0.4.ebuild
+++ b/x11-libs/libXfont2/libXfont2-2.0.4.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X.Org Xfont library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 ipv6 truetype"
RDEPEND="sys-libs/zlib
diff --git a/x11-libs/libXft/libXft-2.3.3.ebuild b/x11-libs/libXft/libXft-2.3.3.ebuild
index 7091c3992178..8087fa12d344 100644
--- a/x11-libs/libXft/libXft-2.3.3.ebuild
+++ b/x11-libs/libXft/libXft-2.3.3.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
DESCRIPTION="X.Org Xft library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="doc"
RDEPEND=">=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXi/libXi-1.7.10.ebuild b/x11-libs/libXi/libXi-1.7.10.ebuild
index 4c7db2cfcc4e..8b48636b5798 100644
--- a/x11-libs/libXi/libXi-1.7.10.ebuild
+++ b/x11-libs/libXi/libXi-1.7.10.ebuild
@@ -8,7 +8,7 @@ XORG_MULTILIB=yes
inherit xorg-3
DESCRIPTION="X.Org Xi library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="
diff --git a/x11-libs/libXinerama/libXinerama-1.1.4-r1.ebuild b/x11-libs/libXinerama/libXinerama-1.1.4-r1.ebuild
index 449d7364df91..aa19c2ed3839 100644
--- a/x11-libs/libXinerama/libXinerama-1.1.4-r1.ebuild
+++ b/x11-libs/libXinerama/libXinerama-1.1.4-r1.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X.Org Xinerama library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
RDEPEND="x11-base/xorg-proto
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXmu/libXmu-1.1.3.ebuild b/x11-libs/libXmu/libXmu-1.1.3.ebuild
index 9bb50426755e..314d30206083 100644
--- a/x11-libs/libXmu/libXmu-1.1.3.ebuild
+++ b/x11-libs/libXmu/libXmu-1.1.3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X.Org Xmu library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="ipv6"
RDEPEND="
diff --git a/x11-libs/libXrandr/libXrandr-1.5.2.ebuild b/x11-libs/libXrandr/libXrandr-1.5.2.ebuild
index 87e3d4b9237b..a28dfeb4eaa8 100644
--- a/x11-libs/libXrandr/libXrandr-1.5.2.ebuild
+++ b/x11-libs/libXrandr/libXrandr-1.5.2.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
DESCRIPTION="X.Org Xrandr library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="doc"
RDEPEND="
diff --git a/x11-libs/libXrender/libXrender-0.9.10-r2.ebuild b/x11-libs/libXrender/libXrender-0.9.10-r2.ebuild
index fa5f4e24a22c..c6af1e489a88 100644
--- a/x11-libs/libXrender/libXrender-0.9.10-r2.ebuild
+++ b/x11-libs/libXrender/libXrender-0.9.10-r2.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
DESCRIPTION="X.Org Xrender library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
RDEPEND="x11-base/xorg-proto
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/libXres/libXres-1.2.0-r1.ebuild b/x11-libs/libXres/libXres-1.2.0-r1.ebuild
index 326864d2d86f..be385fa681a8 100644
--- a/x11-libs/libXres/libXres-1.2.0-r1.ebuild
+++ b/x11-libs/libXres/libXres-1.2.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
DESCRIPTION="X.Org XRes library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
RDEPEND="x11-libs/libX11
x11-libs/libXext"
diff --git a/x11-libs/libXt/libXt-1.2.0.ebuild b/x11-libs/libXt/libXt-1.2.0.ebuild
index 5fa09a11fd38..c3537018691f 100644
--- a/x11-libs/libXt/libXt-1.2.0.ebuild
+++ b/x11-libs/libXt/libXt-1.2.0.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X.Org X Toolkit Intrinsics library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/x11-libs/libXtst/libXtst-1.2.3-r2.ebuild b/x11-libs/libXtst/libXtst-1.2.3-r2.ebuild
index b491b536cc3b..a154b568a086 100644
--- a/x11-libs/libXtst/libXtst-1.2.3-r2.ebuild
+++ b/x11-libs/libXtst/libXtst-1.2.3-r2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X.Org Xlib-based client API for the XTEST & RECORD extensions library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXv/libXv-1.0.11-r2.ebuild b/x11-libs/libXv/libXv-1.0.11-r2.ebuild
index 451fa0fad8bd..982285c959d6 100644
--- a/x11-libs/libXv/libXv-1.0.11-r2.ebuild
+++ b/x11-libs/libXv/libXv-1.0.11-r2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X.Org Xv library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
RDEPEND="x11-base/xorg-proto
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild b/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild
index c1c889e6e876..1db7cfb3b571 100644
--- a/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild
+++ b/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
DESCRIPTION="X.Org Xxf86dga library"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
IUSE="doc"
RDEPEND="
diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild
index 1fce4cd50a93..26bba73312eb 100644
--- a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild
+++ b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X.Org Xxf86vm library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
RDEPEND="x11-base/xorg-proto
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libdmx/libdmx-1.1.4.ebuild b/x11-libs/libdmx/libdmx-1.1.4.ebuild
index 4af9be3851ce..ab393c538099 100644
--- a/x11-libs/libdmx/libdmx-1.1.4.ebuild
+++ b/x11-libs/libdmx/libdmx-1.1.4.ebuild
@@ -6,7 +6,7 @@ EAPI=7
inherit xorg-3
DESCRIPTION="X.Org dmx library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
RDEPEND="
x11-base/xorg-proto
diff --git a/x11-libs/libfontenc/libfontenc-1.1.4.ebuild b/x11-libs/libfontenc/libfontenc-1.1.4.ebuild
index 6ec6434fdc20..e835d708f8a8 100644
--- a/x11-libs/libfontenc/libfontenc-1.1.4.ebuild
+++ b/x11-libs/libfontenc/libfontenc-1.1.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="X.Org fontenc library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="sys-libs/zlib"
diff --git a/x11-libs/libpciaccess/libpciaccess-0.16.ebuild b/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
index 958bd5f5f287..934d5c999f02 100644
--- a/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
@@ -8,7 +8,7 @@ XORG_EAUTORECONF=yes
inherit xorg-3
DESCRIPTION="Library providing generic access to the PCI bus and devices"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="zlib"
DEPEND="
diff --git a/x11-libs/libxcb/libxcb-1.14.ebuild b/x11-libs/libxcb/libxcb-1.14.ebuild
index d9dd40baa8ea..c1b19d34ac13 100644
--- a/x11-libs/libxcb/libxcb-1.14.ebuild
+++ b/x11-libs/libxcb/libxcb-1.14.ebuild
@@ -15,7 +15,7 @@ inherit python-any-r1 xorg-3
DESCRIPTION="X C-language Bindings library"
HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc selinux test +xkb"
RESTRICT="!test? ( test )"
SLOT="0/1.12"
diff --git a/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild b/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
index d158ab4c9074..15403f69d2f9 100644
--- a/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
+++ b/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="X.Org xkbfile library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild b/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild
index 155e3e84881e..0ee4dd83fe9b 100644
--- a/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild
+++ b/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,6 +8,6 @@ inherit xorg-3
DESCRIPTION="Shared memory fences using futexes"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
DEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/pango/pango-1.42.4-r2.ebuild b/x11-libs/pango/pango-1.42.4-r2.ebuild
index 4bf698cf7c90..abe3639b94ad 100644
--- a/x11-libs/pango/pango-1.42.4-r2.ebuild
+++ b/x11-libs/pango/pango-1.42.4-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
LICENSE="LGPL-2+ FTL"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="X +introspection test"
RESTRICT="!test? ( test )"
diff --git a/x11-libs/pixman/pixman-0.40.0.ebuild b/x11-libs/pixman/pixman-0.40.0.ebuild
index c6e6516af00d..daac74216757 100644
--- a/x11-libs/pixman/pixman-0.40.0.ebuild
+++ b/x11-libs/pixman/pixman-0.40.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
if [[ ${PV} = 9999* ]]; then
SRC_URI=""
else
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz"
fi
diff --git a/x11-libs/tslib/tslib-1.22.ebuild b/x11-libs/tslib/tslib-1.22.ebuild
index b3e2cb6092dd..ea4cf2ff9605 100644
--- a/x11-libs/tslib/tslib-1.22.ebuild
+++ b/x11-libs/tslib/tslib-1.22.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libts/tslib/releases/download/${PV}/${P}.tar.xz"
LICENSE="LGPL-2 uinput? ( GPL-2+ )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="evdev sdl uinput"
BDEPEND="
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r3.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r3.ebuild
index cd7a6d4a43e4..85f17e5da11e 100644
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r3.ebuild
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X C-language Bindings sample implementations"
HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
>=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}]
diff --git a/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r2.ebuild b/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r2.ebuild
index c4839af8d2f3..fd67ff80ff37 100644
--- a/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r2.ebuild
+++ b/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X C-language Bindings sample implementations"
HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-image"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
>=x11-libs/xcb-util-${PV}:=[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r2.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r2.ebuild
index dd16257b3b28..7791bec83f74 100644
--- a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r2.ebuild
+++ b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X C-language Bindings sample implementations"
HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
RDEPEND="x11-libs/libxcb:=[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
diff --git a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r3.ebuild b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r3.ebuild
index cb1715300e2c..ad2b141a271b 100644
--- a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r3.ebuild
+++ b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X C-language Bindings sample implementations"
HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
diff --git a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r3.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r3.ebuild
index 0b203a89cfe6..e7e02cc41a34 100644
--- a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r3.ebuild
+++ b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X C-language Bindings sample implementations"
HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-wm"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
diff --git a/x11-libs/xcb-util/xcb-util-0.4.0-r2.ebuild b/x11-libs/xcb-util/xcb-util-0.4.0-r2.ebuild
index bc1ac0d72abb..1c10dcc1aae5 100644
--- a/x11-libs/xcb-util/xcb-util-0.4.0-r2.ebuild
+++ b/x11-libs/xcb-util/xcb-util-0.4.0-r2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X C-language Bindings sample implementations"
HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-util"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
diff --git a/x11-libs/xtrans/xtrans-1.4.0.ebuild b/x11-libs/xtrans/xtrans-1.4.0.ebuild
index fe2fd8a45255..6f7b1b960fa2 100644
--- a/x11-libs/xtrans/xtrans-1.4.0.ebuild
+++ b/x11-libs/xtrans/xtrans-1.4.0.ebuild
@@ -9,7 +9,7 @@ XORG_DOC=doc
inherit xorg-3
DESCRIPTION="X.Org xtrans library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=""
diff --git a/x11-misc/compose-tables/compose-tables-1.7.0.ebuild b/x11-misc/compose-tables/compose-tables-1.7.0.ebuild
index 3df2e244891e..7e7d9e2e4120 100644
--- a/x11-misc/compose-tables/compose-tables-1.7.0.ebuild
+++ b/x11-misc/compose-tables/compose-tables-1.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}
S="${WORKDIR}/libX11-${PV}/"
DESCRIPTION="X.Org Compose Key tables from libX11"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
# Only needed by configure
DEPEND="
diff --git a/x11-misc/imake/imake-1.0.8.ebuild b/x11-misc/imake/imake-1.0.8.ebuild
index 83e3302b4d8a..0a444446e083 100644
--- a/x11-misc/imake/imake-1.0.8.ebuild
+++ b/x11-misc/imake/imake-1.0.8.ebuild
@@ -6,7 +6,7 @@ EAPI=7
inherit toolchain-funcs xorg-3
DESCRIPTION="C preprocessor interface to the make utility"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="x11-misc/xorg-cf-files"
diff --git a/x11-misc/makedepend/makedepend-1.0.6.ebuild b/x11-misc/makedepend/makedepend-1.0.6.ebuild
index d89f1ced1741..d59cde933a93 100644
--- a/x11-misc/makedepend/makedepend-1.0.6.ebuild
+++ b/x11-misc/makedepend/makedepend-1.0.6.ebuild
@@ -5,7 +5,7 @@ EAPI=7
inherit xorg-3
DESCRIPTION="create dependencies in makefiles"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=""
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild
index 3fdb9cb01123..30f6230d919a 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://people.freedesktop.org/~hadess/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.15.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.15.ebuild
index b4beb04ef3e4..5af6d1e9416d 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.15.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.15.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.freedesktop.org/xdg/${PN}/uploads/${HASH}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
BDEPEND="
dev-util/itstool
diff --git a/x11-misc/shared-mime-info/shared-mime-info-2.0-r2.ebuild b/x11-misc/shared-mime-info/shared-mime-info-2.0-r2.ebuild
index 2114c664ba70..948338326b9f 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-2.0-r2.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-2.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.freedesktop.org/xdg/${PN}/uploads/${HASH}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# requires installed xdgmime binary
RESTRICT="test"
diff --git a/x11-misc/util-macros/util-macros-1.19.2-r2.ebuild b/x11-misc/util-macros/util-macros-1.19.2-r2.ebuild
index 6df0fcdf0f9b..933fe66464b7 100644
--- a/x11-misc/util-macros/util-macros-1.19.2-r2.ebuild
+++ b/x11-misc/util-macros/util-macros-1.19.2-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
PATCHES=(
"${FILESDIR}"/${P}-CPP.patch
diff --git a/x11-misc/util-macros/util-macros-1.19.3.ebuild b/x11-misc/util-macros/util-macros-1.19.3.ebuild
index b4c80bbc6eea..b5f10bd1d187 100644
--- a/x11-misc/util-macros/util-macros-1.19.3.ebuild
+++ b/x11-misc/util-macros/util-macros-1.19.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# there is nothing to compile for this package, all its contents are produced by
# configure. the only make job that matters is make install
diff --git a/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
index afc5a1ef0522..ba4ca5d5d4c1 100644
--- a/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
+++ b/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.x.org/releases/individual/data/${P}.tar.bz2"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND=""
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
index 53f333ca4639..3d6f1b575d45 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="https://portland.freedesktop.org/download/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc"
RDEPEND="
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r1.ebuild
index 568c30765b80..8db71130ff20 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r1.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ S=${WORKDIR}/xdg-utils-${EGIT_COMMIT}
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="dbus doc gnome"
REQUIRED_USE="gnome? ( dbus )"
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220.ebuild
index f3b6c3be0379..00294847ef41 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ S=${WORKDIR}/xdg-utils-${EGIT_COMMIT}
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc"
RDEPEND="
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
index c1a023f830c1..b674d2cf2e0a 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
BDEPEND="
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.32.0.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.32.0.ebuild
index e6b170a05836..d89ebf416d44 100644
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.32.0.ebuild
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.32.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,7 +17,7 @@ LICENSE="
"
SLOT="0"
IUSE="branding"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
# gtk+:3 is needed for build for the gtk-encode-symbolic-svg utility
# librsvg is needed for gtk-encode-symbolic-svg to be able to read the source SVG via its pixbuf loader and at runtime for rendering scalable icons shipped by the theme
diff --git a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.28.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.28.ebuild
index 1411f1b518ff..5df61e130b23 100644
--- a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.28.ebuild
+++ b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-themes-extra"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
# Depend on gsettings-desktop-schemas-3.4 to make sure 3.2 users don't lose
# their default background image
diff --git a/x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.28.ebuild b/x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.28.ebuild
index eb94c0181f60..ca21345a86d9 100644
--- a/x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.28.ebuild
+++ b/x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-themes-extra/"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
DEPEND="
>=x11-libs/gtk+-2.24.15:2[${MULTILIB_USEDEP}]
diff --git a/x11-themes/hicolor-icon-theme/hicolor-icon-theme-0.17.ebuild b/x11-themes/hicolor-icon-theme/hicolor-icon-theme-0.17.ebuild
index 65ad4e07118f..757370d9d999 100644
--- a/x11-themes/hicolor-icon-theme/hicolor-icon-theme-0.17.ebuild
+++ b/x11-themes/hicolor-icon-theme/hicolor-icon-theme-0.17.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://icon-theme.freedesktop.org/releases/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
BDEPEND="app-arch/xz-utils"
diff --git a/x11-wm/twm/twm-1.0.11.ebuild b/x11-wm/twm/twm-1.0.11.ebuild
index 0f75a088df07..16a3075a4b48 100644
--- a/x11-wm/twm/twm-1.0.11.ebuild
+++ b/x11-wm/twm/twm-1.0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ inherit xorg-3
DESCRIPTION="X.Org Tab Window Manager"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
COMMON_DEPEND="